Fix strange error that caused some DateTime fields to not output in Json meta

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.67-main
+    image: ghcr.io/yaytay/query-engine-design-mode:0.0.68-main
     ports:
     - 2000:8080
     volumes:

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

@@ -117,7 +117,6 @@ public FormatJsonInstance(WriteStream<Buffer> outputStream, FormatJson defn) {
               return start();
             }
             , row -> {
-              logger.debug("Outputting row: {}", row);
               if (row.isEmpty()) {
                 return Future.succeededFuture();
               } else if (started.get()) {
@@ -204,7 +203,13 @@ private Future<Void> start() {
       if (Strings.isNullOrEmpty(defn.getMetadataName())) {
         start = "{\"" + defn.getDataName() + "\":";
       } else {
-        DataRow row = DataRow.create(types);
+        logger.debug("Data types: {}", types);
+        Types metaTypes = new Types();
+        types.forEach((cd -> {
+          metaTypes.putIfAbsent(cd.name(), DataType.String);
+        }));
+        logger.debug("Meta types: {}", metaTypes);
+        DataRow metaRow = DataRow.create(metaTypes);
         types.forEach(cd -> {
           String typeName = cd.typeName();
           if (defn.isCompatibleTypeNames()) {
@@ -216,7 +221,7 @@ private Future<Void> start() {
               typeName = typeName.toLowerCase(Locale.ROOT);
             }
           }
-          row.put(cd.name(), typeName);
+          metaRow.put(cd.name(), typeName);
         });
         String insertTitle = "";
         if (!Strings.isNullOrEmpty(title)) {
@@ -226,7 +231,7 @@ private Future<Void> start() {
         if (!Strings.isNullOrEmpty(description)) {
           insertTitle = "\"description\":\"" + description.trim() + "\",";
         }
-        start = "{\"" + defn.getMetadataName() + "\":{" + insertTitle + insertDesc + "\"fields\":" + toJson(row).toString() + "},\"" + defn.getDataName() + "\":" + OPEN_ARRAY;
+        start = "{\"" + defn.getMetadataName() + "\":{" + insertTitle + insertDesc + "\"fields\":" + toJson(metaRow).toString() + "},\"" + defn.getDataName() + "\":" + OPEN_ARRAY;
       }
       return outputStream.write(Buffer.buffer(start));
     }

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.67-main";
+  public static final String MAVEN_PROJECT_VERSION = "0.0.68-main";
 
   private Version() {
   }

query-engine/src/test/java/uk/co/spudsoft/query/main/MainQueryIT.java

@@ -210,7 +210,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
 
-    assertThat(body, startsWith("{\"meta\":{\"fields\":{\"dataId\":\"int\",\"ref\":\"string\",\"value\":\"string\",\"children\":\"string\"}},\"data\":[{\"dataId\":1,\"instant\":\"1971-05-07 03:00:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\"},"));
+    assertThat(body, startsWith("{\"meta\":{\"fields\":{\"dataId\":\"int\",\"instant\":\"datetime\",\"ref\":\"string\",\"value\":\"string\",\"children\":\"string\"}},\"data\":[{\"dataId\":1,\"instant\":\"1971-05-07 03:00:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\"},"));
     assertThat(body, endsWith(",{\"dataId\":13,\"instant\":\"1971-05-20 15:00:00\",\"ref\":\"cadetblue\",\"value\":\"thirteenth\",\"children\":\"thirteen,twenty six,thirty nine,fifty two,sixty five,seventy eight\"}]}"));
 
     body = given()