You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2009/08/26 18:10:56 UTC

svn commit: r808086 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

Author: faywang
Date: Wed Aug 26 16:10:55 2009
New Revision: 808086

URL: http://svn.apache.org/viewvc?rev=808086&view=rev
Log:
OPENJPA-1266: no need to cast for JDBC escape syntax for date, time, timestamp in DB2

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=808086&r1=808085&r2=808086&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Aug 26 16:10:55 2009
@@ -44,6 +44,7 @@
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.kernel.Filters;
 import org.apache.openjpa.kernel.MixedLockLevels;
+import org.apache.openjpa.kernel.exps.Literal;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.OpenJPAException;
@@ -195,14 +196,19 @@
         int idx) {
         // if this is a literal value, add a cast...
         Object val = sel.getSelects().get(idx);
-        if (val instanceof Lit)
+        boolean toCast = (val instanceof Lit) && 
+            ((Lit)val).getParseType() != Literal.TYPE_DATE && 
+            ((Lit)val).getParseType() != Literal.TYPE_TIME &&
+            ((Lit)val).getParseType() != Literal.TYPE_TIMESTAMP;
+        
+        if (toCast) 
             selectSQL.append("CAST(");
 
         // ... and add the select per super's behavior...
         super.appendSelect(selectSQL, alias, sel, idx);
 
         // ... and finish the cast
-        if (val instanceof Lit) {
+        if (toCast) {
             Class c = ((Lit) val).getType();
             int javaTypeCode = JavaTypes.getTypeCode(c);
             int jdbcTypeCode = getJDBCType(javaTypeCode, false);