knex 0.21.20 → 0.21.21

package/lib/dialects/oracle/schema/columnbuilder.js

@@ -1,18 +1,18 @@
-const { inherits } = require('util');
-const ColumnBuilder = require('../../../schema/columnbuilder');
-
-const toArray = require('lodash/toArray');
-
-function ColumnBuilder_Oracle() {
-  ColumnBuilder.apply(this, arguments);
-}
-inherits(ColumnBuilder_Oracle, ColumnBuilder);
-
-// checkIn added to the builder to allow the column compiler to change the
-// order via the modifiers ("check" must be after "default")
-ColumnBuilder_Oracle.prototype.checkIn = function () {
-  this._modifiers.checkIn = toArray(arguments);
-  return this;
-};
-
-module.exports = ColumnBuilder_Oracle;
+const { inherits } = require('util');
+const ColumnBuilder = require('../../../schema/columnbuilder');
+
+const toArray = require('lodash/toArray');
+
+function ColumnBuilder_Oracle() {
+  ColumnBuilder.apply(this, arguments);
+}
+inherits(ColumnBuilder_Oracle, ColumnBuilder);
+
+// checkIn added to the builder to allow the column compiler to change the
+// order via the modifiers ("check" must be after "default")
+ColumnBuilder_Oracle.prototype.checkIn = function () {
+  this._modifiers.checkIn = toArray(arguments);
+  return this;
+};
+
+module.exports = ColumnBuilder_Oracle;

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

