knex 0.21.20 → 0.21.21

package/lib/dialects/mysql/query/compiler.js

@@ -1,142 +1,142 @@
-// MySQL Query Compiler
-// ------
-const QueryCompiler = require('../../../query/compiler');
-
-const identity = require('lodash/identity');
-
-class QueryCompiler_MySQL extends QueryCompiler {
-  constructor(client, builder) {
-    super(client, builder);
-
-    const { returning } = this.single;
-    if (returning) {
-      this.client.logger.warn(
-        '.returning() is not supported by mysql and will not have any effect.'
-      );
-    }
-
-    this._emptyInsertValue = '() values ()';
-  }
-
-  // Compiles an `insert` query, allowing for multiple
-  // inserts using a single query statement.
-  insert() {
-    let sql = super.insert();
-    if (sql === '') return sql;
-
-    const { ignore, merge, insert } = this.single;
-    if (ignore) sql = sql.replace('insert into', 'insert ignore into');
-    if (merge) {
-      sql += this._merge(merge.updates, insert);
-      const wheres = this.where();
-      if (wheres) {
-        throw new Error('.onConflict().merge().where() is not supported for mysql');
-      }
-    }
-
-    return sql;
-  }
-
-  _merge(updates, insert) {
-    let sql = ' on duplicate key update ';
-    if (updates) {
-      const updateData = this._prepUpdate(updates);
-      return sql + updateData.join(',');
-    } else {
-      const insertData = this._prepInsert(insert);
-      if (typeof insertData === 'string') {
-        throw new Error(
-          'If using merge with a raw insert query, then updates must be provided'
-        );
-      }
-
-      sql += insertData.columns
-        .map((column) => this.formatter.wrapAsIdentifier(column))
-        .map((column) => `${column} = values(${column})`)
-        .join(', ');
-
-      return sql;
-    }
-  }
-
-  // Update method, including joins, wheres, order & limits.
-  update() {
-    const join = this.join();
-    const updates = this._prepUpdate(this.single.update);
-    const where = this.where();
-    const order = this.order();
-    const limit = this.limit();
-    return (
-      `update ${this.tableName}` +
-      (join ? ` ${join}` : '') +
-      ' set ' +
-      updates.join(', ') +
-      (where ? ` ${where}` : '') +
-      (order ? ` ${order}` : '') +
-      (limit ? ` ${limit}` : '')
-    );
-  }
-
-  forUpdate() {
-    return 'for update';
-  }
-
-  forShare() {
-    return 'lock in share mode';
-  }
-
-  // Only supported on MySQL 8.0+
-  skipLocked() {
-    return 'skip locked';
-  }
-
-  // Supported on MySQL 8.0+ and MariaDB 10.3.0+
-  noWait() {
-    return 'nowait';
-  }
-
-  // Compiles a `columnInfo` query.
-  columnInfo() {
-    const column = this.single.columnInfo;
-
-    // The user may have specified a custom wrapIdentifier function in the config. We
-    // need to run the identifiers through that function, but not format them as
-    // identifiers otherwise.
-    const table = this.client.customWrapIdentifier(this.single.table, identity);
-
-    return {
-      sql:
-        'select * from information_schema.columns where table_name = ? and table_schema = ?',
-      bindings: [table, this.client.database()],
-      output(resp) {
-        const out = resp.reduce(function (columns, val) {
-          columns[val.COLUMN_NAME] = {
-            defaultValue: val.COLUMN_DEFAULT,
-            type: val.DATA_TYPE,
-            maxLength: val.CHARACTER_MAXIMUM_LENGTH,
-            nullable: val.IS_NULLABLE === 'YES',
-          };
-          return columns;
-        }, {});
-        return (column && out[column]) || out;
-      },
-    };
-  }
-
-  limit() {
-    const noLimit = !this.single.limit && this.single.limit !== 0;
-    if (noLimit && !this.single.offset) return '';
-
-    // Workaround for offset only.
-    // see: http://stackoverflow.com/questions/255517/mysql-offset-infinite-rows
-    const limit =
-      this.single.offset && noLimit
-        ? '18446744073709551615'
-        : this.formatter.parameter(this.single.limit);
-    return `limit ${limit}`;
-  }
-}
-
-// Set the QueryBuilder & QueryCompiler on the client object,
-// in case anyone wants to modify things to suit their own purposes.
-module.exports = QueryCompiler_MySQL;
+// MySQL Query Compiler
+// ------
+const QueryCompiler = require('../../../query/compiler');
+
+const identity = require('lodash/identity');
+
+class QueryCompiler_MySQL extends QueryCompiler {
+  constructor(client, builder) {
+    super(client, builder);
+
+    const { returning } = this.single;
+    if (returning) {
+      this.client.logger.warn(
+        '.returning() is not supported by mysql and will not have any effect.'
+      );
+    }
+
+    this._emptyInsertValue = '() values ()';
+  }
+
+  // Compiles an `insert` query, allowing for multiple
+  // inserts using a single query statement.
+  insert() {
+    let sql = super.insert();
+    if (sql === '') return sql;
+
+    const { ignore, merge, insert } = this.single;
+    if (ignore) sql = sql.replace('insert into', 'insert ignore into');
+    if (merge) {
+      sql += this._merge(merge.updates, insert);
+      const wheres = this.where();
+      if (wheres) {
+        throw new Error('.onConflict().merge().where() is not supported for mysql');
+      }
+    }
+
+    return sql;
+  }
+
+  _merge(updates, insert) {
+    let sql = ' on duplicate key update ';
+    if (updates) {
+      const updateData = this._prepUpdate(updates);
+      return sql + updateData.join(',');
+    } else {
+      const insertData = this._prepInsert(insert);
+      if (typeof insertData === 'string') {
+        throw new Error(
+          'If using merge with a raw insert query, then updates must be provided'
+        );
+      }
+
+      sql += insertData.columns
+        .map((column) => this.formatter.wrapAsIdentifier(column))
+        .map((column) => `${column} = values(${column})`)
+        .join(', ');
+
+      return sql;
+    }
+  }
+
+  // Update method, including joins, wheres, order & limits.
+  update() {
+    const join = this.join();
+    const updates = this._prepUpdate(this.single.update);
+    const where = this.where();
+    const order = this.order();
+    const limit = this.limit();
+    return (
+      `update ${this.tableName}` +
+      (join ? ` ${join}` : '') +
+      ' set ' +
+      updates.join(', ') +
+      (where ? ` ${where}` : '') +
+      (order ? ` ${order}` : '') +
+      (limit ? ` ${limit}` : '')
+    );
+  }
+
+  forUpdate() {
+    return 'for update';
+  }
+
+  forShare() {
+    return 'lock in share mode';
+  }
+
+  // Only supported on MySQL 8.0+
+  skipLocked() {
+    return 'skip locked';
+  }
+
+  // Supported on MySQL 8.0+ and MariaDB 10.3.0+
+  noWait() {
+    return 'nowait';
+  }
+
+  // Compiles a `columnInfo` query.
+  columnInfo() {
+    const column = this.single.columnInfo;
+
+    // The user may have specified a custom wrapIdentifier function in the config. We
+    // need to run the identifiers through that function, but not format them as
+    // identifiers otherwise.
+    const table = this.client.customWrapIdentifier(this.single.table, identity);
+
+    return {
+      sql:
+        'select * from information_schema.columns where table_name = ? and table_schema = ?',
+      bindings: [table, this.client.database()],
+      output(resp) {
+        const out = resp.reduce(function (columns, val) {
+          columns[val.COLUMN_NAME] = {
+            defaultValue: val.COLUMN_DEFAULT,
+            type: val.DATA_TYPE,
+            maxLength: val.CHARACTER_MAXIMUM_LENGTH,
+            nullable: val.IS_NULLABLE === 'YES',
+          };
+          return columns;
+        }, {});
+        return (column && out[column]) || out;
+      },
+    };
+  }
+
+  limit() {
+    const noLimit = !this.single.limit && this.single.limit !== 0;
+    if (noLimit && !this.single.offset) return '';
+
+    // Workaround for offset only.
+    // see: http://stackoverflow.com/questions/255517/mysql-offset-infinite-rows
+    const limit =
+      this.single.offset && noLimit
+        ? '18446744073709551615'
+        : this.formatter.parameter(this.single.limit);
+    return `limit ${limit}`;
+  }
+}
+
+// Set the QueryBuilder & QueryCompiler on the client object,
+// in case anyone wants to modify things to suit their own purposes.
+module.exports = QueryCompiler_MySQL;

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

