@onivoro/server-aws-redshift 22.0.5 → 22.0.6

package/dist/cjs/lib/services/redshift.service.d.ts

@@ -28,8 +28,12 @@ export declare class RedshiftDataService {
         database: string;
         workgroupName: string;
     }): Promise<any>;
-    query(_: {
+    queryV1(_: {
         database: string;
         workgroupName: string;
     }, Sql: string): Promise<number>;
+    query(_: {
+        database: string;
+        workgroupName: string;
+    }, Sql: string): Promise<(string | number)[][]>;
 }

package/dist/cjs/lib/services/redshift.service.js

@@ -150,7 +150,7 @@ let RedshiftDataService = class RedshiftDataService {
             throw error;
         }
     }
-    async query(_, Sql) {
+    async queryV1(_, Sql) {
         const result = await this.redshiftDataClient.send(new client_redshift_data_1.ExecuteStatementCommand({
             Database: _.database,
             Sql,
@@ -158,6 +158,41 @@ let RedshiftDataService = class RedshiftDataService {
         }));
         return await this.waitForStatement(result.Id);
     }
+    async query(_, Sql) {
+        try {
+            const executeCommand = new client_redshift_data_1.ExecuteStatementCommand({
+                Database: _.database,
+                Sql,
+                WorkgroupName: _.workgroupName
+            });
+            const { Id } = await this.redshiftDataClient.send(executeCommand);
+            if (!Id) {
+                throw new Error("Failed to get statement ID");
+            }
+            let status = "";
+            do {
+                const describeCommand = new client_redshift_data_1.DescribeStatementCommand({ Id });
+                const { Status } = await this.redshiftDataClient.send(describeCommand);
+                status = Status || "";
+                if (status === "FAILED") {
+                    throw new Error("Query execution failed");
+                }
+                if (status !== "FINISHED") {
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                }
+            } while (status !== "FINISHED");
+            const getResultsCommand = new client_redshift_data_1.GetStatementResultCommand({ Id });
+            const results = await this.redshiftDataClient.send(getResultsCommand);
+            const records = results.Records || [];
+            return records.map(record => {
+                return record.map(field => field.stringValue || field.longValue || field.doubleValue);
+            });
+        }
+        catch (error) {
+            console.error({ detail: "Error executing query:", error });
+            throw error;
+        }
+    }
 };
 exports.RedshiftDataService = RedshiftDataService;
 exports.RedshiftDataService = RedshiftDataService = __decorate([

package/dist/esm/lib/services/redshift.service.d.ts

@@ -28,8 +28,12 @@ export declare class RedshiftDataService {
         database: string;
         workgroupName: string;
     }): Promise<any>;
-    query(_: {
+    queryV1(_: {
         database: string;
         workgroupName: string;
     }, Sql: string): Promise<number>;
+    query(_: {
+        database: string;
+        workgroupName: string;
+    }, Sql: string): Promise<(string | number)[][]>;
 }

package/dist/esm/lib/services/redshift.service.js

@@ -150,7 +150,7 @@ let RedshiftDataService = class RedshiftDataService {
             throw error;
         }
     }
-    async query(_, Sql) {
+    async queryV1(_, Sql) {
         const result = await this.redshiftDataClient.send(new client_redshift_data_1.ExecuteStatementCommand({
             Database: _.database,
             Sql,
@@ -158,6 +158,41 @@ let RedshiftDataService = class RedshiftDataService {
         }));
         return await this.waitForStatement(result.Id);
     }
+    async query(_, Sql) {
+        try {
+            const executeCommand = new client_redshift_data_1.ExecuteStatementCommand({
+                Database: _.database,
+                Sql,
+                WorkgroupName: _.workgroupName
+            });
+            const { Id } = await this.redshiftDataClient.send(executeCommand);
+            if (!Id) {
+                throw new Error("Failed to get statement ID");
+            }
+            let status = "";
+            do {
+                const describeCommand = new client_redshift_data_1.DescribeStatementCommand({ Id });
+                const { Status } = await this.redshiftDataClient.send(describeCommand);
+                status = Status || "";
+                if (status === "FAILED") {
+                    throw new Error("Query execution failed");
+                }
+                if (status !== "FINISHED") {
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                }
+            } while (status !== "FINISHED");
+            const getResultsCommand = new client_redshift_data_1.GetStatementResultCommand({ Id });
+            const results = await this.redshiftDataClient.send(getResultsCommand);
+            const records = results.Records || [];
+            return records.map(record => {
+                return record.map(field => field.stringValue || field.longValue || field.doubleValue);
+            });
+        }
+        catch (error) {
+            console.error({ detail: "Error executing query:", error });
+            throw error;
+        }
+    }
 };
 exports.RedshiftDataService = RedshiftDataService;
 exports.RedshiftDataService = RedshiftDataService = __decorate([

package/dist/types/lib/services/redshift.service.d.ts

@@ -28,8 +28,12 @@ export declare class RedshiftDataService {
         database: string;
         workgroupName: string;
     }): Promise<any>;
-    query(_: {
+    queryV1(_: {
         database: string;
         workgroupName: string;
     }, Sql: string): Promise<number>;
+    query(_: {
+        database: string;
+        workgroupName: string;
+    }, Sql: string): Promise<(string | number)[][]>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@onivoro/server-aws-redshift",
-    "version": "22.0.5",
+    "version": "22.0.6",
     "repository": {
         "url": "git+https://github.com/onivoro/server-aws-redshift.git"
     },