@l-v-yonsama/multi-platform-database-drivers 0.1.33 → 0.1.35
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/AwsBaseDriver.d.ts +24 -0
- package/built/src/drivers/AwsBaseDriver.js +89 -0
- package/built/src/drivers/AwsBaseDriver.js.map +1 -0
- package/built/src/drivers/AwsCloudwatchDriver.d.ts +28 -0
- package/built/src/drivers/AwsCloudwatchDriver.js +192 -0
- package/built/src/drivers/AwsCloudwatchDriver.js.map +1 -0
- package/built/src/drivers/AwsS3Driver.d.ts +13 -10
- package/built/src/drivers/AwsS3Driver.js +37 -44
- package/built/src/drivers/AwsS3Driver.js.map +1 -1
- package/built/src/drivers/AwsSQSDriver.d.ts +21 -14
- package/built/src/drivers/AwsSQSDriver.js +55 -55
- package/built/src/drivers/AwsSQSDriver.js.map +1 -1
- package/built/src/drivers/BaseDriver.d.ts +11 -4
- package/built/src/drivers/BaseDriver.js +18 -1
- package/built/src/drivers/BaseDriver.js.map +1 -1
- package/built/src/drivers/DBDriverResolver.js +4 -0
- package/built/src/drivers/DBDriverResolver.js.map +1 -1
- package/built/src/drivers/MySQLDriver.js +30 -33
- package/built/src/drivers/MySQLDriver.js.map +1 -1
- package/built/src/drivers/PostgresDriver.js +18 -26
- package/built/src/drivers/PostgresDriver.js.map +1 -1
- package/built/src/drivers/RedisDriver.d.ts +4 -4
- package/built/src/drivers/RedisDriver.js +16 -6
- package/built/src/drivers/RedisDriver.js.map +1 -1
- package/built/src/drivers/index.d.ts +1 -0
- package/built/src/drivers/index.js +1 -0
- package/built/src/drivers/index.js.map +1 -1
- package/built/src/example.d.ts +1 -0
- package/built/src/example.js +25 -0
- package/built/src/example.js.map +1 -0
- package/built/src/resource/DbResource.d.ts +37 -27
- package/built/src/resource/DbResource.js +10 -123
- package/built/src/resource/DbResource.js.map +1 -1
- package/built/src/resource/ResultSetDataHolder.d.ts +0 -2
- package/built/src/resource/ResultSetDataHolder.js +1 -14
- package/built/src/resource/ResultSetDataHolder.js.map +1 -1
- package/built/src/types/AwsRegion.d.ts +14 -13
- package/built/src/types/AwsRegion.js +15 -14
- package/built/src/types/AwsRegion.js.map +1 -1
- package/built/src/types/AwsSQSAttributes.d.ts +18 -0
- package/built/src/types/AwsSQSAttributes.js +3 -0
- package/built/src/types/AwsSQSAttributes.js.map +1 -0
- package/built/src/types/DBType.d.ts +1 -2
- package/built/src/types/DBType.js +2 -15
- package/built/src/types/DBType.js.map +1 -1
- package/built/src/types/RedisKeyType.d.ts +1 -0
- package/built/src/types/RedisKeyType.js +2 -1
- package/built/src/types/RedisKeyType.js.map +1 -1
- package/built/src/types/ScanParams.d.ts +1 -2
- package/built/src/types/index.d.ts +1 -0
- package/built/src/types/index.js +1 -0
- package/built/src/types/index.js.map +1 -1
- package/package.json +4 -1
|
@@ -4,78 +4,71 @@ exports.AwsSQSDriver = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const client_sqs_1 = require("@aws-sdk/client-sqs");
|
|
6
6
|
const url = tslib_1.__importStar(require("url"));
|
|
7
|
-
const BaseDriver_1 = require("./BaseDriver");
|
|
8
7
|
const resource_1 = require("../resource");
|
|
9
8
|
const types_1 = require("../types");
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
throw new Error('Method not implemented.');
|
|
13
|
-
}
|
|
9
|
+
const AwsBaseDriver_1 = require("./AwsBaseDriver");
|
|
10
|
+
class AwsSQSDriver extends AwsBaseDriver_1.AwsBaseDriver {
|
|
14
11
|
constructor(conRes) {
|
|
15
12
|
super(conRes);
|
|
16
13
|
}
|
|
17
14
|
connectSub() {
|
|
18
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
this.
|
|
20
|
-
this.config.region = types_1.AwsRegion.usWest1;
|
|
21
|
-
if (this.conRes.region) {
|
|
22
|
-
this.config.region = this.conRes.region;
|
|
23
|
-
}
|
|
24
|
-
this.config.credentials = {
|
|
25
|
-
accessKeyId: this.conRes.user,
|
|
26
|
-
secretAccessKey: this.conRes.password,
|
|
27
|
-
};
|
|
28
|
-
if (this.conRes.url) {
|
|
29
|
-
this.config.endpoint = this.conRes.url;
|
|
30
|
-
}
|
|
31
|
-
this.sqsClient = new client_sqs_1.SQSClient(this.config);
|
|
16
|
+
this.sqsClient = new client_sqs_1.SQSClient(this.createClientConfig());
|
|
32
17
|
return this.test(false);
|
|
33
18
|
});
|
|
34
19
|
}
|
|
35
|
-
|
|
20
|
+
testSub() {
|
|
36
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
37
22
|
let errorReason = '';
|
|
38
|
-
if (with_connect) {
|
|
39
|
-
errorReason = yield this.connect();
|
|
40
|
-
}
|
|
41
23
|
if (this.sqsClient) {
|
|
42
24
|
try {
|
|
43
|
-
|
|
25
|
+
yield this.sqsClient.send(new client_sqs_1.ListQueuesCommand({ MaxResults: 1 }));
|
|
44
26
|
}
|
|
45
27
|
catch (e) {
|
|
46
28
|
errorReason = e.message;
|
|
47
29
|
}
|
|
48
30
|
}
|
|
49
|
-
if (with_connect) {
|
|
50
|
-
yield this.disconnect();
|
|
51
|
-
}
|
|
52
31
|
return errorReason;
|
|
53
32
|
});
|
|
54
33
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
this.
|
|
58
|
-
|
|
34
|
+
receiveMessages(params) {
|
|
35
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
|
+
const { Messages } = yield this.sqsClient.send(new client_sqs_1.ReceiveMessageCommand(params));
|
|
37
|
+
return Messages.map((it) => {
|
|
38
|
+
var _a, _b;
|
|
39
|
+
const params = {
|
|
40
|
+
body: it.Body,
|
|
41
|
+
receiptHandle: it.ReceiptHandle,
|
|
42
|
+
md5OfBody: it.MD5OfBody,
|
|
43
|
+
sentTimestamp: this.toDate(this.toNum((_a = it.Attributes) === null || _a === void 0 ? void 0 : _a.SentTimestamp)),
|
|
44
|
+
approximateFirstReceiveTimestamp: this.toDate(this.toNum((_b = it.Attributes) === null || _b === void 0 ? void 0 : _b.ApproximateFirstReceiveTimestamp)),
|
|
45
|
+
};
|
|
46
|
+
return new resource_1.DbKey(it.MessageId, params);
|
|
47
|
+
});
|
|
48
|
+
});
|
|
59
49
|
}
|
|
60
50
|
scan(params) {
|
|
61
51
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
62
52
|
const { target, limit, keyword } = params;
|
|
63
|
-
|
|
53
|
+
let keys = yield this.receiveMessages({
|
|
64
54
|
QueueUrl: target,
|
|
65
55
|
MaxNumberOfMessages: limit,
|
|
66
|
-
|
|
67
|
-
|
|
56
|
+
AttributeNames: ['SentTimestamp', 'ApproximateFirstReceiveTimestamp'],
|
|
57
|
+
});
|
|
68
58
|
if (keyword) {
|
|
69
|
-
|
|
59
|
+
keys = keys.filter((it) => it.meta.body.includes(keyword) || it.name.includes(keyword));
|
|
70
60
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
61
|
+
const rdh = new resource_1.ResultSetDataHolder([
|
|
62
|
+
new resource_1.RdhKey('messageId', types_1.GeneralColumnType.TEXT),
|
|
63
|
+
new resource_1.RdhKey('body', types_1.GeneralColumnType.TEXT),
|
|
64
|
+
new resource_1.RdhKey('receiptHandle', types_1.GeneralColumnType.TEXT),
|
|
65
|
+
new resource_1.RdhKey('sentTimestamp', types_1.GeneralColumnType.TIMESTAMP),
|
|
66
|
+
new resource_1.RdhKey('approximateFirstReceiveTimestamp', types_1.GeneralColumnType.TIMESTAMP),
|
|
67
|
+
]);
|
|
68
|
+
keys.forEach((dbKey) => {
|
|
69
|
+
rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { messageId: dbKey.getName() }));
|
|
78
70
|
});
|
|
71
|
+
return rdh;
|
|
79
72
|
});
|
|
80
73
|
}
|
|
81
74
|
getInfomationSchemas() {
|
|
@@ -92,13 +85,16 @@ class AwsSQSDriver extends BaseDriver_1.BaseDriver {
|
|
|
92
85
|
const queues = yield this.sqsClient.send(new client_sqs_1.ListQueuesCommand({ MaxResults: 1000, NextToken }));
|
|
93
86
|
if (queues.QueueUrls) {
|
|
94
87
|
for (const queueUrl of queues.QueueUrls) {
|
|
95
|
-
|
|
88
|
+
let name = url.parse(queueUrl).pathname;
|
|
89
|
+
const idx = name.lastIndexOf('/');
|
|
90
|
+
if (idx) {
|
|
91
|
+
name = name.substring(idx + 1);
|
|
92
|
+
}
|
|
96
93
|
const attr = yield this.sqsClient.send(new client_sqs_1.GetQueueAttributesCommand({
|
|
97
94
|
QueueUrl: queueUrl,
|
|
98
95
|
AttributeNames: ['All'],
|
|
99
96
|
}));
|
|
100
|
-
const
|
|
101
|
-
const dbQueue = new resource_1.DbSQSQueue(name, queueUrl, attributes);
|
|
97
|
+
const dbQueue = new resource_1.DbSQSQueue(name, queueUrl, this.toAttributes(attr === null || attr === void 0 ? void 0 : attr.Attributes));
|
|
102
98
|
dbDatabase.addChild(dbQueue);
|
|
103
99
|
}
|
|
104
100
|
}
|
|
@@ -112,29 +108,33 @@ class AwsSQSDriver extends BaseDriver_1.BaseDriver {
|
|
|
112
108
|
return dbResources;
|
|
113
109
|
});
|
|
114
110
|
}
|
|
115
|
-
|
|
111
|
+
toAttributes(it) {
|
|
112
|
+
return Object.assign(Object.assign({}, it), { ApproximateNumberOfMessages: this.toNum(it.ApproximateNumberOfMessages), ApproximateNumberOfMessagesNotVisible: this.toNum(it.ApproximateNumberOfMessagesNotVisible), ApproximateNumberOfMessagesDelayed: this.toNum(it.ApproximateNumberOfMessagesDelayed), DelaySeconds: this.toNum(it.DelaySeconds), MaximumMessageSize: this.toNum(it.MaximumMessageSize), MessageRetentionPeriod: this.toNum(it.MessageRetentionPeriod), ReceiveMessageWaitTimeSeconds: this.toNum(it.ReceiveMessageWaitTimeSeconds), VisibilityTimeout: this.toNum(it.VisibilityTimeout), CreatedTimestamp: this.toNum(it.CreatedTimestamp), LastModifiedTimestamp: this.toNum(it.LastModifiedTimestamp), FifoQueue: this.toBoolean(it.FifoQueue), ContentBasedDeduplication: this.toBoolean(it.ContentBasedDeduplication) });
|
|
113
|
+
}
|
|
114
|
+
createQueue({ name, attributes, }) {
|
|
116
115
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
117
|
-
|
|
116
|
+
const { QueueUrl } = yield this.sqsClient.send(new client_sqs_1.CreateQueueCommand({ QueueName: name, Attributes: attributes }));
|
|
117
|
+
return QueueUrl;
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
|
-
|
|
120
|
+
deleteQueue({ url }) {
|
|
121
121
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
122
|
-
yield this.sqsClient.send(new client_sqs_1.
|
|
122
|
+
yield this.sqsClient.send(new client_sqs_1.DeleteQueueCommand({ QueueUrl: url }));
|
|
123
123
|
});
|
|
124
124
|
}
|
|
125
|
-
|
|
125
|
+
purgeQueue({ url }) {
|
|
126
126
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
127
|
-
yield this.sqsClient.send(new client_sqs_1.
|
|
127
|
+
yield this.sqsClient.send(new client_sqs_1.PurgeQueueCommand({ QueueUrl: url }));
|
|
128
128
|
});
|
|
129
129
|
}
|
|
130
|
-
|
|
130
|
+
deleteMessage({ url, receiptHandle, }) {
|
|
131
131
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
132
|
-
|
|
133
|
-
this.sqsClient.destroy();
|
|
134
|
-
}
|
|
135
|
-
return '';
|
|
132
|
+
yield this.sqsClient.send(new client_sqs_1.DeleteMessageCommand({ QueueUrl: url, ReceiptHandle: receiptHandle }));
|
|
136
133
|
});
|
|
137
134
|
}
|
|
135
|
+
getClient() {
|
|
136
|
+
return this.sqsClient;
|
|
137
|
+
}
|
|
138
138
|
}
|
|
139
139
|
exports.AwsSQSDriver = AwsSQSDriver;
|
|
140
140
|
//# sourceMappingURL=AwsSQSDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSQSDriver.js","sourceRoot":"","sources":["../../../src/drivers/AwsSQSDriver.ts"],"names":[],"mappings":";;;;AAGA,
|
|
1
|
+
{"version":3,"file":"AwsSQSDriver.js","sourceRoot":"","sources":["../../../src/drivers/AwsSQSDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { ColumnResolver, DbColumn, DbConnection, DbDatabase, ResultSetDataHolder, SchemaAndTableHints } from '../resource';
|
|
2
|
-
import { GeneralResult } from '../types';
|
|
2
|
+
import { GeneralResult, ScanParams } from '../types';
|
|
3
3
|
import { DBError } from './DBError';
|
|
4
|
+
export interface Scannable {
|
|
5
|
+
scan(params: ScanParams): Promise<ResultSetDataHolder>;
|
|
6
|
+
}
|
|
7
|
+
export declare function isScannable(arg: any): arg is Scannable;
|
|
8
|
+
export declare function isRDSDriver(arg: any): arg is RDSDriver;
|
|
9
|
+
export interface RDSDriver {
|
|
10
|
+
requestSql(sql: string, options?: RequestSqlOptions): Promise<ResultSetDataHolder>;
|
|
11
|
+
}
|
|
4
12
|
export declare abstract class BaseDriver {
|
|
5
13
|
isConnected: boolean;
|
|
6
14
|
protected conRes: DbConnection;
|
|
@@ -21,15 +29,14 @@ export declare abstract class BaseDriver {
|
|
|
21
29
|
connectToSshServer(): Promise<string>;
|
|
22
30
|
connect(): Promise<string>;
|
|
23
31
|
disconnect(): Promise<string>;
|
|
24
|
-
viewData(tableName: string, options
|
|
32
|
+
viewData(tableName: string, options?: {
|
|
25
33
|
schemaName?: string;
|
|
26
|
-
columnNames
|
|
34
|
+
columnNames?: string[];
|
|
27
35
|
}): Promise<ResultSetDataHolder>;
|
|
28
36
|
abstract connectSub(): Promise<string>;
|
|
29
37
|
abstract closeSub(): Promise<string>;
|
|
30
38
|
abstract getInfomationSchemas(): Promise<Array<DbDatabase>>;
|
|
31
39
|
abstract test(with_connect: boolean): Promise<string>;
|
|
32
|
-
abstract requestSql(sql: string, options?: RequestSqlOptions): Promise<ResultSetDataHolder>;
|
|
33
40
|
createDBError(message: string, sourceError: any): DBError;
|
|
34
41
|
}
|
|
35
42
|
export interface RequestSqlOptions {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BaseDriver = void 0;
|
|
3
|
+
exports.BaseDriver = exports.isRDSDriver = exports.isScannable = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const tunnel = tslib_1.__importStar(require("tunnel-ssh"));
|
|
6
6
|
const get_port_please_1 = require("get-port-please");
|
|
@@ -8,6 +8,20 @@ const fs = tslib_1.__importStar(require("fs"));
|
|
|
8
8
|
const resource_1 = require("../resource");
|
|
9
9
|
const types_1 = require("../types");
|
|
10
10
|
const DBError_1 = require("./DBError");
|
|
11
|
+
function isScannable(arg) {
|
|
12
|
+
if (!arg) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
return typeof arg === 'object' && typeof arg.scan === 'function';
|
|
16
|
+
}
|
|
17
|
+
exports.isScannable = isScannable;
|
|
18
|
+
function isRDSDriver(arg) {
|
|
19
|
+
if (!arg) {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
return typeof arg === 'object' && typeof arg.requestSql === 'function';
|
|
23
|
+
}
|
|
24
|
+
exports.isRDSDriver = isRDSDriver;
|
|
11
25
|
class BaseDriver {
|
|
12
26
|
constructor(conRes) {
|
|
13
27
|
this.conRes = conRes;
|
|
@@ -208,6 +222,9 @@ class BaseDriver {
|
|
|
208
222
|
viewData(tableName, options) {
|
|
209
223
|
var _a;
|
|
210
224
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
225
|
+
if (!isRDSDriver(this)) {
|
|
226
|
+
throw new Error('Not support yet.');
|
|
227
|
+
}
|
|
211
228
|
let sp = '';
|
|
212
229
|
let cols = '';
|
|
213
230
|
if (options === null || options === void 0 ? void 0 : options.schemaName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/BaseDriver.ts"],"names":[],"mappings":";;;;AAAA,2DAAqC;AACrC,qDAA0C;AAC1C,+CAAyB;AACzB,0CASqB;AACrB,
|
|
1
|
+
{"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/BaseDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const PostgresDriver_1 = require("./PostgresDriver");
|
|
|
10
10
|
const RedisDriver_1 = require("./RedisDriver");
|
|
11
11
|
const AwsS3Driver_1 = require("./AwsS3Driver");
|
|
12
12
|
const AwsSQSDriver_1 = require("./AwsSQSDriver");
|
|
13
|
+
const AwsCloudwatchDriver_1 = require("./AwsCloudwatchDriver");
|
|
13
14
|
const uid = new short_unique_id_1.default();
|
|
14
15
|
class DBDriverResolver {
|
|
15
16
|
static getInstance() {
|
|
@@ -47,6 +48,9 @@ class DBDriverResolver {
|
|
|
47
48
|
case types_1.DBType.AwsSQS:
|
|
48
49
|
driver = new AwsSQSDriver_1.AwsSQSDriver(conRes);
|
|
49
50
|
break;
|
|
51
|
+
case types_1.DBType.AwsCloudwatch:
|
|
52
|
+
driver = new AwsCloudwatchDriver_1.AwsCloudwatchDriver(conRes);
|
|
53
|
+
break;
|
|
50
54
|
default:
|
|
51
55
|
throw new Error(`${conRes.dbType} is not supported.`);
|
|
52
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBDriverResolver.js","sourceRoot":"","sources":["../../../src/drivers/DBDriverResolver.ts"],"names":[],"mappings":";;;;AAAA,8EAA4C;AAE5C,0CAA8D;AAC9D,oCAAkC;AAClC,+CAA4C;AAC5C,qDAAkD;AAClD,+CAA4C;AAC5C,+CAA4C;AAC5C,iDAA8C;
|
|
1
|
+
{"version":3,"file":"DBDriverResolver.js","sourceRoot":"","sources":["../../../src/drivers/DBDriverResolver.ts"],"names":[],"mappings":";;;;AAAA,8EAA4C;AAE5C,0CAA8D;AAC9D,oCAAkC;AAClC,+CAA4C;AAC5C,qDAAkD;AAClD,+CAA4C;AAC5C,+CAA4C;AAC5C,iDAA8C;AAC9C,+DAA4D;AAE5D,MAAM,GAAG,GAAG,IAAI,yBAAa,EAAE,CAAC;AAEhC,MAAa,gBAAgB;IAK3B,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;SACxC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAGD;QACE,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAsB,CAAC;IACjD,CAAC;IAED,aAAa,CAAC,YAAoB;QAChC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACb,+BAA+B,YAAY,cAAc,CAC1D,CAAC;SACH;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,YAAY,CAAuB,OAA0B;QAC3D,MAAM,MAAM,GAAG,IAAI,uBAAY,iCAC1B,OAAO,KACV,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IACrB,CAAC;QAEH,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,QAAQ,MAAM,CAAC,MAAM,EAAE;YAIrB,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YACR,KAAK,cAAM,CAAC,QAAQ;gBAClB,MAAM,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC;gBACpC,MAAM;YACR,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YAIR,KAAK,cAAM,CAAC,KAAK,CAAC;YAClB,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YACR,KAAK,cAAM,CAAC,MAAM;gBAChB,MAAM,GAAG,IAAI,2BAAY,CAAC,MAAM,CAAC,CAAC;gBAClC,MAAM;YACR,KAAK,cAAM,CAAC,aAAa;gBACvB,MAAM,GAAG,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC;gBACzC,MAAM;YAOR;gBACE,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,oBAAoB,CAAC,CAAC;SACzD;QACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,YAAY,CAAC,MAAkB;QAC7B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;IAEK,QAAQ;;YACZ,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAO,MAAkB,EAAE,EAAE;gBAClD,IAAI;oBACF,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;iBAC3B;gBAAC,OAAO,CAAC,EAAE;oBACV,YAAY,IAAI,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;iBAClC;YACH,CAAC,CAAA,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;CACF;AAxFD,4CAwFC"}
|
|
@@ -51,9 +51,11 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
|
|
|
51
51
|
errorReason = yield this.connect();
|
|
52
52
|
}
|
|
53
53
|
if (!errorReason) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
try {
|
|
55
|
+
yield this.requestSql('SELECT 1 from DUAL');
|
|
56
|
+
}
|
|
57
|
+
catch (e) {
|
|
58
|
+
errorReason = e.message;
|
|
57
59
|
}
|
|
58
60
|
if (with_connect) {
|
|
59
61
|
yield this.disconnect();
|
|
@@ -75,37 +77,32 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
|
|
|
75
77
|
resolver = this.createColumnResolver(sql);
|
|
76
78
|
}
|
|
77
79
|
const [rows, fields] = yield this.client.execute(sql, binds);
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
});
|
|
97
|
-
}
|
|
98
|
-
else {
|
|
99
|
-
rdh = new resource_1.ResultSetDataHolder(fields === undefined
|
|
100
|
-
? []
|
|
101
|
-
: fields.map((f) => this.fieldInfo2Key(f, resolver)));
|
|
102
|
-
rows.forEach((result) => {
|
|
103
|
-
rdh.addRow(result);
|
|
104
|
-
});
|
|
105
|
-
}
|
|
80
|
+
if (fields === undefined) {
|
|
81
|
+
const results = rows;
|
|
82
|
+
rdh = new resource_1.ResultSetDataHolder([
|
|
83
|
+
'fieldCount',
|
|
84
|
+
'affectedRows',
|
|
85
|
+
'insertId',
|
|
86
|
+
'serverStatus',
|
|
87
|
+
'warningStatus',
|
|
88
|
+
'changedRows',
|
|
89
|
+
]);
|
|
90
|
+
rdh.addRow({
|
|
91
|
+
fieldCount: results.fieldCount,
|
|
92
|
+
affectedRows: results.affectedRows,
|
|
93
|
+
insertId: results.insertId,
|
|
94
|
+
serverStatus: results.serverStatus,
|
|
95
|
+
warningStatus: results.warningStatus,
|
|
96
|
+
changedRows: results.changedRows,
|
|
97
|
+
});
|
|
106
98
|
}
|
|
107
|
-
|
|
108
|
-
rdh = resource_1.ResultSetDataHolder
|
|
99
|
+
else {
|
|
100
|
+
rdh = new resource_1.ResultSetDataHolder(fields === undefined
|
|
101
|
+
? []
|
|
102
|
+
: fields.map((f) => this.fieldInfo2Key(f, resolver)));
|
|
103
|
+
rows.forEach((result) => {
|
|
104
|
+
rdh.addRow(result);
|
|
105
|
+
});
|
|
109
106
|
}
|
|
110
107
|
}
|
|
111
108
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MySQLDriver.js","sourceRoot":"","sources":["../../../src/drivers/MySQLDriver.ts"],"names":[],"mappings":";;;;AAAA,8DAAwC;AACxC,6CAAyC;AAEzC,8DAA2D;AAC3D,6CAA6D;AAC7D,0CAWqB;AACrB,oCAA6C;AAE7C,MAAa,WAAY,SAAQ,uBAAU;IAGzC,YAAY,MAAoB;QAC9B,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,aAAa,CAAC,SAAS,EAAE,QAAyB;QAChD,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;SACzD;QACD,MAAM,IAAI,GAAG,wBAAU,CAAC,gBAAgB,CACtC,iCAAe,EACf,iCAAe,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAC5C,CAAC;QACF,MAAM,GAAG,GAAG,IAAI,iBAAM,CACpB,SAAS,CAAC,IAAI,EACd,yBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,EAC7B,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CACxD,CAAC;QACF,IAAI,GAAG,CAAC,IAAI,KAAK,yBAAiB,CAAC,OAAO,EAAE;SAE3C;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAEK,UAAU;;YACd,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG;gBACd,eAAe,EAAE,CAAC;gBAClB,kBAAkB,EAAE,IAAI;gBACxB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;aAC/B,CAAC;YACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACxC,IAAI;gBACF,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;aAClC;YAAC,OAAO,CAAC,EAAE;gBACV,YAAY,GAAG,CAAC,CAAC,OAAO,CAAC;aAC1B;YACD,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;IAEK,IAAI,CAAC,YAAY,GAAG,KAAK;;YAC7B,IAAI,WAAW,GAAG,EAAE,CAAC;YACrB,IAAI,YAAY,EAAE;gBAChB,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;aACpC;YACD,IAAI,CAAC,WAAW,EAAE;gBAChB,
|
|
1
|
+
{"version":3,"file":"MySQLDriver.js","sourceRoot":"","sources":["../../../src/drivers/MySQLDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,10 +49,7 @@ class PostgresDriver extends BaseDriver_1.BaseDriver {
|
|
|
49
49
|
if (with_connect) {
|
|
50
50
|
errorReason = yield this.connect();
|
|
51
51
|
}
|
|
52
|
-
|
|
53
|
-
if (rdh && rdh.errorMessage) {
|
|
54
|
-
errorReason = rdh.errorMessage;
|
|
55
|
-
}
|
|
52
|
+
yield this.requestSql('SELECT NOW()');
|
|
56
53
|
}
|
|
57
54
|
catch (e) {
|
|
58
55
|
errorReason = e.message;
|
|
@@ -68,31 +65,26 @@ class PostgresDriver extends BaseDriver_1.BaseDriver {
|
|
|
68
65
|
requestSql(sql, options) {
|
|
69
66
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
70
67
|
let rdh = new resource_1.ResultSetDataHolder([]);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
68
|
+
let binds = [];
|
|
69
|
+
if (options && options.binds) {
|
|
70
|
+
binds = options.binds;
|
|
71
|
+
}
|
|
72
|
+
const results = yield this.pool.query(sql, binds);
|
|
73
|
+
if (results) {
|
|
74
|
+
let resolver;
|
|
75
|
+
if (options && options.needsColumnResolve === true) {
|
|
76
|
+
resolver = this.createColumnResolver(sql);
|
|
75
77
|
}
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
? []
|
|
85
|
-
: fields.map((f) => this.fieldInfo2Key(f, resolver)));
|
|
86
|
-
if (results.rows) {
|
|
87
|
-
results.rows.forEach((result) => {
|
|
88
|
-
rdh.addRow(result);
|
|
89
|
-
});
|
|
90
|
-
}
|
|
78
|
+
const fields = results.fields;
|
|
79
|
+
rdh = new resource_1.ResultSetDataHolder(fields === undefined
|
|
80
|
+
? []
|
|
81
|
+
: fields.map((f) => this.fieldInfo2Key(f, resolver)));
|
|
82
|
+
if (results.rows) {
|
|
83
|
+
results.rows.forEach((result) => {
|
|
84
|
+
rdh.addRow(result);
|
|
85
|
+
});
|
|
91
86
|
}
|
|
92
87
|
}
|
|
93
|
-
catch (err) {
|
|
94
|
-
rdh = resource_1.ResultSetDataHolder.create(err);
|
|
95
|
-
}
|
|
96
88
|
rdh.setSqlStatement(sql);
|
|
97
89
|
return rdh;
|
|
98
90
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresDriver.js","sourceRoot":"","sources":["../../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":";;;;AAEA,oDAAmC;AACnC,6CAAyC;AACzC,oEAAiE;AACjE,6CAA6D;AAC7D,0CAWqB;AACrB,oCAA6C;AAE7C,MAAa,cAAe,SAAQ,uBAAU;IAG5C,YAAY,MAAoB;QAC9B,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IASD,aAAa,CAAC,SAAsB,EAAE,QAAyB;QAC7D,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACnC,OAAO,CAAC,GAAG,CACT,KAAK,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,MAC5C,SAAS,CAAC,UACZ,EAAE,CACH,CAAC;SACH;QACD,MAAM,IAAI,GAAG,wBAAU,CAAC,gBAAgB,CACtC,uCAAkB,EAClB,uCAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAC/C,CAAC;QACF,MAAM,GAAG,GAAG,IAAI,iBAAM,CACpB,SAAS,CAAC,IAAI,EACd,yBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,EAC7B,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CACrD,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAEK,UAAU;;YACd,IAAI,WAAW,GAAG,EAAE,CAAC;YAErB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAC3B;gBACE,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,UAAU;aACrB,EACD;gBACE,GAAG,EAAE,CAAC;gBACN,iBAAiB,EAAE,IAAI;gBACvB,uBAAuB,EAAE,IAAI;gBAC7B,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;aAC/B,CACF,CAAC;YAEF,IAAI,CAAC,IAAI,GAAG,IAAI,YAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAYjC,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAEhC,OAAO,WAAW,CAAC;QACrB,CAAC;KAAA;IAEK,IAAI,CAAC,YAAY,GAAG,KAAK;;YAC7B,IAAI,WAAW,GAAG,EAAE,CAAC;YACrB,IAAI;gBACF,IAAI,YAAY,EAAE;oBAChB,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;iBACpC;gBACD,MAAM,
|
|
1
|
+
{"version":3,"file":"PostgresDriver.js","sourceRoot":"","sources":["../../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { Redis } from 'ioredis';
|
|
2
|
-
import { BaseDriver,
|
|
2
|
+
import { BaseDriver, Scannable } from './BaseDriver';
|
|
3
3
|
import { DbConnection, DbDatabase, DbKey, RedisKeyParams, ResultSetDataHolder } from '../resource';
|
|
4
4
|
import { RedisKeyType, ScanParams } from '../types';
|
|
5
|
-
export declare class RedisDriver extends BaseDriver {
|
|
5
|
+
export declare class RedisDriver extends BaseDriver implements Scannable {
|
|
6
6
|
client: Redis | undefined;
|
|
7
7
|
databases: number;
|
|
8
8
|
constructor(conRes: DbConnection);
|
|
9
9
|
connectSub(): Promise<string>;
|
|
10
10
|
test(with_connect?: boolean): Promise<string>;
|
|
11
|
-
|
|
12
|
-
scan(params: ScanParams): Promise<
|
|
11
|
+
scanStream(params: ScanParams): Promise<DbKey<RedisKeyParams>[]>;
|
|
12
|
+
scan(params: ScanParams): Promise<ResultSetDataHolder>;
|
|
13
13
|
getValueByKey(client: Redis, key: string, type: RedisKeyType): Promise<any>;
|
|
14
14
|
getInfomationSchemas(): Promise<Array<DbDatabase>>;
|
|
15
15
|
closeSub(): Promise<string>;
|
|
@@ -84,12 +84,7 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
|
|
|
84
84
|
return errorReason;
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
|
-
|
|
88
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
89
|
-
return resource_1.ResultSetDataHolder.createEmpty();
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
scan(params) {
|
|
87
|
+
scanStream(params) {
|
|
93
88
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
94
89
|
const { target, limit, withValue, keyword } = params;
|
|
95
90
|
const keys = yield new Promise((resolve) => {
|
|
@@ -130,6 +125,21 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
|
|
|
130
125
|
return yield Promise.all(promises);
|
|
131
126
|
});
|
|
132
127
|
}
|
|
128
|
+
scan(params) {
|
|
129
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
130
|
+
const dbKeys = yield this.scanStream(params);
|
|
131
|
+
const rdh = new resource_1.ResultSetDataHolder([
|
|
132
|
+
new resource_1.RdhKey('key', types_1.GeneralColumnType.TEXT),
|
|
133
|
+
new resource_1.RdhKey('type', types_1.GeneralColumnType.ENUM),
|
|
134
|
+
new resource_1.RdhKey('ttl', types_1.GeneralColumnType.INTEGER),
|
|
135
|
+
new resource_1.RdhKey('val', types_1.GeneralColumnType.UNKNOWN),
|
|
136
|
+
]);
|
|
137
|
+
dbKeys.forEach((dbKey) => {
|
|
138
|
+
rdh.addRow(Object.assign(Object.assign({}, dbKey.params), { key: dbKey.getName() }));
|
|
139
|
+
});
|
|
140
|
+
return rdh;
|
|
141
|
+
});
|
|
142
|
+
}
|
|
133
143
|
getValueByKey(client, key, type) {
|
|
134
144
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
135
145
|
switch (type) {
|