typeorm 0.2.38-dev.e9366b3 → 0.2.39-dev.1197f88

package/browser/schema-builder/RdbmsSchemaBuilder.js

@@ -1,4 +1,4 @@
-import { __awaiter, __generator, __values } from "tslib";
+import { __awaiter, __generator, __read, __values } from "tslib";
 import { CockroachDriver } from "../driver/cockroachdb/CockroachDriver";
 import { Table } from "./table/Table";
 import { TableColumn } from "./table/TableColumn";
@@ -11,6 +11,7 @@ import { TableUnique } from "./table/TableUnique";
 import { TableCheck } from "./table/TableCheck";
 import { TableExclusion } from "./table/TableExclusion";
 import { View } from "./view/View";
+import { ViewUtils } from "./util/ViewUtils";
 import { AuroraDataApiDriver } from "../driver/aurora-data-api/AuroraDataApiDriver";
 /**
  * Creates complete tables schemas in the database based on the entity metadatas.
@@ -47,6 +48,9 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.queryRunner = this.connection.createQueryRunner();
+                        // this.connection.driver.database || this.currentDatabase;
+                        this.currentDatabase = this.connection.driver.database;
+                        this.currentSchema = this.connection.driver.schema;
                         isUsingTransactions = (!(this.connection.driver instanceof CockroachDriver) &&
                             this.connection.options.migrationsTransactionMode !== "none");
                         if (!isUsingTransactions) return [3 /*break*/, 2];
@@ -177,7 +181,10 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
          * Returns only entities that should be synced in the database.
          */
         get: function () {
-            return this.connection.entityMetadatas.filter(function (metadata) { return metadata.tableType === "view" && metadata.synchronize; });
+            return this.connection.entityMetadatas
+                .filter(function (metadata) { return metadata.tableType === "view" && metadata.synchronize; })
+                // sort views in creation order by dependencies
+                .sort(ViewUtils.viewMetadataCmp);
         },
         enumerable: false,
         configurable: true
@@ -252,13 +259,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
         });
     };
     RdbmsSchemaBuilder.prototype.getTablePath = function (target) {
-        if (target instanceof Table) {
-            return target.name;
-        }
-        if (target instanceof TableForeignKey) {
-            return target.referencedTableName;
-        }
-        return target.tablePath;
+        var parsed = this.connection.driver.parseTableName(target);
+        return this.connection.driver.buildTableName(parsed.tableName, parsed.schema || this.currentSchema, parsed.database || this.currentDatabase);
     };
     /**
      * Drops all (old) foreign keys that exist in the tables, but do not exist in the entity metadata.
@@ -706,27 +708,18 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.createNewTables = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var currentSchema, _loop_7, this_7, _a, _b, metadata, e_7_1;
+            var _loop_7, this_7, _a, _b, metadata, e_7_1;
             var e_7, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, this.queryRunner.getCurrentSchema()];
-                    case 1:
-                        currentSchema = _d.sent();
+                    case 0:
                         _loop_7 = function (metadata) {
                             var existTable, table;
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        existTable = this_7.queryRunner.loadedTables.find(function (table) {
-                                            var database = metadata.database && metadata.database !== _this.connection.driver.database ? metadata.database : undefined;
-                                            var schema = metadata.schema || _this.connection.driver.options.schema;
-                                            // if schema is default db schema (e.g. "public" in PostgreSQL), skip it.
-                                            schema = schema === currentSchema ? undefined : schema;
-                                            var fullTableName = _this.connection.driver.buildTableName(metadata.tableName, schema, database);
-                                            return table.name === fullTableName;
-                                        });
+                                        existTable = this_7.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (existTable)
                                             return [2 /*return*/, "continue"];
                                         this_7.connection.logger.logSchemaBuild("creating a new table: " + this_7.getTablePath(metadata));
@@ -740,33 +733,33 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             });
                         };
                         this_7 = this;
+                        _d.label = 1;
+                    case 1:
+                        _d.trys.push([1, 6, 7, 8]);
+                        _a = __values(this.entityToSyncMetadatas), _b = _a.next();
                         _d.label = 2;
                     case 2:
-                        _d.trys.push([2, 7, 8, 9]);
-                        _a = __values(this.entityToSyncMetadatas), _b = _a.next();
-                        _d.label = 3;
-                    case 3:
-                        if (!!_b.done) return [3 /*break*/, 6];
+                        if (!!_b.done) return [3 /*break*/, 5];
                         metadata = _b.value;
                         return [5 /*yield**/, _loop_7(metadata)];
-                    case 4:
+                    case 3:
                         _d.sent();
