@l-v-yonsama/multi-platform-database-drivers 0.1.15 → 0.1.16
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/README.md +109 -0
- package/built/src/db/DBError.d.ts +1 -1
- package/built/src/db/DBError.js +2 -1
- package/built/src/db/DBError.js.map +1 -1
- package/built/src/db/drivers/AwsS3Driver.d.ts +3 -4
- package/built/src/db/drivers/AwsS3Driver.js +10 -11
- package/built/src/db/drivers/AwsS3Driver.js.map +1 -1
- package/built/src/db/drivers/BaseDriver.d.ts +3 -4
- package/built/src/db/drivers/BaseDriver.js +8 -8
- package/built/src/db/drivers/BaseDriver.js.map +1 -1
- package/built/src/db/drivers/MySQLDriver.d.ts +3 -4
- package/built/src/db/drivers/MySQLDriver.js +17 -19
- package/built/src/db/drivers/MySQLDriver.js.map +1 -1
- package/built/src/db/drivers/PostgresDriver.d.ts +3 -4
- package/built/src/db/drivers/PostgresDriver.js +16 -18
- package/built/src/db/drivers/PostgresDriver.js.map +1 -1
- package/built/src/db/drivers/RedisDriver.d.ts +3 -4
- package/built/src/db/drivers/RedisDriver.js +12 -12
- package/built/src/db/drivers/RedisDriver.js.map +1 -1
- package/built/src/db/resource/DbResource.d.ts +1 -5
- package/built/src/db/resource/DbResource.js +22 -26
- package/built/src/db/resource/DbResource.js.map +1 -1
- package/built/src/db/resource/MultipleResultSetDataHolder.d.ts +2 -2
- package/built/src/db/resource/MultipleResultSetDataHolder.js +4 -3
- package/built/src/db/resource/MultipleResultSetDataHolder.js.map +1 -1
- package/built/src/db/resource/ResultSetDataHolder.d.ts +2 -2
- package/built/src/db/resource/ResultSetDataHolder.js +18 -18
- package/built/src/db/resource/ResultSetDataHolder.js.map +1 -1
- package/built/src/service/DBAccessService.d.ts +1 -2
- package/built/src/service/DBAccessService.js +8 -10
- package/built/src/service/DBAccessService.js.map +1 -1
- package/built/src/service/DBDriverResolver.d.ts +1 -2
- package/built/src/service/DBDriverResolver.js +11 -16
- package/built/src/service/DBDriverResolver.js.map +1 -1
- package/built/src/service/SQLService.d.ts +1 -1
- package/built/src/service/request/RedisRequest.d.ts +1 -1
- package/built/src/service/request/index.d.ts +2 -0
- package/built/src/service/request/index.js +3 -0
- package/built/src/service/request/index.js.map +1 -1
- package/built/src/service/response/index.d.ts +1 -0
- package/built/src/service/response/index.js +1 -0
- package/built/src/service/response/index.js.map +1 -1
- package/built/src/service/response/result/ConnectionResult.js.map +1 -0
- package/built/src/service/response/{reply/GeneralReply.d.ts → result/GeneralResult.d.ts} +1 -1
- package/built/src/service/response/{reply/GeneralReply.js → result/GeneralResult.js} +4 -3
- package/built/src/service/response/result/GeneralResult.js.map +1 -0
- package/built/src/service/response/{reply/ProgressReply.d.ts → result/ProgressResult.d.ts} +2 -2
- package/built/src/service/response/{reply/ProgressReply.js → result/ProgressResult.js} +5 -5
- package/built/src/service/response/result/ProgressResult.js.map +1 -0
- package/built/src/service/response/result/index.d.ts +3 -0
- package/built/src/service/response/result/index.js +7 -0
- package/built/src/service/response/result/index.js.map +1 -0
- package/package.json +2 -2
- package/built/src/service/response/reply/ConnectionResult.js.map +0 -1
- package/built/src/service/response/reply/FileExportReply.d.ts +0 -10
- package/built/src/service/response/reply/FileExportReply.js +0 -18
- package/built/src/service/response/reply/FileExportReply.js.map +0 -1
- package/built/src/service/response/reply/FileProcessResult.d.ts +0 -14
- package/built/src/service/response/reply/FileProcessResult.js +0 -29
- package/built/src/service/response/reply/FileProcessResult.js.map +0 -1
- package/built/src/service/response/reply/GeneralReply.js.map +0 -1
- package/built/src/service/response/reply/OutputReply.d.ts +0 -9
- package/built/src/service/response/reply/OutputReply.js +0 -17
- package/built/src/service/response/reply/OutputReply.js.map +0 -1
- package/built/src/service/response/reply/ProgressReply.js.map +0 -1
- package/built/src/service/response/reply/types/FileExportType.d.ts +0 -3
- package/built/src/service/response/reply/types/FileExportType.js +0 -9
- package/built/src/service/response/reply/types/FileExportType.js.map +0 -1
- package/built/src/service/response/reply/types/OutputType.d.ts +0 -11
- package/built/src/service/response/reply/types/OutputType.js +0 -16
- package/built/src/service/response/reply/types/OutputType.js.map +0 -1
- package/built/src/service/response/reply/types/ReplyEventType.d.ts +0 -10
- package/built/src/service/response/reply/types/ReplyEventType.js +0 -16
- package/built/src/service/response/reply/types/ReplyEventType.js.map +0 -1
- /package/built/src/service/response/{reply → result}/ConnectionResult.d.ts +0 -0
- /package/built/src/service/response/{reply → result}/ConnectionResult.js +0 -0
package/README.md
CHANGED
|
@@ -11,3 +11,112 @@ yarn add @l-v-yonsama/multi-platform-database-drivers
|
|
|
11
11
|
OR
|
|
12
12
|
npm i @l-v-yonsama/multi-platform-database-drivers
|
|
13
13
|
```
|
|
14
|
+
|
|
15
|
+
```js
|
|
16
|
+
import {
|
|
17
|
+
ConnectionSetting,
|
|
18
|
+
DBAccessService,
|
|
19
|
+
DBType,
|
|
20
|
+
DbDatabase,
|
|
21
|
+
SQLService,
|
|
22
|
+
} from "@l-v-yonsama/multi-platform-database-drivers";
|
|
23
|
+
|
|
24
|
+
const setting: ConnectionSetting = {
|
|
25
|
+
host: "127.0.0.1",
|
|
26
|
+
port: 6001,
|
|
27
|
+
user: "testuser",
|
|
28
|
+
password: "testpass",
|
|
29
|
+
database: "testdb",
|
|
30
|
+
dbType: DBType.MySQL,
|
|
31
|
+
name: "local-mysql",
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
(async () => {
|
|
35
|
+
await DBAccessService.addConnectionSetting({ setting });
|
|
36
|
+
const res = await DBAccessService.connect({
|
|
37
|
+
connectionName: setting.name,
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
if (!res.ok) {
|
|
41
|
+
console.error(res.message);
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
const { connectionId } = res.result;
|
|
45
|
+
const resInfo = await DBAccessService.getInfomationSchemas({
|
|
46
|
+
connectionId,
|
|
47
|
+
});
|
|
48
|
+
if (!resInfo.ok) {
|
|
49
|
+
console.error(resInfo.message);
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
if (!resInfo.result) {
|
|
53
|
+
console.error("No database.");
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const dbRes = resInfo.result[0] as DbDatabase;
|
|
57
|
+
const defaultSchema = dbRes.getSchema({ isDefault: true });
|
|
58
|
+
|
|
59
|
+
console.log("------ Information schema ------");
|
|
60
|
+
console.log(defaultSchema.toJsonStringify(2));
|
|
61
|
+
|
|
62
|
+
const sql = `SELECT n0,f1,f2,d1,dummy1 FROM testtable WHERE n2=2 AND s2='s2' `;
|
|
63
|
+
const resValidation = SQLService.validate(sql, defaultSchema);
|
|
64
|
+
console.log("------ SQL validation result ------");
|
|
65
|
+
console.log(resValidation);
|
|
66
|
+
await DBAccessService.disconnectAll();
|
|
67
|
+
})();
|
|
68
|
+
```
|
|
69
|
+
|
|
70
|
+
```sh
|
|
71
|
+
------ Information schema ------
|
|
72
|
+
{
|
|
73
|
+
"id":"vQTDHe6X",
|
|
74
|
+
"resouceType":2,
|
|
75
|
+
"name":"testdb",
|
|
76
|
+
"children":[
|
|
77
|
+
{
|
|
78
|
+
"id":"p6nEAlxc",
|
|
79
|
+
"resouceType":3,
|
|
80
|
+
"name":"testtable",
|
|
81
|
+
"children":[
|
|
82
|
+
{"id":"WMLrwKRe","resouceType":4,"name":"ID","children":[],"colType":14,"comment":"","nullable":false,"key":"PRI","default":null,"extra":"auto_increment"},
|
|
83
|
+
{"id":"1TvQOMlg","resouceType":4,"name":"n0","children":[],"colType":0,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
84
|
+
{"id":"Jx3ensD1","resouceType":4,"name":"n1","children":[],"colType":11,"comment":"MAX 127","nullable":true,"key":"","default":null,"extra":""},
|
|
85
|
+
{"id":"dMpSYRPb","resouceType":4,"name":"n2","children":[],"colType":12,"comment":"MAX 32767","nullable":true,"key":"","default":null,"extra":""},
|
|
86
|
+
{"id":"00NOGCMG","resouceType":4,"name":"n3","children":[],"colType":13,"comment":"MAX 8388607","nullable":true,"key":"","default":null,"extra":""},
|
|
87
|
+
{"id":"faVOIMni","resouceType":4,"name":"n4","children":[],"colType":15,"comment":"MAX 9223372036854775807","nullable":true,"key":"","default":null,"extra":""},
|
|
88
|
+
{"id":"8qyyVS5L","resouceType":4,"name":"f1","children":[],"colType":16,"comment":"","nullable":true,"key":"","default":null,"extra":""},{"id":"b7j1n1wS","resouceType":4,"name":"f2","children":[],"colType":20,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
89
|
+
{"id":"hQjnzYH6","resouceType":4,"name":"f3","children":[],"colType":22,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
90
|
+
{"id":"21BOjbB1","resouceType":4,"name":"d1","children":[],"colType":36,"comment":"“Zero” Value 0000-00-00","nullable":true,"key":"","default":null,"extra":""},
|
|
91
|
+
{"id":"YofUrn8X","resouceType":4,"name":"d2","children":[],"colType":34,"comment":"“Zero” Value 00:00:00","nullable":true,"key":"","default":null,"extra":""},
|
|
92
|
+
{"id":"JHmT8ALr","resouceType":4,"name":"d3","children":[],"colType":37,"comment":"“Zero” Value 0000-00-00 00:00:00","nullable":true,"key":"","default":null,"extra":""},
|
|
93
|
+
{"id":"wMqGccPW","resouceType":4,"name":"d4","children":[],"colType":37,"comment":"“Zero” Value 0000-00-00 00:00:00","nullable":true,"key":"","default":null,"extra":""},
|
|
94
|
+
{"id":"qQW5i5Vn","resouceType":4,"name":"d5","children":[],"colType":39,"comment":"“Zero” Value 0000","nullable":true,"key":"","default":null,"extra":""},
|
|
95
|
+
{"id":"TJ0zRqZL","resouceType":4,"name":"s1","children":[],"colType":3,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
96
|
+
{"id":"ixbuC6Qz","resouceType":4,"name":"s2","children":[],"colType":4,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
97
|
+
{"id":"Eu6rOC53","resouceType":4,"name":"s3a","children":[],"colType":5,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
98
|
+
{"id":"uzL3dNQO","resouceType":4,"name":"s3b","children":[],"colType":7,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
99
|
+
{"id":"8EJDWj7a","resouceType":4,"name":"s3c","children":[],"colType":6,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
100
|
+
{"id":"1R1HKCT4","resouceType":4,"name":"s3d","children":[],"colType":8,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
101
|
+
{"id":"bgoRaWrE","resouceType":4,"name":"s4","children":[],"colType":40,"comment":"A list of a,b or c","nullable":true,"key":"","default":null,"extra":""},
|
|
102
|
+
{"id":"ZaOslFEV","resouceType":4,"name":"s5","children":[],"colType":50,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
103
|
+
{"id":"2XoOWXad","resouceType":4,"name":"s6","children":[],"colType":-1,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
104
|
+
{"id":"aitMMHvy","resouceType":4,"name":"s7","children":[],"colType":51,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
105
|
+
{"id":"Lz62H4A3","resouceType":4,"name":"s8","children":[],"colType":41,"comment":"","nullable":true,"key":"","default":null,"extra":""},
|
|
106
|
+
{"id":"XJPve9jl","resouceType":4,"name":"g1","children":[],"colType":-1,"comment":"","nullable":false,"key":"","default":null,"extra":""},
|
|
107
|
+
{"id":"n0hND90M","resouceType":4,"name":"j1","children":[],"colType":25,"comment":"JSON data type","nullable":true,"key":"","default":null,"extra":""}
|
|
108
|
+
],
|
|
109
|
+
"isInProgress":false,
|
|
110
|
+
"tableType":"TABLE",
|
|
111
|
+
"comment":"table with various data types"
|
|
112
|
+
}
|
|
113
|
+
],
|
|
114
|
+
"isDefault":true
|
|
115
|
+
}
|
|
116
|
+
------ SQL validation result ------
|
|
117
|
+
{
|
|
118
|
+
ok: false,
|
|
119
|
+
message: '',
|
|
120
|
+
result: [ { type: 'select', table: '', column: 'dummy1' } ]
|
|
121
|
+
}
|
|
122
|
+
```
|
package/built/src/db/DBError.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DBError = void 0;
|
|
3
4
|
class DBError extends Error {
|
|
4
5
|
constructor(message, code, errno, sqlMessage, sqlState) {
|
|
5
6
|
super(message);
|
|
@@ -16,5 +17,5 @@ class DBError extends Error {
|
|
|
16
17
|
this.sqlState = sqlState;
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
|
-
exports.
|
|
20
|
+
exports.DBError = DBError;
|
|
20
21
|
//# 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,MAAa,OAAQ,SAAQ,KAAK;IAMhC,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;AAzBD,0BAyBC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import BaseDriver,
|
|
2
|
-
import { DbConnection, DbResource, TableRows, SchemaAndTableHints } from '../resource
|
|
3
|
-
import ResultSetDataHolder from '../resource/ResultSetDataHolder';
|
|
1
|
+
import { BaseDriver, RequestSqlOptions } from './BaseDriver';
|
|
2
|
+
import { DbConnection, DbResource, TableRows, SchemaAndTableHints, ResultSetDataHolder } from '../resource';
|
|
4
3
|
import { PutObjectCommandInput, S3Client, S3ClientConfig } from '@aws-sdk/client-s3';
|
|
5
|
-
export
|
|
4
|
+
export declare class AwsS3Driver extends BaseDriver {
|
|
6
5
|
s3Client: S3Client;
|
|
7
6
|
finder: any;
|
|
8
7
|
config: S3ClientConfig;
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AwsS3Driver = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
|
-
const BaseDriver_1 =
|
|
5
|
-
const
|
|
6
|
-
const ResultSetDataHolder_1 = tslib_1.__importDefault(require("../resource/ResultSetDataHolder"));
|
|
7
|
-
const DBType_1 = require("../resource/types/DBType");
|
|
5
|
+
const BaseDriver_1 = require("./BaseDriver");
|
|
6
|
+
const resource_1 = require("../resource");
|
|
8
7
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
9
|
-
class AwsS3Driver extends BaseDriver_1.
|
|
8
|
+
class AwsS3Driver extends BaseDriver_1.BaseDriver {
|
|
10
9
|
constructor(conRes) {
|
|
11
10
|
super(conRes);
|
|
12
11
|
}
|
|
@@ -21,7 +20,7 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
21
20
|
accessKeyId: this.conRes.user,
|
|
22
21
|
secretAccessKey: this.conRes.password,
|
|
23
22
|
};
|
|
24
|
-
if (this.conRes.dbType ===
|
|
23
|
+
if (this.conRes.dbType === resource_1.DBType.Minio) {
|
|
25
24
|
this.config.endpoint = this.conRes.url;
|
|
26
25
|
this.config.s3ForcePathStyle = 'true';
|
|
27
26
|
}
|
|
@@ -66,18 +65,18 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
66
65
|
return [];
|
|
67
66
|
}
|
|
68
67
|
const dbResources = new Array();
|
|
69
|
-
const dbDatabase = new
|
|
68
|
+
const dbDatabase = new resource_1.DbDatabase('S3');
|
|
70
69
|
dbResources.push(dbDatabase);
|
|
71
70
|
try {
|
|
72
71
|
const buckets = yield this.s3Client.send(new client_s3_1.ListBucketsCommand({}));
|
|
73
72
|
if (buckets.Buckets) {
|
|
74
73
|
for (const bucket of buckets.Buckets) {
|
|
75
|
-
const dbBucket = new
|
|
74
|
+
const dbBucket = new resource_1.DbS3Bucket(bucket.Name, bucket.CreationDate);
|
|
76
75
|
dbDatabase.addChild(dbBucket);
|
|
77
76
|
}
|
|
78
77
|
}
|
|
79
78
|
if (buckets.Owner) {
|
|
80
|
-
const dbOwner = new
|
|
79
|
+
const dbOwner = new resource_1.DbS3Owner(buckets.Owner.ID, buckets.Owner.DisplayName);
|
|
81
80
|
dbDatabase.addChild(dbOwner);
|
|
82
81
|
}
|
|
83
82
|
else {
|
|
@@ -91,7 +90,7 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
91
90
|
}
|
|
92
91
|
requestSql(sql, options) {
|
|
93
92
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
94
|
-
return new
|
|
93
|
+
return new resource_1.ResultSetDataHolder([]);
|
|
95
94
|
});
|
|
96
95
|
}
|
|
97
96
|
createBucket({ bucket }) {
|
|
@@ -154,5 +153,5 @@ class AwsS3Driver extends BaseDriver_1.default {
|
|
|
154
153
|
});
|
|
155
154
|
}
|
|
156
155
|
}
|
|
157
|
-
exports.
|
|
156
|
+
exports.AwsS3Driver = AwsS3Driver;
|
|
158
157
|
//# 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,7 +1,6 @@
|
|
|
1
|
-
import DBError from '../DBError';
|
|
2
|
-
import { DbConnection, DbResource, ColumnResolver, DbColumn, SchemaAndTableHints, TableRows, DbDatabase } from '../resource
|
|
3
|
-
|
|
4
|
-
export default abstract class BaseDriver {
|
|
1
|
+
import { DBError } from '../DBError';
|
|
2
|
+
import { DbConnection, DbResource, ColumnResolver, DbColumn, SchemaAndTableHints, TableRows, DbDatabase, ResultSetDataHolder } from '../resource';
|
|
3
|
+
export declare abstract class BaseDriver {
|
|
5
4
|
isConnected: boolean;
|
|
6
5
|
protected conRes: DbConnection;
|
|
7
6
|
protected sshServer: any;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BaseDriver = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
|
-
const DBError_1 =
|
|
5
|
+
const DBError_1 = require("../DBError");
|
|
6
|
+
const resource_1 = require("../resource");
|
|
5
7
|
const tunnel = tslib_1.__importStar(require("tunnel-ssh"));
|
|
6
8
|
const get_port_please_1 = require("get-port-please");
|
|
7
|
-
const ResourceType_1 = require("../resource/types/ResourceType");
|
|
8
9
|
const fs = tslib_1.__importStar(require("fs"));
|
|
9
|
-
const resource_1 = require("../resource");
|
|
10
10
|
class BaseDriver {
|
|
11
11
|
constructor(conRes) {
|
|
12
12
|
this.conRes = conRes;
|
|
@@ -61,7 +61,7 @@ class BaseDriver {
|
|
|
61
61
|
searchNames.push('public');
|
|
62
62
|
for (const searchName of searchNames) {
|
|
63
63
|
const child = database.getChildByName(searchName, {
|
|
64
|
-
resouceType:
|
|
64
|
+
resouceType: resource_1.ResourceType.Schema,
|
|
65
65
|
});
|
|
66
66
|
if (child) {
|
|
67
67
|
child.isDefault = true;
|
|
@@ -70,7 +70,7 @@ class BaseDriver {
|
|
|
70
70
|
}
|
|
71
71
|
const child = database
|
|
72
72
|
.getChildren()
|
|
73
|
-
.find((it) => it.getResouceType() ===
|
|
73
|
+
.find((it) => it.getResouceType() === resource_1.ResourceType.Schema);
|
|
74
74
|
if (child) {
|
|
75
75
|
child.isDefault = true;
|
|
76
76
|
}
|
|
@@ -82,7 +82,7 @@ class BaseDriver {
|
|
|
82
82
|
if (this.conRes) {
|
|
83
83
|
for (let i = 0; i < resolver.hints.list.length; i++) {
|
|
84
84
|
const hints = resolver.hints.list[i];
|
|
85
|
-
const t = resource_1.ResourceHelper.findResource(this.conRes,
|
|
85
|
+
const t = resource_1.ResourceHelper.findResource(this.conRes, resource_1.ResourceType.Table, hints.table);
|
|
86
86
|
if (t) {
|
|
87
87
|
return t.getChildByName(column, { unwrapQuote: true });
|
|
88
88
|
}
|
|
@@ -177,8 +177,8 @@ class BaseDriver {
|
|
|
177
177
|
});
|
|
178
178
|
}
|
|
179
179
|
createDBError(message, sourceError) {
|
|
180
|
-
return new DBError_1.
|
|
180
|
+
return new DBError_1.DBError(message, sourceError.code, sourceError.errno, sourceError.sqlMessage, sourceError.sqlState);
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
|
-
exports.
|
|
183
|
+
exports.BaseDriver = BaseDriver;
|
|
184
184
|
//# 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,7 +1,6 @@
|
|
|
1
|
-
import BaseDriver,
|
|
2
|
-
import ResultSetDataHolder,
|
|
3
|
-
|
|
4
|
-
export default class MySQLDriver extends BaseDriver {
|
|
1
|
+
import { BaseDriver, RequestSqlOptions } from './BaseDriver';
|
|
2
|
+
import { ResultSetDataHolder, RdhKey, DbConnection, DbResource, DbDatabase, DbSchema, DbTable, DbColumn, ColumnResolver, TableRows, SchemaAndTableHints } from '../resource';
|
|
3
|
+
export declare class MySQLDriver extends BaseDriver {
|
|
5
4
|
private client;
|
|
6
5
|
constructor(conRes: DbConnection);
|
|
7
6
|
fieldInfo2Key(fieldInfo: any, resolver?: ColumnResolver): RdhKey;
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MySQLDriver = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
|
-
const BaseDriver_1 =
|
|
5
|
+
const BaseDriver_1 = require("./BaseDriver");
|
|
5
6
|
const mysql = tslib_1.__importStar(require("mysql2/promise"));
|
|
6
|
-
const
|
|
7
|
-
const DbResource_1 = require("../resource/DbResource");
|
|
8
|
-
const MySQLColumnType_1 = require("../resource/types/MySQLColumnType");
|
|
7
|
+
const resource_1 = require("../resource");
|
|
9
8
|
const enum_values_1 = require("enum-values");
|
|
10
|
-
|
|
11
|
-
class MySQLDriver extends BaseDriver_1.default {
|
|
9
|
+
class MySQLDriver extends BaseDriver_1.BaseDriver {
|
|
12
10
|
constructor(conRes) {
|
|
13
11
|
super(conRes);
|
|
14
12
|
}
|
|
@@ -16,9 +14,9 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
16
14
|
if (resolver) {
|
|
17
15
|
resolver.hints.list.push({ table: fieldInfo.orgTable });
|
|
18
16
|
}
|
|
19
|
-
const name = enum_values_1.EnumValues.getNameFromValue(
|
|
20
|
-
const key = new
|
|
21
|
-
if (key.type ===
|
|
17
|
+
const name = enum_values_1.EnumValues.getNameFromValue(resource_1.MySQLColumnType, resource_1.MySQLColumnType.parseByFieldInfo(fieldInfo));
|
|
18
|
+
const key = new resource_1.RdhKey(fieldInfo.name, resource_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.orgName, resolver));
|
|
19
|
+
if (key.type === resource_1.GeneralColumnType.UNKNOWN) {
|
|
22
20
|
}
|
|
23
21
|
return key;
|
|
24
22
|
}
|
|
@@ -64,7 +62,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
64
62
|
}
|
|
65
63
|
requestSql(sql, options) {
|
|
66
64
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
67
|
-
let rdh = new
|
|
65
|
+
let rdh = new resource_1.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 resource_1.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 resource_1.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 = resource_1.ResultSetDataHolder.create(err);
|
|
109
107
|
}
|
|
110
108
|
}
|
|
111
109
|
else {
|
|
@@ -151,7 +149,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
151
149
|
return [];
|
|
152
150
|
}
|
|
153
151
|
const dbResources = new Array();
|
|
154
|
-
const dbDatabase = new
|
|
152
|
+
const dbDatabase = new resource_1.DbDatabase(this.conRes.database);
|
|
155
153
|
dbResources.push(dbDatabase);
|
|
156
154
|
let progress = 10;
|
|
157
155
|
if (options.progress_callback) {
|
|
@@ -195,7 +193,7 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
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 resource_1.DbSchema(r.values.name);
|
|
199
197
|
return res;
|
|
200
198
|
});
|
|
201
199
|
});
|
|
@@ -211,7 +209,7 @@ 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 resource_1.DbTable(r.values.name, r.values.table_type, r.values.comment);
|
|
215
213
|
return res;
|
|
216
214
|
});
|
|
217
215
|
});
|
|
@@ -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 = enum_values_1.EnumValues.getNameFromValue(
|
|
233
|
-
const res = new
|
|
230
|
+
const type_name = enum_values_1.EnumValues.getNameFromValue(resource_1.MySQLColumnType, resource_1.MySQLColumnType.parse(r.values.col_type));
|
|
231
|
+
const res = new resource_1.DbColumn(r.values.name, resource_1.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,
|
|
@@ -254,5 +252,5 @@ class MySQLDriver extends BaseDriver_1.default {
|
|
|
254
252
|
});
|
|
255
253
|
}
|
|
256
254
|
}
|
|
257
|
-
exports.
|
|
255
|
+
exports.MySQLDriver = MySQLDriver;
|
|
258
256
|
//# 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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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import BaseDriver,
|
|
2
|
-
import ResultSetDataHolder,
|
|
3
|
-
import { DbConnection, DbResource, DbDatabase, DbSchema, DbTable, DbColumn, ColumnResolver, TableRows, SchemaAndTableHints } from '../resource/DbResource';
|
|
1
|
+
import { BaseDriver, RequestSqlOptions } from './BaseDriver';
|
|
2
|
+
import { ResultSetDataHolder, RdhKey, DbConnection, DbResource, DbDatabase, DbSchema, DbTable, DbColumn, ColumnResolver, TableRows, SchemaAndTableHints } from '../resource';
|
|
4
3
|
import { default as pg } from 'pg';
|
|
5
|
-
export
|
|
4
|
+
export declare class PostgresDriver extends BaseDriver {
|
|
6
5
|
private pool;
|
|
7
6
|
constructor(conRes: DbConnection);
|
|
8
7
|
fieldInfo2Key(fieldInfo: pg.FieldDef, resolver?: ColumnResolver): RdhKey;
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PostgresDriver = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
|
-
const BaseDriver_1 =
|
|
5
|
-
const
|
|
6
|
-
const DbResource_1 = require("../resource/DbResource");
|
|
5
|
+
const BaseDriver_1 = require("./BaseDriver");
|
|
6
|
+
const resource_1 = require("../resource");
|
|
7
7
|
const pg_1 = tslib_1.__importDefault(require("pg"));
|
|
8
|
-
const PostgresColumnType_1 = require("../resource/types/PostgresColumnType");
|
|
9
8
|
const enum_values_1 = require("enum-values");
|
|
10
|
-
|
|
11
|
-
class PostgresDriver extends BaseDriver_1.default {
|
|
9
|
+
class PostgresDriver extends BaseDriver_1.BaseDriver {
|
|
12
10
|
constructor(conRes) {
|
|
13
11
|
super(conRes);
|
|
14
12
|
}
|
|
@@ -16,8 +14,8 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
16
14
|
if (fieldInfo.name.startsWith('c_')) {
|
|
17
15
|
console.log(`★ ${fieldInfo.name.substring(2).toUpperCase()} = ${fieldInfo.dataTypeID}`);
|
|
18
16
|
}
|
|
19
|
-
const name = enum_values_1.EnumValues.getNameFromValue(
|
|
20
|
-
const key = new
|
|
17
|
+
const name = enum_values_1.EnumValues.getNameFromValue(resource_1.PostgresColumnType, resource_1.PostgresColumnType.parse(fieldInfo.dataTypeID));
|
|
18
|
+
const key = new resource_1.RdhKey(fieldInfo.name, resource_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.name, resolver));
|
|
21
19
|
return key;
|
|
22
20
|
}
|
|
23
21
|
connectSub() {
|
|
@@ -67,7 +65,7 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
67
65
|
}
|
|
68
66
|
requestSql(sql, options) {
|
|
69
67
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
70
|
-
let rdh = new
|
|
68
|
+
let rdh = new resource_1.ResultSetDataHolder([]);
|
|
71
69
|
try {
|
|
72
70
|
let binds = [];
|
|
73
71
|
if (options && options.binds) {
|
|
@@ -80,7 +78,7 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
80
78
|
resolver = this.createColumnResolver(sql);
|
|
81
79
|
}
|
|
82
80
|
const fields = results.fields;
|
|
83
|
-
rdh = new
|
|
81
|
+
rdh = new resource_1.ResultSetDataHolder(fields === undefined
|
|
84
82
|
? []
|
|
85
83
|
: fields.map((f) => this.fieldInfo2Key(f, resolver)));
|
|
86
84
|
if (results.rows) {
|
|
@@ -91,7 +89,7 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
91
89
|
}
|
|
92
90
|
}
|
|
93
91
|
catch (err) {
|
|
94
|
-
rdh =
|
|
92
|
+
rdh = resource_1.ResultSetDataHolder.create(err);
|
|
95
93
|
}
|
|
96
94
|
return rdh;
|
|
97
95
|
});
|
|
@@ -158,7 +156,7 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
158
156
|
.requestSql(`SELECT datname AS name, pg_encoding_to_char(encoding) AS comment
|
|
159
157
|
FROM pg_database ORDER BY datname`);
|
|
160
158
|
return rdh.rows.map((r) => {
|
|
161
|
-
const res = new
|
|
159
|
+
const res = new resource_1.DbDatabase(r.values.name);
|
|
162
160
|
res.comment = r.values.comment;
|
|
163
161
|
res.disabled = res.name !== connection_database;
|
|
164
162
|
return res;
|
|
@@ -172,7 +170,7 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
172
170
|
WHERE LOWER(SCHEMA_NAME) NOT IN ('information_schema', 'sys', 'performance_schema', 'pg_catalog', 'pg_toast', 'pg_temp_1', 'pg_toast_temp_1')
|
|
173
171
|
ORDER BY name`);
|
|
174
172
|
return rdh.rows.map((r) => {
|
|
175
|
-
const res = new
|
|
173
|
+
const res = new resource_1.DbSchema(r.values.name);
|
|
176
174
|
return res;
|
|
177
175
|
});
|
|
178
176
|
});
|
|
@@ -186,7 +184,7 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
186
184
|
WHERE m.schemaname='${dbSchema.getName()}'
|
|
187
185
|
ORDER BY m.relname`);
|
|
188
186
|
const list = rdh.rows.map((r) => {
|
|
189
|
-
const res = new
|
|
187
|
+
const res = new resource_1.DbTable(r.values.qname, 'TABLE', r.values.comment);
|
|
190
188
|
return res;
|
|
191
189
|
});
|
|
192
190
|
rdh = yield this
|
|
@@ -194,7 +192,7 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
194
192
|
where schemaname = '${dbSchema.getName()}'
|
|
195
193
|
order by viewname`);
|
|
196
194
|
return list.concat(rdh.rows.map((r) => {
|
|
197
|
-
const res = new
|
|
195
|
+
const res = new resource_1.DbTable(r.values.qname, 'VIEW', '');
|
|
198
196
|
return res;
|
|
199
197
|
}));
|
|
200
198
|
});
|
|
@@ -256,8 +254,8 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
256
254
|
order by
|
|
257
255
|
col.ordinal_position`, { binds });
|
|
258
256
|
return rdh.rows.map((r) => {
|
|
259
|
-
const type_name = enum_values_1.EnumValues.getNameFromValue(
|
|
260
|
-
const res = new
|
|
257
|
+
const type_name = enum_values_1.EnumValues.getNameFromValue(resource_1.PostgresColumnType, resource_1.PostgresColumnType.parse(r.values.col_type));
|
|
258
|
+
const res = new resource_1.DbColumn(r.values.qname, resource_1.GeneralColumnType.parse(type_name), {
|
|
261
259
|
nullable: r.values.nullable === 1,
|
|
262
260
|
key: r.values.col_key,
|
|
263
261
|
default: r.values.col_default,
|
|
@@ -281,5 +279,5 @@ class PostgresDriver extends BaseDriver_1.default {
|
|
|
281
279
|
});
|
|
282
280
|
}
|
|
283
281
|
}
|
|
284
|
-
exports.
|
|
282
|
+
exports.PostgresDriver = PostgresDriver;
|
|
285
283
|
//# sourceMappingURL=PostgresDriver.js.map
|