querize 1.0.8 → 1.1.0
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 +755 -583
- package/cjs/drivers/drv_mariadb.js +32 -1
- package/cjs/drivers/drv_mariadb.js.map +1 -1
- package/cjs/drivers/drv_mysql2.js +33 -1
- package/cjs/drivers/drv_mysql2.js.map +1 -1
- package/cjs/drivers/drv_oracledb.js +81 -24
- package/cjs/drivers/drv_oracledb.js.map +1 -1
- package/cjs/drivers/drv_query.js.map +1 -1
- package/cjs/drivers/index.js +3 -3
- package/cjs/drivers/index.js.map +1 -1
- package/cjs/querize.js +7 -1
- package/cjs/querize.js.map +1 -1
- package/cjs/types/drivers/drv_mariadb.d.ts +18 -5
- package/cjs/types/drivers/drv_mariadb.d.ts.map +1 -1
- package/cjs/types/drivers/drv_mysql2.d.ts +18 -5
- package/cjs/types/drivers/drv_mysql2.d.ts.map +1 -1
- package/cjs/types/drivers/drv_oracledb.d.ts +37 -7
- package/cjs/types/drivers/drv_oracledb.d.ts.map +1 -1
- package/cjs/types/drivers/drv_query.d.ts +6 -6
- package/cjs/types/drivers/drv_query.d.ts.map +1 -1
- package/cjs/types/drivers/index.d.ts +8 -15
- package/cjs/types/drivers/index.d.ts.map +1 -1
- package/cjs/types/querize.d.ts +4 -5
- package/cjs/types/querize.d.ts.map +1 -1
- package/esm/drivers/drv_mariadb.js +32 -1
- package/esm/drivers/drv_mariadb.js.map +1 -1
- package/esm/drivers/drv_mysql2.js +33 -1
- package/esm/drivers/drv_mysql2.js.map +1 -1
- package/esm/drivers/drv_oracledb.js +83 -25
- package/esm/drivers/drv_oracledb.js.map +1 -1
- package/esm/drivers/drv_query.js.map +1 -1
- package/esm/drivers/index.js +3 -3
- package/esm/drivers/index.js.map +1 -1
- package/esm/querize.js +7 -1
- package/esm/querize.js.map +1 -1
- package/esm/types/drivers/drv_mariadb.d.ts +18 -5
- package/esm/types/drivers/drv_mariadb.d.ts.map +1 -1
- package/esm/types/drivers/drv_mysql2.d.ts +18 -5
- package/esm/types/drivers/drv_mysql2.d.ts.map +1 -1
- package/esm/types/drivers/drv_oracledb.d.ts +37 -7
- package/esm/types/drivers/drv_oracledb.d.ts.map +1 -1
- package/esm/types/drivers/drv_query.d.ts +6 -6
- package/esm/types/drivers/drv_query.d.ts.map +1 -1
- package/esm/types/drivers/index.d.ts +8 -15
- package/esm/types/drivers/index.d.ts.map +1 -1
- package/esm/types/querize.d.ts +4 -5
- package/esm/types/querize.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drv_query.d.ts","sourceRoot":"","sources":["../../../../src/drivers/drv_query.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,QAAQ,EAAC,MAAQ,SAAS,CAAC;AACnC,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAG1C,yBAAiB,QAAQ,CACzB;IACI,SAAgB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"drv_query.d.ts","sourceRoot":"","sources":["../../../../src/drivers/drv_query.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,QAAQ,EAAC,MAAQ,SAAS,CAAC;AACnC,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAG1C,yBAAiB,QAAQ,CACzB;IACI,SAAgB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,GAAI,OAAO,CAAC,SAAS,CAAC,CAEjF;IAED,MAAa,SAAU,YAAW,QAAQ,CAAC,SAAS;QAChD,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;oBACb,IAAI,EAAE,OAAO,CAAC,UAAU;QAGpC,OAAO;QACP,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAG5E,OAAO,IAAK,OAAO,CAAC,GAAG,CAAC;KAC3B;IAGD,MAAa,SAAU,YAAW,QAAQ,CAAC,SAAS;QAChD,SAAgB,KAAK,EAAG,SAAS,CAAC;QAE3B,IAAI,EAAE,MAAM,CAAC;oBAER,KAAK,EAAE,SAAS;QAK5B,KAAK;QACL,gBAAgB,IAAK,OAAO,CAAC,GAAG,CAAC;QACjC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAI,OAAO,CAAC,GAAG,CAAC;QAIjC,MAAM,IAAK,OAAO,CAAC,GAAG,CAAC;QACvB,QAAQ,IAAK,OAAO,CAAC,GAAG,CAAC;QACzB,KAAK,IAAK,OAAO,CAAC,GAAG,CAAC;KAKzB;CACJ"}
|
|
@@ -1,18 +1,5 @@
|
|
|
1
1
|
import { MQConst } from '../mq_const.js';
|
|
2
2
|
export declare namespace MQDriver {
|
|
3
|
-
interface Option {
|
|
4
|
-
alias: string;
|
|
5
|
-
host: string;
|
|
6
|
-
user: string;
|
|
7
|
-
password: string;
|
|
8
|
-
database: string;
|
|
9
|
-
dateStrings?: boolean;
|
|
10
|
-
checkDuplicate?: boolean;
|
|
11
|
-
compress?: boolean;
|
|
12
|
-
supportBigNumbers?: boolean;
|
|
13
|
-
bigNumberStrings?: boolean;
|
|
14
|
-
connectionLimit?: number;
|
|
15
|
-
}
|
|
16
3
|
interface Container {
|
|
17
4
|
getType(): MQConst.CONNECTION;
|
|
18
5
|
getConnection(dbname?: string, dbmode?: string): Promise<MQDriver.Connector>;
|
|
@@ -26,7 +13,13 @@ export declare namespace MQDriver {
|
|
|
26
13
|
query: (sql: string) => Promise<any>;
|
|
27
14
|
close: () => Promise<any>;
|
|
28
15
|
}
|
|
29
|
-
|
|
30
|
-
|
|
16
|
+
interface ResultSet {
|
|
17
|
+
insertId?: any;
|
|
18
|
+
affected: number;
|
|
19
|
+
rows: any[];
|
|
20
|
+
meta: any;
|
|
21
|
+
}
|
|
22
|
+
function invokeFunction(driver: string, name: string, args?: any): Promise<any>;
|
|
23
|
+
function create(type: MQConst.CONNECTION, driver: string, config?: any): Promise<MQDriver.Container>;
|
|
31
24
|
}
|
|
32
25
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/drivers/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAE1C,yBAAiB,QAAQ,CACzB;IACI,UAAiB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/drivers/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAE1C,yBAAiB,QAAQ,CACzB;IACI,UAAiB,SAAS;QACtB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;QAC9B,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC7E,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;KAC3B;IACD,UAAiB,SAAS;QACtB,KAAK,EAAG,MAAM,MAAM,CAAC;QACrB,gBAAgB,EAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,EAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,QAAQ,EAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,KAAK,EAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,KAAK,EAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;KAC9B;IACD,UAAiB,SAAS;QACtB,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,IAAI,EAAE,GAAG,CAAC;KACb;IAYD,SAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAKrF;IAED,SAAgB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAS1G;CACJ"}
|
package/cjs/types/querize.d.ts
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
import { MQDriver } from './drivers/index.js';
|
|
2
1
|
import { MQDatabase } from './mq_database.js';
|
|
3
|
-
type MQOption = MQDriver.Option;
|
|
4
2
|
export declare class Querize {
|
|
5
3
|
driver: string;
|
|
6
4
|
constructor(driver: string, doptions: object);
|
|
7
5
|
initialize(options?: Object): Promise<any>;
|
|
6
|
+
generateConfig(type?: string): Promise<any>;
|
|
8
7
|
createQuery(): Promise<MQDatabase.Class>;
|
|
9
|
-
createConnect(option:
|
|
10
|
-
createPool(option:
|
|
11
|
-
createCluster(option:
|
|
8
|
+
createConnect(option: any): Promise<MQDatabase.Class>;
|
|
9
|
+
createPool(option: any): Promise<MQDatabase.Class>;
|
|
10
|
+
createCluster(option: any): Promise<MQDatabase.Class>;
|
|
12
11
|
static setTrace(callback: Function): void;
|
|
13
12
|
}
|
|
14
13
|
export declare function setTrace(callback: Function): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"querize.d.ts","sourceRoot":"","sources":["../../../src/querize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"querize.d.ts","sourceRoot":"","sources":["../../../src/querize.ts"],"names":[],"mappings":"AAcA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,qBAAa,OAAO;IAChB,MAAM,EAAE,MAAM,CAAC;gBAEH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAI5C,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAG1C,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAI3C,WAAW,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;IASxC,aAAa,CAAC,MAAM,EAAG,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;IAatD,UAAU,CAAC,MAAM,EAAG,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;IASnD,aAAa,CAAC,MAAM,EAAG,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;IAStD,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ;CAIrC;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,QAG1C;AAGD,eAAe,OAAO,CAAC"}
|
|
@@ -14,6 +14,22 @@ import { MQTrace } from '../mq_trace.js';
|
|
|
14
14
|
import NodeMaria from 'mariadb';
|
|
15
15
|
export var DrvMariaDB;
|
|
16
16
|
(function (DrvMariaDB) {
|
|
17
|
+
function generateConfig() {
|
|
18
|
+
return {
|
|
19
|
+
alias: "local-mariadb", // transaction,singleton 시 찾을 이름
|
|
20
|
+
host: "127.0.0.1", // DB ip
|
|
21
|
+
user: "maria", // DB user
|
|
22
|
+
password: "password", // DB password
|
|
23
|
+
database: "test-db", // DB database
|
|
24
|
+
dateStrings: true,
|
|
25
|
+
checkDuplicate: false,
|
|
26
|
+
compress: true,
|
|
27
|
+
supportBigNumbers: true,
|
|
28
|
+
bigNumberStrings: false,
|
|
29
|
+
connectionLimit: 5,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
DrvMariaDB.generateConfig = generateConfig;
|
|
17
33
|
var _tid = 0;
|
|
18
34
|
function create(type, config) {
|
|
19
35
|
let toid = ++_tid;
|
|
@@ -111,7 +127,22 @@ export var DrvMariaDB;
|
|
|
111
127
|
beginTransaction() { return this.conn.beginTransaction(); }
|
|
112
128
|
query(sql) {
|
|
113
129
|
MQTrace.log(`[C:${this.coid}] [${this.owner.getType()}}]: query:`, sql);
|
|
114
|
-
return this.conn.query(sql)
|
|
130
|
+
return this.conn.query(sql).then(function (result) {
|
|
131
|
+
if (Array.isArray(result)) {
|
|
132
|
+
return {
|
|
133
|
+
affected: 0,
|
|
134
|
+
rows: result || [],
|
|
135
|
+
meta: result,
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
// DML(INSERT, UPDATE, DELETE) 결과인 경우 (ResultSetHeader 객체)
|
|
139
|
+
return {
|
|
140
|
+
affected: result.affectedRows || 0,
|
|
141
|
+
insertId: result.insertId,
|
|
142
|
+
rows: [],
|
|
143
|
+
meta: result,
|
|
144
|
+
};
|
|
145
|
+
});
|
|
115
146
|
}
|
|
116
147
|
commit() {
|
|
117
148
|
var self = this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drv_mariadb.js","sourceRoot":"","sources":["../../../src/drivers/drv_mariadb.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AAEb,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAC1C,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAC1C,OAAO,SAAS,MAAS,SAAS,CAAC;AAEnC,MAAM,KAAW,UAAU,
|
|
1
|
+
{"version":3,"file":"drv_mariadb.js","sourceRoot":"","sources":["../../../src/drivers/drv_mariadb.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,22 @@ import { MQTrace } from '../mq_trace.js';
|
|
|
14
14
|
import NodeMysql2 from 'mysql2/promise';
|
|
15
15
|
export var DrvMySQL;
|
|
16
16
|
(function (DrvMySQL) {
|
|
17
|
+
function generateConfig() {
|
|
18
|
+
return {
|
|
19
|
+
alias: "local-mysql", // transaction,singleton 시 찾을 이름
|
|
20
|
+
host: "127.0.0.1", // DB ip
|
|
21
|
+
user: "mysql", // DB user
|
|
22
|
+
password: "password", // DB password
|
|
23
|
+
database: "test-db", // DB database
|
|
24
|
+
dateStrings: true,
|
|
25
|
+
checkDuplicate: false,
|
|
26
|
+
compress: true,
|
|
27
|
+
supportBigNumbers: true,
|
|
28
|
+
bigNumberStrings: false,
|
|
29
|
+
connectionLimit: 5,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
DrvMySQL.generateConfig = generateConfig;
|
|
17
33
|
var _tid = 0;
|
|
18
34
|
function create(type, config) {
|
|
19
35
|
let toid = ++_tid;
|
|
@@ -111,7 +127,23 @@ export var DrvMySQL;
|
|
|
111
127
|
beginTransaction() { return this.conn.beginTransaction(); }
|
|
112
128
|
query(sql) {
|
|
113
129
|
MQTrace.log(`[C:${this.coid}] [${this.owner.getType()}}]: query:`, sql);
|
|
114
|
-
return this.conn.
|
|
130
|
+
return this.conn.query(sql).then(function (result) {
|
|
131
|
+
// MariaDB는 [rows, fields] 형태 또는 ResultSetHeader 객체로 옴
|
|
132
|
+
const data = Array.isArray(result) ? result[0] : result;
|
|
133
|
+
if (Array.isArray(data)) {
|
|
134
|
+
return {
|
|
135
|
+
affected: 0,
|
|
136
|
+
rows: data,
|
|
137
|
+
meta: result
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
return {
|
|
141
|
+
affected: data.affectedRows || 0,
|
|
142
|
+
insertId: data.insertId,
|
|
143
|
+
rows: [],
|
|
144
|
+
meta: result
|
|
145
|
+
};
|
|
146
|
+
});
|
|
115
147
|
}
|
|
116
148
|
commit() {
|
|
117
149
|
var self = this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drv_mysql2.js","sourceRoot":"","sources":["../../../src/drivers/drv_mysql2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AAEb,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAC1C,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAC1C,OAAO,UAAU,MAAQ,gBAAgB,CAAC;AAE1C,MAAM,KAAW,QAAQ,
|
|
1
|
+
{"version":3,"file":"drv_mysql2.js","sourceRoot":"","sources":["../../../src/drivers/drv_mysql2.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,17 +15,45 @@ import OracleDB from 'oracledb';
|
|
|
15
15
|
let _initialized = false;
|
|
16
16
|
export var DrvOracleDB;
|
|
17
17
|
(function (DrvOracleDB) {
|
|
18
|
-
function
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
function generateConfig(type) {
|
|
19
|
+
switch (type) {
|
|
20
|
+
case 'initialize':
|
|
21
|
+
return {
|
|
22
|
+
libDir: 'C:\\oracle\\instantclient_19_8', // 클라이언트 위치
|
|
23
|
+
configDir: 'C:\\oracle\\network\\admin', // TNS 설정 위치(tnsnames.ora, sqlnet.ora, oraaccess.xml)
|
|
24
|
+
errorUrl: 'https://my-company.com', // 커스텀 에러 안내
|
|
25
|
+
driverName: 'MyNodeApp:1.0' // DB 식별용 이름(DB 서버 모니터링 시 식별할 수 있는 드라이버 이름)
|
|
26
|
+
};
|
|
27
|
+
break;
|
|
28
|
+
case 'createConnect':
|
|
29
|
+
case 'createPool':
|
|
30
|
+
default:
|
|
31
|
+
return {
|
|
32
|
+
poolAlias: "dbname",
|
|
33
|
+
user: "oracle",
|
|
34
|
+
password: "password",
|
|
35
|
+
connectString: "127.0.0.1/ORCL",
|
|
36
|
+
poolMax: 10, //4
|
|
37
|
+
poolMin: 0, //0
|
|
38
|
+
poolIncrement: 1, //1
|
|
39
|
+
poolTimeout: 30, //60
|
|
40
|
+
poolPingInterval: 10, //60
|
|
41
|
+
};
|
|
25
42
|
}
|
|
26
|
-
|
|
27
|
-
|
|
43
|
+
}
|
|
44
|
+
DrvOracleDB.generateConfig = generateConfig;
|
|
45
|
+
function initialize(options) {
|
|
46
|
+
if (_initialized == false) {
|
|
47
|
+
_initialized = true;
|
|
48
|
+
console.log("ORACLEDB.initOracleClient");
|
|
49
|
+
if (options === undefined) {
|
|
50
|
+
OracleDB.initOracleClient();
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
OracleDB.initOracleClient(options);
|
|
54
|
+
}
|
|
28
55
|
}
|
|
56
|
+
return Promise.resolve();
|
|
29
57
|
}
|
|
30
58
|
DrvOracleDB.initialize = initialize;
|
|
31
59
|
var _tid = 0;
|
|
@@ -36,8 +64,16 @@ export var DrvOracleDB;
|
|
|
36
64
|
return Promise.resolve(new Container(null, MQConst.CONNECTION.CONNECTER, config));
|
|
37
65
|
break;
|
|
38
66
|
case MQConst.CONNECTION.POOLER:
|
|
67
|
+
if (Array.isArray(config)) {
|
|
68
|
+
return Promise.all(config.map(function (cfg) { return OracleDB.createPool(cfg); }))
|
|
69
|
+
.then(function (Pools) {
|
|
70
|
+
return new Container(Pools, MQConst.CONNECTION.POOLER);
|
|
71
|
+
});
|
|
72
|
+
}
|
|
39
73
|
return OracleDB.createPool(config)
|
|
40
|
-
.then(function (Pool) {
|
|
74
|
+
.then(function (Pool) {
|
|
75
|
+
return new Container(Pool, MQConst.CONNECTION.POOLER);
|
|
76
|
+
});
|
|
41
77
|
break;
|
|
42
78
|
}
|
|
43
79
|
throw new Error(`unsupport type(${type}).`);
|
|
@@ -45,10 +81,18 @@ export var DrvOracleDB;
|
|
|
45
81
|
DrvOracleDB.create = create;
|
|
46
82
|
class Container {
|
|
47
83
|
pool;
|
|
84
|
+
pools;
|
|
48
85
|
type;
|
|
49
86
|
config;
|
|
50
87
|
constructor(pool, type, config) {
|
|
51
|
-
|
|
88
|
+
if (Array.isArray(pool)) {
|
|
89
|
+
this.pool = null;
|
|
90
|
+
this.pools = pool;
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
this.pools = null;
|
|
94
|
+
this.pool = pool;
|
|
95
|
+
}
|
|
52
96
|
this.type = type;
|
|
53
97
|
this.config = config;
|
|
54
98
|
}
|
|
@@ -62,7 +106,7 @@ export var DrvOracleDB;
|
|
|
62
106
|
});
|
|
63
107
|
break;
|
|
64
108
|
case MQConst.CONNECTION.POOLER:
|
|
65
|
-
return
|
|
109
|
+
return OracleDB.getPool(dbname).getConnection()
|
|
66
110
|
.then(function (conn) {
|
|
67
111
|
return new Connector(self, conn);
|
|
68
112
|
});
|
|
@@ -70,13 +114,20 @@ export var DrvOracleDB;
|
|
|
70
114
|
return Promise.reject(new Error(`Unsupported connection type: ${self.type}`));
|
|
71
115
|
}
|
|
72
116
|
destory() {
|
|
73
|
-
|
|
117
|
+
var self = this;
|
|
118
|
+
switch (self.type) {
|
|
74
119
|
case MQConst.CONNECTION.PHONY:
|
|
75
120
|
case MQConst.CONNECTION.CONNECTER:
|
|
76
121
|
break;
|
|
77
122
|
case MQConst.CONNECTION.POOLER:
|
|
78
123
|
// Force close after 10 seconds if it does not shut down normally.
|
|
79
|
-
|
|
124
|
+
if (self.pool != null) {
|
|
125
|
+
return self.pool.close(10);
|
|
126
|
+
}
|
|
127
|
+
else if (self.pools != null) {
|
|
128
|
+
return Promise.all(self.pools.map(function (pool) { return pool.close(0); }));
|
|
129
|
+
}
|
|
130
|
+
break;
|
|
80
131
|
}
|
|
81
132
|
return Promise.resolve();
|
|
82
133
|
}
|
|
@@ -86,35 +137,42 @@ export var DrvOracleDB;
|
|
|
86
137
|
class Connector {
|
|
87
138
|
owner;
|
|
88
139
|
conn;
|
|
89
|
-
|
|
140
|
+
isTR; // is-transaction
|
|
90
141
|
coid;
|
|
91
142
|
constructor(owner, conn) {
|
|
92
143
|
this.owner = owner;
|
|
93
144
|
this.conn = conn;
|
|
94
145
|
this.coid = ++_cid;
|
|
95
|
-
this.
|
|
146
|
+
this.isTR = false;
|
|
96
147
|
MQTrace.log(`[C:${this.coid}] [${this.owner.getType()}}]: connected.`);
|
|
97
148
|
}
|
|
98
149
|
getId() { return this.coid.toString(); }
|
|
99
150
|
// 1. A transaction automatically starts when a DML(INSERT/UPDATE/DELETE/MERGE) statement is executed.
|
|
100
151
|
// 2. Use SET TRANSACTION – this will be handled later as an argument to beginTransaction().
|
|
101
|
-
beginTransaction() { this.
|
|
152
|
+
beginTransaction() { this.isTR = true; return Promise.resolve(); }
|
|
102
153
|
query(sql) {
|
|
103
|
-
MQTrace.log(`[C:${this.coid}] [${this.owner.getType()}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
}
|
|
108
|
-
return this.conn.execute(sql)
|
|
154
|
+
MQTrace.log(`[C:${this.coid}] [${this.owner.getType()}]: query:`, sql);
|
|
155
|
+
const options = {
|
|
156
|
+
outFormat: OracleDB.OUT_FORMAT_OBJECT,
|
|
157
|
+
autoCommit: this.isTR !== true,
|
|
158
|
+
};
|
|
159
|
+
return this.conn.execute(sql, {}, options).then(function (result) {
|
|
160
|
+
return {
|
|
161
|
+
insertId: result.lastRowid,
|
|
162
|
+
affected: result.rowsAffected || 0,
|
|
163
|
+
rows: result.rows || [], // oracledb.OUT_FORMAT_OBJECT 설정 필수
|
|
164
|
+
meta: result,
|
|
165
|
+
};
|
|
166
|
+
});
|
|
109
167
|
}
|
|
110
168
|
commit() {
|
|
111
169
|
var self = this;
|
|
112
|
-
self.
|
|
170
|
+
self.isTR = false;
|
|
113
171
|
return self.conn.commit().then(function () { self.close(); });
|
|
114
172
|
}
|
|
115
173
|
rollback() {
|
|
116
174
|
var self = this;
|
|
117
|
-
self.
|
|
175
|
+
self.isTR = false;
|
|
118
176
|
return self.conn.rollback().then(function () { self.close(); });
|
|
119
177
|
}
|
|
120
178
|
close() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drv_oracledb.js","sourceRoot":"","sources":["../../../src/drivers/drv_oracledb.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AAEb,OAAO,EAAC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"drv_oracledb.js","sourceRoot":"","sources":["../../../src/drivers/drv_oracledb.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drv_query.js","sourceRoot":"","sources":["../../../src/drivers/drv_query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AAGb,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAE1C,MAAM,KAAW,QAAQ,CA2CxB;AA3CD,WAAiB,QAAQ;IAErB,SAAgB,MAAM,CAAC,IAAwB,EAAE,MAAW;QACxD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IAFe,eAAM,SAErB,CAAA;IAED,MAAa,SAAS;QAClB,IAAI,CAAqB;QACzB,YAAY,IAAwB;YAChC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,OAAO,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/B,aAAa,CAAC,MAAe,EAAE,MAAe;YAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,
|
|
1
|
+
{"version":3,"file":"drv_query.js","sourceRoot":"","sources":["../../../src/drivers/drv_query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AAGb,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAE1C,MAAM,KAAW,QAAQ,CA2CxB;AA3CD,WAAiB,QAAQ;IAErB,SAAgB,MAAM,CAAC,IAAwB,EAAE,MAAW;QACxD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IAFe,eAAM,SAErB,CAAA;IAED,MAAa,SAAS;QAClB,IAAI,CAAqB;QACzB,YAAY,IAAwB;YAChC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,OAAO,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/B,aAAa,CAAC,MAAe,EAAE,MAAe;YAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,KAAoB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;KACzD;IAVY,kBAAS,YAUrB,CAAA;IAED,IAAI,IAAI,GAAW,CAAC,CAAC;IACrB,MAAa,SAAS;QACF,KAAK,CAAa;QAE3B,IAAI,CAAS;QAEpB,YAAY,KAAgB;YACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,IAAI,GAAG,EAAE,IAAI,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC3E,CAAC;QACD,KAAK,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACxC,gBAAgB,KAAoB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC/D,KAAK,CAAC,GAAW;YACb,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;YACxE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QACD,MAAM,KAAoB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACrD,QAAQ,KAAoB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACvD,KAAK;YACD,IAAI,IAAI,GAAG,IAAI,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,wBAAwB,CAAC,CAAC;YAC/E,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;KACJ;IAvBY,kBAAS,YAuBrB,CAAA;IAAA,CAAC;AACN,CAAC,EA3CgB,QAAQ,KAAR,QAAQ,QA2CxB;AAAA,CAAC"}
|
package/esm/drivers/index.js
CHANGED
|
@@ -23,13 +23,13 @@ export var MQDriver;
|
|
|
23
23
|
throw err;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
function
|
|
26
|
+
function invokeFunction(driver, name, args) {
|
|
27
27
|
return bring(driver).then(function (library) {
|
|
28
28
|
let nmsp = Object.keys(library)[0];
|
|
29
|
-
return library[nmsp]
|
|
29
|
+
return library[nmsp][name] && library[nmsp][name](args);
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
|
-
MQDriver.
|
|
32
|
+
MQDriver.invokeFunction = invokeFunction;
|
|
33
33
|
function create(type, driver, config) {
|
|
34
34
|
// console.log("type :", type);
|
|
35
35
|
// console.log("driver:", driver);
|
package/esm/drivers/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drivers/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AAGb,MAAM,KAAW,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drivers/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AAGb,MAAM,KAAW,QAAQ,CAiDxB;AAjDD,WAAiB,QAAQ;IAMpB,CAAC;IAQD,CAAC;IAMD,CAAC;IAEF,KAAK,UAAU,KAAK,CAAC,IAAY;QAC7B,IAAI,CAAC;YACD,OAAO,MAAM,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;QAC5C,CAAC;QACD,OAAM,GAAG,EAAE,CAAC;YACR,OAAO,CAAC,IAAI,CAAC,sBAAsB,IAAI,kCAAkC,CAAC,CAAC;YAC3E,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAED,SAAgB,cAAc,CAAC,MAAc,EAAE,IAAY,EAAE,IAAU;QACnE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAS,OAAO;YACtC,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACP,CAAC;IALe,uBAAc,iBAK7B,CAAA;IAED,SAAgB,MAAM,CAAC,IAAwB,EAAE,MAAc,EAAE,MAAY;QACzE,gCAAgC;QAChC,kCAAkC;QAClC,kCAAkC;QAClC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAS,OAAO;YACtC,oCAAoC;YACpC,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACP,CAAC;IATe,eAAM,SASrB,CAAA;AACL,CAAC,EAjDgB,QAAQ,KAAR,QAAQ,QAiDxB;AAAA,CAAC"}
|
package/esm/querize.js
CHANGED
|
@@ -19,7 +19,10 @@ export class Querize {
|
|
|
19
19
|
this.driver = driver;
|
|
20
20
|
}
|
|
21
21
|
initialize(options) {
|
|
22
|
-
return MQDriver.
|
|
22
|
+
return MQDriver.invokeFunction(this.driver, 'initialize', options);
|
|
23
|
+
}
|
|
24
|
+
generateConfig(type) {
|
|
25
|
+
return MQDriver.invokeFunction(this.driver, 'generateConfig', type);
|
|
23
26
|
}
|
|
24
27
|
createQuery() {
|
|
25
28
|
MQTrace.log(`PHONY: create.`);
|
|
@@ -30,6 +33,9 @@ export class Querize {
|
|
|
30
33
|
}
|
|
31
34
|
createConnect(option) {
|
|
32
35
|
MQTrace.log(`CONNECTER: create.`);
|
|
36
|
+
if (Array.isArray(option)) {
|
|
37
|
+
return Promise.reject(new Error('createConnect only 1-connection.'));
|
|
38
|
+
}
|
|
33
39
|
return MQDriver.create(MQConst.CONNECTION.CONNECTER, this.driver, option)
|
|
34
40
|
.then(function (container) {
|
|
35
41
|
return new MQDatabase.Class(container);
|
package/esm/querize.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"querize.js","sourceRoot":"","sources":["../../src/querize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AACb,OAAO,EAAC,QAAQ,EAAC,MAAQ,oBAAoB,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAC,MAAS,eAAe,CAAC;AACzC,OAAO,EAAC,OAAO,EAAC,MAAS,eAAe,CAAC;AACzC,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"querize.js","sourceRoot":"","sources":["../../src/querize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;EASE;AACF,YAAY,CAAC;AACb,OAAO,EAAC,QAAQ,EAAC,MAAQ,oBAAoB,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAC,MAAS,eAAe,CAAC;AACzC,OAAO,EAAC,OAAO,EAAC,MAAS,eAAe,CAAC;AACzC,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,MAAM,OAAO,OAAO;IAChB,MAAM,CAAS;IAEf,YAAY,MAAc,EAAE,QAAgB;QACxC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,UAAU,CAAC,OAAgB;QACvB,OAAO,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IACD,cAAc,CAAC,IAAa;QACxB,OAAO,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;IAED,WAAW;QACP,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAE9B,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;aAC5D,IAAI,CAAC,UAAS,SAAS;YACpB,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,MAAY;QACtB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAElC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAG,CAAC;YACzB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;aACxE,IAAI,CAAC,UAAS,SAAS;YACpB,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,UAAU,CAAC,MAAY;QACnB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAE/B,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;aACrE,IAAI,CAAC,UAAS,SAAS;YACpB,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,MAAY;QACtB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAEhC,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;aACtE,IAAI,CAAC,UAAS,SAAS;YACpB,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,QAAkB;QAC9B,UAAU;QACV,OAAO,CAAC,YAAY,GAAG,QAAQ,CAAC;IACpC,CAAC;CACJ;AAAA,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,QAAkB;IACvC,UAAU;IACV,OAAO,CAAC,YAAY,GAAG,QAAQ,CAAC;AACpC,CAAC;AAGD,eAAe,OAAO,CAAC,CAAC,UAAU"}
|
|
@@ -4,15 +4,28 @@ import NodeMaria from 'mariadb';
|
|
|
4
4
|
export declare namespace DrvMariaDB {
|
|
5
5
|
type TypeContainer = NodeMaria.Connection | NodeMaria.Pool | NodeMaria.PoolCluster;
|
|
6
6
|
type TypeConnect = NodeMaria.Connection | NodeMaria.PoolConnection;
|
|
7
|
-
export function
|
|
7
|
+
export function generateConfig(): {
|
|
8
|
+
alias: string;
|
|
9
|
+
host: string;
|
|
10
|
+
user: string;
|
|
11
|
+
password: string;
|
|
12
|
+
database: string;
|
|
13
|
+
dateStrings: boolean;
|
|
14
|
+
checkDuplicate: boolean;
|
|
15
|
+
compress: boolean;
|
|
16
|
+
supportBigNumbers: boolean;
|
|
17
|
+
bigNumberStrings: boolean;
|
|
18
|
+
connectionLimit: number;
|
|
19
|
+
};
|
|
20
|
+
export function create(type: MQConst.CONNECTION, config: any): Promise<Container>;
|
|
8
21
|
export class Container implements MQDriver.Container {
|
|
9
22
|
pool: TypeContainer | null;
|
|
10
23
|
type: MQConst.CONNECTION;
|
|
11
|
-
config?:
|
|
12
|
-
constructor(pool: TypeContainer | null, type: MQConst.CONNECTION, config?:
|
|
24
|
+
config?: any;
|
|
25
|
+
constructor(pool: TypeContainer | null, type: MQConst.CONNECTION, config?: any);
|
|
13
26
|
getType(): MQConst.CONNECTION;
|
|
14
27
|
getConnection(dbname?: string, dbmode?: string): Promise<MQDriver.Connector>;
|
|
15
|
-
destory(): Promise<
|
|
28
|
+
destory(): Promise<any>;
|
|
16
29
|
}
|
|
17
30
|
export class Connector implements MQDriver.Connector {
|
|
18
31
|
readonly owner: MQDriver.Container;
|
|
@@ -21,7 +34,7 @@ export declare namespace DrvMariaDB {
|
|
|
21
34
|
constructor(owner: any, conn: TypeConnect);
|
|
22
35
|
getId(): string;
|
|
23
36
|
beginTransaction(): Promise<any>;
|
|
24
|
-
query(sql: string): Promise<
|
|
37
|
+
query(sql: string): Promise<MQDriver.ResultSet>;
|
|
25
38
|
commit(): Promise<any>;
|
|
26
39
|
rollback(): Promise<any>;
|
|
27
40
|
close(): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drv_mariadb.d.ts","sourceRoot":"","sources":["../../../../src/drivers/drv_mariadb.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,QAAQ,EAAC,
|
|
1
|
+
{"version":3,"file":"drv_mariadb.d.ts","sourceRoot":"","sources":["../../../../src/drivers/drv_mariadb.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,QAAQ,EAAC,MAAQ,SAAS,CAAC;AACnC,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAE1C,OAAO,SAAS,MAAS,SAAS,CAAC;AAEnC,yBAAiB,UAAU,CAC3B;IACI,KAAK,aAAa,GAAG,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC;IACnF,KAAK,WAAW,GAAK,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,cAAc,CAAC;IAErE,MAAM,UAAU,cAAc;;;;;;;;;;;;MAc7B;IAGD,MAAM,UAAU,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAyBhF;IAED,MAAM,OAAO,SAAU,YAAW,QAAQ,CAAC,SAAS;QAChD,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;QAC3B,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QACzB,MAAM,CAAC,EAAE,GAAG,CAAC;oBAED,IAAI,EAAE,aAAa,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,GAAG;QAM9E,OAAO;QACP,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QA+B5E,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC;KAY1B;IAGD,MAAM,OAAO,SAAU,YAAW,QAAQ,CAAC,SAAS;QAChD,SAAgB,KAAK,EAAG,QAAQ,CAAC,SAAS,CAAC;QAC3C,SAAgB,IAAI,EAAG,WAAW,CAAC;QAE5B,IAAI,EAAE,MAAM,CAAC;oBAER,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW;QAQzC,KAAK;QACL,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC;QAChC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAoB/C,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;QAItB,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC;QAIxB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;KAmBxB;;CACJ"}
|
|
@@ -4,15 +4,28 @@ import NodeMysql2 from 'mysql2/promise';
|
|
|
4
4
|
export declare namespace DrvMySQL {
|
|
5
5
|
type TypeContainer = NodeMysql2.Connection | NodeMysql2.Pool | NodeMysql2.PoolCluster;
|
|
6
6
|
type TypeConnect = NodeMysql2.Connection | NodeMysql2.PoolConnection;
|
|
7
|
-
export function
|
|
7
|
+
export function generateConfig(): {
|
|
8
|
+
alias: string;
|
|
9
|
+
host: string;
|
|
10
|
+
user: string;
|
|
11
|
+
password: string;
|
|
12
|
+
database: string;
|
|
13
|
+
dateStrings: boolean;
|
|
14
|
+
checkDuplicate: boolean;
|
|
15
|
+
compress: boolean;
|
|
16
|
+
supportBigNumbers: boolean;
|
|
17
|
+
bigNumberStrings: boolean;
|
|
18
|
+
connectionLimit: number;
|
|
19
|
+
};
|
|
20
|
+
export function create(type: MQConst.CONNECTION, config: any): Promise<Container>;
|
|
8
21
|
export class Container implements MQDriver.Container {
|
|
9
22
|
pool: TypeContainer | null;
|
|
10
23
|
type: MQConst.CONNECTION;
|
|
11
|
-
config?:
|
|
12
|
-
constructor(pool: TypeContainer | null, type: MQConst.CONNECTION, config?:
|
|
24
|
+
config?: any;
|
|
25
|
+
constructor(pool: TypeContainer | null, type: MQConst.CONNECTION, config?: any);
|
|
13
26
|
getType(): MQConst.CONNECTION;
|
|
14
27
|
getConnection(dbname?: string, dbmode?: string): Promise<MQDriver.Connector>;
|
|
15
|
-
destory(): Promise<
|
|
28
|
+
destory(): Promise<any>;
|
|
16
29
|
}
|
|
17
30
|
export class Connector implements MQDriver.Connector {
|
|
18
31
|
readonly owner: MQDriver.Container;
|
|
@@ -21,7 +34,7 @@ export declare namespace DrvMySQL {
|
|
|
21
34
|
constructor(owner: any, conn: TypeConnect);
|
|
22
35
|
getId(): string;
|
|
23
36
|
beginTransaction(): Promise<any>;
|
|
24
|
-
query(sql: string): Promise<
|
|
37
|
+
query(sql: string): Promise<MQDriver.ResultSet>;
|
|
25
38
|
commit(): Promise<any>;
|
|
26
39
|
rollback(): Promise<any>;
|
|
27
40
|
close(): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drv_mysql2.d.ts","sourceRoot":"","sources":["../../../../src/drivers/drv_mysql2.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,QAAQ,EAAC,MAAQ,SAAS,CAAC;AACnC,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAE1C,OAAO,UAAU,MAAQ,gBAAgB,CAAC;AAE1C,yBAAiB,QAAQ,CACzB;IACI,KAAK,aAAa,GAAG,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;IACtF,KAAK,WAAW,GAAK,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"drv_mysql2.d.ts","sourceRoot":"","sources":["../../../../src/drivers/drv_mysql2.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,QAAQ,EAAC,MAAQ,SAAS,CAAC;AACnC,OAAO,EAAC,OAAO,EAAC,MAAS,gBAAgB,CAAC;AAE1C,OAAO,UAAU,MAAQ,gBAAgB,CAAC;AAE1C,yBAAiB,QAAQ,CACzB;IACI,KAAK,aAAa,GAAG,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;IACtF,KAAK,WAAW,GAAK,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC;IAEvE,MAAM,UAAU,cAAc;;;;;;;;;;;;MAc7B;IAGD,MAAM,UAAU,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAyBhF;IAED,MAAM,OAAO,SAAU,YAAW,QAAQ,CAAC,SAAS;QAChD,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;QAC3B,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QACzB,MAAM,CAAC,EAAE,GAAG,CAAC;oBAED,IAAI,EAAE,aAAa,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,GAAG;QAM9E,OAAO;QACP,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QA+B5E,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC;KAY1B;IAGD,MAAM,OAAO,SAAU,YAAW,QAAQ,CAAC,SAAS;QAChD,SAAgB,KAAK,EAAG,QAAQ,CAAC,SAAS,CAAC;QAC3C,SAAgB,IAAI,EAAG,WAAW,CAAC;QAE5B,IAAI,EAAE,MAAM,CAAC;oBAER,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW;QAQzC,KAAK;QACL,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC;QAChC,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAoB/C,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;QAItB,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC;QAIxB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;KAmBxB;;CACJ"}
|