-                        _d.label = 5;
-                    case 5:
+                        _d.label = 4;
+                    case 4:
                         _b = _a.next();
-                        return [3 /*break*/, 3];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
+                        return [3 /*break*/, 2];
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
                         e_7_1 = _d.sent();
                         e_7 = { error: e_7_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
+                        return [3 /*break*/, 8];
+                    case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_7) throw e_7.error; }
                         return [7 /*endfinally*/];
-                    case 9: return [2 /*return*/];
+                    case 8: return [2 /*return*/];
                 }
             });
         });
@@ -785,12 +778,9 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                 switch (_e.label) {
                                     case 0:
                                         existView = this_8.queryRunner.loadedViews.find(function (view) {
-                                            var database = metadata.database && metadata.database !== _this.connection.driver.database ? metadata.database : undefined;
-                                            var schema = metadata.schema || _this.connection.driver.options.schema;
-                                            var fullViewName = _this.connection.driver.buildTableName(metadata.tableName, schema, database);
                                             var viewExpression = typeof view.expression === "string" ? view.expression.trim() : view.expression(_this.connection).getQuery();
                                             var metadataExpression = typeof metadata.expression === "string" ? metadata.expression.trim() : metadata.expression(_this.connection).getQuery();
-                                            return view.name === fullViewName && viewExpression === metadataExpression;
+                                            return _this.getTablePath(view) === _this.getTablePath(metadata) && viewExpression === metadataExpression;
                                         });
                                         if (existView)
                                             return [2 /*return*/, "continue"];
@@ -838,68 +828,136 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
     };
     RdbmsSchemaBuilder.prototype.dropOldViews = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var droppedViews, _loop_9, this_9, _a, _b, view, e_9_1;
-            var e_9, _c;
+            var droppedViews, viewEntityToSyncMetadatas, viewToMetadata, _loop_9, _a, _b, view, _c, _d, view, viewMetadata, viewExpression, metadataExpression, viewDependencyChain, droppedViewsWithDependencies, droppedViewsWithDependencies_1, droppedViewsWithDependencies_1_1, view, e_9_1;
+            var e_10, _e, e_11, _f, e_9, _g;
             var _this = this;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            return __generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
