@pi-r/oci 0.6.0 → 0.6.1

package/client/index.js

@@ -71,7 +71,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const caching = length > 0 && this.hasCache(batch[0].service, sessionKey);
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     let client;
-    const createClient = async () => createDatabaseClient.call(this, length === 1 ? credential : { ...credential });
+    const createClient = async () => createDatabaseClient.call(this, credential);
     const closeClient = async () => client?.close();
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
@@ -80,14 +80,14 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             closeClient();
             throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
         }
-        const renewCache = ignoreCache === 0;
         const getCache = (value) => {
             if (ignoreCache !== 1) {
-                cacheValue.renewCache = renewCache;
+                cacheValue.renewCache = ignoreCache === 0;
                 return this.getQueryResult(service, credential, value, cacheValue);
             }
         };
-        let rows, queryString = caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache ? table + '_' : '';
+        cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
+        let rows, queryString = caching && ignoreCache !== true ? table + '_' : '';
         invalid: {
             if (id) {
                 const update = item.update;
@@ -140,7 +140,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
             }
             else if (query) {
-                const maxRows = typeof item.limit === 'number' ? Math.max(item.limit, 0) : undefined;
+                let maxRows = typeof item.limit === 'number' ? Math.max(item.limit, 0) : undefined;
                 if ((0, types_1.isPlainObject)(query)) {
                     if (queryString && (rows = getCache(queryString += Module.asString(query, true) + (maxRows ? maxRows : '')))) {
                         result[i] = rows;
@@ -159,11 +159,43 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
                 else {
                     const { params, options } = item;
+                    maxRows || (maxRows = options?.maxRows);
                     if (queryString && (rows = getCache(queryString += query + Module.asString(params, true) + Module.asString(options, true) + (maxRows ? maxRows : '')))) {
                         result[i] = rows;
                         continue;
                     }
-                    ({ rows } = await (client || (client = await createClient())).execute(query, params || [], { ...options, outFormat: 4002 /* OUT_FORMAT.OBJECT */, maxRows, resultSet: false, autoCommit: true }));
+                    client || (client = await createClient());
+                    const executeOptions = { ...options, outFormat: 4002 /* OUT_FORMAT.OBJECT */, maxRows, resultSet: false, autoCommit: true };
+                    if (item.streamRow) {
+                        rows = [];
+                        await new Promise((resolve, reject) => {
+                            let error;
+                            const stream = client.queryStream(query, params || [], executeOptions);
+                            stream
+                                .on('data', row => {
+                                rows.push(row);
+                            })
+                                .on('error', err => {
+                                error = true;
+                                reject(err);
+                            })
+                                .on('close', () => {
+                                if (!error) {
+                                    resolve(rows);
+                                }
+                            })
+                                .on('end', () => {
+                                stream.destroy();
+                            });
+                        })
+                            .catch(err => {
+                            closeClient();
+                            throw (0, util_1.formatError)(item, err instanceof Error ? err.message : "Missing database query" /* ERR_DB.QUERY */);
+                        });
+                    }
+                    else {
+                        ({ rows } = await client.execute(query, params || [], executeOptions));
+                    }
                 }
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oci",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Oracle (OCI) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,12 +20,12 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.0",
-    "@e-mc/module": "^0.8.0",
-    "@e-mc/types": "^0.8.0",
-    "@pi-r/aws": "^0.6.0",
-    "@pi-r/oracle": "^0.6.0",
-    "aws-sdk": "^2.1524.0",
+    "@e-mc/cloud": "^0.8.1",
+    "@e-mc/module": "^0.8.1",
+    "@e-mc/types": "^0.8.1",
+    "@pi-r/aws": "^0.6.1",
+    "@pi-r/oracle": "^0.6.1",
+    "aws-sdk": "^2.1531.0",
     "oracledb": "^6.3.0"
   }
 }