@malloydata/db-trino 0.0.138-dev240402185231 → 0.0.138-dev240402223657

package/dist/trino_connection.d.ts

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

package/dist/trino_connection.js

@@ -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,

package/dist/trino_connection.spec.js

@@ -27,9 +27,15 @@ const ARRAY_SCHEMA = 'array(integer)';
 const STRUCT_SCHEMA = 'row(a double, b integer, c varchar(60))';
 const DEEP_SCHEMA = 'array(row(a double, b integer, c varchar(60)))';
 describe('Trino connection', () => {
+    let connection;
+    beforeAll(() => {
+        connection = new _1.TrinoConnection('trino', {}, _1.TrinoExecutor.getConnectionOptionsFromEnv());
+    });
+    afterAll(() => {
+        connection.close();
+    });
     describe('schema parser', () => {
         it('parses arrays', () => {
-            const connection = new _1.TrinoConnection('trino', {}, _1.TrinoExecutor.getConnectionOptionsFromEnv());
             expect(connection.malloyTypeFromTrinoType('test', ARRAY_SCHEMA)).toEqual({
                 'name': 'test',
                 'type': 'struct',
@@ -103,5 +109,15 @@ describe('Trino connection', () => {
             });
         });
     });
+    describe('splitColumns', () => {
+        it('handles internal rows', () => {
+            const nested = 'popular_name varchar, airport_count double, by_state array(row(state varchar, airport_count double))';
+            expect(connection.splitColumns(nested)).toEqual([
+                'popular_name varchar',
+                'airport_count double',
+                'by_state array(row(state varchar, airport_count double))',
+            ]);
+        });
+    });
 });
 //# sourceMappingURL=trino_connection.spec.js.map

package/package.json

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