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

package/dist/trino_connection.d.ts

@@ -59,6 +59,7 @@ export declare class TrinoConnection implements Connection, PersistSQLResults {
     }>;
     private structDefFromSqlBlock;
     private executeAndWait;
+    private splitColumns;
     malloyTypeFromTrinoType(name: string, trinoType: string): FieldAtomicTypeDef | StructDef;
     structDefFromSchema(rows: string[][], structDef: StructDef): void;
     private loadSchemaForSqlBlock;

package/dist/trino_connection.js

@@ -174,7 +174,6 @@ class TrinoConnection {
         return col;
     }
     convertNest(structDef, dataRows) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const ret = [];
         if (structDef.structRelationship.type === 'nested' &&
             !structDef.structRelationship.isArray) {
@@ -193,7 +192,8 @@ class TrinoConnection {
         let queryResult = await result.next();
         if (queryResult.value.error) {
             // TODO: handle.
-            throw new Error(`Failed to execute sql: ${sqlCommand}. \n Error: ${JSON.stringify(queryResult.value.error)}`);
+            const { failureInfo: _, ...error } = queryResult.value.error;
+            throw new Error(`Failed to execute sql: ${sqlCommand}. \n Error: ${JSON.stringify(error)}`);
         }
         const malloyColumns = queryResult.value.columns.map(c => this.malloyTypeFromTrinoType(c.name, c.type));
         // Debugging types
@@ -340,6 +340,37 @@ class TrinoConnection {
         while (!(await result.next()).done)
             ;
     }
+    splitColumns(s) {
+        const columns = [];
+        let parens = 0;
+        let column = '';
+        let eatSpaces = true;
+        for (let idx = 0; idx < s.length; idx++) {
+            const c = s.charAt(idx);
+            if (eatSpaces && c === ' ') {
+                // Eat space
+            }
+            else {
+                eatSpaces = false;
+                if (!parens && c === ',') {
+                    columns.push(column);
+                    column = '';
+                    eatSpaces = true;
+                }
+                else {
+                    column += c;
+                }
+                if (c === '(') {
+                    parens += 1;
+                }
+                else if (c === ')') {
+                    parens -= 1;
+                }
+            }
+        }
+        columns.push(column);
+        return columns;
+    }
     malloyTypeFromTrinoType(name, trinoType) {
         var _a;
         let malloyType;
@@ -377,7 +408,7 @@ class TrinoConnection {
             // TODO: Trino doesn't quote or escape commas in field names,
             // so some magic is going to need to be applied before we get here
             // to avoid confusion if a field name contains a comma
-            const innerTypes = structMatch[1].split(/,\s+/);
+            const innerTypes = this.splitColumns(structMatch[1]);
             malloyType = {
                 type: 'struct',
                 name,
@@ -421,7 +452,7 @@ class TrinoConnection {
     structDefFromSchema(rows, structDef) {
         for (const row of rows) {
             const name = row[0];
-            const type = row[1] || row[4];
+            const type = row[4] || row[1];
             const malloyType = this.malloyTypeFromTrinoType(name, type);
             // console.log('>', row, '\n<', malloyType);
             structDef.fields.push({ name, ...malloyType });

package/package.json

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