@malloydata/db-postgres 0.0.22-dev230207180844 → 0.0.22-dev230207183024

package/dist/index.d.ts

@@ -1 +1 @@
-export { PostgresConnection, PooledPostgresConnection, } from "./postgres_connection";
+export { PostgresConnection, PooledPostgresConnection } from "./postgres_connection";

package/dist/postgres_connection.d.ts

@@ -1,4 +1,4 @@
-import { PersistSQLResults, RunSQLOptions, StreamingConnection, StructDef, MalloyQueryData, QueryData, PooledConnection, SQLBlock, Connection, QueryDataRow } from "@malloydata/malloy";
+import { Connection, MalloyQueryData, PersistSQLResults, PooledConnection, QueryData, QueryDataRow, RunSQLOptions, SQLBlock, StreamingConnection, StructDef } from "@malloydata/malloy";
 import { Client } from "pg";
 interface PostgresQueryConfiguration {
     rowLimit?: number;

package/dist/postgres_connection.js

@@ -61,29 +61,29 @@ const pg_query_stream_1 = __importDefault(require("pg-query-stream"));
 const crypto_1 = require("crypto");
 const postgresToMalloyTypes = {
     "character varying": "string",
-    name: "string",
-    text: "string",
-    date: "date",
-    integer: "number",
-    bigint: "number",
+    "name": "string",
+    "text": "string",
+    "date": "date",
+    "integer": "number",
+    "bigint": "number",
     "double precision": "number",
     "timestamp without time zone": "timestamp",
-    oid: "string",
-    boolean: "boolean",
+    "oid": "string",
+    "boolean": "boolean",
     // ARRAY: "string",
     "timestamp with time zone": "timestamp",
-    timestamp: "timestamp",
+    "timestamp": "timestamp",
     '"char"': "string",
-    character: "string",
-    smallint: "number",
-    xid: "string",
-    real: "number",
-    interval: "string",
-    inet: "string",
-    regtype: "string",
-    numeric: "number",
-    bytea: "string",
-    pg_ndistinct: "number",
+    "character": "string",
+    "smallint": "number",
+    "xid": "string",
+    "real": "number",
+    "interval": "string",
+    "inet": "string",
+    "regtype": "string",
+    "numeric": "number",
+    "bytea": "string",
+    "pg_ndistinct": "number"
 };
 const DEFAULT_PAGE_SIZE = 1000;
 const SCHEMA_PAGE_SIZE = 1000;
@@ -131,12 +131,12 @@ class PostgresConnection {
             if (!inCache) {
                 try {
                     inCache = {
-                        schema: await this.getTableSchema(tableURL),
+                        "schema": await this.getTableSchema(tableURL)
                     };
                     this.schemaCache.set(tableURL, inCache);
                 }
                 catch (error) {
-                    inCache = { error: error.message };
+                    inCache = { "error": error.message };
                 }
             }
             if (inCache.schema !== undefined) {
@@ -154,11 +154,11 @@ class PostgresConnection {
         if (!inCache) {
             try {
                 inCache = {
-                    structDef: await this.getSQLBlockSchema(sqlRef),
+                    "structDef": await this.getSQLBlockSchema(sqlRef)
                 };
             }
             catch (error) {
-                inCache = { error: error.message };
+                inCache = { "error": error.message };
             }
             this.sqlSchemaCache.set(key, inCache);
         }
@@ -167,11 +167,11 @@ class PostgresConnection {
     async getClient() {
         const config = await this.readConfig();
         return new pg_1.Client({
-            user: config.username,
-            password: config.password,
-            database: config.databaseName,
-            port: config.port,
-            host: config.host,
+            "user": config.username,
+            "password": config.password,
+            "database": config.databaseName,
+            "port": config.port,
+            "host": config.host
         });
     }
     async runPostgresQuery(sqlCommand, _pageSize, _rowIndex, deJSON) {
@@ -187,23 +187,26 @@ class PostgresConnection {
             }
         }
         await client.end();
-        return { rows: result.rows, totalRows: result.rows.length };
+        return {
+            "rows": result.rows,
+            "totalRows": result.rows.length
+        };
     }
     async getSQLBlockSchema(sqlRef) {
         const structDef = {
-            type: "struct",
-            dialect: "postgres",
-            name: sqlRef.name,
-            structSource: {
-                type: "sql",
-                method: "subquery",
-                sqlBlock: sqlRef,
+            "type": "struct",
+            "dialect": "postgres",
+            "name": sqlRef.name,
+            "structSource": {
+                "type": "sql",
+                "method": "subquery",
+                "sqlBlock": sqlRef
             },
-            structRelationship: {
-                type: "basetable",
-                connectionName: this.name,
+            "structRelationship": {
+                "type": "basetable",
+                "connectionName": this.name
             },
-            fields: [],
+            "fields": []
         };
         const tempTableName = `tmp${(0, crypto_1.randomUUID)()}`.replace(/-/g, "");
         const infoQuery = `
@@ -230,27 +233,31 @@ class PostgresConnection {
             if (postgresDataType === "ARRAY") {
                 malloyType = postgresToMalloyTypes[row["element_type"]];
                 s = {
-                    type: "struct",
-                    name: row["column_name"],
-                    dialect: this.dialectName,
-                    structRelationship: { type: "nested", field: name, isArray: true },
-                    structSource: { type: "nested" },
-                    fields: [],
+                    "type": "struct",
+                    "name": row["column_name"],
+                    "dialect": this.dialectName,
+                    "structRelationship": {
+                        "type": "nested",
+                        "field": name,
+                        "isArray": true
+                    },
+                    "structSource": { "type": "nested" },
+                    "fields": []
                 };
                 structDef.fields.push(s);
                 name = "value";
             }
             if (malloyType !== undefined) {
                 s.fields.push({
-                    type: malloyType,
-                    name,
+                    "type": malloyType,
+                    name
                 });
             }
             else {
                 s.fields.push({
                     name,
-                    type: "string",
-                    e: [`'Postgres type "${postgresDataType}" not supported by Malloy'`],
+                    "type": "string",
+                    "e": [`'Postgres type "${postgresDataType}" not supported by Malloy'`]
                 });
             }
         }
@@ -258,15 +265,15 @@ class PostgresConnection {
     async getTableSchema(tableURL) {
         const { tablePath } = (0, malloy_1.parseTableURI)(tableURL);
         const structDef = {
-            type: "struct",
-            name: tableURL,
-            dialect: "postgres",
-            structSource: { type: "table", tablePath },
-            structRelationship: {
-                type: "basetable",
-                connectionName: this.name,
+            "type": "struct",
+            "name": tableURL,
+            "dialect": "postgres",
+            "structSource": { "type": "table", tablePath },
+            "structRelationship": {
+                "type": "basetable",
+                "connectionName": this.name
             },
-            fields: [],
+            "fields": []
         };
         const [schema, table] = tablePath.split(".");
         if (table === undefined) {
@@ -346,7 +353,10 @@ class PooledPostgresConnection extends PostgresConnection {
                 result.rows[i] = result.rows[i].row;
             }
         }
-        return { rows: result.rows, totalRows: result.rows.length };
+        return {
+            "rows": result.rows,
+            "totalRows": result.rows.length
+        };
     }
     async getClientFromPool() {
         return await new Promise((resolve, reject) => this.pool.connect((error, client, releaseClient) => {

package/package.json

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