@onivoro/server-aws-redshift 22.0.5 → 22.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/cjs/lib/server-aws-redshift.module.js +25 -23
  2. package/dist/cjs/lib/services/redshift.service.d.ts +5 -1
  3. package/dist/cjs/lib/services/redshift.service.js +36 -1
  4. package/dist/esm/lib/server-aws-redshift.module.js +25 -23
  5. package/dist/esm/lib/services/redshift.service.d.ts +5 -1
  6. package/dist/esm/lib/services/redshift.service.js +36 -1
  7. package/dist/types/lib/services/redshift.service.d.ts +5 -1
  8. package/package.json +1 -1
package/dist/cjs/lib/server-aws-redshift.module.js CHANGED
@@ -14,7 +14,9 @@ const client_redshift_data_1 = require("@aws-sdk/client-redshift-data");
14
14
  const redshift_service_1 = require("./services/redshift.service");
15
15
  const server_aws_redshift_config_class_1 = require("./classes/server-aws-redshift-config.class");
16
16
  const client_redshift_serverless_1 = require("@aws-sdk/client-redshift-serverless");
17
+ const client_redshift_1 = require("@aws-sdk/client-redshift");
17
18
  let redshiftClient = null;
19
+ let redshiftDataClient = null;
18
20
  let redshiftServerlessClient = null;
