knex 3.1.0 → 3.2.1

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

@@ -1,156 +1,162 @@
-// PostgreSQL Column Compiler
-// -------
-
-const ColumnCompiler = require('../../../schema/columncompiler');
-const { isObject } = require('../../../util/is');
-const { toNumber } = require('../../../util/helpers');
-const commentEscapeRegex = /(?<!')'(?!')/g;
-
-class ColumnCompiler_PG extends ColumnCompiler {
-  constructor(client, tableCompiler, columnBuilder) {
-    super(client, tableCompiler, columnBuilder);
-    this.modifiers = ['nullable', 'defaultTo', 'comment'];
-    this._addCheckModifiers();
-  }
-
-  // Types
-  // ------
-
-  bit(column) {
-    return column.length !== false ? `bit(${column.length})` : 'bit';
-  }
-
-  // Create the column definition for an enum type.
-  // Using method "2" here: http://stackoverflow.com/a/10984951/525714
-  enu(allowed, options) {
-    options = options || {};
-
-    const values =
-      options.useNative && options.existingType
-        ? undefined
-        : allowed.join("', '");
-
-    if (options.useNative) {
-      let enumName = '';
-      const schemaName = options.schemaName || this.tableCompiler.schemaNameRaw;
-
-      if (schemaName) {
-        enumName += `"${schemaName}".`;
-      }
-
-      enumName += `"${options.enumName}"`;
-
-      if (!options.existingType) {
-        this.tableCompiler.unshiftQuery(
-          `create type ${enumName} as enum ('${values}')`
-        );
-      }
-
-      return enumName;
-    }
-    return `text check (${this.formatter.wrap(this.args[0])} in ('${values}'))`;
-  }
-
-  decimal(precision, scale) {
-    if (precision === null) return 'decimal';
-    return `decimal(${toNumber(precision, 8)}, ${toNumber(scale, 2)})`;
-  }
-
-  json(jsonb) {
-    if (jsonb) this.client.logger.deprecate('json(true)', 'jsonb()');
-    return jsonColumn(this.client, jsonb);
-  }
-
-  jsonb() {
-    return jsonColumn(this.client, true);
-  }
-
-  checkRegex(regex, constraintName) {
-    return this._check(
-      `${this.formatter.wrap(
-        this.getColumnName()
-      )} ~ ${this.client._escapeBinding(regex)}`,
-      constraintName
-    );
-  }
-
-  datetime(withoutTz = false, precision) {
-    let useTz;
-    if (isObject(withoutTz)) {
-      ({ useTz, precision } = withoutTz);
-    } else {
-      useTz = !withoutTz;
-    }
-    useTz = typeof useTz === 'boolean' ? useTz : true;
-    precision =
-      precision !== undefined && precision !== null
-        ? '(' + precision + ')'
-        : '';
-
-    return `${useTz ? 'timestamptz' : 'timestamp'}${precision}`;
-  }
-
-  timestamp(withoutTz = false, precision) {
-    return this.datetime(withoutTz, precision);
-  }
-
-  // Modifiers:
-  // ------
-  comment(comment) {
-    const columnName = this.args[0] || this.defaults('columnName');
-    const escapedComment = comment
-      ? `'${comment.replace(commentEscapeRegex, "''")}'`
-      : 'NULL';
-
-    this.pushAdditional(function () {
-      this.pushQuery(
-        `comment on column ${this.tableCompiler.tableName()}.` +
-          this.formatter.wrap(columnName) +
-          ` is ${escapedComment}`
-      );
-    }, comment);
-  }
-
-  increments(options = { primaryKey: true }) {
-    return (
-      'serial' +
-      (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '')
-    );
-  }
-
-  bigincrements(options = { primaryKey: true }) {
-    return (
-      'bigserial' +
-      (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '')
-    );
-  }
-
-  uuid(options = { primaryKey: false }) {
-    return (
-      'uuid' +
-      (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '')
-    );
-  }
-}
-
-ColumnCompiler_PG.prototype.bigint = 'bigint';
-ColumnCompiler_PG.prototype.binary = 'bytea';
-ColumnCompiler_PG.prototype.bool = 'boolean';
-ColumnCompiler_PG.prototype.double = 'double precision';
-ColumnCompiler_PG.prototype.floating = 'real';
-ColumnCompiler_PG.prototype.smallint = 'smallint';
-ColumnCompiler_PG.prototype.tinyint = 'smallint';
-
-function jsonColumn(client, jsonb) {
-  if (
-    !client.version ||
-    client.config.client === 'cockroachdb' ||
-    client.config.jsonbSupport === true ||
-    parseFloat(client.version) >= 9.2
-  ) {
-    return jsonb ? 'jsonb' : 'json';
-  }
-  return 'text';
-}
-
-module.exports = ColumnCompiler_PG;
+// PostgreSQL Column Compiler
+// -------
+
+const ColumnCompiler = require('../../../schema/columncompiler');
+const { isObject, isNumber } = require('../../../util/is');
+const { toNumber } = require('../../../util/helpers');
+const commentEscapeRegex = /(?<!')'(?!')/g;
+
+class ColumnCompiler_PG extends ColumnCompiler {
+  constructor(client, tableCompiler, columnBuilder) {
+    super(client, tableCompiler, columnBuilder);
+    this.modifiers = ['nullable', 'defaultTo', 'comment'];
+    this._addCheckModifiers();
+  }
+
+  // Types
+  // ------
+
+  bit(column) {
+    return column.length !== false ? `bit(${column.length})` : 'bit';
+  }
+
+  // Create the column definition for an enum type.
+  // Using method "2" here: http://stackoverflow.com/a/10984951/525714
+  enu(allowed, options) {
+    options = options || {};
+
+    const values =
+      options.useNative && options.existingType
+        ? undefined
+        : allowed.join("', '");
+
+    if (options.useNative) {
+      let enumName = '';
+      const schemaName = options.schemaName || this.tableCompiler.schemaNameRaw;
+
+      if (schemaName) {
+        enumName += `"${schemaName}".`;
+      }
+
+      enumName += `"${options.enumName}"`;
+
+      if (!options.existingType) {
+        this.tableCompiler.unshiftQuery(
+          `create type ${enumName} as enum ('${values}')`
+        );
+      }
+
+      return enumName;
+    }
+    return `text check (${this.formatter.wrap(this.args[0])} in ('${values}'))`;
+  }
+
+  decimal(precision, scale) {
+    if (precision === null) return 'decimal';
+    return `decimal(${toNumber(precision, 8)}, ${toNumber(scale, 2)})`;
+  }
+
+  json(jsonb) {
+    if (jsonb) this.client.logger.deprecate('json(true)', 'jsonb()');
+    return jsonColumn(this.client, jsonb);
+  }
+
+  jsonb() {
+    return jsonColumn(this.client, true);
+  }
+
+  checkRegex(regex, constraintName) {
+    return this._check(
+      `${this.formatter.wrap(
+        this.getColumnName()
+      )} ~ ${this.client._escapeBinding(regex)}`,
+      constraintName
+    );
+  }
+
+  datetime(withoutTz = false, precision) {
+    const defaultPrecision = isNumber(
+      this.client.config.defaultDateTimePrecision
+    )
+      ? `(${this.client.config.defaultDateTimePrecision})`
+      : '';
+
+    let useTz;
+    if (isObject(withoutTz)) {
+      ({ useTz, precision } = withoutTz);
+    } else {
+      useTz = !withoutTz;
+    }
+    useTz = typeof useTz === 'boolean' ? useTz : true;
+    precision =
+      precision !== undefined && precision !== null
+        ? '(' + precision + ')'
+        : defaultPrecision;
+
+    return `${useTz ? 'timestamptz' : 'timestamp'}${precision}`;
+  }
+
+  timestamp(withoutTz = false, precision) {
+    return this.datetime(withoutTz, precision);
+  }
+
+  // Modifiers:
+  // ------
+  comment(comment) {
+    const columnName = this.args[0] || this.defaults('columnName');
+    const escapedComment = comment
+      ? `'${comment.replace(commentEscapeRegex, "''")}'`
+      : 'NULL';
+
+    this.pushAdditional(function () {
+      this.pushQuery(
+        `comment on column ${this.tableCompiler.tableName()}.` +
+          this.formatter.wrap(columnName) +
+          ` is ${escapedComment}`
+      );
+    }, comment);
+  }
+
+  increments(options = { primaryKey: true }) {
+    return (
+      'serial' +
+      (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '')
+    );
+  }
+
+  bigincrements(options = { primaryKey: true }) {
+    return (
+      'bigserial' +
+      (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '')
+    );
+  }
+
+  uuid(options = { primaryKey: false }) {
+    return (
+      'uuid' +
+      (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '')
+    );
+  }
+}
+
+ColumnCompiler_PG.prototype.bigint = 'bigint';
+ColumnCompiler_PG.prototype.binary = 'bytea';
+ColumnCompiler_PG.prototype.bool = 'boolean';
+ColumnCompiler_PG.prototype.double = 'double precision';
+ColumnCompiler_PG.prototype.floating = 'real';
+ColumnCompiler_PG.prototype.smallint = 'smallint';
+ColumnCompiler_PG.prototype.tinyint = 'smallint';
+
+function jsonColumn(client, jsonb) {
+  if (
+    !client.version ||
+    client.config.client === 'cockroachdb' ||
+    client.config.jsonbSupport === true ||
+    parseFloat(client.version) >= 9.2
+  ) {
+    return jsonb ? 'jsonb' : 'json';
+  }
+  return 'text';
+}
+
+module.exports = ColumnCompiler_PG;

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

@@ -1,138 +1,138 @@
-// PostgreSQL Schema Compiler
-// -------
-
-const SchemaCompiler = require('../../../schema/compiler');
-
-class SchemaCompiler_PG extends SchemaCompiler {
-  constructor(client, builder) {
-    super(client, builder);
-  }
-
-  // Check whether the current table
-  hasTable(tableName) {
-    let sql = 'select * from information_schema.tables where table_name = ?';
-    const bindings = [tableName];
-
-    if (this.schema) {
-      sql += ' and table_schema = ?';
-      bindings.push(this.schema);
-    } else {
-      sql += ' and table_schema = current_schema()';
-    }
-
-    this.pushQuery({
-      sql,
-      bindings,
-      output(resp) {
-        return resp.rows.length > 0;
-      },
-    });
-  }
-
-  // Compile the query to determine if a column exists in a table.
-  hasColumn(tableName, columnName) {
-    let sql =
-      'select * from information_schema.columns where table_name = ? and column_name = ?';
-    const bindings = [tableName, columnName];
-
-    if (this.schema) {
-      sql += ' and table_schema = ?';
-      bindings.push(this.schema);
-    } else {
-      sql += ' and table_schema = current_schema()';
-    }
-
-    this.pushQuery({
-      sql,
-      bindings,
-      output(resp) {
-        return resp.rows.length > 0;
-      },
-    });
-  }
-
-  qualifiedTableName(tableName) {
-    const name = this.schema ? `${this.schema}.${tableName}` : tableName;
-    return this.formatter.wrap(name);
-  }
-
-  // Compile a rename table command.
-  renameTable(from, to) {
-    this.pushQuery(
-      `alter table ${this.qualifiedTableName(
-        from
-      )} rename to ${this.formatter.wrap(to)}`
-    );
-  }
-
-  createSchema(schemaName) {
-    this.pushQuery(`create schema ${this.formatter.wrap(schemaName)}`);
-  }
-
-  createSchemaIfNotExists(schemaName) {
-    this.pushQuery(
-      `create schema if not exists ${this.formatter.wrap(schemaName)}`
-    );
-  }
-
-  dropSchema(schemaName, cascade = false) {
-    this.pushQuery(
-      `drop schema ${this.formatter.wrap(schemaName)}${
-        cascade ? ' cascade' : ''
-      }`
-    );
-  }
-
-  dropSchemaIfExists(schemaName, cascade = false) {
-    this.pushQuery(
-      `drop schema if exists ${this.formatter.wrap(schemaName)}${
-        cascade ? ' cascade' : ''
-      }`
-    );
-  }
-
-  dropExtension(extensionName) {
-    this.pushQuery(`drop extension ${this.formatter.wrap(extensionName)}`);
-  }
-
-  dropExtensionIfExists(extensionName) {
-    this.pushQuery(
-      `drop extension if exists ${this.formatter.wrap(extensionName)}`
-    );
-  }
-
-  createExtension(extensionName) {
-    this.pushQuery(`create extension ${this.formatter.wrap(extensionName)}`);
-  }
-
-  createExtensionIfNotExists(extensionName) {
-    this.pushQuery(
-      `create extension if not exists ${this.formatter.wrap(extensionName)}`
-    );
-  }
-
-  renameView(from, to) {
-    this.pushQuery(
-      this.alterViewPrefix +
-        `${this.formatter.wrap(from)} rename to ${this.formatter.wrap(to)}`
-    );
-  }
-
-  refreshMaterializedView(viewName, concurrently = false) {
-    this.pushQuery({
-      sql: `refresh materialized view${
-        concurrently ? ' concurrently' : ''
-      } ${this.formatter.wrap(viewName)}`,
-    });
-  }
-
-  dropMaterializedView(viewName) {
-    this._dropView(viewName, false, true);
-  }
-
-  dropMaterializedViewIfExists(viewName) {
-    this._dropView(viewName, true, true);
-  }
-}
-
-module.exports = SchemaCompiler_PG;
+// PostgreSQL Schema Compiler
+// -------
+
+const SchemaCompiler = require('../../../schema/compiler');
+
+class SchemaCompiler_PG extends SchemaCompiler {
+  constructor(client, builder) {
+    super(client, builder);
+  }
+
+  // Check whether the current table
+  hasTable(tableName) {
+    let sql = 'select * from information_schema.tables where table_name = ?';
+    const bindings = [tableName];
+
+    if (this.schema) {
+      sql += ' and table_schema = ?';
+      bindings.push(this.schema);
+    } else {
+      sql += ' and table_schema = current_schema()';
+    }
+
+    this.pushQuery({
+      sql,
+      bindings,
+      output(resp) {
+        return resp.rows.length > 0;
+      },
+    });
+  }
+
+  // Compile the query to determine if a column exists in a table.
+  hasColumn(tableName, columnName) {
+    let sql =
+      'select * from information_schema.columns where table_name = ? and column_name = ?';
+    const bindings = [tableName, columnName];
+
+    if (this.schema) {
+      sql += ' and table_schema = ?';
+      bindings.push(this.schema);
+    } else {
+      sql += ' and table_schema = current_schema()';
+    }
+
+    this.pushQuery({
+      sql,
+      bindings,
+      output(resp) {
+        return resp.rows.length > 0;
+      },
+    });
+  }
+
+  qualifiedTableName(tableName) {
+    const name = this.schema ? `${this.schema}.${tableName}` : tableName;
+    return this.formatter.wrap(name);
+  }
+
+  // Compile a rename table command.
+  renameTable(from, to) {
+    this.pushQuery(
+      `alter table ${this.qualifiedTableName(
+        from
+      )} rename to ${this.formatter.wrap(to)}`
+    );
+  }
+
+  createSchema(schemaName) {
+    this.pushQuery(`create schema ${this.formatter.wrap(schemaName)}`);
+  }
+
+  createSchemaIfNotExists(schemaName) {
+    this.pushQuery(
+      `create schema if not exists ${this.formatter.wrap(schemaName)}`
+    );
+  }
+
+  dropSchema(schemaName, cascade = false) {
+    this.pushQuery(
+      `drop schema ${this.formatter.wrap(schemaName)}${
+        cascade ? ' cascade' : ''
+      }`
+    );
+  }
+
+  dropSchemaIfExists(schemaName, cascade = false) {
+    this.pushQuery(
+      `drop schema if exists ${this.formatter.wrap(schemaName)}${
+        cascade ? ' cascade' : ''
+      }`
+    );
+  }
+
+  dropExtension(extensionName) {
+    this.pushQuery(`drop extension ${this.formatter.wrap(extensionName)}`);
+  }
+
+  dropExtensionIfExists(extensionName) {
+    this.pushQuery(
+      `drop extension if exists ${this.formatter.wrap(extensionName)}`
+    );
+  }
+
+  createExtension(extensionName) {
+    this.pushQuery(`create extension ${this.formatter.wrap(extensionName)}`);
+  }
+
+  createExtensionIfNotExists(extensionName) {
+    this.pushQuery(
+      `create extension if not exists ${this.formatter.wrap(extensionName)}`
+    );
+  }
+
+  renameView(from, to) {
+    this.pushQuery(
+      this.alterViewPrefix +
+        `${this.formatter.wrap(from)} rename to ${this.formatter.wrap(to)}`
+    );
+  }
+
+  refreshMaterializedView(viewName, concurrently = false) {
+    this.pushQuery({
+      sql: `refresh materialized view${
+        concurrently ? ' concurrently' : ''
+      } ${this.formatter.wrap(viewName)}`,
+    });
+  }
+
+  dropMaterializedView(viewName) {
+    this._dropView(viewName, false, true);
+  }
+
+  dropMaterializedViewIfExists(viewName) {
+    this._dropView(viewName, true, true);
+  }
+}
+
+module.exports = SchemaCompiler_PG;