@lightdash/warehouses 1.56.0 → 1.57.0

package/dist/warehouseClients/PgQueryStream.d.ts

@@ -22,5 +22,5 @@ declare class QueryStream extends Readable implements Submittable {
     _destroy(_err: Error, cb: Function): void;
     _read(size: number): void;
 }
-export = QueryStream;
+export default QueryStream;
 //# sourceMappingURL=PgQueryStream.d.ts.map

package/dist/warehouseClients/PgQueryStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PgQueryStream.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/PgQueryStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAe,WAAW,EAAE,MAAM,IAAI,CAAC;AAE1D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,UAAU,iBAAiB;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAID,cAAM,WAAY,SAAQ,QAAS,YAAW,WAAW;IACrD,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,EAAE,OAAO,CAAC;IAEjB,oBAAoB,EAAE,QAAQ,CAAC;IAE/B,aAAa,EAAE,QAAQ,CAAC;IAExB,qBAAqB,EAAE,QAAQ,CAAC;IAEhC,qBAAqB,EAAE,QAAQ,CAAC;IAEhC,mBAAmB,EAAE,QAAQ,CAAC;IAE9B,WAAW,EAAE,QAAQ,CAAC;IAEtB,gBAAgB,EAAE,QAAQ,CAAC;IAE3B,YACI,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,EAClB,MAAM,GAAE,iBAAsB,EA+BjC;IAEM,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAE1C;IAGM,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,QAIxC;IAIM,KAAK,CAAC,IAAI,EAAE,MAAM,QAexB;CACJ;SAEQ,WAAW"}
+{"version":3,"file":"PgQueryStream.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/PgQueryStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAe,WAAW,EAAE,MAAM,IAAI,CAAC;AAE1D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,UAAU,iBAAiB;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAID,cAAM,WAAY,SAAQ,QAAS,YAAW,WAAW;IACrD,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,EAAE,OAAO,CAAC;IAEjB,oBAAoB,EAAE,QAAQ,CAAC;IAE/B,aAAa,EAAE,QAAQ,CAAC;IAExB,qBAAqB,EAAE,QAAQ,CAAC;IAEhC,qBAAqB,EAAE,QAAQ,CAAC;IAEhC,mBAAmB,EAAE,QAAQ,CAAC;IAE9B,WAAW,EAAE,QAAQ,CAAC;IAEtB,gBAAgB,EAAE,QAAQ,CAAC;IAE3B,YACI,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,EAClB,MAAM,GAAE,iBAAsB,EA+BjC;IAEM,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAE1C;IAGM,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,QAIxC;IAIM,KAAK,CAAC,IAAI,EAAE,MAAM,QAexB;CACJ;eAEc,WAAW"}

package/dist/warehouseClients/PgQueryStream.js

@@ -2,6 +2,7 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const pg_cursor_1 = __importDefault(require("pg-cursor"));
 const stream_1 = require("stream");
 // Note: this is a copy of the QueryStream class from pg-query-stream with the following changes:
@@ -54,4 +55,4 @@ class QueryStream extends stream_1.Readable {
         });
     }
 }
-module.exports = QueryStream;
+exports.default = QueryStream;

package/dist/warehouseClients/PostgresWarehouseClient.d.ts

@@ -56,9 +56,16 @@ export declare class PostgresSqlBuilder extends WarehouseBaseSqlBuilder {
     getMetricSql(sql: string, metric: Metric): string;
     concatString(...args: string[]): string;
 }
+type CatalogQueryFilters = {
+    databaseFilters: string[];
+    schemaFilters: string[];
+    tableFilters: string[];
+    values: string[] | undefined;
+};
 export declare class PostgresClient<T extends CreatePostgresLikeCredentials> extends WarehouseBaseClient<T> {
     config: pg.PoolConfig;
     constructor(credentials: T, config: pg.PoolConfig);
+    protected getCatalogQueryFilters(databases: Set<string>, schemas: Set<string>, tables: Set<string>): CatalogQueryFilters;
     private getSQLWithMetadata;
     static convertQueryResultFields(fields: QueryResult<AnyType>['fields']): WarehouseResults['fields'];
     private static getNoticeError;
@@ -82,6 +89,8 @@ export declare class PostgresClient<T extends CreatePostgresLikeCredentials> ext
     parseError(error: pg.DatabaseError, query?: string): WarehouseQueryError;
 }
 export declare class PostgresWarehouseClient extends PostgresClient<CreatePostgresCredentials> {
+    protected getCatalogQueryFilters(databases: Set<string>, schemas: Set<string>, tables: Set<string>): CatalogQueryFilters;
     constructor(credentials: CreatePostgresCredentials);
 }
