knex 2.4.0 → 2.4.1

package/lib/dialects/postgres/schema/pg-viewcompiler.js

@@ -1,35 +1,35 @@
-/* eslint max-len: 0 */
-
-const ViewCompiler = require('../../../schema/viewcompiler.js');
-
-class ViewCompiler_PG extends ViewCompiler {
-  constructor(client, viewCompiler) {
-    super(client, viewCompiler);
-  }
-
-  renameColumn(from, to) {
-    return this.pushQuery({
-      sql: `alter view ${this.viewName()} rename ${this.formatter.wrap(
-        from
-      )} to ${this.formatter.wrap(to)}`,
-    });
-  }
-
-  defaultTo(column, defaultValue) {
-    return this.pushQuery({
-      sql: `alter view ${this.viewName()} alter ${this.formatter.wrap(
-        column
-      )} set default ${defaultValue}`,
-    });
-  }
-
-  createOrReplace() {
-    this.createQuery(this.columns, this.selectQuery, false, true);
-  }
-
-  createMaterializedView() {
-    this.createQuery(this.columns, this.selectQuery, true);
-  }
-}
-
-module.exports = ViewCompiler_PG;
+/* eslint max-len: 0 */
+
+const ViewCompiler = require('../../../schema/viewcompiler.js');
+
+class ViewCompiler_PG extends ViewCompiler {
+  constructor(client, viewCompiler) {
+    super(client, viewCompiler);
+  }
+
+  renameColumn(from, to) {
+    return this.pushQuery({
+      sql: `alter view ${this.viewName()} rename ${this.formatter.wrap(
+        from
+      )} to ${this.formatter.wrap(to)}`,
+    });
+  }
+
+  defaultTo(column, defaultValue) {
+    return this.pushQuery({
+      sql: `alter view ${this.viewName()} alter ${this.formatter.wrap(
+        column
+      )} set default ${defaultValue}`,
+    });
+  }
+
+  createOrReplace() {
+    this.createQuery(this.columns, this.selectQuery, false, true);
+  }
+
+  createMaterializedView() {
+    this.createQuery(this.columns, this.selectQuery, true);
+  }
+}
+
+module.exports = ViewCompiler_PG;

package/lib/dialects/redshift/index.js

