@malloydata/db-postgres 0.0.98-dev231026211435 → 0.0.98-dev231027183449

package/dist/postgres_connection.d.ts

@@ -14,13 +14,13 @@ interface PostgresConnectionConfiguration {
 }
 type PostgresConnectionConfigurationReader = PostgresConnectionConfiguration | (() => Promise<PostgresConnectionConfiguration>);
 export declare class PostgresConnection implements Connection, StreamingConnection, PersistSQLResults {
+    readonly name: string;
+    private queryConfigReader;
+    private configReader;
     private readonly dialect;
     private isSetup;
     private schemaCache;
     private sqlSchemaCache;
-    private queryConfigReader;
-    private configReader;
-    readonly name: any;
     constructor(name: string, queryConfigReader?: PostgresQueryConfigurationReader, configReader?: PostgresConnectionConfigurationReader);
     private readQueryConfig;
     private readConfig;
@@ -58,7 +58,7 @@ export declare class PostgresConnection implements Connection, StreamingConnecti
 }
 export declare class PooledPostgresConnection extends PostgresConnection implements PooledConnection {
     private pool;
-    constructor(name: string);
+    constructor(name: string, queryConfigReader?: PostgresQueryConfigurationReader, configReader?: PostgresConnectionConfigurationReader);
     isPool(): true;
     drain(): Promise<void>;
     protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean): Promise<MalloyQueryData>;

package/dist/postgres_connection.js

@@ -63,13 +63,13 @@ 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;
         this.dialect = new malloy_1.PostgresDialect();
         this.isSetup = false;
         this.schemaCache = new Map();
         this.sqlSchemaCache = new Map();
-        this.queryConfigReader = queryConfigReader;
-        this.configReader = configReader;
-        this.name = name;
     }
     async readQueryConfig() {
         if (this.queryConfigReader instanceof Function) {
@@ -151,13 +151,13 @@ class PostgresConnection {
         return inCache;
     }
     async getClient() {
-        const config = await this.readConfig();
+        const { username: user, password, databaseName: database, port, host, } = await this.readConfig();
         return new pg_1.Client({
-            user: config.username,
-            password: config.password,
-            database: config.databaseName,
-            port: config.port,
-            host: config.host,
+            user,
+            password,
+            database,
+            port,
+            host,
         });
     }
     async runPostgresQuery(sqlCommand, _pageSize, _rowIndex, deJSON) {
@@ -326,8 +326,8 @@ class PostgresConnection {
 }
 exports.PostgresConnection = PostgresConnection;
 class PooledPostgresConnection extends PostgresConnection {
-    constructor(name) {
-        super(name);
+    constructor(name, queryConfigReader = {}, configReader = {}) {
+        super(name, queryConfigReader, configReader);
         this.pool = new pg_1.Pool();
         this.pool.on('acquire', client => client.query("SET TIME ZONE 'UTC'"));
     }

package/package.json

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