oracledb 6.2.0 → 6.3.0

package/README.md

@@ -1,10 +1,10 @@
-# node-oracledb version 6.2.0
+# node-oracledb version 6.3.0
 
 The node-oracledb add-on for Node.js powers high performance Oracle Database
 applications.  Applications can be written in TypeScript, or directly in
 JavaScript.
 
-Use node-oracledb 6.2.0 to connect Node.js 14.6, or later, to Oracle
+Use node-oracledb 6.3.0 to connect Node.js 14.6, or later, to Oracle
 Database.  Older versions of node-oracledb may work with older versions of
 Node.js.
 

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

@@ -0,0 +1 @@
+oracledb-6.3.0-darwin-x64.node v18.16.0 6430a56e82b0405c4118fcc1060c3568be4c43aa 4b8ebc2af8c9d58f7260c9de81d220f14fcab777 Sun, 17 Dec 2023 09:33:07 GMT

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

@@ -0,0 +1 @@
+6430a56e82b0405c4118fcc1060c3568be4c43aa

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

@@ -0,0 +1 @@
+oracledb-6.3.0-linux-arm64.node v16.20.2 6430a56e82b0405c4118fcc1060c3568be4c43aa 4b8ebc2af8c9d58f7260c9de81d220f14fcab777 Sun, 17 Dec 2023 09:47:35 GMT

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

@@ -0,0 +1 @@
+oracledb-6.3.0-linux-x64.node v16.19.1 6430a56e82b0405c4118fcc1060c3568be4c43aa 4b8ebc2af8c9d58f7260c9de81d220f14fcab777 Fri, 15 Dec 2023 17:32:48 GMT

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

@@ -0,0 +1 @@
+oracledb-6.3.0-win32-x64.node v14.17.3 6430a56e82b0405c4118fcc1060c3568be4c43aa 4b8ebc2af8c9d58f7260c9de81d220f14fcab777 Fri, 15 Dec 2023 17:43:19 GMT

package/examples/README.md

@@ -1,8 +1,7 @@
 # Node-oracledb Examples
 