@@ -1,171 +1,171 @@
-// MySQL Column Compiler
-// -------
-const { inherits } = require('util');
-const ColumnCompiler = require('../../../schema/columncompiler');
-const { isObject } = require('../../../util/is');
-
-const commentEscapeRegex = /(?<!\\)'/g;
-
-function ColumnCompiler_MySQL() {
-  ColumnCompiler.apply(this, arguments);
-  this.modifiers = [
-    'unsigned',
-    'nullable',
-    'defaultTo',
-    'comment',
-    'collate',
-    'first',
-    'after',
-  ];
-}
-inherits(ColumnCompiler_MySQL, ColumnCompiler);
-
-// Types
-// ------
-
-Object.assign(ColumnCompiler_MySQL.prototype, {
-  increments: 'int unsigned not null auto_increment primary key',
-
-  bigincrements: 'bigint unsigned not null auto_increment primary key',
-
-  bigint: 'bigint',
-
-  double(precision, scale) {
-    if (!precision) return 'double';
-    return `double(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
-  },
-
-  integer(length) {
-    length = length ? `(${this._num(length, 11)})` : '';
-    return `int${length}`;
-  },
-
-  mediumint: 'mediumint',
-
-  smallint: 'smallint',
-
-  tinyint(length) {
-    length = length ? `(${this._num(length, 1)})` : '';
-    return `tinyint${length}`;
-  },
-
-  text(column) {
-    switch (column) {
-      case 'medium':
-      case 'mediumtext':
-        return 'mediumtext';
-      case 'long':
-      case 'longtext':
-        return 'longtext';
-      default:
-        return 'text';
-    }
-  },
-
-  mediumtext() {
-    return this.text('medium');
-  },
-
-  longtext() {
-    return this.text('long');
-  },
-
-  enu(allowed) {
-    return `enum('${allowed.join("', '")}')`;
-  },
-
-  datetime(precision) {
-    if (isObject(precision)) {
-      ({ precision } = precision);
-    }
-
-    return typeof precision === 'number'
-      ? `datetime(${precision})`
-      : 'datetime';
-  },
-
-  timestamp(precision) {
-    if (isObject(precision)) {
-      ({ precision } = precision);
-    }
-
-    return typeof precision === 'number'
-      ? `timestamp(${precision})`
-      : 'timestamp';
-  },
-
-  time(precision) {
-    if (isObject(precision)) {
-      ({ precision } = precision);
-    }
-
-    return typeof precision === 'number' ? `time(${precision})` : 'time';
-  },
-
-  bit(length) {
-    return length ? `bit(${this._num(length)})` : 'bit';
-  },
-
-  binary(length) {
-    return length ? `varbinary(${this._num(length)})` : 'blob';
-  },
-
-  json() {
-    return 'json';
-  },
-
-  jsonb() {
-    return 'json';
-  },
-
-  // Modifiers
-  // ------
-
-  defaultTo(value) {
-    // MySQL defaults to null by default, but breaks down if you pass it explicitly
-    // Note that in MySQL versions up to 5.7, logic related to updating
-    // timestamps when no explicit value is passed is quite insane - https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp
-    if (value === null || value === undefined) {
-      return;
-    }
-    if ((this.type === 'json' || this.type === 'jsonb') && isObject(value)) {
-      // Default value for json will work only it is an expression
-      return `default ('${JSON.stringify(value)}')`;
-    }
-    const defaultVal = ColumnCompiler_MySQL.super_.prototype.defaultTo.apply(
-      this,
-      arguments
-    );
-    if (this.type !== 'blob' && this.type.indexOf('text') === -1) {
-      return defaultVal;
-    }
-    return '';
-  },
-
-  unsigned() {
-    return 'unsigned';
-  },
-
-  comment(comment) {
-    if (comment && comment.length > 255) {
-      this.client.logger.warn(
-        'Your comment is longer than the max comment length for MySQL'
-      );
-    }
-    return comment && `comment '${comment.replace(commentEscapeRegex, "\\'")}'`;
-  },
-
-  first() {
-    return 'first';
-  },
-
-  after(column) {
-    return `after ${this.formatter.wrap(column)}`;
-  },
-
-  collate(collation) {
-    return collation && `collate '${collation}'`;
-  },
-});
-
-module.exports = ColumnCompiler_MySQL;
+// MySQL Column Compiler
+// -------
+const { inherits } = require('util');
+const ColumnCompiler = require('../../../schema/columncompiler');
+const { isObject } = require('../../../util/is');
+
+const commentEscapeRegex = /(?<!\\)'/g;
+
+function ColumnCompiler_MySQL() {
+  ColumnCompiler.apply(this, arguments);
+  this.modifiers = [
+    'unsigned',
+    'nullable',
+    'defaultTo',
+    'comment',
+    'collate',
+    'first',
+    'after',
+  ];
+}
+inherits(ColumnCompiler_MySQL, ColumnCompiler);
+
+// Types
+// ------
+
+Object.assign(ColumnCompiler_MySQL.prototype, {
+  increments: 'int unsigned not null auto_increment primary key',
+
+  bigincrements: 'bigint unsigned not null auto_increment primary key',
+
+  bigint: 'bigint',
+
+  double(precision, scale) {
+    if (!precision) return 'double';
+    return `double(${this._num(precision, 8)}, ${this._num(scale, 2)})`;
+  },
+
+  integer(length) {
+    length = length ? `(${this._num(length, 11)})` : '';
+    return `int${length}`;
+  },
+
+  mediumint: 'mediumint',
+
+  smallint: 'smallint',
+
+  tinyint(length) {
+    length = length ? `(${this._num(length, 1)})` : '';
+    return `tinyint${length}`;
+  },
+
+  text(column) {
+    switch (column) {
+      case 'medium':
+      case 'mediumtext':
+        return 'mediumtext';
+      case 'long':
+      case 'longtext':
+        return 'longtext';
+      default:
+        return 'text';
+    }
+  },
+
+  mediumtext() {
+    return this.text('medium');
+  },
+
+  longtext() {
+    return this.text('long');
+  },
+
+  enu(allowed) {
+    return `enum('${allowed.join("', '")}')`;
+  },
+
+  datetime(precision) {
+    if (isObject(precision)) {
+      ({ precision } = precision);
+    }
+
+    return typeof precision === 'number'
+      ? `datetime(${precision})`
+      : 'datetime';
+  },
+
+  timestamp(precision) {
+    if (isObject(precision)) {
+      ({ precision } = precision);
+    }
+
+    return typeof precision === 'number'
+      ? `timestamp(${precision})`
+      : 'timestamp';
+  },
+
+  time(precision) {
+    if (isObject(precision)) {
+      ({ precision } = precision);
+    }
+
+    return typeof precision === 'number' ? `time(${precision})` : 'time';
+  },
+
+  bit(length) {
+    return length ? `bit(${this._num(length)})` : 'bit';
+  },
+
+  binary(length) {
+    return length ? `varbinary(${this._num(length)})` : 'blob';
+  },
+
+  json() {
+    return 'json';
+  },
+
+  jsonb() {
+    return 'json';
+  },
+
+  // Modifiers
+  // ------
+
+  defaultTo(value) {
+    // MySQL defaults to null by default, but breaks down if you pass it explicitly
+    // Note that in MySQL versions up to 5.7, logic related to updating
+    // timestamps when no explicit value is passed is quite insane - https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp
+    if (value === null || value === undefined) {
+      return;
+    }
+    if ((this.type === 'json' || this.type === 'jsonb') && isObject(value)) {
+      // Default value for json will work only it is an expression
+      return `default ('${JSON.stringify(value)}')`;
+    }
+    const defaultVal = ColumnCompiler_MySQL.super_.prototype.defaultTo.apply(
+      this,
+      arguments
+    );
+    if (this.type !== 'blob' && this.type.indexOf('text') === -1) {
+      return defaultVal;
+    }
+    return '';
+  },
+
+  unsigned() {
+    return 'unsigned';
+  },
+
+  comment(comment) {
+    if (comment && comment.length > 255) {
+      this.client.logger.warn(
+        'Your comment is longer than the max comment length for MySQL'
+      );
+    }
+    return comment && `comment '${comment.replace(commentEscapeRegex, "\\'")}'`;
+  },
+
+  first() {
+    return 'first';
+  },
+
+  after(column) {
+    return `after ${this.formatter.wrap(column)}`;
+  },
+
+  collate(collation) {
+    return collation && `collate '${collation}'`;
+  },
+});
+
+module.exports = ColumnCompiler_MySQL;