knex 2.5.0 → 2.5.1

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

@@ -1,122 +1,122 @@
-// Oracle Schema Compiler
-// -------
-const SchemaCompiler = require('../../../schema/compiler');
-const utils = require('../utils');
-const Trigger = require('./internal/trigger');
-
-class SchemaCompiler_Oracle extends SchemaCompiler {
-  constructor() {
-    super(...arguments);
-  }
-
-  // Rename a table on the schema.
-  renameTable(tableName, to) {
-    const renameTable = Trigger.renameTableAndAutoIncrementTrigger(
-      this.client.logger,
-      tableName,
-      to
-    );
-    this.pushQuery(renameTable);
-  }
-
-  // Check whether a table exists on the query.
-  hasTable(tableName) {
-    this.pushQuery({
-      sql:
-        'select TABLE_NAME from USER_TABLES where TABLE_NAME = ' +
-        this.client.parameter(tableName, this.builder, this.bindingsHolder),
-      output(resp) {
-        return resp.length > 0;
-      },
-    });
-  }
-
-  // Check whether a column exists on the schema.
-  hasColumn(tableName, column) {
-    const sql =
-      `select COLUMN_NAME from ALL_TAB_COLUMNS ` +
-      `where TABLE_NAME = ${this.client.parameter(
-        tableName,
-        this.builder,
-        this.bindingsHolder
-      )} ` +
-      `and COLUMN_NAME = ${this.client.parameter(
-        column,
-        this.builder,
-        this.bindingsHolder
-      )}`;
-    this.pushQuery({ sql, output: (resp) => resp.length > 0 });
-  }
-
-  dropSequenceIfExists(sequenceName) {
-    const prefix = this.schema ? `"${this.schema}".` : '';
-    this.pushQuery(
-      utils.wrapSqlWithCatch(
-        `drop sequence ${prefix}${this.formatter.wrap(sequenceName)}`,
-        -2289
-      )
-    );
-  }
-
-  _dropRelatedSequenceIfExists(tableName) {
-    // removing the sequence that was possibly generated by increments() column
-    const sequenceName = utils.generateCombinedName(
-      this.client.logger,
-      'seq',
-      tableName
-    );
-    this.dropSequenceIfExists(sequenceName);
-  }
-
-  dropTable(tableName) {
-    const prefix = this.schema ? `"${this.schema}".` : '';
-    this.pushQuery(`drop table ${prefix}${this.formatter.wrap(tableName)}`);
-
-    // removing the sequence that was possibly generated by increments() column
-    this._dropRelatedSequenceIfExists(tableName);
-  }
-
-  dropTableIfExists(tableName) {
-    this.dropObject(tableName, 'table');
-  }
-
-  dropViewIfExists(viewName) {
-    this.dropObject(viewName, 'view');
-  }
-
-  dropObject(objectName, type) {
-    const prefix = this.schema ? `"${this.schema}".` : '';
-    let errorCode = -942;
-    if (type === 'materialized view') {
-      // https://stackoverflow.com/a/1801453
-      errorCode = -12003;
-    }
-    this.pushQuery(
-      utils.wrapSqlWithCatch(
-        `drop ${type} ${prefix}${this.formatter.wrap(objectName)}`,
-        errorCode
-      )
-    );
-
-    // removing the sequence that was possibly generated by increments() column
-    this._dropRelatedSequenceIfExists(objectName);
-  }
-
-  refreshMaterializedView(viewName) {
-    return this.pushQuery({
-      sql: `BEGIN DBMS_MVIEW.REFRESH('${
-        this.schemaNameRaw ? this.schemaNameRaw + '.' : ''
-      }${viewName}'); END;`,
-    });
-  }
-
-  dropMaterializedView(viewName) {
-    this._dropView(viewName, false, true);
-  }
-
-  dropMaterializedViewIfExists(viewName) {
-    this.dropObject(viewName, 'materialized view');
-  }
-}
-
-module.exports = SchemaCompiler_Oracle;
+// Oracle Schema Compiler
+// -------
+const SchemaCompiler = require('../../../schema/compiler');
+const utils = require('../utils');
+const Trigger = require('./internal/trigger');
+
+class SchemaCompiler_Oracle extends SchemaCompiler {
+  constructor() {
+    super(...arguments);
+  }
+
+  // Rename a table on the schema.
+  renameTable(tableName, to) {
+    const renameTable = Trigger.renameTableAndAutoIncrementTrigger(
+      this.client.logger,
+      tableName,
+      to
+    );
+    this.pushQuery(renameTable);
+  }
+
+  // Check whether a table exists on the query.
+  hasTable(tableName) {
+    this.pushQuery({
+      sql:
+        'select TABLE_NAME from USER_TABLES where TABLE_NAME = ' +
+        this.client.parameter(tableName, this.builder, this.bindingsHolder),
+      output(resp) {
+        return resp.length > 0;
+      },
+    });
+  }
+
+  // Check whether a column exists on the schema.
+  hasColumn(tableName, column) {
+    const sql =
+      `select COLUMN_NAME from ALL_TAB_COLUMNS ` +
+      `where TABLE_NAME = ${this.client.parameter(
+        tableName,
+        this.builder,
+        this.bindingsHolder
+      )} ` +
+      `and COLUMN_NAME = ${this.client.parameter(
+        column,
+        this.builder,
+        this.bindingsHolder
+      )}`;
+    this.pushQuery({ sql, output: (resp) => resp.length > 0 });
+  }
+
+  dropSequenceIfExists(sequenceName) {
+    const prefix = this.schema ? `"${this.schema}".` : '';
+    this.pushQuery(
+      utils.wrapSqlWithCatch(
+        `drop sequence ${prefix}${this.formatter.wrap(sequenceName)}`,
+        -2289
+      )
+    );
+  }
+
+  _dropRelatedSequenceIfExists(tableName) {
+    // removing the sequence that was possibly generated by increments() column
+    const sequenceName = utils.generateCombinedName(
+      this.client.logger,
+      'seq',
+      tableName
+    );
+    this.dropSequenceIfExists(sequenceName);
+  }
+
+  dropTable(tableName) {
+    const prefix = this.schema ? `"${this.schema}".` : '';
+    this.pushQuery(`drop table ${prefix}${this.formatter.wrap(tableName)}`);
+
+    // removing the sequence that was possibly generated by increments() column
+    this._dropRelatedSequenceIfExists(tableName);
+  }
+
+  dropTableIfExists(tableName) {
+    this.dropObject(tableName, 'table');
+  }
+
+  dropViewIfExists(viewName) {
+    this.dropObject(viewName, 'view');
+  }
+
+  dropObject(objectName, type) {
+    const prefix = this.schema ? `"${this.schema}".` : '';
+    let errorCode = -942;
+    if (type === 'materialized view') {
+      // https://stackoverflow.com/a/1801453
+      errorCode = -12003;
+    }
+    this.pushQuery(
+      utils.wrapSqlWithCatch(
+        `drop ${type} ${prefix}${this.formatter.wrap(objectName)}`,
+        errorCode
+      )
+    );
+
+    // removing the sequence that was possibly generated by increments() column
+    this._dropRelatedSequenceIfExists(objectName);
+  }
+
+  refreshMaterializedView(viewName) {
+    return this.pushQuery({
+      sql: `BEGIN DBMS_MVIEW.REFRESH('${
+        this.schemaNameRaw ? this.schemaNameRaw + '.' : ''
+      }${viewName}'); END;`,
+    });
+  }
+
+  dropMaterializedView(viewName) {
+    this._dropView(viewName, false, true);
+  }
+
+  dropMaterializedViewIfExists(viewName) {
+    this.dropObject(viewName, 'materialized view');
+  }
+}
+
+module.exports = SchemaCompiler_Oracle;

