knex 3.1.0 → 3.2.1

package/lib/dialects/cockroachdb/crdb-tablecompiler.js

@@ -1,37 +1,46 @@
-/* eslint max-len: 0 */
-
-const TableCompiler = require('../postgres/schema/pg-tablecompiler');
-
-class TableCompiler_CRDB extends TableCompiler {
-  constructor(client, tableBuilder) {
-    super(client, tableBuilder);
-  }
-
-  addColumns(columns, prefix, colCompilers) {
-    if (prefix === this.alterColumnsPrefix) {
-      // alter columns
-      for (const col of colCompilers) {
-        this.client.logger.warn(
-          'Experimental alter column in use, see issue: https://github.com/cockroachdb/cockroach/issues/49329'
-        );
-        this.pushQuery({
-          sql: 'SET enable_experimental_alter_column_type_general = true',
-          bindings: [],
-        });
-        super._addColumn(col);
-      }
-    } else {
-      // base class implementation for normal add
-      super.addColumns(columns, prefix);
-    }
-  }
-
-  dropUnique(columns, indexName) {
-    indexName = indexName
-      ? this.formatter.wrap(indexName)
-      : this._indexCommand('unique', this.tableNameRaw, columns);
-    this.pushQuery(`drop index ${this.tableName()}@${indexName} cascade `);
-  }
-}
-
-module.exports = TableCompiler_CRDB;
+/* eslint max-len: 0 */
+
+const TableCompiler = require('../postgres/schema/pg-tablecompiler');
+
+class TableCompiler_CRDB extends TableCompiler {
+  constructor(client, tableBuilder) {
+    super(client, tableBuilder);
+  }
+
+  addColumns(columns, prefix, colCompilers) {
+    if (prefix === this.alterColumnsPrefix) {
+      // alter columns
+      for (const col of colCompilers) {
+        this.client.logger.warn(
+          'Experimental alter column in use, see issue: https://github.com/cockroachdb/cockroach/issues/49329'
+        );
+        this.pushQuery({
+          sql: 'SET enable_experimental_alter_column_type_general = true',
+          bindings: [],
+        });
+        super._addColumn(col);
+      }
+    } else {
+      // base class implementation for normal add
+      super.addColumns(columns, prefix);
+    }
+  }
+
+  dropUnique(columns, indexName) {
+    indexName = indexName
+      ? this.formatter.wrap(indexName)
+      : this._indexCommand('unique', this.tableNameRaw, columns);
+    this.pushQuery(`drop index ${this.tableName()}@${indexName} cascade`);
+  }
+
+  dropUniqueIfExists(columns, indexName) {
+    indexName = indexName
+      ? this.formatter.wrap(indexName)
+      : this._indexCommand('unique', this.tableNameRaw, columns);
+    this.pushQuery(
+      `drop index if exists ${this.tableName()}@${indexName} cascade`
+    );
+  }
+}
+
+module.exports = TableCompiler_CRDB;

package/lib/dialects/cockroachdb/crdb-viewcompiler.js

@@ -1,15 +1,15 @@
-const ViewCompiler_PG = require('../postgres/schema/pg-viewcompiler.js');
-
-class ViewCompiler_CRDB extends ViewCompiler_PG {
-  renameColumn(from, to) {
-    throw new Error('rename column of views is not supported by this dialect.');
-  }
-
-  defaultTo(column, defaultValue) {
-    throw new Error(
-      'change default values of views is not supported by this dialect.'
-    );
-  }
-}
-
-module.exports = ViewCompiler_CRDB;
+const ViewCompiler_PG = require('../postgres/schema/pg-viewcompiler.js');
+
+class ViewCompiler_CRDB extends ViewCompiler_PG {
+  renameColumn(from, to) {
+    throw new Error('rename column of views is not supported by this dialect.');
+  }
+
+  defaultTo(column, defaultValue) {
+    throw new Error(
+      'change default values of views is not supported by this dialect.'
+    );
+  }
+}
+
+module.exports = ViewCompiler_CRDB;

package/lib/dialects/cockroachdb/index.js

