@malloydata/db-trino 0.0.220-dev241203204946 → 0.0.220-dev241205013400

package/dist/trino_connection.d.ts

@@ -1,4 +1,4 @@
-import { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef } from '@malloydata/malloy';
+import { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, TrinoDialect, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef } from '@malloydata/malloy';
 import { BaseConnection } from '@malloydata/malloy/connection';
 export interface TrinoManagerOptions {
     credentials?: {
@@ -31,7 +31,7 @@ export interface BaseRunner {
 }
 export declare abstract class TrinoPrestoConnection extends BaseConnection implements Connection, PersistSQLResults {
     name: string;
-    private readonly dialect;
+    protected readonly dialect: TrinoDialect;
     static DEFAULT_QUERY_OPTIONS: RunSQLOptions;
     private queryOptions?;
     private client;
@@ -45,6 +45,7 @@ export declare abstract class TrinoPrestoConnection extends BaseConnection imple
     convertRow(structDef: StructDef, rawRow: unknown): {};
     convertNest(structDef: StructDef, _data: unknown): unknown[];
     runSQL(sqlCommand: string, options?: RunSQLOptions, _rowIndex?: number): Promise<MalloyQueryData>;
+    private resultRow;
     runSQLBlockAndFetchResultSchema(_sqlBlock: SQLSourceDef, _options?: RunSQLOptions): Promise<{
         data: MalloyQueryData;
         schema: StructDef;

package/dist/trino_connection.js

@@ -194,30 +194,39 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
             for (let i = 0; i < columns.length; i++) {
                 const column = columns[i];
                 const schemaColumn = malloyColumns[i];
-                if (schemaColumn.type === 'record') {
-                    malloyRow[column.name] = this.convertRow(schemaColumn, row[i]);
-                }
-                else if (schemaColumn.type === 'array') {
-                    malloyRow[column.name] = this.convertNest(schemaColumn, row[i]);
-                }
-                else if (schemaColumn.type === 'number' &&
-                    typeof row[i] === 'string') {
-                    // decimal numbers come back as strings
-                    malloyRow[column.name] = Number(row[i]);
-                }
-                else if (schemaColumn.type === 'timestamp' &&
-                    typeof row[i] === 'string') {
-                    // timestamps come back as strings
-                    malloyRow[column.name] = new Date(row[i]);
-                }
-                else {
-                    malloyRow[column.name] = row[i];
-                }
+                malloyRow[column.name] = this.resultRow(schemaColumn, row[i]);
             }
             malloyRows.push(malloyRow);
         }
         return { rows: malloyRows, totalRows: malloyRows.length };
     }
+    resultRow(colSchema, rawRow) {
+        if (colSchema.type === 'record') {
+            return this.convertRow(colSchema, rawRow);
+        }
+        else if (colSchema.type === 'array') {
+            const elType = colSchema.elementTypeDef;
+            if (elType.type === 'record_element') {
+                return this.convertNest(colSchema, rawRow);
+            }
+            let theArray = this.unpackArray(rawRow);
+            if (elType.type === 'array') {
+                theArray = theArray.map(el => this.resultRow(elType, el));
+            }
+            return theArray;
+        }
+        else if (colSchema.type === 'number' && typeof rawRow === 'string') {
+            // decimal numbers come back as strings
+            return Number(rawRow);
+        }
+        else if (colSchema.type === 'timestamp' && typeof rawRow === 'string') {
+            // timestamps come back as strings
+            return new Date(rawRow);
+        }
+        else {
+            return rawRow;
+        }
+    }
     async runSQLBlockAndFetchResultSchema(_sqlBlock, _options) {
         throw new Error('Not implemented 3');
     }
@@ -413,32 +422,8 @@ class PrestoConnection extends TrinoPrestoConnection {
         if ((lines === null || lines === void 0 ? void 0 : lines.length) === 0) {
             throw new Error('Received invalid explain result when trying to fetch schema.');
         }
-        let outputLine = lines[0];
-        const namesIndex = outputLine.indexOf('][');
-        outputLine = outputLine.substring(namesIndex + 2);
-        const lineParts = outputLine.split('] => [');
-        if (lineParts.length !== 2) {
-            throw new Error('There was a problem parsing schema from Explain.');
-        }
-        const fieldNamesPart = lineParts[0];
-        const fieldNames = fieldNamesPart.split(',').map(e => e.trim());
-        let schemaData = lineParts[1];
-        schemaData = schemaData.substring(0, schemaData.length - 1);
-        const rawFieldsTarget = schemaData
-            .split(',')
-            .map(e => e.trim())
-            .map(e => e.split(':'));
-        if (rawFieldsTarget.length !== fieldNames.length) {
-            throw new Error('There was a problem parsing schema from Explain. Field names size do not match target fields with types.');
-        }
-        for (let index = 0; index < fieldNames.length; index++) {
-            const name = fieldNames[index];
-            const type = rawFieldsTarget[index][1];
-            structDef.fields.push({
-                name,
-                ...this.malloyTypeFromTrinoType(name, type),
-            });
-        }
+        const schemaDesc = new PrestoExplainParser(lines[0], this.dialect);
+        structDef.fields = schemaDesc.parseExplain();
     }
     unpackArray(data) {
         return JSON.parse(data);
@@ -456,4 +441,124 @@ class TrinoConnection extends TrinoPrestoConnection {
     }
 }
 exports.TrinoConnection = TrinoConnection;
+/**
+ * A hand built parser for schema lines, roughly this grammar
+ * SCHEMA_LINE: - Output [PlanName N] [NAME_LIST] => [TYPE_LIST]
+ * NAME_LIST: NAME (, NAME)*
+ * TYPE_LIST: TYPE_SPEC (, TYPE_SPEC)*
+ * TYPE_SPEC: exprN ':' TYPE
+ * TYPE: REC_TYPE | ARRAY_TYPE | SQL_TYPE
+ * ARRAY_TYPE: ARRAY '(' TYPE ')'
+ * REC_TYPE: REC '(' "name" TYPE (, "name" TYPE)* ')'
+ */
+class PrestoExplainParser extends malloy_1.TinyParser {
+    constructor(input, dialect) {
+        super(input, {
+            space: /^\s+/,
+            arrow: /^=>/,
+            char: /^[,:[\]()-]/,
+            id: /^\w+/,
+            quoted_name: /^"\w+"/,
+        });
+        this.input = input;
+        this.dialect = dialect;
+    }
+    fieldNameList() {
+        this.skipTo(']'); // Skip to end of plan
+        this.next('['); // Expect start of name list
+        const fieldNames = [];
+        for (;;) {
+            const nmToken = this.next('id');
+            fieldNames.push(nmToken.text);
+            const sep = this.next();
+            if (sep.type === ',') {
+                continue;
+            }
+            if (sep.type !== ']') {
+                throw this.parseError(`Unexpected '${sep.text}' while getting field name list`);
+            }
+            break;
+        }
+        return fieldNames;
+    }
+    parseExplain() {
+        const fieldNames = this.fieldNameList();
+        const fields = [];
+        this.next('arrow', '[');
+        for (let nameIndex = 0;; nameIndex += 1) {
+            const name = fieldNames[nameIndex];
+            this.next('id', ':');
+            const nextType = this.typeDef();
+            fields.push({ ...nextType, name });
+            const sep = this.next();
+            if (sep.text === ',') {
+                continue;
+            }
+            if (sep.text !== ']') {
+                throw this.parseError(`Unexpected '${sep.text}' between field types`);
+            }
+            break;
+        }
+        if (fields.length !== fieldNames.length) {
+            throw new Error(`Presto schema error mismatched ${fields.length} types and ${fieldNames.length} fields`);
+        }
+        return fields;
+    }
+    typeDef() {
+        const typToken = this.next();
+        if (typToken.type === 'eof') {
+            throw this.parseError('Unexpected EOF parsing type, expected a type name');
+        }
+        else if (typToken.text === 'row' && this.next('(')) {
+            const fields = [];
+            for (;;) {
+                const name = this.next('quoted_name');
+                const getDef = this.typeDef();
+                fields.push({ ...getDef, name: name.text });
+                const sep = this.next();
+                if (sep.text === ')') {
+                    break;
+                }
+                if (sep.text === ',') {
+                    continue;
+                }
+            }
+            const def = {
+                type: 'record',
+                name: '',
+                join: 'one',
+                dialect: this.dialect.name,
+                fields,
+            };
+            return def;
+        }
+        else if (typToken.text === 'array' && this.next('(')) {
+            const elType = this.typeDef();
+            this.next(')');
+            const def = {
+                type: 'array',
+                name: '',
+                dialect: this.dialect.name,
+                join: 'many',
+                elementTypeDef: elType.type === 'record' ? { type: 'record_element' } : elType,
+                fields: elType.type === 'record' ? elType.fields : (0, malloy_1.arrayEachFields)(elType),
+            };
+            return def;
+        }
+        else if (typToken.type === 'id') {
+            const sqlType = typToken.text;
+            const def = this.dialect.sqlTypeToMalloyType(sqlType);
+            if (def === undefined) {
+                throw this.parseError(`Can't parse presto type ${sqlType}`);
+            }
+            if (sqlType === 'varchar') {
+                if (this.peek().type === '(') {
+                    this.next('(', 'id', ')');
+                }
+            }
+            return def;
+        }
+        throw this.parseError(`'${typToken.text}' unexpected while looking for a type`);
+    }
+}
 //# sourceMappingURL=trino_connection.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.220-dev241203204946",
+  "version": "0.0.220-dev241205013400",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.220-dev241203204946",
+    "@malloydata/malloy": "^0.0.220-dev241205013400",
     "@prestodb/presto-js-client": "^1.0.0",
     "gaxios": "^4.2.0",
     "trino-client": "^0.2.2"