knex 2.4.0 → 2.4.1

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

@@ -1,40 +1,40 @@
-/* eslint max-len: 0 */
-
-const ViewCompiler = require('../../../schema/viewcompiler.js');
-const {
-  columnize: columnize_,
-} = require('../../../formatter/wrappingFormatter');
-
-class ViewCompiler_SQLite3 extends ViewCompiler {
-  constructor(client, viewCompiler) {
-    super(client, viewCompiler);
-  }
-  createOrReplace() {
-    const columns = this.columns;
-    const selectQuery = this.selectQuery.toString();
-    const viewName = this.viewName();
-
-    const columnList = columns
-      ? ' (' +
-        columnize_(
-          columns,
-          this.viewBuilder,
-          this.client,
-          this.bindingsHolder
-        ) +
-        ')'
-      : '';
-
-    const dropSql = `drop view if exists ${viewName}`;
-    const createSql = `create view ${viewName}${columnList} as ${selectQuery}`;
-
-    this.pushQuery({
-      sql: dropSql,
-    });
-    this.pushQuery({
-      sql: createSql,
-    });
-  }
-}
-
-module.exports = ViewCompiler_SQLite3;
+/* eslint max-len: 0 */
+
+const ViewCompiler = require('../../../schema/viewcompiler.js');
+const {
+  columnize: columnize_,
+} = require('../../../formatter/wrappingFormatter');
+
+class ViewCompiler_SQLite3 extends ViewCompiler {
+  constructor(client, viewCompiler) {
+    super(client, viewCompiler);
+  }
+  createOrReplace() {
+    const columns = this.columns;
+    const selectQuery = this.selectQuery.toString();
+    const viewName = this.viewName();
+
+    const columnList = columns
+      ? ' (' +
+        columnize_(
+          columns,
+          this.viewBuilder,
+          this.client,
+          this.bindingsHolder
+        ) +
+        ')'
+      : '';
+
+    const dropSql = `drop view if exists ${viewName}`;
+    const createSql = `create view ${viewName}${columnList} as ${selectQuery}`;
+
+    this.pushQuery({
+      sql: dropSql,
+    });
+    this.pushQuery({
+      sql: createSql,
+    });
+  }
+}
+
+module.exports = ViewCompiler_SQLite3;

package/lib/execution/batch-insert.js

@@ -1,51 +1,51 @@
-const chunk = require('lodash/chunk');
-const flatten = require('lodash/flatten');
-const delay = require('./internal/delay');
-const { isNumber } = require('../util/is');
-
-function batchInsert(client, tableName, batch, chunkSize = 1000) {
-  let returning = undefined;
-  let transaction = null;
-  if (!isNumber(chunkSize) || chunkSize < 1) {
-    throw new TypeError(`Invalid chunkSize: ${chunkSize}`);
-  }
-  if (!Array.isArray(batch)) {
-    throw new TypeError(`Invalid batch: Expected array, got ${typeof batch}`);
-  }
-  const chunks = chunk(batch, chunkSize);
-
-  const runInTransaction = (cb) => {
-    if (transaction) {
-      return cb(transaction);
-    }
-    return client.transaction(cb);
-  };
-
-  return Object.assign(
-    Promise.resolve().then(async () => {
-      //Next tick to ensure wrapper functions are called if needed
-      await delay(1);
-      return runInTransaction(async (tr) => {
-        const chunksResults = [];
-        for (const items of chunks) {
-          chunksResults.push(await tr(tableName).insert(items, returning));
-        }
-        return flatten(chunksResults);
-      });
-    }),
-    {
-      returning(columns) {
-        returning = columns;
-
-        return this;
-      },
-      transacting(tr) {
-        transaction = tr;
-
-        return this;
-      },
-    }
-  );
-}
-
-module.exports = batchInsert;
+const chunk = require('lodash/chunk');
+const flatten = require('lodash/flatten');
+const delay = require('./internal/delay');
+const { isNumber } = require('../util/is');
+
+function batchInsert(client, tableName, batch, chunkSize = 1000) {
+  let returning = undefined;
+  let transaction = null;
+  if (!isNumber(chunkSize) || chunkSize < 1) {
+    throw new TypeError(`Invalid chunkSize: ${chunkSize}`);
+  }
+  if (!Array.isArray(batch)) {
+    throw new TypeError(`Invalid batch: Expected array, got ${typeof batch}`);
+  }
+  const chunks = chunk(batch, chunkSize);
+
+  const runInTransaction = (cb) => {
+    if (transaction) {
+      return cb(transaction);
+    }
+    return client.transaction(cb);
+  };
+
+  return Object.assign(
+    Promise.resolve().then(async () => {
+      //Next tick to ensure wrapper functions are called if needed
+      await delay(1);
+      return runInTransaction(async (tr) => {
+        const chunksResults = [];
+        for (const items of chunks) {
+          chunksResults.push(await tr(tableName).insert(items, returning));
+        }
+        return flatten(chunksResults);
+      });
+    }),
+    {
+      returning(columns) {
+        returning = columns;
+
+        return this;
+      },
+      transacting(tr) {
+        transaction = tr;
+
+        return this;
+      },
+    }
+  );
+}
+
+module.exports = batchInsert;

