@malloydata/db-trino 0.0.227 → 0.0.228-dev250116203644

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 export type { BaseRunner } from './trino_connection';
-export { PrestoConnection, PrestoExplainParser, TrinoConnection, TrinoPrestoConnection, } from './trino_connection';
+export { PrestoConnection, TrinoConnection, TrinoPrestoConnection, } from './trino_connection';
 export { TrinoExecutor } from './trino_executor';

package/dist/index.js

@@ -22,10 +22,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TrinoExecutor = exports.TrinoPrestoConnection = exports.TrinoConnection = exports.PrestoExplainParser = exports.PrestoConnection = void 0;
+exports.TrinoExecutor = exports.TrinoPrestoConnection = exports.TrinoConnection = exports.PrestoConnection = void 0;
 var trino_connection_1 = require("./trino_connection");
 Object.defineProperty(exports, "PrestoConnection", { enumerable: true, get: function () { return trino_connection_1.PrestoConnection; } });
-Object.defineProperty(exports, "PrestoExplainParser", { enumerable: true, get: function () { return trino_connection_1.PrestoExplainParser; } });
 Object.defineProperty(exports, "TrinoConnection", { enumerable: true, get: function () { return trino_connection_1.TrinoConnection; } });
 Object.defineProperty(exports, "TrinoPrestoConnection", { enumerable: true, get: function () { return trino_connection_1.TrinoPrestoConnection; } });
 var trino_executor_1 = require("./trino_executor");

package/dist/trino_connection.d.ts

