@l-v-yonsama/multi-platform-database-drivers 0.1.51 → 0.1.54
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/built/src/drivers/AwsDriver.d.ts +2 -2
- package/built/src/drivers/BaseDriver.d.ts +6 -6
- package/built/src/drivers/BaseDriver.js +9 -52
- package/built/src/drivers/BaseDriver.js.map +1 -1
- package/built/src/drivers/MySQLDriver.d.ts +4 -4
- package/built/src/drivers/MySQLDriver.js +19 -20
- package/built/src/drivers/MySQLDriver.js.map +1 -1
- package/built/src/drivers/PostgresDriver.d.ts +5 -5
- package/built/src/drivers/PostgresDriver.js +20 -19
- package/built/src/drivers/PostgresDriver.js.map +1 -1
- package/built/src/drivers/RDSBaseDriver.d.ts +11 -1
- package/built/src/drivers/RDSBaseDriver.js +85 -1
- package/built/src/drivers/RDSBaseDriver.js.map +1 -1
- package/built/src/drivers/RedisDriver.d.ts +2 -2
- package/built/src/drivers/RedisDriver.js +1 -1
- package/built/src/drivers/RedisDriver.js.map +1 -1
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.d.ts +2 -2
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.js +1 -1
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.js.map +1 -1
- package/built/src/drivers/aws/AwsS3ServiceClient.d.ts +2 -2
- package/built/src/drivers/aws/AwsS3ServiceClient.js +1 -1
- package/built/src/drivers/aws/AwsS3ServiceClient.js.map +1 -1
- package/built/src/drivers/aws/AwsSQSServiceClient.d.ts +2 -2
- package/built/src/drivers/aws/AwsSQSServiceClient.js +2 -2
- package/built/src/drivers/aws/AwsSQSServiceClient.js.map +1 -1
- package/built/src/helpers/ResourceHelper.d.ts +8 -0
- package/built/src/helpers/ResourceHelper.js +94 -0
- package/built/src/helpers/ResourceHelper.js.map +1 -0
- package/built/src/helpers/SQLHelper.d.ts +9 -2
- package/built/src/helpers/SQLHelper.js +113 -54
- package/built/src/helpers/SQLHelper.js.map +1 -1
- package/built/src/helpers/index.d.ts +1 -0
- package/built/src/helpers/index.js +1 -0
- package/built/src/helpers/index.js.map +1 -1
- package/built/src/index.d.ts +1 -0
- package/built/src/index.js +1 -0
- package/built/src/index.js.map +1 -1
- package/built/src/resource/DbResource.d.ts +27 -26
- package/built/src/resource/DbResource.js +68 -87
- package/built/src/resource/DbResource.js.map +1 -1
- package/built/src/resource/MultipleResultSetDataHolder.d.ts +2 -1
- package/built/src/resource/MultipleResultSetDataHolder.js.map +1 -1
- package/built/src/resource/ResultSetDataHolder.d.ts +12 -41
- package/built/src/resource/ResultSetDataHolder.js +5 -18
- package/built/src/resource/ResultSetDataHolder.js.map +1 -1
- package/built/src/types/CompareKey.d.ts +9 -0
- package/built/src/types/CompareKey.js +3 -0
- package/built/src/types/CompareKey.js.map +1 -0
- package/built/src/types/ResourceType.d.ts +3 -1
- package/built/src/types/ResourceType.js +3 -1
- package/built/src/types/ResourceType.js.map +1 -1
- package/built/src/types/index.d.ts +2 -0
- package/built/src/types/index.js +2 -0
- package/built/src/types/index.js.map +1 -1
- package/built/src/types/resource/Annonations.d.ts +33 -0
- package/built/src/types/resource/Annonations.js +36 -0
- package/built/src/types/resource/Annonations.js.map +1 -0
- package/built/src/types/resource/index.d.ts +1 -0
- package/built/src/types/resource/index.js +5 -0
- package/built/src/types/resource/index.js.map +1 -0
- package/package.json +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Redis } from 'ioredis';
|
|
2
2
|
import { BaseDriver, Scannable } from './BaseDriver';
|
|
3
|
-
import { DbConnection,
|
|
3
|
+
import { DbConnection, DbKey, RedisDatabase, RedisKeyParams, ResultSetDataHolder } from '../resource';
|
|
4
4
|
import { RedisKeyType, ScanParams } from '../types';
|
|
5
5
|
export declare class RedisDriver extends BaseDriver implements Scannable {
|
|
6
6
|
client: Redis | undefined;
|
|
@@ -10,6 +10,6 @@ export declare class RedisDriver extends BaseDriver implements Scannable {
|
|
|
10
10
|
scanStream(params: ScanParams): Promise<DbKey<RedisKeyParams>[]>;
|
|
11
11
|
scan(params: ScanParams): Promise<ResultSetDataHolder>;
|
|
12
12
|
getValueByKey(client: Redis, key: string, type: RedisKeyType): Promise<any>;
|
|
13
|
-
getInfomationSchemas(): Promise<Array<
|
|
13
|
+
getInfomationSchemas(): Promise<Array<RedisDatabase>>;
|
|
14
14
|
closeSub(): Promise<string>;
|
|
15
15
|
}
|
|
@@ -118,7 +118,7 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
|
|
|
118
118
|
new resource_1.RdhKey('val', types_1.GeneralColumnType.UNKNOWN),
|
|
119
119
|
]);
|
|
120
120
|
dbKeys.forEach((dbKey) => {
|
|
121
|
-
rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { key: dbKey.
|
|
121
|
+
rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { key: dbKey.name }));
|
|
122
122
|
});
|
|
123
123
|
return rdh;
|
|
124
124
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../src/drivers/RedisDriver.ts"],"names":[],"mappings":";;;;AAEA,qCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../src/drivers/RedisDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AwsDatabase, DbConnection, ResultSetDataHolder } from '../../resource';
|
|
2
2
|
import { ScanParams } from '../../types';
|
|
3
3
|
import { CloudWatchLogsClient, GetQueryResultsCommandOutput, LogStream, OutputLogEvent, QueryDefinition, StartQueryCommandInput } from '@aws-sdk/client-cloudwatch-logs';
|
|
4
4
|
import { AwsServiceClient } from './AwsServiceClient';
|
|
@@ -19,7 +19,7 @@ export declare class AwsCloudwatchServiceClient extends AwsServiceClient impleme
|
|
|
19
19
|
scan(params: ScanParams): Promise<ResultSetDataHolder>;
|
|
20
20
|
scanLogGroup(params: ScanParams): Promise<ResultSetDataHolder>;
|
|
21
21
|
scanLogStream(params: ScanParams): Promise<ResultSetDataHolder>;
|
|
22
|
-
getInfomationSchemas(): Promise<
|
|
22
|
+
getInfomationSchemas(): Promise<AwsDatabase>;
|
|
23
23
|
getLogStreams({ logGroupName, }: {
|
|
24
24
|
logGroupName: string;
|
|
25
25
|
}): Promise<LogStream[]>;
|
|
@@ -176,7 +176,7 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
176
176
|
}
|
|
177
177
|
nextToken = result.nextToken;
|
|
178
178
|
} while (nextToken);
|
|
179
|
-
dbDatabase.comment = `${dbDatabase.
|
|
179
|
+
dbDatabase.comment = `${dbDatabase.children.length} ${(0, pluralize_1.plural)('group')}`;
|
|
180
180
|
}
|
|
181
181
|
catch (e) {
|
|
182
182
|
console.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsCloudwatchServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsCloudwatchServiceClient.ts"],"names":[],"mappings":";;;;AAEA,
|
|
1
|
+
{"version":3,"file":"AwsCloudwatchServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsCloudwatchServiceClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3';
|
|
2
|
-
import {
|
|
2
|
+
import { AwsDatabase, DbConnection, DbKey, ResultSetDataHolder, S3KeyParams } from '../../resource';
|
|
3
3
|
import { ScanParams } from '../../types';
|
|
4
4
|
import { AwsServiceClient } from './AwsServiceClient';
|
|
5
5
|
import { ClientConfigType } from '../AwsDriver';
|
|
@@ -16,7 +16,7 @@ export declare class AwsS3ServiceClient extends AwsServiceClient implements Scan
|
|
|
16
16
|
withValue: boolean | 'auto';
|
|
17
17
|
}): Promise<DbKey<S3KeyParams>[]>;
|
|
18
18
|
scan(params: ScanParams): Promise<ResultSetDataHolder>;
|
|
19
|
-
getInfomationSchemas(): Promise<
|
|
19
|
+
getInfomationSchemas(): Promise<AwsDatabase>;
|
|
20
20
|
createBucket({ bucket }: {
|
|
21
21
|
bucket: string;
|
|
22
22
|
}): Promise<void>;
|
|
@@ -98,7 +98,7 @@ class AwsS3ServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
98
98
|
]);
|
|
99
99
|
list.forEach((dbKey) => {
|
|
100
100
|
var _a;
|
|
101
|
-
rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { key: dbKey.
|
|
101
|
+
rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { key: dbKey.name, value: (_a = dbKey.params) === null || _a === void 0 ? void 0 : _a.base64 }));
|
|
102
102
|
});
|
|
103
103
|
return rdh;
|
|
104
104
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsS3ServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsS3ServiceClient.ts"],"names":[],"mappings":";;;;AAGA,kDAY4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"AwsS3ServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsS3ServiceClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ReceiveMessageCommandInput, SQSClient } from '@aws-sdk/client-sqs';
|
|
2
|
-
import {
|
|
2
|
+
import { AwsDatabase, DbConnection, DbKey, ResultSetDataHolder, SQSMessageParams } from '../../resource';
|
|
3
3
|
import { ScanParams } from '../../types';
|
|
4
4
|
import { AwsSQSAttributes } from '../../types/AwsSQSAttributes';
|
|
5
5
|
import { AwsServiceClient } from './AwsServiceClient';
|
|
@@ -12,7 +12,7 @@ export declare class AwsSQSServiceClient extends AwsServiceClient implements Sca
|
|
|
12
12
|
protected testSub(): Promise<void>;
|
|
13
13
|
receiveMessages(params: ReceiveMessageCommandInput): Promise<DbKey<SQSMessageParams>[]>;
|
|
14
14
|
scan(params: ScanParams): Promise<ResultSetDataHolder>;
|
|
15
|
-
getInfomationSchemas(): Promise<
|
|
15
|
+
getInfomationSchemas(): Promise<AwsDatabase>;
|
|
16
16
|
private toAttributes;
|
|
17
17
|
createQueue({ name, attributes, }: {
|
|
18
18
|
name: string;
|
|
@@ -62,7 +62,7 @@ class AwsSQSServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
62
62
|
new resource_1.RdhKey('approximateFirstReceiveTimestamp', types_1.GeneralColumnType.TIMESTAMP),
|
|
63
63
|
]);
|
|
64
64
|
keys.forEach((dbKey) => {
|
|
65
|
-
rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { messageId: dbKey.
|
|
65
|
+
rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { messageId: dbKey.name }));
|
|
66
66
|
});
|
|
67
67
|
return rdh;
|
|
68
68
|
});
|
|
@@ -95,7 +95,7 @@ class AwsSQSServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
95
95
|
}
|
|
96
96
|
NextToken = queues.NextToken;
|
|
97
97
|
} while (NextToken);
|
|
98
|
-
dbDatabase.comment = `${dbDatabase.
|
|
98
|
+
dbDatabase.comment = `${dbDatabase.children.length} ${(0, pluralize_1.plural)('queue')}`;
|
|
99
99
|
}
|
|
100
100
|
catch (e) {
|
|
101
101
|
console.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSQSServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsSQSServiceClient.ts"],"names":[],"mappings":";;;;AAGA,oDAU6B;AAC7B,iDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"AwsSQSServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsSQSServiceClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.diff = void 0;
|
|
4
|
+
const types_1 = require("../types");
|
|
5
|
+
const diff = (rdh1, rdh2) => {
|
|
6
|
+
var _a, _b, _c;
|
|
7
|
+
const result = {
|
|
8
|
+
ok: false,
|
|
9
|
+
deleted: 0,
|
|
10
|
+
inserted: 0,
|
|
11
|
+
updated: 0,
|
|
12
|
+
};
|
|
13
|
+
if (!((_a = rdh1.meta) === null || _a === void 0 ? void 0 : _a.compareKeys) || ((_b = rdh1.meta) === null || _b === void 0 ? void 0 : _b.compareKeys.length) === 0) {
|
|
14
|
+
return result;
|
|
15
|
+
}
|
|
16
|
+
const keynames = rdh1.keynames();
|
|
17
|
+
const compareKey = getAvailableCompareKey(keynames, (_c = rdh1.meta) === null || _c === void 0 ? void 0 : _c.compareKeys);
|
|
18
|
+
if (!compareKey) {
|
|
19
|
+
return result;
|
|
20
|
+
}
|
|
21
|
+
const hasAlreadyChecked = new Set();
|
|
22
|
+
rdh2.rows.forEach((row2) => {
|
|
23
|
+
row2.clearAllAnnotations();
|
|
24
|
+
});
|
|
25
|
+
rdh1.rows.forEach((row1) => {
|
|
26
|
+
row1.clearAllAnnotations();
|
|
27
|
+
const key1 = createCompareKeysValue(compareKey, row1);
|
|
28
|
+
hasAlreadyChecked.add(key1);
|
|
29
|
+
let removed = true;
|
|
30
|
+
for (const row2 of rdh2.rows) {
|
|
31
|
+
const key2 = createCompareKeysValue(compareKey, row2);
|
|
32
|
+
if (key1 === key2) {
|
|
33
|
+
removed = false;
|
|
34
|
+
let updated = false;
|
|
35
|
+
keynames.forEach((name) => {
|
|
36
|
+
var _a, _b, _c, _d;
|
|
37
|
+
const v1 = (_b = (_a = row1.values[name]) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
|
|
38
|
+
const v2 = (_d = (_c = row2.values[name]) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : '';
|
|
39
|
+
const diffR = v1 != v2;
|
|
40
|
+
if (v1 != v2) {
|
|
41
|
+
updated = true;
|
|
42
|
+
row1.pushAnnotation(name, types_1.AnnotationType.Upd, row2.values[name]);
|
|
43
|
+
row2.pushAnnotation(name, types_1.AnnotationType.Upd, row1.values[name]);
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
if (updated) {
|
|
47
|
+
result.updated++;
|
|
48
|
+
}
|
|
49
|
+
break;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
if (removed) {
|
|
53
|
+
keynames.forEach((name) => {
|
|
54
|
+
row1.pushAnnotation(name, types_1.AnnotationType.Del);
|
|
55
|
+
});
|
|
56
|
+
result.deleted++;
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
rdh2.rows.forEach((row2) => {
|
|
60
|
+
const key2 = createCompareKeysValue(compareKey, row2);
|
|
61
|
+
if (!hasAlreadyChecked.has(key2)) {
|
|
62
|
+
keynames.forEach((name) => {
|
|
63
|
+
row2.pushAnnotation(name, types_1.AnnotationType.Add);
|
|
64
|
+
});
|
|
65
|
+
result.inserted++;
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
result.ok = true;
|
|
69
|
+
return result;
|
|
70
|
+
};
|
|
71
|
+
exports.diff = diff;
|
|
72
|
+
function createCompareKeysValue(compareKey, row1) {
|
|
73
|
+
var _a;
|
|
74
|
+
if (compareKey.kind === 'primary') {
|
|
75
|
+
return compareKey.names.map((k) => { var _a; return (_a = row1.values[k]) !== null && _a !== void 0 ? _a : ''; }).join('|:|');
|
|
76
|
+
}
|
|
77
|
+
return (_a = row1.values[compareKey.name]) !== null && _a !== void 0 ? _a : '';
|
|
78
|
+
}
|
|
79
|
+
function getAvailableCompareKey(keynames, compareKeys) {
|
|
80
|
+
for (const ckey of compareKeys) {
|
|
81
|
+
if (ckey.kind === 'primary') {
|
|
82
|
+
if (ckey.names.every((it) => keynames.includes(it))) {
|
|
83
|
+
return ckey;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
else if (ckey.kind === 'uniq') {
|
|
87
|
+
if (keynames.includes(ckey.name)) {
|
|
88
|
+
return ckey;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
return undefined;
|
|
93
|
+
}
|
|
94
|
+
//# sourceMappingURL=ResourceHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ResourceHelper.js","sourceRoot":"","sources":["../../../src/helpers/ResourceHelper.ts"],"names":[],"mappings":";;;AACA,oCAAsD;AAS/C,MAAM,IAAI,GAAG,CAClB,IAAyB,EACzB,IAAyB,EACb,EAAE;;IACd,MAAM,MAAM,GAAe;QACzB,EAAE,EAAE,KAAK;QACT,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;KACX,CAAC;IACF,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,CAAA,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,CAAC,MAAM,MAAK,CAAC,EAAE;QAClE,OAAO,MAAM,CAAC;KACf;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjC,MAAM,UAAU,GAAG,sBAAsB,CAAC,QAAQ,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,CAAC,CAAC;IAC5E,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,MAAM,CAAC;KACf;IAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACtD,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;YAC5B,MAAM,IAAI,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACtD,IAAI,IAAI,KAAK,IAAI,EAAE;gBACjB,OAAO,GAAG,KAAK,CAAC;gBAEhB,IAAI,OAAO,GAAG,KAAK,CAAC;gBACpB,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;;oBACxB,MAAM,EAAE,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;oBAC/C,MAAM,EAAE,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;oBAC/C,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,CAAC;oBAEvB,IAAI,EAAE,IAAI,EAAE,EAAE;wBACZ,OAAO,GAAG,IAAI,CAAC;wBACf,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAc,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;wBACjE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAc,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;qBAClE;gBACH,CAAC,CAAC,CAAC;gBACH,IAAI,OAAO,EAAE;oBACX,MAAM,CAAC,OAAO,EAAE,CAAC;iBAClB;gBACD,MAAM;aACP;SACF;QACD,IAAI,OAAO,EAAE;YACX,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACxB,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAc,CAAC,GAAG,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,EAAE,CAAC;SAClB;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,MAAM,IAAI,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAChC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACxB,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAc,CAAC,GAAG,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,QAAQ,EAAE,CAAC;SACnB;IACH,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;IAEjB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAzEW,QAAA,IAAI,QAyEf;AAEF,SAAS,sBAAsB,CAAC,UAAsB,EAAE,IAAY;;IAClE,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;QACjC,OAAO,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACtE;IACD,OAAO,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC;AAC5C,CAAC;AAED,SAAS,sBAAsB,CAC7B,QAAkB,EAClB,WAAyB;IAEzB,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;QAC9B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;YAC3B,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE;gBACnD,OAAO,IAAI,CAAC;aACb;SACF;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;YAC/B,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChC,OAAO,IAAI,CAAC;aACb;SACF;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RdsDatabase } from '../resource/DbResource';
|
|
2
2
|
export declare enum ProposalKind {
|
|
3
3
|
Schema = 0,
|
|
4
4
|
Table = 1,
|
|
@@ -11,5 +11,12 @@ export type Proposal = {
|
|
|
11
11
|
detail?: string;
|
|
12
12
|
desc?: string;
|
|
13
13
|
};
|
|
14
|
-
export
|
|
14
|
+
export type ProposalParams = {
|
|
15
|
+
sql: string;
|
|
16
|
+
lastChar: string;
|
|
17
|
+
keyword: string;
|
|
18
|
+
parentWord?: string;
|
|
19
|
+
db?: RdsDatabase;
|
|
20
|
+
};
|
|
21
|
+
export declare const getProposals: (params: ProposalParams) => Proposal[];
|
|
15
22
|
export declare const RESERVED_WORDS: string[];
|
|
@@ -9,95 +9,127 @@ var ProposalKind;
|
|
|
9
9
|
ProposalKind[ProposalKind["Column"] = 2] = "Column";
|
|
10
10
|
ProposalKind[ProposalKind["ReservedWord"] = 3] = "ReservedWord";
|
|
11
11
|
})(ProposalKind = exports.ProposalKind || (exports.ProposalKind = {}));
|
|
12
|
-
const getProposals = (
|
|
12
|
+
const getProposals = (params) => {
|
|
13
|
+
const { db, sql, lastChar, keyword, parentWord } = params;
|
|
13
14
|
const upperKeyword = keyword.toUpperCase();
|
|
14
15
|
const upperParentWord = parentWord === null || parentWord === void 0 ? void 0 : parentWord.toUpperCase();
|
|
15
16
|
let ast;
|
|
16
|
-
try {
|
|
17
|
-
[ast] = (0, pgsql_ast_parser_1.parse)(sql, { locationTracking: true });
|
|
18
|
-
}
|
|
19
|
-
catch (_) {
|
|
20
|
-
}
|
|
21
17
|
const retList = [];
|
|
22
|
-
|
|
23
|
-
if (
|
|
24
|
-
|
|
18
|
+
try {
|
|
19
|
+
if (db) {
|
|
20
|
+
try {
|
|
21
|
+
[ast] = (0, pgsql_ast_parser_1.parse)(sql, { locationTracking: true });
|
|
22
|
+
}
|
|
23
|
+
catch (_) {
|
|
24
|
+
}
|
|
25
|
+
if (parentWord) {
|
|
26
|
+
let list = getProposalsByKeywordWithParent(db, ast, upperKeyword, upperParentWord, lastChar);
|
|
27
|
+
if (list.length === 0) {
|
|
28
|
+
list = getProposalsByKeyword(db, upperKeyword, lastChar);
|
|
29
|
+
}
|
|
30
|
+
retList.push(...list);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
if (keyword) {
|
|
34
|
+
const list = getProposalsByKeyword(db, upperKeyword, lastChar);
|
|
35
|
+
retList.push(...list);
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
retList.push(...getAllProposals(db));
|
|
39
|
+
}
|
|
40
|
+
}
|
|
25
41
|
}
|
|
26
|
-
|
|
27
|
-
|
|
42
|
+
if (lastChar !== '.' && !parentWord) {
|
|
43
|
+
exports.RESERVED_WORDS.filter((s) => s.startsWith(upperKeyword)).forEach((s) => {
|
|
44
|
+
retList.push({
|
|
45
|
+
label: s,
|
|
46
|
+
kind: ProposalKind.ReservedWord,
|
|
47
|
+
});
|
|
48
|
+
});
|
|
28
49
|
}
|
|
29
50
|
}
|
|
30
|
-
|
|
31
|
-
retList.push(...getAllProposals(db));
|
|
51
|
+
catch (_) {
|
|
32
52
|
}
|
|
33
|
-
exports.RESERVED_WORDS.filter((s) => s.startsWith(upperKeyword)).forEach((s) => {
|
|
34
|
-
retList.push({
|
|
35
|
-
label: s,
|
|
36
|
-
kind: ProposalKind.ReservedWord,
|
|
37
|
-
});
|
|
38
|
-
});
|
|
39
53
|
return retList;
|
|
40
54
|
};
|
|
41
55
|
exports.getProposals = getProposals;
|
|
56
|
+
const resolveAlias = (ast, alias) => {
|
|
57
|
+
if (!ast || !alias) {
|
|
58
|
+
return undefined;
|
|
59
|
+
}
|
|
60
|
+
if (ast.type === 'select') {
|
|
61
|
+
for (const tbl of ast.from) {
|
|
62
|
+
if (tbl.type === 'table') {
|
|
63
|
+
if (tbl.name.alias.toUpperCase() === alias) {
|
|
64
|
+
return tbl.name.name;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return undefined;
|
|
70
|
+
};
|
|
42
71
|
const matchKeyword = (list, keyword) => {
|
|
43
72
|
return list.some((it) => it.toUpperCase().startsWith(keyword));
|
|
44
73
|
};
|
|
45
|
-
const
|
|
46
|
-
var _a;
|
|
47
|
-
const detail = (schema.isDefault ? '' : schema.getName() + ' ') + ((_a = table.comment) !== null && _a !== void 0 ? _a : '');
|
|
48
|
-
return {
|
|
49
|
-
label: table.name,
|
|
50
|
-
kind: ProposalKind.Table,
|
|
51
|
-
detail,
|
|
52
|
-
};
|
|
53
|
-
};
|
|
54
|
-
const createColumnProposal = (table, column) => {
|
|
55
|
-
var _a, _b;
|
|
56
|
-
const detail = `${(_a = table.comment) !== null && _a !== void 0 ? _a : table.name}.${(_b = column.comment) !== null && _b !== void 0 ? _b : column.name}`;
|
|
57
|
-
return {
|
|
58
|
-
label: column.name,
|
|
59
|
-
kind: ProposalKind.Column,
|
|
60
|
-
detail,
|
|
61
|
-
};
|
|
62
|
-
};
|
|
63
|
-
const getProposalsByKeywordWithParent = (db, keyword, parentWord) => {
|
|
74
|
+
const getProposalsByKeywordWithParent = (db, ast, keyword, parentWord, lastChar) => {
|
|
64
75
|
var _a;
|
|
65
76
|
const retList = [];
|
|
66
|
-
const schema = db.
|
|
67
|
-
schema
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
77
|
+
const schema = db.children.find((it) => it.name.toUpperCase() === parentWord);
|
|
78
|
+
if (schema) {
|
|
79
|
+
schema.children.forEach((table) => {
|
|
80
|
+
var _a;
|
|
81
|
+
const table_comment = (_a = table.comment) !== null && _a !== void 0 ? _a : '';
|
|
82
|
+
if (keyword === '' ||
|
|
83
|
+
matchKeyword([table.name, table_comment], keyword)) {
|
|
84
|
+
retList.push(createTableProposal(schema, table));
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
}
|
|
74
88
|
const defaultSchema = db.getSchema({ isDefault: true });
|
|
75
|
-
|
|
89
|
+
let table = defaultSchema.children.find((it) => it.name.toUpperCase() === parentWord);
|
|
90
|
+
if (!table) {
|
|
91
|
+
const resolvedName = resolveAlias(ast, parentWord);
|
|
92
|
+
if (resolvedName) {
|
|
93
|
+
table = defaultSchema.children.find((it) => it.name.toUpperCase() === resolvedName.toUpperCase());
|
|
94
|
+
}
|
|
95
|
+
}
|
|
76
96
|
if (table) {
|
|
77
97
|
const table_comment = (_a = table.comment) !== null && _a !== void 0 ? _a : '';
|
|
78
98
|
if (matchKeyword([table.name, table_comment], keyword)) {
|
|
79
99
|
retList.push(createTableProposal(schema, table));
|
|
80
100
|
}
|
|
81
|
-
table.
|
|
101
|
+
table.children.forEach((column) => {
|
|
82
102
|
var _a;
|
|
83
103
|
const columnComment = (_a = column.comment) !== null && _a !== void 0 ? _a : '';
|
|
84
|
-
if (
|
|
104
|
+
if (keyword === '' ||
|
|
105
|
+
matchKeyword([column.name, columnComment], keyword)) {
|
|
85
106
|
retList.push(createColumnProposal(table, column));
|
|
86
107
|
}
|
|
87
108
|
});
|
|
88
109
|
}
|
|
89
110
|
return retList;
|
|
90
111
|
};
|
|
91
|
-
const getProposalsByKeyword = (db, keyword) => {
|
|
112
|
+
const getProposalsByKeyword = (db, keyword, lastChar) => {
|
|
92
113
|
const retList = [];
|
|
93
114
|
const schema = db.getSchema({ isDefault: true });
|
|
94
|
-
|
|
115
|
+
if (lastChar === ' ') {
|
|
116
|
+
if (['INTO', 'UPDATE', 'FROM'].includes(keyword)) {
|
|
117
|
+
schema.children.forEach((table) => {
|
|
118
|
+
retList.push(createTableProposal(schema, table));
|
|
119
|
+
});
|
|
120
|
+
return retList;
|
|
121
|
+
}
|
|
122
|
+
if ('DELETE' === keyword) {
|
|
123
|
+
retList.push(createReservedWordProposal('FROM'));
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
schema.children.forEach((table) => {
|
|
95
127
|
var _a;
|
|
96
128
|
const table_comment = (_a = table.comment) !== null && _a !== void 0 ? _a : '';
|
|
97
129
|
if (matchKeyword([table.name, table_comment], keyword)) {
|
|
98
130
|
retList.push(createTableProposal(schema, table));
|
|
99
131
|
}
|
|
100
|
-
table.
|
|
132
|
+
table.children.forEach((column) => {
|
|
101
133
|
var _a;
|
|
102
134
|
const columnComment = (_a = column.comment) !== null && _a !== void 0 ? _a : '';
|
|
103
135
|
if (matchKeyword([column.name, columnComment], keyword)) {
|
|
@@ -110,14 +142,41 @@ const getProposalsByKeyword = (db, keyword) => {
|
|
|
110
142
|
const getAllProposals = (db) => {
|
|
111
143
|
const retList = [];
|
|
112
144
|
const schema = db.getSchema({ isDefault: true });
|
|
113
|
-
schema.
|
|
145
|
+
schema.children.forEach((table) => {
|
|
114
146
|
retList.push(createTableProposal(schema, table));
|
|
115
|
-
table.
|
|
147
|
+
table.children.forEach((column) => {
|
|
116
148
|
retList.push(createColumnProposal(table, column));
|
|
117
149
|
});
|
|
118
150
|
});
|
|
119
151
|
return retList;
|
|
120
152
|
};
|
|
153
|
+
const createTableProposal = (schema, table) => {
|
|
154
|
+
var _a;
|
|
155
|
+
let detail = (_a = table.comment) !== null && _a !== void 0 ? _a : '';
|
|
156
|
+
if ((schema === null || schema === void 0 ? void 0 : schema.isDefault) === false) {
|
|
157
|
+
detail = schema.name + ' ' + detail;
|
|
158
|
+
}
|
|
159
|
+
return {
|
|
160
|
+
label: table.name,
|
|
161
|
+
kind: ProposalKind.Table,
|
|
162
|
+
detail,
|
|
163
|
+
};
|
|
164
|
+
};
|
|
165
|
+
const createColumnProposal = (table, column) => {
|
|
166
|
+
var _a, _b;
|
|
167
|
+
const detail = `${(_a = table.comment) !== null && _a !== void 0 ? _a : table.name}.${(_b = column.comment) !== null && _b !== void 0 ? _b : column.name}`;
|
|
168
|
+
return {
|
|
169
|
+
label: column.name,
|
|
170
|
+
kind: ProposalKind.Column,
|
|
171
|
+
detail,
|
|
172
|
+
};
|
|
173
|
+
};
|
|
174
|
+
const createReservedWordProposal = (word) => {
|
|
175
|
+
return {
|
|
176
|
+
label: word,
|
|
177
|
+
kind: ProposalKind.ReservedWord,
|
|
178
|
+
};
|
|
179
|
+
};
|
|
121
180
|
exports.RESERVED_WORDS = [
|
|
122
181
|
'ACCESSIBLE',
|
|
123
182
|
'ADD',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLHelper.js","sourceRoot":"","sources":["../../../src/helpers/SQLHelper.ts"],"names":[],"mappings":";;;AAEA,uDAAoD;AAEpD,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,mDAAU,CAAA;IACV,iDAAS,CAAA;IACT,mDAAU,CAAA;IACV,+DAAgB,CAAA;AAClB,CAAC,EALW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAKvB;
|
|
1
|
+
{"version":3,"file":"SQLHelper.js","sourceRoot":"","sources":["../../../src/helpers/SQLHelper.ts"],"names":[],"mappings":"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"}
|