@malloydata/db-trino 0.0.138-dev240402021905 → 0.0.138-dev240402171233

package/dist/trino_connection.d.ts

@@ -38,6 +38,8 @@ export declare class TrinoConnection implements Connection, PersistSQLResults {
     canStream(): this is StreamingConnection;
     get supportsNesting(): boolean;
     manifestTemporaryTable(_sqlCommand: string): Promise<string>;
+    convertRow(structDef: StructDef, row: unknown[]): {};
+    convertNest(structDef: StructDef, dataRows: unknown[][]): {};
     runSQL(sqlCommand: string, options?: RunSQLOptions, _rowIndex?: number): Promise<MalloyQueryData>;
     runSQLBlockAndFetchResultSchema(_sqlBlock: SQLBlock, _options?: RunSQLOptions): Promise<{
         data: MalloyQueryData;

package/dist/trino_connection.js

@@ -166,6 +166,25 @@ class TrinoConnection {
         throw maybeRewriteError(e);
       }
     }*/
+    convertRow(structDef, row) {
+        const col = {};
+        for (let i = 0; i < structDef.fields.length; i++) {
+            col[structDef.fields[i].name] = row[i];
+        }
+        return col;
+    }
+    convertNest(structDef, dataRows) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const ret = [];
+        if (structDef.structRelationship.type === 'nested' &&
+            !structDef.structRelationship.isArray) {
+            return this.convertRow(structDef, dataRows);
+        }
+        for (const row of dataRows) {
+            ret.push(this.convertRow(structDef, row));
+        }
+        return ret;
+    }
     async runSQL(sqlCommand, options = {}, 
     // TODO(figutierrez): Use.
     _rowIndex = 0) {
@@ -176,6 +195,10 @@ class TrinoConnection {
             // TODO: handle.
             throw new Error(`Failed to execute sql: ${sqlCommand}. \n Error: ${JSON.stringify(queryResult.value.error)}`);
         }
+        const malloyColumns = queryResult.value.columns.map(c => this.malloyTypeFromTrinoType(c.name, c.type));
+        // Debugging types
+        // const _x = queryResult.value.columns.map(c => console.log(c.type));
+        // console.log(JSON.stringify(malloyColumns, null, 2));
         let maxRows = (_a = options.rowLimit) !== null && _a !== void 0 ? _a : 50;
         const malloyRows = [];
         while (queryResult !== null && maxRows--) {
@@ -184,9 +207,8 @@ class TrinoConnection {
                 const malloyRow = {};
                 for (let i = 0; i < queryResult.value.columns.length; i++) {
                     const column = queryResult.value.columns[i];
-                    // TODO: handle arrays etc.
-                    if (column.type === 'json') {
-                        malloyRow[column.name] = JSON.parse(row[i]);
+                    if (malloyColumns[i].type === 'struct') {
+                        malloyRow[column.name] = this.convertNest(malloyColumns[i], row[i]);
                     }
                     else {
                         malloyRow[column.name] = row[i];
@@ -328,18 +350,28 @@ class TrinoConnection {
         if (arrayMatch) {
             const arrayType = arrayMatch[1];
             const innerType = this.malloyTypeFromTrinoType(name, arrayType);
-            malloyType = {
-                type: 'struct',
-                name,
-                dialect: this.dialectName,
-                structSource: { type: 'nested' },
-                structRelationship: {
+            if (innerType.type === 'struct') {
+                malloyType = innerType;
+                malloyType.structRelationship = {
                     type: 'nested',
                     fieldName: name,
                     isArray: true,
-                },
-                fields: [{ ...innerType, name: 'value' }],
-            };
+                };
+            }
+            else {
+                malloyType = {
+                    type: 'struct',
+                    name,
+                    dialect: this.dialectName,
+                    structSource: { type: 'nested' },
+                    structRelationship: {
+                        type: 'nested',
+                        fieldName: name,
+                        isArray: true,
+                    },
+                    fields: [{ ...innerType, name: 'value' }],
+                };
+            }
         }
         else if (structMatch) {
             // TODO: Trino doesn't quote or escape commas in field names,

package/dist/trino_connection.spec.js

@@ -96,22 +96,9 @@ describe('Trino connection', () => {
                 },
                 'structSource': { 'type': 'nested' },
                 'fields': [
-                    {
-                        'name': 'value',
-                        'type': 'struct',
-                        'dialect': 'trino',
-                        'structRelationship': {
-                            'fieldName': 'test',
-                            'isArray': false,
-                            'type': 'nested',
-                        },
-                        'structSource': { 'type': 'nested' },
-                        'fields': [
-                            { 'name': 'a', 'numberType': 'float', 'type': 'number' },
-                            { 'name': 'b', 'numberType': 'integer', 'type': 'number' },
-                            { 'name': 'c', 'type': 'string' },
-                        ],
-                    },
+                    { 'name': 'a', 'numberType': 'float', 'type': 'number' },
+                    { 'name': 'b', 'numberType': 'integer', 'type': 'number' },
+                    { 'name': 'c', 'type': 'string' },
                 ],
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.138-dev240402021905",
+  "version": "0.0.138-dev240402171233",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",