From 0b2a2ca4d1fbe2339974e4521945684ad1a37eb7 Mon Sep 17 00:00:00 2001
From: Igor Savin <iselwin@gmail.com>
Date: Wed, 6 Jan 2021 23:21:10 +0200
Subject: [PATCH] Extract static method _num out of class. Use super-methods
 (#4212)

---
 .../mssql/schema/mssql-columncompiler.js      |  5 +--
 .../mysql/schema/mysql-columncompiler.js      | 11 ++++---
 .../oracle/schema/internal/incrementUtils.js  | 18 +++++++++++
 .../oracle/schema/{ => internal}/trigger.js   |  2 +-
 .../oracle/schema/oracle-columncompiler.js    | 32 +++++++------------
 lib/dialects/oracle/schema/oracle-compiler.js |  2 +-
 .../oracle/schema/oracle-tablecompiler.js     |  2 +-
 lib/dialects/postgres/query/compiler.js       |  2 +-
 .../postgres/schema/pg-columncompiler.js      |  3 +-
 lib/dialects/redshift/index.js                |  2 +-
 .../{compiler.js => reshift-querycompiler.js} |  0
 .../redshift/schema/redshift-tablecompiler.js |  7 +---
 lib/schema/columncompiler.js                  | 13 +++-----
 lib/util/helpers.js                           |  9 +++++-
 ...tom-type.spec.js => specific-type.spec.js} |  0
 15 files changed, 58 insertions(+), 50 deletions(-)
 create mode 100644 lib/dialects/oracle/schema/internal/incrementUtils.js
 rename lib/dialects/oracle/schema/{ => internal}/trigger.js (99%)
 rename lib/dialects/redshift/query/{compiler.js => reshift-querycompiler.js} (100%)
 rename test/integration2/schema/{custom-type.spec.js => specific-type.spec.js} (100%)

diff --git a/lib/dialects/mssql/schema/mssql-columncompiler.js b/lib/dialects/mssql/schema/mssql-columncompiler.js
index 7985a9152..491f0b888 100644
--- a/lib/dialects/mssql/schema/mssql-columncompiler.js
+++ b/lib/dialects/mssql/schema/mssql-columncompiler.js
@@ -1,6 +1,7 @@
 // MSSQL Column Compiler
 // -------
 const ColumnCompiler = require('../../../schema/columncompiler');
