knex 0.21.20 → 0.21.21

package/lib/dialects/oracledb/schema/columncompiler.js

@@ -1,35 +1,35 @@
-const { inherits } = require('util');
-const ColumnCompiler_Oracle = require('../../oracle/schema/columncompiler');
-const { isObject } = require('../../../util/is');
-
-function ColumnCompiler_Oracledb() {
-  ColumnCompiler_Oracle.apply(this, arguments);
-}
-
-inherits(ColumnCompiler_Oracledb, ColumnCompiler_Oracle);
-
-Object.assign(ColumnCompiler_Oracledb.prototype, {
-  time: 'timestamp with local time zone',
-
-  datetime: function (withoutTz) {
-    let useTz;
-    if (isObject(withoutTz)) {
-      ({ useTz } = withoutTz);
-    } else {
-      useTz = !withoutTz;
-    }
-    return useTz ? 'timestamp with local time zone' : 'timestamp';
-  },
-
-  timestamp: function (withoutTz) {
-    let useTz;
-    if (isObject(withoutTz)) {
-      ({ useTz } = withoutTz);
-    } else {
-      useTz = !withoutTz;
-    }
-    return useTz ? 'timestamp with local time zone' : 'timestamp';
-  },
-});
-
-module.exports = ColumnCompiler_Oracledb;
+const { inherits } = require('util');
+const ColumnCompiler_Oracle = require('../../oracle/schema/columncompiler');
+const { isObject } = require('../../../util/is');
+
+function ColumnCompiler_Oracledb() {
+  ColumnCompiler_Oracle.apply(this, arguments);
+}
+
+inherits(ColumnCompiler_Oracledb, ColumnCompiler_Oracle);
+
+Object.assign(ColumnCompiler_Oracledb.prototype, {
+  time: 'timestamp with local time zone',
+
+  datetime: function (withoutTz) {
+    let useTz;
+    if (isObject(withoutTz)) {
+      ({ useTz } = withoutTz);
+    } else {
+      useTz = !withoutTz;
+    }
+    return useTz ? 'timestamp with local time zone' : 'timestamp';
+  },
+
+  timestamp: function (withoutTz) {
+    let useTz;
+    if (isObject(withoutTz)) {
+      ({ useTz } = withoutTz);
+    } else {
+      useTz = !withoutTz;
+    }
+    return useTz ? 'timestamp with local time zone' : 'timestamp';
+  },
+});
+
+module.exports = ColumnCompiler_Oracledb;

package/lib/dialects/oracledb/transaction.js

@@ -1,76 +1,76 @@
-const Transaction = require('../../transaction');
-const { timeout, KnexTimeoutError } = require('../../util/timeout');
-const debugTx = require('debug')('knex:tx');
-
-module.exports = class Oracle_Transaction extends Transaction {
-  // disable autocommit to allow correct behavior (default is true)
-  begin() {
-    return Promise.resolve();
-  }
-
-  async commit(conn, value) {
-    this._completed = true;
-    try {
-      await conn.commitAsync();
-      this._resolver(value);
-    } catch (err) {
-      this._rejecter(err);
-    }
-  }
-
-  release(conn, value) {
-    return this._resolver(value);
-  }
-
-  rollback(conn, err) {
-    this._completed = true;
-    debugTx('%s: rolling back', this.txid);
-    return timeout(conn.rollbackAsync(), 5000)
-      .catch((e) => {
-        if (!(e instanceof KnexTimeoutError)) {
-          return Promise.reject(e);
-        }
-        this._rejecter(e);
-      })
-      .then(() => {
-        if (err === undefined) {
-          if (this.doNotRejectOnRollback) {
-            this._resolver();
-            return;
-          }
-          err = new Error(`Transaction rejected with non-error: ${err}`);
-        }
-        this._rejecter(err);
-      });
-  }
-
-  savepoint(conn) {
-    return this.query(conn, `SAVEPOINT ${this.txid}`);
-  }
-
-  async acquireConnection(config, cb) {
-    const configConnection = config && config.connection;
-
-    const connection =
-      configConnection || (await this.client.acquireConnection());
-    try {
-      connection.__knexTxId = this.txid;
-      connection.isTransaction = true;
-      return await cb(connection);
-    } finally {
-      debugTx('%s: releasing connection', this.txid);
-      connection.isTransaction = false;
-      try {
-        await connection.commitAsync();
-      } catch (err) {
-        this._rejecter(err);
-      } finally {
-        if (!configConnection) {
-          await this.client.releaseConnection(connection);
-        } else {
-          debugTx('%s: not releasing external connection', this.txid);
-        }
-      }
-    }
-  }
-};
+const Transaction = require('../../transaction');
+const { timeout, KnexTimeoutError } = require('../../util/timeout');
+const debugTx = require('debug')('knex:tx');
+
+module.exports = class Oracle_Transaction extends Transaction {
+  // disable autocommit to allow correct behavior (default is true)
+  begin() {
+    return Promise.resolve();
+  }
+
+  async commit(conn, value) {
+    this._completed = true;
+    try {
+      await conn.commitAsync();
+      this._resolver(value);
+    } catch (err) {
+      this._rejecter(err);
+    }
+  }
+
+  release(conn, value) {
+    return this._resolver(value);
+  }
+
+  rollback(conn, err) {
+    this._completed = true;
+    debugTx('%s: rolling back', this.txid);
+    return timeout(conn.rollbackAsync(), 5000)
+      .catch((e) => {
+        if (!(e instanceof KnexTimeoutError)) {
+          return Promise.reject(e);
+        }
+        this._rejecter(e);
+      })
+      .then(() => {
+        if (err === undefined) {
+          if (this.doNotRejectOnRollback) {
+            this._resolver();
+            return;
+          }
+          err = new Error(`Transaction rejected with non-error: ${err}`);
+        }
+        this._rejecter(err);
+      });
+  }
+
+  savepoint(conn) {
+    return this.query(conn, `SAVEPOINT ${this.txid}`);
+  }
+
+  async acquireConnection(config, cb) {
+    const configConnection = config && config.connection;
+
+    const connection =
+      configConnection || (await this.client.acquireConnection());
+    try {
+      connection.__knexTxId = this.txid;
+      connection.isTransaction = true;
+      return await cb(connection);
+    } finally {
+      debugTx('%s: releasing connection', this.txid);
+      connection.isTransaction = false;
+      try {
+        await connection.commitAsync();
+      } catch (err) {
+        this._rejecter(err);
+      } finally {
+        if (!configConnection) {
+          await this.client.releaseConnection(connection);
+        } else {
+          debugTx('%s: not releasing external connection', this.txid);
+        }
+      }
+    }
+  }
+};

package/lib/dialects/oracledb/utils.js

@@ -1,14 +1,14 @@
-const Utils = require('../oracle/utils');
-
-function BlobHelper(columnName, value) {
-  this.columnName = columnName;
-  this.value = value;
-  this.returning = false;
-}
-
-BlobHelper.prototype.toString = function () {
-  return '[object BlobHelper:' + this.columnName + ']';
-};
-
-Utils.BlobHelper = BlobHelper;
-module.exports = Utils;
+const Utils = require('../oracle/utils');
+
+function BlobHelper(columnName, value) {
+  this.columnName = columnName;
+  this.value = value;
+  this.returning = false;
+}
+
+BlobHelper.prototype.toString = function () {
+  return '[object BlobHelper:' + this.columnName + ']';
+};
+
+Utils.BlobHelper = BlobHelper;
+module.exports = Utils;