@l-v-yonsama/multi-platform-database-drivers 0.1.10 → 0.1.11
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/db/DBError.js +1 -4
- package/built/src/db/DBError.js.map +1 -1
- package/built/src/db/drivers/AwsS3Driver.js +32 -35
- package/built/src/db/drivers/AwsS3Driver.js.map +1 -1
- package/built/src/db/drivers/BaseDriver.js +16 -19
- package/built/src/db/drivers/BaseDriver.js.map +1 -1
- package/built/src/db/drivers/MySQLDriver.js +30 -33
- package/built/src/db/drivers/MySQLDriver.js.map +1 -1
- package/built/src/db/drivers/PostgresDriver.js +31 -34
- package/built/src/db/drivers/PostgresDriver.js.map +1 -1
- package/built/src/db/drivers/RedisDriver.js +37 -40
- package/built/src/db/drivers/RedisDriver.js.map +1 -1
- package/built/src/db/drivers/index.js +5 -8
- package/built/src/db/drivers/index.js.map +1 -1
- package/built/src/db/index.js +3 -6
- package/built/src/db/index.js.map +1 -1
- package/built/src/db/resource/DbResource.js +43 -57
- package/built/src/db/resource/DbResource.js.map +1 -1
- package/built/src/db/resource/MultipleResultSetDataHolder.js +5 -8
- package/built/src/db/resource/MultipleResultSetDataHolder.js.map +1 -1
- package/built/src/db/resource/ResourceHelper.js +1 -5
- package/built/src/db/resource/ResourceHelper.js.map +1 -1
- package/built/src/db/resource/ResultSetDataHolder.js +33 -42
- package/built/src/db/resource/ResultSetDataHolder.js.map +1 -1
- package/built/src/db/resource/index.js +5 -8
- package/built/src/db/resource/index.js.map +1 -1
- package/built/src/db/resource/types/DBType.js +3 -6
- package/built/src/db/resource/types/DBType.js.map +1 -1
- package/built/src/db/resource/types/GeneralColumnType.js +5 -8
- package/built/src/db/resource/types/GeneralColumnType.js.map +1 -1
- package/built/src/db/resource/types/MySQLColumnType.js +7 -10
- package/built/src/db/resource/types/MySQLColumnType.js.map +1 -1
- package/built/src/db/resource/types/ODBCVendorType.js +2 -5
- package/built/src/db/resource/types/ODBCVendorType.js.map +1 -1
- package/built/src/db/resource/types/PostgresColumnType.js +6 -9
- package/built/src/db/resource/types/PostgresColumnType.js.map +1 -1
- package/built/src/db/resource/types/RedisKeyType.js +5 -8
- package/built/src/db/resource/types/RedisKeyType.js.map +1 -1
- package/built/src/db/resource/types/ResourceType.js +2 -5
- package/built/src/db/resource/types/ResourceType.js.map +1 -1
- package/built/src/db/resource/types/index.js +7 -10
- package/built/src/db/resource/types/index.js.map +1 -1
- package/built/src/index.js +3 -6
- package/built/src/index.js.map +1 -1
- package/built/src/service/DBAccessService.js +43 -47
- package/built/src/service/DBAccessService.js.map +1 -1
- package/built/src/service/DBDriverResolver.js +22 -26
- package/built/src/service/DBDriverResolver.js.map +1 -1
- package/built/src/service/SQLService.js +3 -7
- package/built/src/service/SQLService.js.map +1 -1
- package/built/src/service/index.js +5 -8
- package/built/src/service/index.js.map +1 -1
- package/built/src/service/request/RedisRequest.js +2 -5
- package/built/src/service/request/RedisRequest.js.map +1 -1
- package/built/src/service/request/S3Request.js +2 -5
- package/built/src/service/request/S3Request.js.map +1 -1
- package/built/src/service/request/index.js +2 -5
- package/built/src/service/request/index.js.map +1 -1
- package/built/src/service/response/GeneralDBResponse.js +1 -2
- package/built/src/service/response/GeneralResponse.js +1 -5
- package/built/src/service/response/GeneralResponse.js.map +1 -1
- package/built/src/service/response/index.js +2 -5
- package/built/src/service/response/index.js.map +1 -1
- package/built/src/service/response/reply/ConnectionResult.js +1 -2
- package/built/src/service/response/reply/FileExportReply.js +4 -7
- package/built/src/service/response/reply/FileExportReply.js.map +1 -1
- package/built/src/service/response/reply/FileProcessResult.js +3 -6
- package/built/src/service/response/reply/FileProcessResult.js.map +1 -1
- package/built/src/service/response/reply/GeneralReply.js +1 -4
- package/built/src/service/response/reply/GeneralReply.js.map +1 -1
- package/built/src/service/response/reply/OutputReply.js +4 -7
- package/built/src/service/response/reply/OutputReply.js.map +1 -1
- package/built/src/service/response/reply/ProgressReply.js +2 -5
- package/built/src/service/response/reply/ProgressReply.js.map +1 -1
- package/built/src/service/response/reply/types/FileExportType.js +2 -5
- package/built/src/service/response/reply/types/FileExportType.js.map +1 -1
- package/built/src/service/response/reply/types/OutputType.js +2 -5
- package/built/src/service/response/reply/types/OutputType.js.map +1 -1
- package/built/src/service/response/reply/types/ReplyEventType.js +2 -5
- package/built/src/service/response/reply/types/ReplyEventType.js.map +1 -1
- package/built/src/types/DateModifiedType.js +3 -6
- package/built/src/types/DateModifiedType.js.map +1 -1
- package/built/src/types/FileKindType.js +3 -6
- package/built/src/types/FileKindType.js.map +1 -1
- package/built/src/types/index.js +2 -5
- package/built/src/types/index.js.map +1 -1
- package/package.json +11 -8
package/built/src/db/DBError.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
class DBError extends Error {
|
|
1
|
+
export default class DBError extends Error {
|
|
4
2
|
constructor(message, code, errno, sqlMessage, sqlState) {
|
|
5
3
|
super(message);
|
|
6
4
|
this.name = this.constructor.name;
|
|
@@ -16,5 +14,4 @@ class DBError extends Error {
|
|
|
16
14
|
this.sqlState = sqlState;
|
|
17
15
|
}
|
|
18
16
|
}
|
|
19
|
-
exports.default = DBError;
|
|
20
17
|
//# sourceMappingURL=DBError.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBError.js","sourceRoot":"","sources":["../../../src/db/DBError.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DBError.js","sourceRoot":"","sources":["../../../src/db/DBError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,KAAK;IAMxC,YACE,OAAY,EACZ,IAAS,EACT,KAAU,EACV,UAAe,EACf,QAAa;QAEb,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,OAAO,KAAK,CAAC,iBAAiB,KAAK,UAAU,EAAE;YACjD,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;SACjD;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;SACvC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF"}
|
|
@@ -1,17 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
9
|
-
class AwsS3Driver extends BaseDriver_1.default {
|
|
1
|
+
import { __awaiter } from "tslib";
|
|
2
|
+
import BaseDriver from './BaseDriver';
|
|
3
|
+
import { DbDatabase, DbS3Bucket, DbS3Owner, } from '../resource/DbResource';
|
|
4
|
+
import ResultSetDataHolder from '../resource/ResultSetDataHolder';
|
|
5
|
+
import { DBType } from '../resource/types/DBType';
|
|
6
|
+
import { CreateBucketCommand, DeleteBucketCommand, DeleteObjectCommand, GetObjectCommand, ListBucketsCommand, ListObjectsCommand, PutObjectCommand, S3Client, } from '@aws-sdk/client-s3';
|
|
7
|
+
export default class AwsS3Driver extends BaseDriver {
|
|
10
8
|
constructor(conRes) {
|
|
11
9
|
super(conRes);
|
|
12
10
|
}
|
|
13
11
|
connectSub() {
|
|
14
|
-
return
|
|
12
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
15
13
|
this.config = {};
|
|
16
14
|
this.config.region = 'us-west-1';
|
|
17
15
|
if (this.conRes.region) {
|
|
@@ -21,23 +19,23 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
21
19
|
accessKeyId: this.conRes.user,
|
|
22
20
|
secretAccessKey: this.conRes.password,
|
|
23
21
|
};
|
|
24
|
-
if (this.conRes.dbType ===
|
|
22
|
+
if (this.conRes.dbType === DBType.Minio) {
|
|
25
23
|
this.config.endpoint = this.conRes.url;
|
|
26
24
|
this.config.s3ForcePathStyle = 'true';
|
|
27
25
|
}
|
|
28
|
-
this.s3Client = new
|
|
26
|
+
this.s3Client = new S3Client(this.config);
|
|
29
27
|
return this.test(false);
|
|
30
28
|
});
|
|
31
29
|
}
|
|
32
30
|
test(with_connect = false) {
|
|
33
|
-
return
|
|
31
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
34
32
|
let errorReason = '';
|
|
35
33
|
if (with_connect) {
|
|
36
34
|
errorReason = yield this.connect();
|
|
37
35
|
}
|
|
38
36
|
if (this.s3Client) {
|
|
39
37
|
try {
|
|
40
|
-
const a = yield this.s3Client.send(new
|
|
38
|
+
const a = yield this.s3Client.send(new ListBucketsCommand({}));
|
|
41
39
|
}
|
|
42
40
|
catch (e) {
|
|
43
41
|
console.error(e);
|
|
@@ -51,7 +49,7 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
51
49
|
});
|
|
52
50
|
}
|
|
53
51
|
countTables(tables, options) {
|
|
54
|
-
return
|
|
52
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
55
53
|
return new Array();
|
|
56
54
|
});
|
|
57
55
|
}
|
|
@@ -61,23 +59,23 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
61
59
|
}
|
|
62
60
|
}
|
|
63
61
|
getInfomationSchemas(options) {
|
|
64
|
-
return
|
|
62
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
65
63
|
if (!this.conRes) {
|
|
66
64
|
return [];
|
|
67
65
|
}
|
|
68
66
|
const dbResources = new Array();
|
|
69
|
-
const dbDatabase = new
|
|
67
|
+
const dbDatabase = new DbDatabase('S3');
|
|
70
68
|
dbResources.push(dbDatabase);
|
|
71
69
|
try {
|
|
72
|
-
const buckets = yield this.s3Client.send(new
|
|
70
|
+
const buckets = yield this.s3Client.send(new ListBucketsCommand({}));
|
|
73
71
|
if (buckets.Buckets) {
|
|
74
72
|
for (const bucket of buckets.Buckets) {
|
|
75
|
-
const dbBucket = new
|
|
73
|
+
const dbBucket = new DbS3Bucket(bucket.Name, bucket.CreationDate);
|
|
76
74
|
dbDatabase.addChild(dbBucket);
|
|
77
75
|
}
|
|
78
76
|
}
|
|
79
77
|
if (buckets.Owner) {
|
|
80
|
-
const dbOwner = new
|
|
78
|
+
const dbOwner = new DbS3Owner(buckets.Owner.ID, buckets.Owner.DisplayName);
|
|
81
79
|
dbDatabase.addChild(dbOwner);
|
|
82
80
|
}
|
|
83
81
|
else {
|
|
@@ -90,18 +88,18 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
90
88
|
});
|
|
91
89
|
}
|
|
92
90
|
requestSql(sql, options) {
|
|
93
|
-
return
|
|
94
|
-
return new
|
|
91
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
92
|
+
return new ResultSetDataHolder([]);
|
|
95
93
|
});
|
|
96
94
|
}
|
|
97
95
|
createBucket({ bucket }) {
|
|
98
|
-
return
|
|
99
|
-
yield this.s3Client.send(new
|
|
96
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
97
|
+
yield this.s3Client.send(new CreateBucketCommand({ Bucket: bucket }));
|
|
100
98
|
});
|
|
101
99
|
}
|
|
102
100
|
getValueByKey({ bucket, key, }) {
|
|
103
|
-
return
|
|
104
|
-
const data = yield this.s3Client.send(new
|
|
101
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
102
|
+
const data = yield this.s3Client.send(new GetObjectCommand({
|
|
105
103
|
Bucket: bucket,
|
|
106
104
|
Key: key,
|
|
107
105
|
}));
|
|
@@ -109,8 +107,8 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
109
107
|
});
|
|
110
108
|
}
|
|
111
109
|
putObject({ bucket, key, body, }) {
|
|
112
|
-
return
|
|
113
|
-
yield this.s3Client.send(new
|
|
110
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
111
|
+
yield this.s3Client.send(new PutObjectCommand({
|
|
114
112
|
Bucket: bucket,
|
|
115
113
|
Key: key,
|
|
116
114
|
Body: body,
|
|
@@ -118,21 +116,21 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
118
116
|
});
|
|
119
117
|
}
|
|
120
118
|
removeBucket({ bucket }) {
|
|
121
|
-
return
|
|
119
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
122
120
|
yield this.removeAllObjects({ bucket });
|
|
123
|
-
yield this.s3Client.send(new
|
|
121
|
+
yield this.s3Client.send(new DeleteBucketCommand({ Bucket: bucket }));
|
|
124
122
|
});
|
|
125
123
|
}
|
|
126
124
|
removeAllObjects({ bucket }) {
|
|
127
|
-
return
|
|
125
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
128
126
|
let truncated = true;
|
|
129
127
|
let pageMarker;
|
|
130
128
|
const bucketParams = { Bucket: bucket };
|
|
131
129
|
while (truncated) {
|
|
132
|
-
const response = yield this.s3Client.send(new
|
|
130
|
+
const response = yield this.s3Client.send(new ListObjectsCommand(bucketParams));
|
|
133
131
|
for (let i = 0; i < response.Contents.length; i++) {
|
|
134
132
|
const item = response.Contents[i];
|
|
135
|
-
const delR = yield this.s3Client.send(new
|
|
133
|
+
const delR = yield this.s3Client.send(new DeleteObjectCommand({
|
|
136
134
|
Bucket: bucket,
|
|
137
135
|
Key: item.Key,
|
|
138
136
|
}));
|
|
@@ -146,7 +144,7 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
146
144
|
});
|
|
147
145
|
}
|
|
148
146
|
closeSub() {
|
|
149
|
-
return
|
|
147
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
150
148
|
if (this.s3Client) {
|
|
151
149
|
this.s3Client.destroy();
|
|
152
150
|
}
|
|
@@ -154,5 +152,4 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
154
152
|
});
|
|
155
153
|
}
|
|
156
154
|
}
|
|
157
|
-
exports.default = AwsS3Driver;
|
|
158
155
|
//# sourceMappingURL=AwsS3Driver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsS3Driver.js","sourceRoot":"","sources":["../../../../src/db/drivers/AwsS3Driver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AwsS3Driver.js","sourceRoot":"","sources":["../../../../src/db/drivers/AwsS3Driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const resource_1 = require("../resource");
|
|
10
|
-
class BaseDriver {
|
|
1
|
+
import { __awaiter } from "tslib";
|
|
2
|
+
import DBError from '../DBError';
|
|
3
|
+
import * as tunnel from 'tunnel-ssh';
|
|
4
|
+
import getPort, { portNumbers } from 'get-port';
|
|
5
|
+
import { ResourceType } from '../resource/types/ResourceType';
|
|
6
|
+
import * as fs from 'fs';
|
|
7
|
+
import { ResourceHelper } from '../resource';
|
|
8
|
+
export default class BaseDriver {
|
|
11
9
|
constructor(conRes) {
|
|
12
10
|
this.conRes = conRes;
|
|
13
11
|
this.isConnected = false;
|
|
@@ -61,7 +59,7 @@ class BaseDriver {
|
|
|
61
59
|
searchNames.push('public');
|
|
62
60
|
for (const searchName of searchNames) {
|
|
63
61
|
const child = database.getChildByName(searchName, {
|
|
64
|
-
resouceType:
|
|
62
|
+
resouceType: ResourceType.Schema,
|
|
65
63
|
});
|
|
66
64
|
if (child) {
|
|
67
65
|
child.isDefault = true;
|
|
@@ -70,7 +68,7 @@ class BaseDriver {
|
|
|
70
68
|
}
|
|
71
69
|
const child = database
|
|
72
70
|
.getChildren()
|
|
73
|
-
.find((it) => it.getResouceType() ===
|
|
71
|
+
.find((it) => it.getResouceType() === ResourceType.Schema);
|
|
74
72
|
if (child) {
|
|
75
73
|
child.isDefault = true;
|
|
76
74
|
}
|
|
@@ -82,7 +80,7 @@ class BaseDriver {
|
|
|
82
80
|
if (this.conRes) {
|
|
83
81
|
for (let i = 0; i < resolver.hints.list.length; i++) {
|
|
84
82
|
const hints = resolver.hints.list[i];
|
|
85
|
-
const t =
|
|
83
|
+
const t = ResourceHelper.findResource(this.conRes, ResourceType.Table, hints.table);
|
|
86
84
|
if (t) {
|
|
87
85
|
return t.getChildByName(column, { unwrapQuote: true });
|
|
88
86
|
}
|
|
@@ -102,8 +100,8 @@ class BaseDriver {
|
|
|
102
100
|
return '';
|
|
103
101
|
}
|
|
104
102
|
connectToSshServer() {
|
|
105
|
-
return
|
|
106
|
-
this.sshLocalPort = yield (
|
|
103
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
104
|
+
this.sshLocalPort = yield getPort({ port: portNumbers(13000, 15100) });
|
|
107
105
|
return new Promise((resolve, reject) => {
|
|
108
106
|
const setting = Object.assign({}, this.conRes.ssh, {
|
|
109
107
|
localHost: '127.0.0.1',
|
|
@@ -127,7 +125,7 @@ class BaseDriver {
|
|
|
127
125
|
});
|
|
128
126
|
}
|
|
129
127
|
connect() {
|
|
130
|
-
return
|
|
128
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
131
129
|
let errorReason = '';
|
|
132
130
|
try {
|
|
133
131
|
this.initBaseStatus();
|
|
@@ -149,7 +147,7 @@ class BaseDriver {
|
|
|
149
147
|
});
|
|
150
148
|
}
|
|
151
149
|
disconnect() {
|
|
152
|
-
return
|
|
150
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
153
151
|
let errorReason = '';
|
|
154
152
|
try {
|
|
155
153
|
if (this.conRes) {
|
|
@@ -177,8 +175,7 @@ class BaseDriver {
|
|
|
177
175
|
});
|
|
178
176
|
}
|
|
179
177
|
createDBError(message, sourceError) {
|
|
180
|
-
return new
|
|
178
|
+
return new DBError(message, sourceError.code, sourceError.errno, sourceError.sqlMessage, sourceError.sqlState);
|
|
181
179
|
}
|
|
182
180
|
}
|
|
183
|
-
exports.default = BaseDriver;
|
|
184
181
|
//# sourceMappingURL=BaseDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../../src/db/drivers/BaseDriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../../src/db/drivers/BaseDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const GeneralColumnType_1 = require("../resource/types/GeneralColumnType");
|
|
11
|
-
class MySQLDriver extends BaseDriver_1.default {
|
|
1
|
+
import { __awaiter } from "tslib";
|
|
2
|
+
import BaseDriver from './BaseDriver';
|
|
3
|
+
import * as mysql from 'mysql2/promise';
|
|
4
|
+
import ResultSetDataHolder, { RdhKey } from '../resource/ResultSetDataHolder';
|
|
5
|
+
import { DbDatabase, DbSchema, DbTable, DbColumn, } from '../resource/DbResource';
|
|
6
|
+
import { MySQLColumnType } from '../resource/types/MySQLColumnType';
|
|
7
|
+
import { EnumValues } from 'enum-values';
|
|
8
|
+
import { GeneralColumnType } from '../resource/types/GeneralColumnType';
|
|
9
|
+
export default class MySQLDriver extends BaseDriver {
|
|
12
10
|
constructor(conRes) {
|
|
13
11
|
super(conRes);
|
|
14
12
|
}
|
|
@@ -16,14 +14,14 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
16
14
|
if (resolver) {
|
|
17
15
|
resolver.hints.list.push({ table: fieldInfo.orgTable });
|
|
18
16
|
}
|
|
19
|
-
const name =
|
|
20
|
-
const key = new
|
|
21
|
-
if (key.type ===
|
|
17
|
+
const name = EnumValues.getNameFromValue(MySQLColumnType, MySQLColumnType.parseByFieldInfo(fieldInfo));
|
|
18
|
+
const key = new RdhKey(fieldInfo.name, GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.orgName, resolver));
|
|
19
|
+
if (key.type === GeneralColumnType.UNKNOWN) {
|
|
22
20
|
}
|
|
23
21
|
return key;
|
|
24
22
|
}
|
|
25
23
|
connectSub() {
|
|
26
|
-
return
|
|
24
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
27
25
|
let errorMessage = '';
|
|
28
26
|
const options = {
|
|
29
27
|
connectionLimit: 4,
|
|
@@ -45,7 +43,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
45
43
|
});
|
|
46
44
|
}
|
|
47
45
|
test(with_connect = false) {
|
|
48
|
-
return
|
|
46
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
49
47
|
let errorReason = '';
|
|
50
48
|
if (with_connect) {
|
|
51
49
|
errorReason = yield this.connect();
|
|
@@ -63,8 +61,8 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
63
61
|
});
|
|
64
62
|
}
|
|
65
63
|
requestSql(sql, options) {
|
|
66
|
-
return
|
|
67
|
-
let rdh = new
|
|
64
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
65
|
+
let rdh = new ResultSetDataHolder([]);
|
|
68
66
|
if (this.client) {
|
|
69
67
|
let binds = [];
|
|
70
68
|
if (options && options.binds) {
|
|
@@ -78,7 +76,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
78
76
|
try {
|
|
79
77
|
if (fields === undefined) {
|
|
80
78
|
const results = rows;
|
|
81
|
-
rdh = new
|
|
79
|
+
rdh = new ResultSetDataHolder([
|
|
82
80
|
'fieldCount',
|
|
83
81
|
'affectedRows',
|
|
84
82
|
'insertId',
|
|
@@ -96,7 +94,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
96
94
|
});
|
|
97
95
|
}
|
|
98
96
|
else {
|
|
99
|
-
rdh = new
|
|
97
|
+
rdh = new ResultSetDataHolder(fields === undefined
|
|
100
98
|
? []
|
|
101
99
|
: fields.map((f) => this.fieldInfo2Key(f, resolver)));
|
|
102
100
|
rows.forEach((result) => {
|
|
@@ -105,7 +103,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
105
103
|
}
|
|
106
104
|
}
|
|
107
105
|
catch (err) {
|
|
108
|
-
rdh =
|
|
106
|
+
rdh = ResultSetDataHolder.create(err);
|
|
109
107
|
}
|
|
110
108
|
}
|
|
111
109
|
else {
|
|
@@ -115,7 +113,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
115
113
|
});
|
|
116
114
|
}
|
|
117
115
|
countTables(tables, options) {
|
|
118
|
-
return
|
|
116
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
119
117
|
const list = new Array();
|
|
120
118
|
let counter = 1;
|
|
121
119
|
for (const st of tables.list) {
|
|
@@ -146,12 +144,12 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
146
144
|
});
|
|
147
145
|
}
|
|
148
146
|
getInfomationSchemas(options) {
|
|
149
|
-
return
|
|
147
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
150
148
|
if (!this.conRes) {
|
|
151
149
|
return [];
|
|
152
150
|
}
|
|
153
151
|
const dbResources = new Array();
|
|
154
|
-
const dbDatabase = new
|
|
152
|
+
const dbDatabase = new DbDatabase(this.conRes.database);
|
|
155
153
|
dbResources.push(dbDatabase);
|
|
156
154
|
let progress = 10;
|
|
157
155
|
if (options.progress_callback) {
|
|
@@ -189,19 +187,19 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
189
187
|
});
|
|
190
188
|
}
|
|
191
189
|
getSchemas(dbDatabase) {
|
|
192
|
-
return
|
|
190
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
193
191
|
const rdh = yield this.requestSql(`SELECT SCHEMA_NAME AS name
|
|
194
192
|
FROM INFORMATION_SCHEMA.SCHEMATA
|
|
195
193
|
WHERE LOWER(SCHEMA_NAME) NOT IN ('information_schema', 'sys', 'performance_schema')
|
|
196
194
|
ORDER BY name`);
|
|
197
195
|
return rdh.rows.map((r) => {
|
|
198
|
-
const res = new
|
|
196
|
+
const res = new DbSchema(r.values.name);
|
|
199
197
|
return res;
|
|
200
198
|
});
|
|
201
199
|
});
|
|
202
200
|
}
|
|
203
201
|
getTables(dbSchema) {
|
|
204
|
-
return
|
|
202
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
205
203
|
const rdh = yield this
|
|
206
204
|
.requestSql(`SELECT TABLE_NAME as name, CASE TABLE_TYPE
|
|
207
205
|
WHEN 'BASE TABLE' THEN 'TABLE'
|
|
@@ -211,13 +209,13 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
211
209
|
FROM INFORMATION_SCHEMA.TABLES
|
|
212
210
|
WHERE TABLE_SCHEMA = '${dbSchema.getName()}' `);
|
|
213
211
|
return rdh.rows.map((r) => {
|
|
214
|
-
const res = new
|
|
212
|
+
const res = new DbTable(r.values.name, r.values.table_type, r.values.comment);
|
|
215
213
|
return res;
|
|
216
214
|
});
|
|
217
215
|
});
|
|
218
216
|
}
|
|
219
217
|
getColumns(dbTable) {
|
|
220
|
-
return
|
|
218
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
221
219
|
const binds = [dbTable.getParent().getName(), dbTable.getName()];
|
|
222
220
|
const rdh = yield this.requestSql(`SELECT COLUMN_NAME as name,
|
|
223
221
|
DATA_TYPE as col_type,
|
|
@@ -229,8 +227,8 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
229
227
|
FROM INFORMATION_SCHEMA.COLUMNS
|
|
230
228
|
WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?`, { binds });
|
|
231
229
|
return rdh.rows.map((r) => {
|
|
232
|
-
const type_name =
|
|
233
|
-
const res = new
|
|
230
|
+
const type_name = EnumValues.getNameFromValue(MySQLColumnType, MySQLColumnType.parse(r.values.col_type));
|
|
231
|
+
const res = new DbColumn(r.values.name, GeneralColumnType.parse(type_name), {
|
|
234
232
|
nullable: r.values.nullable === 1,
|
|
235
233
|
key: r.values.col_key,
|
|
236
234
|
default: r.values.col_default,
|
|
@@ -241,7 +239,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
241
239
|
});
|
|
242
240
|
}
|
|
243
241
|
closeSub() {
|
|
244
|
-
return
|
|
242
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
245
243
|
try {
|
|
246
244
|
if (this.client) {
|
|
247
245
|
yield this.client.end();
|
|
@@ -254,5 +252,4 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
254
252
|
});
|
|
255
253
|
}
|
|
256
254
|
}
|
|
257
|
-
exports.default = MySQLDriver;
|
|
258
255
|
//# sourceMappingURL=MySQLDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MySQLDriver.js","sourceRoot":"","sources":["../../../../src/db/drivers/MySQLDriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MySQLDriver.js","sourceRoot":"","sources":["../../../../src/db/drivers/MySQLDriver.ts"],"names":[],"mappings":"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"}
|