knex 2.4.1 → 2.4.2

package/lib/dialects/sqlite3/schema/internal/sqlite-ddl-operations.js

@@ -1,41 +1,41 @@
-function copyData(sourceTable, targetTable, columns) {
-  return `INSERT INTO "${targetTable}" SELECT ${
-    columns === undefined
-      ? '*'
-      : columns.map((column) => `"${column}"`).join(', ')
-  } FROM "${sourceTable}";`;
-}
-
-function dropOriginal(tableName) {
-  return `DROP TABLE "${tableName}"`;
-}
-
-function renameTable(tableName, alteredName) {
-  return `ALTER TABLE "${tableName}" RENAME TO "${alteredName}"`;
-}
-
-function getTableSql(tableName) {
-  return `SELECT type, sql FROM sqlite_master WHERE (type='table' OR (type='index' AND sql IS NOT NULL)) AND tbl_name='${tableName}'`;
-}
-
-function isForeignCheckEnabled() {
-  return `PRAGMA foreign_keys`;
-}
-
-function setForeignCheck(enable) {
-  return `PRAGMA foreign_keys = ${enable ? 'ON' : 'OFF'}`;
-}
-
-function executeForeignCheck() {
-  return `PRAGMA foreign_key_check`;
-}
-
-module.exports = {
-  copyData,
-  dropOriginal,
-  renameTable,
-  getTableSql,
-  isForeignCheckEnabled,
-  setForeignCheck,
-  executeForeignCheck,
-};
+function copyData(sourceTable, targetTable, columns) {
+  return `INSERT INTO "${targetTable}" SELECT ${
+    columns === undefined
+      ? '*'
+      : columns.map((column) => `"${column}"`).join(', ')
+  } FROM "${sourceTable}";`;
+}
+
+function dropOriginal(tableName) {
+  return `DROP TABLE "${tableName}"`;
+}
+
+function renameTable(tableName, alteredName) {
+  return `ALTER TABLE "${tableName}" RENAME TO "${alteredName}"`;
+}
+
+function getTableSql(tableName) {
+  return `SELECT type, sql FROM sqlite_master WHERE (type='table' OR (type='index' AND sql IS NOT NULL)) AND tbl_name='${tableName}'`;
+}
+
+function isForeignCheckEnabled() {
+  return `PRAGMA foreign_keys`;
+}
+
+function setForeignCheck(enable) {
+  return `PRAGMA foreign_keys = ${enable ? 'ON' : 'OFF'}`;
+}
+
+function executeForeignCheck() {
+  return `PRAGMA foreign_key_check`;
+}
+
+module.exports = {
+  copyData,
+  dropOriginal,
+  renameTable,
+  getTableSql,
+  isForeignCheckEnabled,
+  setForeignCheck,
+  executeForeignCheck,
+};

package/lib/dialects/sqlite3/schema/internal/tokenizer.js

@@ -1,38 +1,38 @@
-function tokenize(text, tokens) {
-  const compiledRegex = new RegExp(
-    Object.entries(tokens)
-      .map(([type, regex]) => `(?<${type}>${regex.source})`)
-      .join('|'),
-    'yi'
-  );
-
-  let index = 0;
-  const ast = [];
-
-  while (index < text.length) {
-    compiledRegex.lastIndex = index;
-    const result = text.match(compiledRegex);
-
-    if (result !== null) {
-      const [type, text] = Object.entries(result.groups).find(
-        ([name, group]) => group !== undefined
-      );
-
-      index += text.length;
-
-      if (!type.startsWith('_')) {
-        ast.push({ type, text });
-      }
-    } else {
-      throw new Error(
-        `No matching tokenizer rule found at: [${text.substring(index)}]`
-      );
-    }
-  }
-
-  return ast;
-}
-
-module.exports = {
-  tokenize,
-};
+function tokenize(text, tokens) {
+  const compiledRegex = new RegExp(
+    Object.entries(tokens)
+      .map(([type, regex]) => `(?<${type}>${regex.source})`)
+      .join('|'),
+    'yi'
+  );
+
+  let index = 0;
+  const ast = [];
+
+  while (index < text.length) {
+    compiledRegex.lastIndex = index;
+    const result = text.match(compiledRegex);
+
+    if (result !== null) {
+      const [type, text] = Object.entries(result.groups).find(
+        ([name, group]) => group !== undefined
+      );
+
+      index += text.length;
+
+      if (!type.startsWith('_')) {
+        ast.push({ type, text });
+      }
+    } else {
+      throw new Error(
+        `No matching tokenizer rule found at: [${text.substring(index)}]`
+      );
+    }
+  }
+
+  return ast;
+}
+
+module.exports = {
+  tokenize,
+};

