knex 2.4.2 → 2.5.0

package/lib/dialects/mysql/schema/mysql-viewbuilder.js

@@ -1,21 +1,21 @@
-const ViewBuilder = require('../../../schema/viewbuilder.js');
-
-class ViewBuilder_MySQL extends ViewBuilder {
-  constructor() {
-    super(...arguments);
-  }
-
-  checkOption() {
-    this._single.checkOption = 'default_option';
-  }
-
-  localCheckOption() {
-    this._single.checkOption = 'local';
-  }
-
-  cascadedCheckOption() {
-    this._single.checkOption = 'cascaded';
-  }
-}
-
-module.exports = ViewBuilder_MySQL;
+const ViewBuilder = require('../../../schema/viewbuilder.js');
+
+class ViewBuilder_MySQL extends ViewBuilder {
+  constructor() {
+    super(...arguments);
+  }
+
+  checkOption() {
+    this._single.checkOption = 'default_option';
+  }
+
+  localCheckOption() {
+    this._single.checkOption = 'local';
+  }
+
+  cascadedCheckOption() {
+    this._single.checkOption = 'cascaded';
+  }
+}
+
+module.exports = ViewBuilder_MySQL;

package/lib/dialects/mysql/schema/mysql-viewcompiler.js

@@ -1,15 +1,15 @@
-/* eslint max-len: 0 */
-
-const ViewCompiler = require('../../../schema/viewcompiler.js');
-
-class ViewCompiler_MySQL extends ViewCompiler {
-  constructor(client, viewCompiler) {
-    super(client, viewCompiler);
-  }
-
-  createOrReplace() {
-    this.createQuery(this.columns, this.selectQuery, false, true);
-  }
-}
-
-module.exports = ViewCompiler_MySQL;
+/* eslint max-len: 0 */
+
+const ViewCompiler = require('../../../schema/viewcompiler.js');
+
+class ViewCompiler_MySQL extends ViewCompiler {
+  constructor(client, viewCompiler) {
+    super(client, viewCompiler);
+  }
+
+  createOrReplace() {
+    this.createQuery(this.columns, this.selectQuery, false, true);
+  }
+}
+
+module.exports = ViewCompiler_MySQL;

package/lib/dialects/mysql/transaction.js

@@ -1,46 +1,46 @@
-const Transaction = require('../../execution/transaction');
-const Debug = require('debug');
-
-const debug = Debug('knex:tx');
-
-class Transaction_MySQL extends Transaction {
-  query(conn, sql, status, value) {
-    const t = this;
-    const q = this.trxClient
-      .query(conn, sql)
-      .catch((err) => {
-        if (err.errno === 1305) {
-          this.trxClient.logger.warn(
-            'Transaction was implicitly committed, do not mix transactions and ' +
-              'DDL with MySQL (#805)'
-          );
-          return;
-        }
-
-        status = 2;
-        value = err;
-        t._completed = true;
-        debug('%s error running transaction query', t.txid);
-      })
-      .then(function (res) {
-        if (status === 1) t._resolver(value);
-        if (status === 2) {
-          if (value === undefined) {
-            if (t.doNotRejectOnRollback && /^ROLLBACK\b/i.test(sql)) {
-              t._resolver();
-              return;
-            }
-            value = new Error(`Transaction rejected with non-error: ${value}`);
-          }
-          t._rejecter(value);
-        }
-        return res;
-      });
-    if (status === 1 || status === 2) {
-      t._completed = true;
-    }
-    return q;
-  }
-}
-
-module.exports = Transaction_MySQL;
+const Transaction = require('../../execution/transaction');
+const Debug = require('debug');
+
+const debug = Debug('knex:tx');
+
+class Transaction_MySQL extends Transaction {
+  query(conn, sql, status, value) {
+    const t = this;
+    const q = this.trxClient
+      .query(conn, sql)
+      .catch((err) => {
+        if (err.errno === 1305) {
+          this.trxClient.logger.warn(
+            'Transaction was implicitly committed, do not mix transactions and ' +
+              'DDL with MySQL (#805)'
+          );
+          return;
+        }
+
+        status = 2;
+        value = err;
+        t._completed = true;
+        debug('%s error running transaction query', t.txid);
+      })
+      .then(function (res) {
+        if (status === 1) t._resolver(value);
+        if (status === 2) {
+          if (value === undefined) {
+            if (t.doNotRejectOnRollback && /^ROLLBACK\b/i.test(sql)) {
+              t._resolver();
+              return;
+            }
+            value = new Error(`Transaction rejected with non-error: ${value}`);
+          }
+          t._rejecter(value);
+        }
+        return res;
+      });
+    if (status === 1 || status === 2) {
+      t._completed = true;
+    }
+    return q;
+  }
+}
+
+module.exports = Transaction_MySQL;

