oracledb 5.4.0 → 6.0.0

package/lib/connection.js

@@ -1,17 +1,24 @@
-// Copyright (c) 2016, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
-// You may not use the identified files except in compliance with the Apache
-// License, Version 2.0 (the "License.")
+// This software is dual-licensed to you under the Universal Permissive License
+// (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+// 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
+// either license.
 //
+// If you elect to accept the software under the Apache License, Version 2.0,
+// the following applies:
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    https://www.apache.org/licenses/LICENSE-2.0
 //
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
@@ -19,589 +26,1119 @@
 
 'use strict';
 
+const AqQueue = require('./aqQueue.js');
 const BaseDbObject = require('./dbObject.js');
+const Lob = require('./lob.js');
+const ResultSet = require('./resultset.js');
+const SodaDatabase = require('./sodaDatabase.js');
 const EventEmitter = require('events');
 const QueryStream = require('./queryStream.js');
+const errors = require('./errors.js');
 const nodbUtil = require('./util.js');
+const impl = require('./impl');
 const util = require('util');
+const constants = require('./constants.js');
+const settings = require('./settings.js');
+const transformer = require('./transformer.js');
+const types = require('./types.js');
 
-//-----------------------------------------------------------------------------
-// execute()
-//   Executes a SQL statement and returns the results.
-//-----------------------------------------------------------------------------
-async function execute(sql, a2, a3) {
-  let binds = [];
-  let executeOpts = {};
-
-  nodbUtil.checkArgCount(arguments, 1, 3);
-  nodbUtil.assert(typeof sql === 'string', 'NJS-005', 1);
-
-  switch (arguments.length) {
-    case 2:
-      nodbUtil.assert(nodbUtil.isObjectOrArray(a2), 'NJS-005', 2);
-      binds = a2;
-      break;
-    case 3:
-      nodbUtil.assert(nodbUtil.isObjectOrArray(a2), 'NJS-005', 2);
-      nodbUtil.assert(nodbUtil.isObject(a3), 'NJS-005', 3);
-      binds = a2;
-      executeOpts = a3;
-      break;
-  }
-
-  const result = await this._execute(sql, binds, executeOpts);
-
-  // process queries; if a result set is not desired, fetch all of the rows
-  // from the result set and then destroy the result set
-  if (result.resultSet && !executeOpts.resultSet) {
-    result.rows = await result.resultSet._getAllRows(executeOpts, result);
-    delete result.resultSet;
-  }
-
-  // process implicit results; ensure all implicit results have their fetch
-  // array size fixed, or, if a result set is not requested, that all rows are
-  // fetched
-  if (result.implicitResults) {
-    for (const key in result.implicitResults) {
-      const implicitResult = result.implicitResults[key];
-      if (!executeOpts.resultSet) {
-        result.implicitResults[key] =
-            await implicitResult._getAllRows(executeOpts);
+// global mapping of subscriptions; these cannot be tied to a particular
+// connection or pool since subscriptions can be created with one connection
+// and destroyed with another!
+const _subscriptions = new Map();
+
+// define class
+class Connection extends EventEmitter {
+
+  constructor() {
+    super();
+    this._dbObjectClasses = new Map();
+    this._closing = false;
+  }
+
+  //---------------------------------------------------------------------------
+  // _addDefaultsToExecOpts()
+  //
+  // Add values to the execute options from the global settings, if needed.
+  //---------------------------------------------------------------------------
+  _addDefaultsToExecOpts(options) {
+    options.connection = this;
+    if (options.keepInStmtCache === undefined)
+      options.keepInStmtCache = true;
+    settings.addToOptions(options,
+      "autoCommit",
+      "dbObjectAsPojo",
+      "fetchArraySize",
+      "fetchTypeHandler",
+      "maxRows",
+      "outFormat",
+      "prefetchRows");
+  }
+
+  //---------------------------------------------------------------------------
+  // _buildDbObjectClass()
+  //
+  // Builds and returns a database object class given the object type
+  // information supplied by the implementation.
+  //---------------------------------------------------------------------------
+  _buildDbObjectClass(objType) {
+    const DbObject = function(initialValue) {
+      this._impl = new impl.DbObjectImpl(objType);
+      if (this.isCollection) {
+        const proxy = new Proxy(this, BaseDbObject._collectionProxyHandler);
+        if (initialValue !== undefined) {
+          for (let i = 0; i < initialValue.length; i++) {
+            this.append(initialValue[i]);
+          }
+        }
+        return (proxy);
+      } else if (initialValue !== undefined) {
+        Object.assign(this, initialValue);
+      }
+    };
+    DbObject.prototype = Object.create(BaseDbObject.prototype);
+    DbObject.prototype.constructor = DbObject;
+    DbObject.prototype._objType = objType;
+    if (objType.elementTypeClass) {
+      const cls = this._getDbObjectClass(objType.elementTypeClass);
+      objType.elementTypeClass = cls;
+    }
+    nodbUtil.addTypeProperties(objType, "elementType");
+    if (objType.attributes) {
+      const props = {};
+      for (const attr of objType.attributes) {
+        if (attr.typeClass) {
+          attr.typeClass = this._getDbObjectClass(attr.typeClass);
+        }
+        nodbUtil.addTypeProperties(attr, "type");
+        const prop = {
+          get() {
+            return this._getAttrValue(attr);
+          },
+          set(value) {
+            this._setAttrValue(attr, value);
+          }
+        };
+        props[attr.name] = prop;
       }
+      Object.defineProperties(DbObject.prototype, props);
     }
+    DbObject.toString = function() {
+      return ('DbObjectClass [' + objType.fqn + ']');
+    };
+    return (DbObject);
   }
 
-  return (result);
-}
-
+  //---------------------------------------------------------------------------
+  // _getDbObjectClass()
+  //
+  // Returns the database object class given the object type information
+  // supplied by the implementation. The cache is searched first to see if an
+  // object class has already been built.
+  //---------------------------------------------------------------------------
+  _getDbObjectClass(objType) {
+    if (objType.prototype instanceof BaseDbObject)
+      return objType;
+    let cls = this._dbObjectClasses.get(objType);
+    if (!cls) {
+      cls = this._buildDbObjectClass(objType);
+      cls._connection = this;
+      cls._objType = objType;
+      this._dbObjectClasses.set(objType, cls);
+    }
+    return (cls);
+  }
 
-//-----------------------------------------------------------------------------
-// executeMany()
-//   Executes a SQL statement multiple times and returns the results.
-//-----------------------------------------------------------------------------
-async function executeMany(sql, bindsOrNumIters, a3) {
-  let options = {};
+  //---------------------------------------------------------------------------
+  // _getDbObjectClassForName()
+  //
+  // Returns the database object class given the name of the database object
+  // type. The cache is searched first to see if an object class has already
+  // been built.
+  //---------------------------------------------------------------------------
+  async _getDbObjectClassForName(name) {
+    let cls = this._dbObjectClasses.get(name);
+    if (!cls) {
+      const objType = await this._impl.getDbObjectClass(name);
+      cls = this._getDbObjectClass(objType);
+      this._dbObjectClasses.set(name, cls);
+    }
+    return cls;
+  }
 
-  nodbUtil.checkArgCount(arguments, 2, 3);
-  nodbUtil.assert(typeof sql === 'string', 'NJS-005', 1);
-  if (typeof bindsOrNumIters === 'number') {
-    nodbUtil.assert(Number.isInteger(bindsOrNumIters), 'NJS-005', 2);
-    nodbUtil.assert(bindsOrNumIters > 0, 'NJS-005', 2);
-  } else {
-    nodbUtil.assert(Array.isArray(bindsOrNumIters), 'NJS-005', 2);
-    nodbUtil.assert(bindsOrNumIters.length > 0, 'NJS-005', 2);
+  //---------------------------------------------------------------------------
+  // _isBindDir()
+  //
+  // Returns a boolean indicating if the supplied value is a valid bind
+  // direction.
+  //---------------------------------------------------------------------------
+  _isBindDir(value) {
+    return (
+      value === constants.BIND_IN ||
+      value === constants.BIND_OUT ||
+      value === constants.BIND_INOUT
+    );
   }
 
-  if (arguments.length == 3) {
-    nodbUtil.assert(nodbUtil.isObject(a3), 'NJS-005', 3);
-    options = a3;
+  //---------------------------------------------------------------------------
+  // _isBindValue()
+  //
+  // Returns a boolean indicating if the supplied value is one that can be
+  // bound.
+  //---------------------------------------------------------------------------
+  _isBindValue(value) {
+    return (
+      value === null ||
+      value === undefined ||
+      typeof value === 'number' ||
+      typeof value === 'string' ||
+      typeof value === 'boolean' ||
+      Array.isArray(value) ||
+      Buffer.isBuffer(value) ||
+      util.isDate(value) ||
+      value instanceof Lob ||
+      value instanceof ResultSet ||
+      value instanceof BaseDbObject
+    );
   }
 
-  return (await this._executeMany(sql, bindsOrNumIters, options));
-}
+  //---------------------------------------------------------------------------
+  // _processBindUnit()
+  //
+  // Processes a bind unit (object) supplied by the user and returns the value
+  // stored in it (if one is).
+  //---------------------------------------------------------------------------
+  async _processBindUnit(bindInfo, bindUnit, inExecuteMany) {
+    let okBindUnit = false;
 
+    // get and validate bind direction; if not specified, IN is assumed
+    if (bindUnit.dir === undefined) {
+      bindInfo.dir = constants.BIND_IN;
+    } else {
+      errors.assert(this._isBindDir(bindUnit.dir),
+        errors.ERR_INVALID_BIND_DIRECTION);
+      bindInfo.dir = bindUnit.dir;
+      okBindUnit = true;
+    }
 
-//-----------------------------------------------------------------------------
-// getDbObjectClass()
-//   Returns a database object class given its name. The cache is searched
-// first, but if not found, the database is queried and the result is cached
-// using the fully qualified name.
-//-----------------------------------------------------------------------------
-async function getDbObjectClass(name) {
-  nodbUtil.checkArgCount(arguments, 1, 1);
-  nodbUtil.assert(typeof name === 'string', 'NJS-005', 1);
+    // get and validate bind type; it must be one of the integer constants
+    // identifying types, a string identifying an object type or a constructor
+    // function identifying an object type
+    if (bindUnit.type !== undefined) {
+      if (typeof bindUnit.type === 'string') {
+        bindInfo.type = types.DB_TYPE_OBJECT;
+        bindInfo.typeClass = await this._getDbObjectClassForName(bindUnit.type);
+        bindInfo.objType = bindInfo.typeClass._objType;
+      } else if (bindUnit.type.prototype instanceof BaseDbObject) {
+        bindInfo.type = types.DB_TYPE_OBJECT;
+        bindInfo.typeClass = bindUnit.type;
+        bindInfo.objType = bindInfo.typeClass._objType;
+      } else {
+        errors.assert(bindUnit.type instanceof types.DbType,
+          errors.ERR_INVALID_BIND_DATA_TYPE, 2);
+        bindInfo.type = bindUnit.type;
+      }
+      okBindUnit = true;
 
-  let cls = this._dbObjectClasses[name];
-  if (cls) {
-    return cls;
-  }
-  return (await this._getDbObjectClass(name));
-}
+    // when calling executeMany(), bind type is mandatory
+    } else if (inExecuteMany) {
+      if (bindInfo.name)
+        errors.throwErr(errors.ERR_MISSING_TYPE_BY_NAME, bindInfo.name);
+      errors.throwErr(errors.ERR_MISSING_TYPE_BY_POS, bindInfo.pos);
+    }
 
+    // get and validate the maximum size for strings/buffers; this value is
+    // used for IN/OUT and OUT binds in execute() and at all times for
+    // executeMany()
+    if (bindInfo.dir !== constants.BIND_IN || inExecuteMany) {
+      if (bindUnit.maxSize !== undefined) {
+        errors.assertParamPropValue(Number.isInteger(bindUnit.maxSize) &&
+          bindUnit.maxSize > 0, 2, "maxSize");
+        bindInfo.maxSize = bindUnit.maxSize;
+        bindInfo.checkSize = true;
+        okBindUnit = true;
+      } else if (inExecuteMany) {
+        if (bindInfo.type === types.DB_TYPE_VARCHAR ||
+            bindInfo.type === types.DB_TYPE_RAW) {
+          if (bindInfo.name)
+            errors.throwErr(errors.ERR_MISSING_MAX_SIZE_BY_NAME, bindInfo.name);
+          errors.throwErr(errors.ERR_MISSING_MAX_SIZE_BY_POS, bindInfo.pos);
+        }
+      } else {
+        bindInfo.maxSize = constants.DEFAULT_MAX_SIZE_FOR_OUT_BINDS;
+      }
+    }
 
-//-----------------------------------------------------------------------------
-// getStatementInfo()
-//   Returns information about the statement.
-//-----------------------------------------------------------------------------
-async function getStatementInfo(sql) {
-  nodbUtil.checkArgCount(arguments, 1, 1);
-  return (await this._getStatementInfo(sql));
-}
+    // get max array size (for array binds, not possible in executeMany())
+    bindInfo.isArray = false;
+    if (!inExecuteMany) {
+      if (bindUnit.maxArraySize !== undefined) {
+        errors.assertParamPropValue(Number.isInteger(bindUnit.maxArraySize) &&
+          bindUnit.maxArraySize > 0, 2, "maxArraySize");
+        bindInfo.maxArraySize = bindUnit.maxArraySize;
+        bindInfo.isArray = true;
+      }
+    }
 
+    // get the value, if specified (not used in executeMany())
+    if (!inExecuteMany && bindUnit.val !== undefined) {
+      return bindUnit.val;
+    }
 
-//-----------------------------------------------------------------------------
-// commit()
-//   Commits the current transaction.
-//-----------------------------------------------------------------------------
-async function commit() {
-  nodbUtil.checkArgCount(arguments, 0, 0);
-  await this._commit();
-}
+    if (!okBindUnit)
+      errors.throwErr(errors.ERR_INVALID_BIND_UNIT);
+  }
 
+  //---------------------------------------------------------------------------
+  // _processBindValue()
+  //
+  // Processes the bind value supplied by the caller. This performs all checks
+  // on the value and normalizes it for use by the implementation class. If no
+  // bind info has been defined yet, the value defines that.
+  //---------------------------------------------------------------------------
+  async _processBindValue(bindInfo, value, options) {
+    const transformed = transformer.transformValueIn(bindInfo, value, options);
+    if (bindInfo.isArray) {
+      bindInfo.values = transformed.concat(bindInfo.values.slice(transformed.length));
+    } else {
+      bindInfo.values[options.pos] = transformed;
+    }
+    if (bindInfo.type === types.DB_TYPE_OBJECT &&
+        bindInfo.typeClass === undefined) {
+      bindInfo.typeClass = await this._getDbObjectClass(value._objType);
+      bindInfo.objType = bindInfo.typeClass._objType;
+    }
+  }
 
-//-----------------------------------------------------------------------------
-// createLob()
-//   Creates a temporary LOB and returns it to the caller.
-//-----------------------------------------------------------------------------
-async function createLob(type) {
-  nodbUtil.checkArgCount(arguments, 1, 1);
-  nodbUtil.assert(typeof type === 'number', 'NJS-005', 1);
-  return (await this._createLob(type));
-}
+  //---------------------------------------------------------------------------
+  // _processExecuteBind()
+  //
+  // Processes a single execute bind supplied by the caller. This performs all
+  // checks on the bind and normalizes it for use by the implementation class.
+  //---------------------------------------------------------------------------
+  async _processExecuteBind(bindInfo, bindData) {
 
+    // setup defaults
+    bindInfo.isArray = false;
 
-//-----------------------------------------------------------------------------
-// rollback()
-//   Rolls back the current transaction.
-//-----------------------------------------------------------------------------
-async function rollback() {
-  nodbUtil.checkArgCount(arguments, 0, 0);
-  await this._rollback();
-}
+    // if bind data is a value that can be bound directly, use it; otherwise,
+    // scan the bind unit for bind information and its value
+    let bindValue;
+    if (this._isBindValue(bindData)) {
+      bindInfo.dir = constants.BIND_IN;
+      bindValue = bindData;
+    } else {
+      bindValue = await this._processBindUnit(bindInfo, bindData, false);
+    }
 
+    // for IN and IN/OUT binds, process the value
+    if (bindInfo.dir !== constants.BIND_OUT) {
+      const options = {pos: 0, allowArray: true};
+      await this._processBindValue(bindInfo, bindValue, options);
+    }
 
-//-----------------------------------------------------------------------------
-// close()
-//   Closes the connection and makes it unusable for further work.
-//-----------------------------------------------------------------------------
-async function close(a1) {
-  let options = {};
+    // if only null values were found (or an OUT bind was specified), type
+    // information may not be set, so complete bind information as a string
+    // and set the maxSize to 1 if it has not already been set
+    if (bindInfo.type === undefined) {
+      bindInfo.type = types.DB_TYPE_VARCHAR;
+      if (bindInfo.maxSize === undefined)
+        bindInfo.maxSize = 1;
+    }
 
-  nodbUtil.checkArgCount(arguments, 0, 1);
-  if (arguments.length == 1) {
-    nodbUtil.assert(nodbUtil.isObject(a1), 'NJS-005', 1);
-    options = a1;
-  }
+    // check valid bind type for array binds
+    if (bindInfo.isArray &&
+        bindInfo.type !== types.DB_TYPE_VARCHAR &&
+        bindInfo.type !== types.DB_TYPE_NVARCHAR &&
+        bindInfo.type !== types.DB_TYPE_CHAR &&
+        bindInfo.type !== types.DB_TYPE_NCHAR &&
+        bindInfo.type !== types.DB_TYPE_NUMBER &&
+        bindInfo.type !== types.DB_TYPE_BINARY_FLOAT &&
+        bindInfo.type !== types.DB_TYPE_BINARY_DOUBLE &&
+        bindInfo.type !== types.DB_TYPE_DATE &&
+        bindInfo.type !== types.DB_TYPE_TIMESTAMP &&
+        bindInfo.type !== types.DB_TYPE_TIMESTAMP_LTZ &&
+        bindInfo.type !== types.DB_TYPE_TIMESTAMP_TZ &&
+        bindInfo.type !== types.DB_TYPE_RAW) {
+      errors.throwErr(errors.ERR_INVALID_TYPE_FOR_ARRAY_BIND);
+    }
 
-  // If already in the process of closing, throw an error instead of doing
-  // a roundtrip
-  if (this._closing) {
-    throw new Error (nodbUtil.getErrorMessage('NJS-003'));
   }
 
-  this._closing = true;
-  try {
-    await this._close(options);
-  } finally {
-    this._closing = false;
+  //---------------------------------------------------------------------------
+  // _processExecuteBinds()
+  //
+  // Processes the binds supplied by the caller. This performs all checks on
+  // the binds and normalizes them for use by the implementation class.
+  //---------------------------------------------------------------------------
+  async _processExecuteBinds(binds) {
+    const normBinds = [];
+    if (Array.isArray(binds)) {
+      for (let i = 0; i < binds.length; i++) {
+        const bindInfo = normBinds[i] = {pos: i + 1, values: []};
+        await this._processExecuteBind(bindInfo, binds[i]);
+      }
+    } else {
+      errors.assertParamValue(nodbUtil.isObject(binds), 2);
+      const bindNames = Object.getOwnPropertyNames(binds);
+      for (let i = 0; i < bindNames.length; i++) {
+        const bindInfo = normBinds[i] = {name: bindNames[i], values: []};
+        await this._processExecuteBind(bindInfo, binds[bindNames[i]]);
+      }
+    }
+    return normBinds;
   }
 
-  for (const cls of Object.values(this._dbObjectClasses)) {
-    cls.prototype.constructor = Object;
-    cls.prototype = null;
-  }
-  this.emit('_afterConnClose');
-}
+  //---------------------------------------------------------------------------
+  // _processExecuteManyBinds()
+  //
+  // Processes the binds supplied by the caller. This performs all checks on
+  // the binds and normalizes them for use by the implementation class.
+  //---------------------------------------------------------------------------
+  async _processExecuteManyBinds(binds, bindDefs) {
+    const normBinds = [];
+    let byPosition;
+
+    // transform bindDefs into normalized binds, if available
+    if (bindDefs !== undefined) {
+      if (Array.isArray(bindDefs)) {
+        byPosition = true;
+        for (let i = 0; i < bindDefs.length; i++) {
+          const bindInfo = normBinds[i] = {pos: i + 1, values: []};
+          await this._processBindUnit(bindInfo, bindDefs[i], true);
+        }
+      } else {
+        byPosition = false;
+        const bindNames = Object.getOwnPropertyNames(bindDefs);
+        for (let i = 0; i < bindNames.length; i++) {
+          const bindInfo = normBinds[i] = {name: bindNames[i], values: []};
+          await this._processBindUnit(bindInfo, bindDefs[bindNames[i]], true);
+        }
+      }
 
+    // otherwise, use the first row to determine the binds to use
+    } else {
+      const row = binds[0];
+      errors.assertParamValue(nodbUtil.isObjectOrArray(row), 2);
+      if (Array.isArray(row)) {
+        byPosition = true;
+        for (let i = 0; i < row.length; i++) {
+          normBinds[i] = {pos: i + 1};
+        }
+      } else {
+        byPosition = false;
+        const bindNames = Object.getOwnPropertyNames(row);
+        for (let i = 0; i < bindNames.length; i++) {
+          normBinds[i] = {name: bindNames[i]};
+        }
+      }
+      for (let i = 0; i < normBinds.length; i++) {
+        normBinds[i].dir = constants.BIND_IN;
+        normBinds[i].isArray = false;
+        normBinds[i].values = [];
+      }
+    }
 
-//-----------------------------------------------------------------------------
-// break()
-//   Breaks the execution of the statement.
-//-----------------------------------------------------------------------------
-module.break = async function() {
-  nodbUtil.checkArgCount(arguments, 0, 0);
-  await this._break();
-};
+    // process each of the rows
+    for (let i = 0; i < binds.length; i++) {
+      const row = binds[i];
+      const options = {pos: i, allowArray: false};
+      errors.assert((byPosition && Array.isArray(row)) ||
+        (!byPosition && nodbUtil.isObject(row)), errors.ERR_MIXED_BIND);
+      for (let j = 0; j < normBinds.length; j++) {
+        const bindInfo = normBinds[j];
+        const value = (byPosition) ? row[j] : row[bindInfo.name];
+        await this._processBindValue(bindInfo, value, options);
+      }
+    }
 
+    // set bind type and size to a string of size 1 if no bind type was
+    // specified (and all values are null)
+    for (let i = 0; i < normBinds.length; i++) {
+      const bindInfo = normBinds[i];
+      if (bindInfo.type === undefined) {
+        bindInfo.type = types.DB_TYPE_VARCHAR;
+        bindInfo.maxSize = 1;
+      }
+    }
 
-//-----------------------------------------------------------------------------
-// changePassword()
-//   Changes the password of the specified user.
-//-----------------------------------------------------------------------------
-async function changePassword(user, password, newPassword) {
-  nodbUtil.checkArgCount(arguments, 3, 3);
-  nodbUtil.assert(typeof user === 'string', 'NJS-005', 1);
-  nodbUtil.assert(typeof password === 'string', 'NJS-005', 2);
-  nodbUtil.assert(typeof newPassword === 'string', 'NJS-005', 3);
-  await this._changePassword(user, password, newPassword);
-}
+    return normBinds;
+  }
 
+  //---------------------------------------------------------------------------
+  // _transformOutBind()
+  //
+  // Transform an output bind value from an implementation value to a user
+  // facing value (for result sets and LOBs). DML returning output variables
+  // are always an array of values.
+  //---------------------------------------------------------------------------
+  _transformOutBind(val, options) {
+    let outVal = val;
+    if (Array.isArray(val)) {
+      outVal = [];
+      for (let i = 0; i < val.length; i++)
+        outVal.push(this._transformOutBind(val[i], options));
+    } else if (val instanceof impl.ResultSetImpl) {
+      outVal = new ResultSet();
+      outVal._setup(this, val);
+    } else if (val instanceof impl.LobImpl) {
+      outVal = new Lob();
+      outVal._setup(val, true);
+    } else if (val instanceof impl.DbObjectImpl) {
+      const cls = this._dbObjectClasses.get(val._objType);
+      outVal = Object.create(cls.prototype);
+      outVal._impl = val;
+      if (options.dbObjectAsPojo) {
+        outVal = outVal._toPojo();
+      } else if (outVal.isCollection) {
+        outVal = new Proxy(outVal, BaseDbObject._collectionProxyHandler);
+      }
+    }
+    return outVal;
+  }
 
-//-----------------------------------------------------------------------------
-// getQueue()
-//   Returns a queue with the specified name.
-//-----------------------------------------------------------------------------
-async function getQueue(name, a2) {
-  let options = {};
+  //---------------------------------------------------------------------------
+  // _verifyExecOpts
+  //
+  // Verify that the value passed by the user for binds is acceptable. Perform
+  // any transformations necessary.
+  //---------------------------------------------------------------------------
+  _verifyExecOpts(options, inExecuteMany) {
 
-  nodbUtil.checkArgCount(arguments, 1, 2);
-  nodbUtil.assert(typeof name === 'string', 'NJS-005', 1);
-  if (arguments.length == 2) {
-    nodbUtil.assert(nodbUtil.isObject(a2), 'NJS-005', 2);
-    options = a2;
-  }
-  return (await this._getQueue(name, options));
-}
+    // define normalized options (value returned to caller)
+    const outOptions = {};
 
+    // handle common options
+    errors.assertParamValue(nodbUtil.isObject(options), 3);
 
-//-----------------------------------------------------------------------------
-// ping()
-//   Sends a "ping" to the database to see if it is "alive".
-//-----------------------------------------------------------------------------
-async function ping() {
-  nodbUtil.checkArgCount(arguments, 0, 0);
-  await this._ping();
-}
+    // autoCommit must be a boolean value
+    if (options.autoCommit !== undefined) {
+      errors.assertParamPropValue(typeof options.autoCommit === 'boolean', 3,
+        "autoCommit");
+      outOptions.autoCommit = options.autoCommit;
+    }
 
+    // dbObjectAsPojo must be a boolean value
+    if (options.dbObjectAsPojo !== undefined) {
+      errors.assertParamPropValue(typeof options.dbObjectAsPojo === 'boolean',
+        3, "dbObjectAsPojo");
+      outOptions.dbObjectAsPojo = options.dbObjectAsPojo;
+    }
 
-//-----------------------------------------------------------------------------
-// shutdown()
-//   Shuts down the database instance.
-//-----------------------------------------------------------------------------
-async function shutdown(a1) {
-  let mode = this._oracledb.SHUTDOWN_MODE_DEFAULT;
+    // keepInStmtCache must be a boolean value
+    if (options.keepInStmtCache !== undefined) {
+      errors.assertParamPropValue(typeof options.keepInStmtCache === 'boolean',
+        3, "keepInStmtCache");
+      outOptions.keepInStmtCache = options.keepInStmtCache;
+    }
 
-  nodbUtil.checkArgCount(arguments, 0, 1);
-  if (a1 !== undefined) {
-    nodbUtil.assert(typeof mode === 'number', 'NJS-005', 1);
-    mode = a1;
-  }
+    // handle options specific to executeMany()
+    if (inExecuteMany) {
 
-  await this._shutdown(mode);
-}
+      // bindDefs must be an object or array
+      if (options.bindDefs !== undefined) {
+        errors.assertParamPropValue(nodbUtil.isObjectOrArray(options.bindDefs),
+          3, "bindDefs");
+        outOptions.bindDefs = options.bindDefs;
+      }
 
+      // batchErrors must be a boolean value
+      if (options.batchErrors !== undefined) {
+        errors.assertParamPropValue(typeof options.batchErrors === 'boolean',
+          3, "batchErrors");
+        outOptions.batchErrors = options.batchErrors;
+      }
 
-//-----------------------------------------------------------------------------
-// startup()
-//   Starts up the database instance.
-//-----------------------------------------------------------------------------
-async function startup(a1) {
-  let opts = {};
+      // dmlRowCounts must be a boolean value
+      if (options.dmlRowCounts !== undefined) {
+        errors.assertParamPropValue(typeof options.dmlRowCounts === 'boolean',
+          3, "dmlRowCounts");
+        outOptions.dmlRowCounts = options.dmlRowCounts;
+      }
 
-  nodbUtil.checkArgCount(arguments, 0, 1);
-  if (arguments.length == 1) {
-    nodbUtil.assert(typeof opts === 'object', 'NJS-005', 1);
-    opts = a1;
-  }
+    // handle options specific to execute()
+    } else {
 
-  await this._startup(opts);
-}
+      // fetchArraySize must be a positive integer
+      if (options.fetchArraySize !== undefined) {
+        errors.assertParamPropValue(Number.isInteger(options.fetchArraySize) &&
+          options.fetchArraySize > 0, 3, "fetchArraySize");
+        outOptions.fetchArraySize = options.fetchArraySize;
+      }
 
+      // fetchInfo must be an object with keys containing an object with a
+      // "type" property; these are converted to an array of objects for ease
+      // of processing by the implementation
+      if (options.fetchInfo !== undefined) {
+        errors.assertParamPropValue(nodbUtil.isObject(options.fetchInfo), 3,
+          "fetchInfo");
+        const names = Object.getOwnPropertyNames(options.fetchInfo);
+        const map = new Map(settings.fetchTypeMap);
+        for (const name of names) {
+          const info = options.fetchInfo[name];
+          if (info.type === undefined)
+            errors.throwErr(errors.ERR_NO_TYPE_FOR_CONVERSION);
+          if (info.type !== constants.DEFAULT &&
+              info.type !== types.DB_TYPE_VARCHAR &&
+              info.type !== types.DB_TYPE_RAW) {
+            errors.throwErr(errors.ERR_INVALID_TYPE_FOR_CONVERSION);
+          }
+          map.set(name, info.type);
+        }
+        outOptions.fetchTypeMap = map;
+      }
 
-//-----------------------------------------------------------------------------
-// subscribe()
-//   Creates a subscription which can be used to get notifications of database
-// changes or of AQ messages available to dequeue.
-//-----------------------------------------------------------------------------
-async function subscribe(name, options) {
-  nodbUtil.checkArgCount(arguments, 2, 2);
-  nodbUtil.assert(typeof name === 'string', 'NJS-005', 1);
-  nodbUtil.assert(nodbUtil.isObject(options), 'NJS-005', 2);
-  await this._subscribe(name, options);
-}
+      // fetchTypeHandler must be a function which is called for each column to
+      // be fetched and accepts the metadata for a column
+      if (options.fetchTypeHandler !== undefined) {
+        const type = (typeof options.fetchTypeHandler);
+        errors.assertParamPropValue(type === 'function', 3, "fetchTypeHandler");
+        outOptions.fetchTypeHandler = options.fetchTypeHandler;
+      }
 
+      // maxRows must be a positive integer (or 0)
+      if (options.maxRows !== undefined) {
+        errors.assertParamPropValue(Number.isInteger(options.maxRows) &&
+          options.maxRows >= 0, 3, "maxRows");
+        outOptions.maxRows = options.maxRows;
+      }
 
-//-----------------------------------------------------------------------------
-// unsubscribe()
-//   Destroy a subscription which was earlier created using subscribe().
-//-----------------------------------------------------------------------------
-async function unsubscribe(name) {
-  nodbUtil.checkArgCount(arguments, 1, 1);
-  nodbUtil.assert(typeof name === 'string', 'NJS-005', 1);
-  await this._unsubscribe(name);
-}
+      // outFormat must be one of the two possible constants
+      if (options.outFormat !== undefined) {
+        errors.assertParamPropValue(
+          options.outFormat === constants.OUT_FORMAT_ARRAY ||
+          options.outFormat === constants.OUT_FORMAT_OBJECT, 3, "outFormat");
+        outOptions.outFormat = options.outFormat;
+      }
 
-// build a database object class
-function buildDbObjectClass(schema, name, fqn) {
-  const DbObject = function(initialValue) {
-    if (this.isCollection) {
-      const proxy = new Proxy(this, BaseDbObject._collectionProxyHandler);
-      if (initialValue !== undefined) {
-        for (let i = 0; i < initialValue.length; i++) {
-          this.append(initialValue[i]);
-        }
+      // prefetchRows must be a positive integer (or 0)
+      if (options.prefetchRows !== undefined) {
+        errors.assertParamPropValue(Number.isInteger(options.prefetchRows) &&
+          options.prefetchRows >= 0, 3, "prefetchRows");
+        outOptions.prefetchRows = options.prefetchRows;
       }
-      return (proxy);
-    } else if (initialValue !== undefined) {
-      Object.assign(this, initialValue);
-    }
-  };
-  DbObject.prototype = Object.create(BaseDbObject.prototype);
-  DbObject.prototype.constructor = DbObject;
-  DbObject.prototype.schema = schema;
-  DbObject.prototype.name = name;
-  DbObject.prototype.fqn = fqn;
-  DbObject.toString = function() {
-    return ('DbObjectClass [' + fqn + ']');
-  };
-  return (DbObject);
-}
 
-//-----------------------------------------------------------------------------
-//  tpcBegin()
-//    Starts a two-phase-commit transaction
-//----------------------------------------------------------------------------
-async function tpcBegin(xid, flag, timeout) {
-  nodbUtil.checkArgCount(arguments, 1, 3);
-  nodbUtil.assert(nodbUtil.isXid(xid), 'NJS-005', 1);
+      // resultSet must be a boolean value
+      if (options.resultSet !== undefined) {
+        errors.assertParamPropValue(typeof options.resultSet === 'boolean', 3,
+          "resultSet");
+        outOptions.resultSet = options.resultSet;
+      }
+
+    }
 
-  if (arguments.length < 3) {
-    timeout = 60;   // seconds
-  } else {
-    nodbUtil.assert(typeof timeout === 'number', 'NJS-005', 3);
+    return outOptions;
   }
 
-  if (arguments.length < 2) {
-    flag = this._oracledb.TPC_BEGIN_NEW;
-  } else {
-    nodbUtil.assert(typeof flag === 'number', 'NJS-005', 2);
+  //---------------------------------------------------------------------------
+  // action
+  //
+  // Property for end-to-end tracing attribute.
+  //---------------------------------------------------------------------------
+  get action() {
+    return null;
   }
-  await this._tpcBegin(xid, flag, timeout);
-}
 
+  set action(value) {
+    errors.assertPropValue(typeof value === 'string', "action");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setAction(value);
+  }
 
-//-----------------------------------------------------------------------------
-//  tpcCommit
-//    Commit the two-phase-commit transaction
-//-----------------------------------------------------------------------------
-async function tpcCommit(xid, onePhase) {
-  nodbUtil.checkArgCount(arguments, 0, 2);
+  //---------------------------------------------------------------------------
+  // breakExecution()
+  //
+  // Breaks execution of a running statement.
+  //---------------------------------------------------------------------------
+  async breakExecution() {
+    errors.assertArgCount(arguments, 0, 0);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    await this._impl.breakExecution();
+  }
 
-  if (arguments.length < 2) {
-    onePhase = false;
-  } else {
-    nodbUtil.assert(typeof onePhase === 'boolean', 'NJS-005', 2);
+  //---------------------------------------------------------------------------
+  // callTimeout
+  //
+  // Property for round-trip timeouts.
+  //---------------------------------------------------------------------------
+  get callTimeout() {
+    if (this._impl)
+      return this._impl.getCallTimeout();
+    return undefined;
   }
-  if (arguments.length >= 1) {
-    nodbUtil.assert(nodbUtil.isXid(xid), 'NJS-005', 1);
+
+  set callTimeout(value) {
+    errors.assertPropValue(Number.isInteger(value) && value >= 0,
+      "callTimeout");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setCallTimeout(value);
   }
-  await this._tpcCommit(xid, onePhase);
-}
 
+  //---------------------------------------------------------------------------
+  // changePassword()
+  //
+  // Changes the password of the specified user.
+  //---------------------------------------------------------------------------
+  async changePassword(user, password, newPassword) {
+    errors.assertArgCount(arguments, 3, 3);
+    errors.assertParamValue(typeof user === 'string', 1);
+    errors.assertParamValue(typeof password === 'string', 2);
+    errors.assertParamValue(typeof newPassword === 'string', 3);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    await this._impl.changePassword(user, password, newPassword);
+  }
 
-//-----------------------------------------------------------------------------
-//  tpcEnd
-//    Ends the two-phase-commit transaction
-//-----------------------------------------------------------------------------
-async function tpcEnd(xid, flag) {
-  nodbUtil.checkArgCount(arguments, 0, 2);
+  //---------------------------------------------------------------------------
+  // clientId
+  //
+  // Property for end-to-end tracing attribute.
+  //---------------------------------------------------------------------------
+  get clientId() {
+    return null;
+  }
 
-  if (arguments.length < 2) {
-    flag = this._oracledb.TPC_END_NORMAL;
-  } else {
-    nodbUtil.assert(typeof flag === 'number', 'NJS-005', 2);
+  set clientId(value) {
+    errors.assertPropValue(typeof value === 'string', "clientId");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setClientId(value);
   }
 
-  if (arguments.length >= 1) {
-    nodbUtil.assert(nodbUtil.isXid(xid), 'NJS-005', 1);
+  //---------------------------------------------------------------------------
+  // clientInfo
+  //
+  // Property for end-to-end tracing attribute.
+  //---------------------------------------------------------------------------
+  get clientInfo() {
+    return null;
   }
 
-  await this._tpcEnd(xid, flag);
-}
+  set clientInfo(value) {
+    errors.assertPropValue(typeof value === 'string', "clientInfo");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setClientInfo(value);
+  }
 
+  //---------------------------------------------------------------------------
+  // close()
+  //
+  // Closes the connection and makes it unusable for further work.
+  //---------------------------------------------------------------------------
+  async close(a1) {
+    let options = {};
+
+    errors.assertArgCount(arguments, 0, 1);
+    if (arguments.length == 1) {
+      errors.assertParamValue(nodbUtil.isObject(a1), 1);
+      options = a1;
+      errors.assertParamPropBool(options, 1, "drop");
+    }
+    errors.assert(this._impl && !this._closing, errors.ERR_INVALID_CONNECTION);
 
-//-----------------------------------------------------------------------------
-//  tpcForget
-//    causes the server to forget a heuristically completed global transaction.
-//-----------------------------------------------------------------------------
-async function tpcForget(xid) {
+    this._closing = true;
+    try {
+      await this._impl.close(options);
+    } finally {
+      this._closing = false;
+    }
 
-  nodbUtil.checkArgCount(arguments, 1, 1);
-  nodbUtil.assert(nodbUtil.isXid(xid), 'NJS-005', 1);
+    delete this._impl;
+    this._dbObjectClasses.clear();
+    this.emit('_afterConnClose');
+  }
 
-  await this._tpcForget(xid);
-}
+  //---------------------------------------------------------------------------
+  // commit()
+  //
+  // Commits the current transaction.
+  //---------------------------------------------------------------------------
+  async commit() {
+    errors.assertArgCount(arguments, 0, 0);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    await this._impl.commit();
+  }
 
+  //---------------------------------------------------------------------------
+  // createLob()
+  //
+  // Creates a temporary LOB and returns it to the caller.
+  //---------------------------------------------------------------------------
+  async createLob(type) {
+    errors.assertArgCount(arguments, 1, 1);
+    errors.assertParamValue(type === types.DB_TYPE_CLOB ||
+      type === types.DB_TYPE_BLOB ||
+      type === types.DB_TYPE_NCLOB, 1);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    const lob = new Lob();
+    lob._setup(await this._impl.createLob(type), false);
+    return lob;
+  }
 
-//-----------------------------------------------------------------------------
-//  tpcPrepare
-//    prepares a global transaction for commit.
-//-----------------------------------------------------------------------------
-async function tpcPrepare(xid) {
-  nodbUtil.checkArgCount(arguments, 0, 1);
+  //---------------------------------------------------------------------------
+  // currentSchema
+  //
+  // Property for identifying the current schema to use in the database.
+  //---------------------------------------------------------------------------
+  get currentSchema() {
+    if (this._impl)
+      return this._impl.getCurrentSchema();
+    return undefined;
+  }
 
-  if (arguments.length >= 1) {
-    nodbUtil.assert(nodbUtil.isXid(xid), 'NJS-005', 1);
+  set currentSchema(value) {
+    errors.assertPropValue(typeof value === 'string', "currentSchema");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setCurrentSchema(value);
   }
 
-  return await this._tpcPrepare(xid);
-}
+  //---------------------------------------------------------------------------
+  // dbOp
+  //
+  // Property for end-to-end tracing attribute.
+  //---------------------------------------------------------------------------
+  get dbOp() {
+    return null;
+  }
 
+  set dbOp(value) {
+    errors.assertPropValue(typeof value === 'string', "dbOp");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setDbOp(value);
+  }
 
-//-----------------------------------------------------------------------------
-//  tpcRecover
-//    Returns a list of pending transactions
-//-----------------------------------------------------------------------------
-async function tpcRecover(asString) {
-  nodbUtil.checkArgCount(arguments, 0, 1);
-
-  if (arguments.length == 1) {
-    nodbUtil.assert(typeof asString === 'boolean', 'NJS-005', 1);
-  } else {
-    asString = true;
-  }
-
-  const sqlStr = `
-    SELECT
-        formatid as "formatId",
-        UTL_RAW.CAST_TO_VARCHAR2(globalid) as "globalTransactionId",
-        UTL_RAW.CAST_TO_VARCHAR2(branchid) as "branchQualifier"
-    FROM DBA_PENDING_TRANSACTIONS`;
-  const sqlBuf = `
-    SELECT
-        formatid as "formatId",
-        globalid as "globalTransactionId",
-        branchid as "branchQualifier"
-    FROM DBA_PENDING_TRANSACTIONS`;
-  const options = {
-    outFormat: this._oracledb.OUT_FORMAT_OBJECT,
-  };
-
-  const result = await this._execute(asString ? sqlStr : sqlBuf, {}, options);
-  return result.resultSet._getAllRows(options, result.metaData, false);
-}
+  //---------------------------------------------------------------------------
+  // thin()
+  //
+  // return true, if driver mode is thin while acquiring connection
+  // return false, if driver mode is thick while acquiring connection
+  //---------------------------------------------------------------------------
+  get thin() {
+    return settings.thin;
+  }
 
+  //---------------------------------------------------------------------------
+  // ecid
+  //
+  // Property for end-to-end tracing attribute.
+  //---------------------------------------------------------------------------
+  get ecid() {
+    return null;
+  }
 
-//-----------------------------------------------------------------------------
-//  tpcRollback()
-//    Rollbacks the current changes in two-phase-commit
-//-----------------------------------------------------------------------------
-async function tpcRollback(xid) {
-  nodbUtil.checkArgCount(arguments, 0, 1);
-  if (arguments.length == 1) {
-    nodbUtil.assert(nodbUtil.isXid(xid), 'NJS-005', 1);
+  set ecid(value) {
+    errors.assertPropValue(typeof value === 'string', "ecid");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setECID(value);
   }
 
-  await this._tpcRollback(xid);
-}
+  //---------------------------------------------------------------------------
+  // execute()
+  //
+  // Executes a SQL statement and returns the results.
+  //---------------------------------------------------------------------------
+  async execute(sql, a2, a3) {
+    const numIters = 1;
+    let binds = [];
+    let options = {};
+
+    // process arguments
+    errors.assertArgCount(arguments, 1, 3);
+    errors.assertParamValue(typeof sql === 'string', 1);
+    if (arguments.length >= 2) {
+      binds = await this._processExecuteBinds(a2);
+    }
+    if (arguments.length == 3) {
+      options = this._verifyExecOpts(a3, false);
+    }
+    this._addDefaultsToExecOpts(options);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    // perform actual execute
+    let result;
+    try {
+      result = await this._impl.execute(sql, numIters, binds, options, false);
+    } catch (err) {
+      if (err.errorNum === 1406)
+        errors.throwErr(errors.ERR_INSUFFICIENT_BUFFER_FOR_BINDS);
+      throw err;
+    }
 
+    // process queries; if a result set is not desired, fetch all of the rows
+    // from the result set and then destroy the result set
+    if (result.resultSet !== undefined) {
+      const resultSet = new ResultSet();
+      resultSet._setup(this, result.resultSet);
+      result.metaData = resultSet._impl.metaData;
+      if (options.resultSet) {
+        result.resultSet = resultSet;
+      } else {
+        result.rows = await resultSet._getAllRows();
+        delete result.resultSet;
+      }
+    }
 
-// define class
-class Connection extends EventEmitter {
+    // process output binds
+    if (result.outBinds !== undefined) {
+      for (const key in result.outBinds) {
+        const val = this._transformOutBind(result.outBinds[key], options);
+        result.outBinds[key] = val;
+      }
+    }
 
-  constructor() {
-    super();
-    this._dbObjectClasses = {};
-    this._requestQueue = [];
-    this._inProgress = false;
-    this._closing = false;
+    // process implicit results; ensure all implicit results have their fetch
+    // array size fixed, or, if a result set is not requested, that all rows
+    // are fetched
+    if (result.implicitResults) {
+      for (const key in result.implicitResults) {
+        const resultSetImpl = result.implicitResults[key];
+        const resultSet = new ResultSet();
+        resultSet._setup(this, resultSetImpl);
+        if (options.resultSet) {
+          result.implicitResults[key] = resultSet;
+        } else {
+          result.implicitResults[key] = await resultSet._getAllRows();
+        }
+      }
+    }
+
+    return (result);
   }
 
-  // extend class with promisified functions
-  _extend(oracledb) {
-    this._oracledb = oracledb;
-    this.break = nodbUtil.callbackify(module.break);  // should not be serialized
-    this.changePassword = nodbUtil.callbackify(nodbUtil.serialize(changePassword));
-    this.close = nodbUtil.callbackify(nodbUtil.serialize(close));
-    this.commit = nodbUtil.callbackify(nodbUtil.serialize(commit));
-    this.createLob = nodbUtil.callbackify(nodbUtil.serialize(createLob));
-    this.execute = nodbUtil.callbackify(nodbUtil.serialize(execute));
-    this.executeMany = nodbUtil.callbackify(nodbUtil.serialize(executeMany));
-    this.getDbObjectClass = nodbUtil.callbackify(nodbUtil.serialize(getDbObjectClass));
-    this.getQueue = nodbUtil.callbackify(nodbUtil.serialize(getQueue));
-    this.getStatementInfo = nodbUtil.callbackify(nodbUtil.serialize(getStatementInfo));
-    this.ping = nodbUtil.callbackify(nodbUtil.serialize(ping));
-    this.release = nodbUtil.callbackify(nodbUtil.serialize(close));
-    this.rollback = nodbUtil.callbackify(nodbUtil.serialize(rollback));
-    this.shutdown = nodbUtil.callbackify(nodbUtil.serialize(shutdown));
-    this.startup = nodbUtil.callbackify(nodbUtil.serialize(startup));
-    this.subscribe = nodbUtil.callbackify(nodbUtil.serialize(subscribe));
-    this.tpcBegin = nodbUtil.callbackify(nodbUtil.serialize(tpcBegin));
-    this.tpcCommit = nodbUtil.callbackify(nodbUtil.serialize(tpcCommit));
-    this.tpcEnd = nodbUtil.callbackify(nodbUtil.serialize(tpcEnd));
-    this.tpcForget = nodbUtil.callbackify(nodbUtil.serialize(tpcForget));
-    this.tpcPrepare = nodbUtil.callbackify(nodbUtil.serialize(tpcPrepare));
-    this.tpcRecover = nodbUtil.callbackify(nodbUtil.serialize(tpcRecover));
-    this.tpcRollback = nodbUtil.callbackify(nodbUtil.serialize(tpcRollback));
-    this.unsubscribe = nodbUtil.callbackify(nodbUtil.serialize(unsubscribe));
-  }
-
-  async _acquireLock() {
-    if (this._inProgress) {
-      if (this._oracledb.errorOnConcurrentExecute) {
-        throw new Error(nodbUtil.getErrorMessage('NJS-081'));
+  //---------------------------------------------------------------------------
+  // executeMany()
+  //
+  // Executes a SQL statement multiple times and returns the results.
+  //---------------------------------------------------------------------------
+  async executeMany(sql, bindsOrNumIters, a3) {
+    let options = {};
+    let binds = [];
+    let numIters;
+
+    errors.assertArgCount(arguments, 2, 3);
+    errors.assertParamValue(typeof sql === 'string', 1);
+    if (arguments.length == 3) {
+      options = this._verifyExecOpts(a3, true);
+    }
+    this._addDefaultsToExecOpts(options);
+    if (typeof bindsOrNumIters === 'number') {
+      errors.assertParamValue(Number.isInteger(bindsOrNumIters) &&
+        bindsOrNumIters > 0, 2);
+      numIters = bindsOrNumIters;
+      if (options.bindDefs !== undefined) {
+        binds = await this._processExecuteManyBinds([], options.bindDefs);
       }
-      await new Promise((resolve, reject) => {
-        const payload = {resolve: resolve, reject: reject};
-        this._requestQueue.push(payload);
-      });
+    } else {
+      errors.assertParamValue(Array.isArray(bindsOrNumIters) &&
+        bindsOrNumIters.length > 0, 2);
+      numIters = bindsOrNumIters.length;
+      binds = await this._processExecuteManyBinds(bindsOrNumIters,
+        options.bindDefs);
     }
-    this._inProgress = true;
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    const result = await this._impl.execute(sql, numIters, binds, options,
+      true);
+
+    // process output binds
+    if (result.outBinds !== undefined) {
+      for (let i = 0; i < result.outBinds.length; i++) {
+        const outBind = result.outBinds[i];
+        for (const key in outBind) {
+          outBind[key] = this._transformOutBind(outBind[key], options);
+        }
+      }
+    }
+
+    return result;
   }
 
-  _getConnection() {
-    return this;
+  //---------------------------------------------------------------------------
+  // externalName
+  //
+  // Property for identifying the external name to use in TPC logging.
+  //---------------------------------------------------------------------------
+  get externalName() {
+    if (this._impl)
+      return this._impl.getExternalName();
+    return undefined;
   }
 
-  _getDbObjectClassJS(schema, name) {
-    const fqn = `${schema}.${name}`;
-    let cls = this._dbObjectClasses[fqn];
-    if (!cls) {
-      cls = buildDbObjectClass(schema, name, fqn);
-      cls._connection = this;
-      this._dbObjectClasses[fqn] = cls;
-    }
-    return (cls);
+  set externalName(value) {
+    errors.assertPropValue(typeof value === 'string', "externalName");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setExternalName(value);
   }
 
-  _isDate(val) {
-    return (util.isDate(val));
+  //---------------------------------------------------------------------------
+  // getDbObjectClass()
+  //
+  // Returns a database object class given its name. The cache is searched
+  // first, but if not found, the database is queried and the result is cached
+  // using the type information (as well as the name for easier lookup later).
+  //---------------------------------------------------------------------------
+  async getDbObjectClass(name) {
+    errors.assertArgCount(arguments, 1, 1);
+    errors.assertParamValue(typeof name === 'string', 1);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    return await this._getDbObjectClassForName(name);
   }
 
-  _releaseLock() {
-    if (this._requestQueue.length > 0) {
-      const payload = this._requestQueue.shift();
-      payload.resolve();
-    } else {
-      this._inProgress = false;
+  //---------------------------------------------------------------------------
+  // getQueue()
+  //
+  // Returns a queue with the specified name.
+  //---------------------------------------------------------------------------
+  async getQueue(name, a2) {
+    let options = {};
+
+    errors.assertArgCount(arguments, 1, 2);
+    errors.assertParamValue(typeof name === 'string', 1);
+    if (arguments.length == 2) {
+      errors.assertParamValue(nodbUtil.isObject(a2), 2);
+      options = {...a2};
     }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    const queue = new AqQueue();
+    await queue.create(this, name, options);
+    return queue;
   }
 
-  // To obtain a SodaDatabase object (high-level SODA object associated with
-  // current connection)
+  //---------------------------------------------------------------------------
+  // getSodaDatabase()
+  //
+  // Returns a SodaDatabase object (high-level SODA object associated with
+  // the current connection).
+  //---------------------------------------------------------------------------
   getSodaDatabase() {
-    nodbUtil.checkArgCount(arguments, 0, 0);
-    return (this._getSodaDatabase());
+    errors.assertArgCount(arguments, 0, 0);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    const sodaDb = new SodaDatabase();
+    sodaDb._impl = this._impl.getSodaDatabase();
+    return sodaDb;
   }
 
-  //--------------------------------------------------------------------------
-  //  isHealthy()
-  //    To get the health status of the connection.
-  //  NOTE: if this function returns false, the application must close the
-  //        connection obect.
-  //        This is a synchronous call.
   //---------------------------------------------------------------------------
-  isHealthy() {
-    return (!this._closing && this._isHealthy());
+  // getStatementInfo()
+  //
+  // Returns information about the statement.
+  //---------------------------------------------------------------------------
+  async getStatementInfo(sql) {
+    errors.assertArgCount(arguments, 1, 1);
+    errors.assertParamValue(typeof sql === 'string', 1);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    const info = await this._impl.getStatementInfo(sql);
+    if (info.metaData) {
+      for (let i = 0; i < info.metaData.length; i++) {
+        const m = info.metaData[i];
+        nodbUtil.addTypeProperties(m, "dbType");
+        m.fetchType = types.DB_TYPE_FETCH_TYPE_MAP.get(m.dbType);
+      }
+    }
+    return info;
   }
 
+  //---------------------------------------------------------------------------
+  // internalName
+  //
+  // Property for identifying the internal name to use in TPC logging.
+  //---------------------------------------------------------------------------
+  get internalName() {
+    if (this._impl)
+      return this._impl.getInternalName();
+    return undefined;
+  }
 
-  // The queryStream function is similar to execute except that it immediately
-  // returns a QueryStream.
-  queryStream(sql, binding, options) {
+  set internalName(value) {
+    errors.assertPropValue(typeof value === 'string', "internalName");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setInternalName(value);
+  }
 
-    nodbUtil.checkArgCount(arguments, 1, 3);
-    nodbUtil.assert(typeof sql === 'string', 'NJS-005', 1);
+  //--------------------------------------------------------------------------
+  // isHealthy()
+  //
+  // Returns the health status of the connection. If this function returns
+  // false, the caller should close the connection.
+  // ---------------------------------------------------------------------------
+  isHealthy() {
+    return (this._impl !== undefined && !this._closing &&
+      this._impl.isHealthy());
+  }
 
-    if (binding) {
-      nodbUtil.assert(nodbUtil.isObjectOrArray(binding), 'NJS-005', 2);
-    }
+  //---------------------------------------------------------------------------
+  // module
+  //
+  // Property for end-to-end tracing attribute.
+  //---------------------------------------------------------------------------
+  get module() {
+    return null;
+  }
 
-    if (options) {
-      nodbUtil.assert(nodbUtil.isObject(options), 'NJS-005', 3);
-    }
+  set module(value) {
+    errors.assertPropValue(typeof value === 'string', "module");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setModule(value);
+  }
+
+  //---------------------------------------------------------------------------
+  // oracleServerVersion
+  //
+  // Returns an integer identifying the Oracle Server version.
+  //---------------------------------------------------------------------------
+  get oracleServerVersion() {
+    if (this._impl)
+      return this._impl.getOracleServerVersion();
+    return undefined;
+  }
+
+  //---------------------------------------------------------------------------
+  // oracleServerVersionString
+  //
+  // Returns a string identifying the Oracle Server version.
+  //---------------------------------------------------------------------------
+  get oracleServerVersionString() {
+    if (this._impl)
+      return this._impl.getOracleServerVersionString();
+    return undefined;
+  }
 
-    binding = binding || [];
-    options = options || {};
+  //---------------------------------------------------------------------------
+  // ping()
+  //
+  // Sends a "ping" to the database to see if it is "alive".
+  //---------------------------------------------------------------------------
+  async ping() {
+    errors.assertArgCount(arguments, 0, 0);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    await this._impl.ping();
+  }
 
+  //--------------------------------------------------------------------------
+  // queryStream()
+  //
+  // Similar to execute() except that it immediately returns a QueryStream
+  // object.
+  // ---------------------------------------------------------------------------
+  queryStream(sql, binds, options) {
+    errors.assertArgCount(arguments, 1, 3);
+    errors.assertParamValue(typeof sql === 'string', 1);
+    if (arguments.length == 3) {
+      errors.assertParamValue(nodbUtil.isObject(options), 3);
+      options = {...options};
+    } else {
+      options = {};
+    }
     options.resultSet = true;
 
     const stream = new QueryStream();
 
     // calling execute() via nextTick to ensure that handlers are registered
     // prior to the events being emitted
-    process.nextTick(() => {
+    process.nextTick(async () => {
       try {
-        const p = this._execute(sql, binding, options);
-        p.then(function(result) {
-          if (!result.resultSet) {
-            stream.destroy(new Error(nodbUtil.getErrorMessage('NJS-019')));
-          } else {
-            stream._open(result.resultSet);
-          }
-        }, function(err) {
-          stream.destroy(err);
-        });
+        const result = await this.execute(sql, binds || [], options);
+        if (!result.resultSet)
+          errors.throwErr(errors.ERR_NOT_A_QUERY);
+        stream._open(result.resultSet);
       } catch (err) {
         stream.destroy(err);
         return;
@@ -611,8 +1148,330 @@ class Connection extends EventEmitter {
     return (stream);
   }
 
-}
+  //---------------------------------------------------------------------------
+  // rollback()
+  //
+  // Rolls back the current transaction.
+  //---------------------------------------------------------------------------
+  async rollback() {
+    errors.assertArgCount(arguments, 0, 0);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    await this._impl.rollback();
+  }
+
+  //---------------------------------------------------------------------------
+  // shutdown()
+  //   Shuts down the database instance.
+  //---------------------------------------------------------------------------
+  async shutdown(a1) {
+    let mode = constants.SHUTDOWN_MODE_DEFAULT;
+
+    errors.assertArgCount(arguments, 0, 1);
+    if (a1 !== undefined) {
+      errors.assertParamValue(typeof mode === 'number', 1);
+      mode = a1;
+    }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    await this._impl.shutdown(mode);
+  }
+
+  //---------------------------------------------------------------------------
+  // startup()
+  //   Starts up the database instance.
+  //---------------------------------------------------------------------------
+  async startup(a1) {
+    let options = {};
+
+    errors.assertArgCount(arguments, 0, 1);
+    if (arguments.length == 1) {
+      errors.assertParamValue(typeof options === 'object', 1);
+      options = a1;
+      errors.assertParamPropBool(options, 1, "force");
+      errors.assertParamPropBool(options, 1, "restrict");
+      errors.assertParamPropString(options, 1, "pfile");
+    }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    await this._impl.startup(options);
+  }
+
+  //---------------------------------------------------------------------------
+  // stmtCacheSize
+  //
+  // Property for statement cache size.
+  //---------------------------------------------------------------------------
+  get stmtCacheSize() {
+    if (this._impl)
+      return this._impl.getStmtCacheSize();
+    return undefined;
+  }
+
+  set stmtCacheSize(value) {
+    errors.assertPropValue(Number.isInteger(value) && value >= 0,
+      "stmtCacheSize");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setStmtCacheSize(value);
+  }
+
+  //---------------------------------------------------------------------------
+  // subscribe()
+  //
+  // Creates a subscription which can be used to get notifications of database
+  // changes or of AQ messages available to dequeue.
+  //---------------------------------------------------------------------------
+  async subscribe(name, options) {
+    errors.assertArgCount(arguments, 2, 2);
+    errors.assertParamValue(typeof name === 'string', 1);
+    errors.assertParamValue(nodbUtil.isObject(options), 2);
+    options = {...options};
+    errors.assertParamPropUnsignedInt(options, 2, "namespace");
+    if (options.namespace === undefined)
+      options.namespace = constants.SUBSCR_NAMESPACE_DBCHANGE;
+    errors.assertParamPropString(options, 2, "ipAddress");
+    errors.assertParamPropUnsignedInt(options, 2, "port");
+    errors.assertParamPropUnsignedInt(options, 2, "timeout");
+    errors.assertParamPropUnsignedInt(options, 2, "operations");
+    errors.assertParamPropUnsignedInt(options, 2, "qos");
+    errors.assertParamPropUnsignedInt(options, 2, "groupingClass");
+    errors.assertParamPropUnsignedInt(options, 2, "groupingValue");
+    errors.assertParamPropUnsignedInt(options, 2, "groupingType");
+    errors.assertParamPropBool(options, 2, "clientInitiated");
+    errors.assertParamPropFunction(options, 2, "callback");
+    errors.assert(options.callback, errors.ERR_MISSING_SUBSCR_CALLBACK);
+    if (options.namespace === constants.SUBSCR_NAMESPACE_DBCHANGE) {
+      errors.assertParamPropString(options, 2, "sql");
+      errors.assert(options.sql && options.sql.length > 0,
+        errors.ERR_MISSING_SUBSCR_SQL);
+      if (options.binds !== undefined) {
+        options.binds = await this._processExecuteBinds(options.binds);
+      }
+    }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    const inSubscr = _subscriptions.get(name);
+    let outValue = await this._impl.subscribe(inSubscr, options);
+    let subscription;
+    if (options.namespace === constants.SUBSCR_NAMESPACE_DBCHANGE) {
+      subscription = outValue.subscription;
+      delete outValue.subscription;
+    } else {
+      subscription = outValue;
+      outValue = undefined;
+    }
+    _subscriptions.set(name, subscription);
+    return outValue;
+  }
+
+  //---------------------------------------------------------------------------
+  // tag
+  //
+  // Property for tag to associate with the connection.
+  //---------------------------------------------------------------------------
+  get tag() {
+    if (this._impl)
+      return this._impl.getTag();
+    return undefined;
+  }
+
+  set tag(value) {
+    errors.assertPropValue(typeof value === 'string', "tag");
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    this._impl.setTag(value);
+  }
+
+  //---------------------------------------------------------------------------
+  // tpcBegin()
+  //
+  // Starts a two-phase-commit transaction.
+  //--------------------------------------------------------------------------
+  async tpcBegin(xid, flag, timeout) {
+    errors.assertArgCount(arguments, 1, 3);
+    errors.assertParamValue(nodbUtil.isXid(xid), 1);
+
+    if (arguments.length < 3) {
+      timeout = 60;   // seconds
+    } else {
+      errors.assertParamValue(typeof timeout === 'number', 3);
+    }
 
+    if (arguments.length < 2) {
+      flag = constants.TPC_BEGIN_NEW;
+    } else {
+      errors.assertParamValue(typeof flag === 'number', 2);
+    }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    await this._impl.tpcBegin(xid, flag, timeout);
+  }
+
+  //---------------------------------------------------------------------------
+  // tpcCommit()
+  //
+  // Commits a two-phase-commit transaction.
+  //---------------------------------------------------------------------------
+  async tpcCommit(xid, onePhase) {
+    errors.assertArgCount(arguments, 0, 2);
+
+    if (arguments.length < 2) {
+      onePhase = false;
+    } else {
+      errors.assertParamValue(typeof onePhase === 'boolean', 2);
+    }
+    if (arguments.length >= 1) {
+      errors.assertParamValue(nodbUtil.isXid(xid), 1);
+    }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    await this._impl.tpcCommit(xid, onePhase);
+  }
+
+  //---------------------------------------------------------------------------
+  // tpcEnd()
+  //
+  // Ends a two-phase-commit transaction.
+  //---------------------------------------------------------------------------
+  async tpcEnd(xid, flag) {
+    errors.assertArgCount(arguments, 0, 2);
+
+    if (arguments.length < 2) {
+      flag = constants.TPC_END_NORMAL;
+    } else {
+      errors.assertParamValue(typeof flag === 'number', 2);
+    }
+
+    if (arguments.length >= 1) {
+      errors.assertParamValue(nodbUtil.isXid(xid), 1);
+    }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    await this._impl.tpcEnd(xid, flag);
+  }
+
+  //---------------------------------------------------------------------------
+  // tpcForget()
+  //
+  // Causes the server to forget a heuristically completed two-phase-commit
+  // transaction.
+  // ---------------------------------------------------------------------------
+  async tpcForget(xid) {
+    errors.assertArgCount(arguments, 1, 1);
+    errors.assertParamValue(nodbUtil.isXid(xid), 1);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    await this._impl.tpcForget(xid);
+  }
+
+  //---------------------------------------------------------------------------
+  // tpcPrepare()
+  //
+  // Prepares a two-phase-commit transaction for commit.
+  //---------------------------------------------------------------------------
+  async tpcPrepare(xid) {
+    errors.assertArgCount(arguments, 0, 1);
+    if (arguments.length >= 1) {
+      errors.assertParamValue(nodbUtil.isXid(xid), 1);
+    }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    return await this._impl.tpcPrepare(xid);
+  }
+
+  //---------------------------------------------------------------------------
+  // tpcRecover()
+  //
+  // Returns a list of pending two-phase-commit transactions.
+  //---------------------------------------------------------------------------
+  async tpcRecover(asString) {
+    errors.assertArgCount(arguments, 0, 1);
+
+    if (arguments.length == 1) {
+      errors.assertParamValue(typeof asString === 'boolean', 1);
+    } else {
+      asString = true;
+    }
+
+    const sqlStr = `
+      SELECT
+          formatid as "formatId",
+          UTL_RAW.CAST_TO_VARCHAR2(globalid) as "globalTransactionId",
+          UTL_RAW.CAST_TO_VARCHAR2(branchid) as "branchQualifier"
+      FROM DBA_PENDING_TRANSACTIONS`;
+    const sqlBuf = `
+      SELECT
+          formatid as "formatId",
+          globalid as "globalTransactionId",
+          branchid as "branchQualifier"
+      FROM DBA_PENDING_TRANSACTIONS`;
+    const options = {
+      outFormat: constants.OUT_FORMAT_OBJECT,
+      resultSet: false
+    };
+
+    const result = await this.execute(asString ? sqlStr : sqlBuf, {}, options);
+    return result.rows;
+  }
+
+  //---------------------------------------------------------------------------
+  // tpcRollback()
+  //
+  // Rolls back the current changes in a two-phase-commit transaction.
+  //---------------------------------------------------------------------------
+  async tpcRollback(xid) {
+    errors.assertArgCount(arguments, 0, 1);
+    if (arguments.length == 1) {
+      errors.assertParamValue(nodbUtil.isXid(xid), 1);
+    }
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+
+    await this._impl.tpcRollback(xid);
+  }
+
+  //---------------------------------------------------------------------------
+  // unsubscribe()
+  //
+  // Destroy a subscription which was earlier created using subscribe().
+  //---------------------------------------------------------------------------
+  async unsubscribe(name) {
+    errors.assertArgCount(arguments, 1, 1);
+    errors.assertParamValue(typeof name === 'string', 1);
+    errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
+    errors.assert(_subscriptions.has(name), errors.ERR_INVALID_SUBSCR);
+    await this._impl.unsubscribe(_subscriptions.get(name));
+    _subscriptions.delete(name);
+  }
+
+}
 
-// module.exports.extend = extend;
+// adjust functions to support the old callback style and to serialize calls
+// that cannot take place concurrently
+// NOTE: breakExecution() should not be serialized
+Connection.prototype.break =
+    nodbUtil.callbackify(Connection.prototype.breakExecution);
+nodbUtil.wrapFns(Connection.prototype,
+  "changePassword",
+  "close",
+  "commit",
+  "createLob",
+  "execute",
+  "executeMany",
+  "getDbObjectClass",
+  "getQueue",
+  "getStatementInfo",
+  "ping",
+  "rollback",
+  "shutdown",
+  "startup",
+  "subscribe",
+  "tpcBegin",
+  "tpcCommit",
+  "tpcEnd",
+  "tpcForget",
+  "tpcPrepare",
+  "tpcRecover",
+  "tpcRollback",
+  "unsubscribe");
+
+// add alias for release()
+Connection.prototype.release = Connection.prototype.close;
+
+// export just the Connection class
 module.exports = Connection;