package/lib/dialects/sqlite3/schema/internal/utils.js

@@ -1,12 +1,12 @@
-function isEqualId(first, second) {
-  return first.toLowerCase() === second.toLowerCase();
-}
-
-function includesId(list, id) {
-  return list.some((item) => isEqualId(item, id));
-}
-
-module.exports = {
-  isEqualId,
-  includesId,
-};
+function isEqualId(first, second) {
+  return first.toLowerCase() === second.toLowerCase();
+}
+
+function includesId(list, id) {
+  return list.some((item) => isEqualId(item, id));
+}
+
+module.exports = {
+  isEqualId,
+  includesId,
+};

package/lib/dialects/sqlite3/schema/sqlite-columncompiler.js

@@ -1,50 +1,50 @@
-const ColumnCompiler = require('../../../schema/columncompiler');
-
-// Column Compiler
-// -------
-
-class ColumnCompiler_SQLite3 extends ColumnCompiler {
-  constructor() {
-    super(...arguments);
-    this.modifiers = ['nullable', 'defaultTo'];
-    this._addCheckModifiers();
-  }
-
-  // Types
-  // -------
-
-  enu(allowed) {
-    return `text check (${this.formatter.wrap(
-      this.args[0]
-    )} in ('${allowed.join("', '")}'))`;
-  }
-
-  _pushAlterCheckQuery(checkPredicate, constraintName) {
-    throw new Error(
-      `Alter table with to add constraints is not permitted in SQLite`
-    );
-  }
-
-  checkRegex(regexes, constraintName) {
-    return this._check(
-      `${this.formatter.wrap(
-        this.getColumnName()
-      )} REGEXP ${this.client._escapeBinding(regexes)}`,
-      constraintName
-    );
-  }
-}
-
-ColumnCompiler_SQLite3.prototype.json = 'json';
-ColumnCompiler_SQLite3.prototype.jsonb = 'json';
-ColumnCompiler_SQLite3.prototype.double =
-  ColumnCompiler_SQLite3.prototype.decimal =
-  ColumnCompiler_SQLite3.prototype.floating =
-    'float';
-ColumnCompiler_SQLite3.prototype.timestamp = 'datetime';
-// autoincrement without primary key is a syntax error in SQLite, so it's necessary
-ColumnCompiler_SQLite3.prototype.increments =
-  ColumnCompiler_SQLite3.prototype.bigincrements =
-    'integer not null primary key autoincrement';
-
-module.exports = ColumnCompiler_SQLite3;
+const ColumnCompiler = require('../../../schema/columncompiler');
+
+// Column Compiler
+// -------
+
+class ColumnCompiler_SQLite3 extends ColumnCompiler {
+  constructor() {
+    super(...arguments);
+    this.modifiers = ['nullable', 'defaultTo'];
+    this._addCheckModifiers();
+  }
+
+  // Types
+  // -------
+
+  enu(allowed) {
+    return `text check (${this.formatter.wrap(
+      this.args[0]
+    )} in ('${allowed.join("', '")}'))`;
+  }
+
+  _pushAlterCheckQuery(checkPredicate, constraintName) {
+    throw new Error(
+      `Alter table with to add constraints is not permitted in SQLite`
+    );
+  }
+
+  checkRegex(regexes, constraintName) {
+    return this._check(
+      `${this.formatter.wrap(
+        this.getColumnName()
+      )} REGEXP ${this.client._escapeBinding(regexes)}`,
+      constraintName
+    );
+  }
+}
+
+ColumnCompiler_SQLite3.prototype.json = 'json';
+ColumnCompiler_SQLite3.prototype.jsonb = 'json';
+ColumnCompiler_SQLite3.prototype.double =
+  ColumnCompiler_SQLite3.prototype.decimal =
+  ColumnCompiler_SQLite3.prototype.floating =
+    'float';
+ColumnCompiler_SQLite3.prototype.timestamp = 'datetime';
+// autoincrement without primary key is a syntax error in SQLite, so it's necessary
+ColumnCompiler_SQLite3.prototype.increments =
+  ColumnCompiler_SQLite3.prototype.bigincrements =
+    'integer not null primary key autoincrement';
+
+module.exports = ColumnCompiler_SQLite3;

package/lib/dialects/sqlite3/schema/sqlite-compiler.js