package/lib/dialects/mysql2/index.js

@@ -1,33 +1,53 @@
-// MySQL2 Client
-// -------
-const Client_MySQL = require('../mysql');
-const Transaction = require('./transaction');
-
-// Always initialize with the "QueryBuilder" and "QueryCompiler"
-// objects, which extend the base 'lib/query/builder' and
-// 'lib/query/compiler', respectively.
-class Client_MySQL2 extends Client_MySQL {
-  transaction() {
-    return new Transaction(this, ...arguments);
-  }
-
-  _driver() {
-    return require('mysql2');
-  }
-  validateConnection(connection) {
-    return (
-      connection &&
-      !connection._fatalError &&
-      !connection._protocolError &&
-      !connection._closing &&
-      !connection.stream.destroyed
-    );
-  }
-}
-
-Object.assign(Client_MySQL2.prototype, {
-  // The "dialect", for reference elsewhere.
-  driverName: 'mysql2',
-});
-
-module.exports = Client_MySQL2;
+// MySQL2 Client
+// -------
+const Client_MySQL = require('../mysql');
+const Transaction = require('./transaction');
+
+// Always initialize with the "QueryBuilder" and "QueryCompiler"
+// objects, which extend the base 'lib/query/builder' and
+// 'lib/query/compiler', respectively.
+class Client_MySQL2 extends Client_MySQL {
+  transaction() {
+    return new Transaction(this, ...arguments);
+  }
+
+  _driver() {
+    return require('mysql2');
+  }
+
+  initializeDriver() {
+    try {
+      this.driver = this._driver();
+    } catch (e) {
+      let message = `Knex: run\n$ npm install ${this.driverName}`;
+
+      const nodeMajorVersion = process.version.replace(/^v/, '').split('.')[0];
+      if (nodeMajorVersion <= 12) {
+        message += `@3.2.0`;
+        this.logger.error(
+          'Mysql2 version 3.2.0 is the latest version to support Node.js 12 or lower.'
+        );
+      }
+      message += ` --save`;
+      this.logger.error(`${message}\n${e.message}\n${e.stack}`);
+      throw new Error(`${message}\n${e.message}`);
+    }
+  }
+
+  validateConnection(connection) {
+    return (
+      connection &&
+      !connection._fatalError &&
+      !connection._protocolError &&
+      !connection._closing &&
+      !connection.stream.destroyed
+    );
+  }
+}
+
+Object.assign(Client_MySQL2.prototype, {
+  // The "dialect", for reference elsewhere.
+  driverName: 'mysql2',
+});
+
+module.exports = Client_MySQL2;

package/lib/dialects/mysql2/transaction.js

