@malloydata/db-postgres 0.0.424 → 0.0.426

package/dist/postgres_connection.d.ts

@@ -82,8 +82,8 @@ export declare class PostgresConnection extends BaseConnection implements Connec
     fetchTableSchema(tableKey: string, tablePath: string): Promise<TableSourceDef | string>;
     test(): Promise<void>;
     connectionSetup(client: Client): Promise<void>;
-    runSQL(sql: string, { rowLimit }?: RunSQLOptions, rowIndex?: number): Promise<MalloyQueryData>;
-    runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryRecord>;
+    runSQL(sql: string, options?: RunSQLOptions, rowIndex?: number): Promise<MalloyQueryData>;
+    runSQLStream(sqlCommand: string, options?: RunSQLOptions): AsyncIterableIterator<QueryRecord>;
     estimateQueryCost(_: string): Promise<QueryRunStats>;
     manifestTemporaryTable(sqlCommand: string): Promise<string>;
     close(): Promise<void>;
@@ -96,7 +96,7 @@ export declare class PooledPostgresConnection extends PostgresConnection impleme
     drain(): Promise<void>;
     getPool(): Promise<Pool>;
     protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean, values?: unknown[]): Promise<MalloyQueryData>;
-    runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryRecord>;
+    runSQLStream(sqlCommand: string, options?: RunSQLOptions): AsyncIterableIterator<QueryRecord>;
     close(): Promise<void>;
 }
 export {};

package/dist/postgres_connection.js

@@ -319,13 +319,14 @@ class PostgresConnection extends connection_1.BaseConnection {
             }
         }
     }
-    async runSQL(sql, { rowLimit } = {}, rowIndex = 0) {
-        var _a;
+    async runSQL(sql, options = {}, rowIndex = 0) {
+        var _a, _b;
         const config = await this.readQueryConfig();
-        return this.runPostgresQuery(sql, (_a = rowLimit !== null && rowLimit !== void 0 ? rowLimit : config.rowLimit) !== null && _a !== void 0 ? _a : DEFAULT_PAGE_SIZE, rowIndex, true);
+        return this.runPostgresQuery(this.sqlWithQueryMetadata(sql, options.queryMetadata), (_b = (_a = options.rowLimit) !== null && _a !== void 0 ? _a : config.rowLimit) !== null && _b !== void 0 ? _b : DEFAULT_PAGE_SIZE, rowIndex, true);
     }
-    async *runSQLStream(sqlCommand, { rowLimit, abortSignal } = {}) {
-        const query = new pg_query_stream_1.default(sqlCommand);
+    async *runSQLStream(sqlCommand, options = {}) {
+        const { rowLimit, abortSignal } = options;
+        const query = new pg_query_stream_1.default(this.sqlWithQueryMetadata(sqlCommand, options.queryMetadata));
         const client = await this.getClient();
         await this.withTlsHint(() => client.connect());
         await this.connectionSetup(client);
@@ -407,8 +408,9 @@ class PooledPostgresConnection extends PostgresConnection {
             totalRows: result.rows.length,
         };
     }
-    async *runSQLStream(sqlCommand, { rowLimit, abortSignal } = {}) {
-        const query = new pg_query_stream_1.default(sqlCommand);
+    async *runSQLStream(sqlCommand, options = {}) {
+        const { rowLimit, abortSignal } = options;
+        const query = new pg_query_stream_1.default(this.sqlWithQueryMetadata(sqlCommand, options.queryMetadata));
         let index = 0;
         // This is a strange hack... `this.pool.query(query)` seems to return the wrong
         // type. Because `query` is a `QueryStream`, the result is supposed to be a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.424",
+  "version": "0.0.426",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.424",
+    "@malloydata/malloy": "0.0.426",
     "@types/pg": "^8.6.1",
     "pg": "8.7.3",
     "pg-query-stream": "4.2.3"