@malloydata/db-postgres 0.0.394 → 0.0.396

package/dist/postgres_connection.d.ts

@@ -30,7 +30,7 @@ export declare class PostgresConnection extends BaseConnection implements Connec
     getDigest(): string;
     get supportsNesting(): boolean;
     protected getClient(): Promise<Client>;
-    protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean): Promise<MalloyQueryData>;
+    protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean, values?: unknown[]): Promise<MalloyQueryData>;
     fetchSelectSchema(sqlRef: SQLSourceRequest): Promise<SQLSourceDef | string>;
     private schemaFromQuery;
     fetchTableSchema(tableKey: string, tablePath: string): Promise<TableSourceDef | string>;
@@ -49,7 +49,7 @@ export declare class PooledPostgresConnection extends PostgresConnection impleme
     isPool(): this is PooledConnection;
     drain(): Promise<void>;
     getPool(): Promise<Pool>;
-    protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean): Promise<MalloyQueryData>;
+    protected runPostgresQuery(sqlCommand: string, _pageSize: number, _rowIndex: number, deJSON: boolean, values?: unknown[]): Promise<MalloyQueryData>;
     runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryRecord>;
     close(): Promise<void>;
 }

package/dist/postgres_connection.js

@@ -32,6 +32,24 @@ const pg_1 = require("pg");
 const pg_query_stream_1 = __importDefault(require("pg-query-stream"));
 const DEFAULT_PAGE_SIZE = 1000;
 const SCHEMA_PAGE_SIZE = 1000;
+/**
+ * Decode a canonical Postgres dotted-table path into its underlying
+ * identifier strings as they appear in `information_schema`. The schema
+ * lookup is a string-literal comparison, not an identifier reference,
+ * so Postgres's bare-name lowercase folding doesn't happen for us — we
+ * apply it here: bare segments → lowercase, `"…"` segments → as-is.
+ */
+function decodeDottedSegments(input) {
+    const result = (0, malloy_1.decodeDottedTablePath)(input, {
+        quoteChar: '"',
+        escapeStyle: 'doubled',
+        bareIdentRegex: /^[A-Za-z_][A-Za-z0-9_$]*/,
+        dialectName: 'Postgres',
+    });
+    if (!result.ok)
+        return undefined;
+    return result.segments.map(s => (s.quoted ? s.value : s.value.toLowerCase()));
+}
 class PostgresConnection extends connection_1.BaseConnection {
     constructor(arg, queryOptionsReader, configReader) {
         super();
@@ -105,11 +123,11 @@ class PostgresConnection extends connection_1.BaseConnection {
             connectionString,
         });
     }
-    async runPostgresQuery(sqlCommand, _pageSize, _rowIndex, deJSON) {
+    async runPostgresQuery(sqlCommand, _pageSize, _rowIndex, deJSON, values) {
         const client = await this.getClient();
         await client.connect();
         await this.connectionSetup(client);
-        let result = await client.query(sqlCommand);
+        let result = await client.query(sqlCommand, values);
         if (Array.isArray(result)) {
             result = result.pop();
         }
@@ -222,8 +240,8 @@ class PostgresConnection extends connection_1.BaseConnection {
         await client.end();
         return structDef;
     }
-    async schemaFromQuery(infoQuery, structDef) {
-        const { rows, totalRows } = await this.runPostgresQuery(infoQuery, SCHEMA_PAGE_SIZE, 0, false);
+    async schemaFromQuery(infoQuery, structDef, values) {
+        const { rows, totalRows } = await this.runPostgresQuery(infoQuery, SCHEMA_PAGE_SIZE, 0, false, values);
         if (!totalRows) {
             throw new Error('Unable to read schema.');
         }
@@ -249,20 +267,25 @@ class PostgresConnection extends connection_1.BaseConnection {
             connection: this.name,
             fields: [],
         };
-        const [schema, table] = tablePath.split('.');
-        if (table === undefined) {
+        // tablePath is canonical SQL — bare segments (case-folded to lower by
+        // Postgres) or `"…"` quoted segments (case-preserving, `""` escape).
+        // The information_schema lookup needs the raw identifier strings, not
+        // the SQL surface form, so decode each segment.
+        const segments = decodeDottedSegments(tablePath);
+        if (segments === undefined || segments.length < 2) {
             return 'Default schema not yet supported in Postgres';
         }
+        const [schema, table] = segments.slice(-2);
         const infoQuery = `
       SELECT column_name, c.data_type, e.data_type as element_type
       FROM information_schema.columns c LEFT JOIN information_schema.element_types e
         ON ((c.table_catalog, c.table_schema, c.table_name, 'TABLE', c.dtd_identifier)
           = (e.object_catalog, e.object_schema, e.object_name, e.object_type, e.collection_type_identifier))
-        WHERE table_name = '${table}'
-          AND table_schema = '${schema}'
+        WHERE table_name = $1
+          AND table_schema = $2
     `;
         try {
-            await this.schemaFromQuery(infoQuery, structDef);
+            await this.schemaFromQuery(infoQuery, structDef, [table, schema]);
         }
         catch (error) {
             return `Error fetching schema for ${tablePath}: ${error.message}`;
@@ -363,9 +386,9 @@ class PooledPostgresConnection extends PostgresConnection {
         }
         return this._pool;
     }
-    async runPostgresQuery(sqlCommand, _pageSize, _rowIndex, deJSON) {
+    async runPostgresQuery(sqlCommand, _pageSize, _rowIndex, deJSON, values) {
         const pool = await this.getPool();
-        let result = await pool.query(sqlCommand);
+        let result = await pool.query(sqlCommand, values);
         if (Array.isArray(result)) {
             result = result.pop();
         }

package/package.json

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