@@ -1,80 +1,80 @@
-// SQLite3: Column Builder & Compiler
-// -------
-const SchemaCompiler = require('../../../schema/compiler');
-
-const some = require('lodash/some');
-
-// Schema Compiler
-// -------
-
-class SchemaCompiler_SQLite3 extends SchemaCompiler {
-  constructor(client, builder) {
-    super(client, builder);
-  }
-
-  // Compile the query to determine if a table exists.
-  hasTable(tableName) {
-    const sql =
-      `select * from sqlite_master ` +
-      `where type = 'table' and name = ${this.client.parameter(
-        this.formatter.wrap(tableName).replace(/`/g, ''),
-        this.builder,
-        this.bindingsHolder
-      )}`;
-    this.pushQuery({ sql, output: (resp) => resp.length > 0 });
-  }
-
-  // Compile the query to determine if a column exists.
-  hasColumn(tableName, column) {
-    this.pushQuery({
-      sql: `PRAGMA table_info(${this.formatter.wrap(tableName)})`,
-      output(resp) {
-        return some(resp, (col) => {
-          return (
-            this.client.wrapIdentifier(col.name.toLowerCase()) ===
-            this.client.wrapIdentifier(column.toLowerCase())
-          );
-        });
-      },
-    });
-  }
-
-  // Compile a rename table command.
-  renameTable(from, to) {
-    this.pushQuery(
-      `alter table ${this.formatter.wrap(from)} rename to ${this.formatter.wrap(
-        to
-      )}`
-    );
-  }
-
-  async generateDdlCommands() {
-    const sequence = this.builder._sequence;
-    for (let i = 0, l = sequence.length; i < l; i++) {
-      const query = sequence[i];
-      this[query.method].apply(this, query.args);
-    }
-
-    const commandSources = this.sequence;
-
-    if (commandSources.length === 1 && commandSources[0].statementsProducer) {
-      return commandSources[0].statementsProducer();
-    } else {
-      const result = [];
-
-      for (const commandSource of commandSources) {
-        const command = commandSource.sql;
-
-        if (Array.isArray(command)) {
-          result.push(...command);
-        } else {
-          result.push(command);
-        }
-      }
-
-      return { pre: [], sql: result, check: null, post: [] };
-    }
-  }
-}
-
-module.exports = SchemaCompiler_SQLite3;
+// SQLite3: Column Builder & Compiler
+// -------
+const SchemaCompiler = require('../../../schema/compiler');
+
+const some = require('lodash/some');
+
+// Schema Compiler
+// -------
+
+class SchemaCompiler_SQLite3 extends SchemaCompiler {
+  constructor(client, builder) {
+    super(client, builder);
+  }
+
+  // Compile the query to determine if a table exists.
+  hasTable(tableName) {
+    const sql =
+      `select * from sqlite_master ` +
+      `where type = 'table' and name = ${this.client.parameter(
+        this.formatter.wrap(tableName).replace(/`/g, ''),
+        this.builder,
+        this.bindingsHolder
+      )}`;
+    this.pushQuery({ sql, output: (resp) => resp.length > 0 });
+  }
+
+  // Compile the query to determine if a column exists.
+  hasColumn(tableName, column) {
+    this.pushQuery({
+      sql: `PRAGMA table_info(${this.formatter.wrap(tableName)})`,
+      output(resp) {
+        return some(resp, (col) => {
+          return (
+            this.client.wrapIdentifier(col.name.toLowerCase()) ===
+            this.client.wrapIdentifier(column.toLowerCase())
+          );
+        });
+      },
+    });
+  }
+
+  // Compile a rename table command.
+  renameTable(from, to) {
+    this.pushQuery(
+      `alter table ${this.formatter.wrap(from)} rename to ${this.formatter.wrap(
+        to
+      )}`
+    );
+  }
+
+  async generateDdlCommands() {
+    const sequence = this.builder._sequence;
+    for (let i = 0, l = sequence.length; i < l; i++) {
+      const query = sequence[i];
+      this[query.method].apply(this, query.args);
+    }
+
+    const commandSources = this.sequence;
+
+    if (commandSources.length === 1 && commandSources[0].statementsProducer) {
+      return commandSources[0].statementsProducer();
+    } else {
+      const result = [];
+
+      for (const commandSource of commandSources) {
+        const command = commandSource.sql;
+
+        if (Array.isArray(command)) {
+          result.push(...command);
+        } else {
+          result.push(command);
+        }
+      }
+
+      return { pre: [], sql: result, check: null, post: [] };
+    }
+  }
+}
+
+module.exports = SchemaCompiler_SQLite3;