@things-factory/integration-base 6.2.115 → 6.2.117

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.2.115",
+  "version": "6.2.117",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -47,5 +47,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "1daed375a4ad4c542f49ab14495b6613a65b1a04"
+  "gitHead": "5e4b0cfba46d97d2f570b2c7da0e08863a409130"
 }

package/server/engine/connector/oracle-connector.ts

@@ -63,8 +63,24 @@ export class OracleConnector implements Connector {
         const result = await connection.execute(procedure, params, {
           outFormat: Client.OBJECT
         })
+
+        var taskResult = {}
+        let paramKeys = Object.keys(params)
+
+        for (const paramKey of paramKeys) {
+          if (params[paramKey].dir === Client?.BIND_OUT) {
+            if (params[paramKey].type === Client?.CURSOR) {
+              const resultSetTemp = result.outBinds[paramKey]
+              taskResult[paramKey] = await resultSetTemp.getRows()
+              await resultSetTemp.close()
+            } else {
+              taskResult[paramKey] = result.outBinds[paramKey]
+            }
+          }
+        }
+
         await connection.close()
-        return result
+        return taskResult
       },
       close: async () => {
         await Client.getPool(poolAlias).close(10)

package/server/engine/task/oracle-procedure.ts

@@ -97,23 +97,8 @@ async function OracleProcedure(step: InputStep, context: Context) {
 
   const result = await dbconnection.execute(code, procedureParameters)
 
-  var taskResult = {}
-  let paramKeys = Object.keys(procedureParameters)
-
-  for (const paramKey of paramKeys) {
-    if (procedureParameters[paramKey].dir === oracledb?.BIND_OUT) {
-      if (procedureParameters[paramKey].type === oracledb?.CURSOR) {
-        const resultSetTemp = result.outBinds[paramKey]
-        taskResult[paramKey] = await resultSetTemp.getRows()
-        await resultSetTemp.close()
-      } else {
-        taskResult[paramKey] = result.outBinds[paramKey]
-      }
-    }
-  }
-
   return {
-    data: taskResult
+    data: result
   }
 }