-                        droppedViews = new Set();
+                        droppedViews = [];
+                        viewEntityToSyncMetadatas = this.viewEntityToSyncMetadatas;
+                        viewToMetadata = new Map();
                         _loop_9 = function (view) {
-                            var existViewMetadata;
-                            return __generator(this, function (_e) {
-                                switch (_e.label) {
-                                    case 0:
-                                        existViewMetadata = this_9.viewEntityToSyncMetadatas.find(function (metadata) {
-                                            var database = metadata.database && metadata.database !== _this.connection.driver.database ? metadata.database : undefined;
-                                            var schema = metadata.schema || _this.connection.driver.options.schema;
-                                            var fullViewName = _this.connection.driver.buildTableName(metadata.tableName, schema, database);
-                                            var viewExpression = typeof view.expression === "string" ? view.expression.trim() : view.expression(_this.connection).getQuery();
-                                            var metadataExpression = typeof metadata.expression === "string" ? metadata.expression.trim() : metadata.expression(_this.connection).getQuery();
-                                            return view.name === fullViewName && viewExpression === metadataExpression;
-                                        });
-                                        if (existViewMetadata)
-                                            return [2 /*return*/, "continue"];
-                                        this_9.connection.logger.logSchemaBuild("dropping an old view: " + view.name);
-                                        // drop an old view
-                                        return [4 /*yield*/, this_9.queryRunner.dropView(view)];
-                                    case 1:
-                                        // drop an old view
-                                        _e.sent();
-                                        droppedViews.add(view);
-                                        return [2 /*return*/];
-                                }
+                            var viewMetadata = viewEntityToSyncMetadatas.find(function (metadata) {
+                                return _this.getTablePath(view) === _this.getTablePath(metadata);
                             });
+                            if (viewMetadata) {
+                                viewToMetadata.set(view, viewMetadata);
+                            }
                         };
-                        this_9 = this;
-                        _d.label = 1;
+                        try {
+                            for (_a = __values(this.queryRunner.loadedViews), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                view = _b.value;
+                                _loop_9(view);
+                            }
+                        }
+                        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                            }
+                            finally { if (e_10) throw e_10.error; }
+                        }
+                        try {
+                            // Gather all changed view, that need a drop
+                            for (_c = __values(this.queryRunner.loadedViews), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                view = _d.value;
+                                viewMetadata = viewToMetadata.get(view);
+                                if (!viewMetadata) {
+                                    continue;
+                                }
+                                viewExpression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
+                                metadataExpression = typeof viewMetadata.expression === "string" ? viewMetadata.expression.trim() : viewMetadata.expression(this.connection).getQuery();
+                                if (viewExpression === metadataExpression)
+                                    continue;
+                                this.connection.logger.logSchemaBuild("dropping an old view: " + view.name);
+                                // Collect view to be dropped
+                                droppedViews.push(view);
+                            }
+                        }
+                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                        finally {
+                            try {
+                                if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                            }
+                            finally { if (e_11) throw e_11.error; }
+                        }
+                        viewDependencyChain = function (view) {
+                            var e_12, _a;
+                            // Get the view metadata
+                            var viewMetadata = viewToMetadata.get(view);
+                            var viewWithDependencies = [view];
+                            // If no metadata is known for the view, simply return the view itself
+                            if (!viewMetadata) {
+                                return viewWithDependencies;
+                            }
+                            try {
+                                // Iterate over all known views
+                                for (var _b = __values(viewToMetadata.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                    var _d = __read(_c.value, 2), currentView = _d[0], currentMetadata = _d[1];
+                                    // Ignore self reference
+                                    if (currentView === view) {
+                                        continue;
+                                    }
+                                    // If the currently iterated view depends on the passed in view
+                                    if (currentMetadata.dependsOn && (currentMetadata.dependsOn.has(viewMetadata.target) ||
+                                        currentMetadata.dependsOn.has(viewMetadata.name))) {
+                                        // Recursively add currently iterate view and its dependents
+                                        viewWithDependencies = viewWithDependencies.concat(viewDependencyChain(currentView));
+                                    }
+                                }
+                            }
+                            catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                            finally {
+                                try {
+                                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                }
+                                finally { if (e_12) throw e_12.error; }
+                            }
+                            // Return all collected views
+                            return viewWithDependencies;
+                        };
+                        droppedViewsWithDependencies = new Set(
+                        // Collect all dropped views, and their dependencies
+                        droppedViews.map(function (view) { return viewDependencyChain(view); })
+                            // Flattened to single Array ( can be replaced with flatMap, once supported)
+                            .reduce(function (all, segment) {
+                            return all.concat(segment);
+                        }, [])
+                            // Sort the views to be dropped in creation order
+                            .sort(function (a, b) {
+                            return ViewUtils.viewMetadataCmp(viewToMetadata.get(a), viewToMetadata.get(b));
+                        })
+                            // reverse order to get drop order
+                            .reverse());
+                        _h.label = 1;
                     case 1:
-                        _d.trys.push([1, 6, 7, 8]);
-                        _a = __values(this.queryRunner.loadedViews), _b = _a.next();
-                        _d.label = 2;
+                        _h.trys.push([1, 6, 7, 8]);
+                        droppedViewsWithDependencies_1 = __values(droppedViewsWithDependencies), droppedViewsWithDependencies_1_1 = droppedViewsWithDependencies_1.next();
+                        _h.label = 2;
                     case 2:
-                        if (!!_b.done) return [3 /*break*/, 5];
-                        view = _b.value;
-                        return [5 /*yield**/, _loop_9(view)];
+                        if (!!droppedViewsWithDependencies_1_1.done) return [3 /*break*/, 5];
+                        view = droppedViewsWithDependencies_1_1.value;
+                        return [4 /*yield*/, this.queryRunner.dropView(view)];
                     case 3:
-                        _d.sent();
-                        _d.label = 4;
+                        _h.sent();
+                        _h.label = 4;
                     case 4:
-                        _b = _a.next();
+                        droppedViewsWithDependencies_1_1 = droppedViewsWithDependencies_1.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_9_1 = _d.sent();
+                        e_9_1 = _h.sent();
                         e_9 = { error: e_9_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
-                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            if (droppedViewsWithDependencies_1_1 && !droppedViewsWithDependencies_1_1.done && (_g = droppedViewsWithDependencies_1.return)) _g.call(droppedViewsWithDependencies_1);
                         }
                         finally { if (e_9) throw e_9.error; }
                         return [7 /*endfinally*/];
                     case 8:
-                        this.queryRunner.loadedViews = this.queryRunner.loadedViews.filter(function (view) { return !droppedViews.has(view); });
+                        this.queryRunner.loadedViews = this.queryRunner.loadedViews.filter(function (view) { return !droppedViewsWithDependencies.has(view); });
                         return [2 /*return*/];
                 }
             });