-The directory in node-oracledb's [Github repository](https://github.com/oracle/node-oracledb/tree/main/examples) contains a lot of [node-oracledb](https://www.npmjs.com/package/oracledb)
-examples.  Documentation is
-[here](https://node-oracledb.readthedocs.io/en/latest/).
+The directory in node-oracledb's [Github repository](https://github.com/oracle/node-oracledb/tree/main/examples) contains a lot of [node-oracledb](https://www.npmjs.com/package/oracledb) examples.
+Documentation is [here](https://node-oracledb.readthedocs.io/en/latest/).
 
 To run the examples:
 
@@ -11,18 +10,37 @@ To run the examples:
 - Ensure that you navigate to the `examples` directory in your terminal window
   or IDE, where you are running the samples.
 
-- Review `dbconfig.js`.  In your terminal window or IDE, set the environment
-  variables.  For example, set `NODE_ORACLEDB_PASSWORD` to the value of your
-  database password.
+- Review `dbconfig.js`.
 
-- Review the samples and then run them individually.  For example, to see what
+In your terminal window or IDE, set the following environment variables to
+provide credentials for the `dbconfig.js` file.
+
+- `NODE_ORACLEDB_USER` must be set to the database user.
+
+- `NODE_ORACLEDB_PASSWORD` must be set to the database password.
+
+- `NODE_ORACLEDB_CONNECTIONSTRING` must be set to the connection string that points to your database's location.
+
+- `NODE_ORACLEDB_EXTERNALAUTH` provides the options for enabling external authentication. Setting this environment variable to "true" will enable external authentication. To ensure external authentication works, firstly make sure the Oracle external authentication service is correctly configured. See [Documentation for External Authentication](https://node-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#extauth) for details.
+
+- `NODE_ORACLEDB_DRIVER_MODE` provides an option to set the 'Thin' or 'Thick' modes of node-oracledb. Setting this environment variable to "thick" will enable Thick mode.
+Setting it to "thin" will retain the Thin mode. The default mode is Thin.
+
+- `NODE_ORACLEDB_WALLET_LOCATION` must be set to the local directory name for the wallets that may be required for mutual TLS (mTLS) connections, especially to Oracle Cloud
+Autonomous Databases optionally. The wallet location can also be provided as a part of the database connect string.
+
+- `NODE_ORACLEDB_WALLET_PASSWORD` must set to the password for the wallets that may be required for mutual TLS (mTLS) connections, especially to Oracle Cloud Autonomous Databases.
+
+- `NODE_ORACLEDB_CLIENT_LIB_DIR` provides an optional path for the Oracle Client libraries to be used on Windows and macOS platforms, when using Thick mode in node-oracledb.
+
+Review the examples and then run them individually.  For example, to see what
   the file `example.js` does, use:
 
   ```
   node example.js
   ```
 
-- After running examples, the demonstration objects can be dropped with
+After running the examples, the demonstration objects can be dropped with
   `demodrop.js`:
 
   ```

package/examples/dbconfig.js

@@ -26,17 +26,16 @@
  *   dbconfig.js
  *
  * DESCRIPTION
- *   Holds the credentials used by node-oracledb examples to connect
- *   to the database.  Production applications should consider using
- *   External Authentication to avoid hard coded credentials.
+ *   Holds the credentials used by node-oracledb examples to connect to the
+ *   database. Production applications should consider using External
+ *   Authentication to avoid hard coded credentials.
  *
  *   To create a database user, see
  *   https://blogs.oracle.com/sql/post/how-to-create-users-grant-them-privileges-and-remove-them-in-oracle-database
  *
- *   Applications can set the connectString value to an Easy Connect
- *   string, or a Net Service Name from a tnsnames.ora file or
- *   external naming service, or it can be the name of a local Oracle
- *   database instance.
+ *   Applications can set the connectString value to an Easy Connect string,
+ *   or a Net Service Name from the tnsnames.ora file or an external naming
+ *   service, or it can be the name of a local Oracle Database instance.
  *
  *   If node-oracledb is linked with Instant Client, then an Easy
  *   Connect string is generally appropriate.  The basic syntax is:
@@ -50,20 +49,20 @@
  *   refer to the latest Oracle documentation on Easy Connect syntax:
  *   https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-B0437826-43C1-49EC-A94D-B650B6A4A6EE
  *
- *   If using a tnsnames.ora file, the file can be in a default
- *   location such as $ORACLE_HOME/network/admin/tnsnames.ora or
- *   /etc/tnsnames.ora.  Alternatively set the TNS_ADMIN environment
- *   variable and put the file in $TNS_ADMIN/tnsnames.ora.
+ *   If using a tnsnames.ora file, the file can be in a default location such
+ *   as $ORACLE_HOME/network/admin/tnsnames.ora or /etc/tnsnames.ora.
+ *   Alternatively set the TNS_ADMIN environment variable and put the file in
+ *   $TNS_ADMIN/tnsnames.ora.
  *
- *   If connectString is not specified, the empty string "" is used
- *   which indicates to connect to the local, default database.
+ *   If connectString is not specified, the empty string "" is used which
+ *   indicates to connect to the local, default database.
  *
- *   External Authentication can be used by setting the optional
- *   property externalAuth to true.  External Authentication allows
- *   applications to use an external password store such as Oracle
- *   Wallet so passwords do not need to be hard coded into the
- *   application.  The user and password properties for connecting or
- *   creating a pool should not be set when externalAuth is true.
+ *   External Authentication can be used by setting the optional property
+ *   externalAuth to true. External Authentication allows applications to use
+ *   an external password store such as Oracle Wallet, so that passwords
+ *   do not need to be hard coded into the application. The user and password
+ *   application. The user and password properties for connecting or creating
+ *   a pool should not be set when externalAuth is true.
  *
  * TROUBLESHOOTING
  *   Refer to the Error Handling section in node-oracledb documentation
@@ -73,21 +72,46 @@
  *
  *****************************************************************************/
 
-module.exports = {
-  user          : process.env.NODE_ORACLEDB_USER,
+const config = {
+  user: process.env.NODE_ORACLEDB_USER,
 
   // Get the password from the environment variable
   // NODE_ORACLEDB_PASSWORD.  The password could also be a hard coded
   // string (not recommended), or it could be prompted for.
-  // Alternatively use External Authentication so that no password is
-  // needed.
-  password      : process.env.NODE_ORACLEDB_PASSWORD,
+  // Alternatively use External Authentication so that no password is needed.
+  password: process.env.NODE_ORACLEDB_PASSWORD,
 
   // For information on connection strings see:
   // https://node-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#connectionstrings
-  connectString : process.env.NODE_ORACLEDB_CONNECTIONSTRING,
+  connectString: process.env.NODE_ORACLEDB_CONNECTIONSTRING,
 
   // Setting externalAuth is optional.  It defaults to false.  See:
   // https://node-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#extauth
-  externalAuth  : process.env.NODE_ORACLEDB_EXTERNALAUTH ? true : false,
+  externalAuth: process.env.NODE_ORACLEDB_EXTERNALAUTH ? true : false,
 };
+
+// Set the NODE_ORACLEDB_WALLET_LOCATION and NODE_ORACLEDB_WALLET_PASSWORD
+// environment variables for database connections that require wallets.
+// For example, creating and dropping a user.
+// See the README.md file in this directory for more details.
+if (process.env.NODE_ORACLEDB_WALLET_PASSWORD) {
+  config.walletPassword = process.env.NODE_ORACLEDB_WALLET_PASSWORD;
+}
+
+if (process.env.NODE_ORACLEDB_WALLET_LOCATION) {
+  config.walletLocation = process.env.NODE_ORACLEDB_WALLET_LOCATION;
+}
+
+// Set the NODE_ORACLEDB_DBA_USER and NODE_ORACLEDB_DBA_PASSWORD environment
+// variables for database operations which require SYSDBA privileges.
+// For example, creating and dropping a user. See the README.md file in this
+// directory for more details.
+if (process.env.NODE_ORACLEDB_DBA_USER) {
+  config.DBA_user = process.env.NODE_ORACLEDB_DBA_USER;
+}
+
+if (process.env.NODE_ORACLEDB_DBA_PASSWORD) {
+  config.DBA_password = process.env.NODE_ORACLEDB_DBA_PASSWORD;
+}
+
+module.exports = config;

package/examples/example.js

@@ -54,14 +54,16 @@ if (process.env.NODE_ORACLEDB_DRIVER_MODE === 'thick') {
   // is not correct, you will get a DPI-1047 error.  See the node-oracledb
   // installation documentation.
   let clientOpts = {};
-  if (process.platform === 'win32') {                                   // Windows
-    clientOpts = { libDir: 'C:\\oracle\\instantclient_19_17' };
-  } else if (process.platform === 'darwin' && process.arch === 'x64') { // macOS Intel
-    clientOpts = { libDir: process.env.HOME + '/Downloads/instantclient_19_8' };
+  // On Windows and macOS Intel platforms, set the environment
+  // variable NODE_ORACLEDB_CLIENT_LIB_DIR to the Oracle Client library path
+  if (process.platform === 'win32' || (process.platform === 'darwin' && process.arch === 'x64')) {
+    clientOpts = { libDir: process.env.NODE_ORACLEDB_CLIENT_LIB_DIR };
   }
   oracledb.initOracleClient(clientOpts);  // enable node-oracledb Thick mode
 }
 
+console.log(oracledb.thin ? 'Running in thin mode' : 'Running in thick mode');
+
 async function run() {
   let connection;
 

package/lib/connection.js

@@ -865,6 +865,11 @@ class Connection extends EventEmitter {
       throw err;
     }
 
+    // convert ORA errors to NJS
+    if (result.warning) {
+      result.warning = errors.transformErr(result.warning);
+    }
+
     // 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) {
@@ -971,6 +976,24 @@ class Connection extends EventEmitter {
     this._impl.setExternalName(value);
   }
 
+  //---------------------------------------------------------------------------
+  // dbDomain (READONLY)
+  //
+  // Property for identifying the dbDomain of the Oracle Database.
+  //---------------------------------------------------------------------------
+  get dbDomain() {
+    return this._impl && this._impl.getDbDomain();
+  }
+
+  //---------------------------------------------------------------------------
+  // dbName (READONLY)
+  //
+  // Property for identifying the dbName of the Oracle Database.
+  //---------------------------------------------------------------------------
+  get dbName() {
+    return this._impl && this._impl.getDbName();
+  }
+
   //---------------------------------------------------------------------------
   // getDbObjectClass()
   //
@@ -1080,6 +1103,30 @@ class Connection extends EventEmitter {
       this._impl.isHealthy());
   }
 
+  //---------------------------------------------------------------------------
+  // maxOpenCursors
+  //
+  // Returns maximum number of cursors that can be opened in one session.
+  //---------------------------------------------------------------------------
+  get maxOpenCursors() {
+    return this._impl && this._impl.getMaxOpenCursors();
+  }
+
+  //---------------------------------------------------------------------------
+  // warning
+  //
+  // Returns warningInfo.
+  //---------------------------------------------------------------------------
+  get warning() {
+    let warning = this._impl.getWarning();
+    if (warning) {
+      // Make sure that warning code attribute is populated and ORA error
+      // is converted to NJS, if required
+      warning = errors.transformErr(warning);
+    }
+    return this._impl && warning;
+  }
+
   //---------------------------------------------------------------------------
   // module
   //
@@ -1117,6 +1164,25 @@ class Connection extends EventEmitter {
     return undefined;
   }
 
+  //---------------------------------------------------------------------------
+  // serviceName
+  //
+  // Returns the Oracle Database service name associated with the connection.
+  //---------------------------------------------------------------------------
+  get serviceName() {
+    return this._impl && this._impl.getServiceName();
+  }
+
+  //---------------------------------------------------------------------------
+  // transactionInProgress
+  //
+  // Returns a boolean value based on the presence of an active transaction
+  // on the connection
+  //---------------------------------------------------------------------------
+  get transactionInProgress() {
+    return this._impl && this._impl.getTransactionInProgress();
+  }
+
   //---------------------------------------------------------------------------
   // ping()
   //

package/lib/errors.js

@@ -136,6 +136,8 @@ const ERR_WRONG_VALUE_FOR_DBOBJECT_ELEM = 135;
 const ERR_WRONG_CRED_FOR_EXTAUTH = 136;
 const ERR_MISSING_BIND_VALUE = 137;
 const ERR_SERVER_VERSION_NOT_SUPPORTED = 138;
+const ERR_UNEXPECTED_XML_TYPE = 139;
+const ERR_WRONG_USER_FORMAT_EXTAUTH_PROXY = 140;
 
 // Oracle Net layer errors start from 500
 const ERR_CONNECTION_CLOSED = 500;
@@ -160,6 +162,9 @@ const ERR_INVALID_SID = 519;
 const ERR_TNS_NAMES_FILE_MISSING = 520;
 const ERR_CONNECTION_EOF = 521;
 
+// Oracle SUCCESS_WITH_INFO warning start from 700
+const WRN_COMPILATION_CREATE = 700;
+
 // define mapping for ODPI-C, OCI & ORA errors that need to be wrapped
 // with NJS errors
 const adjustErrorXref = new Map();
@@ -178,6 +183,7 @@ adjustErrorXref.set("ORA-00028", ERR_CONNECTION_CLOSED);
 adjustErrorXref.set("ORA-00600", ERR_CONNECTION_CLOSED);
 adjustErrorXref.set("ORA-24338", ERR_INVALID_REF_CURSOR);
 adjustErrorXref.set("ORA-25708", ERR_TOKEN_HAS_EXPIRED);
+adjustErrorXref.set("ORA-24344", WRN_COMPILATION_CREATE);
 
 // define mapping for error messages
 const messages = new Map();
@@ -393,6 +399,10 @@ messages.set(ERR_MISSING_BIND_VALUE,                    // NJS-137
   'a bind variable replacement value for placeholder ":%s" was not provided');
 messages.set(ERR_SERVER_VERSION_NOT_SUPPORTED,          // NJS-138
   'connections to this database server version are not supported by node-oracledb in Thin mode');
+messages.set(ERR_UNEXPECTED_XML_TYPE,                   // NJS-139
+  'unexpected XML type with flag %d');
+messages.set(ERR_WRONG_USER_FORMAT_EXTAUTH_PROXY,       // NJS-140
+  'user name must be enclosed in [] when using external authentication with a proxy user');
 
 // Oracle Net layer errors
 
@@ -439,6 +449,11 @@ messages.set(ERR_TNS_NAMES_FILE_MISSING,                // NJS-520
 messages.set(ERR_CONNECTION_EOF,                        // NJS-521
   'connection to host %s port %d received end-of-file on communication channel. (CONNECTION_ID=%s)');
 
+// Oracle SUCCESS_WITH_INFO warning
+
+messages.set(WRN_COMPILATION_CREATE,                           // NJS-700
+  'creation succeeded with compilation errors');
+
 //-----------------------------------------------------------------------------
 // assert()
 //
@@ -772,7 +787,10 @@ module.exports = {
   ERR_WRONG_CRED_FOR_EXTAUTH,
   ERR_MISSING_BIND_VALUE,
   ERR_SERVER_VERSION_NOT_SUPPORTED,
+  ERR_UNEXPECTED_XML_TYPE,
+  ERR_WRONG_USER_FORMAT_EXTAUTH_PROXY,
   ERR_CONNECTION_CLOSED_CODE: `${ERR_PREFIX}-${ERR_CONNECTION_CLOSED}`,
+  WRN_COMPILATION_CREATE,
   assert,
   assertArgCount,
   assertParamPropBool,

package/lib/future.js

@@ -0,0 +1,53 @@
+// Copyright (c) 2023, Oracle and/or its affiliates.
+
+//-----------------------------------------------------------------------------
+//
+// 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
+//
+//    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.
+//
+//-----------------------------------------------------------------------------
+
+'use strict';
+
+const errors = require('./errors.js');
+
+// future object used for managing backwards incompatible changes.
+class Future {
+
+  constructor() {
+    this._featureFlags = {};
+    this._featureFlags.oldJsonColumnAsObj = false;
+  }
+
+  get oldJsonColumnAsObj() {
+    return this._featureFlags.oldJsonColumnAsObj;
+  }
+
+  // fetch VARCHAR2 and LOB columns that contain JSON data (and have
+  // the "IS JSON" constraint enabled) in the same way that columns
+  // of type JSON (which requires Oracle Database 21 and higher) are fetched.
+  set oldJsonColumnAsObj(value) {
+    errors.assertPropValue(typeof value === 'boolean', "oldJsonColumnAsObj");
+    this._featureFlags.oldJsonColumnAsObj = value;
+  }
+
+}
+
+module.exports = new Future;

package/lib/impl/connection.js

@@ -208,6 +208,24 @@ class ConnectionImpl {
     errors.throwNotImplemented("getting current schema");
   }
 
+  //---------------------------------------------------------------------------
+  // getDbDomain()
+  //
+  // Returns the Oracle Database domain name associated with the connection.
+  //---------------------------------------------------------------------------
+  getDbDomain() {
+    errors.throwNotImplemented("getting db domain");
+  }
+
+  //---------------------------------------------------------------------------
+  // getDbName()
+  //
+  // Returns the Oracle Database name associated with the connection.
+  //---------------------------------------------------------------------------
+  getDbName() {
+    errors.throwNotImplemented("getting db name");
+  }
+
   //---------------------------------------------------------------------------
   // getDbObjectClass()
   //
@@ -244,6 +262,15 @@ class ConnectionImpl {
     errors.throwNotImplemented("getting the internal name");
   }
 
+  //---------------------------------------------------------------------------
+  // getMaxOpenCursors()
+  //
+  // Returns maximum number of cursors that can be opened in one session.
+  //---------------------------------------------------------------------------
+  getMaxOpenCursors() {
+    errors.throwNotImplemented("getting max open cursors");
+  }
+
   //---------------------------------------------------------------------------
   // getOracleServerVersion()
   //
@@ -271,6 +298,15 @@ class ConnectionImpl {
     errors.throwNotImplemented("getting a queue");
   }
 
+  //---------------------------------------------------------------------------
+  // getServiceName()
+  //
+  // Returns the Oracle Database service name associated with the connection.
+  //---------------------------------------------------------------------------
+  getServiceName() {
+    errors.throwNotImplemented("getting service name");
+  }
+
   //---------------------------------------------------------------------------
   // getSodaDatabase()
   //
@@ -307,6 +343,26 @@ class ConnectionImpl {
     errors.throwNotImplemented("getting the tag for the connection");
   }
 
+  //---------------------------------------------------------------------------
+  // getTransactionInProgress()
+  //
+  // Returns boolean based on the presence of an active transaction on the
+  // connection
+  //---------------------------------------------------------------------------
+  getTransactionInProgress() {
+    errors.throwNotImplemented("getting the status of an active transaction" +
+      " on the connection");
+  }
+
+  //---------------------------------------------------------------------------
+  // getWarning()
+  //
+  // Returns a warning on a connection
+  //---------------------------------------------------------------------------
+  getWarning() {
+    errors.throwNotImplemented("getting information about warning");
+  }
+
   //---------------------------------------------------------------------------
   // isHealthy()
   //

package/lib/impl/pool.js

@@ -37,10 +37,10 @@ class PoolImpl {
   // Access token handler callback function which wraps the user callback and
   // returns the token to the implementation.
   //---------------------------------------------------------------------------
-  async _accessTokenHandler(userFn, externalObj, refresh) {
+  async _accessTokenHandler(userFn, externalObj, refresh, accessTokenConfig) {
     let accessToken;
     try {
-      let result = userFn(refresh);
+      let result = userFn(refresh, accessTokenConfig);
       if (result instanceof Promise) {
         result = await result;
       }
@@ -48,7 +48,9 @@ class PoolImpl {
       if (!nodbUtil.isTokenValid(result)) {
         errors.throwErr(errors.ERR_TOKEN_HAS_EXPIRED);
       }
-
+      if (typeof result === 'object' && result.privateKey !== undefined) {
+        result.privateKey = nodbUtil.denormalizePrivateKey(result.privateKey);
+      }
       accessToken = result;
     } finally {
       this.returnAccessToken(externalObj, accessToken);

package/lib/impl/resultset.js

@@ -30,7 +30,9 @@ const constants = require('../constants.js');
 const errors = require('../errors.js');
 const nodbUtil = require('../util.js');
 const settings = require('../settings.js');
+const future = require('../future.js');
 const types = require('../types.js');
+const Lob = require('../lob.js');
 
 // define implementation class
 class ResultSetImpl {
@@ -100,36 +102,71 @@ class ResultSetImpl {
       metadata.fetchType = actualFetchType;
     }
 
+    let converter;
+    const userConverter = metadata.converter;
+
+    // If IsJson is set convert to JSON objects unless
+    // user defined output type handler overwrites it.
+    if (future.oldJsonColumnAsObj && metadata.isJson && metadata.dbType !== types.DB_TYPE_JSON
+      && userConverter === undefined) {
+      const outConverter = async function(val) {
+        if (!val) {
+          return val;
+        }
+
+        let result = val;
+        if (val instanceof Lob) {
+          result = await val.getData();
+        }
+        if (result instanceof Buffer) {
+          result = result.toString();
+        }
+        result = JSON.parse(result);
+        return result;
+      };
+      converter = outConverter;
+    }
+
     // in thin mode, Oracle NUMBER values are internally fetched as string in
     // order to preserve precision so must be converted to JavaScript Number
     // when needed; other numeric and date types are fetched natively as
     // JavaScript Number and Date values and are converted to string using
     // toString() when desired
     if (settings.thin) {
-      let converter;
-      const userConverter = metadata.converter;
       if (metadata.dbType === types.DB_TYPE_NUMBER &&
-          metadata.fetchType === types.DB_TYPE_NUMBER) {
+        metadata.fetchType === types.DB_TYPE_NUMBER) {
         converter = (v) => (v === null) ? null : parseFloat(v);
       } else if (metadata.fetchType === types.DB_TYPE_VARCHAR) {
         if (metadata.dbType === types.DB_TYPE_BINARY_DOUBLE ||
-           metadata.dbType === types.DB_TYPE_BINARY_FLOAT ||
-           metadata.dbType === types.DB_TYPE_DATE ||
-           metadata.dbType === types.DB_TYPE_TIMESTAMP ||
-           metadata.dbType === types.DB_TYPE_TIMESTAMP_LTZ ||
-           metadata.dbType === types.DB_TYPE_TIMESTAMP_TZ) {
+          metadata.dbType === types.DB_TYPE_BINARY_FLOAT ||
+          metadata.dbType === types.DB_TYPE_DATE ||
+          metadata.dbType === types.DB_TYPE_TIMESTAMP ||
+          metadata.dbType === types.DB_TYPE_TIMESTAMP_LTZ ||
+          metadata.dbType === types.DB_TYPE_TIMESTAMP_TZ) {
           converter = (v) => (v === null) ? null : v.toString();
         } else if (metadata.dbType === types.DB_TYPE_RAW) {
           converter = (v) => (v === null) ? null : v.toString('hex').toUpperCase();
         }
+      } else if (metadata.dbType === types.DB_TYPE_XMLTYPE) {
+        const xmlConverter = async function(val) {
+          if (!val) {
+            return val;
+          }
+          if (typeof val === 'string') {
+            return val;
+          }
+          return await val.getData();
+        };
+        converter = xmlConverter;
       }
       if (userConverter && converter) {
         const internalConverter = converter;
         converter = (v) => userConverter(internalConverter(v));
       }
-      if (converter) {
-        metadata.converter = converter;
-      }
+    }
+
+    if (converter) {
+      metadata.converter = converter;
     }
 
   }