@@ -1,4 +1,4 @@
-import { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, TrinoDialect, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef, Dialect, FieldDef, TinyParser } from '@malloydata/malloy';
+import { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, TrinoDialect, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef, FieldDef } from '@malloydata/malloy';
 import { BaseConnection } from '@malloydata/malloy/connection';
 export interface TrinoManagerOptions {
     credentials?: {
@@ -54,8 +54,7 @@ export declare abstract class TrinoPrestoConnection extends BaseConnection imple
     fetchSelectSchema(sqlRef: SQLSourceDef): Promise<SQLSourceDef>;
     protected abstract fillStructDefForSqlBlockSchema(sql: string, structDef: StructDef): Promise<void>;
     protected executeAndWait(sqlBlock: string): Promise<void>;
-    splitColumns(s: string): string[];
-    malloyTypeFromTrinoType(name: string, trinoType: string): AtomicTypeDef;
+    malloyTypeFromTrinoType(trinoType: string): AtomicTypeDef;
     structDefFromSchema(rows: string[][], structDef: StructDef): void;
     protected loadSchemaForSqlBlock(sqlBlock: string, structDef: StructDef, element: string): Promise<StructDef>;
     estimateQueryCost(_sqlCommand: string): Promise<QueryRunStats>;
@@ -75,21 +74,3 @@ export declare class TrinoConnection extends TrinoPrestoConnection {
     constructor(option: TrinoConnectionOptions, queryOptions?: QueryOptionsReader);
     protected fillStructDefForSqlBlockSchema(sql: string, structDef: StructDef): Promise<void>;
 }
-/**
- * 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)* ')'
- */
-export declare class PrestoExplainParser extends TinyParser {
-    readonly input: string;
-    readonly dialect: Dialect;
-    constructor(input: string, dialect: Dialect);
-    fieldNameList(): string[];
-    parseExplain(): FieldDef[];
-    typeDef(): AtomicTypeDef;
-}

package/dist/trino_connection.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrestoExplainParser = exports.TrinoConnection = exports.PrestoConnection = exports.TrinoPrestoConnection = void 0;
+exports.TrinoConnection = exports.PrestoConnection = exports.TrinoPrestoConnection = void 0;
 const malloy_1 = require("@malloydata/malloy");
 const connection_1 = require("@malloydata/malloy/connection");
 const presto_js_client_1 = require("@prestodb/presto-js-client");
@@ -182,7 +182,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
         }
         const inputRows = r.rows;
         const columns = r.columns;
-        const malloyColumns = columns.map(c => this.malloyTypeFromTrinoType(c.name, c.type));
+        const malloyColumns = columns.map(c => (0, malloy_1.mkFieldDef)(this.malloyTypeFromTrinoType(c.type), c.name));
         const malloyRows = [];
         const rows = inputRows !== null && inputRows !== void 0 ? inputRows : [];
         for (const row of rows) {
@@ -249,96 +249,15 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
         // TODO: make sure failure is handled correctly.
         //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) {
-        // Arrays look like `array(type)`
-        const arrayMatch = trinoType.match(/^(([^,])+\s)?array\((.*)\)$/);
-        // Structs look like `row(name type, name type)`
-        const structMatch = trinoType.match(/^(([^,])+\s)?row\((.*)\)$/);
-        if (arrayMatch) {
-            const arrayType = arrayMatch[3];
-            const innerType = this.malloyTypeFromTrinoType(name, arrayType);
-            if (innerType.type === 'record') {
-                const complexStruct = {
-                    type: 'array',
-                    elementTypeDef: { type: 'record_element' },
-                    fields: innerType.fields,
-                };
-                return complexStruct;
-            }
-            else {
-                const arrayStruct = {
-                    type: 'array',
-                    elementTypeDef: innerType,
-                };
-                return arrayStruct;
-            }
-        }
-        else if (structMatch) {
-            // 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 = this.splitColumns(structMatch[3]);
-            const recordType = {
-                type: 'record',
-                fields: [],
-            };
-            for (let innerType of innerTypes) {
-                // TODO: Handle time zone type annotation, which is an
-                // exception to the types not containing spaces assumption
-                innerType = innerType.replace(/ with time zone$/, '');
-                let parts = innerType.match(/^(.+?)\s((array\(|row\().*)$/);
-                if (parts === null) {
-                    parts = innerType.match(/^(.+)\s(\S+)$/);
-                }
-                if (parts) {
-                    // remove quotes from the name
-                    const innerName = parts[1].replace(/^"(.+(?="$))"$/, '$1');
-                    const innerTrinoType = parts[2];
-                    const innerMalloyType = this.malloyTypeFromTrinoType(innerName, innerTrinoType);
-                    recordType.fields.push((0, malloy_1.mkFieldDef)(innerMalloyType, innerName));
-                }
-            }
-            return recordType;
-        }
-        return this.dialect.sqlTypeToMalloyType(trinoType);
+    malloyTypeFromTrinoType(trinoType) {
+        const typeParse = new TrinoPrestoSchemaParser(trinoType, this.dialect);
+        return typeParse.typeDef();
     }
     structDefFromSchema(rows, structDef) {
         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 = (0, malloy_1.mkFieldDef)(this.malloyTypeFromTrinoType(type), name);
             structDef.fields.push((0, malloy_1.mkFieldDef)(malloyType, name));
         }
     }
@@ -408,8 +327,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.');
         }
-        const schemaDesc = new PrestoExplainParser(lines[0], this.dialect);
-        structDef.fields = schemaDesc.parseExplain();
+        const schemaDesc = new TrinoPrestoSchemaParser(lines[0], this.dialect);
+        structDef.fields = schemaDesc.parseQueryPlan();
     }
     unpackArray(data) {
         return JSON.parse(data);
@@ -428,23 +347,26 @@ class TrinoConnection extends TrinoPrestoConnection {
 }
 exports.TrinoConnection = TrinoConnection;
 /**
- * A hand built parser for schema lines, roughly this grammar
+ * A hand built parser for schema lines, it parses two things ...
+ * A presto query plan
  * SCHEMA_LINE: - Output [PlanName N] [NAME_LIST] => [TYPE_LIST]
  * NAME_LIST: NAME (, NAME)*
  * TYPE_LIST: TYPE_SPEC (, TYPE_SPEC)*
  * TYPE_SPEC: exprN ':' TYPE
+ *
+ * And a presto/trino 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 {
+class TrinoPrestoSchemaParser extends malloy_1.TinyParser {
     constructor(input, dialect) {
         super(input, {
             space: /^\s+/,
             arrow: /^=>/,
             char: /^[,:[\]()-]/,
             id: /^\w+/,
-            quoted_name: /^"\w+"/,
+            quoted_name: /^"(\\"|[^"])*"/,
         });
         this.input = input;
         this.dialect = dialect;
@@ -467,7 +389,7 @@ class PrestoExplainParser extends malloy_1.TinyParser {
         }
         return fieldNames;
     }
-    parseExplain() {
+    parseQueryPlan() {
         const fieldNames = this.fieldNameList();
         const fields = [];
         this.next('arrow', '[');
@@ -498,7 +420,10 @@ class PrestoExplainParser extends malloy_1.TinyParser {
         else if (typToken.text === 'row' && this.next('(')) {
             const fields = [];
             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, got '${name.type}'`);
+                }
                 const getDef = this.typeDef();
                 fields.push((0, malloy_1.mkFieldDef)(getDef, name.text));
                 const sep = this.next();
@@ -527,20 +452,38 @@ class PrestoExplainParser extends malloy_1.TinyParser {
                 : { type: 'array', elementTypeDef: elType };
         }
         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}`);
-            }
+            const sqlType = typToken.text.toLowerCase();
             if (sqlType === 'varchar') {
                 if (this.peek().type === '(') {
                     this.next('(', 'id', ')');
                 }
             }
-            return def;
+            else if (sqlType === 'timestamp') {
+                if (this.peek().text === '(') {
+                    this.next('(', 'id', ')');
+                }
+                if (this.peek().text === 'with') {
+                    this.nextText('with', 'time', 'zone');
+                }
+            }
+            const typeDef = this.dialect.sqlTypeToMalloyType(sqlType);
+            if (typeDef.type === 'number' && sqlType === 'decimal') {
+                this.next('(', 'id');
+                if (this.peek().type === ',') {
+                    this.next(',', 'id');
+                    typeDef.numberType = 'float';
+                }
+                else {
+                    typeDef.numberType = 'integer';
+                }
+                this.next(')');
+            }
+            if (typeDef === undefined) {
+                throw this.parseError(`Can't parse presto type ${sqlType}`);
+            }
+            return typeDef;
         }
         throw this.parseError(`'${typToken.text}' unexpected while looking for a type`);
     }
 }
-exports.PrestoExplainParser = PrestoExplainParser;
 //# sourceMappingURL=trino_connection.js.map

package/dist/trino_connection.spec.js

@@ -49,29 +49,47 @@ 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({
+            expect(connection.malloyTypeFromTrinoType(INLINE_SCHEMA)).toEqual({
                 'type': 'record',
                 'fields': recordSchema,
             });
         });
         it('parses nested', () => {
-            expect(connection.malloyTypeFromTrinoType('test', NESTED_SCHEMA)).toEqual({
+            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(stringType);
+            expect(connection.malloyTypeFromTrinoType('varchar(60)')).toEqual(stringType);
+        });
+        it('parses a decimal integer type', () => {
+            expect(connection.malloyTypeFromTrinoType('decimal(10)')).toEqual({
+                type: 'number',
+                numberType: 'integer',
+            });
+        });
+        it('parses a decimal float type', () => {
+            expect(connection.malloyTypeFromTrinoType('decimal(10,10)')).toEqual({
+                type: 'number',
+                numberType: 'float',
+            });
+        });
+        it('parses row with timestamp(3)', () => {
+            expect(connection.malloyTypeFromTrinoType('row(la_time timestamp(3))')).toEqual({
+                type: 'record',
+                fields: [{ name: 'la_time', type: 'timestamp' }],
+            });
         });
         it('parses deep nesting', () => {
-            expect(connection.malloyTypeFromTrinoType('test', DEEP_SCHEMA)).toEqual({
+            expect(connection.malloyTypeFromTrinoType(DEEP_SCHEMA)).toEqual({
                 'type': 'array',
                 'elementTypeDef': { type: 'record_element' },
                 'fields': [
@@ -90,15 +108,5 @@ 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.227",
+  "version": "0.0.228-dev250116203644",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.227",
+    "@malloydata/malloy": "^0.0.228-dev250116203644",
     "@prestodb/presto-js-client": "^1.0.0",
     "gaxios": "^4.2.0",
     "trino-client": "^0.2.2"