Update for timestamps and boolean issues for Sybase

Author: Jonny Dixon

dremio-sybasearp-plugin.jar

@@ -35,6 +35,25 @@
       <artifactId>dremio-ce-jdbc-plugin</artifactId>
       <version>${version.dremio}</version>
     </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.9</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.9.3</version>
+  </dependency>
   </dependencies>
 
   <build>

pom.xml

@@ -105,6 +105,8 @@ protected Config toPluginConfig(SabotContext context) {
     private CloseableDataSource newDataSource() {
     final Properties properties = new Properties();
 
+    properties.setProperty("JCONNECT_VERSION", "7");
+
     if (useSsl) {
       properties.setProperty("SYBSOCKET_FACTORY", "DEFAULT");
     }

src/main/java/com/dremio/exec/store/jdbc/conf/SybaseConf.java

@@ -14,6 +14,7 @@
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import com.dremio.exec.store.jdbc.dialect.arp.ArpDialect;
+import com.dremio.common.expression.CompleteType;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +49,15 @@ public boolean hasImplicitTableAlias() {
     return false;
   }
 
+  @Override
+  public boolean supportsLiteral(CompleteType type) {
+    if (CompleteType.BIT.equals(type)) {
+      return false;
+    }
+
+    return super.supportsLiteral(type);
+  }
+
   @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

@@ -24,7 +24,7 @@ syntax:
   # Manually Configured Syntax Section.
   identifier_quote: '"'
   identifier_length_limit: 128
-  allows_boolean_literal: true
+  allows_boolean_literal: false
   map_boolean_literal_to_bit: false
   supports_catalogs: true
   supports_schemas: true
@@ -33,132 +33,120 @@ data_types:
   mappings:
   # Manually Configured Data Types Mappings Section.
   - source:
-      name: "BIT"
+      name: "INTEGER"
     dremio:
-      name: "boolean"
-    required_cast_arguments: "none"
+      name: "integer"
   - source:
-      name: "INT"
+      name: "TIMESTAMP"
     dremio:
-      name: "integer"
-    required_cast_arguments: "none"
+      name: "timestamp"
   - source:
-      name: "INTEGER"
+      name: "INT"
     dremio:
       name: "integer"
-    required_cast_arguments: "none"
   - source:
       name: "SMALLINT"
     dremio:
       name: "integer"
-    required_cast_arguments: "none"
   - source:
       name: "TINYINT"
     dremio:
       name: "integer"
-    required_cast_arguments: "none"
   - source:
       name: "BIGINT"
     dremio:
       name: "bigint"
-    required_cast_arguments: "none"
   - source:
       name: "DECIMAL"
     dremio:
       name: "decimal"
-    required_cast_arguments: "none"
   - source:
       name: "REAL"
     dremio:
       name: "double"
-      required_cast_arguments: "none"
   - source:
       name: "NUMERIC"
     dremio:
       name: "integer"
-    required_cast_arguments: "none"
   - source:
       name: "MONEY"
     dremio:
       name: "double"
-    required_cast_arguments: "none"
   - source:
       name: "SMALLMONEY"
     dremio:
       name: "double"
-    required_cast_arguments: "none"
   - source:
       name: "DATETIME"
       max_scale: 8
     dremio:
       name: "timestamp"
-    required_cast_arguments: "none"
   - source:
       name: "SMALLDATETIME"
       max_scale: 4
     dremio:
       name: "timestamp"
-    required_cast_arguments: "none"
   - source:
       name: "DATE"
     dremio:
-      name: "date"
-    required_cast_arguments: "none"
+      name: "timestamp"
   - source:
       name: "TIME"
     dremio:
       name: "time"
-    required_cast_arguments: "none"
+  - source:
+      name: "VARCHAR"
+    dremio:
+      name: "varchar"
   - source:
       name: "TEXT"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
   - source:
       name: "UNITEXT"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
   - source:
       name: "BINARY"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
   - source:
       name: "VARBINARY"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
   - source:
       name: "IMAGE"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
   - source:
       name: "CHAR"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
   - source:
       name: "NCHAR"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
-  - source:
-      name: "VARCHAR"
-    dremio:
-      name: "varchar"
-    required_cast_arguments: "none"
   - source:
       name: "NVARCHAR"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
   - source:
       name: "UNIVARCHAR"
     dremio:
       name: "varchar"
-    required_cast_arguments: "none"
+  - source:
+      name: "BIT"
+    dremio:
+      name: "boolean"
+    default_cast_spec: true
+  - source:
+      name: "BIGDATETIME"
+    dremio:
+      name: "timestamp"
+  - source:
+      name: "BIGTIME"
+    dremio:
+      name: "time"
 
 relational_algebra:
   aggregation:
@@ -288,7 +276,7 @@ expressions:
     correlated: true
     scalar: true
     in_clause: true
-    exists_clase: true
+    exists_clause: true
   supports_case: true
   supports_over: true
   datetime_formats:

src/main/resources/arp/implementation/sybase-arp.yaml

@@ -0,0 +1,4 @@
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
+log4j.rootLogger=info, stdout