knex 0.12.6 → 0.13.0

package/CHANGELOG.md

@@ -1,6 +1,48 @@
 
 # Master (Unreleased)
+
+# 0.13 - 29 Apr, 2017
+
+### Breaking Changes:
+- Multiple concurrent migration runners blocks instead of throwing error when possible #1962
+- Fixed transaction promise mutation issue #1991
+
+### Other Changes:
+- Allow passing version of connected db in configuration file #1993
+- Bugfixes on batchInsert and transactions for mysql/maria #1992
+- Add fetchAsString optional parameter to oracledb dialect #1998
+- fix: escapeObject parameter order for Postgres dialect. #2003
+
+# 0.12.9 - 23 Mar, 2017
+- Fixed unhandled exception in batchInsert when the rows to be inserted resulted in duplicate key violation #1880
+
+# 0.12.8 - 15 Mar, 2017
+- Added clearSelect and clearWhere to query builder #1912
+- Properly close Postgres query streams on error #1935
+- Transactions should never reject with undefined #1970
+- Clear acquireConnectionTimeout if an error occurs when acquiring a connection #1973
+
+# 0.12.7 - 17 Feb, 2017
+
+### Accidental Breaking Change:
+- Ensure that 'client' is provided in knex config object #1822
+
+### Other Changes:
+- Support custom foreign key names #1311, #1726
+- Fixed named bindings to work with queries containing `:`-chars #1890
+- Exposed more promise functions #1896
+- Pass rollback errors to transaction promise in mssql #1885
+- ONLY keyword support for PostgreSQL (for table inheritance) #1874
+- Fixed Mssql update with join syntax #1777
+- Replace migrations and seed for react-native packager #1813
+- Support knexfile, migration and seeds in TypeScript #1769
+- Fix float to integer conversion of decimal fields in MSSQL #1781
+- External authentication capability when using oracledb driver #1716
+- Fixed MSSQL incorect query build when locks are used #1707
+- Allow to use `first` method as aliased select #1784
+- Alter column for nullability, type and default value #46, #1759
 - Add more having* methods / join clause on* methods  #1674
+- Compatibility fixes and cleanups #1788, #1792, #1794, #1814, #1857, #1649
 
 # 0.12.6 - 19 Oct, 2016
 - Address warnings mentioned in #1388 (#1740)

package/CONTRIBUTING.md

@@ -12,6 +12,12 @@
 
 * All pull requests should be made to the `master` branch.
 
+## Documentation
+
+Documentation is no longer maintained in knex master repository. All the documentation pull requests should be sent to https://github.com/knex/documentation
+
+Documentation pull requests should not be merged before knex version which has the new documented feature is released.
+
 ## Integration Tests
 
 ### The Easy Way
@@ -65,7 +71,7 @@ There is always room for more collaborators. Be active on resolving github issue
 
 ### Etiquette (/ˈɛtᵻkɛt/ or /ˈɛtᵻkɪt/, French: [e.ti.kɛt])
 
-Make pull requests for your changes, do not commit directly to master (release stuff / documentation changes are ok though).
+Make pull requests for your changes, do not commit directly to master (release stuff like fixing changelog are ok though).
 
 All the pull requests must be peer reviewed by other collaborator, so don't merge your request before that. If there is no response ping others.
 

package/bin/cli.js

