@malloydata/db-duckdb 0.0.239-dev250226183425 → 0.0.239-dev250227145856

package/dist/duckdb.spec.js

@@ -194,11 +194,7 @@ const makeStructDef = () => {
 //
 // Uses string value for table
 const SQL_BLOCK_1 = {
-    type: 'sql_select',
-    name: 'block1',
-    dialect: 'duckdb',
     connection: 'duckdb',
-    fields: [],
     selectStr: `
 SELECT
 created_at,
@@ -215,11 +211,7 @@ FROM "inventory_items.parquet"
 };
 // Uses read_parquet() for table
 const SQL_BLOCK_2 = {
-    type: 'sql_select',
-    name: 'block2',
-    dialect: 'duckdb',
     connection: 'duckdb',
-    fields: [],
     selectStr: `
 SELECT
 created_at,

package/dist/duckdb_common.d.ts

@@ -1,4 +1,4 @@
-import { MalloyQueryData, PersistSQLResults, PooledConnection, QueryDataRow, QueryOptionsReader, QueryRunStats, RunSQLOptions, StreamingConnection, StructDef, TestableConnection, SQLSourceDef, TableSourceDef } from '@malloydata/malloy';
+import { MalloyQueryData, PersistSQLResults, PooledConnection, QueryDataRow, QueryOptionsReader, QueryRunStats, RunSQLOptions, StreamingConnection, StructDef, TestableConnection, SQLSourceDef, TableSourceDef, SQLSourceRequest } from '@malloydata/malloy';
 import { BaseConnection } from '@malloydata/malloy/connection';
 export interface DuckDBQueryOptions {
     rowLimit: number;
@@ -26,7 +26,7 @@ export declare abstract class DuckDBCommon extends BaseConnection implements Tes
     }>;
     runSQL(sql: string, options?: RunSQLOptions): Promise<MalloyQueryData>;
     abstract runSQLStream(sql: string, options: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
-    fetchSelectSchema(sqlRef: SQLSourceDef): Promise<SQLSourceDef | string>;
+    fetchSelectSchema(sqlRef: SQLSourceRequest): Promise<SQLSourceDef | string>;
     estimateQueryCost(_: string): Promise<QueryRunStats>;
     fillStructDefFromTypeMap(structDef: StructDef, typeMap: {
         [name: string]: string;

package/dist/duckdb_common.js

@@ -84,7 +84,13 @@ class DuckDBCommon extends connection_1.BaseConnection {
         return { rows: result, totalRows: result.length };
     }
     async fetchSelectSchema(sqlRef) {
-        const sqlDef = { ...sqlRef };
+        const sqlDef = {
+            type: 'sql_select',
+            ...sqlRef,
+            dialect: this.dialectName,
+            fields: [],
+            name: (0, malloy_1.sqlKey)(sqlRef.connection, sqlRef.selectStr),
+        };
         await this.schemaFromQuery(`DESCRIBE SELECT * FROM (${sqlRef.selectStr})`, sqlDef);
         return sqlDef;
     }

package/dist/duckdb_wasm_connection.d.ts

@@ -1,5 +1,5 @@
 import * as duckdb from '@duckdb/duckdb-wasm';
-import { FetchSchemaOptions, QueryDataRow, QueryOptionsReader, RunSQLOptions, SQLSourceDef, ConnectionConfig, TableSourceDef } from '@malloydata/malloy';
+import { FetchSchemaOptions, QueryDataRow, QueryOptionsReader, RunSQLOptions, SQLSourceDef, ConnectionConfig, TableSourceDef, SQLSourceRequest } from '@malloydata/malloy';
 import { StructRow } from 'apache-arrow';
 import { DuckDBCommon } from './duckdb_common';
 /**
@@ -53,7 +53,7 @@ export declare abstract class DuckDBWASMConnection extends DuckDBCommon {
     }>;
     runSQLStream(sql: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
     private findTables;
-    fetchSchemaForSQLStruct(sqlRef: SQLSourceDef, options: FetchSchemaOptions): Promise<{
+    fetchSchemaForSQLStruct(sqlRef: SQLSourceRequest, options: FetchSchemaOptions): Promise<{
         structDef: SQLSourceDef;
         error?: undefined;
     } | {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.239-dev250226183425",
+  "version": "0.0.239-dev250227145856",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "1.29.0",
-    "@malloydata/malloy": "^0.0.239-dev250226183425",
+    "@malloydata/malloy": "^0.0.239-dev250227145856",
     "@motherduck/wasm-client": "^0.6.6",
     "apache-arrow": "^17.0.0",
     "duckdb": "1.1.1",