@@ -1,139 +1,139 @@
-const uniq = require('lodash/uniq');
-const { inherits } = require('util');
-const Raw = require('../../../raw');
-const ColumnCompiler = require('../../../schema/columncompiler');
-const Trigger = require('./trigger');
-
-// Column Compiler
-// -------
-
-function ColumnCompiler_Oracle() {
-  ColumnCompiler.apply(this, arguments);
-  this.modifiers = ['defaultTo', 'checkIn', 'nullable', 'comment'];
-}
-inherits(ColumnCompiler_Oracle, ColumnCompiler);
-
-Object.assign(ColumnCompiler_Oracle.prototype, {
-  // helper function for pushAdditional in increments() and bigincrements()
-  _createAutoIncrementTriggerAndSequence() {
-    // TODO Add warning that sequence etc is created
-    this.pushAdditional(function () {
-      const tableName = this.tableCompiler.tableNameRaw;
-      const createTriggerSQL = Trigger.createAutoIncrementTrigger(
-        this.client.logger,
-        tableName
-      );
-      this.pushQuery(createTriggerSQL);
-    });
-  },
-
-  increments() {
-    this._createAutoIncrementTriggerAndSequence();
-    return 'integer not null primary key';
-  },
-
-  bigincrements() {
-    this._createAutoIncrementTriggerAndSequence();
-    return 'number(20, 0) not null primary key';
-  },
-
-  floating(precision) {
-    const parsedPrecision = this._num(precision, 0);
-    return `float${parsedPrecision ? `(${parsedPrecision})` : ''}`;
-  },
-
-  double(precision, scale) {
-    // if (!precision) return 'number'; // TODO: Check If default is ok
-    return `number(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
-  },
-
-  decimal(precision, scale) {
-    if (precision === null) return 'decimal';
-    return `decimal(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
-  },
-
-  integer(length) {
-    return length ? `number(${this._num(length, 11)})` : 'integer';
-  },
-
-  tinyint: 'smallint',
-
-  smallint: 'smallint',
-
-  mediumint: 'integer',
-
-  biginteger: 'number(20, 0)',
-
-  text: 'clob',
-
-  enu(allowed) {
-    allowed = uniq(allowed);
-    const maxLength = (allowed || []).reduce(
-      (maxLength, name) => Math.max(maxLength, String(name).length),
-      1
-    );
-
-    // implicitly add the enum values as checked values
-    this.columnBuilder._modifiers.checkIn = [allowed];
-
-    return `varchar2(${maxLength})`;
-  },
-
-  time: 'timestamp with time zone',
-
-  datetime(without) {
-    return without ? 'timestamp' : 'timestamp with time zone';
-  },
-
-  timestamp(without) {
-    return without ? 'timestamp' : 'timestamp with time zone';
-  },
-
-  bit: 'clob',
-
-  json: 'clob',
-
-  bool() {
-    // implicitly add the check for 0 and 1
-    this.columnBuilder._modifiers.checkIn = [[0, 1]];
-    return 'number(1, 0)';
-  },
-
-  varchar(length) {
-    return `varchar2(${this._num(length, 255)})`;
-  },
-
-  // Modifiers
-  // ------
-
-  comment(comment) {
-    const columnName = this.args[0] || this.defaults('columnName');
-
-    this.pushAdditional(function () {
-      this.pushQuery(
-        `comment on column ${this.tableCompiler.tableName()}.` +
-          this.formatter.wrap(columnName) +
-          " is '" +
-          (comment || '') +
-          "'"
-      );
-    }, comment);
-  },
-
-  checkIn(value) {
-    // TODO: Maybe accept arguments also as array
-    // TODO: value(s) should be escaped properly
-    if (value === undefined) {
-      return '';
-    } else if (value instanceof Raw) {
-      value = value.toQuery();
-    } else if (Array.isArray(value)) {
-      value = value.map((v) => `'${v}'`).join(', ');
-    } else {
-      value = `'${value}'`;
-    }
-    return `check (${this.formatter.wrap(this.args[0])} in (${value}))`;
-  },
-});
-
-module.exports = ColumnCompiler_Oracle;
+const uniq = require('lodash/uniq');
+const { inherits } = require('util');
+const Raw = require('../../../raw');
+const ColumnCompiler = require('../../../schema/columncompiler');
+const Trigger = require('./trigger');
+
+// Column Compiler
+// -------
+
+function ColumnCompiler_Oracle() {
+  ColumnCompiler.apply(this, arguments);
+  this.modifiers = ['defaultTo', 'checkIn', 'nullable', 'comment'];
+}
+inherits(ColumnCompiler_Oracle, ColumnCompiler);
+
+Object.assign(ColumnCompiler_Oracle.prototype, {
+  // helper function for pushAdditional in increments() and bigincrements()
+  _createAutoIncrementTriggerAndSequence() {
+    // TODO Add warning that sequence etc is created
+    this.pushAdditional(function () {
+      const tableName = this.tableCompiler.tableNameRaw;
+      const createTriggerSQL = Trigger.createAutoIncrementTrigger(
+        this.client.logger,
+        tableName
+      );
+      this.pushQuery(createTriggerSQL);
+    });
+  },
+
+  increments() {
+    this._createAutoIncrementTriggerAndSequence();
+    return 'integer not null primary key';
+  },
+
+  bigincrements() {
+    this._createAutoIncrementTriggerAndSequence();
+    return 'number(20, 0) not null primary key';
+  },
+
+  floating(precision) {
+    const parsedPrecision = this._num(precision, 0);
+    return `float${parsedPrecision ? `(${parsedPrecision})` : ''}`;
+  },
+
+  double(precision, scale) {
+    // if (!precision) return 'number'; // TODO: Check If default is ok
+    return `number(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
+  },
+
+  decimal(precision, scale) {
+    if (precision === null) return 'decimal';
+    return `decimal(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
+  },
+
+  integer(length) {
+    return length ? `number(${this._num(length, 11)})` : 'integer';
+  },
+
+  tinyint: 'smallint',
+
+  smallint: 'smallint',
+
+  mediumint: 'integer',
+
+  biginteger: 'number(20, 0)',
+
+  text: 'clob',
+
+  enu(allowed) {
+    allowed = uniq(allowed);
+    const maxLength = (allowed || []).reduce(
+      (maxLength, name) => Math.max(maxLength, String(name).length),
+      1
+    );
+
+    // implicitly add the enum values as checked values
+    this.columnBuilder._modifiers.checkIn = [allowed];
+
+    return `varchar2(${maxLength})`;
+  },
+
+  time: 'timestamp with time zone',
+
+  datetime(without) {
+    return without ? 'timestamp' : 'timestamp with time zone';
+  },
+
+  timestamp(without) {
+    return without ? 'timestamp' : 'timestamp with time zone';
+  },
+
+  bit: 'clob',
+
+  json: 'clob',
+
+  bool() {
+    // implicitly add the check for 0 and 1
+    this.columnBuilder._modifiers.checkIn = [[0, 1]];
+    return 'number(1, 0)';
+  },
+
+  varchar(length) {
+    return `varchar2(${this._num(length, 255)})`;
+  },
+
+  // Modifiers
+  // ------
+
+  comment(comment) {
+    const columnName = this.args[0] || this.defaults('columnName');
+
+    this.pushAdditional(function () {
+      this.pushQuery(
+        `comment on column ${this.tableCompiler.tableName()}.` +
+          this.formatter.wrap(columnName) +
+          " is '" +
+          (comment || '') +
+          "'"
+      );
+    }, comment);
+  },
+
+  checkIn(value) {
+    // TODO: Maybe accept arguments also as array
+    // TODO: value(s) should be escaped properly
+    if (value === undefined) {
+      return '';
+    } else if (value instanceof Raw) {
+      value = value.toQuery();
+    } else if (Array.isArray(value)) {
+      value = value.map((v) => `'${v}'`).join(', ');
+    } else {
+      value = `'${value}'`;
+    }
+    return `check (${this.formatter.wrap(this.args[0])} in (${value}))`;
+  },
+});
+
+module.exports = ColumnCompiler_Oracle;

package/lib/dialects/oracle/schema/compiler.js

@@ -1,81 +1,81 @@
-// Oracle Schema Compiler
-// -------
-const { inherits } = require('util');
-const SchemaCompiler = require('../../../schema/compiler');
-const utils = require('../utils');
-const Trigger = require('./trigger');
-
-function SchemaCompiler_Oracle() {
-  SchemaCompiler.apply(this, arguments);
-}
-inherits(SchemaCompiler_Oracle, SchemaCompiler);
-
-// Rename a table on the schema.
-SchemaCompiler_Oracle.prototype.renameTable = function (tableName, to) {
-  const renameTable = Trigger.renameTableAndAutoIncrementTrigger(
-    this.client.logger,
-    tableName,
-    to
-  );
-  this.pushQuery(renameTable);
-};
-
-// Check whether a table exists on the query.
-SchemaCompiler_Oracle.prototype.hasTable = function (tableName) {
-  this.pushQuery({
-    sql:
-      'select TABLE_NAME from USER_TABLES where TABLE_NAME = ' +
-      this.formatter.parameter(tableName),
-    output(resp) {
-      return resp.length > 0;
-    },
-  });
-};
-
-// Check whether a column exists on the schema.
-SchemaCompiler_Oracle.prototype.hasColumn = function (tableName, column) {
-  const sql =
-    `select COLUMN_NAME from ALL_TAB_COLUMNS ` +
-    `where TABLE_NAME = ${this.formatter.parameter(tableName)} ` +
-    `and COLUMN_NAME = ${this.formatter.parameter(column)}`;
-  this.pushQuery({ sql, output: (resp) => resp.length > 0 });
-};
-
-SchemaCompiler_Oracle.prototype.dropSequenceIfExists = function (sequenceName) {
-  this.pushQuery(
-    utils.wrapSqlWithCatch(
-      `drop sequence ${this.formatter.wrap(sequenceName)}`,
-      -2289
-    )
-  );
-};
-
-SchemaCompiler_Oracle.prototype._dropRelatedSequenceIfExists = function (
-  tableName
-) {
-  // removing the sequence that was possibly generated by increments() column
-  const sequenceName = utils.generateCombinedName(
-    this.client.logger,
-    'seq',
-    tableName
-  );
-  this.dropSequenceIfExists(sequenceName);
-};
-
-SchemaCompiler_Oracle.prototype.dropTable = function (tableName) {
-  this.pushQuery(`drop table ${this.formatter.wrap(tableName)}`);
-
-  // removing the sequence that was possibly generated by increments() column
-  this._dropRelatedSequenceIfExists(tableName);
-};
-
-SchemaCompiler_Oracle.prototype.dropTableIfExists = function (tableName) {
-  this.pushQuery(
-    utils.wrapSqlWithCatch(`drop table ${this.formatter.wrap(tableName)}`, -942)
-  );
-
-  // removing the sequence that was possibly generated by increments() column
-  this._dropRelatedSequenceIfExists(tableName);
-};
-
-module.exports = SchemaCompiler_Oracle;
+// Oracle Schema Compiler
+// -------
+const { inherits } = require('util');
+const SchemaCompiler = require('../../../schema/compiler');
+const utils = require('../utils');
+const Trigger = require('./trigger');
+
+function SchemaCompiler_Oracle() {
+  SchemaCompiler.apply(this, arguments);
+}
+inherits(SchemaCompiler_Oracle, SchemaCompiler);
+
+// Rename a table on the schema.
+SchemaCompiler_Oracle.prototype.renameTable = function (tableName, to) {
+  const renameTable = Trigger.renameTableAndAutoIncrementTrigger(
+    this.client.logger,
+    tableName,
+    to
+  );
+  this.pushQuery(renameTable);
+};
+
+// Check whether a table exists on the query.
+SchemaCompiler_Oracle.prototype.hasTable = function (tableName) {
+  this.pushQuery({
+    sql:
+      'select TABLE_NAME from USER_TABLES where TABLE_NAME = ' +
+      this.formatter.parameter(tableName),
+    output(resp) {
+      return resp.length > 0;
+    },
+  });
+};
+
+// Check whether a column exists on the schema.
+SchemaCompiler_Oracle.prototype.hasColumn = function (tableName, column) {
+  const sql =
+    `select COLUMN_NAME from ALL_TAB_COLUMNS ` +
+    `where TABLE_NAME = ${this.formatter.parameter(tableName)} ` +
+    `and COLUMN_NAME = ${this.formatter.parameter(column)}`;
+  this.pushQuery({ sql, output: (resp) => resp.length > 0 });
+};
+
+SchemaCompiler_Oracle.prototype.dropSequenceIfExists = function (sequenceName) {
+  this.pushQuery(
+    utils.wrapSqlWithCatch(
+      `drop sequence ${this.formatter.wrap(sequenceName)}`,
+      -2289
+    )
+  );
+};
+
+SchemaCompiler_Oracle.prototype._dropRelatedSequenceIfExists = function (
+  tableName
+) {
+  // removing the sequence that was possibly generated by increments() column
+  const sequenceName = utils.generateCombinedName(
+    this.client.logger,
+    'seq',
+    tableName
+  );
+  this.dropSequenceIfExists(sequenceName);
+};
+
+SchemaCompiler_Oracle.prototype.dropTable = function (tableName) {
+  this.pushQuery(`drop table ${this.formatter.wrap(tableName)}`);
+
+  // removing the sequence that was possibly generated by increments() column
+  this._dropRelatedSequenceIfExists(tableName);
+};
+
+SchemaCompiler_Oracle.prototype.dropTableIfExists = function (tableName) {
+  this.pushQuery(
+    utils.wrapSqlWithCatch(`drop table ${this.formatter.wrap(tableName)}`, -942)
+  );
+
+  // removing the sequence that was possibly generated by increments() column
+  this._dropRelatedSequenceIfExists(tableName);
+};
+
+module.exports = SchemaCompiler_Oracle;