oracledb 6.4.0 → 6.5.1

package/lib/thin/protocol/messages/{connectionCookie.js → fastAuth.js}

@@ -1,4 +1,4 @@
-// Copyright (c) 2023 Oracle and/or its affiliates.
+// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -31,46 +31,48 @@ const Message = require("./base.js");
 
 /**
  * Executes a Fast Negotiation RPC function.
- * It sends Protocol Negotiation, Cookie Message, Datatype Negotiation
+ * It sends Protocol Negotiation, Datatype Negotiation
  * and OSESS Key RPC in single round trip.
  *
- * @class ConnectionCookieMessage
+ * @class FastAuthMessage
  * @extends {Message}
  */
-class ConnectionCookieMessage extends Message {
+class FastAuthMessage extends Message {
 
   /**
-   * Serializes the ConnectionCookieMessage function arguments
+   * Serializes the FastAuthMessage function arguments
    *
    * @param {object} buf input arguments
    */
   encode(buf) {
+    buf.writeUInt8(constants.TNS_MSG_TYPE_FAST_AUTH);
+    buf.writeUInt8(1); // Fast Auth version
+    buf.writeUInt8(constants.TNS_SERVER_CONVERTS_CHARS); // flag 1
+    buf.writeUInt8(0); // flag 2
     this.protocolMessage.encode(buf);
-    buf.writeUInt8(constants.TNS_MSG_TYPE_COOKIE);
-    buf.writeUInt8(1);                  // cookie version
-    buf.writeUInt8(this.cookie.protocolVersion);
-    buf.writeUInt16LE(this.cookie.charsetID);
-    buf.writeUInt8(this.cookie.flags);
-    buf.writeUInt16LE(this.cookie.ncharsetID);
-    buf.writeBytesWithLength(this.cookie.serverBanner);
-    buf.writeBytesWithLength(this.cookie.compileCaps);
-    buf.writeBytesWithLength(this.cookie.runtimeCaps);
+    buf.writeUInt16BE(0); // server charset (unused)
+    buf.writeUInt8(0); // server charset flag (unused)
+    buf.writeUInt16BE(0); // server ncharset (unused)
+    buf.caps.ttcFieldVersion = constants.TNS_CCAP_FIELD_VERSION_19_1_EXT_1;
+    buf.writeUInt8(buf.caps.ttcFieldVersion);
     this.dataTypeMessage.encode(buf);
     this.authMessage.encode(buf);
+    buf.caps.ttcFieldVersion = constants.TNS_CCAP_FIELD_VERSION_MAX;
   }
 
   processMessage(buf, messageType) {
     if (messageType === constants.TNS_MSG_TYPE_RENEGOTIATE) {
-      this.cookie.populated = false;
+      this.reNegotiate = true;
     } else if (messageType === constants.TNS_MSG_TYPE_PROTOCOL) {
       this.protocolMessage.processMessage(buf, messageType);
     } else if (messageType === constants.TNS_MSG_TYPE_DATA_TYPES) {
       this.dataTypeMessage.processMessage(buf, messageType);
     } else {
       this.authMessage.processMessage(buf, messageType);
+      this.endOfResponse = this.authMessage.endOfResponse;
     }
   }
 
 }
 
-module.exports = ConnectionCookieMessage;
+module.exports = FastAuthMessage;

package/lib/thin/protocol/messages/fetch.js

@@ -28,6 +28,7 @@
 
 const constants = require("../constants.js");
 const MessageWithData = require("./withData.js");
+const errors = require("../../../errors.js");
 
 /**
  * Executes OFETCH RPC
@@ -51,6 +52,9 @@ class FetchMessage extends MessageWithData {
   //-------------------------------------------------------------------------
   encode(buf) {
     this.writeFunctionHeader(buf);
+    if (this.statement.cursorId === 0) {
+      errors.throwErr(errors.ERR_CURSOR_HAS_BEEN_CLOSED);
+    }
     buf.writeUB4(this.statement.cursorId);
     buf.writeUB4(this.options.fetchArraySize);
   }

package/lib/thin/protocol/messages/index.js

@@ -37,12 +37,12 @@ const PingMessage = require('./ping.js');
 const ProtocolMessage = require('./protocol.js');
 const RollbackMessage = require('./rollback.js');
 const SessionReleaseMessage = require('./sessionRelease.js');
-const ConnectionCookieMessage = require('./connectionCookie.js');
+const FastAuthMessage = require('./fastAuth.js');
 
 module.exports = {
   AuthMessage,
   CommitMessage,
-  ConnectionCookieMessage,
+  FastAuthMessage,
   DataTypeMessage,
   ExecuteMessage,
   FetchMessage,

package/lib/thin/protocol/messages/protocol.js

@@ -53,6 +53,7 @@ class ProtocolMessage extends Message {
   processMessage(buf, messageType) {
     if (messageType === constants.TNS_MSG_TYPE_PROTOCOL) {
       this.processProtocolInfo(buf);
+      this.endOfResponse = !this.connection.nscon.endOfRequestSupport;
     } else {
       super.processMessage(buf, messageType);
     }
@@ -75,7 +76,14 @@ class ProtocolMessage extends Message {
     const serverCompileCaps = buf.readBytesWithLength();
     if (serverCompileCaps) {
       this.serverCompileCaps = Buffer.from(serverCompileCaps);
-      buf.caps.adjustForServerCompileCaps(this.serverCompileCaps);
+      buf.caps.adjustForServerCompileCaps(this.serverCompileCaps, this.connection.nscon);
+
+      // Set the maximum OSON field name size
+      if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_23_1) {
+        this.connection._osonMaxFieldNameSize = 65535;
+      } else {
+        this.connection._osonMaxFieldNameSize = 255;
+      }
     }
     const serverRunTimeCaps = buf.readBytesWithLength();
     if (serverRunTimeCaps) {

package/lib/thin/protocol/messages/withData.js

@@ -85,6 +85,7 @@ class MessageWithData extends Message {
       this.processIOVector(buf);
     } else if (messageType === constants.TNS_MSG_TYPE_FLUSH_OUT_BINDS) {
       this.flushOutBinds = true;
+      this.endOfResponse = true;
     } else if (messageType === constants.TNS_MSG_TYPE_ERROR) {
       this.processErrorInfo(buf);
     } else {
@@ -92,10 +93,6 @@ class MessageWithData extends Message {
     }
   }
 
-  hasMoreData() {
-    return !this.processedError && !this.flushOutBinds;
-  }
-
   processErrorInfo(buf) {
     super.processErrorInfo(buf);
     if (this.errorInfo.cursorId !== 0) {
@@ -116,9 +113,18 @@ class MessageWithData extends Message {
       this.errorInfo.num = 0;
       this.errorOccurred = false;
       this.statement.moreRowsToFetch = false;
+    } else if (this.retry) {
+      this.retry = false;
+    } else if (this.statement.isQuery &&
+      (this.errorInfo.num === constants.TNS_ERR_VAR_NOT_IN_SELECT_LIST
+        || this.errorInfo.num === constants.TNS_ERR_INCONSISTENT_DATA_TYPES)) {
+      this.retry = true;
+      this.connection.statementCache.clearCursor(this.statement);
     } else if (this.errorInfo.num !== 0 && this.errorInfo.cursorId !== 0) {
-      this.connection.statementCache._cachedStatements.delete(this.statement.sql);
-      this.statement.returnToCache = false;
+      if (!errors.ERR_INTEGRITY_ERROR_CODES.includes(this.errorInfo.num)) {
+        this.connection.statementCache.clearCursor(this.statement);
+        this.statement.returnToCache = false;
+      }
     }
     if (this.errorInfo.batchErrors) {
       this.errorOccurred = false;
@@ -852,7 +858,7 @@ class MessageWithData extends Message {
     } else if ([constants.TNS_DATA_TYPE_ROWID, constants.TNS_DATA_TYPE_UROWID].includes(oraTypeNum)) {
       buf.writeBytesWithLength(Buffer.from(value));
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_JSON) {
-      buf.writeOson(value);
+      buf.writeOson(value, this.connection._osonMaxFieldNameSize);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_VECTOR) {
       buf.writeVector(value);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_INT_NAMED) {

package/lib/thin/protocol/packet.js

@@ -35,6 +35,9 @@ const vector = require('../../impl/datahandlers/vector.js');
 const errors = require("../../errors.js");
 
 const TNS_BASE64_ALPHABET_ARRAY = Buffer.from("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 'utf8');
+const FAST_AUTH_END_OF_RPC_VALUE = 0x800;
+const FAST_AUTH_END_OF_RPC_OFFSET = 0x8;
+const MSG_TYPE_OFFSET = 11;
 
 /**
  * Class used for byte chunks used in the ChunkedBytesBuffer.
@@ -290,14 +293,38 @@ class ReadPacket extends BaseBuffer {
     this.packetNum = packet.num;
   }
 
-  async waitForPackets() {
-    const packet = await this.nsi.recvPacket();
+  /**
+   * Read packets from network.
+   * If checkRequestBoundary is passed as true, it
+   * would read all packets until end of request
+   * boundary is seen in nwk header.
+   */
+  async waitForPackets(checkRequestBoundary = false) {
+    let packet = await this.nsi.recvPacket();
     if (!this.savedPackets) {
       this.savedPackets = [packet];
       this.savedPacketPos = 0;
     } else {
       this.savedPackets.push(packet);
     }
+    if (checkRequestBoundary && this.nsi.endOfRequestSupport) {
+      while (packet.type === constants.TNS_PACKET_TYPE_DATA) {
+        // End Marker
+        if ((packet.buf.readUInt16BE(8) &
+            constants.TNS_DATA_FLAGS_END_OF_REQUEST)) {
+          break;
+        }
+
+        // Single Byte 1D packet
+        if (packet.buf.length === MSG_TYPE_OFFSET &&
+            packet.buf[MSG_TYPE_OFFSET - 1] ===
+            constants.TNS_MSG_TYPE_END_OF_REQUEST) {
+          break;
+        }
+        packet = await this.nsi.recvPacket();
+        this.savedPackets.push(packet);
+      }
+    }
     this.startPacket(this.savedPackets[this.savedPacketPos++]);
   }
 
@@ -495,6 +522,10 @@ class WritePacket extends BaseBuffer {
     if (!finalPacket) {
       buf = Buffer.from(buf);
       this.startPacket();
+    } else {
+      // Write End of RPC bit in last packet used only for fastAuth Message.
+      this.buf.writeUInt16BE(FAST_AUTH_END_OF_RPC_VALUE,
+        FAST_AUTH_END_OF_RPC_OFFSET);
     }
     if (!this.nsi.ntAdapter) {
       errors.throwErr(errors.ERR_INVALID_CONNECTION);
@@ -545,9 +576,9 @@ class WritePacket extends BaseBuffer {
    * Encodes a JavaScript object into OSON and then writes it (QLocator
    * followed by data) to the buffer.
    */
-  writeOson(value) {
+  writeOson(value, osonMaxFieldSize) {
     const encoder = new oson.OsonEncoder();
-    const buf = encoder.encode(value);
+    const buf = encoder.encode(value, osonMaxFieldSize);
     this.writeQLocator(buf.length);
     this.writeBytesWithLength(buf);
   }

package/lib/thin/protocol/protocol.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -49,7 +49,7 @@ class Protocol {
      * Compile and Runtime capabilities negotiated with Server
      * @type {object}
      */
-    this.caps = new Capabilities(conn.nscon.sAtts.version);
+    this.caps = new Capabilities(conn.nscon);
     this.writeBuf = new WritePacket(conn.nscon, this.caps, this);
     this.readBuf = new ReadPacket(conn.nscon, this.caps);
     this.callTimeout = 0;
@@ -67,11 +67,11 @@ class Protocol {
    */
   async _decodeMessage(message) {
     message.preProcess();
-    await this.readBuf.waitForPackets();
+    await this.readBuf.waitForPackets(true);
     while (true) {     // eslint-disable-line
       if (this.nsi.isBreak) {
         await this.resetMessage();
-        delete this.readBuf.savedBuffers;
+        delete this.readBuf.savedPackets;
         await this.readBuf.waitForPackets();
       }
       try {
@@ -164,11 +164,20 @@ class Protocol {
     if (message.flushOutBinds) {
       await this.flushOutBindMessage(message);
     }
-    this.txnInProgress = message.callStatus & constants.TNS_TXN_IN_PROGRESS;
+    this.txnInProgress = Boolean(message.callStatus & constants.TNS_EOCS_FLAGS_TXN_IN_PROGRESS);
+    // processes the call status flags returned by the server.
+    if (message.callStatus & constants.TNS_EOCS_FLAGS_SESS_RELEASE) {
+      message.connection.statementCache.clearCursors();
+    }
+
     if (message.errorOccurred) {
       if (callTimeoutExpired) {
         errors.throwErr(errors.ERR_CALL_TIMEOUT_EXCEEDED, this.callTimeout);
       }
+      if (message.retry) {
+        message.errorOccurred = false;
+        return await this._processMessage(message);
+      }
       let err = new Error(message.errorInfo.message);
       err.offset = message.errorInfo.pos;
       err.errorNum = message.errorInfo.num;

package/lib/thin/protocol/utils.js

@@ -52,30 +52,23 @@ function encodeRowID(rowID) {
   }
 }
 
-// obfuscate value and clear memory for Buffers as they are from Buffer pool
-// and are possible to stay longer
+// obfuscate value
 function setObfuscatedValue(value) {
-  const buf = crypto.randomBytes(Buffer.byteLength(value));
-  const bytes = Buffer.from(value, 'utf8');
-  const len = Buffer.byteLength(value);
-
-  const arr = [];
-  for (let i = 0; i < len; i++) {
-    arr.push(buf[i] ^ bytes[i]);
+  const valueBytes = Buffer.from(value);
+  const obfuscatedBytes = crypto.randomBytes(valueBytes.length);
+  for (let i = 0; i < valueBytes.length; i++) {
+    valueBytes[i] = obfuscatedBytes[i] ^ valueBytes[i];
   }
-  bytes.fill(0);
-  return {obfuscatedValue: buf, value: arr};
+  return {obfuscatedValue: obfuscatedBytes, value: valueBytes};
 }
 
-// returns the Deobfuscated value, after removing the obfuscation
+// returns the deobfuscated value, after removing the obfuscation
 // and clear memory of temporary Buffers coming from Buffer pool
-function getDeobfuscatedValue(value, obfuscatedValue) {
-  const arr = [];
-  for (let i = 0; i < value.length; i++) {
-    arr.push(value[i] ^ obfuscatedValue[i]);
+function getDeobfuscatedValue(valueBytes, obfuscatedBytes) {
+  const buf = Buffer.from(valueBytes);
+  for (let i = 0; i < valueBytes.length; i++) {
+    buf[i] = valueBytes[i] ^ obfuscatedBytes[i];
   }
-  const buf = Buffer.from(arr);
-  arr.fill(0);
   const retVal = buf.toString();
   buf.fill(0);
   return retVal;

package/lib/thin/sqlnet/constants.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -107,7 +107,8 @@ module.exports =  {
   NSGRAW: 0x1000, // I/O is direct to/from transport
   TNS_VERSION_DESIRED: 319,
   TNS_VERSION_MINIMUM: 300,
-  TNS_VERSION_MIN_UUID: 319,
+  TNS_VERSION_MIN_DATA_FLAGS: 318,
+  TNS_VERSION_MIN_END_OF_RESPONSE: 319,
   TNS_UUID_OFFSET: 45,
 
   /* Accept Packet */
@@ -143,6 +144,8 @@ module.exports =  {
   // Accept flag2
   NSPACOOB: 0x00000001, // OOB support check at connection time
   NSGPCHKSCMD: 0x01000000, // Support for Poll and Check logic
+  TNS_ACCEPT_FLAG_HAS_END_OF_REQUEST: 0x02000000,
+  TNS_ACCEPT_FLAG_FAST_AUTH: 0x10000000, // Support Fast Auth
 
   /* Redirect packet */
   NSPRDLEN: 8,   // Length of redirect data

package/lib/thin/sqlnet/ezConnectResolver.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -164,6 +164,7 @@ class EZConnectResolver {
     const poolConnectionClass = this.urlProps.get("POOL_CONNECTION_CLASS");
     const poolPurity = this.urlProps.get("POOL_PURITY");
     const serviceTag = this.urlProps.get("SERVICE_TAG");
+    const poolBoundary = this.urlProps.get("POOL_BOUNDARY");
 
     const parts = [];
     if (serviceName)
@@ -182,6 +183,8 @@ class EZConnectResolver {
       parts.push(`(SERVICE_TAG=${serviceTag})`);
     if (connectionIdPrefix)
       parts.push(`(CONNECTION_ID_PREFIX=${connectionIdPrefix})`);
+    if (poolBoundary)
+      parts.push(`(POOL_BOUNDARY=${poolBoundary})`);
     return `(CONNECT_DATA=${parts.join("")})`;
   }
 
@@ -211,17 +214,17 @@ class EZConnectResolver {
     let naddr = 0;
     // ; groups the user into a ADDRESS_LIST
     const addressLists = hostInfo.split(";");
-    for (const addressList in addressLists) {
+    for (const addressList of addressLists) {
       let addressNodeCount = 0;
       const addressListBuilder = new Array();
-      for (const match of addressLists[addressList].matchAll(HOSTNAMES_PATTERN)) {
+      for (const match of addressList.matchAll(HOSTNAMES_PATTERN)) {
         const hostnames = (match.groups.hostnames).split(',');
         let port = match.groups.port;
         if (port == null) {
           port = '1521';    //default port
         }
-        for (const hname in hostnames) {
-          addressListBuilder.push(this.getAddrStr(hostnames[hname], port, protocol, proxyInfo));
+        for (const hname of hostnames) {
+          addressListBuilder.push(this.getAddrStr(hname, port, protocol, proxyInfo));
           addressNodeCount++;
         }
       }
@@ -455,6 +458,7 @@ class EZConnectResolver {
     aliasMap.set("pool_purity", "POOL_PURITY");
     aliasMap.set("service_tag", "SERVICE_TAG");
     aliasMap.set("connection_id_prefix", "CONNECTION_ID_PREFIX");
+    aliasMap.set("pool_boundary", "POOL_BOUNDARY");
     return aliasMap;
   }
 }module.exports = EZConnectResolver;

package/lib/thin/sqlnet/navNodes.js

@@ -486,7 +486,7 @@ class NavAddress extends Address {
     if (!net.isIP(this.host)) {
       try {
         addresses = await dnsPromises.lookup(this.host, options);
-        for (const addr in addresses) {
+        for (const addr of addresses) {
           const co = new ConnOption();
           co.hostname = this.host;
           co.port = this.port;
@@ -499,7 +499,7 @@ class NavAddress extends Address {
             co.CNdata.push('(address=(protocol=' + this.prot + ')(host=' + this.host + ')(port=' + this.port + '))');
           else
             co.CNdata.push(this.toString());
-          co.host = addresses[addr].address;
+          co.host = addr.address;
           co.addr = this.addr;
           cs.getcurrentDescription().addConnectOption(co);
         }
@@ -777,7 +777,8 @@ class NavDescription extends Description {
       if (this.connectData == null) {
         this.connectData = "(SERVICE_NAME=)";
       }
-      const cid = `(CID=(PROGRAM=${cInfo.program})(HOST=${cInfo.hostName})(USER=${cInfo.userName}))`;
+      const pgmName = "\"'" + cInfo.program + "'\"";
+      const cid = `(CID=(PROGRAM=${pgmName})(HOST=${cInfo.hostName})(USER=${cInfo.userName}))`;
       cOpts[i].CNdata.push(NavSchemaObject.CD);
       cOpts[i].CNdata.push(this.connectData);
       cOpts[i].CNdata.push(cid);

package/lib/thin/sqlnet/networkSession.js

@@ -59,7 +59,7 @@ async function getConnectionInfo(userConfig) {
   const sid =   findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "SID"]);
   const poolPurity = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "POOL_PURITY"]);
 
-  return [serverVal, connClass, svcname, poolPurity, sid, addressNode ];
+  return [serverVal, connClass, svcname, poolPurity, sid, addressNode];
 }
 
 /**
@@ -83,6 +83,12 @@ async function resolveConnectStr(connectString, configDir) {
       resolvedVal = p.get(connStr.toUpperCase());
       if (!resolvedVal)
         errors.throwErr(errors.ERR_TNS_ENTRY_NOT_FOUND, connStr, configDir ? configDir + '/tnsnames.ora' : process.env.TNS_ADMIN + '/tnsnames.ora');
+      if (resolvedVal.rhsType == 1) {
+        const rString = resolvedVal.atom;
+        if ((rString.indexOf(':') != -1) || (rString.indexOf('/') != -1)) {
+          return new EzConnect(rString).getResolvedUrl();
+        }
+      }
       resolvedVal = resolvedVal.getListElement(0);
     }
 
@@ -354,8 +360,13 @@ class NetworkSession {
         break;
       case constants.NSPTAC: /* ACCEPT */
         Packet.AcceptPacket(packet, this.sAtts);
-        this.dbUUID = packet.dbUUID;
-        packet.dbUUID = null;
+        if (this.sAtts.version >= constants.TNS_VERSION_MIN_END_OF_RESPONSE
+          && (packet.flags & constants.TNS_ACCEPT_FLAG_HAS_END_OF_REQUEST)) {
+          this.endOfRequestSupport = true;
+        }
+        if (packet.flags & constants.TNS_ACCEPT_FLAG_FAST_AUTH) {
+          this.supportsFastAuth = true;
+        }
         break;
       case constants.NSPTRF: /* REFUSE */
         this.refusePkt = new Packet.RefusePacket(packet);

package/lib/thin/sqlnet/packet.js

@@ -246,11 +246,8 @@ function AcceptPacket(packet, sAtts) {
   this.flag0 = packet.buf.readUInt8(constants.NSPACFL0);
   this.flag1 = packet.buf.readUInt8(constants.NSPACFL1);
 
-  /* UUID - CDB Instance ID */
-  if (sAtts.version >= constants.TNS_VERSION_MIN_UUID) {
-    packet.dbUUID = packet.buf.subarray(constants.TNS_UUID_OFFSET,
-      constants.TNS_UUID_OFFSET + 16);
-    packet.dbUUID = packet.dbUUID.toString('base64');
+  if (sAtts.version >= constants.TNS_VERSION_MIN_DATA_FLAGS) {
+    packet.flags = packet.buf.readUInt32BE(constants.NSPACFL2);
   }
 }
 
@@ -299,7 +296,9 @@ function RedirectPacket(packet) {
  */
 function MarkerPacket(isLargeSDU) {
   this.len = constants.NSPMKDAT + 1; /* Packet length */
-  this.buf = Buffer.allocUnsafe(constants.NSPMKDAT + 1); /* Packet Buffer */
+
+  // Packet Buffer
+  this.buf = Buffer.allocUnsafe(constants.NSPMKDAT + 1).fill(0);
 
   if (isLargeSDU) {
     this.buf.writeUInt32BE(this.len, constants.NSPHDLEN);

package/lib/thin/statement.js

@@ -28,6 +28,8 @@
 
 const { Buffer } = require('buffer');
 const constants = require('../constants');
+const errors = require('../errors');
+const protoConstants = require('./protocol/constants');
 
 /**
  * It is used to cache the metadata about bind information
@@ -359,6 +361,7 @@ class Statement {
     this.inUse = false;
     this.bufferRowIndex = 0;
     this.bufferRowCount = 0;
+    this.pendingClear = false;
     this.statementType = constants.STMT_TYPE_UNKNOWN;
   }
 
@@ -495,6 +498,12 @@ class Statement {
       const info = new BindInfo(name, this.isReturning);
       this.bindInfoList.push(info);
       if (this.bindInfoDict.has(info.bindName)) {
+        if (this.isReturning) {
+          const origInfo = this.bindInfoDict.get(info.bindName)[0];
+          if (!origInfo.isReturnBind) {
+            errors.throwErr(errors.ERR_DML_RETURNING_DUP_BINDS, name);
+          }
+        }
         this.bindInfoDict.get(info.bindName).push(info);
       } else {
         this.bindInfoDict.set(info.bindName, [info]);
@@ -511,6 +520,9 @@ class Statement {
   // cursor also requires a full execute.
   //---------------------------------------------------------------------------
   _setVariable(bindInfo, variable) {
+    if (variable.type._oraTypeNum === protoConstants.TNS_DATA_TYPE_CURSOR) {
+      this.requiresFullExecute = true;
+    }
     if (variable.maxSize !== bindInfo.maxSize
         || variable.dir !== bindInfo.dir
         || variable.isArray !== bindInfo.isArray
@@ -528,6 +540,34 @@ class Statement {
 
     bindInfo.bindVar = variable;
   }
+
+  //---------------------------------------------------------------------------
+  // _clearAllState
+  //
+  // clear all state associated with the cursor
+  //---------------------------------------------------------------------------
+  _clearAllState() {
+    this.cursorId = 0;
+    this.requiresDefine = false;
+    this.noPrefetch = false;
+    this.requiresFullExecute = false;
+    this.queryVars = [];
+    this.numQueryVars = 0;
+    this.bufferRowCount = 0;
+    this.bufferRowIndex = 0;
+  }
+
+  //---------------------------------------------------------------------------
+  // _clearState
+  //
+  // clear some state associated with the cursor
+  //---------------------------------------------------------------------------
+  _clearState() {
+    this.cursorId = 0;
+    this.requiresDefine = false;
+    this.noPrefetch = false;
+    this.requiresFullExecute = false;
+  }
 }
 
 module.exports.Statement = Statement;