@@ -911,8 +969,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.dropRemovedColumns = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_10, this_10, _a, _b, metadata, e_10_1;
-            var e_10, _c;
+            var _loop_10, this_9, _a, _b, metadata, e_13_1;
+            var e_13, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -922,7 +980,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        table = this_10.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_9.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
                                         droppedTableColumns = table.columns.filter(function (tableColumn) {
@@ -930,9 +988,9 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                         });
                                         if (droppedTableColumns.length === 0)
                                             return [2 /*return*/, "continue"];
-                                        this_10.connection.logger.logSchemaBuild("columns dropped in " + table.name + ": " + droppedTableColumns.map(function (column) { return column.name; }).join(", "));
+                                        this_9.connection.logger.logSchemaBuild("columns dropped in " + table.name + ": " + droppedTableColumns.map(function (column) { return column.name; }).join(", "));
                                         // drop columns from the database
-                                        return [4 /*yield*/, this_10.queryRunner.dropColumns(table, droppedTableColumns)];
+                                        return [4 /*yield*/, this_9.queryRunner.dropColumns(table, droppedTableColumns)];
                                     case 1:
                                         // drop columns from the database
                                         _e.sent();
@@ -940,7 +998,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                 }
                             });
                         };
-                        this_10 = this;
+                        this_9 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -958,14 +1016,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_10_1 = _d.sent();
-                        e_10 = { error: e_10_1 };
+                        e_13_1 = _d.sent();
+                        e_13 = { error: e_13_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_10) throw e_10.error; }
+                        finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -978,8 +1036,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.addNewColumns = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_11, this_11, _a, _b, metadata, e_11_1;
-            var e_11, _c;
+            var _loop_11, this_10, _a, _b, metadata, e_14_1;
+            var e_14, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -989,7 +1047,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        table = this_11.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_10.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
                                         newColumnMetadatas = metadata.columns.filter(function (columnMetadata) {
@@ -997,19 +1055,19 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                         });
                                         if (newColumnMetadatas.length === 0)
                                             return [2 /*return*/, "continue"];
-                                        newTableColumnOptions = this_11.metadataColumnsToTableColumnOptions(newColumnMetadatas);
+                                        newTableColumnOptions = this_10.metadataColumnsToTableColumnOptions(newColumnMetadatas);
                                         newTableColumns = newTableColumnOptions.map(function (option) { return new TableColumn(option); });
                                         if (newTableColumns.length === 0)
                                             return [2 /*return*/, "continue"];
-                                        this_11.connection.logger.logSchemaBuild("new columns added: " + newColumnMetadatas.map(function (column) { return column.databaseName; }).join(", "));
-                                        return [4 /*yield*/, this_11.queryRunner.addColumns(table, newTableColumns)];
+                                        this_10.connection.logger.logSchemaBuild("new columns added: " + newColumnMetadatas.map(function (column) { return column.databaseName; }).join(", "));
+                                        return [4 /*yield*/, this_10.queryRunner.addColumns(table, newTableColumns)];
                                     case 1:
                                         _e.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
-                        this_11 = this;
+                        this_10 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -1027,14 +1085,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_11_1 = _d.sent();
-                        e_11 = { error: e_11_1 };
+                        e_14_1 = _d.sent();
+                        e_14 = { error: e_14_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_11) throw e_11.error; }
+                        finally { if (e_14) throw e_14.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1046,8 +1104,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.updatePrimaryKeys = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_12, this_12, _a, _b, metadata, e_12_1;
-            var e_12, _c;
+            var _loop_12, this_11, _a, _b, metadata, e_15_1;
+            var e_15, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1057,7 +1115,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        table = this_12.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_11.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
                                         primaryMetadataColumns = metadata.columns.filter(function (column) { return column.isPrimary; });
@@ -1066,7 +1124,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                         changedPrimaryColumns = primaryMetadataColumns.map(function (primaryMetadataColumn) {
                                             return new TableColumn(TableUtils.createTableColumnOptions(primaryMetadataColumn, _this.connection.driver));
                                         });
-                                        return [4 /*yield*/, this_12.queryRunner.updatePrimaryKeys(table, changedPrimaryColumns)];
+                                        return [4 /*yield*/, this_11.queryRunner.updatePrimaryKeys(table, changedPrimaryColumns)];
                                     case 1:
                                         _e.sent();
                                         _e.label = 2;
@@ -1074,7 +1132,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                 }
                             });
                         };
