typeorm 0.2.25 → 0.2.29

package/browser/driver/oracle/OracleQueryRunner.js

@@ -1,4 +1,4 @@
-import * as tslib_1 from "tslib";
+import { __awaiter, __extends, __generator, __read, __values } from "tslib";
 import { TransactionAlreadyStartedError } from "../../error/TransactionAlreadyStartedError";
 import { TransactionNotStartedError } from "../../error/TransactionNotStartedError";
 import { TableColumn } from "../../schema-builder/table/TableColumn";
@@ -14,17 +14,16 @@ import { Broadcaster } from "../../subscriber/Broadcaster";
 import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
 import { OrmUtils } from "../../util/OrmUtils";
 import { TableCheck } from "../../schema-builder/table/TableCheck";
-import { PromiseUtils } from "../../index";
+import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single oracle database connection.
  */
 var OracleQueryRunner = /** @class */ (function (_super) {
-    tslib_1.__extends(OracleQueryRunner, _super);
+    __extends(OracleQueryRunner, _super);
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
     function OracleQueryRunner(driver, mode) {
-        if (mode === void 0) { mode = "master"; }
         var _this = _super.call(this) || this;
         _this.driver = driver;
         _this.connection = driver.connection;
@@ -84,8 +83,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      */
     OracleQueryRunner.prototype.startTransaction = function (isolationLevel) {
         if (isolationLevel === void 0) { isolationLevel = "READ COMMITTED"; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.isReleased)
@@ -96,11 +96,25 @@ var OracleQueryRunner = /** @class */ (function (_super) {
                         if (isolationLevel !== "SERIALIZABLE" && isolationLevel !== "READ COMMITTED") {
                             throw new Error("Oracle only supports SERIALIZABLE and READ COMMITTED isolation");
                         }
-                        return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
+                        beforeBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionStartEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = true;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -110,17 +124,32 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Error will be thrown if transaction was not started.
      */
     OracleQueryRunner.prototype.commitTransaction = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError();
-                        return [4 /*yield*/, this.query("COMMIT")];
+                        beforeBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionCommitEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.query("COMMIT")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionCommitEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -130,17 +159,32 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Error will be thrown if transaction was not started.
      */
     OracleQueryRunner.prototype.rollbackTransaction = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError();
-                        return [4 /*yield*/, this.query("ROLLBACK")];
+                        beforeBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionRollbackEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.query("ROLLBACK")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionRollbackEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -152,10 +196,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
         var _this = this;
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError();
-        return new Promise(function (ok, fail) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        return new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
             var queryStartTime_1, handler, executionOptions, databaseConnection, err_1;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -202,8 +246,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Returns all available database names including system databases.
      */
     OracleQueryRunner.prototype.getDatabases = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, Promise.resolve([])];
             });
         });
@@ -213,8 +257,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * If database parameter specified, returns schemas of that database.
      */
     OracleQueryRunner.prototype.getSchemas = function (database) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, Promise.resolve([])];
             });
         });
@@ -223,8 +267,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Checks if database with the given name exist.
      */
     OracleQueryRunner.prototype.hasDatabase = function (database) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, Promise.resolve(false)];
             });
         });
@@ -233,8 +277,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Checks if schema with the given name exist.
      */
     OracleQueryRunner.prototype.hasSchema = function (schema) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, Promise.resolve(false)];
             });
         });
@@ -243,9 +287,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Checks if table with the given name exist in the database.
      */
     OracleQueryRunner.prototype.hasTable = function (tableOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var tableName, sql, result;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         tableName = tableOrName instanceof Table ? tableOrName.name : tableOrName;
@@ -262,9 +306,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Checks if column with the given name exist in the given table.
      */
     OracleQueryRunner.prototype.hasColumn = function (tableOrName, columnName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var tableName, sql, result;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         tableName = tableOrName instanceof Table ? tableOrName.name : tableOrName;
@@ -281,8 +325,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new database.
      */
     OracleQueryRunner.prototype.createDatabase = function (database, ifNotExist) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.query("CREATE DATABASE IF NOT EXISTS \"" + database + "\"")];
                     case 1:
@@ -296,8 +340,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops database.
      */
     OracleQueryRunner.prototype.dropDatabase = function (database, ifExist) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, Promise.resolve()];
             });
         });
@@ -306,8 +350,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new table schema.
      */
     OracleQueryRunner.prototype.createSchema = function (schemas, ifNotExist) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("Schema create queries are not supported by Oracle driver.");
             });
         });