package/lib/execution/internal/delay.js

@@ -1,6 +1,6 @@
-/**
- * @param {number} delay
- * @returns {Promise<void>}
- */
-module.exports = (delay) =>
-  new Promise((resolve) => setTimeout(resolve, delay));
+/**
+ * @param {number} delay
+ * @returns {Promise<void>}
+ */
+module.exports = (delay) =>
+  new Promise((resolve) => setTimeout(resolve, delay));

package/lib/execution/internal/ensure-connection-callback.js

@@ -1,41 +1,41 @@
-function ensureConnectionCallback(runner) {
-  runner.client.emit('start', runner.builder);
-  runner.builder.emit('start', runner.builder);
-  const sql = runner.builder.toSQL();
-
-  if (runner.builder._debug) {
-    runner.client.logger.debug(sql);
-  }
-
-  if (Array.isArray(sql)) {
-    return runner.queryArray(sql);
-  }
-  return runner.query(sql);
-}
-
-function ensureConnectionStreamCallback(runner, params) {
-  try {
-    const sql = runner.builder.toSQL();
-
-    if (Array.isArray(sql) && params.hasHandler) {
-      throw new Error(
-        'The stream may only be used with a single query statement.'
-      );
-    }
-
-    return runner.client.stream(
-      runner.connection,
-      sql,
-      params.stream,
-      params.options
-    );
-  } catch (e) {
-    params.stream.emit('error', e);
-    throw e;
-  }
-}
-
-module.exports = {
-  ensureConnectionCallback,
-  ensureConnectionStreamCallback,
-};
+function ensureConnectionCallback(runner) {
+  runner.client.emit('start', runner.builder);
+  runner.builder.emit('start', runner.builder);
+  const sql = runner.builder.toSQL();
+
+  if (runner.builder._debug) {
+    runner.client.logger.debug(sql);
+  }
+
+  if (Array.isArray(sql)) {
+    return runner.queryArray(sql);
+  }
+  return runner.query(sql);
+}
+
+function ensureConnectionStreamCallback(runner, params) {
+  try {
+    const sql = runner.builder.toSQL();
+
+    if (Array.isArray(sql) && params.hasHandler) {
+      throw new Error(
+        'The stream may only be used with a single query statement.'
+      );
+    }
+
+    return runner.client.stream(
+      runner.connection,
+      sql,
+      params.stream,
+      params.options
+    );
+  } catch (e) {
+    params.stream.emit('error', e);
+    throw e;
+  }
+}
+
+module.exports = {
+  ensureConnectionCallback,
+  ensureConnectionStreamCallback,
+};

package/lib/execution/internal/query-executioner.js