+export {};
 //# sourceMappingURL=PostgresWarehouseClient.d.ts.map

package/dist/warehouseClients/PostgresWarehouseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresWarehouseClient.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/PostgresWarehouseClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PostgresWarehouseClient.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/PostgresWarehouseClient.ts"],"names":[],"mappings":"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"}

package/dist/warehouseClients/PostgresWarehouseClient.js

@@ -235,6 +235,14 @@ class PostgresClient extends WarehouseBaseClient_1.default {
         super(credentials, new PostgresSqlBuilder(credentials.startOfWeek));
         this.config = config;
     }
+    getCatalogQueryFilters(databases, schemas, tables) {
+        return {
+            databaseFilters: [...databases].map((value) => `'${value}'`),
+            schemaFilters: [...schemas].map((value) => `'${value}'`),
+            tableFilters: [...tables].map((value) => `'${value}'`),
+            values: undefined,
+        };
+    }
     getSQLWithMetadata(sql, tags) {
         let alteredQuery = sql;
         if (tags) {
@@ -437,15 +445,18 @@ class PostgresClient extends WarehouseBaseClient_1.default {
     }
     async getCatalog(requests) {
         const { databases, schemas, tables } = requests.reduce((acc, { database, schema, table }) => ({
-            databases: acc.databases.add(`'${database}'`),
-            schemas: acc.schemas.add(`'${schema}'`),
-            tables: acc.tables.add(`'${table}'`),
+            databases: acc.databases.add(database),
+            schemas: acc.schemas.add(schema),
+            tables: acc.tables.add(table),
         }), {
             databases: new Set(),
             schemas: new Set(),
             tables: new Set(),
         });
-        if (databases.size <= 0 || schemas.size <= 0 || tables.size <= 0) {
+        const { databaseFilters, schemaFilters, tableFilters, values } = this.getCatalogQueryFilters(databases, schemas, tables);
+        if (databaseFilters.length <= 0 ||
+            schemaFilters.length <= 0 ||
+            tableFilters.length <= 0) {
             return {};
         }
         const { rows: pgVersionRows } = await this.runQuery('SELECT version()');
@@ -462,9 +473,9 @@ class PostgresClient extends WarehouseBaseClient_1.default {
                    column_name,
                    data_type
             FROM information_schema.columns
-            WHERE table_catalog IN (${Array.from(databases)})
-              AND table_schema IN (${Array.from(schemas)})
-              AND table_name IN (${Array.from(tables)})
+            WHERE table_catalog IN (${databaseFilters})
+              AND table_schema IN (${schemaFilters})
+              AND table_name IN (${tableFilters})
             ${supportsMatviews
             ? `
 
@@ -480,13 +491,15 @@ class PostgresClient extends WarehouseBaseClient_1.default {
             JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid
             JOIN pg_catalog.pg_matviews mv ON n.nspname = mv.schemaname AND c.relname = mv.matviewname
             WHERE c.relkind = 'm'
-            AND current_database() IN (${Array.from(databases)})
-            AND n.nspname IN (${Array.from(schemas)})
-            AND c.relname IN (${Array.from(tables)})
+            AND current_database() IN (${databaseFilters})
+            AND n.nspname IN (${schemaFilters})
+            AND c.relname IN (${tableFilters})
             AND a.attnum > 0
             AND NOT a.attisdropped`
             : ''}`;
-        const { rows } = await this.runQuery(query);
+        const { rows } = values === undefined
+            ? await this.runQuery(query)
+            : await this.runQuery(query, {}, undefined, values);
         const catalog = rows.reduce((acc, { table_catalog, table_schema, table_name, column_name, data_type, }) => {
             const match = requests.find(({ database, schema, table }) => database === table_catalog &&
                 schema === table_schema &&
@@ -639,6 +652,15 @@ const getSSLConfigFromMode = ({ sslcert, sslkey, sslmode, sslrootcert, }) => {
     }
 };
 class PostgresWarehouseClient extends PostgresClient {
+    getCatalogQueryFilters(databases, schemas, tables) {
+        const values = [...databases, ...schemas, ...tables];
+        return {
+            databaseFilters: [...databases].map((_, index) => `$${index + 1}`),
+            schemaFilters: [...schemas].map((_, index) => `$${databases.size + index + 1}`),
+            tableFilters: [...tables].map((_, index) => `$${databases.size + schemas.size + index + 1}`),
+            values,
+        };
+    }
     constructor(credentials) {
         const ssl = getSSLConfigFromMode(credentials);
         super(credentials, {

package/dist/warehouseClients/PostgresWarehouseClient.test.js

@@ -147,6 +147,30 @@ describe('PostgresWarehouseClient', () => {
         const warehouse = new PostgresWarehouseClient_1.PostgresWarehouseClient(PostgresWarehouseClient_mock_1.credentials);
         expect(await warehouse.getCatalog([])).toEqual({});
     });
+    it('binds catalog filter values as query parameters', async () => {
+        const warehouse = new PostgresWarehouseClient_1.PostgresWarehouseClient(PostgresWarehouseClient_mock_1.credentials);
+        const database = "missing') OR (SELECT CAST(current_database() AS integer)=0) OR ('x'='x";
+        const runQuery = vi
+            .spyOn(warehouse, 'runQuery')
+            .mockResolvedValueOnce({
+            rows: [{ version: 'PostgreSQL 15.4' }],
+            fields: {},
+        })
+            .mockResolvedValueOnce({ rows: [], fields: {} });
+        await warehouse.getCatalog([
+            { database, schema: 'public', table: 'orders' },
+        ]);
+        const catalogQuery = runQuery.mock.calls[1][0];
+        expect(catalogQuery).toContain('table_catalog IN ($1)');
+        expect(catalogQuery).toContain('table_schema IN ($2)');
+        expect(catalogQuery).toContain('table_name IN ($3)');
+        expect(catalogQuery).not.toContain(database);
+        expect(runQuery.mock.calls[1][3]).toEqual([
+            database,
+            'public',
+            'orders',
+        ]);
+    });
 });
 describe('PostgresWarehouseClient statement timeout', () => {
     const mockPoolWithQuery = (queryMock) => {

package/dist/warehouseClients/RedshiftWarehouseClient.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RedshiftWarehouseClient.test.d.ts.map

package/dist/warehouseClients/RedshiftWarehouseClient.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedshiftWarehouseClient.test.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/RedshiftWarehouseClient.test.ts"],"names":[],"mappings":""}

package/dist/warehouseClients/RedshiftWarehouseClient.test.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("@lightdash/common");
+const RedshiftWarehouseClient_1 = require("./RedshiftWarehouseClient");
+describe('RedshiftWarehouseClient', () => {
+    it('keeps catalog filters in the Redshift query', async () => {
+        const warehouse = new RedshiftWarehouseClient_1.RedshiftWarehouseClient({
+            type: common_1.WarehouseTypes.REDSHIFT,
+            host: 'localhost',
+            user: 'analytics',
+            password: 'password',
+            port: 5439,
+            dbname: 'warehouse',
+            schema: 'public',
+            authenticationType: common_1.RedshiftAuthenticationType.PASSWORD,
+        });
+        const runQuery = vi
+            .spyOn(warehouse, 'runQuery')
+            .mockResolvedValueOnce({
+            rows: [{ version: 'PostgreSQL 8.0.2' }],
+            fields: {},
+        })
+            .mockResolvedValueOnce({ rows: [], fields: {} });
+        await warehouse.getCatalog([
+            { database: 'warehouse', schema: 'public', table: 'orders' },
+        ]);
+        const catalogQuery = runQuery.mock.calls[1][0];
+        expect(catalogQuery).toContain("table_catalog IN ('warehouse')");
+        expect(catalogQuery).toContain("table_schema IN ('public')");
+        expect(catalogQuery).toContain("table_name IN ('orders')");
+        expect(runQuery.mock.calls[1][3]).toBeUndefined();
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/warehouses",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "description": "Warehouse connectors for Lightdash",
   "license": "MIT",
   "repository": {
@@ -29,7 +29,7 @@
     "snowflake-sdk": "2.3.4",
     "ssh2": "1.14.0",
     "trino-client": "0.2.9",
-    "@lightdash/common": "1.56.0"
+    "@lightdash/common": "1.57.0"
   },
   "devDependencies": {
     "@types/big.js": "6.2.2",