+const { toNumber } = require('../../../util/helpers');
 
 class ColumnCompiler_MSSQL extends ColumnCompiler {
   constructor() {
@@ -31,7 +32,7 @@ class ColumnCompiler_MSSQL extends ColumnCompiler {
   }
 
   varchar(length) {
-    return `nvarchar(${this._num(length, 255)})`;
+    return `nvarchar(${toNumber(length, 255)})`;
   }
 
   timestamp({ useTz = false } = {}) {
@@ -46,7 +47,7 @@ class ColumnCompiler_MSSQL extends ColumnCompiler {
   }
 
   binary(length) {
-    return length ? `varbinary(${this._num(length)})` : 'varbinary(max)';
+    return length ? `varbinary(${toNumber(length)})` : 'varbinary(max)';
   }
 
   // Modifiers
diff --git a/lib/dialects/mysql/schema/mysql-columncompiler.js b/lib/dialects/mysql/schema/mysql-columncompiler.js
index 5c6e42d7b..c050eeb9a 100644
--- a/lib/dialects/mysql/schema/mysql-columncompiler.js
+++ b/lib/dialects/mysql/schema/mysql-columncompiler.js
@@ -2,6 +2,7 @@
 // -------
 const ColumnCompiler = require('../../../schema/columncompiler');
 const { isObject } = require('../../../util/is');
+const { toNumber } = require('../../../util/helpers');
 
 const commentEscapeRegex = /(?<!\\)'/g;
 
@@ -24,16 +25,16 @@ class ColumnCompiler_MySQL extends ColumnCompiler {
 
   double(precision, scale) {
     if (!precision) return 'double';
-    return `double(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
+    return `double(${toNumber(precision, 8)}, ${toNumber(scale, 2)})`;
   }
 
   integer(length) {
-    length = length ? `(${this._num(length, 11)})` : '';
+    length = length ? `(${toNumber(length, 11)})` : '';
     return `int${length}`;
   }
 
   tinyint(length) {
-    length = length ? `(${this._num(length, 1)})` : '';
+    length = length ? `(${toNumber(length, 1)})` : '';
     return `tinyint${length}`;
   }
 
@@ -91,11 +92,11 @@ class ColumnCompiler_MySQL extends ColumnCompiler {
   }
 
   bit(length) {
-    return length ? `bit(${this._num(length)})` : 'bit';
+    return length ? `bit(${toNumber(length)})` : 'bit';
   }
 
   binary(length) {
-    return length ? `varbinary(${this._num(length)})` : 'blob';
+    return length ? `varbinary(${toNumber(length)})` : 'blob';
   }
 
   json() {
diff --git a/lib/dialects/oracle/schema/internal/incrementUtils.js b/lib/dialects/oracle/schema/internal/incrementUtils.js
new file mode 100644
index 000000000..775c83b5f
--- /dev/null
+++ b/lib/dialects/oracle/schema/internal/incrementUtils.js
@@ -0,0 +1,18 @@
+const Trigger = require('./trigger');
+
+// helper function for pushAdditional in increments() and bigincrements()
+function createAutoIncrementTriggerAndSequence(columnCompiler) {
+  // TODO Add warning that sequence etc is created
+  columnCompiler.pushAdditional(function () {
+    const tableName = this.tableCompiler.tableNameRaw;
+    const createTriggerSQL = Trigger.createAutoIncrementTrigger(
+      this.client.logger,
+      tableName
+    );
+    this.pushQuery(createTriggerSQL);
+  });
+}
+
+module.exports = {
+  createAutoIncrementTriggerAndSequence,
+};
diff --git a/lib/dialects/oracle/schema/trigger.js b/lib/dialects/oracle/schema/internal/trigger.js
similarity index 99%
rename from lib/dialects/oracle/schema/trigger.js
rename to lib/dialects/oracle/schema/internal/trigger.js
index f23eda419..534aab498 100644
--- a/lib/dialects/oracle/schema/trigger.js
+++ b/lib/dialects/oracle/schema/internal/trigger.js
@@ -1,4 +1,4 @@
-const utils = require('../utils');
+const utils = require('../../utils');
 
 const trigger = {
   renameColumnTrigger: function (logger, tableName, columnName, to) {
diff --git a/lib/dialects/oracle/schema/oracle-columncompiler.js b/lib/dialects/oracle/schema/oracle-columncompiler.js
index eb3be9525..ba41d6cbf 100644
--- a/lib/dialects/oracle/schema/oracle-columncompiler.js
+++ b/lib/dialects/oracle/schema/oracle-columncompiler.js
@@ -1,7 +1,10 @@
 const uniq = require('lodash/uniq');
 const Raw = require('../../../raw');
 const ColumnCompiler = require('../../../schema/columncompiler');
-const Trigger = require('./trigger');
+const {
+  createAutoIncrementTriggerAndSequence,
+} = require('./internal/incrementUtils');
+const { toNumber } = require('../../../util/helpers');
 
 // Column Compiler
 // -------
@@ -12,46 +15,33 @@ class ColumnCompiler_Oracle extends ColumnCompiler {
     this.modifiers = ['defaultTo', 'checkIn', 'nullable', 'comment'];
   }
 
-  // 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();
+    createAutoIncrementTriggerAndSequence(this);
     return 'integer not null primary key';
   }
 
   bigincrements() {
-    this._createAutoIncrementTriggerAndSequence();
+    createAutoIncrementTriggerAndSequence(this);
     return 'number(20, 0) not null primary key';
   }
 
   floating(precision) {
-    const parsedPrecision = this._num(precision, 0);
+    const parsedPrecision = toNumber(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)})`;
+    return `number(${toNumber(precision, 8)}, ${toNumber(scale, 2)})`;
   }
 
   decimal(precision, scale) {
     if (precision === null) return 'decimal';
-    return `decimal(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
+    return `decimal(${toNumber(precision, 8)}, ${toNumber(scale, 2)})`;
   }
 
   integer(length) {
-    return length ? `number(${this._num(length, 11)})` : 'integer';
+    return length ? `number(${toNumber(length, 11)})` : 'integer';
   }
 
   enu(allowed) {
@@ -82,7 +72,7 @@ class ColumnCompiler_Oracle extends ColumnCompiler {
   }
 
   varchar(length) {
-    return `varchar2(${this._num(length, 255)})`;
+    return `varchar2(${toNumber(length, 255)})`;
   }
 
   // Modifiers
diff --git a/lib/dialects/oracle/schema/oracle-compiler.js b/lib/dialects/oracle/schema/oracle-compiler.js
index 7a7a8d5db..14ffa6424 100644
--- a/lib/dialects/oracle/schema/oracle-compiler.js
+++ b/lib/dialects/oracle/schema/oracle-compiler.js
@@ -2,7 +2,7 @@
 // -------
 const SchemaCompiler = require('../../../schema/compiler');
 const utils = require('../utils');
-const Trigger = require('./trigger');
+const Trigger = require('./internal/trigger');
 
 class SchemaCompiler_Oracle extends SchemaCompiler {
   constructor() {
diff --git a/lib/dialects/oracle/schema/oracle-tablecompiler.js b/lib/dialects/oracle/schema/oracle-tablecompiler.js
index 876fdc4bf..a0759479b 100644
--- a/lib/dialects/oracle/schema/oracle-tablecompiler.js
+++ b/lib/dialects/oracle/schema/oracle-tablecompiler.js
@@ -3,7 +3,7 @@
 const utils = require('../utils');
 const TableCompiler = require('../../../schema/tablecompiler');
 const helpers = require('../../../util/helpers');
-const Trigger = require('./trigger');
+const Trigger = require('./internal/trigger');
 
 // Table Compiler
 // ------
diff --git a/lib/dialects/postgres/query/compiler.js b/lib/dialects/postgres/query/compiler.js
index a06c2b15d..ec34fc9b5 100644
--- a/lib/dialects/postgres/query/compiler.js
+++ b/lib/dialects/postgres/query/compiler.js
@@ -21,7 +21,7 @@ class QueryCompiler_PG extends QueryCompiler {
   // Compiles an `insert` query, allowing for multiple
   // inserts using a single query statement.
   insert() {
-    let sql = QueryCompiler.prototype.insert.call(this);
+    let sql = super.insert();
     if (sql === '') return sql;
 
     const { returning, onConflict, ignore, merge, insert } = this.single;
diff --git a/lib/dialects/postgres/schema/pg-columncompiler.js b/lib/dialects/postgres/schema/pg-columncompiler.js
index f784ba16e..5a0c52b08 100644
--- a/lib/dialects/postgres/schema/pg-columncompiler.js
+++ b/lib/dialects/postgres/schema/pg-columncompiler.js
@@ -3,6 +3,7 @@
 
 const ColumnCompiler = require('../../../schema/columncompiler');
 const { isObject } = require('../../../util/is');
+const { toNumber } = require('../../../util/helpers');
 const commentEscapeRegex = /(?<!')'(?!')/g;
 
 class ColumnCompiler_PG extends ColumnCompiler {
@@ -51,7 +52,7 @@ class ColumnCompiler_PG extends ColumnCompiler {
 
   decimal(precision, scale) {
     if (precision === null) return 'decimal';
-    return `decimal(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
+    return `decimal(${toNumber(precision, 8)}, ${toNumber(scale, 2)})`;
   }
 
   json(jsonb) {
diff --git a/lib/dialects/redshift/index.js b/lib/dialects/redshift/index.js
index 9b46c63ea..37920bdbe 100644
--- a/lib/dialects/redshift/index.js
+++ b/lib/dialects/redshift/index.js
@@ -5,7 +5,7 @@ const Client_PG = require('../postgres');
 const map = require('lodash/map');
 
 const Transaction = require('./transaction');
-const QueryCompiler = require('./query/compiler');
+const QueryCompiler = require('./query/reshift-querycompiler');
 const ColumnBuilder = require('./schema/redshift-columnbuilder');
 const ColumnCompiler = require('./schema/redshift-columncompiler');
 const TableCompiler = require('./schema/redshift-tablecompiler');
diff --git a/lib/dialects/redshift/query/compiler.js b/lib/dialects/redshift/query/reshift-querycompiler.js
similarity index 100%
rename from lib/dialects/redshift/query/compiler.js
rename to lib/dialects/redshift/query/reshift-querycompiler.js
diff --git a/lib/dialects/redshift/schema/redshift-tablecompiler.js b/lib/dialects/redshift/schema/redshift-tablecompiler.js
index 3267b3884..c7ebc184a 100644
--- a/lib/dialects/redshift/schema/redshift-tablecompiler.js
+++ b/lib/dialects/redshift/schema/redshift-tablecompiler.js
@@ -94,12 +94,7 @@ class TableCompiler_Redshift extends TableCompiler_PG {
   // Compiles column add. Redshift can only add one column per ALTER TABLE, so core addColumns doesn't work.  #2545
   addColumns(columns, prefix, colCompilers) {
     if (prefix === this.alterColumnsPrefix) {
-      TableCompiler_PG.prototype.addColumns.call(
-        this,
-        columns,
-        prefix,
-        colCompilers
-      );
+      super.addColumns(columns, prefix, colCompilers);
     } else {
       prefix = prefix || this.addColumnsPrefix;
       colCompilers = colCompilers || this.getColumns();
diff --git a/lib/schema/columncompiler.js b/lib/schema/columncompiler.js
index 426f6fa1d..9735b6d09 100644
--- a/lib/schema/columncompiler.js
+++ b/lib/schema/columncompiler.js
@@ -9,6 +9,7 @@ const first = require('lodash/first');
 const has = require('lodash/has');
 const tail = require('lodash/tail');
 const { isObject } = require('../util/is');
+const { toNumber } = require('../util/helpers');
 
 class ColumnCompiler {
   constructor(client, tableCompiler, columnBuilder) {
@@ -90,11 +91,11 @@ class ColumnCompiler {
   // Types
   // ------
   varchar(length) {
-    return `varchar(${this._num(length, 255)})`;
+    return `varchar(${toNumber(length, 255)})`;
   }
 
   floating(precision, scale) {
-    return `float(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
+    return `float(${toNumber(precision, 8)}, ${toNumber(scale, 2)})`;
   }
 
   decimal(precision, scale) {
@@ -103,7 +104,7 @@ class ColumnCompiler {
         'Specifying no precision on decimal columns is not supported for that SQL dialect.'
       );
     }
-    return `decimal(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
+    return `decimal(${toNumber(precision, 8)}, ${toNumber(scale, 2)})`;
   }
 
   // Used to support custom types
@@ -142,12 +143,6 @@ class ColumnCompiler {
     }
     return `default ${value}`;
   }
-
-  _num(val, fallback) {
-    if (val === undefined || val === null) return fallback;
-    const number = parseInt(val, 10);
-    return isNaN(number) ? fallback : number;
-  }
 }
 
 ColumnCompiler.prototype.binary = 'blob';
diff --git a/lib/util/helpers.js b/lib/util/helpers.js
index 10603023c..c0532e2e6 100644
--- a/lib/util/helpers.js
+++ b/lib/util/helpers.js
@@ -83,10 +83,17 @@ function resolveClientNameWithAliases(clientName) {
   return CLIENT_ALIASES[clientName] || clientName;
 }
 
+function toNumber(val, fallback) {
+  if (val === undefined || val === null) return fallback;
+  const number = parseInt(val, 10);
+  return isNaN(number) ? fallback : number;
+}
+
 module.exports = {
   addQueryContext,
   containsUndefined,
+  getUndefinedIndices,
   normalizeArr,
   resolveClientNameWithAliases,
-  getUndefinedIndices,
+  toNumber,
 };
diff --git a/test/integration2/schema/custom-type.spec.js b/test/integration2/schema/specific-type.spec.js
similarity index 100%
rename from test/integration2/schema/custom-type.spec.js
rename to test/integration2/schema/specific-type.spec.js