oracledb 6.5.1 → 6.6.0

package/lib/thin/sqlnet/sessionAtts.js

@@ -77,6 +77,9 @@ class SessionAtts {
       if (typeof params.walletPassword === 'string') {
         this.nt.walletPassword = params.walletPassword;
       }
+      if (typeof params.walletContent === 'string') {
+        this.nt.wallet = params.walletContent;
+      }
       if (params.expireTime > 0) {
         this.nt.expireTime = params.expireTime * 1000 * 60;
       }
@@ -135,6 +138,15 @@ class SessionAtts {
     });
   }
 
+  /**
+   * Clear wallet
+   */
+  clearWallet() {
+    if (this.nt.wallet && Buffer.isBuffer(this.nt.wallet))
+      this.nt.wallet.fill(0);
+    this.nt.wallet = null;
+  }
+
   /**
    * Prepare attributes for connection, Generate Connection ID and read Wallet file
    *
@@ -151,7 +163,7 @@ class SessionAtts {
     }
     this.nt.connectionId = this.connectionId;
 
-    if (protocol && (protocol.toUpperCase() == "TCPS" && this.nt.walletFile)) {
+    if (protocol && (protocol.toUpperCase() == "TCPS" && !this.nt.wallet && this.nt.walletFile)) {
       this.nt.wallet = await this.readWalletFile();
     }
 

package/lib/transformer.js

@@ -228,8 +228,7 @@ function transformValueIn(info, value, options) {
     return value._impl;
 
   // handle vectors
-  } else if (value instanceof Float32Array || value instanceof Float64Array ||
-    value instanceof Int8Array) {
+  } else if (nodbUtil.isVectorValue(value)) {
     checkType(info, options, types.DB_TYPE_VECTOR);
     return value;
   } else if (info.type === types.DB_TYPE_VECTOR && Array.isArray(value)) {

package/lib/types.js

@@ -112,7 +112,7 @@ function getTypeByOraTypeNum(oraTypeNum, csfrm) {
 
 const DB_TYPE_BFILE = new DbType(2020,
   "DB_TYPE_BFILE", "BFILE",
-  { oraTypeNum: 114, bufferSizeFactor: 112 });
+  { oraTypeNum: 114, bufferSizeFactor: 4000 });
 const DB_TYPE_BINARY_DOUBLE = new DbType(2008,
   "DB_TYPE_BINARY_DOUBLE", "BINARY_DOUBLE",
   { oraTypeNum: 101, bufferSizeFactor: 8 });

package/lib/util.js

@@ -277,6 +277,36 @@ function isXid(value) {
       typeof value.branchQualifier === 'string'));
 }
 
+function normalizeXid(value) {
+  let normalizedXid;
+  if (Buffer.isBuffer(value.globalTransactionId) &&
+    Buffer.isBuffer(value.branchQualifier)) {
+    normalizedXid = value;
+  } else {
+    normalizedXid = {
+      formatId: value.formatId,
+      globalTransactionId: value.globalTransactionId,
+      branchQualifier: value.branchQualifier
+    };
+    if (typeof value.globalTransactionId === 'string') {
+      normalizedXid.globalTransactionId = Buffer.from(value.globalTransactionId);
+    }
+    if (typeof value.branchQualifier === 'string') {
+      normalizedXid.branchQualifier = Buffer.from(value.branchQualifier);
+    }
+  }
+  if (normalizedXid.globalTransactionId.length > 64) {
+    errors.throwErr(errors.ERR_INVALID_TRANSACTION_SIZE,
+      normalizedXid.globalTransactionId.length);
+  }
+  if (normalizedXid.branchQualifier.length > 64) {
+    errors.throwErr(errors.ERR_INVALID_BRANCH_SIZE,
+      normalizedXid.branchQualifier.length);
+  }
+
+  return normalizedXid;
+}
+
 function verifySodaDoc(content) {
   if (isSodaDocument(content))
     return content._impl;
@@ -362,8 +392,9 @@ function addTypeProperties(obj, attrName) {
 // -----------------------------------------------------------------------------
 function isVectorValue(value) {
   return (value instanceof Float32Array ||
-      value instanceof Float64Array ||
-      value instanceof Int8Array);
+    value instanceof Float64Array ||
+    value instanceof Int8Array || (Object.getPrototypeOf(value)
+      === Uint8Array.prototype));
 }
 
 //-----------------------------------------------------------------------------
@@ -403,6 +434,7 @@ module.exports = {
   isTokenValid,
   isVectorValue,
   isXid,
+  normalizeXid,
   makeDate,
   preventConcurrent,
   serialize,

package/lib/version.js

@@ -30,7 +30,7 @@
 
 module.exports = {
   VERSION_MAJOR: 6,
-  VERSION_MINOR: 5,
-  VERSION_PATCH: 1,
+  VERSION_MINOR: 6,
+  VERSION_PATCH: 0,
   VERSION_SUFFIX: ''
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.5.1",
+  "version": "6.6.0",
   "description": "A Node.js module for Oracle Database access from JavaScript and TypeScript",
   "license": "(Apache-2.0 OR UPL-1.0)",
   "homepage": "http://oracle.github.io/node-oracledb/",

package/build/Release/oracledb-6.5.1-darwin-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.5.1-darwin-x64.node v20.11.1 572ce8bae4965b47d3554fa08a0d131acb4dc70b 077b92ae23b597c7854563e2ab4506966aa5fe40 Fri, 17 May 2024 14:57:54 GMT

package/build/Release/oracledb-6.5.1-js-buildinfo.txt

@@ -1 +0,0 @@
-572ce8bae4965b47d3554fa08a0d131acb4dc70b

package/build/Release/oracledb-6.5.1-linux-arm64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.5.1-linux-arm64.node v18.19.1 572ce8bae4965b47d3554fa08a0d131acb4dc70b 077b92ae23b597c7854563e2ab4506966aa5fe40 Fri, 17 May 2024 15:07:07 GMT

package/build/Release/oracledb-6.5.1-linux-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.5.1-linux-x64.node v16.20.2 572ce8bae4965b47d3554fa08a0d131acb4dc70b 077b92ae23b597c7854563e2ab4506966aa5fe40 Fri, 17 May 2024 15:08:37 GMT

package/build/Release/oracledb-6.5.1-win32-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.5.1-win32-x64.node v18.16.0 572ce8bae4965b47d3554fa08a0d131acb4dc70b 077b92ae23b597c7854563e2ab4506966aa5fe40 Fri, 17 May 2024 15:09:11 GMT