@malloydata/db-postgres 0.0.11-dev221202152346 → 0.0.11-dev221202180154

package/dist/postgres_connection.d.ts

@@ -1,4 +1,4 @@
-import { FetchSchemaAndRunSimultaneously, FetchSchemaAndRunStreamSimultaneously, PersistSQLResults, RunSQLOptions, StreamingConnection, StructDef, MalloyQueryData, QueryData, PooledConnection, SQLBlock, Connection, QueryDataRow } from "@malloydata/malloy";
+import { PersistSQLResults, RunSQLOptions, StreamingConnection, StructDef, MalloyQueryData, QueryData, PooledConnection, SQLBlock, Connection, QueryDataRow } from "@malloydata/malloy";
 import { Client } from "pg";
 interface PostgresQueryConfiguration {
     rowLimit?: number;
@@ -24,16 +24,17 @@ export declare class PostgresConnection implements Connection, StreamingConnecti
     get dialectName(): string;
     isPool(): this is PooledConnection;
     canPersist(): this is PersistSQLResults;
-    canFetchSchemaAndRunSimultaneously(): this is FetchSchemaAndRunSimultaneously;
-    canFetchSchemaAndRunStreamSimultaneously(): this is FetchSchemaAndRunStreamSimultaneously;
     canStream(): this is StreamingConnection;
     fetchSchemaForTables(missing: string[]): Promise<{
         schemas: Record<string, StructDef>;
         errors: Record<string, string>;
     }>;
-    fetchSchemaForSQLBlocks(sqlRefs: SQLBlock[]): Promise<{
-        schemas: Record<string, StructDef>;
-        errors: Record<string, string>;
+    fetchSchemaForSQLBlock(sqlRef: SQLBlock): Promise<{
+        structDef: StructDef;
+        error?: undefined;
+    } | {
+        error: string;
+        structDef?: undefined;
     }>;
     protected getClient(): Promise<Client>;
     protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean): Promise<MalloyQueryData>;

package/dist/postgres_connection.js

@@ -48,6 +48,7 @@ const crypto = __importStar(require("crypto"));
 const malloy_1 = require("@malloydata/malloy");
 const pg_1 = require("pg");
 const pg_query_stream_1 = __importDefault(require("pg-query-stream"));
+const crypto_1 = require("crypto");
 const postgresToMalloyTypes = {
     "character varying": "string",
     name: "string",
@@ -109,13 +110,6 @@ class PostgresConnection {
     canPersist() {
         return true;
     }
-    canFetchSchemaAndRunSimultaneously() {
-        // TODO feature-sql-block Implement FetchSchemaAndRunSimultaneously
-        return false;
-    }
-    canFetchSchemaAndRunStreamSimultaneously() {
-        return false;
-    }
     canStream() {
         return true;
     }
@@ -144,31 +138,21 @@ class PostgresConnection {
         }
         return { schemas, errors };
     }
-    async fetchSchemaForSQLBlocks(sqlRefs) {
-        const schemas = {};
-        const errors = {};
-        for (const sqlRef of sqlRefs) {
-            const key = sqlRef.name;
-            let inCache = this.sqlSchemaCache.get(key);
-            if (!inCache) {
-                try {
-                    inCache = {
-                        schema: await this.getSQLBlockSchema(sqlRef),
-                    };
-                    this.schemaCache.set(key, inCache);
-                }
-                catch (error) {
-                    inCache = { error: error.message };
-                }
-            }
-            if (inCache.schema !== undefined) {
-                schemas[key] = inCache.schema;
+    async fetchSchemaForSQLBlock(sqlRef) {
+        const key = sqlRef.name;
+        let inCache = this.sqlSchemaCache.get(key);
+        if (!inCache) {
+            try {
+                inCache = {
+                    structDef: await this.getSQLBlockSchema(sqlRef),
+                };
             }
-            else {
-                errors[key] = inCache.error;
+            catch (error) {
+                inCache = { error: error.message };
             }
+            this.sqlSchemaCache.set(key, inCache);
         }
-        return { schemas, errors };
+        return inCache;
     }
     async getClient() {
         const config = await this.readConfig();
@@ -211,12 +195,11 @@ class PostgresConnection {
             },
             fields: [],
         };
-        // TODO -- Should be a uuid
-        const tempTableName = `malloy${Math.floor(Math.random() * 10000000)}`;
+        const tempTableName = `tmp${(0, crypto_1.randomUUID)()}`.replace(/-/g, "");
         const infoQuery = `
       drop table if exists ${tempTableName};
       create temp table ${tempTableName} as SELECT * FROM (
-        ${sqlRef.select}
+        ${sqlRef.selectStr}
       ) as x where false;
       SELECT column_name, c.data_type, e.data_type as element_type
       FROM information_schema.columns c LEFT JOIN information_schema.element_types e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.11-dev221202152346",
+  "version": "0.0.11-dev221202180154",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.11-dev221202152346",
+    "@malloydata/malloy": "^0.0.11-dev221202180154",
     "@types/pg": "^8.6.1",
     "pg": "^8.7.1",
     "pg-query-stream": "4.2.3"