@@ -71,7 +71,7 @@ function initKnex(env) {
 
 function invoke(env) {
 
-  var filetypes = ['js', 'coffee', 'eg', 'ls'];
+  var filetypes = ['js', 'coffee', 'ts', 'eg', 'ls'];
   var pending = null;
 
   commander
@@ -110,7 +110,7 @@ function invoke(env) {
 
   commander
     .command('migrate:make <name>')
-    .description('       Create a named migration file.')
+    .description('        Create a named migration file.')
     .option(`-x [${filetypes.join('|')}]`, 'Specify the stub extension (default js)')
     .action(function(name) {
       var instance = initKnex(env);
@@ -152,7 +152,7 @@ function invoke(env) {
 
   commander
     .command('migrate:currentVersion')
-    .description('       View the current version for the migration.')
+    .description('        View the current version for the migration.')
     .action(function () {
       pending = initKnex(env).migrate.currentVersion().then(function(version) {
         success(chalk.green('Current Version: ') + chalk.blue(version));
@@ -161,7 +161,7 @@ function invoke(env) {
 
   commander
     .command('seed:make <name>')
-    .description('       Create a named seed file.')
+    .description('        Create a named seed file.')
     .option(`-x [${filetypes.join('|')}]`, 'Specify the stub extension (default js)')
     .action(function(name) {
       var instance = initKnex(env);
@@ -173,7 +173,7 @@ function invoke(env) {
 
   commander
     .command('seed:run')
-    .description('       Run seed files.')
+    .description('        Run seed files.')
     .action(function() {
       pending = initKnex(env).seed.run().spread(function(log) {
         if (log.length === 0) {

package/lib/client.js

@@ -100,6 +100,14 @@ function Client() {
   var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
   this.config = config;
+
+  //Client is a required field, so throw error if it's not supplied.
+  //If 'this.dialect' is set, then this is a 'super()' call, in which case
+  //'client' does not have to be set as it's already assigned on the client prototype.
+  if (!this.config.client && !this.dialect) {
+    throw new Error('knex: Required configuration option \'client\' is missing.');
+  }
+
   this.connectionSettings = (0, _cloneDeep3.default)(config.connection || {});
   if (this.driverName && config.connection) {
     this.initializeDriver();
@@ -279,10 +287,10 @@ function Client() {
         rejecter(new _bluebird2.default.TimeoutError('Knex: Timeout acquiring a connection. The pool is probably full. ' + 'Are you missing a .transacting(trx) call?'));
       }, _this4.config.acquireConnectionTimeout || 60000);
       _this4.pool.acquire(function (err, connection) {
+        clearTimeout(t);
         if (err) {
           return rejecter(err);
         }
-        clearTimeout(t);
         if (wasRejected) {
           _this4.pool.release(connection);
         } else {

package/lib/dialects/maria/transaction.js

@@ -14,6 +14,10 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
+var _isUndefined2 = require('lodash/isUndefined');
+
+var _isUndefined3 = _interopRequireDefault(_isUndefined2);
+
 var _debug = require('debug');
 
 var _debug2 = _interopRequireDefault(_debug);
@@ -53,7 +57,12 @@ var Transaction_Maria = function (_Transaction) {
       debug('%s error running transaction query', t.txid);
     }).tap(function () {
       if (status === 1) t._resolver(value);
-      if (status === 2) t._rejecter(value);
+      if (status === 2) {
+        if ((0, _isUndefined3.default)(value)) {
+          value = new Error('Transaction rejected with non-error: ' + value);
+        }
+        t._rejecter(value);
+      }
     });
     if (status === 1 || status === 2) {
       t._completed = true;

package/lib/dialects/mssql/index.js

@@ -180,8 +180,8 @@ function Client_MSSQL(config) {
         rejecter(err);
       });
       stream.on('end', resolver);
-      var _obj = obj;
-      var sql = _obj.sql;
+      var _obj = obj,
+          sql = _obj.sql;
 
       if (!sql) return resolver();
       var req = (connection.tx_ || connection).request();
@@ -207,8 +207,8 @@ function Client_MSSQL(config) {
     // convert ? params into positional bindings (@p1)
     obj.sql = this.positionBindings(obj.sql);
     return new _bluebird2.default(function (resolver, rejecter) {
-      var _obj2 = obj;
-      var sql = _obj2.sql;
+      var _obj2 = obj,
+          sql = _obj2.sql;
 
       if (!sql) return resolver();
       var req = (connection.tx_ || connection).request();
@@ -230,13 +230,19 @@ function Client_MSSQL(config) {
   },
 
 
-  // sets a request input parameter. Detects bigints and sets type appropriately.
+  // sets a request input parameter. Detects bigints and decimals and sets type appropriately.
   _setReqInput: function _setReqInput(req, i, binding) {
-    if (typeof binding == 'number' && (binding < SQL_INT4.MIN || binding > SQL_INT4.MAX)) {
-      if (binding < SQL_BIGINT_SAFE.MIN || binding > SQL_BIGINT_SAFE.MAX) {
-        throw new Error('Bigint must be safe integer or must be passed as string, saw ' + binding);
+    if (typeof binding == 'number') {
+      if (binding % 1 !== 0) {
+        req.input('p' + i, this.driver.Decimal(38, 10), binding);
+      } else if (binding < SQL_INT4.MIN || binding > SQL_INT4.MAX) {
+        if (binding < SQL_BIGINT_SAFE.MIN || binding > SQL_BIGINT_SAFE.MAX) {
+          throw new Error('Bigint must be safe integer or must be passed as string, saw ' + binding);
+        }
+        req.input('p' + i, this.driver.BigInt, binding);
+      } else {
+        req.input('p' + i, this.driver.Int, binding);
       }
-      req.input('p' + i, this.driver.BigInt, binding);
     } else {
       req.input('p' + i, binding);
     }

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

@@ -6,6 +6,10 @@ var _typeof2 = require('babel-runtime/helpers/typeof');
 
 var _typeof3 = _interopRequireDefault(_typeof2);
 
+var _compact2 = require('lodash/compact');
+
+var _compact3 = _interopRequireDefault(_compact2);
+
 var _isEmpty2 = require('lodash/isEmpty');
 
 var _isEmpty3 = _interopRequireDefault(_isEmpty2);
@@ -31,10 +35,23 @@ function QueryCompiler_MSSQL(client, builder) {
 }
 (0, _inherits2.default)(QueryCompiler_MSSQL, _compiler2.default);
 
+var components = ['columns', 'join', 'lock', 'where', 'union', 'group', 'having', 'order', 'limit', 'offset'];
+
 (0, _assign3.default)(QueryCompiler_MSSQL.prototype, {
 
   _emptyInsertValue: 'default values',
 
+  select: function select() {
+    var _this = this;
+
+    var sql = this.with();
+    var statements = components.map(function (component) {
+      return _this[component](_this);
+    });
+    return sql + (0, _compact3.default)(statements).join(' ');
+  },
+
+
   // Compiles an "insert" query, allowing for multiple
   // inserts using a single query statement.
   insert: function insert() {
@@ -91,7 +108,7 @@ function QueryCompiler_MSSQL(client, builder) {
     var returning = this.single.returning;
 
     return {
-      sql: this.with() + ('update ' + (top ? top + ' ' : '') + this.tableName) + (join ? ' ' + join : '') + ' set ' + updates.join(', ') + (returning ? ' ' + this._returning('update', returning) : '') + (where ? ' ' + where : '') + (order ? ' ' + order : '') + (!returning ? this._returning('rowcount', '@@rowcount') : ''),
+      sql: this.with() + ('update ' + (top ? top + ' ' : '') + this.tableName) + ' set ' + updates.join(', ') + (join ? ' from ' + this.tableName + ' ' + join : '') + (returning ? ' ' + this._returning('update', returning) : '') + (where ? ' ' + where : '') + (order ? ' ' + order : '') + (!returning ? this._returning('rowcount', '@@rowcount') : ''),
       returning: returning || '@@rowcount'
     };
   },

package/lib/dialects/mssql/schema/tablecompiler.js

@@ -60,11 +60,15 @@ function TableCompiler_MSSQL() {
 
   dropColumnPrefix: 'DROP COLUMN ',
 
+  alterColumnPrefix: 'ALTER COLUMN ',
+
   // Compiles column add.  Multiple columns need only one ADD clause (not one ADD per column) so core addColumns doesn't work.  #1348
-  addColumns: function addColumns(columns) {
+  addColumns: function addColumns(columns, prefix) {
+    prefix = prefix || this.addColumnsPrefix;
+
     if (columns.sql.length > 0) {
       this.pushQuery({
-        sql: (this.lowerCase ? 'alter table ' : 'ALTER TABLE ') + this.tableName() + ' ' + this.addColumnsPrefix + columns.sql.join(', '),
+        sql: (this.lowerCase ? 'alter table ' : 'ALTER TABLE ') + this.tableName() + ' ' + prefix + columns.sql.join(', '),
         bindings: columns.bindings
       });
     }

package/lib/dialects/mssql/transaction.js

@@ -69,6 +69,9 @@ var Transaction_MSSQL = function (_Transaction) {
     debug('%s: rolling back', this.txid);
     return conn.tx_.rollback().then(function () {
       return _this4._rejecter(error);
+    }, function (err) {
+      if (error) err.originalError = error;
+      return _this4._rejecter(err);
     });
   };
 

package/lib/dialects/mysql/index.js

@@ -144,8 +144,8 @@ function Client_MySQL(config) {
   _query: function _query(connection, obj) {
     if (!obj || typeof obj === 'string') obj = { sql: obj };
     return new _bluebird2.default(function (resolver, rejecter) {
-      var _obj = obj;
-      var sql = _obj.sql;
+      var _obj = obj,
+          sql = _obj.sql;
 
       if (!sql) return resolver();
       if (obj.options) sql = (0, _assign3.default)({ sql: sql }, obj.options);

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

@@ -72,6 +72,8 @@ function TableCompiler_MySQL() {
 
   addColumnsPrefix: 'add ',
 
+  alterColumnsPrefix: 'modify ',
+
   dropColumnPrefix: 'drop ',
 
   // Compiles the comment on the table.

package/lib/dialects/mysql/transaction.js

@@ -2,6 +2,10 @@
 
 exports.__esModule = true;
 
+var _isUndefined2 = require('lodash/isUndefined');
+
+var _isUndefined3 = _interopRequireDefault(_isUndefined2);
+
 var _assign2 = require('lodash/assign');
 
 var _assign3 = _interopRequireDefault(_assign2);
@@ -47,7 +51,12 @@ function Transaction_MySQL() {
       debug('%s error running transaction query', t.txid);
     }).tap(function () {
       if (status === 1) t._resolver(value);
-      if (status === 2) t._rejecter(value);
+      if (status === 2) {
+        if ((0, _isUndefined3.default)(value)) {
+          value = new Error('Transaction rejected with non-error: ' + value);
+        }
+        t._rejecter(value);
+      }
     });
     if (status === 1 || status === 2) {
       t._completed = true;

package/lib/dialects/mysql2/transaction.js

@@ -2,6 +2,10 @@
 
 exports.__esModule = true;
 
+var _isUndefined2 = require('lodash/isUndefined');
+
+var _isUndefined3 = _interopRequireDefault(_isUndefined2);
+
 var _assign2 = require('lodash/assign');
 
 var _assign3 = _interopRequireDefault(_assign2);
@@ -44,7 +48,12 @@ function Transaction_MySQL2() {
       debug('%s error running transaction query', t.txid);
     }).tap(function () {
       if (status === 1) t._resolver(value);
-      if (status === 2) t._rejecter(value);
+      if (status === 2) {
+        if ((0, _isUndefined3.default)(value)) {
+          value = new Error('Transaction rejected with non-error: ' + value);
+        }
+        t._rejecter(value);
+      }
     });
     if (status === 1 || status === 2) {
       t._completed = true;

package/lib/dialects/oracle/index.js

@@ -66,10 +66,6 @@ var _tablecompiler = require('./schema/tablecompiler');
 
 var _tablecompiler2 = _interopRequireDefault(_tablecompiler);
 
-var _stream2 = require('./stream');
-
-var _stream3 = _interopRequireDefault(_stream2);
-
 var _utils = require('./utils');
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -79,12 +75,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Always initialize with the "QueryBuilder" and "QueryCompiler"
 // objects, which extend the base 'lib/query/builder' and
 // 'lib/query/compiler', respectively.
-
-// Oracle Client
-// -------
 function Client_Oracle(config) {
   _client2.default.call(this, config);
 }
+// Oracle Client
+// -------
+
 (0, _inherits2.default)(Client_Oracle, _client2.default);
 
 (0, _assign3.default)(Client_Oracle.prototype, {
@@ -183,7 +179,7 @@ function Client_Oracle(config) {
         rejecter(err);
       });
       stream.on('end', resolver);
-      var queryStream = new _stream3.default(connection, obj.sql, obj.bindings, options);
+      var queryStream = connection.queryStream(obj.sql, obj.bindings, options);
       queryStream.pipe(stream);
     });
   },

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

@@ -188,13 +188,16 @@ function QueryCompiler_Oracle(client, builder) {
   // Compiles a `columnInfo` query.
   columnInfo: function columnInfo() {
     var column = this.single.columnInfo;
+    // Node oracle drivers doesn't support LONG type (which is data_default type)
+    var sql = 'select * from xmltable( \'/ROWSET/ROW\'\n      passing dbms_xmlgen.getXMLType(\'\n      select char_col_decl_length, column_name, data_type, data_default, nullable\n      from user_tab_columns where table_name = \'\'' + this.single.table + '\'\' \')\n      columns\n      CHAR_COL_DECL_LENGTH number, COLUMN_NAME varchar2(200), DATA_TYPE varchar2(106),\n      DATA_DEFAULT clob, NULLABLE varchar2(1))';
+
     return {
-      sql: 'select COLUMN_NAME, DATA_TYPE, CHAR_COL_DECL_LENGTH, NULLABLE from USER_TAB_COLS where TABLE_NAME = :1',
-      bindings: [this.single.table],
+      sql: sql,
       output: function output(resp) {
         var out = (0, _reduce3.default)(resp, function (columns, val) {
           columns[val.COLUMN_NAME] = {
             type: val.DATA_TYPE,
+            defaultValue: val.DATA_DEFAULT,
             maxLength: val.CHAR_COL_DECL_LENGTH,
             nullable: val.NULLABLE === 'Y'
           };

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

@@ -18,10 +18,6 @@ var _inherits = require('inherits');
 
 var _inherits2 = _interopRequireDefault(_inherits);
 
-var _utils = require('../utils');
-
-var utils = _interopRequireWildcard(_utils);
-
 var _raw = require('../../../raw');
 
 var _raw2 = _interopRequireDefault(_raw);
@@ -30,7 +26,9 @@ var _columncompiler = require('../../../schema/columncompiler');
 
 var _columncompiler2 = _interopRequireDefault(_columncompiler);
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+var _trigger = require('./trigger');
+
+var _trigger2 = _interopRequireDefault(_trigger);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -38,8 +36,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // -------
 
 function ColumnCompiler_Oracle() {
-  this.modifiers = ['defaultTo', 'checkIn', 'nullable', 'comment'];
   _columncompiler2.default.apply(this, arguments);
+  this.modifiers = ['defaultTo', 'checkIn', 'nullable', 'comment'];
 }
 (0, _inherits2.default)(ColumnCompiler_Oracle, _columncompiler2.default);
 
@@ -49,12 +47,8 @@ function ColumnCompiler_Oracle() {
   _createAutoIncrementTriggerAndSequence: function _createAutoIncrementTriggerAndSequence() {
     // TODO Add warning that sequence etc is created
     this.pushAdditional(function () {
-      var sequenceName = this.tableCompiler._indexCommand('seq', this.tableCompiler.tableNameRaw);
-      var triggerName = this.tableCompiler._indexCommand('trg', this.tableCompiler.tableNameRaw, this.getColumnName());
-      var tableName = this.tableCompiler.tableName();
-      var columnName = this.formatter.wrap(this.getColumnName());
-      var createTriggerSQL = 'create or replace trigger ' + triggerName + ' before insert on ' + tableName + ' for each row' + ' declare' + ' checking number := 1;' + ' begin' + (' if (:new.' + columnName + ' is null) then') + ' while checking >= 1' + ' loop' + (' select ' + sequenceName + '.nextval into :new.' + columnName + ' from dual;') + (' select count(' + columnName + ') into checking from ' + tableName) + (' where ' + columnName + ' = :new.' + columnName + ';') + ' end loop;' + ' end if;' + ' end;';
-      this.pushQuery(utils.wrapSqlWithCatch('create sequence ' + sequenceName, -955));
+      var tableName = this.tableCompiler.tableNameRaw;
+      var createTriggerSQL = _trigger2.default.createAutoIncrementTrigger(tableName);
       this.pushQuery(createTriggerSQL);
     });
   },

package/lib/dialects/oracle/schema/compiler.js

@@ -14,21 +14,25 @@ var _utils = require('../utils');
 
 var utils = _interopRequireWildcard(_utils);
 
+var _trigger = require('./trigger');
+
+var _trigger2 = _interopRequireDefault(_trigger);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// Oracle Schema Compiler
+// -------
 function SchemaCompiler_Oracle() {
   _compiler2.default.apply(this, arguments);
 }
-// Oracle Schema Compiler
-// -------
-
 (0, _inherits2.default)(SchemaCompiler_Oracle, _compiler2.default);
 
 // Rename a table on the schema.
 SchemaCompiler_Oracle.prototype.renameTable = function (tableName, to) {
-  this.pushQuery('rename ' + this.formatter.wrap(tableName) + ' to ' + this.formatter.wrap(to));
+  var renameTable = _trigger2.default.renameTableAndAutoIncrementTrigger(tableName, to);
+  this.pushQuery(renameTable);
 };
 
 // Check whether a table exists on the query.

package/lib/dialects/oracle/schema/tablecompiler.js

@@ -22,6 +22,10 @@ var _helpers = require('../../../helpers');
 
 var helpers = _interopRequireWildcard(_helpers);
 
+var _trigger = require('./trigger');
+
+var _trigger2 = _interopRequireDefault(_trigger);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -29,20 +33,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Table Compiler
 // ------
 
-/* eslint max-len:0 */
-
 function TableCompiler_Oracle() {
   _tablecompiler2.default.apply(this, arguments);
-}
+} /* eslint max-len:0 */
+
 (0, _inherits2.default)(TableCompiler_Oracle, _tablecompiler2.default);
 
 (0, _assign3.default)(TableCompiler_Oracle.prototype, {
 
   // Compile a rename column command.
   renameColumn: function renameColumn(from, to) {
-    return this.pushQuery({
-      sql: 'alter table ' + this.tableName() + ' rename column ' + this.formatter.wrap(from) + ' to ' + this.formatter.wrap(to)
-    });
+    // Remove quotes around tableName
+    var tableName = this.tableName().slice(1, -1);
+    return this.pushQuery(_trigger2.default.renameColumnTrigger(tableName, from, to));
   },
   compileAdd: function compileAdd(builder) {
     var table = this.formatter.wrap(builder);
@@ -73,6 +76,8 @@ function TableCompiler_Oracle() {
 
   addColumnsPrefix: 'add ',
 
+  alterColumnsPrefix: 'modify ',
+
   dropColumn: function dropColumn() {
     var columns = helpers.normalizeArr.apply(null, arguments);
     this.pushQuery('alter table ' + this.tableName() + ' drop (' + this.formatter.columnize(columns) + ')');

package/lib/dialects/oracle/schema/trigger.js

@@ -0,0 +1,35 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _utils = require('../utils');
+
+var utils = _interopRequireWildcard(_utils);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+var trigger = {
+
+  renameColumnTrigger: function renameColumnTrigger(tableName, columnName, to) {
+    var triggerName = utils.generateCombinedName('autoinc_trg', tableName);
+    var sequenceName = utils.generateCombinedName('seq', tableName);
+    return 'DECLARE ' + 'PK_NAME VARCHAR(200); ' + 'IS_AUTOINC NUMBER := 0; ' + 'BEGIN' + ('  EXECUTE IMMEDIATE (\'ALTER TABLE "' + tableName + '" RENAME COLUMN "' + columnName + '" TO "' + to + '"\');') + ('  SELECT COUNT(*) INTO IS_AUTOINC from "USER_TRIGGERS" where trigger_name = \'' + triggerName + '\';') + '  IF (IS_AUTOINC > 0) THEN' + '    SELECT cols.column_name INTO PK_NAME' + '    FROM all_constraints cons, all_cons_columns cols' + '    WHERE cons.constraint_type = \'P\'' + '    AND cons.constraint_name = cols.constraint_name' + '    AND cons.owner = cols.owner' + ('    AND cols.table_name = \'' + tableName + '\';') + ('    IF (\'' + to + '\' = PK_NAME) THEN') + ('      EXECUTE IMMEDIATE (\'DROP TRIGGER "' + triggerName + '"\');') + ('      EXECUTE IMMEDIATE (\'create or replace trigger "' + triggerName + '"') + ('      BEFORE INSERT on "' + tableName + '" for each row') + '        declare' + '        checking number := 1;' + '        begin' + ('          if (:new."' + to + '" is null) then') + '            while checking >= 1 loop' + ('              select "' + sequenceName + '".nextval into :new."' + to + '" from dual;') + ('              select count("' + to + '") into checking from "' + tableName + '"') + ('              where "' + to + '" = :new."' + to + '";') + '            end loop;' + '          end if;' + '        end;\');' + '    end if;' + '  end if;' + 'END;';
+  },
+
+  createAutoIncrementTrigger: function createAutoIncrementTrigger(tableName) {
+    var triggerName = utils.generateCombinedName('autoinc_trg', tableName);
+    var sequenceName = utils.generateCombinedName('seq', tableName);
+    return 'DECLARE ' + 'PK_NAME VARCHAR(200); ' + 'BEGIN' + ('  EXECUTE IMMEDIATE (\'CREATE SEQUENCE "' + sequenceName + '"\');') + '  SELECT cols.column_name INTO PK_NAME' + '  FROM all_constraints cons, all_cons_columns cols' + '  WHERE cons.constraint_type = \'P\'' + '  AND cons.constraint_name = cols.constraint_name' + '  AND cons.owner = cols.owner' + ('  AND cols.table_name = \'' + tableName + '\';') + ('  execute immediate (\'create or replace trigger "' + triggerName + '"') + ('  BEFORE INSERT on "' + tableName + '"') + '  for each row' + '  declare' + '  checking number := 1;' + '  begin' + '    if (:new."\' || PK_NAME || \'" is null) then' + '      while checking >= 1 loop' + ('        select "' + sequenceName + '".nextval into :new."\' || PK_NAME || \'" from dual;') + ('        select count("\' || PK_NAME || \'") into checking from "' + tableName + '"') + '        where "\' || PK_NAME || \'" = :new."\' || PK_NAME || \'";' + '      end loop;' + '    end if;' + '  end;\'); ' + 'END;';
+  },
+
+  renameTableAndAutoIncrementTrigger: function renameTableAndAutoIncrementTrigger(tableName, to) {
+    var triggerName = utils.generateCombinedName('autoinc_trg', tableName);
+    var sequenceName = utils.generateCombinedName('seq', tableName);
+    var toTriggerName = utils.generateCombinedName('autoinc_trg', to);
+    var toSequenceName = utils.generateCombinedName('seq', to);
+    return 'DECLARE ' + 'PK_NAME VARCHAR(200); ' + 'IS_AUTOINC NUMBER := 0; ' + 'BEGIN' + ('  EXECUTE IMMEDIATE (\'RENAME "' + tableName + '" TO "' + to + '"\');') + ('  SELECT COUNT(*) INTO IS_AUTOINC from "USER_TRIGGERS" where trigger_name = \'' + triggerName + '\';') + '  IF (IS_AUTOINC > 0) THEN' + ('    EXECUTE IMMEDIATE (\'DROP TRIGGER "' + triggerName + '"\');') + ('    EXECUTE IMMEDIATE (\'RENAME "' + sequenceName + '" TO "' + toSequenceName + '"\');') + '    SELECT cols.column_name INTO PK_NAME' + '    FROM all_constraints cons, all_cons_columns cols' + '    WHERE cons.constraint_type = \'P\'' + '    AND cons.constraint_name = cols.constraint_name' + '    AND cons.owner = cols.owner' + ('    AND cols.table_name = \'' + to + '\';') + ('    EXECUTE IMMEDIATE (\'create or replace trigger "' + toTriggerName + '"') + ('    BEFORE INSERT on "' + to + '" for each row') + '      declare' + '      checking number := 1;' + '      begin' + '        if (:new."\' || PK_NAME || \'" is null) then' + '          while checking >= 1 loop' + ('            select "' + toSequenceName + '".nextval into :new."\' || PK_NAME || \'" from dual;') + ('            select count("\' || PK_NAME || \'") into checking from "' + to + '"') + '            where "\' || PK_NAME || \'" = :new."\' || PK_NAME || \'";' + '          end loop;' + '        end if;' + '      end;\');' + '  end if;' + 'END;';
+  }
+};
+
+exports.default = trigger;
+module.exports = exports['default'];

package/lib/dialects/oracle/transaction.js

@@ -14,6 +14,10 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
+var _isUndefined2 = require('lodash/isUndefined');
+
+var _isUndefined3 = _interopRequireDefault(_isUndefined2);
+
 var _bluebird = require('bluebird');
 
 var _bluebird2 = _interopRequireDefault(_bluebird);
@@ -49,9 +53,17 @@ var Oracle_Transaction = function (_Transaction) {
   };
 
   Oracle_Transaction.prototype.rollback = function rollback(conn, err) {
+    var _this2 = this;
+
     this._completed = true;
     debugTx('%s: rolling back', this.txid);
-    return conn.rollbackAsync().throw(err).catch(this._rejecter);
+    return conn.rollbackAsync().throw(err).catch(function (error) {
+      if ((0, _isUndefined3.default)(error)) {
+        error = new Error('Transaction rejected with non-error: ' + error);
+      }
+
+      return _this2._rejecter(error);
+    });
   };
 
   Oracle_Transaction.prototype.acquireConnection = function acquireConnection(config) {