@@ -1,86 +1,86 @@
-// Redshift
-// -------
-const Client_PG = require('../postgres');
-const map = require('lodash/map');
-
-const Transaction = require('./transaction');
-const QueryCompiler = require('./query/redshift-querycompiler');
-const ColumnBuilder = require('./schema/redshift-columnbuilder');
-const ColumnCompiler = require('./schema/redshift-columncompiler');
-const TableCompiler = require('./schema/redshift-tablecompiler');
-const SchemaCompiler = require('./schema/redshift-compiler');
-const ViewCompiler = require('./schema/redshift-viewcompiler');
-
-class Client_Redshift extends Client_PG {
-  transaction() {
-    return new Transaction(this, ...arguments);
-  }
-
-  queryCompiler(builder, formatter) {
-    return new QueryCompiler(this, builder, formatter);
-  }
-
-  columnBuilder() {
-    return new ColumnBuilder(this, ...arguments);
-  }
-
-  columnCompiler() {
-    return new ColumnCompiler(this, ...arguments);
-  }
-
-  tableCompiler() {
-    return new TableCompiler(this, ...arguments);
-  }
-
-  schemaCompiler() {
-    return new SchemaCompiler(this, ...arguments);
-  }
-
-  viewCompiler() {
-    return new ViewCompiler(this, ...arguments);
-  }
-
-  _driver() {
-    return require('pg');
-  }
-
-  // Ensures the response is returned in the same format as other clients.
-  processResponse(obj, runner) {
-    const resp = obj.response;
-    if (obj.output) return obj.output.call(runner, resp);
-    if (obj.method === 'raw') return resp;
-    if (resp.command === 'SELECT') {
-      if (obj.method === 'first') return resp.rows[0];
-      if (obj.method === 'pluck') return map(resp.rows, obj.pluck);
-      return resp.rows;
-    }
-    if (
-      resp.command === 'INSERT' ||
-      resp.command === 'UPDATE' ||
-      resp.command === 'DELETE'
-    ) {
-      return resp.rowCount;
-    }
-    return resp;
-  }
-
-  toPathForJson(jsonPath, builder, bindingsHolder) {
-    return jsonPath
-      .replace(/^(\$\.)/, '') // remove the first dollar
-      .split('.')
-      .map(
-        function (v) {
-          return this.parameter(v, builder, bindingsHolder);
-        }.bind(this)
-      )
-      .join(', ');
-  }
-}
-
-Object.assign(Client_Redshift.prototype, {
-  dialect: 'redshift',
-
-  driverName: 'pg-redshift',
-});
-
-module.exports = Client_Redshift;
+// Redshift
+// -------
+const Client_PG = require('../postgres');
+const map = require('lodash/map');
+
+const Transaction = require('./transaction');
+const QueryCompiler = require('./query/redshift-querycompiler');
+const ColumnBuilder = require('./schema/redshift-columnbuilder');
+const ColumnCompiler = require('./schema/redshift-columncompiler');
+const TableCompiler = require('./schema/redshift-tablecompiler');
+const SchemaCompiler = require('./schema/redshift-compiler');
+const ViewCompiler = require('./schema/redshift-viewcompiler');
+
+class Client_Redshift extends Client_PG {
+  transaction() {
+    return new Transaction(this, ...arguments);
+  }
+
+  queryCompiler(builder, formatter) {
+    return new QueryCompiler(this, builder, formatter);
+  }
+
+  columnBuilder() {
+    return new ColumnBuilder(this, ...arguments);
+  }
+
+  columnCompiler() {
+    return new ColumnCompiler(this, ...arguments);
+  }
+
+  tableCompiler() {
+    return new TableCompiler(this, ...arguments);
+  }
+
+  schemaCompiler() {
+    return new SchemaCompiler(this, ...arguments);
+  }
+
+  viewCompiler() {
+    return new ViewCompiler(this, ...arguments);
+  }
+
+  _driver() {
+    return require('pg');
+  }
+
+  // Ensures the response is returned in the same format as other clients.
+  processResponse(obj, runner) {
+    const resp = obj.response;
+    if (obj.output) return obj.output.call(runner, resp);
+    if (obj.method === 'raw') return resp;
+    if (resp.command === 'SELECT') {
+      if (obj.method === 'first') return resp.rows[0];
+      if (obj.method === 'pluck') return map(resp.rows, obj.pluck);
+      return resp.rows;
+    }
+    if (
+      resp.command === 'INSERT' ||
+      resp.command === 'UPDATE' ||
+      resp.command === 'DELETE'
+    ) {
+      return resp.rowCount;
+    }
+    return resp;
+  }
+
+  toPathForJson(jsonPath, builder, bindingsHolder) {
+    return jsonPath
+      .replace(/^(\$\.)/, '') // remove the first dollar
+      .split('.')
+      .map(
+        function (v) {
+          return this.parameter(v, builder, bindingsHolder);
+        }.bind(this)
+      )
+      .join(', ');
+  }
+}
+
+Object.assign(Client_Redshift.prototype, {
+  dialect: 'redshift',
+
+  driverName: 'pg-redshift',
+});
+
+module.exports = Client_Redshift;

package/lib/dialects/redshift/query/redshift-querycompiler.js

