@malloydata/db-postgres 0.0.120-dev240131223846 → 0.0.121-dev240201150428

package/dist/postgres_connection.d.ts

@@ -1,9 +1,5 @@
-import { Connection, FetchSchemaOptions, MalloyQueryData, PersistSQLResults, PooledConnection, QueryDataRow, QueryRunStats, RunSQLOptions, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
+import { Connection, ConnectionConfig, FetchSchemaOptions, MalloyQueryData, PersistSQLResults, PooledConnection, QueryDataRow, QueryOptionsReader, QueryRunStats, RunSQLOptions, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
 import { Client, Pool } from 'pg';
-interface PostgresQueryConfiguration {
-    rowLimit?: number;
-}
-type PostgresQueryConfigurationReader = PostgresQueryConfiguration | (() => PostgresQueryConfiguration) | (() => Promise<PostgresQueryConfiguration>);
 interface PostgresConnectionConfiguration {
     host?: string;
     port?: number;
@@ -13,14 +9,17 @@ interface PostgresConnectionConfiguration {
     connectionString?: string;
 }
 type PostgresConnectionConfigurationReader = PostgresConnectionConfiguration | (() => Promise<PostgresConnectionConfiguration>);
+export interface PostgresConnectionOptions extends ConnectionConfig, PostgresConnectionConfiguration {
+}
 export declare class PostgresConnection implements Connection, StreamingConnection, PersistSQLResults {
     readonly name: string;
-    private queryConfigReader;
+    private queryOptionsReader;
     private configReader;
     private readonly dialect;
     private schemaCache;
     private sqlSchemaCache;
-    constructor(name: string, queryConfigReader?: PostgresQueryConfigurationReader, configReader?: PostgresConnectionConfigurationReader);
+    constructor(options: PostgresConnectionOptions, queryOptionsReader?: QueryOptionsReader);
+    constructor(name: string, queryOptionsReader?: QueryOptionsReader, configReader?: PostgresConnectionConfigurationReader);
     private readQueryConfig;
     protected readConfig(): Promise<PostgresConnectionConfiguration>;
     get dialectName(): string;
@@ -54,7 +53,8 @@ export declare class PostgresConnection implements Connection, StreamingConnecti
 }
 export declare class PooledPostgresConnection extends PostgresConnection implements PooledConnection {
     private _pool;
-    constructor(name: string, queryConfigReader?: PostgresQueryConfigurationReader, configReader?: PostgresConnectionConfigurationReader);
+    constructor(options: PostgresConnectionOptions, queryOptionsReader?: QueryOptionsReader);
+    constructor(name: string, queryOptionsReader?: QueryOptionsReader, configReader?: PostgresConnectionConfigurationReader);
     isPool(): true;
     drain(): Promise<void>;
     getPool(): Promise<Pool>;

package/dist/postgres_connection.js

@@ -62,20 +62,33 @@ const crypto_1 = require("crypto");
 const DEFAULT_PAGE_SIZE = 1000;
 const SCHEMA_PAGE_SIZE = 1000;
 class PostgresConnection {
-    constructor(name, queryConfigReader = {}, configReader = {}) {
-        this.name = name;
-        this.queryConfigReader = queryConfigReader;
-        this.configReader = configReader;
+    constructor(arg, queryOptionsReader, configReader) {
+        this.queryOptionsReader = {};
+        this.configReader = {};
         this.dialect = new malloy_1.PostgresDialect();
         this.schemaCache = new Map();
         this.sqlSchemaCache = new Map();
+        if (typeof arg === 'string') {
+            this.name = arg;
+            if (configReader) {
+                this.configReader = configReader;
+            }
+        }
+        else {
+            const { name, ...configReader } = arg;
+            this.name = name;
+            this.configReader = configReader;
+        }
+        if (queryOptionsReader) {
+            this.queryOptionsReader = queryOptionsReader;
+        }
     }
     async readQueryConfig() {
-        if (this.queryConfigReader instanceof Function) {
-            return this.queryConfigReader();
+        if (this.queryOptionsReader instanceof Function) {
+            return this.queryOptionsReader();
         }
         else {
-            return this.queryConfigReader;
+            return this.queryOptionsReader;
         }
     }
     async readConfig() {
@@ -331,8 +344,13 @@ class PostgresConnection {
 }
 exports.PostgresConnection = PostgresConnection;
 class PooledPostgresConnection extends PostgresConnection {
-    constructor(name, queryConfigReader = {}, configReader = {}) {
-        super(name, queryConfigReader, configReader);
+    constructor(arg, queryOptionsReader, configReader) {
+        if (typeof arg === 'string') {
+            super(arg, queryOptionsReader, configReader);
+        }
+        else {
+            super(arg, queryOptionsReader);
+        }
     }
     isPool() {
         return true;

package/package.json

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