@pi-r/oci 0.8.1 → 0.8.3

package/README.md

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

package/client/index.js

@@ -79,7 +79,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     };
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { service, table = '', id, query, ignoreCache } = item;
+        const { service, table = '', id, query, updateType = 0, ignoreCache } = item;
         cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         let rows, queryString = caching && ignoreCache !== true ? table + '_' : '';
         invalid: {
@@ -96,17 +96,38 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         continue;
                     }
                 }
-                const db = await (client ||= await createClient()).getSodaDatabase().openCollection(table);
+                const soda = (client ||= await createClient()).getSodaDatabase();
+                const db = await soda.openCollection(table);
                 if (!db) {
                     closeClient();
                     throw (0, util_1.formatError)(item, "Missing database table");
                 }
-                const row = db.find().key(id);
-                let document = await row.getOne();
-                if (document) {
-                    rows = [document.getContent()];
+                if (update && updateType === 1) {
+                    if (update._id) {
+                        const document = soda.createDocument(update);
+                        await db.insertOne(document);
+                    }
+                    else {
+                        void await db.insertOneAndGet(update);
+                    }
+                }
+                let target, document;
+                if (typeof id === 'string') {
+                    target = db.find().key(id);
+                    document = await target.getOne();
+                    if (document) {
+                        rows = [document.getContent()];
+                    }
+                }
+                else {
+                    rows = [];
+                    const row = await db.find().keys(id).getCursor();
+                    while (document = await row.getNext()) {
+                        rows.push(document.getContent());
+                    }
+                    await row.close();
                 }
-                if (update) {
+                if (update && updateType !== 1) {
                     const failed = (message, fatal) => {
                         if (fatal) {
                             item.transactionFail = true;
@@ -114,22 +135,14 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         else {
                             delete item.update;
                         }
-                        this.addLog(types_1.STATUS_TYPE.WARN, message + ` (_id=${id})`, service, 'replaceOne');
+                        this.addLog(types_1.STATUS_TYPE.WARN, message + ` (_id=${id.toString()})`, service, 'replaceOne');
                     };
-                    if (rows) {
-                        const status = await row.replaceOne({ ...rows[0], ...update });
-                        if (status.replaced) {
-                            rows = undefined;
-                            if (document = await row.getOne()) {
-                                rows = [document.getContent()];
-                            }
-                            else {
-                                failed('Update success (GET failed)');
-                            }
-                        }
-                        else {
-                            failed('Update failed');
-                        }
+                    if ((0, types_1.isArray)(id)) {
+                        target = db.find().key(id[0]);
+                    }
+                    if (rows && target) {
+                        document = await target.replaceOneAndGet(updateType === 0 ? { ...rows[0], ...update } : update);
+                        rows[0] = document.getContent();
                     }
                     else {
                         failed('Row does not exist', true);

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@pi-r/oci",
-  "version": "0.8.1",
-  "description": "Oracle (OCI) cloud functions for E-mc.",
-  "main": "client/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/cloud/oci"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/cloud": "^0.10.0",
-    "@e-mc/module": "^0.10.0",
-    "@e-mc/types": "^0.10.0",
-    "@pi-r/aws": "^0.8.1",
-    "@pi-r/oracle": "^0.8.1",
-    "aws-sdk": "^2.1682.0",
-    "oracledb": "^6.6.0"
-  }
-}
+{
+  "name": "@pi-r/oci",
+  "version": "0.8.3",
+  "description": "Oracle (OCI) cloud functions for E-mc.",
+  "main": "client/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/cloud/oci"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/cloud": "^0.10.3",
+    "@e-mc/module": "^0.10.3",
+    "@e-mc/types": "^0.10.3",
+    "@pi-r/aws": "^0.8.3",
+    "@pi-r/oracle": "^0.8.3",
+    "aws-sdk": "^2.1691.0",
+    "oracledb": "^6.6.0"
+  }
+}

package/types/index.d.ts

@@ -1,19 +1,21 @@
-import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
-
-import type { BindParameters, ConnectionAttributes, ExecuteOptions, InitialiseOptions } from 'oracledb';
-import type { ConfigurationOptions } from 'aws-sdk/lib/core';
-
-export type OCIStorage = CloudStorage<OCIStorageCredential, "oci">;
-
-export interface OCIStorageCredential extends ConfigurationOptions {
-    namespace?: string;
-    endpoint?: string;
-}
-
-export interface OCIDatabaseQuery extends CloudDatabase<PlainObject | string, ExecuteOptions, StandardMap, BindParameters, OCIDatabaseCredential> {
-    source: "cloud";
-    service: "oci";
-    streamRow?: boolean;
-}
-
+import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
+
+import type { BindParameters, ConnectionAttributes, ExecuteOptions, InitialiseOptions } from 'oracledb';
+import type { ConfigurationOptions } from 'aws-sdk/lib/core';
+
+export type OCIStorage = CloudStorage<OCIStorageCredential, "oci">;
+
+export interface OCIStorageCredential extends ConfigurationOptions {
+    namespace?: string;
+    endpoint?: string;
+}
+
+export interface OCIDatabaseQuery extends Omit<CloudDatabase<PlainObject | string, ExecuteOptions, StandardMap, BindParameters, OCIDatabaseCredential>, "id"> {
+    source: "cloud";
+    service: "oci";
+    id?: ArrayOf<string>;
+    updateType?: 0 | 1 | 2;
+    streamRow?: boolean;
+}
+
 export interface OCIDatabaseCredential extends ConnectionAttributes, InitialiseOptions {}