@@ -1,163 +1,163 @@
-// Redshift Query Builder & Compiler
-// ------
-const QueryCompiler = require('../../../query/querycompiler');
-const QueryCompiler_PG = require('../../postgres/query/pg-querycompiler');
-
-const identity = require('lodash/identity');
-const {
-  columnize: columnize_,
-} = require('../../../formatter/wrappingFormatter');
-
-class QueryCompiler_Redshift extends QueryCompiler_PG {
-  truncate() {
-    return `truncate ${this.tableName.toLowerCase()}`;
-  }
-
-  // Compiles an `insert` query, allowing for multiple
-  // inserts using a single query statement.
-  insert() {
-    const sql = QueryCompiler.prototype.insert.apply(this, arguments);
-    if (sql === '') return sql;
-    this._slightReturn();
-    return {
-      sql,
-    };
-  }
-
-  // Compiles an `update` query, warning on unsupported returning
-  update() {
-    const sql = QueryCompiler.prototype.update.apply(this, arguments);
-    this._slightReturn();
-    return {
-      sql,
-    };
-  }
-
-  // Compiles an `delete` query, warning on unsupported returning
-  del() {
-    const sql = QueryCompiler.prototype.del.apply(this, arguments);
-    this._slightReturn();
-    return {
-      sql,
-    };
-  }
-
-  // simple: if trying to return, warn
-  _slightReturn() {
-    if (this.single.isReturning) {
-      this.client.logger.warn(
-        'insert/update/delete returning is not supported by redshift dialect'
-      );
-    }
-  }
-
-  forUpdate() {
-    this.client.logger.warn('table lock is not supported by redshift dialect');
-    return '';
-  }
-
-  forShare() {
-    this.client.logger.warn(
-      'lock for share is not supported by redshift dialect'
-    );
-    return '';
-  }
-
-  forNoKeyUpdate() {
-    this.client.logger.warn('table lock is not supported by redshift dialect');
-    return '';
-  }
-
-  forKeyShare() {
-    this.client.logger.warn(
-      'lock for share is not supported by redshift dialect'
-    );
-    return '';
-  }
-
-  // Compiles a columnInfo query
-  columnInfo() {
-    const column = this.single.columnInfo;
-    let schema = this.single.schema;
-
-    // The user may have specified a custom wrapIdentifier function in the config. We
-    // need to run the identifiers through that function, but not format them as
-    // identifiers otherwise.
-    const table = this.client.customWrapIdentifier(this.single.table, identity);
-
-    if (schema) {
-      schema = this.client.customWrapIdentifier(schema, identity);
-    }
-
-    const sql =
-      'select * from information_schema.columns where table_name = ? and table_catalog = ?';
-    const bindings = [
-      table.toLowerCase(),
-      this.client.database().toLowerCase(),
-    ];
-
-    return this._buildColumnInfoQuery(schema, sql, bindings, column);
-  }
-
-  jsonExtract(params) {
-    let extractions;
-    if (Array.isArray(params.column)) {
-      extractions = params.column;
-    } else {
-      extractions = [params];
-    }
-    return extractions
-      .map((extraction) => {
-        const jsonCol = `json_extract_path_text(${columnize_(
-          extraction.column || extraction[0],
-          this.builder,
-          this.client,
-          this.bindingsHolder
-        )}, ${this.client.toPathForJson(
-          params.path || extraction[1],
-          this.builder,
-          this.bindingsHolder
-        )})`;
-        const alias = extraction.alias || extraction[2];
-        return alias
-          ? this.client.alias(jsonCol, this.formatter.wrap(alias))
-          : jsonCol;
-      })
-      .join(', ');
-  }
-
-  jsonSet(params) {
-    throw new Error('Json set is not supported by Redshift');
-  }
-
-  jsonInsert(params) {
-    throw new Error('Json insert is not supported by Redshift');
-  }
-
-  jsonRemove(params) {
-    throw new Error('Json remove is not supported by Redshift');
-  }
-
-  whereJsonPath(statement) {
-    return this._whereJsonPath(
-      'json_extract_path_text',
-      Object.assign({}, statement, {
-        path: this.client.toPathForJson(statement.path),
-      })
-    );
-  }
-
-  whereJsonSupersetOf(statement) {
-    throw new Error('Json superset is not supported by Redshift');
-  }
-
-  whereJsonSubsetOf(statement) {
-    throw new Error('Json subset is not supported by Redshift');
-  }
-
-  onJsonPathEquals(clause) {
-    return this._onJsonPathEquals('json_extract_path_text', clause);
-  }
-}
-
-module.exports = QueryCompiler_Redshift;
+// Redshift Query Builder & Compiler
+// ------
+const QueryCompiler = require('../../../query/querycompiler');
+const QueryCompiler_PG = require('../../postgres/query/pg-querycompiler');
+
+const identity = require('lodash/identity');
+const {
+  columnize: columnize_,
+} = require('../../../formatter/wrappingFormatter');
+
+class QueryCompiler_Redshift extends QueryCompiler_PG {
+  truncate() {
+    return `truncate ${this.tableName.toLowerCase()}`;
+  }
+
+  // Compiles an `insert` query, allowing for multiple
+  // inserts using a single query statement.
+  insert() {
+    const sql = QueryCompiler.prototype.insert.apply(this, arguments);
+    if (sql === '') return sql;
+    this._slightReturn();
+    return {
+      sql,
+    };
+  }
+
+  // Compiles an `update` query, warning on unsupported returning
+  update() {
+    const sql = QueryCompiler.prototype.update.apply(this, arguments);
+    this._slightReturn();
+    return {
+      sql,
+    };
+  }
+
+  // Compiles an `delete` query, warning on unsupported returning
+  del() {
+    const sql = QueryCompiler.prototype.del.apply(this, arguments);
+    this._slightReturn();
+    return {
+      sql,
+    };
+  }
+
+  // simple: if trying to return, warn
+  _slightReturn() {
+    if (this.single.isReturning) {
+      this.client.logger.warn(
+        'insert/update/delete returning is not supported by redshift dialect'
+      );
+    }
+  }
+
+  forUpdate() {
+    this.client.logger.warn('table lock is not supported by redshift dialect');
+    return '';
+  }
+
+  forShare() {
+    this.client.logger.warn(
+      'lock for share is not supported by redshift dialect'
+    );
+    return '';
+  }
+
+  forNoKeyUpdate() {
+    this.client.logger.warn('table lock is not supported by redshift dialect');
+    return '';
+  }
+
+  forKeyShare() {
+    this.client.logger.warn(
+      'lock for share is not supported by redshift dialect'
+    );
+    return '';
+  }
+
+  // Compiles a columnInfo query
+  columnInfo() {
+    const column = this.single.columnInfo;
+    let schema = this.single.schema;
+
+    // The user may have specified a custom wrapIdentifier function in the config. We
+    // need to run the identifiers through that function, but not format them as
+    // identifiers otherwise.
+    const table = this.client.customWrapIdentifier(this.single.table, identity);
+
+    if (schema) {
+      schema = this.client.customWrapIdentifier(schema, identity);
+    }
+
+    const sql =
+      'select * from information_schema.columns where table_name = ? and table_catalog = ?';
+    const bindings = [
+      table.toLowerCase(),
+      this.client.database().toLowerCase(),
+    ];
+
+    return this._buildColumnInfoQuery(schema, sql, bindings, column);
+  }
+
+  jsonExtract(params) {
+    let extractions;
+    if (Array.isArray(params.column)) {
+      extractions = params.column;
+    } else {
+      extractions = [params];
+    }
+    return extractions
+      .map((extraction) => {
+        const jsonCol = `json_extract_path_text(${columnize_(
+          extraction.column || extraction[0],
+          this.builder,
+          this.client,
+          this.bindingsHolder
+        )}, ${this.client.toPathForJson(
+          params.path || extraction[1],
+          this.builder,
+          this.bindingsHolder
+        )})`;
+        const alias = extraction.alias || extraction[2];
+        return alias
+          ? this.client.alias(jsonCol, this.formatter.wrap(alias))
+          : jsonCol;
+      })
+      .join(', ');
+  }
+
+  jsonSet(params) {
+    throw new Error('Json set is not supported by Redshift');
+  }
+
+  jsonInsert(params) {
+    throw new Error('Json insert is not supported by Redshift');
+  }
+
+  jsonRemove(params) {
+    throw new Error('Json remove is not supported by Redshift');
+  }
+
+  whereJsonPath(statement) {
+    return this._whereJsonPath(
+      'json_extract_path_text',
+      Object.assign({}, statement, {
+        path: this.client.toPathForJson(statement.path),
+      })
+    );
+  }
+
+  whereJsonSupersetOf(statement) {
+    throw new Error('Json superset is not supported by Redshift');
+  }
+
+  whereJsonSubsetOf(statement) {
+    throw new Error('Json subset is not supported by Redshift');
+  }
+
+  onJsonPathEquals(clause) {
+    return this._onJsonPathEquals('json_extract_path_text', clause);
+  }
+}
+
+module.exports = QueryCompiler_Redshift;

package/lib/dialects/redshift/schema/redshift-columnbuilder.js

@@ -1,22 +1,22 @@
-const ColumnBuilder = require('../../../schema/columnbuilder');
-
-class ColumnBuilder_Redshift extends ColumnBuilder {
-  constructor() {
-    super(...arguments);
-  }
-
-  // primary needs to set not null on non-preexisting columns, or fail
-  primary() {
-    this.notNullable();
-    return super.primary(...arguments);
-  }
-
-  index() {
-    this.client.logger.warn(
-      'Redshift does not support the creation of indexes.'
-    );
-    return this;
-  }
-}
-
-module.exports = ColumnBuilder_Redshift;
+const ColumnBuilder = require('../../../schema/columnbuilder');
+
+class ColumnBuilder_Redshift extends ColumnBuilder {
+  constructor() {
+    super(...arguments);
+  }
+
+  // primary needs to set not null on non-preexisting columns, or fail
+  primary() {
+    this.notNullable();
+    return super.primary(...arguments);
+  }
+
+  index() {
+    this.client.logger.warn(
+      'Redshift does not support the creation of indexes.'
+    );
+    return this;
+  }
+}
+
+module.exports = ColumnBuilder_Redshift;