knex 0.19.1 → 0.19.5

package/CHANGELOG.md

@@ -1,5 +1,71 @@
 # Master (Unreleased)
 
+# 0.19.5 - 06 October, 2019
+
+### New features:
+
+- CLI: Migrations up/down commands - filename parameter #3416
+- Oracle: Support stored procedures #3449
+
+### Bug fixes:
+
+- MSSQL: Escape column ids correctly in all cases (reported by Snyk Security Research Team) #3382
+- SQLite: Fix handling of multiline SQL in SQLite3 schema #3411
+- Fix concurrent child transactions failing #2213 #3440
+
+### Typings:
+
+- Add missing Migrator.list typing #3460
+- Fix Typescript type inference for to better support wildcard (*) calls #3444
+- Make options argument optional in timeout #3442
+
+### Test / internal changes:
+
+- Enable linting in CI #3450
+
+# 0.19.4 - 09 September, 2019
+
+### New features:
+
+- Add undefined columns to undefined binding(s) error #3425
+
+### Typings:
+
+- Add `specific` to SeederConfig type #3429
+- Fix some issues with QueryBuilder types #3427
+
+# 0.19.3 - 25 August, 2019
+
+### Bug fixes:
+
+- Fix migrations for native enums to use table schema #3307
+
+### New features:
+
+- Add ability to manually define schema for native enums #3307
+- Add SSL/TLS support for Postgres connection string #3410
+- CLI: new command that lists all migrations with status #3390
+
+### Typings:
+
+- Include schemaName in EnumOptions #3415
+- Allow `ColumnBuilder.defaultTo()` to be `null` #3407
+
+### Changes:
+
+- migrate: Refactor _lockMigrations to avoid forUpdate - makes migrations compatible with CockroachDB #3395
+
+# 0.19.2 - 17 August, 2019
+
+### Changes:
+
+- Make transaction rejection consistent across dialects #3399
+- More consistent handling of nested transactions #3393
+
+### New features:
+
+- Fallback to JSON when using JSONB in MySQL #3394 
+
 # 0.19.1 - 23 July, 2019
 
 ### New features:
@@ -8,7 +74,7 @@
 - Add .isCompleted() to transaction #3368
 - Minor enhancements around aliasing of aggregates #3354
 
-### Typings
+### Typings:
 
 - Update configuration typings to allow for oracle db connectionstring #3361
 - Update Knex.raw type to be any by default because the actual type is dialect specific #3349
@@ -82,7 +148,7 @@
 - Remove Bluebird #3290 #3287 #3285 #3267 #3266 #3263
 - Fix comments that were modified by find & replace #3308
 
-### Typings
+### Typings:
 
 - Add workarounds for degraded inference when strictNullChecks is set to false #3275
 - Add stub type definition for Migrator config #3279
@@ -92,13 +158,13 @@
 
 # 0.17.5 - 8 June, 2019
 
-### Typings
+### Typings:
 
 - Include result.d.ts in published package #3271
 
 # 0.17.4 - 8 June, 2019
 
-### Typings
+### Typings:
 
 - Fix some cases of left-to-right inference causing type mismatch #3265
 - Improve count typings #3249
@@ -109,7 +175,7 @@
 
 # 0.17.3 - 2 June, 2019
 
-### Typings
+### Typings:
 
 - Improve typings for aggregations #3245
 - Add decimalNumbers to MySqlConnectionConfig interface #3244
@@ -130,7 +196,7 @@
 
 - Add migrate:down functionality #3228
 
-### Typings
+### Typings:
 
 - Update type of aggregation results to not be arrays when first has been invoked before #3237
 - Include undefined in type of single row results #3231
@@ -150,7 +216,7 @@
 - Unify object options handling for datetime/timestamp across dialects #3181
 - Add "up" command for migrations #3205
 
-### Typings
+### Typings:
 
 - Add default values for generic types (fixes backwards compatibility broken by 0.16.6) #3189
 - Make function types generic in type definitions #3168
@@ -283,7 +349,7 @@
 - Knex client knexfile resolution fix #2923
 - Add queryContext to type declarations #2931
 
-### Test / internal changes
+### Test / internal changes:
 
 - Add tests for multiple union arguments with callbacks and builders #2749
 - Update dependencies #2772 #2810 #2842 #2848 #2893 #2904
@@ -351,7 +417,7 @@
 - Add support for native enums on Postgres #2632
 - Allow overwriting log functions #2625
 
