OracleDialect - override Driver Type Conversion for Dates

Fixes #754
javalite · Jul 28, 2018 · 9a64889 · 9a64889
1 parent 1907283
commit 9a64889
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/activejdbc/src/main/java/org/javalite/activejdbc/dialects/OracleDialect.java b/activejdbc/src/main/java/org/javalite/activejdbc/dialects/OracleDialect.java
@@ -15,8 +15,11 @@
 */
 package org.javalite.activejdbc.dialects;
 
-import java.util.List;
 import org.javalite.activejdbc.MetaModel;
+import org.javalite.common.Convert;
+
+import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * @author Igor Polevoy
@@ -77,6 +80,18 @@ public String formSelect(String tableName, String[] columns, String subQuery, Li
         return fullQuery.toString();
     }
 
+    @Override
+    public Object overrideDriverTypeConversion(MetaModel mm, String attributeName, Object value) {
+        // Oracle returns java.sql.Timestamp for DATE values
+        if (value instanceof Timestamp) {
+            String typeName = mm.getColumnMetadata().get(attributeName).getTypeName();
+            if ("DATE".equalsIgnoreCase(typeName)) {
+                return Convert.toSqlDate(value);
+            }
+        }
+        return value;
+    }
+
     @Override
     protected void appendEmptyRow(MetaModel metaModel, StringBuilder query) {
         query.append('(').append(metaModel.getIdName()).append(") VALUES (")