midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adempiere 3.1.2

This commit is contained in:
vpj-cd 2006-12-07 03:28:03 +00:00
parent d087054d12
commit 8f6ccfed70
2 changed files with 1447 additions and 1460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dbPort/src/org/compiere/model/MQuery.java
View File

@ -162,7 +162,7 @@ public class MQuery implements Serializable
else // P_Number_To != null else // P_Number_To != null
{ {
if (P_Number == null) if (P_Number == null)
query.addRestriction("TRUNC("+ParameterName+",'DD')", MQuery.LESS_EQUAL, query.addRestriction("TRUNC("+ParameterName+")", MQuery.LESS_EQUAL,
P_Number_To, Name, Info); P_Number_To, Name, Info);
else else
query.addRangeRestriction(ParameterName, query.addRangeRestriction(ParameterName,
@ -175,19 +175,19 @@ public class MQuery implements Serializable
if (P_Date_To == null) if (P_Date_To == null)
{ {
if (isRange) if (isRange)
query.addRestriction("TRUNC("+ParameterName+",'DD')", MQuery.GREATER_EQUAL, query.addRestriction("TRUNC("+ParameterName+")", MQuery.GREATER_EQUAL,
P_Date, Name, Info); P_Date, Name, Info);
else else
query.addRestriction("TRUNC("+ParameterName+",'DD')", MQuery.EQUAL, query.addRestriction("TRUNC("+ParameterName+")", MQuery.EQUAL,
P_Date, Name, Info); P_Date, Name, Info);
} }
else // P_Date_To != null else // P_Date_To != null
{ {
if (P_Date == null) if (P_Date == null)
query.addRestriction("TRUNC("+ParameterName+",'DD')", MQuery.LESS_EQUAL, query.addRestriction("TRUNC("+ParameterName+")", MQuery.LESS_EQUAL,
P_Date_To, Name, Info); P_Date_To, Name, Info);
else else
query.addRangeRestriction("TRUNC("+ParameterName+",'DD')", query.addRangeRestriction("TRUNC("+ParameterName+")",
P_Date, P_Date_To, Name, Info, Info_To); P_Date, P_Date_To, Name, Info, Info_To);
} }
} }
@ -912,38 +912,25 @@ class Restriction implements Serializable
} }
else else
sb.append(ColumnName); sb.append(ColumnName);
//jz fix col=null in where //
if ((Operator.equals("=") || Operator.equals("!="))&& sb.append(Operator);
Code instanceof String && if (Code instanceof String)
(((String) Code).equals("null") ||((String) Code).equals("NULL") || Code == null)) sb.append(DB.TO_STRING(Code.toString()));
if (Operator.equals("=") ) else if (Code instanceof Timestamp)
sb.append(" IS NULL "); sb.append(DB.TO_DATE((Timestamp)Code));
else
sb.append(" IS NOT NULL ");
else else
sb.append(Code);
// Between
// if (Code_to != null && InfoDisplay_to != null)
if (MQuery.BETWEEN.equals(Operator))
{ {
// sb.append(" AND ");
sb.append(Operator); if (Code_to instanceof String)
sb.append(DB.TO_STRING(Code_to.toString()));
if (Code instanceof String) else if (Code_to instanceof Timestamp)
sb.append(DB.TO_STRING(Code.toString())); sb.append(DB.TO_DATE((Timestamp)Code_to));
else if (Code instanceof Timestamp)
sb.append(DB.TO_DATE((Timestamp)Code));
else else
sb.append(Code); sb.append(Code_to);
// Between
// if (Code_to != null && InfoDisplay_to != null)
if (MQuery.BETWEEN.equals(Operator))
{
sb.append(" AND ");
if (Code_to instanceof String)
sb.append(DB.TO_STRING(Code_to.toString()));
else if (Code_to instanceof Timestamp)
sb.append(DB.TO_DATE((Timestamp)Code_to));
else
sb.append(Code_to);
}
} }
return sb.toString(); return sb.toString();
} // getSQL } // getSQL
@ -954,7 +941,7 @@ class Restriction implements Serializable
*/ */
public String toString() public String toString()
{ {
return getSQL(null); //jz will it be used to generate update set clause??? return getSQL(null);
} // toString } // toString
/** /**

6
dbPort/src/org/compiere/model/MSystem.java
View File

@ -178,9 +178,9 @@ public class MSystem extends X_AD_System
//jz to avoid data conversion String sql = "SELECT 'C'||(SELECT COUNT(*) FROM AD_Client)" //jz to avoid data conversion String sql = "SELECT 'C'||(SELECT COUNT(*) FROM AD_Client)"
String sql = "SELECT 'C'||(SELECT COUNT(*) FROM AD_Client)" String sql = "SELECT 'C'||(SELECT COUNT(*) FROM AD_Client)"
+ "||'U'||(SELECT COUNT(*) FROM AD_User)" + "||'U'||(SELECT COUNT(*) FROM AD_User)"
+ "||'B'||(SELECT COUNT(*) FROM C_BPartner)" + "||'B'||(SELECT COUNT(*) FROM C_BPartner)"
+ "||'P'||(SELECT COUNT(*) FROM M_Product)" + "||'P'||(SELECT COUNT(*) FROM M_Product)"
+ "||'I'||(SELECT COUNT(*) FROM C_Invoice)" + "||'I'||(SELECT COUNT(*) FROM C_Invoice)"
+ "||'M'||(SELECT COUNT(*) FROM M_Transaction)" + "||'M'||(SELECT COUNT(*) FROM M_Transaction)"
+ " FROM AD_System"; + " FROM AD_System";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;