@pi-r/oracle 0.12.4 → 0.13.0

package/client/index.js

@@ -178,9 +178,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
+    let parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
     if (isPlainObject(options)) {
-        ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
+        ({ parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
     }
     else {
         if (typeof options === 'string') {
@@ -268,26 +268,33 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle", 'options', credential) && asFunction(item.streamRow) : item.streamRow;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
-        let queryString = '', cacheCredential;
-        if (caching && ignoreCache !== true && !streamRow) {
-            queryString = Db.asString(query, true) + '_' + Db.asString(params, true) + Db.asString(clientOptions, true);
-            cacheCredential = DbPool.sanitize(credential, sortKeys);
-            if (ignoreCache !== 1) {
-                const result = this.getQueryResult(source, cacheCredential, queryString, cacheValue);
-                if (result) {
-                    if (parallel) {
-                        tasks[i] = Promise.resolve(result);
+        let queryString = '', pipeline, streamRow, cacheCredential;
+        if (query instanceof oracledb.Pipeline) {
+            pipeline = query;
+        }
+        else {
+            if (isString(query)) {
+                streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle", 'options', credential) && asFunction(item.streamRow) : item.streamRow;
+            }
+            if (caching && ignoreCache !== true && !streamRow) {
+                queryString = Db.keyForResult(query, params, clientOptions);
+                cacheCredential = DbPool.sanitize(credential, sortKeys);
+                if (ignoreCache !== 1) {
+                    const result = this.getQueryResult(source, cacheCredential, queryString, cacheValue);
+                    if (result) {
+                        if (parallel) {
+                            tasks[i] = Promise.resolve(result);
+                        }
+                        else {
+                            outResult[i] = result;
+                        }
+                        this.add(item, 4 | 128);
+                        continue;
                     }
-                    else {
-                        outResult[i] = result;
+                    if (!ignoreCache && outCacheMiss) {
+                        outCacheMiss.push(source);
                     }
-                    this.add(item, 4 | 128);
-                    continue;
-                }
-                if (!ignoreCache && outCacheMiss) {
-                    outCacheMiss.push(source);
                 }
             }
         }
@@ -310,7 +317,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
                 const executeOptions = { outFormat: oracledb.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
                 commandType = this.commandType.SELECT;
-                if (streamRow && isString(query)) {
+                if (streamRow) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' ? streamRow : null;
                     const stream = client.queryStream(query, params || [], executeOptions);
@@ -341,7 +348,32 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         .on('end', () => stream.destroy());
                 }
                 else {
-                    const { rows } = await client.execute(query, params || [], executeOptions);
+                    let rows;
+                    if (pipeline) {
+                        let result = await client.runPipeline(pipeline);
+                        if (item.pipelineRows) {
+                            result = result.filter(oper => oper.rows);
+                            if (result.length > 0) {
+                                switch (item.pipelineRows) {
+                                    case 'first':
+                                        rows = result[0].rows;
+                                        break;
+                                    case 'last':
+                                        rows = result.at(-1).rows;
+                                        break;
+                                    default:
+                                        rows = result.map(oper => oper.rows);
+                                        break;
+                                }
+                            }
+                        }
+                        else {
+                            rows = result;
+                        }
+                    }
+                    else {
+                        ({ rows } = await client.execute(query, params || [], executeOptions));
+                    }
                     this.add(item, 4);
                     resolve(rows ? this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue) : null);
                 }
@@ -367,6 +399,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     return this.processRows(batch, tasks, clients.length === 0 ? parallel : {
         parallel,
+        errorAsEmpty,
         disconnect: () => {
             for (const item of clients) {
                 item.close(err => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.12.4",
+  "version": "0.13.0",
   "description": "Oracle client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -17,8 +17,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.14.5",
-    "@e-mc/types": "^0.14.5",
-    "oracledb": "^6.10.0"
+    "@e-mc/db": "^0.14.6",
+    "@e-mc/types": "^0.14.6",
+    "oracledb": "^7.0.1"
   }
 }

package/types/index.d.ts

@@ -4,7 +4,7 @@ import type { IdentifierAction } from '@e-mc/types/lib/core';
 import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
 
 // @ts-ignore
-import type { BindParameters, ConnectionAttributes, ExecuteOptions, InitialiseOptions, PoolAttributes } from 'oracledb';
+import type { BindParameters, ConnectionAttributes, ExecuteOptions, InitialiseOptions, Pipeline, PoolAttributes } from 'oracledb';
 
 export const enum POOL_STATUS {
     CLOSED = 6002,
@@ -13,8 +13,9 @@ export const enum POOL_STATUS {
     RECONFIGURING = 6003
 }
 
-export interface OracleDataSource extends DbDataSource<string | object, ExecuteOptions, unknown, OracleCredential, string>, ExecuteAction<BindParameters> {
+export interface OracleDataSource extends DbDataSource<string | object | Pipeline, ExecuteOptions, unknown, OracleCredential, string>, ExecuteAction<BindParameters> {
     source: "oracle";
+    pipelineRows?: boolean | "first" | "last";
 }
 
 export type OracleCredential = ConnectionAttributes & PoolAttributes & InitialiseOptions & ServerAuth;