@onivoro/server-aws-redshift 24.33.18 → 24.33.20
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.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onivoro/server-aws-redshift",
|
|
3
|
-
"version": "24.33.
|
|
3
|
+
"version": "24.33.20",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "./src/index.js",
|
|
@@ -10,8 +10,8 @@
|
|
|
10
10
|
"url": "https://github.com/onivoro/monorepo.git"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@onivoro/server-aws-credential-providers": "24.33.
|
|
14
|
-
"@onivoro/server-common": "24.33.
|
|
13
|
+
"@onivoro/server-aws-credential-providers": "24.33.20",
|
|
14
|
+
"@onivoro/server-common": "24.33.20",
|
|
15
15
|
"tslib": "^2.3.0"
|
|
16
16
|
},
|
|
17
17
|
"peerDependencies": {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { RedshiftDataClient } from "@aws-sdk/client-redshift-data";
|
|
1
|
+
import { RedshiftDataClient, SqlParameter } from "@aws-sdk/client-redshift-data";
|
|
2
2
|
import { RedshiftServerlessClient } from '@aws-sdk/client-redshift-serverless';
|
|
3
|
+
export type RedshiftQueryParameters = Record<string, string | number | boolean | null | undefined>;
|
|
3
4
|
export declare class RedshiftDataService {
|
|
4
5
|
private redshiftDataClient;
|
|
5
6
|
private redshiftServerlessClient;
|
|
@@ -31,11 +32,11 @@ export declare class RedshiftDataService {
|
|
|
31
32
|
queryV1(_: {
|
|
32
33
|
database: string;
|
|
33
34
|
workgroupName: string;
|
|
34
|
-
}, Sql: string): Promise<number | undefined>;
|
|
35
|
+
}, Sql: string, parameters?: RedshiftQueryParameters | SqlParameter[]): Promise<number | undefined>;
|
|
35
36
|
query(_: {
|
|
36
37
|
database: string;
|
|
37
38
|
workgroupName: string;
|
|
38
|
-
}, Sql: string): Promise<(string | number | undefined)[][]>;
|
|
39
|
+
}, Sql: string, parameters?: RedshiftQueryParameters | SqlParameter[]): Promise<(string | number | undefined)[][]>;
|
|
39
40
|
getAssociatedIAmRolesByWorkgroup(_: {
|
|
40
41
|
database: string;
|
|
41
42
|
workgroupName: string;
|
|
@@ -6,6 +6,16 @@ const common_1 = require("@nestjs/common");
|
|
|
6
6
|
const client_redshift_data_1 = require("@aws-sdk/client-redshift-data");
|
|
7
7
|
const client_redshift_serverless_1 = require("@aws-sdk/client-redshift-serverless");
|
|
8
8
|
const crypto_1 = require("crypto");
|
|
9
|
+
function toSqlParameters(parameters) {
|
|
10
|
+
if (!parameters)
|
|
11
|
+
return undefined;
|
|
12
|
+
if (Array.isArray(parameters))
|
|
13
|
+
return parameters;
|
|
14
|
+
return Object.entries(parameters).map(([name, value]) => ({
|
|
15
|
+
name,
|
|
16
|
+
value: value === null || value === undefined ? undefined : String(value),
|
|
17
|
+
}));
|
|
18
|
+
}
|
|
9
19
|
let RedshiftDataService = class RedshiftDataService {
|
|
10
20
|
redshiftDataClient;
|
|
11
21
|
redshiftServerlessClient;
|
|
@@ -141,20 +151,22 @@ let RedshiftDataService = class RedshiftDataService {
|
|
|
141
151
|
throw error;
|
|
142
152
|
}
|
|
143
153
|
}
|
|
144
|
-
async queryV1(_, Sql) {
|
|
154
|
+
async queryV1(_, Sql, parameters) {
|
|
145
155
|
const result = await this.redshiftDataClient.send(new client_redshift_data_1.ExecuteStatementCommand({
|
|
146
156
|
Database: _.database,
|
|
147
157
|
Sql,
|
|
148
|
-
WorkgroupName: _.workgroupName
|
|
158
|
+
WorkgroupName: _.workgroupName,
|
|
159
|
+
Parameters: toSqlParameters(parameters),
|
|
149
160
|
}));
|
|
150
161
|
return await this.waitForStatement(result.Id);
|
|
151
162
|
}
|
|
152
|
-
async query(_, Sql) {
|
|
163
|
+
async query(_, Sql, parameters) {
|
|
153
164
|
try {
|
|
154
165
|
const executeCommand = new client_redshift_data_1.ExecuteStatementCommand({
|
|
155
166
|
Database: _.database,
|
|
156
167
|
Sql,
|
|
157
168
|
WorkgroupName: _.workgroupName,
|
|
169
|
+
Parameters: toSqlParameters(parameters),
|
|
158
170
|
});
|
|
159
171
|
const { Id } = await this.redshiftDataClient.send(executeCommand);
|
|
160
172
|
if (!Id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redshift.service.js","sourceRoot":"","sources":["../../../../../../../libs/server/aws-redshift/src/lib/services/redshift.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"redshift.service.js","sourceRoot":"","sources":["../../../../../../../libs/server/aws-redshift/src/lib/services/redshift.service.ts"],"names":[],"mappings":"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"}
|