@@ -316,8 +360,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops table schema.
      */
     OracleQueryRunner.prototype.dropSchema = function (schemaPath, ifExist) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("Schema drop queries are not supported by Oracle driver.");
             });
         });
@@ -329,10 +373,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
         if (ifNotExist === void 0) { ifNotExist = false; }
         if (createForeignKeys === void 0) { createForeignKeys = true; }
         if (createIndices === void 0) { createIndices = true; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var isTableExist, upQueries, downQueries;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!ifNotExist) return [3 /*break*/, 2];
@@ -374,10 +418,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
     OracleQueryRunner.prototype.dropTable = function (tableOrName, ifExist, dropForeignKeys, dropIndices) {
         if (dropForeignKeys === void 0) { dropForeignKeys = true; }
         if (dropIndices === void 0) { dropIndices = true; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var isTableExist, createForeignKeys, table, _a, upQueries, downQueries;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!ifExist) return [3 /*break*/, 2];
@@ -424,9 +468,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new view.
      */
     OracleQueryRunner.prototype.createView = function (view) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var upQueries, downQueries;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         upQueries = [];
@@ -447,9 +491,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops the view.
      */
     OracleQueryRunner.prototype.dropView = function (target) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var viewName, view, upQueries, downQueries;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         viewName = target instanceof View ? target.name : target;
@@ -474,10 +518,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Renames the given table.
      */
     OracleQueryRunner.prototype.renameTable = function (oldTableOrName, newTableOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var upQueries, downQueries, oldTable, _a, newTable, columnNames, oldPkName, newPkName;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         upQueries = [];
@@ -555,9 +599,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new column from the column in the table.
      */
     OracleQueryRunner.prototype.addColumn = function (tableOrName, column) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, clonedTable, upQueries, downQueries, primaryColumns, pkName_1, columnNames_1, pkName, columnNames, columnIndex, uniqueConstraint;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -620,14 +664,37 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new columns from the column in the table.
      */
     OracleQueryRunner.prototype.addColumns = function (tableOrName, columns) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, PromiseUtils.runInSequence(columns, function (column) { return _this.addColumn(tableOrName, column); })];
+        return __awaiter(this, void 0, void 0, function () {
+            var columns_1, columns_1_1, column, e_1_1;
+            var e_1, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        columns_1 = __values(columns), columns_1_1 = columns_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!columns_1_1.done) return [3 /*break*/, 4];
+                        column = columns_1_1.value;
+                        return [4 /*yield*/, this.addColumn(tableOrName, column)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        columns_1_1 = columns_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_1_1 = _b.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (columns_1_1 && !columns_1_1.done && (_a = columns_1.return)) _a.call(columns_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -636,9 +703,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Renames column in the given table.
      */
     OracleQueryRunner.prototype.renameColumn = function (tableOrName, oldTableColumnOrName, newTableColumnOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, oldColumn, newColumn;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -673,10 +740,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Changes a column in the table.
      */
     OracleQueryRunner.prototype.changeColumn = function (tableOrName, oldTableColumnOrName, newColumn) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, clonedTable, upQueries, downQueries, oldColumn, primaryColumns, columnNames, oldPkName, newPkName, oldTableColumn, defaultUp, defaultDown, nullableUp, nullableDown, primaryColumns, pkName, columnNames, column, pkName, columnNames, primaryColumn, column, pkName, columnNames, uniqueConstraint, uniqueConstraint;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -865,14 +932,37 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Changes a column in the table.
      */
     OracleQueryRunner.prototype.changeColumns = function (tableOrName, changedColumns) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, PromiseUtils.runInSequence(changedColumns, function (changedColumn) { return _this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn); })];
+        return __awaiter(this, void 0, void 0, function () {
+            var changedColumns_1, changedColumns_1_1, _a, oldColumn, newColumn, e_2_1;
+            var e_2, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _c.trys.push([0, 5, 6, 7]);
+                        changedColumns_1 = __values(changedColumns), changedColumns_1_1 = changedColumns_1.next();
+                        _c.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!changedColumns_1_1.done) return [3 /*break*/, 4];
+                        _a = changedColumns_1_1.value, oldColumn = _a.oldColumn, newColumn = _a.newColumn;
+                        return [4 /*yield*/, this.changeColumn(tableOrName, oldColumn, newColumn)];
+                    case 2:
+                        _c.sent();
+                        _c.label = 3;
+                    case 3:
+                        changedColumns_1_1 = changedColumns_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_2_1 = _c.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (changedColumns_1_1 && !changedColumns_1_1.done && (_b = changedColumns_1.return)) _b.call(changedColumns_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -881,9 +971,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops column in the table.
      */
     OracleQueryRunner.prototype.dropColumn = function (tableOrName, columnOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, column, clonedTable, upQueries, downQueries, pkName, columnNames, tableColumn, pkName_2, columnNames_2, columnIndex, columnCheck, columnUnique;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -950,14 +1040,37 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops the columns in the table.
      */
     OracleQueryRunner.prototype.dropColumns = function (tableOrName, columns) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, PromiseUtils.runInSequence(columns, function (column) { return _this.dropColumn(tableOrName, column); })];
+        return __awaiter(this, void 0, void 0, function () {
+            var columns_2, columns_2_1, column, e_3_1;
+            var e_3, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        columns_2 = __values(columns), columns_2_1 = columns_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!columns_2_1.done) return [3 /*break*/, 4];
+                        column = columns_2_1.value;
+                        return [4 /*yield*/, this.dropColumn(tableOrName, column)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        columns_2_1 = columns_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_3_1 = _b.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (columns_2_1 && !columns_2_1.done && (_a = columns_2.return)) _a.call(columns_2);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -966,9 +1079,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new primary key.
      */
     OracleQueryRunner.prototype.createPrimaryKey = function (tableOrName, columnNames) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, clonedTable, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1001,9 +1114,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Updates composite primary keys.
      */
     OracleQueryRunner.prototype.updatePrimaryKeys = function (tableOrName, columns) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, columnNames, clonedTable, upQueries, downQueries, primaryColumns, pkName_3, columnNamesString_1, pkName, columnNamesString;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1047,9 +1160,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops a primary key.
      */
     OracleQueryRunner.prototype.dropPrimaryKey = function (tableOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1078,9 +1191,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new unique constraint.
      */
     OracleQueryRunner.prototype.createUniqueConstraint = function (tableOrName, uniqueConstraint) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1110,10 +1223,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new unique constraints.
      */
     OracleQueryRunner.prototype.createUniqueConstraints = function (tableOrName, uniqueConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = uniqueConstraints.map(function (uniqueConstraint) { return _this.createUniqueConstraint(tableOrName, uniqueConstraint); });
@@ -1129,9 +1242,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops an unique constraint.
      */
     OracleQueryRunner.prototype.dropUniqueConstraint = function (tableOrName, uniqueOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, uniqueConstraint, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1161,10 +1274,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates an unique constraints.
      */
     OracleQueryRunner.prototype.dropUniqueConstraints = function (tableOrName, uniqueConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = uniqueConstraints.map(function (uniqueConstraint) { return _this.dropUniqueConstraint(tableOrName, uniqueConstraint); });
@@ -1180,9 +1293,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates new check constraint.
      */
     OracleQueryRunner.prototype.createCheckConstraint = function (tableOrName, checkConstraint) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1212,10 +1325,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates new check constraints.
      */
     OracleQueryRunner.prototype.createCheckConstraints = function (tableOrName, checkConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = checkConstraints.map(function (checkConstraint) { return _this.createCheckConstraint(tableOrName, checkConstraint); });
@@ -1231,9 +1344,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops check constraint.
      */
     OracleQueryRunner.prototype.dropCheckConstraint = function (tableOrName, checkOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, checkConstraint, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1263,10 +1376,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops check constraints.
      */
     OracleQueryRunner.prototype.dropCheckConstraints = function (tableOrName, checkConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = checkConstraints.map(function (checkConstraint) { return _this.dropCheckConstraint(tableOrName, checkConstraint); });
@@ -1282,8 +1395,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new exclusion constraint.
      */
     OracleQueryRunner.prototype.createExclusionConstraint = function (tableOrName, exclusionConstraint) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("Oracle does not support exclusion constraints.");
             });
         });
@@ -1292,8 +1405,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new exclusion constraints.
      */
     OracleQueryRunner.prototype.createExclusionConstraints = function (tableOrName, exclusionConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("Oracle does not support exclusion constraints.");
             });
         });
@@ -1302,8 +1415,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops exclusion constraint.
      */
     OracleQueryRunner.prototype.dropExclusionConstraint = function (tableOrName, exclusionOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("Oracle does not support exclusion constraints.");
             });
         });
@@ -1312,8 +1425,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops exclusion constraints.
      */
     OracleQueryRunner.prototype.dropExclusionConstraints = function (tableOrName, exclusionConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("Oracle does not support exclusion constraints.");
             });
         });
@@ -1322,9 +1435,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new foreign key.
      */
     OracleQueryRunner.prototype.createForeignKey = function (tableOrName, foreignKey) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1354,10 +1467,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new foreign keys.
      */
     OracleQueryRunner.prototype.createForeignKeys = function (tableOrName, foreignKeys) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = foreignKeys.map(function (foreignKey) { return _this.createForeignKey(tableOrName, foreignKey); });
@@ -1373,9 +1486,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops a foreign key from the table.
      */
     OracleQueryRunner.prototype.dropForeignKey = function (tableOrName, foreignKeyOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, foreignKey, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1405,10 +1518,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops a foreign keys from the table.
      */
     OracleQueryRunner.prototype.dropForeignKeys = function (tableOrName, foreignKeys) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = foreignKeys.map(function (foreignKey) { return _this.dropForeignKey(tableOrName, foreignKey); });
@@ -1424,9 +1537,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new index.
      */
     OracleQueryRunner.prototype.createIndex = function (tableOrName, index) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1456,10 +1569,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Creates a new indices
      */
     OracleQueryRunner.prototype.createIndices = function (tableOrName, indices) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = indices.map(function (index) { return _this.createIndex(tableOrName, index); });
@@ -1475,9 +1588,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops an index from the table.
      */
     OracleQueryRunner.prototype.dropIndex = function (tableOrName, indexOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, index, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1507,10 +1620,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Drops an indices from the table.
      */
     OracleQueryRunner.prototype.dropIndices = function (tableOrName, indices) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = indices.map(function (index) { return _this.dropIndex(tableOrName, index); });
@@ -1527,8 +1640,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Note: this operation uses SQL's TRUNCATE query which cannot be reverted in transactions.
      */
     OracleQueryRunner.prototype.clearTable = function (tableName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE \"" + tableName + "\"")];
                     case 1:
@@ -1542,10 +1655,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Removes all tables from the currently connected database.
      */
     OracleQueryRunner.prototype.clearDatabase = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var dropViewsQuery, dropViewQueries, dropTablesQuery, dropTableQueries, error_1, rollbackError_1;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.startTransaction()];
                     case 1:
@@ -1593,9 +1706,9 @@ var OracleQueryRunner = /** @class */ (function (_super) {
     // Protected Methods
     // -------------------------------------------------------------------------
     OracleQueryRunner.prototype.loadViews = function (viewNames) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var hasTable, viewNamesString, query, dbViews;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.hasTable(this.getTypeormMetadataTableName())];
                     case 1:
@@ -1623,10 +1736,10 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Loads all tables (with given names) from the database and creates a Table from them.
      */
     OracleQueryRunner.prototype.loadTables = function (tableNames) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var tableNamesString, tablesSql, columnsSql, indicesSql, foreignKeysSql, constraintsSql, _a, dbTables, dbColumns, dbIndices, dbForeignKeys, dbConstraints;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         // if no tables given then no need to proceed
@@ -1660,7 +1773,7 @@ var OracleQueryRunner = /** @class */ (function (_super) {
                                 this.query(constraintsSql),
                             ])];
                     case 1:
-                        _a = tslib_1.__read.apply(void 0, [_b.sent(), 5]), dbTables = _a[0], dbColumns = _a[1], dbIndices = _a[2], dbForeignKeys = _a[3], dbConstraints = _a[4];
+                        _a = __read.apply(void 0, [_b.sent(), 5]), dbTables = _a[0], dbColumns = _a[1], dbIndices = _a[2], dbForeignKeys = _a[3], dbConstraints = _a[4];
                         // if tables were not found in the db, no need to proceed
                         if (!dbTables.length)
                             return [2 /*return*/, []];
@@ -1843,7 +1956,7 @@ var OracleQueryRunner = /** @class */ (function (_super) {
     };
     OracleQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         var expression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
-        var _a = tslib_1.__read(this.connection.createQueryBuilder()
+        var _a = __read(this.connection.createQueryBuilder()
             .insert()
             .into(this.getTypeormMetadataTableName())
             .values({ type: "VIEW", name: view.name, value: expression })
@@ -1863,7 +1976,7 @@ var OracleQueryRunner = /** @class */ (function (_super) {
     OracleQueryRunner.prototype.deleteViewDefinitionSql = function (viewOrPath) {
         var viewName = viewOrPath instanceof View ? viewOrPath.name : viewOrPath;
         var qb = this.connection.createQueryBuilder();
-        var _a = tslib_1.__read(qb.delete()
+        var _a = __read(qb.delete()
             .from(this.getTypeormMetadataTableName())
             .where(qb.escape("type") + " = 'VIEW'")
             .andWhere(qb.escape("name") + " = :name", { name: viewName })