@@ -1,44 +1,44 @@
-const Transaction = require('../../execution/transaction');
-const debug = require('debug')('knex:tx');
-
-class Transaction_MySQL2 extends Transaction {
-  query(conn, sql, status, value) {
-    const t = this;
-    const q = this.trxClient
-      .query(conn, sql)
-      .catch((err) => {
-        if (err.code === 'ER_SP_DOES_NOT_EXIST') {
-          this.trxClient.logger.warn(
-            'Transaction was implicitly committed, do not mix transactions and ' +
-              'DDL with MySQL (#805)'
-          );
-          return;
-        }
-
-        status = 2;
-        value = err;
-        t._completed = true;
-        debug('%s error running transaction query', t.txid);
-      })
-      .then(function (res) {
-        if (status === 1) t._resolver(value);
-        if (status === 2) {
-          if (value === undefined) {
-            if (t.doNotRejectOnRollback && /^ROLLBACK\b/i.test(sql)) {
-              t._resolver();
-              return;
-            }
-            value = new Error(`Transaction rejected with non-error: ${value}`);
-          }
-          t._rejecter(value);
-          return res;
-        }
-      });
-    if (status === 1 || status === 2) {
-      t._completed = true;
-    }
-    return q;
-  }
-}
-
-module.exports = Transaction_MySQL2;
+const Transaction = require('../../execution/transaction');
+const debug = require('debug')('knex:tx');
+
+class Transaction_MySQL2 extends Transaction {
+  query(conn, sql, status, value) {
+    const t = this;
+    const q = this.trxClient
+      .query(conn, sql)
+      .catch((err) => {
+        if (err.code === 'ER_SP_DOES_NOT_EXIST') {
+          this.trxClient.logger.warn(
+            'Transaction was implicitly committed, do not mix transactions and ' +
+              'DDL with MySQL (#805)'
+          );
+          return;
+        }
+
+        status = 2;
+        value = err;
+        t._completed = true;
+        debug('%s error running transaction query', t.txid);
+      })
+      .then(function (res) {
+        if (status === 1) t._resolver(value);
+        if (status === 2) {
+          if (value === undefined) {
+            if (t.doNotRejectOnRollback && /^ROLLBACK\b/i.test(sql)) {
+              t._resolver();
+              return;
+            }
+            value = new Error(`Transaction rejected with non-error: ${value}`);
+          }
+          t._rejecter(value);
+          return res;
+        }
+      });
+    if (status === 1 || status === 2) {
+      t._completed = true;
+    }
+    return q;
+  }
+}
+
+module.exports = Transaction_MySQL2;

package/lib/dialects/oracle/DEAD_CODE.md

@@ -1,5 +1,5 @@
-# Warning: Dead Code #
-
-The `oracle` dialect is mostly dead code at this point.  However, a handful of its methods are still referenced by the `oracledb` dialect.  So, we are in the process of migrating those methods over to the `oracledb` dialect where they belong.  Once that task is completed, we will officially remove the `oracle` dialect.
-
-In short: do not use the `oracle` dialect.  Use the `oracledb` dialect instead.
+# Warning: Dead Code #
+
+The `oracle` dialect is mostly dead code at this point.  However, a handful of its methods are still referenced by the `oracledb` dialect.  So, we are in the process of migrating those methods over to the `oracledb` dialect where they belong.  Once that task is completed, we will officially remove the `oracle` dialect.
+
+In short: do not use the `oracle` dialect.  Use the `oracledb` dialect instead.

package/lib/dialects/oracle/index.js