19
21
  let ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule_1 = class ServerAwsRedshiftDataModule {
20
22
  static configure(config) {
@@ -23,33 +25,21 @@ let ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule_1 = class ServerAw
23
25
  providers: [
24
26
  {
25
27
  provide: client_redshift_data_1.RedshiftDataClient,
26
- useFactory: () => redshiftClient
27
- ? redshiftClient
28
- : redshiftClient = new client_redshift_data_1.RedshiftDataClient({
29
- region: config.AWS_REGION,
30
- logger: console,
31
- credentials: config.NODE_ENV === 'production'
32
- ? undefined
33
- : {
34
- accessKeyId: config.AWS_ACCESS_KEY_ID,
35
- secretAccessKey: config.AWS_SECRET_ACCESS_KEY
36
- }
37
- })
28
+ useFactory: () => redshiftDataClient
29
+ ? redshiftDataClient
30
+ : redshiftDataClient = new client_redshift_data_1.RedshiftDataClient(from(config))
38
31
  },
39
32
  {
40
33
  provide: client_redshift_serverless_1.RedshiftServerlessClient,
41
- useFactory: () => redshiftClient
34
+ useFactory: () => redshiftDataClient
42
35
  ? redshiftServerlessClient
43
- : redshiftServerlessClient = new client_redshift_serverless_1.RedshiftServerlessClient({
44
- region: config.AWS_REGION,
45
- logger: console,
46
- credentials: config.NODE_ENV === 'production'
47
- ? undefined
48
- : {
49
- accessKeyId: config.AWS_ACCESS_KEY_ID,
50
- secretAccessKey: config.AWS_SECRET_ACCESS_KEY
51
- }
52
- })
36
+ : redshiftServerlessClient = new client_redshift_serverless_1.RedshiftServerlessClient(from(config))
37
+ },
38
+ {
39
+ provide: client_redshift_1.RedshiftClient,
40
+ useFactory: () => redshiftClient
41
+ ? redshiftClient
42
+ : redshiftClient = new client_redshift_1.RedshiftClient(from(config))
53
43
  },
54
44
  { provide: server_aws_redshift_config_class_1.ServerAwsRedshiftDataConfig, useValue: config },
55
45
  redshift_service_1.RedshiftDataService
@@ -61,3 +51,15 @@ exports.ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule;
61
51
  exports.ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule_1 = __decorate([
62
52
  (0, common_1.Module)({})
63
53
  ], ServerAwsRedshiftDataModule);
54
+ function from(config) {
55
+ return {
56
+ region: config.AWS_REGION,
57
+ logger: console,
58
+ credentials: config.NODE_ENV === 'production'
59
+ ? undefined
60
+ : {
61
+ accessKeyId: config.AWS_ACCESS_KEY_ID,
62
+ secretAccessKey: config.AWS_SECRET_ACCESS_KEY
63
+ }
64
+ };
65
+ }
package/dist/cjs/lib/services/redshift.service.d.ts CHANGED
@@ -28,8 +28,12 @@ export declare class RedshiftDataService {
28
28
  database: string;
29
29
  workgroupName: string;
30
30
  }): Promise<any>;
31
- query(_: {
31
+ queryV1(_: {
32
32
  database: string;
33
33
  workgroupName: string;
34
34
  }, Sql: string): Promise<number>;
35
+ query(_: {
36
+ database: string;
37
+ workgroupName: string;
38
+ }, Sql: string): Promise<(string | number)[][]>;
35
39
  }
package/dist/cjs/lib/services/redshift.service.js CHANGED
@@ -150,7 +150,7 @@ let RedshiftDataService = class RedshiftDataService {
150
150
  throw error;
151
151
  }
152
152
  }
153
- async query(_, Sql) {
153
+ async queryV1(_, Sql) {
154
154
  const result = await this.redshiftDataClient.send(new client_redshift_data_1.ExecuteStatementCommand({
155
155
  Database: _.database,
156
156
  Sql,
@@ -158,6 +158,41 @@ let RedshiftDataService = class RedshiftDataService {
158
158
  }));
159
159
  return await this.waitForStatement(result.Id);
160
160
  }
161
+ async query(_, Sql) {
162
+ try {
163
+ const executeCommand = new client_redshift_data_1.ExecuteStatementCommand({
164
+ Database: _.database,
165
+ Sql,
166
+ WorkgroupName: _.workgroupName
167
+ });
168
+ const { Id } = await this.redshiftDataClient.send(executeCommand);
169
+ if (!Id) {
170
+ throw new Error("Failed to get statement ID");
171
+ }
172
+ let status = "";
173
+ do {
174
+ const describeCommand = new client_redshift_data_1.DescribeStatementCommand({ Id });
175
+ const { Status } = await this.redshiftDataClient.send(describeCommand);
176
+ status = Status || "";
177
+ if (status === "FAILED") {
178
+ throw new Error("Query execution failed");
179
+ }
180
+ if (status !== "FINISHED") {
181
+ await new Promise(resolve => setTimeout(resolve, 1000));
182
+ }
183
+ } while (status !== "FINISHED");
184
+ const getResultsCommand = new client_redshift_data_1.GetStatementResultCommand({ Id });
185
+ const results = await this.redshiftDataClient.send(getResultsCommand);
186
+ const records = results.Records || [];
187
+ return records.map(record => {
188
+ return record.map(field => field.stringValue || field.longValue || field.doubleValue);
189
+ });
190
+ }
191
+ catch (error) {
192
+ console.error({ detail: "Error executing query:", error });
193
+ throw error;
194
+ }
195
+ }
161
196
  };
162
197
  exports.RedshiftDataService = RedshiftDataService;
163
198
  exports.RedshiftDataService = RedshiftDataService = __decorate([
package/dist/esm/lib/server-aws-redshift.module.js CHANGED
@@ -14,7 +14,9 @@ const client_redshift_data_1 = require("@aws-sdk/client-redshift-data");
14
14
  const redshift_service_1 = require("./services/redshift.service");
15
15
  const server_aws_redshift_config_class_1 = require("./classes/server-aws-redshift-config.class");
16
16
  const client_redshift_serverless_1 = require("@aws-sdk/client-redshift-serverless");
17
+ const client_redshift_1 = require("@aws-sdk/client-redshift");
17
18
  let redshiftClient = null;
19
+ let redshiftDataClient = null;
18
20
  let redshiftServerlessClient = null;
19
21
  let ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule_1 = class ServerAwsRedshiftDataModule {
20
22
  static configure(config) {
@@ -23,33 +25,21 @@ let ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule_1 = class ServerAw
23
25
  providers: [
24
26
  {
25
27
  provide: client_redshift_data_1.RedshiftDataClient,
26
- useFactory: () => redshiftClient
27
- ? redshiftClient
28
- : redshiftClient = new client_redshift_data_1.RedshiftDataClient({
29
- region: config.AWS_REGION,
30
- logger: console,
31
- credentials: config.NODE_ENV === 'production'
32
- ? undefined
33
- : {
34
- accessKeyId: config.AWS_ACCESS_KEY_ID,
35
- secretAccessKey: config.AWS_SECRET_ACCESS_KEY
36
- }
37
- })
28
+ useFactory: () => redshiftDataClient
29
+ ? redshiftDataClient
30
+ : redshiftDataClient = new client_redshift_data_1.RedshiftDataClient(from(config))
38
31
  },
39
32
  {
40
33
  provide: client_redshift_serverless_1.RedshiftServerlessClient,
41
- useFactory: () => redshiftClient
34
+ useFactory: () => redshiftDataClient
42
35
  ? redshiftServerlessClient
43
- : redshiftServerlessClient = new client_redshift_serverless_1.RedshiftServerlessClient({
44
- region: config.AWS_REGION,
45
- logger: console,
46
- credentials: config.NODE_ENV === 'production'
47
- ? undefined
48
- : {
49
- accessKeyId: config.AWS_ACCESS_KEY_ID,
50
- secretAccessKey: config.AWS_SECRET_ACCESS_KEY
51
- }
52
- })
36
+ : redshiftServerlessClient = new client_redshift_serverless_1.RedshiftServerlessClient(from(config))
37
+ },
38
+ {
39
+ provide: client_redshift_1.RedshiftClient,
40
+ useFactory: () => redshiftClient
41
+ ? redshiftClient
42
+ : redshiftClient = new client_redshift_1.RedshiftClient(from(config))
53
43
  },
54
44
  { provide: server_aws_redshift_config_class_1.ServerAwsRedshiftDataConfig, useValue: config },
55
45
  redshift_service_1.RedshiftDataService
@@ -61,3 +51,15 @@ exports.ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule;
61
51
  exports.ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule = ServerAwsRedshiftDataModule_1 = __decorate([
62
52
  (0, common_1.Module)({})
63
53
  ], ServerAwsRedshiftDataModule);
54
+ function from(config) {
55
+ return {
56
+ region: config.AWS_REGION,
57
+ logger: console,
58
+ credentials: config.NODE_ENV === 'production'
59
+ ? undefined
60
+ : {
61
+ accessKeyId: config.AWS_ACCESS_KEY_ID,
62
+ secretAccessKey: config.AWS_SECRET_ACCESS_KEY
63
+ }
64
+ };
65
+ }
package/dist/esm/lib/services/redshift.service.d.ts CHANGED
@@ -28,8 +28,12 @@ export declare class RedshiftDataService {
28
28
  database: string;
29
29
  workgroupName: string;
30
30
  }): Promise<any>;
31
- query(_: {
31
+ queryV1(_: {
32
32
  database: string;
33
33
  workgroupName: string;
34
34
  }, Sql: string): Promise<number>;
35
+ query(_: {
36
+ database: string;
37
+ workgroupName: string;
38
+ }, Sql: string): Promise<(string | number)[][]>;
35
39
  }
package/dist/esm/lib/services/redshift.service.js CHANGED
@@ -150,7 +150,7 @@ let RedshiftDataService = class RedshiftDataService {
150
150
  throw error;
151
151
  }
152
152
  }
153
- async query(_, Sql) {
153
+ async queryV1(_, Sql) {
154
154
  const result = await this.redshiftDataClient.send(new client_redshift_data_1.ExecuteStatementCommand({
155
155
  Database: _.database,
156
156
  Sql,
@@ -158,6 +158,41 @@ let RedshiftDataService = class RedshiftDataService {
158
158
  }));
159
159
  return await this.waitForStatement(result.Id);
160
160
  }
161
+ async query(_, Sql) {
162
+ try {
163
+ const executeCommand = new client_redshift_data_1.ExecuteStatementCommand({
164
+ Database: _.database,
165
+ Sql,
166
+ WorkgroupName: _.workgroupName
167
+ });
168
+ const { Id } = await this.redshiftDataClient.send(executeCommand);
169
+ if (!Id) {
170
+ throw new Error("Failed to get statement ID");
171
+ }
172
+ let status = "";
173
+ do {
174
+ const describeCommand = new client_redshift_data_1.DescribeStatementCommand({ Id });
175
+ const { Status } = await this.redshiftDataClient.send(describeCommand);
176
+ status = Status || "";
177
+ if (status === "FAILED") {
178
+ throw new Error("Query execution failed");
179
+ }
180
+ if (status !== "FINISHED") {
181
+ await new Promise(resolve => setTimeout(resolve, 1000));
182
+ }
183
+ } while (status !== "FINISHED");
184
+ const getResultsCommand = new client_redshift_data_1.GetStatementResultCommand({ Id });
185
+ const results = await this.redshiftDataClient.send(getResultsCommand);
186
+ const records = results.Records || [];
187
+ return records.map(record => {
188
+ return record.map(field => field.stringValue || field.longValue || field.doubleValue);
189
+ });
190
+ }
191
+ catch (error) {
192
+ console.error({ detail: "Error executing query:", error });
193
+ throw error;
194
+ }
195
+ }
161
196
  };
162
197
  exports.RedshiftDataService = RedshiftDataService;
163
198
  exports.RedshiftDataService = RedshiftDataService = __decorate([
package/dist/types/lib/services/redshift.service.d.ts CHANGED
@@ -28,8 +28,12 @@ export declare class RedshiftDataService {
28
28
  database: string;
29
29
  workgroupName: string;
30
30
  }): Promise<any>;
31
- query(_: {
31
+ queryV1(_: {
32
32
  database: string;
33
33
  workgroupName: string;
34
34
  }, Sql: string): Promise<number>;
35
+ query(_: {
36
+ database: string;
37
+ workgroupName: string;
38
+ }, Sql: string): Promise<(string | number)[][]>;
35
39
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onivoro/server-aws-redshift",
3
- "version": "22.0.5",
3
+ "version": "22.0.7",
4
4
  "repository": {
5
5
  "url": "git+https://github.com/onivoro/server-aws-redshift.git"
6
6
  },