@@ -1,62 +1,62 @@
-const _debugQuery = require('debug')('knex:query');
-const debugBindings = require('debug')('knex:bindings');
-const debugQuery = (sql, txId) => _debugQuery(sql.replace(/%/g, '%%'), txId);
-const { isString } = require('../../util/is');
-
-function formatQuery(sql, bindings, timeZone, client) {
-  bindings = bindings == null ? [] : [].concat(bindings);
-  let index = 0;
-  return sql.replace(/\\?\?/g, (match) => {
-    if (match === '\\?') {
-      return '?';
-    }
-    if (index === bindings.length) {
-      return match;
-    }
-    const value = bindings[index++];
-    return client._escapeBinding(value, { timeZone });
-  });
-}
-
-function enrichQueryObject(connection, queryParam, client) {
-  const queryObject = isString(queryParam) ? { sql: queryParam } : queryParam;
-
-  queryObject.bindings = client.prepBindings(queryObject.bindings);
-  queryObject.sql = client.positionBindings(queryObject.sql);
-
-  const { __knexUid, __knexTxId } = connection;
-
-  client.emit('query', Object.assign({ __knexUid, __knexTxId }, queryObject));
-  debugQuery(queryObject.sql, __knexTxId);
-  debugBindings(queryObject.bindings, __knexTxId);
-
-  return queryObject;
-}
-
-function executeQuery(connection, queryObject, client) {
-  return client._query(connection, queryObject).catch((err) => {
-    if (client.config && client.config.compileSqlOnError === false) {
-      err.message = queryObject.sql + ' - ' + err.message;
-    } else {
-      err.message =
-        formatQuery(queryObject.sql, queryObject.bindings, undefined, client) +
-        ' - ' +
-        err.message;
-    }
-    client.emit(
-      'query-error',
-      err,
-      Object.assign(
-        { __knexUid: connection.__knexUid, __knexTxId: connection.__knexUid },
-        queryObject
-      )
-    );
-    throw err;
-  });
-}
-
-module.exports = {
-  enrichQueryObject,
-  executeQuery,
-  formatQuery,
-};
+const _debugQuery = require('debug')('knex:query');
+const debugBindings = require('debug')('knex:bindings');
+const debugQuery = (sql, txId) => _debugQuery(sql.replace(/%/g, '%%'), txId);
+const { isString } = require('../../util/is');
+
+function formatQuery(sql, bindings, timeZone, client) {
+  bindings = bindings == null ? [] : [].concat(bindings);
+  let index = 0;
+  return sql.replace(/\\?\?/g, (match) => {
+    if (match === '\\?') {
+      return '?';
+    }
+    if (index === bindings.length) {
+      return match;
+    }
+    const value = bindings[index++];
+    return client._escapeBinding(value, { timeZone });
+  });
+}
+
+function enrichQueryObject(connection, queryParam, client) {
+  const queryObject = isString(queryParam) ? { sql: queryParam } : queryParam;
+
+  queryObject.bindings = client.prepBindings(queryObject.bindings);
+  queryObject.sql = client.positionBindings(queryObject.sql);
+
+  const { __knexUid, __knexTxId } = connection;
+
+  client.emit('query', Object.assign({ __knexUid, __knexTxId }, queryObject));
+  debugQuery(queryObject.sql, __knexTxId);
+  debugBindings(queryObject.bindings, __knexTxId);
+
+  return queryObject;
+}
+
+function executeQuery(connection, queryObject, client) {
+  return client._query(connection, queryObject).catch((err) => {
+    if (client.config && client.config.compileSqlOnError === false) {
+      err.message = queryObject.sql + ' - ' + err.message;
+    } else {
+      err.message =
+        formatQuery(queryObject.sql, queryObject.bindings, undefined, client) +
+        ' - ' +
+        err.message;
+    }
+    client.emit(
+      'query-error',
+      err,
+      Object.assign(
+        { __knexUid: connection.__knexUid, __knexTxId: connection.__knexUid },
+        queryObject
+      )
+    );
+    throw err;
+  });
+}
+
+module.exports = {
+  enrichQueryObject,
+  executeQuery,
+  formatQuery,
+};