fix trino version of schema parser

Author: mtoy-googly-moogly

packages/malloy-db-trino/src/trino_connection.spec.ts

@@ -63,39 +63,35 @@ describe('Trino connection', () => {
 
   describe('schema parser', () => {
     it('parses arrays', () => {
-      expect(connection.malloyTypeFromTrinoType('test', ARRAY_SCHEMA)).toEqual({
+      expect(connection.malloyTypeFromTrinoType(ARRAY_SCHEMA)).toEqual({
         type: 'array',
         elementTypeDef: intType,
       });
     });
 
     it('parses inline', () => {
-      expect(connection.malloyTypeFromTrinoType('test', INLINE_SCHEMA)).toEqual(
-        {
-          'type': 'record',
-          'fields': recordSchema,
-        }
-      );
+      expect(connection.malloyTypeFromTrinoType(INLINE_SCHEMA)).toEqual({
+        'type': 'record',
+        'fields': recordSchema,
+      });
     });
 
     it('parses nested', () => {
-      expect(connection.malloyTypeFromTrinoType('test', NESTED_SCHEMA)).toEqual(
-        {
-          'type': 'array',
-          'elementTypeDef': {type: 'record_element'},
-          'fields': recordSchema,
-        }
-      );
+      expect(connection.malloyTypeFromTrinoType(NESTED_SCHEMA)).toEqual({
+        'type': 'array',
+        'elementTypeDef': {type: 'record_element'},
+        'fields': recordSchema,
+      });
     });
 
     it('parses a simple type', () => {
-      expect(connection.malloyTypeFromTrinoType('test', 'varchar(60)')).toEqual(
+      expect(connection.malloyTypeFromTrinoType('varchar(60)')).toEqual(
         stringType
       );
     });
 
     it('parses deep nesting', () => {
-      expect(connection.malloyTypeFromTrinoType('test', DEEP_SCHEMA)).toEqual({
+      expect(connection.malloyTypeFromTrinoType(DEEP_SCHEMA)).toEqual({
         'type': 'array',
         'elementTypeDef': {type: 'record_element'},
         'fields': [

packages/malloy-db-trino/src/trino_connection.ts

@@ -44,7 +44,6 @@ import {
   FieldDef,
   TinyParser,
   isRepeatedRecord,
-  AtomicFieldDef,
 } from '@malloydata/malloy';
 
 import {BaseConnection} from '@malloydata/malloy/connection';
@@ -260,7 +259,7 @@ export abstract class TrinoPrestoConnection
     const columns = r.columns;
 
     const malloyColumns = columns.map(c =>
-      this.malloyTypeFromTrinoType(c.name, c.type)
+      mkFieldDef(this.malloyTypeFromTrinoType(c.type), c.name)
     );
 
     const malloyRows: QueryDataRow[] = [];
@@ -348,24 +347,16 @@ export abstract class TrinoPrestoConnection
     //while (!(await result.next()).done);
   }
 
-  public malloyTypeFromTrinoType(
-    name: string,
-    trinoType: string
-  ): AtomicFieldDef {
-    const atomicType = new TrinoPrestoSchemaParser(
-      trinoType,
-      this.dialect
-    ).typeDef();
-    const def = mkFieldDef(atomicType, name);
-    return def;
+  public malloyTypeFromTrinoType(trinoType: string): AtomicTypeDef {
+    const typeParse = new TrinoPrestoSchemaParser(trinoType, this.dialect);
+    return typeParse.typeDef();
   }
 
   structDefFromSchema(rows: string[][], structDef: StructDef): void {
     for (const row of rows) {
       const name = row[0];
       const type = row[4] || row[1];
-      const malloyType = this.malloyTypeFromTrinoType(name, type);
-      // console.log('>', row, '\n<', malloyType);
+      const malloyType = mkFieldDef(this.malloyTypeFromTrinoType(type), name);
       structDef.fields.push(mkFieldDef(malloyType, name));
     }
   }
@@ -611,7 +602,10 @@ class TrinoPrestoSchemaParser extends TinyParser {
     } else if (typToken.text === 'row' && this.next('(')) {
       const fields: FieldDef[] = [];
       for (;;) {
-        const name = this.next('quoted_name');
+        const name = this.next();
+        if (name.type !== 'id' && name.type !== 'quoted_name') {
+          throw this.parseError('Expected property name');
+        }
         const getDef = this.typeDef();
         fields.push(mkFieldDef(getDef, name.text));
         const sep = this.next();
@@ -637,10 +631,10 @@ class TrinoPrestoSchemaParser extends TinyParser {
             fields: elType.fields,
           }
         : {type: 'array', elementTypeDef: elType};
-    } else if (typToken.type === 'id') {
+    } else if (typToken.type === 'id' || typToken.type === 'quoted_name') {
       const sqlType = typToken.text;
-      const def = this.dialect.sqlTypeToMalloyType(sqlType);
-      if (def === undefined) {
+      const typeDef = this.dialect.sqlTypeToMalloyType(sqlType);
+      if (typeDef === undefined) {
         throw this.parseError(`Can't parse presto type ${sqlType}`);
       }
       if (sqlType === 'varchar') {
@@ -650,7 +644,7 @@ class TrinoPrestoSchemaParser extends TinyParser {
       } else if (sqlType === 'timezone' && this.peek().text === 'with') {
         this.nextText('with', 'time', 'zone');
       }
-      return def;
+      return typeDef;
     }
     throw this.parseError(
       `'${typToken.text}' unexpected while looking for a type`