@malloydata/db-trino 0.0.220-dev241204170603 → 0.0.220-dev241205182408

package/dist/trino_connection.d.ts

@@ -1,4 +1,4 @@
-import { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, TrinoDialect, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef } 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?: {
@@ -42,8 +42,8 @@ export declare abstract class TrinoPrestoConnection extends BaseConnection imple
     get supportsNesting(): boolean;
     manifestTemporaryTable(_sqlCommand: string): Promise<string>;
     unpackArray(data: unknown): unknown[];
-    convertRow(structDef: StructDef, rawRow: unknown): {};
-    convertNest(structDef: StructDef, _data: unknown): unknown[];
+    convertRow(fields: FieldDef[], rawRow: unknown): {};
+    convertNest(fields: FieldDef[], _data: unknown): unknown[];
     runSQL(sqlCommand: string, options?: RunSQLOptions, _rowIndex?: number): Promise<MalloyQueryData>;
     private resultRow;
     runSQLBlockAndFetchResultSchema(_sqlBlock: SQLSourceDef, _options?: RunSQLOptions): Promise<{

package/dist/trino_connection.js

@@ -146,20 +146,21 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
     unpackArray(data) {
         return data;
     }
-    convertRow(structDef, rawRow) {
+    convertRow(fields, rawRow) {
         var _a;
         const retRow = {};
         const row = this.unpackArray(rawRow);
-        for (let i = 0; i < structDef.fields.length; i++) {
-            const field = structDef.fields[i];
+        for (let i = 0; i < fields.length; i++) {
+            const field = fields[i];
             if (field.type === 'record') {
-                retRow[field.name] = this.convertRow(field, row[i]);
+                retRow[field.name] = this.convertRow(field.fields, row[i]);
             }
             else if ((0, malloy_1.isRepeatedRecord)(field)) {
-                retRow[field.name] = this.convertNest(field, row[i]);
+                retRow[field.name] = this.convertNest(field.fields, row[i]);
             }
             else if (field.type === 'array') {
-                retRow[field.name] = this.convertNest(field, row[i]);
+                // mtoy todo don't understand this line actually
+                retRow[field.name] = this.convertNest(field.fields.slice(0, 1), row[i]);
             }
             else {
                 retRow[field.name] = (_a = row[i]) !== null && _a !== void 0 ? _a : null;
@@ -168,12 +169,12 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
         //console.log(retRow);
         return retRow;
     }
-    convertNest(structDef, _data) {
+    convertNest(fields, _data) {
         const data = this.unpackArray(_data);
         const ret = [];
         const rows = (data === null || data === undefined ? [] : data);
         for (const row of rows) {
-            ret.push(this.convertRow(structDef, row));
+            ret.push(this.convertRow(fields, row));
         }
         return ret;
     }
@@ -202,13 +203,13 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
     }
     resultRow(colSchema, rawRow) {
         if (colSchema.type === 'record') {
-            return this.convertRow(colSchema, rawRow);
+            return this.convertRow(colSchema.fields, rawRow);
         }
-        else if (colSchema.type === 'array') {
+        else if ((0, malloy_1.isRepeatedRecordType)(colSchema)) {
+            return this.convertNest(colSchema.fields, rawRow);
+        }
+        else if ((0, malloy_1.isScalarArrayType)(colSchema)) {
             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));
@@ -295,10 +296,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
             if (innerType.type === 'record') {
                 const complexStruct = {
                     type: 'array',
-                    name,
                     elementTypeDef: { type: 'record_element' },
-                    dialect: this.dialectName,
-                    join: 'many',
                     fields: innerType.fields,
                 };
                 return complexStruct;
@@ -306,11 +304,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
             else {
                 const arrayStruct = {
                     type: 'array',
-                    name,
                     elementTypeDef: innerType,
-                    dialect: this.dialectName,
-                    join: 'many',
-                    fields: (0, malloy_1.arrayEachFields)(innerType),
                 };
                 return arrayStruct;
             }
@@ -322,9 +316,6 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
             const innerTypes = this.splitColumns(structMatch[3]);
             const recordType = {
                 type: 'record',
-                name,
-                dialect: this.dialectName,
-                join: 'one',
                 fields: [],
             };
             for (let innerType of innerTypes) {
@@ -340,7 +331,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
                     const innerName = parts[1].replace(/^"(.+(?="$))"$/, '$1');
                     const innerTrinoType = parts[2];
                     const innerMalloyType = this.malloyTypeFromTrinoType(innerName, innerTrinoType);
-                    recordType.fields.push({ ...innerMalloyType, name: innerName });
+                    recordType.fields.push((0, malloy_1.mkFieldDef)(innerMalloyType, innerName, this.dialectName));
                 }
             }
             return recordType;
@@ -353,7 +344,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
             const type = row[4] || row[1];
             const malloyType = this.malloyTypeFromTrinoType(name, type);
             // console.log('>', row, '\n<', malloyType);
-            structDef.fields.push({ name, ...malloyType });
+            structDef.fields.push((0, malloy_1.mkFieldDef)(malloyType, name, this.dialectName));
         }
     }
     async loadSchemaForSqlBlock(sqlBlock, structDef, element) {
@@ -489,7 +480,7 @@ class PrestoExplainParser extends malloy_1.TinyParser {
             const name = fieldNames[nameIndex];
             this.next('id', ':');
             const nextType = this.typeDef();
-            fields.push({ ...nextType, name });
+            fields.push((0, malloy_1.mkFieldDef)(nextType, name, this.dialect.name));
             const sep = this.next();
             if (sep.text === ',') {
                 continue;
@@ -514,7 +505,7 @@ class PrestoExplainParser extends malloy_1.TinyParser {
             for (;;) {
                 const name = this.next('quoted_name');
                 const getDef = this.typeDef();
-                fields.push({ ...getDef, name: name.text });
+                fields.push((0, malloy_1.mkFieldDef)(getDef, name.text, this.dialect.name));
                 const sep = this.next();
                 if (sep.text === ')') {
                     break;
@@ -525,9 +516,6 @@ class PrestoExplainParser extends malloy_1.TinyParser {
             }
             const def = {
                 type: 'record',
-                name: '',
-                join: 'one',
-                dialect: this.dialect.name,
                 fields,
             };
             return def;
@@ -535,15 +523,13 @@ class PrestoExplainParser extends malloy_1.TinyParser {
         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;
+            return elType.type === 'record'
+                ? {
+                    type: 'array',
+                    elementTypeDef: { type: 'record_element' },
+                    fields: elType.fields,
+                }
+                : { type: 'array', elementTypeDef: elType };
         }
         else if (typToken.type === 'id') {
             const sqlType = typToken.text;

package/dist/trino_connection.spec.js

@@ -22,7 +22,6 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const malloy_1 = require("@malloydata/malloy");
 const _1 = require(".");
 // array(varchar) is array
 const ARRAY_SCHEMA = 'array(integer)';
@@ -51,30 +50,20 @@ describe('Trino connection', () => {
     describe('schema parser', () => {
         it('parses arrays', () => {
             expect(connection.malloyTypeFromTrinoType('test', ARRAY_SCHEMA)).toEqual({
-                'name': 'test',
-                'type': 'array',
-                'dialect': 'trino',
-                'elementTypeDef': intType,
-                'join': 'many',
-                'fields': (0, malloy_1.arrayEachFields)(intType),
+                type: 'array',
+                elementTypeDef: intType,
             });
         });
         it('parses inline', () => {
             expect(connection.malloyTypeFromTrinoType('test', INLINE_SCHEMA)).toEqual({
-                'name': 'test',
                 'type': 'record',
-                'dialect': 'trino',
-                'join': 'one',
                 'fields': recordSchema,
             });
         });
         it('parses nested', () => {
             expect(connection.malloyTypeFromTrinoType('test', NESTED_SCHEMA)).toEqual({
-                'name': 'test',
                 'type': 'array',
                 'elementTypeDef': { type: 'record_element' },
-                'dialect': 'trino',
-                'join': 'many',
                 'fields': recordSchema,
             });
         });
@@ -83,11 +72,8 @@ describe('Trino connection', () => {
         });
         it('parses deep nesting', () => {
             expect(connection.malloyTypeFromTrinoType('test', DEEP_SCHEMA)).toEqual({
-                'name': 'test',
                 'type': 'array',
-                'dialect': 'trino',
                 'elementTypeDef': { type: 'record_element' },
-                'join': 'many',
                 'fields': [
                     { 'name': 'a', ...doubleType },
                     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.220-dev241204170603",
+  "version": "0.0.220-dev241205182408",
   "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-dev241204170603",
+    "@malloydata/malloy": "^0.0.220-dev241205182408",
     "@prestodb/presto-js-client": "^1.0.0",
     "gaxios": "^4.2.0",
     "trino-client": "^0.2.2"