@malloydata/db-postgres 0.0.336 → 0.0.338

package/dist/index.js

@@ -26,4 +26,41 @@ exports.PooledPostgresConnection = exports.PostgresConnection = void 0;
 var postgres_connection_1 = require("./postgres_connection");
 Object.defineProperty(exports, "PostgresConnection", { enumerable: true, get: function () { return postgres_connection_1.PostgresConnection; } });
 Object.defineProperty(exports, "PooledPostgresConnection", { enumerable: true, get: function () { return postgres_connection_1.PooledPostgresConnection; } });
+const malloy_1 = require("@malloydata/malloy");
+const postgres_connection_2 = require("./postgres_connection");
+(0, malloy_1.registerConnectionType)('postgres', {
+    factory: (config) => {
+        return new postgres_connection_2.PostgresConnection(config);
+    },
+    properties: [
+        { name: 'host', displayName: 'Host', type: 'string', optional: true },
+        { name: 'port', displayName: 'Port', type: 'number', optional: true },
+        { name: 'username', displayName: 'Username', type: 'string', optional: true },
+        {
+            name: 'password',
+            displayName: 'Password',
+            type: 'password',
+            optional: true,
+        },
+        {
+            name: 'databaseName',
+            displayName: 'Database Name',
+            type: 'string',
+            optional: true,
+        },
+        {
+            name: 'connectionString',
+            displayName: 'Connection String',
+            type: 'string',
+            optional: true,
+        },
+        {
+            name: 'setupSQL',
+            displayName: 'Setup SQL',
+            type: 'text',
+            optional: true,
+            description: 'SQL statements to run when the connection is established',
+        },
+    ],
+});
 //# sourceMappingURL=index.js.map

package/dist/postgres_connection.d.ts

@@ -1,4 +1,4 @@
-import type { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, PooledConnection, QueryDataRow, QueryOptionsReader, QueryRunStats, RunSQLOptions, SQLSourceDef, TableSourceDef, StreamingConnection, SQLSourceRequest } from '@malloydata/malloy';
+import type { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, PooledConnection, QueryRecord, QueryOptionsReader, QueryRunStats, RunSQLOptions, SQLSourceDef, TableSourceDef, StreamingConnection, SQLSourceRequest } from '@malloydata/malloy';
 import { BaseConnection } from '@malloydata/malloy/connection';
 import { Client, Pool } from 'pg';
 interface PostgresConnectionConfiguration {
@@ -8,12 +8,14 @@ interface PostgresConnectionConfiguration {
     password?: string;
     databaseName?: string;
     connectionString?: string;
+    setupSQL?: string;
 }
 type PostgresConnectionConfigurationReader = PostgresConnectionConfiguration | (() => Promise<PostgresConnectionConfiguration>);
 export interface PostgresConnectionOptions extends ConnectionConfig, PostgresConnectionConfiguration {
 }
 export declare class PostgresConnection extends BaseConnection implements Connection, StreamingConnection, PersistSQLResults {
     readonly name: string;
+    protected setupSQL: string | undefined;
     private queryOptionsReader;
     private configReader;
     private readonly dialect;
@@ -35,7 +37,7 @@ export declare class PostgresConnection extends BaseConnection implements Connec
     test(): Promise<void>;
     connectionSetup(client: Client): Promise<void>;
     runSQL(sql: string, { rowLimit }?: RunSQLOptions, rowIndex?: number): Promise<MalloyQueryData>;
-    runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
+    runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryRecord>;
     estimateQueryCost(_: string): Promise<QueryRunStats>;
     manifestTemporaryTable(sqlCommand: string): Promise<string>;
     close(): Promise<void>;
@@ -48,7 +50,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, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
+    runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryRecord>;
     close(): Promise<void>;
 }
 export {};

package/dist/postgres_connection.js

@@ -45,8 +45,9 @@ class PostgresConnection extends connection_1.BaseConnection {
             }
         }
         else {
-            const { name, ...configReader } = arg;
+            const { name, setupSQL, ...configReader } = arg;
             this.name = name;
+            this.setupSQL = setupSQL;
             this.configReader = configReader;
         }
         if (queryOptionsReader) {
@@ -82,14 +83,14 @@ class PostgresConnection extends connection_1.BaseConnection {
         return true;
     }
     getDigest() {
+        var _a;
         // If configReader is an object (not a function), use its properties
         if (typeof this.configReader !== 'function') {
-            const { host, port, databaseName, connectionString } = this.configReader;
-            const data = `postgres:${host !== null && host !== void 0 ? host : ''}:${port !== null && port !== void 0 ? port : ''}:${databaseName !== null && databaseName !== void 0 ? databaseName : ''}:${connectionString !== null && connectionString !== void 0 ? connectionString : ''}`;
-            return (0, malloy_1.makeDigest)(data);
+            const { host, port, username, databaseName, connectionString } = this.configReader;
+            return (0, malloy_1.makeDigest)('postgres', host !== null && host !== void 0 ? host : '', String(port !== null && port !== void 0 ? port : ''), username !== null && username !== void 0 ? username : '', databaseName !== null && databaseName !== void 0 ? databaseName : '', connectionString !== null && connectionString !== void 0 ? connectionString : '', (_a = this.setupSQL) !== null && _a !== void 0 ? _a : '');
         }
         // Fall back to connection name if config is async
-        return (0, malloy_1.makeDigest)(`postgres:${this.name}`);
+        return (0, malloy_1.makeDigest)('postgres', this.name);
     }
     get supportsNesting() {
         return true;
@@ -274,6 +275,14 @@ class PostgresConnection extends connection_1.BaseConnection {
     }
     async connectionSetup(client) {
         await client.query("SET TIME ZONE 'UTC'");
+        if (this.setupSQL) {
+            for (const stmt of this.setupSQL.split(';\n')) {
+                const trimmed = stmt.trim();
+                if (trimmed) {
+                    await client.query(trimmed);
+                }
+            }
+        }
     }
     async runSQL(sql, { rowLimit } = {}, rowIndex = 0) {
         var _a;
@@ -284,6 +293,7 @@ class PostgresConnection extends connection_1.BaseConnection {
         const query = new pg_query_stream_1.default(sqlCommand);
         const client = await this.getClient();
         await client.connect();
+        await this.connectionSetup(client);
         const rowStream = client.query(query);
         let index = 0;
         for await (const row of rowStream) {
@@ -302,7 +312,7 @@ class PostgresConnection extends connection_1.BaseConnection {
     }
     async manifestTemporaryTable(sqlCommand) {
         const hash = (0, malloy_1.makeDigest)(sqlCommand);
-        const tableName = `tt${hash}`;
+        const tableName = `tt${hash.slice(0, this.dialect.maxIdentifierLength - 2)}`;
         const cmd = `CREATE TEMPORARY TABLE IF NOT EXISTS ${tableName} AS (${sqlCommand});`;
         // console.log(cmd);
         await this.runPostgresQuery(cmd, 1000, 0, false);
@@ -340,7 +350,17 @@ class PooledPostgresConnection extends PostgresConnection {
                 host,
                 connectionString,
             });
-            this._pool.on('acquire', client => client.query("SET TIME ZONE 'UTC'"));
+            this._pool.on('acquire', client => {
+                client.query("SET TIME ZONE 'UTC'");
+                if (this.setupSQL) {
+                    for (const stmt of this.setupSQL.split(';\n')) {
+                        const trimmed = stmt.trim();
+                        if (trimmed) {
+                            client.query(trimmed);
+                        }
+                    }
+                }
+            });
         }
         return this._pool;
     }

package/package.json

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