@malloydata/db-postgres 0.0.103-dev231115200636 → 0.0.103

package/dist/postgres_connection.d.ts

@@ -1,5 +1,5 @@
 import { Connection, MalloyQueryData, PersistSQLResults, PooledConnection, QueryDataRow, QueryRunStats, RunSQLOptions, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
-import { Client, Pool, QueryResult } from 'pg';
+import { Client, Pool } from 'pg';
 import { FetchSchemaOptions } from '@malloydata/malloy-interfaces';
 interface PostgresQueryConfiguration {
     rowLimit?: number;
@@ -18,7 +18,6 @@ export declare class PostgresConnection implements Connection, StreamingConnecti
     private queryConfigReader;
     private configReader;
     private readonly dialect;
-    private isSetup;
     private schemaCache;
     private sqlSchemaCache;
     constructor(name: string, queryConfigReader?: PostgresQueryConfigurationReader, configReader?: PostgresConnectionConfigurationReader);
@@ -45,13 +44,10 @@ export declare class PostgresConnection implements Connection, StreamingConnecti
     private getSQLBlockSchema;
     private schemaFromQuery;
     private getTableSchema;
-    executeSQLRaw(query: string): Promise<QueryResult>;
     test(): Promise<void>;
     connectionSetup(client: Client): Promise<void>;
     runSQL(sql: string, { rowLimit }?: RunSQLOptions, rowIndex?: number): Promise<MalloyQueryData>;
-    runSQLStream(sqlCommand: string, options?: {
-        rowLimit?: number;
-    }): AsyncIterableIterator<QueryDataRow>;
+    runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
     estimateQueryCost(_: string): Promise<QueryRunStats>;
     manifestTemporaryTable(sqlCommand: string): Promise<string>;
     close(): Promise<void>;
@@ -63,9 +59,7 @@ export declare class PooledPostgresConnection extends PostgresConnection impleme
     drain(): Promise<void>;
     getPool(): Promise<Pool>;
     protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean): Promise<MalloyQueryData>;
-    runSQLStream(sqlCommand: string, options?: {
-        rowLimit?: number;
-    }): AsyncIterableIterator<QueryDataRow>;
+    runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
     close(): Promise<void>;
 }
 export {};

package/dist/postgres_connection.js

@@ -67,7 +67,6 @@ class PostgresConnection {
         this.queryConfigReader = queryConfigReader;
         this.configReader = configReader;
         this.dialect = new malloy_1.PostgresDialect();
-        this.isSetup = false;
         this.schemaCache = new Map();
         this.sqlSchemaCache = new Map();
     }
@@ -286,15 +285,8 @@ class PostgresConnection {
         }
         return structDef;
     }
-    async executeSQLRaw(query) {
-        const client = await this.getClient();
-        await client.connect();
-        const results = await client.query(query);
-        await client.end();
-        return results;
-    }
     async test() {
-        await this.executeSQLRaw('SELECT 1');
+        await this.runSQL('SELECT 1');
     }
     async connectionSetup(client) {
         await client.query("SET TIME ZONE 'UTC'");
@@ -302,19 +294,19 @@ class PostgresConnection {
     async runSQL(sql, { rowLimit } = {}, rowIndex = 0) {
         var _a;
         const config = await this.readQueryConfig();
-        const the_return = await this.runPostgresQuery(sql, (_a = rowLimit !== null && rowLimit !== void 0 ? rowLimit : config.rowLimit) !== null && _a !== void 0 ? _a : DEFAULT_PAGE_SIZE, rowIndex, true);
-        return the_return;
+        return this.runPostgresQuery(sql, (_a = rowLimit !== null && rowLimit !== void 0 ? rowLimit : config.rowLimit) !== null && _a !== void 0 ? _a : DEFAULT_PAGE_SIZE, rowIndex, true);
     }
-    async *runSQLStream(sqlCommand, options) {
+    async *runSQLStream(sqlCommand, { rowLimit, abortSignal } = {}) {
         const query = new pg_query_stream_1.default(sqlCommand);
         const client = await this.getClient();
-        client.connect();
+        await client.connect();
         const rowStream = client.query(query);
         let index = 0;
         for await (const row of rowStream) {
             yield row.row;
             index += 1;
-            if ((options === null || options === void 0 ? void 0 : options.rowLimit) !== undefined && index >= options.rowLimit) {
+            if ((rowLimit !== undefined && index >= rowLimit) ||
+                (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)) {
                 query.destroy();
                 break;
             }
@@ -378,7 +370,7 @@ class PooledPostgresConnection extends PostgresConnection {
             totalRows: result.rows.length,
         };
     }
-    async *runSQLStream(sqlCommand, options) {
+    async *runSQLStream(sqlCommand, { rowLimit, abortSignal } = {}) {
         const query = new pg_query_stream_1.default(sqlCommand);
         let index = 0;
         // This is a strange hack... `this.pool.query(query)` seems to return the wrong
@@ -391,7 +383,8 @@ class PooledPostgresConnection extends PostgresConnection {
         for await (const row of resultStream) {
             yield row.row;
             index += 1;
-            if ((options === null || options === void 0 ? void 0 : options.rowLimit) !== undefined && index >= options.rowLimit) {
+            if ((rowLimit !== undefined && index >= rowLimit) ||
+                (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)) {
                 query.destroy();
                 break;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.103-dev231115200636",
+  "version": "0.0.103",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.103-dev231115200636",
-    "@malloydata/malloy-interfaces": "^0.0.103-dev231115200636",
+    "@malloydata/malloy": "^0.0.103",
+    "@malloydata/malloy-interfaces": "^0.0.103",
     "@types/pg": "^8.6.1",
     "pg": "^8.7.1",
     "pg-query-stream": "4.2.3"