@@ -1,86 +1,86 @@
-// CockroachDB Client
-// -------
-const Client_PostgreSQL = require('../postgres');
-const Transaction = require('../postgres/execution/pg-transaction');
-const QueryCompiler = require('./crdb-querycompiler');
-const ColumnCompiler = require('./crdb-columncompiler');
-const TableCompiler = require('./crdb-tablecompiler');
-const ViewCompiler = require('./crdb-viewcompiler');
-const QueryBuilder = require('./crdb-querybuilder');
-
-// Always initialize with the "QueryBuilder" and "QueryCompiler"
-// objects, which extend the base 'lib/query/builder' and
-// 'lib/query/compiler', respectively.
-class Client_CockroachDB extends Client_PostgreSQL {
-  transaction() {
-    return new Transaction(this, ...arguments);
-  }
-
-  queryCompiler(builder, formatter) {
-    return new QueryCompiler(this, builder, formatter);
-  }
-
-  columnCompiler() {
-    return new ColumnCompiler(this, ...arguments);
-  }
-
-  tableCompiler() {
-    return new TableCompiler(this, ...arguments);
-  }
-
-  viewCompiler() {
-    return new ViewCompiler(this, ...arguments);
-  }
-
-  queryBuilder() {
-    return new QueryBuilder(this);
-  }
-
-  _parseVersion(versionString) {
-    return versionString.split(' ')[2];
-  }
-
-  async cancelQuery(connectionToKill) {
-    try {
-      return await this._wrappedCancelQueryCall(null, connectionToKill);
-    } catch (err) {
-      this.logger.warn(`Connection Error: ${err}`);
-      throw err;
-    }
-  }
-
-  _wrappedCancelQueryCall(emptyConnection, connectionToKill) {
-    // FixMe https://github.com/cockroachdb/cockroach/issues/41335
-    if (
-      connectionToKill.activeQuery.processID === 0 &&
-      connectionToKill.activeQuery.secretKey === 0
-    ) {
-      return;
-    }
-
-    return connectionToKill.cancel(
-      connectionToKill,
-      connectionToKill.activeQuery
-    );
-  }
-
-  toArrayPathFromJsonPath(jsonPath, builder, bindingsHolder) {
-    return jsonPath
-      .replace(/^(\$\.)/, '') // remove the first dollar
-      .replace(/\[([0-9]+)]/, '.$1')
-      .split('.')
-      .map(
-        function (v) {
-          return this.parameter(v, builder, bindingsHolder);
-        }.bind(this)
-      )
-      .join(', ');
-  }
-}
-
-Object.assign(Client_CockroachDB.prototype, {
-  // The "dialect", for reference elsewhere.
-  driverName: 'cockroachdb',
-});
-
-module.exports = Client_CockroachDB;
+// CockroachDB Client
+// -------
+const Client_PostgreSQL = require('../postgres');
+const Transaction = require('../postgres/execution/pg-transaction');
+const QueryCompiler = require('./crdb-querycompiler');
+const ColumnCompiler = require('./crdb-columncompiler');
+const TableCompiler = require('./crdb-tablecompiler');
+const ViewCompiler = require('./crdb-viewcompiler');
+const QueryBuilder = require('./crdb-querybuilder');
+
+// Always initialize with the "QueryBuilder" and "QueryCompiler"
+// objects, which extend the base 'lib/query/builder' and
+// 'lib/query/compiler', respectively.
+class Client_CockroachDB extends Client_PostgreSQL {
+  transaction() {
+    return new Transaction(this, ...arguments);
+  }
+
+  queryCompiler(builder, formatter) {
+    return new QueryCompiler(this, builder, formatter);
+  }
+
+  columnCompiler() {
+    return new ColumnCompiler(this, ...arguments);
+  }
+
+  tableCompiler() {
+    return new TableCompiler(this, ...arguments);
+  }
+
+  viewCompiler() {
+    return new ViewCompiler(this, ...arguments);
+  }
+
+  queryBuilder() {
+    return new QueryBuilder(this);
+  }
+
+  _parseVersion(versionString) {
+    return versionString.split(' ')[2];
+  }
+
+  async cancelQuery(connectionToKill) {
+    try {
+      return await this._wrappedCancelQueryCall(null, connectionToKill);
+    } catch (err) {
+      this.logger.warn(`Connection Error: ${err}`);
+      throw err;
+    }
+  }
+
+  _wrappedCancelQueryCall(emptyConnection, connectionToKill) {
+    // FixMe https://github.com/cockroachdb/cockroach/issues/41335
+    if (
+      connectionToKill.activeQuery.processID === 0 &&
+      connectionToKill.activeQuery.secretKey === 0
+    ) {
+      return;
+    }
+
+    return connectionToKill.cancel(
+      connectionToKill,
+      connectionToKill.activeQuery
+    );
+  }
+
+  toArrayPathFromJsonPath(jsonPath, builder, bindingsHolder) {
+    return jsonPath
+      .replace(/^(\$\.)/, '') // remove the first dollar
+      .replace(/\[([0-9]+)]/, '.$1')
+      .split('.')
+      .map(
+        function (v) {
+          return this.parameter(v, builder, bindingsHolder);
+        }.bind(this)
+      )
+      .join(', ');
+  }
+}
+
+Object.assign(Client_CockroachDB.prototype, {
+  // The "dialect", for reference elsewhere.
+  driverName: 'cockroachdb',
+});
+
+module.exports = Client_CockroachDB;