-### Test / internal changes
+### Test / internal changes:
 
 - chore: cache node_modules #2595
 - Remove babel-plugin-lodash #2634
@@ -381,7 +447,7 @@
 - Checks for an empty, undefined or null object on transacting #2494
 - countDistinct with multiple columns #2449
 
-### Test / internal changes
+### Test / internal changes:
 
 - Added npm run test:oracledb command that runs oracledb tests in docker #2491
 - Runnin mssql tests in docker #2496
@@ -401,7 +467,7 @@
 - Allow calling lock procedures (such as forUpdate) outside of transaction. Fixes #2403. (#2475)
 - Added test and documentation for Event 'start' (#2488)
 
-### Test / internal changes
+### Test / internal changes:
 
 - Added stress test, which uses TCP proxy to simulate flaky connection #2460
 - Removed old docker tests, new stress test setup (#2474)
@@ -429,7 +495,7 @@
 - Added redshift dialect #2233
 - Added warning when one uses .createTableIfNotExist and deprecated it from docs #2458
 
-### Test / internal changes
+### Test / internal changes:
 
 - Update dependencies and fix ESLint warnings accordingly #2433
 - Disable oracledb tests from non LTS nodes #2407
@@ -492,7 +558,7 @@
 - Fix mssql wrong binding order of queries that combine a limit with select raw or update #2066
 - Fixed mysql alter table attributes order #2062
 
-### Test / internal changes
+### Test / internal changes:
 
 - Update each out-of-date dependency according to david-dm.org #2297
 - Update v8flags to version 3.0.0 #2288
@@ -817,17 +883,17 @@
 
 # 0.7.0 - Oct 1, 2014
 
-### New Features
+### New Features:
 
 - Oracle support, #419
 - Database seed file support, #391
 - Improved support for sub-raw queries within raw statements
 
-### Breaking Changes
+### Breaking Changes:
 
 - "collate nocase" no longer used by default in sqlite3 #396
 
-### Other Changes
+### Other Changes:
 
 - Bumping Bluebird to ^2.x
 - Transactions in websql are now a no-op (unsupported) #375

package/bin/cli.js

@@ -21,6 +21,7 @@ const {
   getStubPath,
 } = require('./utils/cli-config-utils');
 const { DEFAULT_EXT } = require('./utils/constants');
+const { listMigrations } = require('./utils/migrationsLister');
 
 function initKnex(env, opts) {
   checkLocalModule(env);
@@ -189,11 +190,13 @@ function invoke(env) {
     });
 
   commander
-    .command('migrate:up')
-    .description('        Run the next migration that has not yet been run.')
-    .action(() => {
+    .command('migrate:up [<name>]')
+    .description(
+      '        Run the next or the specified migration that has not yet been run.'
+    )
+    .action((name) => {
       pending = initKnex(env, commander.opts())
-        .migrate.up()
+        .migrate.up({ name })
         .then(([batchNo, log]) => {
           if (log.length === 0) {
             success(color.cyan('Already up to date'));
@@ -234,11 +237,13 @@ function invoke(env) {
     });
 
   commander
-    .command('migrate:down')
-    .description('        Undo the last migration performed.')
-    .action(() => {
+    .command('migrate:down [<name>]')
+    .description(
+      '        Undo the last or the specified migration that was already run.'
+    )
+    .action((name) => {
       pending = initKnex(env, commander.opts())
-        .migrate.down()
+        .migrate.down({ name })
         .then(([batchNo, log]) => {
           if (log.length === 0) {
             success(color.cyan('Already at the base migration'));
@@ -267,6 +272,19 @@ function invoke(env) {
         .catch(exit);
     });
 
+  commander
+    .command('migrate:list')
+    .alias('migrate:status')
+    .description('        List all migrations files with status.')
+    .action(() => {
+      pending = initKnex(env, commander.opts())
+        .migrate.list()
+        .then(([completed, newMigrations]) => {
+          listMigrations(completed, newMigrations);
+        })
+        .catch(exit);
+    });
+
   commander
     .command('seed:make <name>')
     .description('        Create a named seed file.')

package/bin/utils/migrationsLister.js

@@ -0,0 +1,37 @@
+const color = require('colorette');
+
+const { success } = require('./cli-config-utils');
+
+function listMigrations(completed, newMigrations) {
+  let message = '';
+
+  if (completed.length === 0) {
+    message += color.red('No Completed Migration files Found. \n');
+  } else {
+    message = color.green(
+      `Found ${completed.length} Completed Migration file/files.\n`
+    );
+
+    for (let i = 0; i < completed.length; i++) {
+      const file = completed[i];
+      message += color.cyan(`${file} \n`);
+    }
+  }
+
+  if (newMigrations.length === 0) {
+    message += color.red('No Pending Migration files Found.\n');
+  } else {
+    message += color.green(
+      `Found ${newMigrations.length} Pending Migration file/files.\n`
+    );
+
+    for (let i = 0; i < newMigrations.length; i++) {
+      const file = newMigrations[i];
+      message += color.cyan(`${file.file} \n`);
+    }
+  }
+
+  success(message);
+}
+
+module.exports = { listMigrations };

package/lib/dialects/mssql/index.js

@@ -207,7 +207,11 @@ Object.assign(Client_MSSQL.prototype, {
   },
 
   wrapIdentifierImpl(value) {
-    return value !== '*' ? `[${value.replace(/\[/g, '[')}]` : '*';
+    if (value === '*') {
+      return '*';
+    }
+
+    return `[${value.replace(/[[\]']+/g, '')}]`;
   },
 
   // Get a raw connection, called by the `pool` whenever a new

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

@@ -113,6 +113,10 @@ Object.assign(ColumnCompiler_MySQL.prototype, {
     return 'json';
   },
 
+  jsonb() {
+    return 'json';
+  },
+
   // Modifiers
   // ------
 

package/lib/dialects/mysql/transaction.js

@@ -30,11 +30,7 @@ Object.assign(Transaction_MySQL.prototype, {
         if (status === 1) t._resolver(value);
         if (status === 2) {
           if (isUndefined(value)) {
-            if (
-              sql &&
-              sql.toUpperCase() === 'ROLLBACK' &&
-              t.doNotRejectOnRollback
-            ) {
+            if (t.doNotRejectOnRollback && /^ROLLBACK\b/i.test(sql)) {
               t._resolver();
               return;
             }

package/lib/dialects/mysql2/transaction.js

@@ -29,11 +29,7 @@ Object.assign(Transaction_MySQL2.prototype, {
         if (status === 1) t._resolver(value);
         if (status === 2) {
           if (isUndefined(value)) {
-            if (
-              sql &&
-              sql.toUpperCase() === 'ROLLBACK' &&
-              t.doNotRejectOnRollback
-            ) {
+            if (t.doNotRejectOnRollback && /^ROLLBACK\b/i.test(sql)) {
               t._resolver();
               return;
             }

package/lib/dialects/oracledb/index.js

@@ -263,6 +263,13 @@ Client_Oracledb.prototype._query = function(connection, obj) {
           ? response.rows.rowsAffected
           : response.rowsAffected;
 
+        //added for outBind parameter
+        if (obj.method === 'raw' && outBinds.length > 0) {
+          return resolver({
+            response: outBinds,
+          });
+        }
+
         if (obj.method === 'update') {
           const modifiedRowsCount = obj.rowsAffected.length || obj.rowsAffected;
           const updatedObjOutBinding = [];

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

@@ -35,13 +35,22 @@ Object.assign(ColumnCompiler_PG.prototype, {
         : allowed.join("', '");
 
     if (options.useNative) {
+      let enumName = '';
+      const schemaName = options.schemaName || this.tableCompiler.schemaNameRaw;
+
+      if (schemaName) {
+        enumName += `"${schemaName}".`;
+      }
+
+      enumName += `"${options.enumName}"`;
+
       if (!options.existingType) {
         this.tableCompiler.unshiftQuery(
-          `create type "${options.enumName}" as enum ('${values}')`
+          `create type ${enumName} as enum ('${values}')`
         );
       }
 
-      return `"${options.enumName}"`;
+      return enumName;
     }
     return `text check (${this.formatter.wrap(this.args[0])} in ('${values}'))`;
   },

package/lib/dialects/sqlite3/schema/ddl.js

@@ -129,7 +129,8 @@ assign(SQLite3_DDL.prototype, {
   },
 
   _doReplace(sql, from, to) {
-    const matched = sql.match(/^CREATE TABLE (\S+) \((.*)\)/);
+    const oneLineSql = sql.replace(/\s+/g, ' ');
+    const matched = oneLineSql.match(/^CREATE TABLE (\S+) \((.*)\)/);
 
     const tableName = matched[1];
     const defs = matched[2];
@@ -166,23 +167,27 @@ assign(SQLite3_DDL.prototype, {
     }
     args.push(defs.slice(ptr, i));
 
-    // Backwards compatible for double quoted sqlite databases
-    // Detect CREATE TABLE "accounts" ("id"...)
-    // The "from" and "to" field use backsticks, because this is the default notation for
-    // SQlite3 since Knex 0.14.
-    // e.g. from: `about`
-    //
-    // We have to replace the from+to field with double slashes in case you created your SQlite3
-    // database with Knex < 0.14.
-    if (sql.match(/CREATE\sTABLE\s".*"\s\("/)) {
-      from = from.replace(/[`]/g, '"');
-      to = to.replace(/[`]/g, '"');
-    }
+    const fromIdentifier = from.replace(/[`"]/g, '');
 
     args = args.map(function(item) {
-      let split = item.split(' ');
+      let split = item.trim().split(' ');
+
+      let normalizedFrom = from;
 
-      if (split[0] === from) {
+      // Backwards compatible for double quoted sqlite databases
+      // The "from" and "to" field use backsticks, because this is the default notation for
+      // SQlite3 since Knex 0.14.
+      // e.g. from: `about`
+      //
+      // We have to replace the from+to field with double slashes in case you created your SQlite3
+      // database with Knex < 0.14.
+      if (item.match(`"${fromIdentifier}"`)) {
+        normalizedFrom = `"${fromIdentifier}"`;
+      } else if (item.match(`\`${fromIdentifier}\``)) {
+        normalizedFrom = `\`${fromIdentifier}\``;
+      }
+
+      if (split[0] === normalizedFrom) {
         // column definition
         if (to) {
           split[0] = to;
@@ -198,7 +203,9 @@ assign(SQLite3_DDL.prototype, {
       // columns from this table listed between (); replace
       // one if it matches
       if (/primary|unique/i.test(split[idx])) {
-        return item.replace(/\(.*\)/, (columns) => columns.replace(from, to));
+        return item.replace(/\(.*\)/, (columns) =>
+          columns.replace(normalizedFrom, to)
+        );
       }
 
       // foreign keys have one or more columns from this table
@@ -210,11 +217,11 @@ assign(SQLite3_DDL.prototype, {
         split = item.split(/ references /i);
         // the quoted column names save us from having to do anything
         // other than a straight replace here
-        split[0] = split[0].replace(from, to);
+        split[0] = split[0].replace(normalizedFrom, to);
 
         if (split[1].slice(0, tableName.length) === tableName) {
           split[1] = split[1].replace(/\(.*\)/, (columns) =>
-            columns.replace(from, to)
+            columns.replace(normalizedFrom, to)
           );
         }
         return split.join(' references ');
@@ -222,7 +229,7 @@ assign(SQLite3_DDL.prototype, {
 
       return item;
     });
-    return sql
+    return oneLineSql
       .replace(/\(.*\)/, () => `(${args.join(', ')})`)
       .replace(/,\s*([,)])/, '$1');
   },

package/lib/helpers.js

@@ -36,12 +36,12 @@ function containsUndefined(mixed) {
   if (isArray(mixed)) {
     for (let i = 0; i < mixed.length; i++) {
       if (argContainsUndefined) break;
-      argContainsUndefined = this.containsUndefined(mixed[i]);
+      argContainsUndefined = containsUndefined(mixed[i]);
     }
   } else if (isPlainObject(mixed)) {
     Object.keys(mixed).forEach((key) => {
       if (!argContainsUndefined) {
-        argContainsUndefined = this.containsUndefined(mixed[key]);
+        argContainsUndefined = containsUndefined(mixed[key]);
       }
     });
   } else {
@@ -51,6 +51,28 @@ function containsUndefined(mixed) {
   return argContainsUndefined;
 }
 
+function getUndefinedIndices(mixed) {
+  const indices = [];
+
+  if (Array.isArray(mixed)) {
+    mixed.forEach((item, index) => {
+      if (containsUndefined(item)) {
+        indices.push(index);
+      }
+    });
+  } else if (isPlainObject(mixed)) {
+    Object.keys(mixed).forEach((key) => {
+      if (containsUndefined(mixed[key])) {
+        indices.push(key);
+      }
+    });
+  } else {
+    indices.push(0);
+  }
+
+  return indices;
+}
+
 function addQueryContext(Target) {
   // Stores or returns (if called with no arguments) context passed to
   // wrapIdentifier and postProcessResponse hooks
@@ -72,4 +94,5 @@ module.exports = {
   containsUndefined,
   normalizeArr,
   resolveClientNameWithAliases,
+  getUndefinedIndices,
 };

package/lib/migrate/Migrator.js

@@ -108,16 +108,38 @@ class Migrator {
         return value;
       })
       .then(([all, completed]) => {
-        const migrationToRun = getNewMigrations(
+        const newMigrations = getNewMigrations(
           this.config.migrationSource,
           all,
           completed
-        ).slice(0, 1);
+        );
+
+        let migrationToRun;
+        const name = this.config.name;
+        if (name) {
+          if (!completed.includes(name)) {
+            migrationToRun = newMigrations.find((migration) => {
+              return (
+                this.config.migrationSource.getMigrationName(migration) === name
+              );
+            });
+            if (!migrationToRun) {
+              throw new Error(`Migration "${name}" not found.`);
+            }
+          }
+        } else {
+          migrationToRun = newMigrations[0];
+        }
+
+        const migrationsToRun = [];
+        if (migrationToRun) {
+          migrationsToRun.push(migrationToRun);
+        }
 
         const transactionForAll =
           !this.config.disableTransactions &&
           isEmpty(
-            filter(migrationToRun, (migration) => {
+            filter(migrationsToRun, (migration) => {
               const migrationContents = this.config.migrationSource.getMigration(
                 migration
               );
@@ -128,10 +150,10 @@ class Migrator {
 
         if (transactionForAll) {
           return this.knex.transaction((trx) => {
-            return this._runBatch(migrationToRun, 'up', trx);
+            return this._runBatch(migrationsToRun, 'up', trx);
           });
         } else {
-          return this._runBatch(migrationToRun, 'up');
+          return this._runBatch(migrationsToRun, 'up');
         }
       });
   }
@@ -180,16 +202,33 @@ class Migrator {
         return value;
       })
       .then(([all, completed]) => {
-        const migrationToRun = all
-          .filter((migration) => {
-            return completed.includes(
-              this.config.migrationSource.getMigrationName(migration)
+        const completedMigrations = all.filter((migration) => {
+          return completed.includes(
+            this.config.migrationSource.getMigrationName(migration)
+          );
+        });
+
+        let migrationToRun;
+        const name = this.config.name;
+        if (name) {
+          migrationToRun = completedMigrations.find((migration) => {
+            return (
+              this.config.migrationSource.getMigrationName(migration) === name
             );
-          })
-          .reverse()
-          .slice(0, 1);
+          });
+          if (!migrationToRun) {
+            throw new Error(`Migration "${name}" was not run.`);
+          }
+        } else {
+          migrationToRun = completedMigrations[completedMigrations.length - 1];
+        }
+
+        const migrationsToRun = [];
+        if (migrationToRun) {
+          migrationsToRun.push(migrationToRun);
+        }
 
-        return this._runBatch(migrationToRun, 'down');
+        return this._runBatch(migrationsToRun, 'down');
       });
   }
 
@@ -219,6 +258,25 @@ class Migrator {
       });
   }
 
+  // list all migrations
+  async list(config) {
+    this._disableProcessing();
+    this.config = getMergedConfig(config, this.config);
+
+    const [all, completed] = await migrationListResolver.listAllAndCompleted(
+      this.config,
+      this.knex
+    );
+    validateMigrationList(this.config.migrationSource, [all, completed]);
+
+    const newMigrations = getNewMigrations(
+      this.config.migrationSource,
+      all,
+      completed
+    );
+    return [completed, newMigrations];
+  }
+
   forceFreeMigrationsLock(config) {
     this.config = getMergedConfig(config, this.config);
 
@@ -240,32 +298,23 @@ class Migrator {
     }
   }
 
-  _isLocked(trx) {
-    const tableName = getLockTableName(this.config.tableName);
-    return getTable(this.knex, tableName, this.config.schemaName)
-      .transacting(trx)
-      .forUpdate()
-      .select('*')
-      .then((data) => data[0].is_locked);
-  }
-
   _lockMigrations(trx) {
     const tableName = getLockTableName(this.config.tableName);
     return getTable(this.knex, tableName, this.config.schemaName)
       .transacting(trx)
-      .update({ is_locked: 1 });
+      .where('is_locked', '=', 0)
+      .update({ is_locked: 1 })
+      .then((rowCount) => {
+        if (rowCount != 1) {
+          throw new Error('Migration table is already locked');
+        }
+      });
   }
 
   _getLock(trx) {
     const transact = trx ? (fn) => fn(trx) : (fn) => this.knex.transaction(fn);
     return transact((trx) => {
-      return this._isLocked(trx)
-        .then((isLocked) => {
-          if (isLocked) {
-            throw new Error('Migration table is already locked');
-          }
-        })
-        .then(() => this._lockMigrations(trx));
+      return this._lockMigrations(trx);
     }).catch((err) => {
       throw new LockError(err.message);
     });

package/lib/query/builder.js

@@ -1271,8 +1271,8 @@ Builder.prototype.del = Builder.prototype.delete;
 require('../interface')(Builder);
 helpers.addQueryContext(Builder);
 
-Builder.extend = function(methodName, fn) {
-  if (Builder.prototype.hasOwnProperty(methodName)) {
+Builder.extend = (methodName, fn) => {
+  if (Object.prototype.hasOwnProperty.call(Builder.prototype, methodName)) {
     throw new Error(
       `Can't extend QueryBuilder with existing method ('${methodName}').`
     );

package/lib/query/compiler.js

@@ -58,6 +58,7 @@ assign(QueryCompiler.prototype, {
   // Collapse the builder into a single object
   toSQL(method, tz) {
     this._undefinedInWhereClause = false;
+    this.undefinedBindingsInfo = [];
 
     method = method || this.method;
     const val = this[method]() || '';
@@ -99,7 +100,9 @@ assign(QueryCompiler.prototype, {
       debugBindings(query.bindings);
       throw new Error(
         `Undefined binding(s) detected when compiling ` +
-          `${method.toUpperCase()} query: ${query.sql}`
+          `${method.toUpperCase()}. Undefined column(s): [${this.undefinedBindingsInfo.join(
+            ', '
+          )}] query: ${query.sql}`
       );
     }
 
@@ -372,6 +375,7 @@ assign(QueryCompiler.prototype, {
         Object.prototype.hasOwnProperty.call(stmt, 'value') &&
         helpers.containsUndefined(stmt.value)
       ) {
+        this.undefinedBindingsInfo.push(stmt.column);
         this._undefinedInWhereClause = true;
       }
       const val = this[stmt.type](stmt);

package/lib/raw.js

@@ -104,9 +104,12 @@ assign(Raw.prototype, {
 
     obj.bindings = obj.bindings || [];
     if (helpers.containsUndefined(obj.bindings)) {
+      const undefinedBindingIndices = helpers.getUndefinedIndices(
+        this.bindings
+      );
       debugBindings(obj.bindings);
       throw new Error(
-        `Undefined binding(s) detected when compiling RAW query: ` + obj.sql
+        `Undefined binding(s) detected for keys [${undefinedBindingIndices}] when compiling RAW query: ${obj.sql}`
       );
     }
 

package/lib/transaction.js

@@ -210,6 +210,7 @@ class Transaction extends EventEmitter {
   // the original promise is marked completed.
   acquireConnection(client, config, txid) {
     const configConnection = config && config.connection;
+    const trx = this;
     return new Bluebird((resolve, reject) => {
       try {
         resolve(configConnection || client.acquireConnection());
@@ -220,7 +221,12 @@ class Transaction extends EventEmitter {
       .then(function(connection) {
         connection.__knexTxId = txid;
 
-        return connection;
+        return (trx._previousSibling
+          ? trx._previousSibling.reflect()
+          : Promise.resolve()
+        ).then(function() {
+          return connection;
+        });
       })
       .disposer(function(connection) {
         if (!configConnection) {
@@ -250,7 +256,25 @@ function makeTransactor(trx, connection, trxClient) {
   transactor.userParams = trx.userParams || {};
 
   transactor.transaction = function(container, options) {
-    return trxClient.transaction(container, options, trx);
+    if (!options) {
+      options = { doNotRejectOnRollback: true };
+    } else if (isUndefined(options.doNotRejectOnRollback)) {
+      options.doNotRejectOnRollback = true;
+    }
+
+    if (container) {
+      return trxClient.transaction(container, options, trx);
+    } else {
+      return new Promise((resolve, _reject) => {
+        trxClient.transaction(
+          (nestedTrx) => {
+            resolve(nestedTrx);
+          },
+          options,
+          trx
+        );
+      });
+    }
   };
   transactor.savepoint = function(container, options) {
     return transactor.transaction(container, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "0.19.1",
+  "version": "0.19.5",
   "description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser",
   "main": "knex.js",
   "types": "types/index.d.ts",
@@ -14,8 +14,10 @@
     "coveralls": "nyc report --reporter=text-lcov | coveralls",
     "lint": "eslint \"lib/**/*.js\" \"test/**/*.js\"",
     "lint:types": "dtslint types",
+    "lint:everything": "npm run lint:types && npm run lint",
     "test": "mocha --exit -t 10000 test/index.js && npm run test:tape && npm run test:cli",
-    "test:nyc": "nyc mocha --exit --check-leaks --globals __core-js_shared__ -t 10000 test/index.js && npm run test:tape && npm run test:cli",
+    "test:coverage": "nyc mocha --exit --check-leaks --globals __core-js_shared__ -t 10000 test/index.js && npm run test:tape && npm run test:cli",
+    "test:everything": "npm run lint:everything && npm run test:coverage",
     "test:sqlite": "cross-env DB=sqlite3 npm test",
     "test:tape": "node test/tape/index.js | tap-spec",
     "test:cli": "cross-env KNEX_PATH=../knex.js KNEX=bin/cli.js jake -f test/jake/Jakefile",
@@ -26,20 +28,20 @@
     "stress:destroy": "docker-compose -f scripts/stress-test/docker-compose.yml stop"
   },
   "dependencies": {
-    "bluebird": "^3.5.5",
-    "colorette": "1.0.8",
-    "commander": "^2.20.0",
+    "bluebird": "^3.7.0",
+    "colorette": "1.1.0",
+    "commander": "^3.0.2",
     "debug": "4.1.1",
-    "getopts": "2.2.4",
+    "getopts": "2.2.5",
     "inherits": "~2.0.4",
     "interpret": "^1.2.0",
     "liftoff": "3.1.0",
     "lodash": "^4.17.15",
     "mkdirp": "^0.5.1",
-    "pg-connection-string": "2.0.0",
+    "pg-connection-string": "2.1.0",
     "tarn": "^2.0.0",
     "tildify": "2.0.0",
-    "uuid": "^3.3.2",
+    "uuid": "^3.3.3",
     "v8flags": "^3.1.3"
   },
   "lint-staged": {
@@ -49,39 +51,39 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "^10.14.13",
+    "@types/node": "^10.14.20",
     "JSONStream": "^1.3.5",
     "chai": "^4.2.0",
     "chai-subset-in-order": "^2.1.3",
-    "cli-testlab": "^1.7.0",
-    "coveralls": "^3.0.5",
-    "cross-env": "^5.2.0",
-    "dtslint": "^0.9.0",
-    "eslint": "^6.1.0",
-    "eslint-config-prettier": "^6.0.0",
+    "cli-testlab": "^1.8.0",
+    "coveralls": "^3.0.6",
+    "cross-env": "^6.0.3",
+    "dtslint": "^0.9.8",
+    "eslint": "^6.5.1",
+    "eslint-config-prettier": "^6.4.0",
     "eslint-plugin-import": "^2.18.2",
-    "husky": "^3.0.1",
+    "husky": "^3.0.8",
     "jake": "^8.1.1",
-    "lint-staged": "^9.2.0",
-    "mocha": "^6.2.0",
+    "lint-staged": "^9.4.1",
+    "mocha": "^6.2.1",
     "mock-fs": "^4.10.1",
     "mssql": "^5.1.0",
     "mysql": "^2.17.1",
-    "mysql2": "^1.6.5",
+    "mysql2": "^1.7.0",
     "nyc": "^14.1.1",
-    "pg": "^7.11.0",
+    "pg": "^7.12.1",
     "pg-query-stream": "^2.0.0",
     "prettier": "^1.18.2",
-    "rimraf": "^2.6.3",
-    "sinon": "^7.3.2",
+    "rimraf": "^3.0.0",
+    "sinon": "^7.5.0",
     "sinon-chai": "^3.3.0",
-    "source-map-support": "^0.5.12",
-    "sqlite3": "^4.0.9",
+    "source-map-support": "^0.5.13",
+    "sqlite3": "^4.1.0",
     "tap-spec": "^5.0.0",
     "tape": "^4.11.0",
     "toxiproxy-node-client": "^2.0.6",
-    "typescript": "^3.5.3",
-    "webpack-cli": "^3.3.6"
+    "typescript": "^3.6.3",
+    "webpack-cli": "^3.3.9"
   },
   "buildDependencies": [
     "rimraf"

package/types/index.d.ts

@@ -548,6 +548,10 @@ declare namespace Knex {
     ): QueryBuilder<TRecord, TRecord[K][]>;
     pluck<TResult2 extends {}>(column: string): QueryBuilder<TRecord, TResult2>;
 
+    insert(
+      data: MaybeArray<SafePartial<TRecord>>,
+      returning: '*'
+    ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     insert<
       TKey extends StrKey<TRecord>,
       TResult2 = DeferredIndex.Augment<
@@ -601,6 +605,10 @@ declare namespace Knex {
       ...args: any[]
     ): QueryBuilder<TRecord2, TResult2>;
 
+    update(
+      data: MaybeArray<SafePartial<TRecord>>,
+      returning: '*'
+    ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     update<
       TKey extends StrKey<TRecord>,
       TResult2 = DeferredIndex.Augment<
@@ -685,6 +693,7 @@ declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
     update<TResult2 = number>(columnName: string, value: Value): QueryBuilder<TRecord, TResult2>;
 
+    returning(column: '*'): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     returning<
       TKey extends StrKey<TRecord>,
       TResult2 = DeferredIndex.Augment<
@@ -708,6 +717,9 @@ declare namespace Knex {
       column: string | string[]
     ): QueryBuilder<TRecord, TResult2>;
 
+    del(
+      returning: '*'
+    ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     del<
       TKey extends StrKey<TRecord>,
       TResult2 = DeferredIndex.Augment<
@@ -733,6 +745,9 @@ declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
     del<TResult2 = number>(): QueryBuilder<TRecord, TResult2>;
 
+    delete(
+      returning: '*'
+    ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     delete<
       TKey extends StrKey<TRecord>,
       TResult2 = DeferredIndex.Augment<
@@ -759,8 +774,6 @@ declare namespace Knex {
     delete<TResult2 = number>(): QueryBuilder<TRecord, TResult2>;
 
     truncate(): QueryBuilder<TRecord, void>;
-
-    clone(): QueryBuilder<TRecord, TResult>;
   }
 
   interface As<TRecord, TResult> {
@@ -1342,9 +1355,8 @@ declare namespace Knex {
   >
     extends QueryInterface<TRecord, TResult>,
       ChainableInterface<ResolveResult<TResult>> {
-    // [TODO] Doesn't seem to be available
-    // or: QueryBuilder;
-
+    or: QueryBuilder<TRecord, TResult>;
+    not: QueryBuilder<TRecord, TResult>;
     and: QueryBuilder<TRecord, TResult>;
 
     // TODO: Promise?
@@ -1364,6 +1376,9 @@ declare namespace Knex {
     on(event: string, callback: Function): QueryBuilder<TRecord, TResult>;
 
     queryContext(context: any): QueryBuilder<TRecord, TResult>;
+
+    clone(): QueryBuilder<TRecord, TResult>;
+    timeout(ms: number, options?: {cancel?: boolean}): QueryBuilder<TRecord, TResult>;
   }
 
   interface Sql {
@@ -1543,7 +1558,7 @@ declare namespace Knex {
     references(columnName: string): ReferencingColumnBuilder;
     onDelete(command: string): ColumnBuilder;
     onUpdate(command: string): ColumnBuilder;
-    defaultTo(value: Value): ColumnBuilder;
+    defaultTo(value: Value | null): ColumnBuilder;
     unsigned(): ColumnBuilder;
     notNullable(): ColumnBuilder;
     nullable(): ColumnBuilder;
@@ -1724,7 +1739,7 @@ declare namespace Knex {
     ssl?: string | MariaSslConfiguration;
     decimalNumbers?: boolean;
   }
-  
+
   interface OracleDbConnectionConfig {
     host: string;
     user: string;
@@ -1811,6 +1826,7 @@ declare namespace Knex {
     rollback(config?: MigratorConfig, all?: boolean): Promise<any>;
     status(config?: MigratorConfig): Promise<number>;
     currentVersion(config?: MigratorConfig): Promise<string>;
+    list(config?: MigratorConfig): Promise<any>;
     up(config?: MigratorConfig): Promise<any>;
     down(config?: MigratorConfig): Promise<any>;
   }
@@ -1819,6 +1835,7 @@ declare namespace Knex {
     extension?: string;
     directory?: string;
     loadExtensions?: string[];
+    specific?: string;
   }
 
   class Seeder {
@@ -1834,7 +1851,8 @@ declare namespace Knex {
 
   interface EnumOptions {
     useNative: boolean;
-    existingType: boolean;
+    existingType?: boolean;
+    schemaName?: string;
     enumName: string;
   }
 
@@ -1855,7 +1873,7 @@ declare namespace Knex {
   }
 
   class QueryBuilder {
-    public static extend(
+    static extend(
       methodName: string,
       fn: <TRecord extends {} = any, TResult = unknown[]>(
         this: Knex<TRecord, TResult>,