@malloydata/db-duckdb 0.0.80-dev230822210650 → 0.0.80-dev230824170739

package/dist/duckdb_common.d.ts

@@ -5,6 +5,7 @@ export interface DuckDBQueryOptions {
 export type QueryOptionsReader = Partial<DuckDBQueryOptions> | (() => Partial<DuckDBQueryOptions>);
 export declare abstract class DuckDBCommon implements TestableConnection, PersistSQLResults, StreamingConnection {
     private queryOptions?;
+    private readonly dialect;
     static DEFAULT_QUERY_OPTIONS: DuckDBQueryOptions;
     private schemaCache;
     private sqlSchemaCache;

package/dist/duckdb_common.js

@@ -23,24 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuckDBCommon = void 0;
-const duckDBToMalloyTypes = {
-    'BIGINT': 'number',
-    'INTEGER': 'number',
-    'TINYINT': 'number',
-    'SMALLINT': 'number',
-    'UBIGINT': 'number',
-    'UINTEGER': 'number',
-    'UTINYINT': 'number',
-    'USMALLINT': 'number',
-    'HUGEINT': 'number',
-    'DOUBLE': 'number',
-    'VARCHAR': 'string',
-    'DATE': 'date',
-    'TIMESTAMP': 'timestamp',
-    'TIME': 'string',
-    'DECIMAL': 'number',
-    'BOOLEAN': 'boolean',
-};
+const malloy_1 = require("@malloydata/malloy");
 const unquoteName = (name) => {
     const match = /^"(.*)"$/.exec(name);
     if (match) {
@@ -68,6 +51,7 @@ class DuckDBCommon {
     }
     constructor(queryOptions) {
         this.queryOptions = queryOptions;
+        this.dialect = new malloy_1.DuckDBDialect();
         this.schemaCache = new Map();
         this.sqlSchemaCache = new Map();
         this.name = 'duckdb_common';
@@ -183,7 +167,7 @@ class DuckDBCommon {
             const name = unquoteName(fieldName);
             // Remove DECIMAL(x,y) precision to simplify lookup
             duckDBType = duckDBType.replace(/^DECIMAL\(\d+,\d+\)/g, 'DECIMAL');
-            let malloyType = duckDBToMalloyTypes[duckDBType];
+            let malloyType = this.dialect.sqlTypeToMalloyType(duckDBType);
             const arrayMatch = duckDBType.match(/(?<duckDBType>.*)\[\]$/);
             if (arrayMatch && arrayMatch.groups) {
                 duckDBType = arrayMatch.groups['duckDBType'];
@@ -208,7 +192,7 @@ class DuckDBCommon {
             }
             else {
                 if (arrayMatch) {
-                    malloyType = duckDBToMalloyTypes[duckDBType];
+                    malloyType = this.dialect.sqlTypeToMalloyType(duckDBType);
                     const innerStructDef = {
                         type: 'struct',
                         name,
@@ -219,13 +203,13 @@ class DuckDBCommon {
                             field: name,
                             isArray: true,
                         },
-                        fields: [{ type: malloyType, name: 'value' }],
+                        fields: [{ ...malloyType, name: 'value' }],
                     };
                     structDef.fields.push(innerStructDef);
                 }
                 else {
                     if (malloyType) {
-                        structDef.fields.push({ type: malloyType, name });
+                        structDef.fields.push({ ...malloyType, name });
                     }
                     else {
                         structDef.fields.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.80-dev230822210650",
+  "version": "0.0.80-dev230824170739",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@malloydata/duckdb-wasm": "0.0.2",
-    "@malloydata/malloy": "^0.0.80-dev230822210650",
+    "@malloydata/malloy": "^0.0.80-dev230824170739",
     "apache-arrow": "^11.0.0",
     "duckdb": "0.8.1",
     "web-worker": "^1.2.0"