Working on issues around data types, MySQL booleans still not working

Author: Yaytay

query-engine/docs/query-engine-compose.yml

@@ -50,7 +50,7 @@ services:
     - 16686:16686
 
   query-engine:
-    image: ghcr.io/yaytay/query-engine-design-mode:0.0.76-1-main
+    image: ghcr.io/yaytay/query-engine-design-mode:0.0.77-main
     ports:
     - 2000:8080
     volumes:

query-engine/src/main/java/uk/co/spudsoft/query/defn/DataType.java

@@ -18,6 +18,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.sql.JDBCType;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -166,6 +167,7 @@ public Comparable<?> cast(Object value) throws Exception {
           return java.lang.Integer.valueOf(tv);
         }
         default -> {
+          logger.info("Converting {} ({}) to string to parse as {}", value, value.getClass(), this);
           return java.lang.Integer.valueOf(value.toString());
         }
       }
@@ -181,6 +183,7 @@ public Comparable<?> cast(Object value) throws Exception {
           return java.lang.Long.valueOf(tv);
         }
         default -> {
+          logger.info("Converting {} ({}) to string to parse as {}", value, value.getClass(), this);
           return java.lang.Long.valueOf(value.toString());
         }
       }
@@ -196,6 +199,7 @@ public Comparable<?> cast(Object value) throws Exception {
           return java.lang.Float.valueOf(tv);
         }
         default -> {
+          logger.info("Converting {} ({}) to string to parse as {}", value, value.getClass(), this);
           return java.lang.Float.valueOf(value.toString());
         }
       }
@@ -211,6 +215,7 @@ public Comparable<?> cast(Object value) throws Exception {
           return java.lang.Double.valueOf(tv);
         }
         default -> {
+          logger.info("Converting {} ({}) to string to parse as {}", value, value.getClass(), this);
           return java.lang.Double.valueOf(value.toString());
         }
       }
@@ -235,6 +240,7 @@ public Comparable<?> cast(Object value) throws Exception {
           return java.lang.Boolean.valueOf(tv);
         }
         default -> {
+          logger.info("Converting {} ({}) to string to parse as {}", value, value.getClass(), this);
           return java.lang.Boolean.valueOf(value.toString());
         }
       }
@@ -256,6 +262,7 @@ public Comparable<?> cast(Object value) throws Exception {
           return LocalDate.parse(tv.substring(0, 10));
         }
         default -> {
+          logger.info("Converting {} ({}) to string to parse as {}", value, value.getClass(), this);
           return LocalDate.parse(value.toString());
         }
       }
@@ -277,6 +284,7 @@ public Comparable<?> cast(Object value) throws Exception {
           return LocalDateTime.parse(tv);
         }
         default -> {
+          logger.info("Converting {} ({}) to string to parse as {}", value, value.getClass(), this);
           return LocalDateTime.parse(value.toString());
         }
       }
@@ -285,6 +293,14 @@ public Comparable<?> cast(Object value) throws Exception {
         case LocalTime tv -> {
           return tv;
         }
+        case Duration tv -> {
+          return LocalTime.of(
+                  tv.toHoursPart()
+                  , tv.toMinutesPart()
+                  , tv.toSecondsPart()
+                  , tv.toNanosPart()
+          );
+        }
         case LocalDateTime tv -> {
           return tv.toLocalTime();
         }
@@ -298,6 +314,7 @@ public Comparable<?> cast(Object value) throws Exception {
           return LocalTime.parse(tv);
         }
         default -> {
+          logger.info("Converting {} ({}) to string to parse as {}", value, value.getClass(), this);
           return LocalTime.parse(value.toString());
         }
       }

query-engine/src/main/java/uk/co/spudsoft/query/exec/fmts/json/FormatJsonInstance.java

@@ -198,7 +198,7 @@ private Future<Void> start() {
     } else {
       String start;
       if (Strings.isNullOrEmpty(defn.getMetadataName())) {
-        start = "{\"" + defn.getDataName() + "\":";
+        start = "{\"" + defn.getDataName() + "\":" + OPEN_ARRAY;
       } else {
         logger.debug("Data types: {}", types);
         Types metaTypes = new Types();

query-engine/src/main/java/uk/co/spudsoft/query/exec/sources/sql/RowStreamWrapper.java

@@ -159,13 +159,12 @@ private DataRow sqlRowToDataRow(Row row) {
     for (int col = 0; col < size; col++) {
       String name = row.getColumnName(col);
       Object value = row.getValue(col);
-      Comparable<?> compValue = DataRow.convert(value);
       DataType type = types.get(name);
       try {
-        Comparable<?> typedValue = type.cast(compValue);
+        Comparable<?> typedValue = type.cast(value);
         result.put(name, typedValue);
       } catch (Exception ex) {
-        logger.warn("Unable to convert {} to {}: ", compValue, type, ex);
+        logger.warn("Unable to convert {} to {}: ", value, type, ex);
       }
     }
     return result;

query-engine/src/main/java/uk/co/spudsoft/query/main/Version.java

@@ -34,7 +34,7 @@ public final class Version {
   /**
    * The project version, as set in the Maven pom.xml.
    */
-  public static final String MAVEN_PROJECT_VERSION = "0.0.76-1-main";
+  public static final String MAVEN_PROJECT_VERSION = "0.0.77-main";
 
   private Version() {
   }

query-engine/src/test/java/uk/co/spudsoft/query/defn/DataTypeTest.java

@@ -98,6 +98,12 @@ public void testCast() throws Exception {
     assertEquals(Boolean.TRUE, DataType.Boolean.cast("true"));
     assertEquals(Boolean.TRUE, DataType.Boolean.cast(7.5));
     assertEquals(Boolean.TRUE, DataType.Boolean.cast(new StringBuilder("true")));
+    assertEquals(Boolean.TRUE, DataType.Boolean.cast(1));
+    assertEquals(Boolean.FALSE, DataType.Boolean.cast(0));
+    assertEquals(Boolean.TRUE, DataType.Boolean.cast(1L));
+    assertEquals(Boolean.FALSE, DataType.Boolean.cast(0L));
+    assertEquals(Boolean.TRUE, DataType.Boolean.cast((byte) 1));
+    assertEquals(Boolean.FALSE, DataType.Boolean.cast((byte) 0));
 
     assertEquals(null, DataType.Date.cast(null));
     assertEquals(LocalDate.of(1971, 5, 6), DataType.Date.cast(LocalDate.of(1971, 5, 6)));