@@ -1,92 +1,92 @@
-// Oracle Client
-// -------
-const { ReturningHelper } = require('./utils');
-const { isConnectionError } = require('./utils');
-const Client = require('../../client');
-const SchemaCompiler = require('./schema/oracle-compiler');
-const ColumnBuilder = require('./schema/oracle-columnbuilder');
-const ColumnCompiler = require('./schema/oracle-columncompiler');
-const TableCompiler = require('./schema/oracle-tablecompiler');
-
-// Always initialize with the "QueryBuilder" and "QueryCompiler"
-// objects, which extend the base 'lib/query/builder' and
-// 'lib/query/compiler', respectively.
-class Client_Oracle extends Client {
-  schemaCompiler() {
-    return new SchemaCompiler(this, ...arguments);
-  }
-
-  columnBuilder() {
-    return new ColumnBuilder(this, ...arguments);
-  }
-
-  columnCompiler() {
-    return new ColumnCompiler(this, ...arguments);
-  }
-
-  tableCompiler() {
-    return new TableCompiler(this, ...arguments);
-  }
-
-  // Return the database for the Oracle client.
-  database() {
-    return this.connectionSettings.database;
-  }
-
-  // Position the bindings for the query.
-  positionBindings(sql) {
-    let questionCount = 0;
-    return sql.replace(/\?/g, function () {
-      questionCount += 1;
-      return `:${questionCount}`;
-    });
-  }
-
-  _stream(connection, obj, stream, options) {
-    if (!obj.sql) throw new Error('The query is empty');
-
-    return new Promise(function (resolver, rejecter) {
-      stream.on('error', (err) => {
-        if (isConnectionError(err)) {
-          connection.__knex__disposed = err;
-        }
-        rejecter(err);
-      });
-      stream.on('end', resolver);
-      const queryStream = connection.queryStream(
-        obj.sql,
-        obj.bindings,
-        options
-      );
-      queryStream.pipe(stream);
-      queryStream.on('error', function (error) {
-        rejecter(error);
-        stream.emit('error', error);
-      });
-    });
-  }
-
-  // Formatter part
-
-  alias(first, second) {
-    return first + ' ' + second;
-  }
-
-  parameter(value, builder, formatter) {
-    // Returning helper uses always ROWID as string
-    if (value instanceof ReturningHelper && this.driver) {
-      value = new this.driver.OutParam(this.driver.OCCISTRING);
-    } else if (typeof value === 'boolean') {
-      value = value ? 1 : 0;
-    }
-    return super.parameter(value, builder, formatter);
-  }
-}
-
-Object.assign(Client_Oracle.prototype, {
-  dialect: 'oracle',
-
-  driverName: 'oracle',
-});
-
-module.exports = Client_Oracle;
+// Oracle Client
+// -------
+const { ReturningHelper } = require('./utils');
+const { isConnectionError } = require('./utils');
+const Client = require('../../client');
+const SchemaCompiler = require('./schema/oracle-compiler');
+const ColumnBuilder = require('./schema/oracle-columnbuilder');
+const ColumnCompiler = require('./schema/oracle-columncompiler');
+const TableCompiler = require('./schema/oracle-tablecompiler');
+
+// Always initialize with the "QueryBuilder" and "QueryCompiler"
+// objects, which extend the base 'lib/query/builder' and
+// 'lib/query/compiler', respectively.
+class Client_Oracle extends Client {
+  schemaCompiler() {
+    return new SchemaCompiler(this, ...arguments);
+  }
+
+  columnBuilder() {
+    return new ColumnBuilder(this, ...arguments);
+  }
+
+  columnCompiler() {
+    return new ColumnCompiler(this, ...arguments);
+  }
+
+  tableCompiler() {
+    return new TableCompiler(this, ...arguments);
+  }
+
+  // Return the database for the Oracle client.
+  database() {
+    return this.connectionSettings.database;
+  }
+
+  // Position the bindings for the query.
+  positionBindings(sql) {
+    let questionCount = 0;
+    return sql.replace(/\?/g, function () {
+      questionCount += 1;
+      return `:${questionCount}`;
+    });
+  }
+
+  _stream(connection, obj, stream, options) {
+    if (!obj.sql) throw new Error('The query is empty');
+
+    return new Promise(function (resolver, rejecter) {
+      stream.on('error', (err) => {
+        if (isConnectionError(err)) {
+          connection.__knex__disposed = err;
+        }
+        rejecter(err);
+      });
+      stream.on('end', resolver);
+      const queryStream = connection.queryStream(
+        obj.sql,
+        obj.bindings,
+        options
+      );
+      queryStream.pipe(stream);
+      queryStream.on('error', function (error) {
+        rejecter(error);
+        stream.emit('error', error);
+      });
+    });
+  }
+
+  // Formatter part
+
+  alias(first, second) {
+    return first + ' ' + second;
+  }
+
+  parameter(value, builder, formatter) {
+    // Returning helper uses always ROWID as string
+    if (value instanceof ReturningHelper && this.driver) {
+      value = new this.driver.OutParam(this.driver.OCCISTRING);
+    } else if (typeof value === 'boolean') {
+      value = value ? 1 : 0;
+    }
+    return super.parameter(value, builder, formatter);
+  }
+}
+
+Object.assign(Client_Oracle.prototype, {
+  dialect: 'oracle',
+
+  driverName: 'oracle',
+});
+
+module.exports = Client_Oracle;