Update to date handling

Author: Jonny Dixon

dremio-sybasearp-plugin.jar

@@ -13,6 +13,7 @@
 import org.apache.calcite.sql.SqlNodeList;
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.sql.SqlAbstractDateTimeLiteral;
 import com.dremio.exec.store.jdbc.dialect.arp.ArpDialect;
 import com.dremio.common.expression.CompleteType;
 
@@ -58,6 +59,12 @@ public boolean supportsLiteral(CompleteType type) {
     return super.supportsLiteral(type);
   }
 
+  @Override
+  public void unparseDateTimeLiteral(SqlWriter writer,
+    SqlAbstractDateTimeLiteral literal, int leftPrec, int rightPrec) {
+    writer.literal("'" + literal.toFormattedString() + "'");
+  }
+
   @Override
   public void unparseCall(final SqlWriter writer, final SqlCall call, final int leftPrec, final int rightPrec) {
     // Transform SqlSelect nodes that have a fetch node to be SqlSelect nodes with a TOP and no fetch.

src/main/java/com/dremio/exec/store/jdbc/dialect/SybaseDialect.java

@@ -40,6 +40,7 @@ data_types:
       name: "TIMESTAMP"
     dremio:
       name: "timestamp"
+    default_cast_spec: true
   - source:
       name: "INT"
     dremio:
@@ -89,7 +90,7 @@ data_types:
   - source:
       name: "DATE"
     dremio:
-      name: "timestamp"
+      name: "date"
   - source:
       name: "TIME"
     dremio:
@@ -341,6 +342,18 @@ expressions:
         - "varchar"
         return: "integer"
         rewrite: "cast(cast({0} as float) as int)"
+      - args:
+        - "varchar"
+        return: "date"
+        rewrite: "cast({0} as date)"
+      - args:
+        - "varchar"
+        return: "timestamp"
+        rewrite: "cast({0} as timestamp)"
+      - args:
+        - "varchar"
+        return: "time"
+        rewrite: "cast({0} as time)"
     - names:
       - "trim"
       signatures:
@@ -2630,6 +2643,7 @@ expressions:
         - "varchar"
         - "date"
         return: "boolean"
+        rewrite: "cast({0} as date) = {1}"
       - args:
         - "varchar"
         - "time"
@@ -2642,122 +2656,149 @@ expressions:
         - "date"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} = cast({1} as date)"
       - args:
         - "timestamp"
         - "varchar"
         return: "boolean"
+        rewrite: "cast({0} as timestamp) = {1}"
       - args:
         - "time"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} = cast({1} as time)"
     - names:
       - ">"
       signatures:
       - args:
         - "varchar"
         - "date"
         return: "boolean"
+        rewrite: "cast({0} as date) > {1}"
       - args:
         - "varchar"
         - "time"
         return: "boolean"
+        rewrite: "cast({0} as time) > {1}"
       - args:
         - "varchar"
         - "timestamp"
         return: "boolean"
+        rewrite: "cast({0} as timestamp) > {1}"
       - args:
         - "date"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} > cast({1} as date)"
       - args:
         - "timestamp"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} > cast({1} as timestamp)"
       - args:
         - "time"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} > cast({1} as time)"
     - names:
       - ">="
       signatures:
       - args:
         - "varchar"
         - "date"
         return: "boolean"
+        rewrite: "cast({0} as date) >= {1}"
       - args:
         - "varchar"
         - "time"
         return: "boolean"
+        rewrite: "cast({0} as time) >= {1}"
       - args:
         - "varchar"
         - "timestamp"
         return: "boolean"
+        rewrite: "cast({0} as timestamp) >= {1}"
       - args:
         - "date"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} >= cast({1} as date)"
       - args:
         - "timestamp"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} >= cast({1} as timestamp)"
       - args:
         - "time"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} >= cast({1} as time)"
     - names:
       - "<"
       signatures:
       - args:
         - "varchar"
         - "date"
         return: "boolean"
+        rewrite: "cast({0} as date) < {1}"
       - args:
         - "varchar"
         - "time"
         return: "boolean"
+        rewrite: "cast({0} as time) < {1}"
       - args:
         - "varchar"
         - "timestamp"
         return: "boolean"
+        rewrite: "cast({0} as timestamp) < {1}"
       - args:
         - "date"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} < cast({1} as date)"
       - args:
         - "timestamp"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} < cast({1} as timestamp)"
       - args:
         - "time"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} < cast({1} as time)"
     - names:
       - "<="
       signatures:
       - args:
         - "varchar"
         - "date"
         return: "boolean"
+        rewrite: "cast({0} as date) <= {1}"
       - args:
         - "varchar"
         - "time"
         return: "boolean"
+        rewrite: "cast({0} as time) <= {1}"
       - args:
         - "varchar"
         - "timestamp"
         return: "boolean"
+        rewrite: "cast({0} as timestamp) <= {1}"
       - args:
         - "date"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} <= cast({1} as date)"
       - args:
         - "timestamp"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} <= cast({1} as timestamp)"
       - args:
         - "time"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} <= cast({1} as time)"
     - names:
       - "!="
       - "<>"
@@ -2766,26 +2807,32 @@ expressions:
         - "varchar"
         - "date"
         return: "boolean"
+        rewrite: "cast({0} as date) != {1}"
       - args:
         - "varchar"
         - "time"
         return: "boolean"
+        rewrite: "cast({0} as time) != {1}"
       - args:
         - "varchar"
         - "timestamp"
         return: "boolean"
+        rewrite: "cast({0} as timestamp) != {1}"
       - args:
         - "date"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} != cast({1} as date)"
       - args:
         - "timestamp"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} != cast({1} as timestamp)"
       - args:
         - "time"
         - "varchar"
         return: "boolean"
+        rewrite: "{0} != cast({1} as time)"
     - names:
       - "like"
       signatures: