@malloydata/db-postgres 0.0.335 → 0.0.337

package/dist/index.js

@@ -26,4 +26,34 @@ 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,
+        },
+    ],
+});
 //# sourceMappingURL=index.js.map

package/dist/postgres_connection.d.ts

@@ -25,6 +25,7 @@ export declare class PostgresConnection extends BaseConnection implements Connec
     isPool(): this is PooledConnection;
     canPersist(): this is PersistSQLResults;
     canStream(): this is StreamingConnection;
+    getDigest(): string;
     get supportsNesting(): boolean;
     protected getClient(): Promise<Client>;
     protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean): Promise<MalloyQueryData>;

package/dist/postgres_connection.js

@@ -21,50 +21,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PooledPostgresConnection = exports.PostgresConnection = void 0;
-// LTNOTE: we need this extension to be installed to correctly index
-//  postgres data...  We should probably do this on connection creation...
-//
-//     create extension if not exists tsm_system_rows
-//
-const crypto = __importStar(require("crypto"));
 const malloy_1 = require("@malloydata/malloy");
 const connection_1 = require("@malloydata/malloy/connection");
 const pg_1 = require("pg");
@@ -120,6 +81,16 @@ class PostgresConnection extends connection_1.BaseConnection {
     canStream() {
         return true;
     }
+    getDigest() {
+        // 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);
+        }
+        // Fall back to connection name if config is async
+        return (0, malloy_1.makeDigest)(`postgres:${this.name}`);
+    }
     get supportsNesting() {
         return true;
     }
@@ -330,7 +301,7 @@ class PostgresConnection extends connection_1.BaseConnection {
         return {};
     }
     async manifestTemporaryTable(sqlCommand) {
-        const hash = crypto.createHash('md5').update(sqlCommand).digest('hex');
+        const hash = (0, malloy_1.makeDigest)(sqlCommand);
         const tableName = `tt${hash}`;
         const cmd = `CREATE TEMPORARY TABLE IF NOT EXISTS ${tableName} AS (${sqlCommand});`;
         // console.log(cmd);

package/package.json

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