package/lib/dialects/index.js

@@ -1,34 +1,34 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-exports.getDialectByNameOrAlias = void 0;
-const { resolveClientNameWithAliases } = require('../util/helpers');
-const dbNameToDialectLoader = Object.freeze({
-  'better-sqlite3': () => require('./better-sqlite3'),
-  cockroachdb: () => require('./cockroachdb'),
-  mssql: () => require('./mssql'),
-  mysql: () => require('./mysql'),
-  mysql2: () => require('./mysql2'),
-  oracle: () => require('./oracle'),
-  oracledb: () => require('./oracledb'),
-  pgnative: () => require('./pgnative'),
-  postgres: () => require('./postgres'),
-  redshift: () => require('./redshift'),
-  sqlite3: () => require('./sqlite3'),
-});
-/**
- * Gets the Dialect object with the given client name or throw an
- * error if not found.
- *
- * NOTE: This is a replacement for prior practice of doing dynamic
- * string construction for imports of Dialect objects.
- */
-function getDialectByNameOrAlias(clientName) {
-  const resolvedClientName = resolveClientNameWithAliases(clientName);
-  const dialectLoader = dbNameToDialectLoader[resolvedClientName];
-  if (!dialectLoader) {
-    throw new Error(`Invalid clientName given: ${clientName}`);
-  }
-  return dialectLoader();
-}
-exports.getDialectByNameOrAlias = getDialectByNameOrAlias;
-//# sourceMappingURL=index.js.map
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.getDialectByNameOrAlias = void 0;
+const { resolveClientNameWithAliases } = require('../util/helpers');
+const dbNameToDialectLoader = Object.freeze({
+  'better-sqlite3': () => require('./better-sqlite3'),
+  cockroachdb: () => require('./cockroachdb'),
+  mssql: () => require('./mssql'),
+  mysql: () => require('./mysql'),
+  mysql2: () => require('./mysql2'),
+  oracle: () => require('./oracle'),
+  oracledb: () => require('./oracledb'),
+  pgnative: () => require('./pgnative'),
+  postgres: () => require('./postgres'),
+  redshift: () => require('./redshift'),
+  sqlite3: () => require('./sqlite3'),
+});
+/**
+ * Gets the Dialect object with the given client name or throw an
+ * error if not found.
+ *
+ * NOTE: This is a replacement for prior practice of doing dynamic
+ * string construction for imports of Dialect objects.
+ */
+function getDialectByNameOrAlias(clientName) {
+  const resolvedClientName = resolveClientNameWithAliases(clientName);
+  const dialectLoader = dbNameToDialectLoader[resolvedClientName];
+  if (!dialectLoader) {
+    throw new Error(`Invalid clientName given: ${clientName}`);
+  }
+  return dialectLoader();
+}
+exports.getDialectByNameOrAlias = getDialectByNameOrAlias;
+//# sourceMappingURL=index.js.map