@things-factory/integration-base 6.1.116 → 6.1.118
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/assets/images/oracle-procedure-example1.png +0 -0
- package/assets/images/oracle-procedure-example2.png +0 -0
- package/dist-server/engine/task/database-procedure.js +5 -32
- package/dist-server/engine/task/database-procedure.js.map +1 -1
- package/dist-server/engine/task/oracle-procedure.js +16 -10
- package/dist-server/engine/task/oracle-procedure.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/helps/integration/task/oracle-procedure.ko.md +7 -0
- package/helps/integration/task/oracle-procedure.md +6 -0
- package/package.json +7 -7
- package/server/engine/task/oracle-procedure.ts +26 -11
Binary file
|
Binary file
|
@@ -1,28 +1,11 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const vm2_1 = require("vm2");
|
4
|
-
const utils_1 = require("@things-factory/utils");
|
5
4
|
const connection_manager_1 = require("../connection-manager");
|
6
5
|
const task_registry_1 = require("../task-registry");
|
7
|
-
const oracledb = require('oracledb');
|
8
|
-
const TYPES = {
|
9
|
-
Number: oracledb.NUMBER,
|
10
|
-
String: oracledb.STRING,
|
11
|
-
Date: oracledb.DATE,
|
12
|
-
Buffer: oracledb.BUFFER,
|
13
|
-
Blob: oracledb.BLOB,
|
14
|
-
Clob: oracledb.CLOB,
|
15
|
-
Cursor: oracledb.CURSOR
|
16
|
-
};
|
17
|
-
const DIR = {
|
18
|
-
In: oracledb.BIND_IN,
|
19
|
-
Inout: oracledb.BIND_INOUT,
|
20
|
-
Out: oracledb.BIND_OUT
|
21
|
-
};
|
22
6
|
async function DatabaseExecute(step, context) {
|
23
7
|
var { domain, data, variables } = context;
|
24
|
-
var { connection: connectionName, params } = step;
|
25
|
-
var { procedure, parameters } = params;
|
8
|
+
var { connection: connectionName, params: { procedure, params } } = step;
|
26
9
|
var dbconnection = connection_manager_1.ConnectionManager.getConnectionInstanceByName(domain, connectionName);
|
27
10
|
const vm = new vm2_1.VM({
|
28
11
|
sandbox: {
|
@@ -33,17 +16,7 @@ async function DatabaseExecute(step, context) {
|
|
33
16
|
});
|
34
17
|
procedure = vm.run('`' + procedure + '`');
|
35
18
|
console.log('procedure: ', procedure);
|
36
|
-
|
37
|
-
parameters.reduce((sum, { name, val, dir, type, maxSize }) => {
|
38
|
-
sum[name] = {
|
39
|
-
dir: DIR[dir],
|
40
|
-
type: TYPES[type],
|
41
|
-
val: (0, utils_1.access)(val),
|
42
|
-
maxSize
|
43
|
-
};
|
44
|
-
return sum;
|
45
|
-
}, {});
|
46
|
-
var procedureResult = await dbconnection.executeProcedure(procedure, procedureParameters);
|
19
|
+
var procedureResult = await dbconnection.executeProcedure(procedure);
|
47
20
|
console.log('procedureResult: ', procedureResult);
|
48
21
|
return {
|
49
22
|
data: procedureResult
|
@@ -56,9 +29,9 @@ DatabaseExecute.parameterSpec = [
|
|
56
29
|
label: 'procedure'
|
57
30
|
},
|
58
31
|
{
|
59
|
-
type: '
|
60
|
-
name: '
|
61
|
-
label: '
|
32
|
+
type: 'textarea',
|
33
|
+
name: 'params',
|
34
|
+
label: 'params'
|
62
35
|
}
|
63
36
|
];
|
64
37
|
task_registry_1.TaskRegistry.registerTaskHandler('database-procedure', DatabaseExecute);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"database-procedure.js","sourceRoot":"","sources":["../../../server/engine/task/database-procedure.ts"],"names":[],"mappings":";;AAAA,6BAAwB;AACxB,
|
1
|
+
{"version":3,"file":"database-procedure.js","sourceRoot":"","sources":["../../../server/engine/task/database-procedure.ts"],"names":[],"mappings":";;AAAA,6BAAwB;AACxB,8DAAyD;AACzD,oDAA+C;AAE/C,KAAK,UAAU,eAAe,CAAC,IAAI,EAAE,OAAO;IAC1C,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;IACzC,IAAI,EACF,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAC9B,GAAG,IAAI,CAAA;IAER,IAAI,YAAY,GAAG,sCAAiB,CAAC,2BAA2B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAExF,MAAM,EAAE,GAAG,IAAI,QAAE,CAAC;QAChB,OAAO,EAAE;YACP,MAAM;YACN,IAAI;YACJ,SAAS;SACV;KACF,CAAC,CAAA;IAEF,SAAS,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAA;IAEzC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;IAErC,IAAI,eAAe,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;IAEpE,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAA;IAEjD,OAAO;QACL,IAAI,EAAE,eAAe;KACtB,CAAA;AACH,CAAC;AAED,eAAe,CAAC,aAAa,GAAG;IAC9B;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,WAAW;KACnB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,QAAQ;KAChB;CACF,CAAA;AAED,4BAAY,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAA","sourcesContent":["import { VM } from 'vm2'\nimport { ConnectionManager } from '../connection-manager'\nimport { TaskRegistry } from '../task-registry'\n\nasync function DatabaseExecute(step, context) {\n var { domain, data, variables } = context\n var {\n connection: connectionName,\n params: { procedure, params }\n } = step\n\n var dbconnection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n\n const vm = new VM({\n sandbox: {\n domain,\n data,\n variables\n }\n })\n\n procedure = vm.run('`' + procedure + '`')\n\n console.log('procedure: ', procedure)\n\n var procedureResult = await dbconnection.executeProcedure(procedure)\n\n console.log('procedureResult: ', procedureResult)\n\n return {\n data: procedureResult\n }\n}\n\nDatabaseExecute.parameterSpec = [\n {\n type: 'textarea',\n name: 'procedure',\n label: 'procedure'\n },\n {\n type: 'textarea',\n name: 'params',\n label: 'params'\n }\n]\n\nTaskRegistry.registerTaskHandler('database-procedure', DatabaseExecute)\n"]}
|
@@ -39,19 +39,25 @@ async function OracleProcedure(step, context) {
|
|
39
39
|
});
|
40
40
|
procedure = vm.run('`' + procedure + '`');
|
41
41
|
const procedureParameters = parameters &&
|
42
|
-
parameters.reduce((sum, { name, val, dir, type, maxSize }) => {
|
42
|
+
parameters.reduce((sum, { name, val, dir, type, accessor, maxSize }) => {
|
43
43
|
sum[name] = {
|
44
44
|
dir: DIR[dir],
|
45
|
-
type: TYPES[type]
|
46
|
-
val: (0, utils_1.access)(val, data),
|
47
|
-
maxSize
|
45
|
+
type: TYPES[type]
|
48
46
|
};
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
47
|
+
const calculated = val !== undefined ? val : accessor ? (0, utils_1.access)(accessor, data) : undefined;
|
48
|
+
if (calculated !== undefined) {
|
49
|
+
sum[name].val =
|
50
|
+
type == 'Date'
|
51
|
+
? new Date(calculated)
|
52
|
+
: type == 'Number'
|
53
|
+
? Number(calculated)
|
54
|
+
: type == 'String'
|
55
|
+
? String(calculated)
|
56
|
+
: calculated;
|
57
|
+
}
|
58
|
+
if (maxSize) {
|
59
|
+
sum[name].maxSize = maxSize;
|
60
|
+
}
|
55
61
|
return sum;
|
56
62
|
}, {});
|
57
63
|
const result = await dbconnection.execute(procedure, procedureParameters);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"oracle-procedure.js","sourceRoot":"","sources":["../../../server/engine/task/oracle-procedure.ts"],"names":[],"mappings":";;AAAA,6BAAwB;AACxB,6CAA4C;AAC5C,iDAA8C;AAC9C,8DAAyD;AACzD,oDAA+C;AAE/C,IAAI;IACF,IAAI,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;CACnC;AAAC,OAAO,GAAG,EAAE;IACZ,YAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;CAC/C;
|
1
|
+
{"version":3,"file":"oracle-procedure.js","sourceRoot":"","sources":["../../../server/engine/task/oracle-procedure.ts"],"names":[],"mappings":"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","sourcesContent":["import { VM } from 'vm2'\nimport { logger } from '@things-factory/env'\nimport { access } from '@things-factory/utils'\nimport { ConnectionManager } from '../connection-manager'\nimport { TaskRegistry } from '../task-registry'\n\ntry {\n var oracledb = require('oracledb')\n} catch (err) {\n logger.error('oracledb module loading failed')\n}\n\ntype ProcedureParameterType = {\n name: string\n dir: string\n type: string\n val?: any\n accessor?: string\n maxSize?: number\n}\n\nconst TYPES = {\n Number: oracledb.NUMBER,\n String: oracledb.STRING,\n Date: oracledb.DATE,\n Buffer: oracledb.BUFFER,\n Blob: oracledb.BLOB,\n Clob: oracledb.CLOB,\n Cursor: oracledb.CURSOR\n}\n\nconst DIR = {\n In: oracledb.BIND_IN,\n Inout: oracledb.BIND_INOUT,\n Out: oracledb.BIND_OUT\n}\n\nasync function OracleProcedure(step, context) {\n var { domain, data, variables } = context\n var { connection: connectionName, params } = step\n\n var { procedure, parameters } = params as { procedure: string; parameters: ProcedureParameterType[] }\n\n var dbconnection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n\n const vm = new VM({\n sandbox: {\n domain,\n data,\n variables\n }\n })\n\n procedure = vm.run('`' + procedure + '`')\n\n const procedureParameters =\n parameters &&\n parameters.reduce((sum, { name, val, dir, type, accessor, maxSize }) => {\n sum[name] = {\n dir: DIR[dir],\n type: TYPES[type]\n }\n\n const calculated = val !== undefined ? val : accessor ? access(accessor, data) : undefined\n\n if (calculated !== undefined) {\n sum[name].val =\n type == 'Date'\n ? new Date(calculated)\n : type == 'Number'\n ? Number(calculated)\n : type == 'String'\n ? String(calculated)\n : calculated\n }\n\n if (maxSize) {\n sum[name].maxSize = maxSize\n }\n\n return sum\n }, {})\n\n const result = await dbconnection.execute(procedure, procedureParameters)\n\n var taskResult = {}\n let paramKeys = Object.keys(procedureParameters)\n\n for (const paramKey of paramKeys) {\n if (procedureParameters[paramKey].dir === oracledb.BIND_OUT) {\n if (procedureParameters[paramKey].type === oracledb.CURSOR) {\n const resultSetTemp = result.outBinds[paramKey]\n taskResult[paramKey] = await resultSetTemp.getRows()\n await resultSetTemp.close()\n } else {\n taskResult[paramKey] = result.outBinds[paramKey]\n }\n }\n }\n\n console.log('taskResult: ', taskResult)\n\n return {\n data: taskResult\n }\n}\n\nOracleProcedure.parameterSpec = [\n {\n type: 'textarea',\n name: 'procedure',\n label: 'procedure'\n },\n {\n type: 'procedure-parameters',\n name: 'parameters',\n label: 'params'\n }\n]\n\nOracleProcedure.help = 'integration/task/oracle-procedure'\n\nTaskRegistry.registerTaskHandler('oracle-procedure', OracleProcedure)\n"]}
|