@pi-r/oci 0.6.1 → 0.6.3

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/oci
 
+https://e-mc.readthedocs.io/en/latest/cloud/oci.html
+
 ### LICENSE
 
 MIT

package/client/index.js

@@ -75,11 +75,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const closeClient = async () => client?.close();
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { service, table, id, query, ignoreCache } = item;
-        if (!table) {
-            closeClient();
-            throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
-        }
+        const { service, table = '', id, query, ignoreCache } = item;
         const getCache = (value) => {
             if (ignoreCache !== 1) {
                 cacheValue.renewCache = ignoreCache === 0;
@@ -90,6 +86,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         let rows, queryString = caching && ignoreCache !== true ? table + '_' : '';
         invalid: {
             if (id) {
+                if (!table) {
+                    closeClient();
+                    throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+                }
                 const update = item.update;
                 if (queryString) {
                     queryString += id;
@@ -140,9 +140,13 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
             }
             else if (query) {
-                let maxRows = typeof item.limit === 'number' ? Math.max(item.limit, 0) : undefined;
+                let maxRows = typeof item.limit === 'number' ? item.limit : NaN;
                 if ((0, types_1.isPlainObject)(query)) {
-                    if (queryString && (rows = getCache(queryString += Module.asString(query, true) + (maxRows ? maxRows : '')))) {
+                    if (!table) {
+                        closeClient();
+                        throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+                    }
+                    if (queryString && (rows = getCache(queryString += Module.asString(query, true) + (maxRows > 0 ? maxRows : '')))) {
                         result[i] = rows;
                         continue;
                     }
@@ -151,16 +155,40 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         closeClient();
                         throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
                     }
-                    let operation = db.find().filter(query);
-                    if (maxRows) {
-                        operation = operation.limit(maxRows);
+                    const tryQuery = async () => {
+                        let operation = db.find().filter(query);
+                        if (maxRows > 0) {
+                            operation = operation.limit(maxRows);
+                        }
+                        return (await operation.getDocuments()).map(doc => doc.getContent());
+                    };
+                    try {
+                        rows = await tryQuery();
+                    }
+                    catch (err) {
+                        switch (err instanceof Error && err.code) {
+                            case 'ORA-40820':
+                                if (maxRows > 0) {
+                                    const limit = maxRows;
+                                    maxRows = 0;
+                                    rows = await tryQuery();
+                                    if (limit > rows.length) {
+                                        rows = rows.slice(0, limit);
+                                    }
+                                    this.addLog(types_1.STATUS_TYPE.WARN, err, service, Module.asString(query, true));
+                                    break;
+                                }
+                            default:
+                                throw err;
+                        }
                     }
-                    rows = (await operation.getDocuments()).map(doc => doc.getContent());
                 }
                 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 : '')))) {
+                    if (options?.maxRows && isNaN(maxRows)) {
+                        maxRows = options.maxRows;
+                    }
+                    if (queryString && (rows = getCache(queryString += query + Module.asString(params, true) + Module.asString(options, true) + (maxRows > 0 ? maxRows : '')))) {
                         result[i] = rows;
                         continue;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oci",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Oracle (OCI) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/cloud/oci"
   },
   "keywords": [
@@ -20,12 +20,12 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@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",
+    "@e-mc/cloud": "^0.8.3",
+    "@e-mc/module": "^0.8.3",
+    "@e-mc/types": "^0.8.3",
+    "@pi-r/aws": "^0.6.3",
+    "@pi-r/oracle": "^0.6.3",
+    "aws-sdk": "^2.1547.0",
     "oracledb": "^6.3.0"
   }
 }