@zowe/db2-for-zowe-cli 5.0.17 → 5.0.19
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/lib/api/CallSP.js +8 -4
- package/lib/api/CallSP.js.map +1 -1
- package/lib/api/ConnectionString.js +12 -13
- package/lib/api/ConnectionString.js.map +1 -1
- package/lib/api/DB2Constants.d.ts +2 -2
- package/lib/api/DB2Constants.js +3 -2
- package/lib/api/DB2Constants.js.map +1 -1
- package/lib/api/ExecuteSQL.js +15 -5
- package/lib/api/ExecuteSQL.js.map +1 -1
- package/lib/api/ExportTable.js +9 -5
- package/lib/api/ExportTable.js.map +1 -1
- package/lib/api/ExportTableSQL.js +1 -2
- package/lib/api/ExportTableSQL.js.map +1 -1
- package/lib/api/doc/IDB2Column.d.ts +2 -2
- package/lib/cli/call/procedure/Procedure.handler.js +1 -2
- package/lib/cli/call/procedure/Procedure.handler.js.map +1 -1
- package/lib/index.js +6 -2
- package/lib/index.js.map +1 -1
- package/npm-shrinkwrap.json +26 -142
- package/package.json +9 -9
package/lib/api/CallSP.js
CHANGED
|
@@ -11,13 +11,12 @@
|
|
|
11
11
|
*/
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.CallSP = void 0;
|
|
14
|
-
const util_1 = require("util");
|
|
15
14
|
const ibmdb = require("ibm_db");
|
|
16
15
|
const IDB2Parameter_1 = require("./doc/IDB2Parameter");
|
|
17
16
|
const SessionValidator_1 = require("./SessionValidator");
|
|
18
17
|
const ConnectionString_1 = require("./ConnectionString");
|
|
19
|
-
const DB2Constants_1 = require("./DB2Constants");
|
|
20
18
|
const DB2Error_1 = require("./DB2Error");
|
|
19
|
+
const DB2Constants_1 = require("./DB2Constants");
|
|
21
20
|
/**
|
|
22
21
|
* Class to handle the invocation of the stored procedures
|
|
23
22
|
* @export
|
|
@@ -47,19 +46,24 @@ class CallSP {
|
|
|
47
46
|
const query = `CALL ${routineName}`;
|
|
48
47
|
let result;
|
|
49
48
|
let outVarCount = 0;
|
|
49
|
+
const newParameters = [];
|
|
50
50
|
// Count parameters with type OUTPUT or INOUT as they will be returned in the result set.
|
|
51
|
-
if (
|
|
51
|
+
if (parameters != null) {
|
|
52
52
|
for (const parameter of parameters) {
|
|
53
53
|
if (parameter.ParamType === IDB2Parameter_1.DB2_PARM_INOUT || parameter.ParamType === IDB2Parameter_1.DB2_PARM_OUTPUT) {
|
|
54
54
|
outVarCount++;
|
|
55
55
|
}
|
|
56
|
+
if (parameter.ParamType == undefined) {
|
|
57
|
+
parameter.ParamType = IDB2Parameter_1.DB2_PARM_INPUT;
|
|
58
|
+
}
|
|
59
|
+
newParameters.push(parameter);
|
|
56
60
|
}
|
|
57
61
|
}
|
|
58
62
|
try {
|
|
59
63
|
const db2 = ibmdb.openSync(connectionString, options);
|
|
60
64
|
// Prepare and execute the statement
|
|
61
65
|
const preparedStatement = db2.prepareSync(query);
|
|
62
|
-
result = preparedStatement.executeSync(
|
|
66
|
+
result = preparedStatement.executeSync(newParameters);
|
|
63
67
|
// Extract INOUT and OUTPUT parameters
|
|
64
68
|
if (outVarCount !== 0 && Array.isArray(result)) {
|
|
65
69
|
// If there are OUT/INOUT parameters, then ODBC driver returns an array, where
|
package/lib/api/CallSP.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CallSP.js","sourceRoot":"","sources":["../../src/api/CallSP.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF
|
|
1
|
+
{"version":3,"file":"CallSP.js","sourceRoot":"","sources":["../../src/api/CallSP.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@
|
|
|
11
11
|
*/
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.ConnectionString = void 0;
|
|
14
|
-
const util_1 = require("util");
|
|
15
14
|
/**
|
|
16
15
|
* DB2 server APIs
|
|
17
16
|
* @class DB2
|
|
@@ -26,22 +25,22 @@ class ConnectionString {
|
|
|
26
25
|
*/
|
|
27
26
|
static buildFromSession(session) {
|
|
28
27
|
let connectionString = "DRIVER={DB2 ODBC Driver};";
|
|
29
|
-
if (
|
|
28
|
+
if (session.database != null) {
|
|
30
29
|
connectionString += `DATABASE=${session.database};`;
|
|
31
30
|
}
|
|
32
|
-
if (
|
|
31
|
+
if (session.hostname != null) {
|
|
33
32
|
connectionString += `HOSTNAME=${session.hostname};`;
|
|
34
33
|
}
|
|
35
|
-
if (
|
|
34
|
+
if (session.port != null) {
|
|
36
35
|
connectionString += `PORT=${session.port};PROTOCOL=TCPIP;`;
|
|
37
36
|
}
|
|
38
|
-
if (
|
|
37
|
+
if (session.user != null) {
|
|
39
38
|
connectionString += `UID=${session.user};`;
|
|
40
39
|
}
|
|
41
|
-
if (
|
|
40
|
+
if (session.password != null) {
|
|
42
41
|
connectionString += `PWD=${session.password};`;
|
|
43
42
|
}
|
|
44
|
-
if (
|
|
43
|
+
if (session.sslFile != null) {
|
|
45
44
|
connectionString += `Security=SSL;SSLServerCertificate=${session.sslFile};`;
|
|
46
45
|
}
|
|
47
46
|
return connectionString;
|
|
@@ -58,22 +57,22 @@ class ConnectionString {
|
|
|
58
57
|
*/
|
|
59
58
|
static build(hostname, port, user, password, database, sslFile) {
|
|
60
59
|
let connectionString = "DRIVER={DB2 ODBC Driver};";
|
|
61
|
-
if (
|
|
60
|
+
if (database != null) {
|
|
62
61
|
connectionString += `DATABASE=${database};`;
|
|
63
62
|
}
|
|
64
|
-
if (
|
|
63
|
+
if (hostname != null) {
|
|
65
64
|
connectionString += `HOSTNAME=${hostname};`;
|
|
66
65
|
}
|
|
67
|
-
if (
|
|
66
|
+
if (port != null) {
|
|
68
67
|
connectionString += `PORT=${port};PROTOCOL=TCPIP;`;
|
|
69
68
|
}
|
|
70
|
-
if (
|
|
69
|
+
if (user != null) {
|
|
71
70
|
connectionString += `UID=${user};`;
|
|
72
71
|
}
|
|
73
|
-
if (
|
|
72
|
+
if (password != null) {
|
|
74
73
|
connectionString += `PWD=${password};`;
|
|
75
74
|
}
|
|
76
|
-
if (
|
|
75
|
+
if (sslFile != null) {
|
|
77
76
|
connectionString += `Security=SSL;SSLServerCertificate=${sslFile};`;
|
|
78
77
|
}
|
|
79
78
|
return connectionString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionString.js","sourceRoot":"","sources":["../../src/api/ConnectionString.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;
|
|
1
|
+
{"version":3,"file":"ConnectionString.js","sourceRoot":"","sources":["../../src/api/ConnectionString.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAIF;;;;GAIG;AACH,MAAa,gBAAgB;IAEzB;;;;;OAKG;IACI,MAAM,CAAC,gBAAgB,CAAC,OAAoB;QAC/C,IAAI,gBAAgB,GAAW,2BAA2B,CAAC;QAC3D,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,EAAE;YAC1B,gBAAgB,IAAI,YAAY,OAAO,CAAC,QAAQ,GAAG,CAAC;SACvD;QACD,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,EAAE;YAC1B,gBAAgB,IAAI,YAAY,OAAO,CAAC,QAAQ,GAAG,CAAC;SACvD;QACD,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE;YACtB,gBAAgB,IAAI,QAAQ,OAAO,CAAC,IAAI,kBAAkB,CAAC;SAC9D;QACD,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE;YACtB,gBAAgB,IAAI,OAAO,OAAO,CAAC,IAAI,GAAG,CAAC;SAC9C;QACD,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,EAAE;YAC1B,gBAAgB,IAAI,OAAO,OAAO,CAAC,QAAQ,GAAG,CAAC;SAClD;QACD,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE;YACzB,gBAAgB,IAAI,qCAAqC,OAAO,CAAC,OAAO,GAAG,CAAC;SAC/E;QACD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED;;;;;;;;;OASG;IACI,MAAM,CAAC,KAAK,CAAC,QAAiB,EAAE,IAAa,EAAE,IAAa,EAAE,QAAiB,EAAE,QAAiB,EAAE,OAAgB;QACvH,IAAI,gBAAgB,GAAW,2BAA2B,CAAC;QAC3D,IAAI,QAAQ,IAAI,IAAI,EAAE;YAClB,gBAAgB,IAAI,YAAY,QAAQ,GAAG,CAAC;SAC/C;QACD,IAAI,QAAQ,IAAI,IAAI,EAAE;YAClB,gBAAgB,IAAI,YAAY,QAAQ,GAAG,CAAC;SAC/C;QACD,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,gBAAgB,IAAI,QAAQ,IAAI,kBAAkB,CAAC;SACtD;QACD,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,gBAAgB,IAAI,OAAO,IAAI,GAAG,CAAC;SACtC;QACD,IAAI,QAAQ,IAAI,IAAI,EAAE;YAClB,gBAAgB,IAAI,OAAO,QAAQ,GAAG,CAAC;SAC1C;QACD,IAAI,OAAO,IAAI,IAAI,EAAE;YACjB,gBAAgB,IAAI,qCAAqC,OAAO,GAAG,CAAC;SACvE;QACD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CAEJ;AAhED,4CAgEC"}
|
|
@@ -4,6 +4,6 @@
|
|
|
4
4
|
* @class DB2Constants
|
|
5
5
|
*/
|
|
6
6
|
export declare class DB2Constants {
|
|
7
|
-
static readonly FETCH_MODE_ARRAY:
|
|
8
|
-
static readonly FETCH_MODE_OBJECT:
|
|
7
|
+
static readonly FETCH_MODE_ARRAY: import("ibm_db").FetchMode;
|
|
8
|
+
static readonly FETCH_MODE_OBJECT: import("ibm_db").FetchMode;
|
|
9
9
|
}
|
package/lib/api/DB2Constants.js
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.DB2Constants = void 0;
|
|
14
|
+
const ibm_db_1 = require("ibm_db");
|
|
14
15
|
/**
|
|
15
16
|
* Class to contain DB2 related constants
|
|
16
17
|
* @export
|
|
@@ -19,6 +20,6 @@ exports.DB2Constants = void 0;
|
|
|
19
20
|
class DB2Constants {
|
|
20
21
|
}
|
|
21
22
|
exports.DB2Constants = DB2Constants;
|
|
22
|
-
DB2Constants.FETCH_MODE_ARRAY =
|
|
23
|
-
DB2Constants.FETCH_MODE_OBJECT =
|
|
23
|
+
DB2Constants.FETCH_MODE_ARRAY = ibm_db_1.FETCH_ARRAY;
|
|
24
|
+
DB2Constants.FETCH_MODE_OBJECT = ibm_db_1.FETCH_OBJECT;
|
|
24
25
|
//# sourceMappingURL=DB2Constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DB2Constants.js","sourceRoot":"","sources":["../../src/api/DB2Constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF;;;;GAIG;AACH,MAAa,YAAY;;AAAzB,oCAGC;AAF0B,6BAAgB,
|
|
1
|
+
{"version":3,"file":"DB2Constants.js","sourceRoot":"","sources":["../../src/api/DB2Constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,mCAAmD;AAEnD;;;;GAIG;AACH,MAAa,YAAY;;AAAzB,oCAGC;AAF0B,6BAAgB,GAAG,oBAAW,CAAC;AAC/B,8BAAiB,GAAG,qBAAY,CAAC"}
|
package/lib/api/ExecuteSQL.js
CHANGED
|
@@ -13,9 +13,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
exports.ExecuteSQL = void 0;
|
|
14
14
|
const ibmdb = require("ibm_db");
|
|
15
15
|
const ConnectionString_1 = require("./ConnectionString");
|
|
16
|
-
const DB2Constants_1 = require("./DB2Constants");
|
|
17
16
|
const DB2Error_1 = require("./DB2Error");
|
|
17
|
+
const IDB2Parameter_1 = require("./doc/IDB2Parameter");
|
|
18
18
|
const SessionValidator_1 = require("./SessionValidator");
|
|
19
|
+
const DB2Constants_1 = require("./DB2Constants");
|
|
19
20
|
/**
|
|
20
21
|
* Class to handle execution of SQL statements
|
|
21
22
|
* @export
|
|
@@ -43,15 +44,24 @@ class ExecuteSQL {
|
|
|
43
44
|
fetchMode: DB2Constants_1.DB2Constants.FETCH_MODE_OBJECT,
|
|
44
45
|
};
|
|
45
46
|
let result;
|
|
47
|
+
const newParameters = [];
|
|
46
48
|
try {
|
|
47
49
|
this.mConnection = ibmdb.openSync(this.mConnectionString, options);
|
|
48
|
-
|
|
50
|
+
if (parameters != null) {
|
|
51
|
+
for (const parameter of parameters) {
|
|
52
|
+
if (parameter.ParamType == undefined) {
|
|
53
|
+
parameter.ParamType = IDB2Parameter_1.DB2_PARM_INPUT;
|
|
54
|
+
}
|
|
55
|
+
newParameters.push(parameter);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
result = this.mConnection.queryResultSync(sql, newParameters);
|
|
49
59
|
if (result instanceof Error) {
|
|
50
60
|
throw result;
|
|
51
61
|
}
|
|
52
|
-
yield result.fetchAllSync();
|
|
53
|
-
while (result.moreResultsSync()) {
|
|
54
|
-
yield result.fetchAllSync();
|
|
62
|
+
Array.isArray(result) ? yield result[0].fetchAllSync() : yield result.fetchAllSync();
|
|
63
|
+
while (Array.isArray(result) ? result[0].moreResultsSync() : result.moreResultsSync()) {
|
|
64
|
+
Array.isArray(result) ? yield result[0].fetchAllSync() : yield result.fetchAllSync();
|
|
55
65
|
}
|
|
56
66
|
this.mConnection.closeSync();
|
|
57
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExecuteSQL.js","sourceRoot":"","sources":["../../src/api/ExecuteSQL.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,gCAAgC;AAEhC,yDAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"ExecuteSQL.js","sourceRoot":"","sources":["../../src/api/ExecuteSQL.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,gCAAgC;AAEhC,yDAAsD;AACtD,yCAAsC;AACtC,uDAAoE;AACpE,yDAAsD;AACtD,iDAA8C;AAE9C;;;;GAIG;AACH,MAAa,UAAU;IAkBnB;;;OAGG;IACH,YAAY,OAAoB;QAC5B,mCAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,iBAAiB,GAAG,mCAAgB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACxE,CAAC;IAED;;;;;;;OAOG;IACI,CAAC,OAAO,CAAC,GAAW,EAAE,UAA4B;QACrD,MAAM,OAAO,GAAG;YACZ,SAAS,EAAE,2BAAY,CAAC,iBAAiB;SAC5C,CAAC;QACF,IAAI,MAAM,CAAC;QACX,MAAM,aAAa,GAAqB,EAAE,CAAC;QAC3C,IAAI;YACA,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;YACnE,IAAI,UAAU,IAAI,IAAI,EAAE;gBACpB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;oBAChC,IAAI,SAAS,CAAC,SAAS,IAAI,SAAS,EAAE;wBAAE,SAAS,CAAC,SAAS,GAAG,8BAAc,CAAC;qBAAE;oBAC/E,aAAa,CAAC,IAAI,CAAC,SAA2B,CAAC,CAAC;iBACnD;aACJ;YACD,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YAC9D,IAAI,MAAM,YAAY,KAAK,EAAE;gBACzB,MAAM,MAAM,CAAC;aAChB;YACD,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAA,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC;YACpF,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA,CAAC,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE;gBAClF,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAA,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC;aACvF;YACD,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;SAChC;QACD,OAAO,GAAG,EAAE;YACR,mBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;SACzB;IACL,CAAC;CACJ;AA/DD,gCA+DC"}
|
package/lib/api/ExportTable.js
CHANGED
|
@@ -23,10 +23,10 @@ exports.ExportTable = void 0;
|
|
|
23
23
|
const imperative_1 = require("@zowe/imperative");
|
|
24
24
|
const ibmdb = require("ibm_db");
|
|
25
25
|
const ConnectionString_1 = require("./ConnectionString");
|
|
26
|
-
const DB2Constants_1 = require("./DB2Constants");
|
|
27
26
|
const DB2Error_1 = require("./DB2Error");
|
|
28
27
|
const Messages_1 = require("./doc/Messages");
|
|
29
28
|
const SessionValidator_1 = require("./SessionValidator");
|
|
29
|
+
const DB2Constants_1 = require("./DB2Constants");
|
|
30
30
|
/**
|
|
31
31
|
* Class to handle exporting of DB2 tables
|
|
32
32
|
* @export
|
|
@@ -77,7 +77,11 @@ class ExportTable {
|
|
|
77
77
|
if (err !== null) {
|
|
78
78
|
reject(err);
|
|
79
79
|
}
|
|
80
|
-
|
|
80
|
+
let data = [];
|
|
81
|
+
if (res[0] && !(Array.isArray(res[0]))) {
|
|
82
|
+
data = res;
|
|
83
|
+
}
|
|
84
|
+
resolve(data);
|
|
81
85
|
});
|
|
82
86
|
}
|
|
83
87
|
else {
|
|
@@ -104,12 +108,12 @@ class ExportTable {
|
|
|
104
108
|
if (result instanceof Error) {
|
|
105
109
|
throw result;
|
|
106
110
|
}
|
|
107
|
-
let row = result.fetchSync();
|
|
111
|
+
let row = Array.isArray(result) ? result[0].fetchSync() : result.fetchSync();
|
|
108
112
|
while (row != null) {
|
|
109
113
|
yield row;
|
|
110
|
-
row = result.fetchSync();
|
|
114
|
+
row = Array.isArray(result) ? result[0].fetchSync() : result.fetchSync();
|
|
111
115
|
}
|
|
112
|
-
result.closeSync();
|
|
116
|
+
Array.isArray(result) ? result[0].closeSync() : result.closeSync();
|
|
113
117
|
}
|
|
114
118
|
/**
|
|
115
119
|
* Extract a list of columns out of a table metadata
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExportTable.js","sourceRoot":"","sources":["../../src/api/ExportTable.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAEF,iDAAqE;AACrE,gCAAgC;AAEhC,yDAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"ExportTable.js","sourceRoot":"","sources":["../../src/api/ExportTable.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.ExportTableSQL = void 0;
|
|
14
14
|
const imperative_1 = require("@zowe/imperative");
|
|
15
|
-
const util_1 = require("util");
|
|
16
15
|
const ExportTable_1 = require("./ExportTable");
|
|
17
16
|
/**
|
|
18
17
|
* Class to handle exporting DB2 tables
|
|
@@ -68,7 +67,7 @@ class ExportTableSQL extends ExportTable_1.ExportTable {
|
|
|
68
67
|
*/
|
|
69
68
|
escape(columnName, value) {
|
|
70
69
|
const columnMeta = this.getColumnMeta(columnName);
|
|
71
|
-
if (
|
|
70
|
+
if (value === null) {
|
|
72
71
|
return "NULL";
|
|
73
72
|
}
|
|
74
73
|
switch (columnMeta.TYPE_NAME) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExportTableSQL.js","sourceRoot":"","sources":["../../src/api/ExportTableSQL.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,iDAAmD;
|
|
1
|
+
{"version":3,"file":"ExportTableSQL.js","sourceRoot":"","sources":["../../src/api/ExportTableSQL.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,iDAAmD;AAEnD,+CAA4C;AAE5C;;;;GAIG;AACH,MAAa,cAAe,SAAQ,yBAAW;IAE3C;;;;;OAKG;IACH,YAAY,OAAoB,EAAE,YAAoB,EAAE,SAAiB;QACrE,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACI,CAAC,MAAM;QACV,IAAI;YACA,IAAI,GAAG,CAAC;YACR,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACzB,OAAO,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;gBAC9B,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aAC9C;SACJ;QACD,OAAO,GAAG,EAAE;YACR,MAAM,IAAI,4BAAe,CAAC,EAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAC,CAAC,CAAC;SACpD;IACL,CAAC;IAED;;;;OAIG;IACI,oBAAoB,CAAC,IAAS;QACjC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAC1D;QACD,MAAM,UAAU,GAAW,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,UAAU,GAAW,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,eAAe,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,IAAI,UAAU,aAAa,UAAU,KAAK,CAAC;IAClG,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,UAAkB,EAAE,KAAU;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAClD,IAAI,KAAK,KAAK,IAAI,EAAE;YAChB,OAAO,MAAM,CAAC;SACjB;QACD,QAAQ,UAAU,CAAC,SAAS,EAAE;YAC1B,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,WAAW,CAAC;YACjB,KAAK,SAAS;gBACV,OAAO,IAAI,KAAK,GAAG,CAAC;YACxB;gBACI,OAAO,KAAK,CAAC;SACpB;IACL,CAAC;CACJ;AApED,wCAoEC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* @interface IDB2Column
|
|
4
4
|
* @export
|
|
5
5
|
*/
|
|
6
|
-
export
|
|
6
|
+
export type IDB2Column = {
|
|
7
7
|
/**
|
|
8
8
|
* The catalog name
|
|
9
9
|
* @type {string}
|
|
@@ -122,4 +122,4 @@ export interface IDB2Column {
|
|
|
122
122
|
* @memberof IDB2Column
|
|
123
123
|
*/
|
|
124
124
|
IS_NULLABLE: string;
|
|
125
|
-
}
|
|
125
|
+
};
|
|
@@ -21,7 +21,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
22
|
const imperative_1 = require("@zowe/imperative");
|
|
23
23
|
const index_1 = require("../../../index");
|
|
24
|
-
const util_1 = require("util");
|
|
25
24
|
/**
|
|
26
25
|
* Command handler for calling a DB2 stored procedure
|
|
27
26
|
* @export
|
|
@@ -35,7 +34,7 @@ class ProcedureHandler extends index_1.DB2BaseHandler {
|
|
|
35
34
|
* @returns {IDB2Parameter[]}
|
|
36
35
|
*/
|
|
37
36
|
static parseParameters(parameters) {
|
|
38
|
-
if (
|
|
37
|
+
if (parameters == null) {
|
|
39
38
|
return [];
|
|
40
39
|
}
|
|
41
40
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Procedure.handler.js","sourceRoot":"","sources":["../../../../src/cli/call/procedure/Procedure.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAAkF;AAClF,0CAAmH;
|
|
1
|
+
{"version":3,"file":"Procedure.handler.js","sourceRoot":"","sources":["../../../../src/cli/call/procedure/Procedure.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAAkF;AAClF,0CAAmH;AAEnH;;;;;GAKG;AACH,MAAqB,gBAAiB,SAAQ,sBAAc;IAExD;;;;OAIG;IACI,MAAM,CAAC,eAAe,CAAC,UAAiB;QAC3C,IAAI,UAAU,IAAI,IAAI,EAAE;YACpB,OAAO,EAAE,CAAC;SACb;aACI;YACD,MAAM,MAAM,GAAoB,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACrD,MAAM,KAAK,GAAkB;oBACzB,SAAS,EAAE,uBAAe;oBAC1B,IAAI,EAAE,KAAK;iBACd,CAAC;gBACF,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACjB;IACL,CAAC;IAEY,qBAAqB,CAAC,MAA0B,EAAE,OAAwB;;YACnF,MAAM,UAAU,GAAG,OAAO,CAAC,QAAuB,CAAC;YAEnD,MAAM,OAAO,GAAW,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;YACjD,MAAM,UAAU,GAAoB,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAElG,MAAM,QAAQ,GAAiB,cAAM,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YAElF,yBAAyB;YACzB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAEpE,wDAAwD;YACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE1C,CAAC;KAAA;CACJ;AAtCD,mCAsCC"}
|
package/lib/index.js
CHANGED
|
@@ -11,13 +11,17 @@
|
|
|
11
11
|
*/
|
|
12
12
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
13
13
|
if (k2 === undefined) k2 = k;
|
|
14
|
-
Object.
|
|
14
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
15
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
16
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
17
|
+
}
|
|
18
|
+
Object.defineProperty(o, k2, desc);
|
|
15
19
|
}) : (function(o, m, k, k2) {
|
|
16
20
|
if (k2 === undefined) k2 = k;
|
|
17
21
|
o[k2] = m[k];
|
|
18
22
|
}));
|
|
19
23
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
20
|
-
for (var p in m) if (p !== "default" && !
|
|
24
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
21
25
|
};
|
|
22
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
27
|
__exportStar(require("./Constants"), exports);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;;;;;AAEF,8CAA4B;AAC5B,yDAAuC;AACvC,uDAAqC;AACrC,0DAAwC;AACxC,yDAAuC;AACvC,iEAA+C;AAC/C,mDAAiC;AACjC,uDAAqC;AACrC,yDAAuC;AACvC,qDAAmC;AACnC,yDAAuC;AACvC,mDAAiC;AACjC,oDAAkC;AAClC,uDAAqC;AACrC,+CAA6B;AAC7B,iDAA+B"}
|