@malloydata/db-duckdb 0.0.138-dev240404233606 → 0.0.138-dev240405003346

package/dist/duckdb.spec.js

@@ -101,7 +101,116 @@ describe('DuckDBConnection', () => {
             await connection2.close();
         });
     });
+    describe('schema parser', () => {
+        it('parses arrays', () => {
+            const structDef = makeStructDef();
+            connection.fillStructDefFromTypeMap(structDef, { test: ARRAY_SCHEMA });
+            expect(structDef.fields[0]).toEqual({
+                'name': 'test',
+                'type': 'struct',
+                'dialect': 'duckdb',
+                'structRelationship': {
+                    'fieldName': 'test',
+                    'isArray': true,
+                    'type': 'nested',
+                },
+                'structSource': {
+                    'type': 'nested',
+                },
+                'fields': [
+                    {
+                        'name': 'value',
+                        'type': 'number',
+                        'numberType': 'integer',
+                    },
+                ],
+            });
+        });
+        it('parses inline', () => {
+            const structDef = makeStructDef();
+            connection.fillStructDefFromTypeMap(structDef, { test: INLINE_SCHEMA });
+            expect(structDef.fields[0]).toEqual({
+                'name': 'test',
+                'type': 'struct',
+                'dialect': 'duckdb',
+                'structRelationship': {
+                    'type': 'inline',
+                },
+                'structSource': {
+                    'type': 'inline',
+                },
+                'fields': [
+                    {
+                        'name': 'a',
+                        'type': 'number',
+                        'numberType': 'float',
+                    },
+                    {
+                        'name': 'b',
+                        'type': 'number',
+                        'numberType': 'integer',
+                    },
+                    {
+                        'name': 'c',
+                        'type': 'string',
+                    },
+                ],
+            });
+        });
+        it('parses nested', () => {
+            const structDef = makeStructDef();
+            connection.fillStructDefFromTypeMap(structDef, { test: NESTED_SCHEMA });
+            expect(structDef.fields[0]).toEqual({
+                'name': 'test',
+                'type': 'struct',
+                'dialect': 'duckdb',
+                'structRelationship': {
+                    'fieldName': 'test',
+                    'isArray': false,
+                    'type': 'nested',
+                },
+                'structSource': { 'type': 'nested' },
+                'fields': [
+                    { 'name': 'a', 'numberType': 'float', 'type': 'number' },
+                    { 'name': 'b', 'numberType': 'integer', 'type': 'number' },
+                    { 'name': 'c', 'type': 'string' },
+                ],
+            });
+        });
+        it('parses a simple type', () => {
+            const structDef = makeStructDef();
+            connection.fillStructDefFromTypeMap(structDef, { test: 'varchar(60)' });
+            expect(structDef.fields[0]).toEqual({
+                'name': 'test',
+                'type': 'string',
+            });
+        });
+    });
 });
+/**
+ * Create a basic StructDef for the purpose of passing to
+ * DuckDBConnection.fillStructDefFromTypeMap()
+ *
+ * @returns valid StructDef for testing
+ */
+const makeStructDef = () => {
+    return {
+        type: 'struct',
+        name: 'test',
+        dialect: 'duckdb',
+        structSource: { type: 'table', tablePath: 'test' },
+        structRelationship: {
+            type: 'basetable',
+            connectionName: 'duckdb',
+        },
+        fields: [],
+    };
+};
+//
+// SQL blocks for testing table name detection in
+// DuckDBConnection.fetchSchemaForSQLBlock()
+//
+// Uses string value for table
 const SQL_BLOCK_1 = {
     type: 'sqlBlock',
     name: 'block1',
@@ -119,6 +228,7 @@ created_at AS inventory_items_created_at
 FROM "inventory_items.parquet"
 `,
 };
+// Uses read_parquet() for table
 const SQL_BLOCK_2 = {
     type: 'sqlBlock',
     name: 'block2',
@@ -136,4 +246,13 @@ created_at AS inventory_items_created_at
 FROM read_parquet("inventory_items2.parquet")
 `,
 };
+//
+// Type strings for testing DuckDBConnection.fillStructDefFromTypeMap()
+//
+// 'integer[]' is array
+const ARRAY_SCHEMA = 'integer[]';
+// STRUCT(...) is inline
+const INLINE_SCHEMA = 'STRUCT(a double, b integer, c varchar(60))';
+// STRUCT(....)[] is nested
+const NESTED_SCHEMA = 'STRUCT(a double, b integer, c varchar(60))[]';
 //# sourceMappingURL=duckdb.spec.js.map

package/dist/duckdb_common.d.ts

@@ -41,7 +41,9 @@ export declare abstract class DuckDBCommon implements TestableConnection, Persis
      */
     private splitColumns;
     private stringToTypeMap;
-    private fillStructDefFromTypeMap;
+    fillStructDefFromTypeMap(structDef: StructDef, typeMap: {
+        [name: string]: string;
+    }): void;
     private schemaFromQuery;
     fetchSchemaForSQLBlock(sqlRef: SQLBlock, { refreshTimestamp }: FetchSchemaOptions): Promise<{
         structDef: StructDef;

package/dist/duckdb_common.js

@@ -181,11 +181,15 @@ class DuckDBCommon {
                     name,
                     dialect: this.dialectName,
                     structSource: { type: arrayMatch ? 'nested' : 'inline' },
-                    structRelationship: {
-                        type: arrayMatch ? 'nested' : 'inline',
-                        fieldName: name,
-                        isArray: false,
-                    },
+                    structRelationship: arrayMatch
+                        ? {
+                            type: 'nested',
+                            fieldName: name,
+                            isArray: false,
+                        }
+                        : {
+                            type: 'inline',
+                        },
                     fields: [],
                 };
                 this.fillStructDefFromTypeMap(innerStructDef, newTypeMap);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.138-dev240404233606",
+  "version": "0.0.138-dev240405003346",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "1.28.1-dev106.0",
-    "@malloydata/malloy": "^0.0.138-dev240404233606",
+    "@malloydata/malloy": "^0.0.138-dev240405003346",
     "@motherduck/wasm-client": "^0.4.0",
     "apache-arrow": "^14.0.0",
     "duckdb": "0.9.2",