@malloydata/db-duckdb 0.0.3 → 0.0.5

package/dist/duckdb_common.d.ts

@@ -1,7 +1,15 @@
 import { Connection, FetchSchemaAndRunSimultaneously, FetchSchemaAndRunStreamSimultaneously, MalloyQueryData, PersistSQLResults, PooledConnection, RunSQLOptions, SQLBlock, StreamingConnection, StructDef, QueryDataRow } from "@malloydata/malloy";
+export interface DuckDBQueryOptions {
+    rowLimit: number;
+}
+export declare type QueryOptionsReader = Partial<DuckDBQueryOptions> | (() => Partial<DuckDBQueryOptions>);
 export declare abstract class DuckDBCommon implements Connection, PersistSQLResults, StreamingConnection {
+    private queryOptions?;
+    static DEFAULT_QUERY_OPTIONS: DuckDBQueryOptions;
     readonly name: string;
     get dialectName(): string;
+    private readQueryOptions;
+    constructor(queryOptions?: QueryOptionsReader | undefined);
     isPool(): this is PooledConnection;
     canPersist(): this is PersistSQLResults;
     protected abstract setup(): Promise<void>;

package/dist/duckdb_common.js

@@ -26,12 +26,27 @@ const duckDBToMalloyTypes = {
     INTEGER: "number",
 };
 class DuckDBCommon {
-    constructor() {
+    constructor(queryOptions) {
+        this.queryOptions = queryOptions;
         this.name = "duckdb_common";
     }
     get dialectName() {
         return "duckdb";
     }
+    readQueryOptions() {
+        const options = DuckDBCommon.DEFAULT_QUERY_OPTIONS;
+        if (this.queryOptions) {
+            if (this.queryOptions instanceof Function) {
+                return { ...options, ...this.queryOptions() };
+            }
+            else {
+                return { ...options, ...this.queryOptions };
+            }
+        }
+        else {
+            return options;
+        }
+    }
     isPool() {
         return false;
     }
@@ -44,7 +59,8 @@ class DuckDBCommon {
     }
     async runSQL(sql, options = {}) {
         var _a;
-        const rowLimit = (_a = options.rowLimit) !== null && _a !== void 0 ? _a : 10;
+        const defaultOptions = this.readQueryOptions();
+        const rowLimit = (_a = options.rowLimit) !== null && _a !== void 0 ? _a : defaultOptions.rowLimit;
         const statements = sql.split("-- hack: split on this");
         while (statements.length > 1) {
             await this.runRawSQL(statements[0]);
@@ -268,4 +284,7 @@ class DuckDBCommon {
     }
 }
 exports.DuckDBCommon = DuckDBCommon;
+DuckDBCommon.DEFAULT_QUERY_OPTIONS = {
+    rowLimit: 10,
+};
 //# sourceMappingURL=duckdb_common.js.map

package/dist/duckdb_connection.d.ts

@@ -1,5 +1,5 @@
 /// <reference path="../src/duckdb.d.ts" />
-import { DuckDBCommon } from "./duckdb_common";
+import { DuckDBCommon, QueryOptionsReader } from "./duckdb_common";
 import { Database, Row } from "duckdb";
 import { QueryDataRow, RunSQLOptions } from "@malloydata/malloy";
 export declare class DuckDBConnection extends DuckDBCommon {
@@ -8,7 +8,7 @@ export declare class DuckDBConnection extends DuckDBCommon {
     protected connection: import("duckdb").Connection;
     protected database: Database;
     protected isSetup: boolean;
-    constructor(name: string, databasePath?: string, workingDirectory?: string);
+    constructor(name: string, databasePath?: string, workingDirectory?: string, queryOptions?: QueryOptionsReader);
     protected setup(): Promise<void>;
     protected runDuckDBQuery(sql: string): Promise<{
         rows: Row[];

package/dist/duckdb_connection.js

@@ -40,8 +40,8 @@ const crypto = __importStar(require("crypto"));
 const duckdb_common_1 = require("./duckdb_common");
 const duckdb_1 = require("duckdb");
 class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
-    constructor(name, databasePath = "test/data/duckdb/duckdb_test.db", workingDirectory = "/") {
-        super();
+    constructor(name, databasePath = "test/data/duckdb/duckdb_test.db", workingDirectory = "/", queryOptions) {
+        super(queryOptions);
         this.name = name;
         this.workingDirectory = workingDirectory;
         this.isSetup = false;

package/dist/duckdb_wasm_connection.d.ts

@@ -1,6 +1,6 @@
 import { QueryDataRow, RunSQLOptions } from "@malloydata/malloy";
 import * as duckdb from "@duckdb/duckdb-wasm";
-import { DuckDBCommon } from "./duckdb_common";
+import { DuckDBCommon, QueryOptionsReader } from "./duckdb_common";
 export declare class DuckDBWASMConnection extends DuckDBCommon {
     readonly name: string;
     private workingDirectory;
@@ -8,7 +8,7 @@ export declare class DuckDBWASMConnection extends DuckDBCommon {
     protected _connection: duckdb.AsyncDuckDBConnection | null;
     protected _database: duckdb.AsyncDuckDB | null;
     protected isSetup: boolean;
-    constructor(name: string, databasePath?: string, workingDirectory?: string);
+    constructor(name: string, databasePath?: string, workingDirectory?: string, queryOptions?: QueryOptionsReader);
     private init;
     get connection(): duckdb.AsyncDuckDBConnection | null;
     get database(): duckdb.AsyncDuckDB | null;

package/dist/duckdb_wasm_connection.js

@@ -90,8 +90,8 @@ const unwrapTable = (table) => {
     return table.toArray().map(unwrapRow);
 };
 class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
-    constructor(name, databasePath = "test/data/duckdb/duckdb_test.db", workingDirectory = "/") {
-        super();
+    constructor(name, databasePath = "test/data/duckdb/duckdb_test.db", workingDirectory = "/", queryOptions) {
+        super(queryOptions);
         this.name = name;
         this.workingDirectory = workingDirectory;
         this._connection = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,11 +14,12 @@
     "lint-fix": "eslint '**/*.ts{,x}' --fix",
     "test": "jest --config=../../jest.config.js",
     "build": "tsc --build",
-    "malloyc": "ts-node ../../scripts/malloy-to-json"
+    "malloyc": "ts-node ../../scripts/malloy-to-json",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.3",
     "@duckdb/duckdb-wasm": "^1.17.0",
+    "@malloydata/malloy": "^0.0.5",
     "duckdb": "0.5.1"
   }
 }