-                        this_12 = this;
+                        this_11 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -1092,14 +1150,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_12_1 = _d.sent();
-                        e_12 = { error: e_12_1 };
+                        e_15_1 = _d.sent();
+                        e_15 = { error: e_15_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_15) throw e_15.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1112,33 +1170,33 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.updateExistColumns = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_13, this_13, _a, _b, metadata, e_13_1;
-            var e_13, _c;
+            var _loop_13, this_12, _a, _b, metadata, e_16_1;
+            var e_16, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         _loop_13 = function (metadata) {
-                            var table, changedColumns, changedColumns_1, changedColumns_1_1, changedColumn, e_14_1, changedColumns_2, changedColumns_2_1, changedColumn, e_15_1, changedColumns_3, changedColumns_3_1, changedColumn, e_16_1, newAndOldTableColumns;
-                            var e_14, _e, e_15, _f, e_16, _g;
+                            var table, changedColumns, changedColumns_1, changedColumns_1_1, changedColumn, e_17_1, changedColumns_2, changedColumns_2_1, changedColumn, e_18_1, changedColumns_3, changedColumns_3_1, changedColumn, e_19_1, newAndOldTableColumns;
+                            var e_17, _e, e_18, _f, e_19, _g;
                             return __generator(this, function (_h) {
                                 switch (_h.label) {
                                     case 0:
-                                        table = this_13.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_12.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
-                                        changedColumns = this_13.connection.driver.findChangedColumns(table.columns, metadata.columns);
+                                        changedColumns = this_12.connection.driver.findChangedColumns(table.columns, metadata.columns);
                                         if (changedColumns.length === 0)
                                             return [2 /*return*/, "continue"];
                                         _h.label = 1;
                                     case 1:
                                         _h.trys.push([1, 6, 7, 8]);
-                                        changedColumns_1 = (e_14 = void 0, __values(changedColumns)), changedColumns_1_1 = changedColumns_1.next();
+                                        changedColumns_1 = (e_17 = void 0, __values(changedColumns)), changedColumns_1_1 = changedColumns_1.next();
                                         _h.label = 2;
                                     case 2:
                                         if (!!changedColumns_1_1.done) return [3 /*break*/, 5];
                                         changedColumn = changedColumns_1_1.value;
-                                        return [4 /*yield*/, this_13.dropColumnReferencedForeignKeys(this_13.getTablePath(metadata), changedColumn.databaseName)];
+                                        return [4 /*yield*/, this_12.dropColumnReferencedForeignKeys(this_12.getTablePath(metadata), changedColumn.databaseName)];
                                     case 3:
                                         _h.sent();
                                         _h.label = 4;
@@ -1147,23 +1205,23 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                         return [3 /*break*/, 2];
                                     case 5: return [3 /*break*/, 8];
                                     case 6:
-                                        e_14_1 = _h.sent();
-                                        e_14 = { error: e_14_1 };
+                                        e_17_1 = _h.sent();
+                                        e_17 = { error: e_17_1 };
                                         return [3 /*break*/, 8];
                                     case 7:
                                         try {
                                             if (changedColumns_1_1 && !changedColumns_1_1.done && (_e = changedColumns_1.return)) _e.call(changedColumns_1);
                                         }
-                                        finally { if (e_14) throw e_14.error; }
+                                        finally { if (e_17) throw e_17.error; }
                                         return [7 /*endfinally*/];
                                     case 8:
                                         _h.trys.push([8, 13, 14, 15]);
-                                        changedColumns_2 = (e_15 = void 0, __values(changedColumns)), changedColumns_2_1 = changedColumns_2.next();
+                                        changedColumns_2 = (e_18 = void 0, __values(changedColumns)), changedColumns_2_1 = changedColumns_2.next();
                                         _h.label = 9;
                                     case 9:
                                         if (!!changedColumns_2_1.done) return [3 /*break*/, 12];
                                         changedColumn = changedColumns_2_1.value;
-                                        return [4 /*yield*/, this_13.dropColumnCompositeIndices(this_13.getTablePath(metadata), changedColumn.databaseName)];
+                                        return [4 /*yield*/, this_12.dropColumnCompositeIndices(this_12.getTablePath(metadata), changedColumn.databaseName)];
                                     case 10:
                                         _h.sent();
                                         _h.label = 11;
@@ -1172,26 +1230,26 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                         return [3 /*break*/, 9];
                                     case 12: return [3 /*break*/, 15];
                                     case 13:
-                                        e_15_1 = _h.sent();
-                                        e_15 = { error: e_15_1 };
+                                        e_18_1 = _h.sent();
+                                        e_18 = { error: e_18_1 };
                                         return [3 /*break*/, 15];
                                     case 14:
                                         try {
                                             if (changedColumns_2_1 && !changedColumns_2_1.done && (_f = changedColumns_2.return)) _f.call(changedColumns_2);
                                         }
-                                        finally { if (e_15) throw e_15.error; }
+                                        finally { if (e_18) throw e_18.error; }
                                         return [7 /*endfinally*/];
                                     case 15:
-                                        if (!!(this_13.connection.driver instanceof MysqlDriver || this_13.connection.driver instanceof AuroraDataApiDriver)) return [3 /*break*/, 23];
+                                        if (!!(this_12.connection.driver instanceof MysqlDriver || this_12.connection.driver instanceof AuroraDataApiDriver)) return [3 /*break*/, 23];
                                         _h.label = 16;
                                     case 16:
                                         _h.trys.push([16, 21, 22, 23]);
-                                        changedColumns_3 = (e_16 = void 0, __values(changedColumns)), changedColumns_3_1 = changedColumns_3.next();
+                                        changedColumns_3 = (e_19 = void 0, __values(changedColumns)), changedColumns_3_1 = changedColumns_3.next();
                                         _h.label = 17;
                                     case 17:
                                         if (!!changedColumns_3_1.done) return [3 /*break*/, 20];
                                         changedColumn = changedColumns_3_1.value;
-                                        return [4 /*yield*/, this_13.dropColumnCompositeUniques(this_13.getTablePath(metadata), changedColumn.databaseName)];
+                                        return [4 /*yield*/, this_12.dropColumnCompositeUniques(this_12.getTablePath(metadata), changedColumn.databaseName)];
                                     case 18:
                                         _h.sent();
                                         _h.label = 19;
@@ -1200,14 +1258,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                         return [3 /*break*/, 17];
                                     case 20: return [3 /*break*/, 23];
                                     case 21:
-                                        e_16_1 = _h.sent();
-                                        e_16 = { error: e_16_1 };
+                                        e_19_1 = _h.sent();
+                                        e_19 = { error: e_19_1 };
                                         return [3 /*break*/, 23];
                                     case 22:
                                         try {
                                             if (changedColumns_3_1 && !changedColumns_3_1.done && (_g = changedColumns_3.return)) _g.call(changedColumns_3);
                                         }
-                                        finally { if (e_16) throw e_16.error; }
+                                        finally { if (e_19) throw e_19.error; }
                                         return [7 /*endfinally*/];
                                     case 23:
                                         newAndOldTableColumns = changedColumns.map(function (changedColumn) {
@@ -1221,15 +1279,15 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                         });
                                         if (newAndOldTableColumns.length === 0)
                                             return [2 /*return*/, "continue"];
-                                        this_13.connection.logger.logSchemaBuild("columns changed in \"" + table.name + "\". updating: " + changedColumns.map(function (column) { return column.databaseName; }).join(", "));
-                                        return [4 /*yield*/, this_13.queryRunner.changeColumns(table, newAndOldTableColumns)];
+                                        this_12.connection.logger.logSchemaBuild("columns changed in \"" + table.name + "\". updating: " + changedColumns.map(function (column) { return column.databaseName; }).join(", "));
+                                        return [4 /*yield*/, this_12.queryRunner.changeColumns(table, newAndOldTableColumns)];
                                     case 24:
                                         _h.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
-                        this_13 = this;
+                        this_12 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -1247,14 +1305,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_13_1 = _d.sent();
-                        e_13 = { error: e_13_1 };
+                        e_16_1 = _d.sent();
+                        e_16 = { error: e_16_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_13) throw e_13.error; }
+                        finally { if (e_16) throw e_16.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1266,8 +1324,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.createNewIndices = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_14, this_14, _a, _b, metadata, e_17_1;
-            var e_17, _c;
+            var _loop_14, this_13, _a, _b, metadata, e_20_1;
+            var e_20, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1277,7 +1335,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        table = this_14.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_13.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
                                         newIndices = metadata.indices
@@ -1285,15 +1343,15 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                             .map(function (indexMetadata) { return TableIndex.create(indexMetadata); });
                                         if (newIndices.length === 0)
                                             return [2 /*return*/, "continue"];
-                                        this_14.connection.logger.logSchemaBuild("adding new indices " + newIndices.map(function (index) { return "\"" + index.name + "\""; }).join(", ") + " in table \"" + table.name + "\"");
-                                        return [4 /*yield*/, this_14.queryRunner.createIndices(table, newIndices)];
+                                        this_13.connection.logger.logSchemaBuild("adding new indices " + newIndices.map(function (index) { return "\"" + index.name + "\""; }).join(", ") + " in table \"" + table.name + "\"");
+                                        return [4 /*yield*/, this_13.queryRunner.createIndices(table, newIndices)];
                                     case 1:
                                         _e.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
-                        this_14 = this;
+                        this_13 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -1311,14 +1369,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_17_1 = _d.sent();
-                        e_17 = { error: e_17_1 };
+                        e_20_1 = _d.sent();
+                        e_20 = { error: e_20_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_17) throw e_17.error; }
+                        finally { if (e_20) throw e_20.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1327,8 +1385,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
     };
     RdbmsSchemaBuilder.prototype.createNewChecks = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_15, this_15, _a, _b, metadata, e_18_1;
-            var e_18, _c;
+            var _loop_15, this_14, _a, _b, metadata, e_21_1;
+            var e_21, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1341,7 +1399,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        table = this_15.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_14.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
                                         newChecks = metadata.checks
@@ -1349,15 +1407,15 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                             .map(function (checkMetadata) { return TableCheck.create(checkMetadata); });
                                         if (newChecks.length === 0)
                                             return [2 /*return*/, "continue"];
-                                        this_15.connection.logger.logSchemaBuild("adding new check constraints: " + newChecks.map(function (index) { return "\"" + index.name + "\""; }).join(", ") + " in table \"" + table.name + "\"");
-                                        return [4 /*yield*/, this_15.queryRunner.createCheckConstraints(table, newChecks)];
+                                        this_14.connection.logger.logSchemaBuild("adding new check constraints: " + newChecks.map(function (index) { return "\"" + index.name + "\""; }).join(", ") + " in table \"" + table.name + "\"");
+                                        return [4 /*yield*/, this_14.queryRunner.createCheckConstraints(table, newChecks)];
                                     case 1:
                                         _e.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
-                        this_15 = this;
+                        this_14 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -1375,14 +1433,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_18_1 = _d.sent();
-                        e_18 = { error: e_18_1 };
+                        e_21_1 = _d.sent();
+                        e_21 = { error: e_21_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_18) throw e_18.error; }
+                        finally { if (e_21) throw e_21.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1394,8 +1452,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.createCompositeUniqueConstraints = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_16, this_16, _a, _b, metadata, e_19_1;
-            var e_19, _c;
+            var _loop_16, this_15, _a, _b, metadata, e_22_1;
+            var e_22, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1405,7 +1463,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        table = this_16.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_15.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
                                         compositeUniques = metadata.uniques
@@ -1413,15 +1471,15 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                             .map(function (uniqueMetadata) { return TableUnique.create(uniqueMetadata); });
                                         if (compositeUniques.length === 0)
                                             return [2 /*return*/, "continue"];
-                                        this_16.connection.logger.logSchemaBuild("adding new unique constraints: " + compositeUniques.map(function (unique) { return "\"" + unique.name + "\""; }).join(", ") + " in table \"" + table.name + "\"");
-                                        return [4 /*yield*/, this_16.queryRunner.createUniqueConstraints(table, compositeUniques)];
+                                        this_15.connection.logger.logSchemaBuild("adding new unique constraints: " + compositeUniques.map(function (unique) { return "\"" + unique.name + "\""; }).join(", ") + " in table \"" + table.name + "\"");
+                                        return [4 /*yield*/, this_15.queryRunner.createUniqueConstraints(table, compositeUniques)];
                                     case 1:
                                         _e.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
-                        this_16 = this;
+                        this_15 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -1439,14 +1497,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_19_1 = _d.sent();
-                        e_19 = { error: e_19_1 };
+                        e_22_1 = _d.sent();
+                        e_22 = { error: e_22_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_19) throw e_19.error; }
+                        finally { if (e_22) throw e_22.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1458,8 +1516,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.createNewExclusions = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_17, this_17, _a, _b, metadata, e_20_1;
-            var e_20, _c;
+            var _loop_17, this_16, _a, _b, metadata, e_23_1;
+            var e_23, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1472,7 +1530,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        table = this_17.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_16.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
                                         newExclusions = metadata.exclusions
@@ -1480,15 +1538,15 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                             .map(function (exclusionMetadata) { return TableExclusion.create(exclusionMetadata); });
                                         if (newExclusions.length === 0)
                                             return [2 /*return*/, "continue"];
-                                        this_17.connection.logger.logSchemaBuild("adding new exclusion constraints: " + newExclusions.map(function (exclusion) { return "\"" + exclusion.name + "\""; }).join(", ") + " in table \"" + table.name + "\"");
-                                        return [4 /*yield*/, this_17.queryRunner.createExclusionConstraints(table, newExclusions)];
+                                        this_16.connection.logger.logSchemaBuild("adding new exclusion constraints: " + newExclusions.map(function (exclusion) { return "\"" + exclusion.name + "\""; }).join(", ") + " in table \"" + table.name + "\"");
+                                        return [4 /*yield*/, this_16.queryRunner.createExclusionConstraints(table, newExclusions)];
                                     case 1:
                                         _e.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
-                        this_17 = this;
+                        this_16 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -1506,14 +1564,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_20_1 = _d.sent();
-                        e_20 = { error: e_20_1 };
+                        e_23_1 = _d.sent();
+                        e_23 = { error: e_23_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_20) throw e_20.error; }
+                        finally { if (e_23) throw e_23.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1525,8 +1583,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.createForeignKeys = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_18, this_18, _a, _b, metadata, e_21_1;
-            var e_21, _c;
+            var _loop_18, this_17, _a, _b, metadata, e_24_1;
+            var e_24, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1536,7 +1594,7 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                             return __generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        table = this_18.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
+                                        table = this_17.queryRunner.loadedTables.find(function (table) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
                                         if (!table)
                                             return [2 /*return*/, "continue"];
                                         newKeys = metadata.foreignKeys
@@ -1547,15 +1605,15 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                         if (newKeys.length === 0)
                                             return [2 /*return*/, "continue"];
                                         dbForeignKeys = newKeys.map(function (foreignKeyMetadata) { return TableForeignKey.create(foreignKeyMetadata, _this.connection.driver); });
-                                        this_18.connection.logger.logSchemaBuild("creating a foreign keys: " + newKeys.map(function (key) { return key.name; }).join(", ") + " on table \"" + table.name + "\"");
-                                        return [4 /*yield*/, this_18.queryRunner.createForeignKeys(table, dbForeignKeys)];
+                                        this_17.connection.logger.logSchemaBuild("creating a foreign keys: " + newKeys.map(function (key) { return key.name; }).join(", ") + " on table \"" + table.name + "\"");
+                                        return [4 /*yield*/, this_17.queryRunner.createForeignKeys(table, dbForeignKeys)];
                                     case 1:
                                         _e.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
-                        this_18 = this;
+                        this_17 = this;
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -1573,14 +1631,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_21_1 = _d.sent();
-                        e_21 = { error: e_21_1 };
+                        e_24_1 = _d.sent();
+                        e_24 = { error: e_24_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_21) throw e_21.error; }
+                        finally { if (e_24) throw e_24.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1592,8 +1650,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
      */
     RdbmsSchemaBuilder.prototype.dropColumnReferencedForeignKeys = function (tablePath, columnName) {
         return __awaiter(this, void 0, void 0, function () {
-            var table, tablesWithFK, columnForeignKey, clonedTable, _loop_19, _a, _b, loadedTable, tablesWithFK_1, tablesWithFK_1_1, tableWithFK, e_22_1;
-            var e_23, _c, e_22, _d;
+            var table, tablesWithFK, columnForeignKey, clonedTable, _loop_19, _a, _b, loadedTable, tablesWithFK_1, tablesWithFK_1_1, tableWithFK, e_25_1;
+            var e_26, _c, e_25, _d;
             var _this = this;
             return __generator(this, function (_e) {
                 switch (_e.label) {
@@ -1626,12 +1684,12 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                                 _loop_19(loadedTable);
                             }
                         }
-                        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+                        catch (e_26_1) { e_26 = { error: e_26_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_23) throw e_23.error; }
+                            finally { if (e_26) throw e_26.error; }
                         }
                         if (!(tablesWithFK.length > 0)) return [3 /*break*/, 8];
                         _e.label = 1;
@@ -1652,14 +1710,14 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_22_1 = _e.sent();
-                        e_22 = { error: e_22_1 };
+                        e_25_1 = _e.sent();
+                        e_25 = { error: e_25_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (tablesWithFK_1_1 && !tablesWithFK_1_1.done && (_d = tablesWithFK_1.return)) _d.call(tablesWithFK_1);
                         }
-                        finally { if (e_22) throw e_22.error; }
+                        finally { if (e_25) throw e_25.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1732,8 +1790,8 @@ var RdbmsSchemaBuilder = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        schema = this.connection.driver.options.schema;
-                        database = this.connection.driver.database;
+                        schema = this.currentSchema;
+                        database = this.currentDatabase;
                         typeormMetadataTable = this.connection.driver.buildTableName("typeorm_metadata", schema, database);
                         return [4 /*yield*/, this.queryRunner.createTable(new Table({
                                 database: database,