package/lib/dialects/oracle/schema/oracle-tablecompiler.js

@@ -1,190 +1,190 @@
-/* eslint max-len:0 */
-
-const utils = require('../utils');
-const TableCompiler = require('../../../schema/tablecompiler');
-const helpers = require('../../../util/helpers');
-const Trigger = require('./internal/trigger');
-const { isObject } = require('../../../util/is');
-
-// Table Compiler
-// ------
-
-class TableCompiler_Oracle extends TableCompiler {
-  constructor() {
-    super(...arguments);
-  }
-
-  addColumns(columns, prefix) {
-    if (columns.sql.length > 0) {
-      prefix = prefix || this.addColumnsPrefix;
-
-      const columnSql = columns.sql;
-      const alter = this.lowerCase ? 'alter table ' : 'ALTER TABLE ';
-
-      let sql = `${alter}${this.tableName()} ${prefix}`;
-      if (columns.sql.length > 1) {
-        sql += `(${columnSql.join(', ')})`;
-      } else {
-        sql += columnSql.join(', ');
-      }
-
-      this.pushQuery({
-        sql,
-        bindings: columns.bindings,
-      });
-    }
-  }
-
-  // Compile a rename column command.
-  renameColumn(from, to) {
-    // Remove quotes around tableName
-    const tableName = this.tableName().slice(1, -1);
-    return this.pushQuery(
-      Trigger.renameColumnTrigger(this.client.logger, tableName, from, to)
-    );
-  }
-
-  compileAdd(builder) {
-    const table = this.formatter.wrap(builder);
-    const columns = this.prefixArray('add column', this.getColumns(builder));
-    return this.pushQuery({
-      sql: `alter table ${table} ${columns.join(', ')}`,
-    });
-  }
-
-  // Adds the "create" query to the query sequence.
-  createQuery(columns, ifNot, like) {
-    const columnsSql =
-      like && this.tableNameLike()
-        ? ' as (select * from ' + this.tableNameLike() + ' where 0=1)'
-        : ' (' + columns.sql.join(', ') + this._addChecks() + ')';
-    const sql = `create table ${this.tableName()}${columnsSql}`;
-
-    this.pushQuery({
-      // catch "name is already used by an existing object" for workaround for "if not exists"
-      sql: ifNot ? utils.wrapSqlWithCatch(sql, -955) : sql,
-      bindings: columns.bindings,
-    });
-    if (this.single.comment) this.comment(this.single.comment);
-    if (like) {
-      this.addColumns(columns, this.addColumnsPrefix);
-    }
-  }
-
-  // Compiles the comment on the table.
-  comment(comment) {
-    this.pushQuery(`comment on table ${this.tableName()} is '${comment}'`);
-  }
-
-  dropColumn() {
-    const columns = helpers.normalizeArr.apply(null, arguments);
-    this.pushQuery(
-      `alter table ${this.tableName()} drop (${this.formatter.columnize(
-        columns
-      )})`
-    );
-  }
-
-  _indexCommand(type, tableName, columns) {
-    return this.formatter.wrap(
-      utils.generateCombinedName(this.client.logger, type, tableName, columns)
-    );
-  }
-
-  primary(columns, constraintName) {
-    let deferrable;
-    if (isObject(constraintName)) {
-      ({ constraintName, deferrable } = constraintName);
-    }
-    deferrable = deferrable ? ` deferrable initially ${deferrable}` : '';
-    constraintName = constraintName
-      ? this.formatter.wrap(constraintName)
-      : this.formatter.wrap(`${this.tableNameRaw}_pkey`);
-    const primaryCols = columns;
-    let incrementsCols = [];
-    if (this.grouped.columns) {
-      incrementsCols = this._getIncrementsColumnNames();
-      if (incrementsCols) {
-        incrementsCols.forEach((c) => {
-          if (!primaryCols.includes(c)) {
-            primaryCols.unshift(c);
-          }
-        });
-      }
-    }
-    this.pushQuery(
-      `alter table ${this.tableName()} add constraint ${constraintName} primary key (${this.formatter.columnize(
-        primaryCols
-      )})${deferrable}`
-    );
-  }
-
-  dropPrimary(constraintName) {
-    constraintName = constraintName
-      ? this.formatter.wrap(constraintName)
-      : this.formatter.wrap(this.tableNameRaw + '_pkey');
-    this.pushQuery(
-      `alter table ${this.tableName()} drop constraint ${constraintName}`
-    );
-  }
-
-  index(columns, indexName) {
-    indexName = indexName
-      ? this.formatter.wrap(indexName)
-      : this._indexCommand('index', this.tableNameRaw, columns);
-    this.pushQuery(
-      `create index ${indexName} on ${this.tableName()}` +
-        ' (' +
-        this.formatter.columnize(columns) +
-        ')'
-    );
-  }
-
-  dropIndex(columns, indexName) {
-    indexName = indexName
-      ? this.formatter.wrap(indexName)
-      : this._indexCommand('index', this.tableNameRaw, columns);
-    this.pushQuery(`drop index ${indexName}`);
-  }
-
-  unique(columns, indexName) {
-    let deferrable;
-    if (isObject(indexName)) {
-      ({ indexName, deferrable } = indexName);
-    }
-    deferrable = deferrable ? ` deferrable initially ${deferrable}` : '';
-    indexName = indexName
-      ? this.formatter.wrap(indexName)
-      : this._indexCommand('unique', this.tableNameRaw, columns);
-    this.pushQuery(
-      `alter table ${this.tableName()} add constraint ${indexName}` +
-        ' unique (' +
-        this.formatter.columnize(columns) +
-        ')' +
-        deferrable
-    );
-  }
-
-  dropUnique(columns, indexName) {
-    indexName = indexName
-      ? this.formatter.wrap(indexName)
-      : this._indexCommand('unique', this.tableNameRaw, columns);
-    this.pushQuery(
-      `alter table ${this.tableName()} drop constraint ${indexName}`
-    );
-  }
-
-  dropForeign(columns, indexName) {
-    indexName = indexName
-      ? this.formatter.wrap(indexName)
-      : this._indexCommand('foreign', this.tableNameRaw, columns);
-    this.pushQuery(
-      `alter table ${this.tableName()} drop constraint ${indexName}`
-    );
-  }
-}
-
-TableCompiler_Oracle.prototype.addColumnsPrefix = 'add ';
-TableCompiler_Oracle.prototype.alterColumnsPrefix = 'modify ';
-
-module.exports = TableCompiler_Oracle;
+/* eslint max-len:0 */
+
+const utils = require('../utils');
+const TableCompiler = require('../../../schema/tablecompiler');
+const helpers = require('../../../util/helpers');
+const Trigger = require('./internal/trigger');
+const { isObject } = require('../../../util/is');
+
+// Table Compiler
+// ------
+
+class TableCompiler_Oracle extends TableCompiler {
+  constructor() {
+    super(...arguments);
+  }
+
+  addColumns(columns, prefix) {
+    if (columns.sql.length > 0) {
+      prefix = prefix || this.addColumnsPrefix;
+
+      const columnSql = columns.sql;
+      const alter = this.lowerCase ? 'alter table ' : 'ALTER TABLE ';
+
+      let sql = `${alter}${this.tableName()} ${prefix}`;
+      if (columns.sql.length > 1) {
+        sql += `(${columnSql.join(', ')})`;
+      } else {
+        sql += columnSql.join(', ');
+      }
+
+      this.pushQuery({
+        sql,
+        bindings: columns.bindings,
+      });
+    }
+  }
+
+  // Compile a rename column command.
+  renameColumn(from, to) {
+    // Remove quotes around tableName
+    const tableName = this.tableName().slice(1, -1);
+    return this.pushQuery(
+      Trigger.renameColumnTrigger(this.client.logger, tableName, from, to)
+    );
+  }
+
+  compileAdd(builder) {
+    const table = this.formatter.wrap(builder);
+    const columns = this.prefixArray('add column', this.getColumns(builder));
+    return this.pushQuery({
+      sql: `alter table ${table} ${columns.join(', ')}`,
+    });
+  }
+
+  // Adds the "create" query to the query sequence.
+  createQuery(columns, ifNot, like) {
+    const columnsSql =
+      like && this.tableNameLike()
+        ? ' as (select * from ' + this.tableNameLike() + ' where 0=1)'
+        : ' (' + columns.sql.join(', ') + this._addChecks() + ')';
+    const sql = `create table ${this.tableName()}${columnsSql}`;
+
+    this.pushQuery({
+      // catch "name is already used by an existing object" for workaround for "if not exists"
+      sql: ifNot ? utils.wrapSqlWithCatch(sql, -955) : sql,
+      bindings: columns.bindings,
+    });
+    if (this.single.comment) this.comment(this.single.comment);
+    if (like) {
+      this.addColumns(columns, this.addColumnsPrefix);
+    }
+  }
+
+  // Compiles the comment on the table.
+  comment(comment) {
+    this.pushQuery(`comment on table ${this.tableName()} is '${comment}'`);
+  }
+
+  dropColumn() {
+    const columns = helpers.normalizeArr.apply(null, arguments);
+    this.pushQuery(
+      `alter table ${this.tableName()} drop (${this.formatter.columnize(
+        columns
+      )})`
+    );
+  }
+
+  _indexCommand(type, tableName, columns) {
+    return this.formatter.wrap(
+      utils.generateCombinedName(this.client.logger, type, tableName, columns)
+    );
+  }
+
+  primary(columns, constraintName) {
+    let deferrable;
+    if (isObject(constraintName)) {
+      ({ constraintName, deferrable } = constraintName);
+    }
+    deferrable = deferrable ? ` deferrable initially ${deferrable}` : '';
+    constraintName = constraintName
+      ? this.formatter.wrap(constraintName)
+      : this.formatter.wrap(`${this.tableNameRaw}_pkey`);
+    const primaryCols = columns;
+    let incrementsCols = [];
+    if (this.grouped.columns) {
+      incrementsCols = this._getIncrementsColumnNames();
+      if (incrementsCols) {
+        incrementsCols.forEach((c) => {
+          if (!primaryCols.includes(c)) {
+            primaryCols.unshift(c);
+          }
+        });
+      }
+    }
+    this.pushQuery(
+      `alter table ${this.tableName()} add constraint ${constraintName} primary key (${this.formatter.columnize(
+        primaryCols
+      )})${deferrable}`
+    );
+  }
+
+  dropPrimary(constraintName) {
+    constraintName = constraintName
+      ? this.formatter.wrap(constraintName)
+      : this.formatter.wrap(this.tableNameRaw + '_pkey');
+    this.pushQuery(
+      `alter table ${this.tableName()} drop constraint ${constraintName}`
+    );
+  }
+
+  index(columns, indexName) {
+    indexName = indexName
+      ? this.formatter.wrap(indexName)
+      : this._indexCommand('index', this.tableNameRaw, columns);
+    this.pushQuery(
+      `create index ${indexName} on ${this.tableName()}` +
+        ' (' +
+        this.formatter.columnize(columns) +
+        ')'
+    );
+  }
+
+  dropIndex(columns, indexName) {
+    indexName = indexName
+      ? this.formatter.wrap(indexName)
+      : this._indexCommand('index', this.tableNameRaw, columns);
+    this.pushQuery(`drop index ${indexName}`);
+  }
+
+  unique(columns, indexName) {
+    let deferrable;
+    if (isObject(indexName)) {
+      ({ indexName, deferrable } = indexName);
+    }
+    deferrable = deferrable ? ` deferrable initially ${deferrable}` : '';
+    indexName = indexName
+      ? this.formatter.wrap(indexName)
+      : this._indexCommand('unique', this.tableNameRaw, columns);
+    this.pushQuery(
+      `alter table ${this.tableName()} add constraint ${indexName}` +
+        ' unique (' +
+        this.formatter.columnize(columns) +
+        ')' +
+        deferrable
+    );
+  }
+
+  dropUnique(columns, indexName) {
+    indexName = indexName
+      ? this.formatter.wrap(indexName)
+      : this._indexCommand('unique', this.tableNameRaw, columns);
+    this.pushQuery(
+      `alter table ${this.tableName()} drop constraint ${indexName}`
+    );
+  }
+
+  dropForeign(columns, indexName) {
+    indexName = indexName
+      ? this.formatter.wrap(indexName)
+      : this._indexCommand('foreign', this.tableNameRaw, columns);
+    this.pushQuery(
+      `alter table ${this.tableName()} drop constraint ${indexName}`
+    );
+  }
+}
+
+TableCompiler_Oracle.prototype.addColumnsPrefix = 'add ';
+TableCompiler_Oracle.prototype.alterColumnsPrefix = 'modify ';
+
+module.exports = TableCompiler_Oracle;