typeorm 0.2.24 → 0.2.28

package/driver/postgres/PostgresQueryRunner.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var __1 = require("../../");
 var QueryFailedError_1 = require("../../error/QueryFailedError");
 var QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
 var TransactionAlreadyStartedError_1 = require("../../error/TransactionAlreadyStartedError");
@@ -27,7 +26,6 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
     // Constructor
     // -------------------------------------------------------------------------
     function PostgresQueryRunner(driver, mode) {
-        if (mode === void 0) { mode = "master"; }
         var _this = _super.call(this) || this;
         _this.driver = driver;
         _this.connection = driver.connection;
@@ -53,7 +51,12 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                 var _b = tslib_1.__read(_a, 2), connection = _b[0], release = _b[1];
                 _this.driver.connectedQueryRunners.push(_this);
                 _this.databaseConnection = connection;
-                _this.releaseCallback = release;
+                var onErrorCallback = function () { return _this.release(); };
+                _this.releaseCallback = function () {
+                    _this.databaseConnection.removeListener("error", onErrorCallback);
+                    release();
+                };
+                _this.databaseConnection.on("error", onErrorCallback);
                 return _this.databaseConnection;
             });
         }
@@ -62,7 +65,12 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                 var _b = tslib_1.__read(_a, 2), connection = _b[0], release = _b[1];
                 _this.driver.connectedQueryRunners.push(_this);
                 _this.databaseConnection = connection;
-                _this.releaseCallback = release;
+                var onErrorCallback = function () { return _this.release(); };
+                _this.releaseCallback = function () {
+                    _this.databaseConnection.removeListener("error", onErrorCallback);
+                    release();
+                };
+                _this.databaseConnection.on("error", onErrorCallback);
                 return _this.databaseConnection;
             });
         }
@@ -73,6 +81,9 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      * You cannot use query runner methods once its released.
      */
     PostgresQueryRunner.prototype.release = function () {
+        if (this.isReleased) {
+            return Promise.resolve();
+        }
         this.isReleased = true;
         if (this.releaseCallback)
             this.releaseCallback();
@@ -562,7 +573,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.renameTable = function (oldTableOrName, newTableName) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e_1, _a, upQueries, downQueries, oldTable, _b, newTable, oldTableName, schemaName, columnNames, oldPkName, newPkName, enumColumns, enumColumns_1, enumColumns_1_1, column, oldEnumType, e_1_1;
+            var upQueries, downQueries, oldTable, _a, newTable, oldTableName, schemaName, columnNames, oldPkName, newPkName, enumColumns, enumColumns_1, enumColumns_1_1, column, oldEnumType, e_1_1;
+            var e_1, _b;
             var _this = this;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
@@ -570,14 +582,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         upQueries = [];
                         downQueries = [];
                         if (!(oldTableOrName instanceof Table_1.Table)) return [3 /*break*/, 1];
-                        _b = oldTableOrName;
+                        _a = oldTableOrName;
                         return [3 /*break*/, 3];
                     case 1: return [4 /*yield*/, this.getCachedTable(oldTableOrName)];
                     case 2:
-                        _b = _c.sent();
+                        _a = _c.sent();
                         _c.label = 3;
                     case 3:
-                        oldTable = _b;
+                        oldTable = _a;
                         newTable = oldTable.clone();
                         oldTableName = oldTable.name.indexOf(".") === -1 ? oldTable.name : oldTable.name.split(".")[1];
                         schemaName = oldTable.name.indexOf(".") === -1 ? undefined : oldTable.name.split(".")[0];
@@ -650,7 +662,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 10:
                         try {
-                            if (enumColumns_1_1 && !enumColumns_1_1.done && (_a = enumColumns_1.return)) _a.call(enumColumns_1);
+                            if (enumColumns_1_1 && !enumColumns_1_1.done && (_b = enumColumns_1.return)) _b.call(enumColumns_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
@@ -741,13 +753,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.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*/, __1.PromiseUtils.runInSequence(columns, function (column) { return _this.addColumn(tableOrName, column); })];
+            var columns_1, columns_1_1, column, e_2_1;
+            var e_2, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        columns_1 = tslib_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_2_1 = _b.sent();
+                        e_2 = { error: e_2_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_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1056,13 +1091,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.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*/, __1.PromiseUtils.runInSequence(changedColumns, function (changedColumn) { return _this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn); })];
+            var changedColumns_1, changedColumns_1_1, _a, oldColumn, newColumn, e_3_1;
+            var e_3, _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _c.trys.push([0, 5, 6, 7]);
+                        changedColumns_1 = tslib_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_3_1 = _c.sent();
+                        e_3 = { error: e_3_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_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1154,13 +1212,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.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*/, __1.PromiseUtils.runInSequence(columns, function (column) { return _this.dropColumn(tableOrName, column); })];
+            var columns_2, columns_2_1, column, e_4_1;
+            var e_4, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        columns_2 = tslib_1.__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_4_1 = _b.sent();
+                        e_4 = { error: e_4_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_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1314,13 +1395,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createUniqueConstraints = function (tableOrName, uniqueConstraints) {
         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*/, __1.PromiseUtils.runInSequence(uniqueConstraints, function (uniqueConstraint) { return _this.createUniqueConstraint(tableOrName, uniqueConstraint); })];
+            var uniqueConstraints_1, uniqueConstraints_1_1, uniqueConstraint, e_5_1;
+            var e_5, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        uniqueConstraints_1 = tslib_1.__values(uniqueConstraints), uniqueConstraints_1_1 = uniqueConstraints_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!uniqueConstraints_1_1.done) return [3 /*break*/, 4];
+                        uniqueConstraint = uniqueConstraints_1_1.value;
+                        return [4 /*yield*/, this.createUniqueConstraint(tableOrName, uniqueConstraint)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        uniqueConstraints_1_1 = uniqueConstraints_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_5_1 = _b.sent();
+                        e_5 = { error: e_5_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (uniqueConstraints_1_1 && !uniqueConstraints_1_1.done && (_a = uniqueConstraints_1.return)) _a.call(uniqueConstraints_1);
+                        }
+                        finally { if (e_5) throw e_5.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1362,13 +1466,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropUniqueConstraints = function (tableOrName, uniqueConstraints) {
         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*/, __1.PromiseUtils.runInSequence(uniqueConstraints, function (uniqueConstraint) { return _this.dropUniqueConstraint(tableOrName, uniqueConstraint); })];
+            var uniqueConstraints_2, uniqueConstraints_2_1, uniqueConstraint, e_6_1;
+            var e_6, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        uniqueConstraints_2 = tslib_1.__values(uniqueConstraints), uniqueConstraints_2_1 = uniqueConstraints_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!uniqueConstraints_2_1.done) return [3 /*break*/, 4];
+                        uniqueConstraint = uniqueConstraints_2_1.value;
+                        return [4 /*yield*/, this.dropUniqueConstraint(tableOrName, uniqueConstraint)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        uniqueConstraints_2_1 = uniqueConstraints_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_6_1 = _b.sent();
+                        e_6 = { error: e_6_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (uniqueConstraints_2_1 && !uniqueConstraints_2_1.done && (_a = uniqueConstraints_2.return)) _a.call(uniqueConstraints_2);
+                        }
+                        finally { if (e_6) throw e_6.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1614,13 +1741,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createForeignKeys = function (tableOrName, foreignKeys) {
         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*/, __1.PromiseUtils.runInSequence(foreignKeys, function (foreignKey) { return _this.createForeignKey(tableOrName, foreignKey); })];
+            var foreignKeys_1, foreignKeys_1_1, foreignKey, e_7_1;
+            var e_7, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        foreignKeys_1 = tslib_1.__values(foreignKeys), foreignKeys_1_1 = foreignKeys_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!foreignKeys_1_1.done) return [3 /*break*/, 4];
+                        foreignKey = foreignKeys_1_1.value;
+                        return [4 /*yield*/, this.createForeignKey(tableOrName, foreignKey)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        foreignKeys_1_1 = foreignKeys_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_7_1 = _b.sent();
+                        e_7 = { error: e_7_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (foreignKeys_1_1 && !foreignKeys_1_1.done && (_a = foreignKeys_1.return)) _a.call(foreignKeys_1);
+                        }
+                        finally { if (e_7) throw e_7.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1662,13 +1812,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropForeignKeys = function (tableOrName, foreignKeys) {
         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*/, __1.PromiseUtils.runInSequence(foreignKeys, function (foreignKey) { return _this.dropForeignKey(tableOrName, foreignKey); })];
+            var foreignKeys_2, foreignKeys_2_1, foreignKey, e_8_1;
+            var e_8, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        foreignKeys_2 = tslib_1.__values(foreignKeys), foreignKeys_2_1 = foreignKeys_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!foreignKeys_2_1.done) return [3 /*break*/, 4];
+                        foreignKey = foreignKeys_2_1.value;
+                        return [4 /*yield*/, this.dropForeignKey(tableOrName, foreignKey)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        foreignKeys_2_1 = foreignKeys_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_8_1 = _b.sent();
+                        e_8 = { error: e_8_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (foreignKeys_2_1 && !foreignKeys_2_1.done && (_a = foreignKeys_2.return)) _a.call(foreignKeys_2);
+                        }
+                        finally { if (e_8) throw e_8.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1710,13 +1883,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createIndices = function (tableOrName, indices) {
         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*/, __1.PromiseUtils.runInSequence(indices, function (index) { return _this.createIndex(tableOrName, index); })];
+            var indices_1, indices_1_1, index, e_9_1;
+            var e_9, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        indices_1 = tslib_1.__values(indices), indices_1_1 = indices_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!indices_1_1.done) return [3 /*break*/, 4];
+                        index = indices_1_1.value;
+                        return [4 /*yield*/, this.createIndex(tableOrName, index)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        indices_1_1 = indices_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_9_1 = _b.sent();
+                        e_9 = { error: e_9_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (indices_1_1 && !indices_1_1.done && (_a = indices_1.return)) _a.call(indices_1);
+                        }
+                        finally { if (e_9) throw e_9.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1758,13 +1954,36 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropIndices = function (tableOrName, indices) {
         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*/, __1.PromiseUtils.runInSequence(indices, function (index) { return _this.dropIndex(tableOrName, index); })];
+            var indices_2, indices_2_1, index, e_10_1;
+            var e_10, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        indices_2 = tslib_1.__values(indices), indices_2_1 = indices_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!indices_2_1.done) return [3 /*break*/, 4];
+                        index = indices_2_1.value;
+                        return [4 /*yield*/, this.dropIndex(tableOrName, index)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        indices_2_1 = indices_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_10_1 = _b.sent();
+                        e_10 = { error: e_10_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (indices_2_1 && !indices_2_1.done && (_a = indices_2.return)) _a.call(indices_2);
+                        }
+                        finally { if (e_10) throw e_10.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1989,13 +2208,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             return [2 /*return*/, []];
                         // create tables for loaded tables
                         return [2 /*return*/, Promise.all(dbTables.map(function (dbTable) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var table, schema, tableFullName, _a, tableUniqueConstraints, tableCheckConstraints, tableExclusionConstraints, tableForeignKeyConstraints, tableIndexConstraints;
+                                var table, getSchemaFromKey, schema, tableFullName, _a, tableUniqueConstraints, tableCheckConstraints, tableExclusionConstraints, tableForeignKeyConstraints, tableIndexConstraints;
                                 var _this = this;
                                 return tslib_1.__generator(this, function (_b) {
                                     switch (_b.label) {
                                         case 0:
                                             table = new Table_1.Table();
-                                            schema = dbTable["table_schema"] === currentSchema && !this.driver.options.schema ? undefined : dbTable["table_schema"];
+                                            getSchemaFromKey = function (dbObject, key) { return dbObject[key] === currentSchema && !_this.driver.options.schema ? undefined : dbObject[key]; };
+                                            schema = getSchemaFromKey(dbTable, "table_schema");
                                             table.name = this.driver.buildTableName(dbTable["table_name"], schema);
                                             tableFullName = this.driver.buildTableName(dbTable["table_name"], dbTable["table_schema"]);
                                             // create columns from the loaded columns
@@ -2055,7 +2275,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                 _a.label = 2;
                                                             case 2:
                                                                 if (!(tableColumn.type === "geometry")) return [3 /*break*/, 4];
-                                                                geometryColumnSql = "SELECT * FROM (\n                        SELECT\n                          \"f_table_schema\" \"table_schema\",\n                          \"f_table_name\" \"table_name\",\n                          \"f_geometry_column\" \"column_name\",\n                          \"srid\",\n                          \"type\"\n                        FROM \"geometry_columns\"\n                      ) AS _\n                      WHERE (" + tablesCondition + ") AND \"column_name\" = '" + tableColumn.name + "' AND \"table_name\" = '" + table.name + "'";
+                                                                geometryColumnSql = "SELECT * FROM (\n                        SELECT\n                          \"f_table_schema\" \"table_schema\",\n                          \"f_table_name\" \"table_name\",\n                          \"f_geometry_column\" \"column_name\",\n                          \"srid\",\n                          \"type\"\n                        FROM \"geometry_columns\"\n                      ) AS _\n                      WHERE (" + tablesCondition + ") AND \"column_name\" = '" + tableColumn.name + "' AND \"table_name\" = '" + dbTable["table_name"] + "'";
                                                                 return [4 /*yield*/, this.query(geometryColumnSql)];
                                                             case 3:
                                                                 results = _a.sent();
@@ -2064,7 +2284,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                 _a.label = 4;
                                                             case 4:
                                                                 if (!(tableColumn.type === "geography")) return [3 /*break*/, 6];
-                                                                geographyColumnSql = "SELECT * FROM (\n                        SELECT\n                          \"f_table_schema\" \"table_schema\",\n                          \"f_table_name\" \"table_name\",\n                          \"f_geography_column\" \"column_name\",\n                          \"srid\",\n                          \"type\"\n                        FROM \"geography_columns\"\n                      ) AS _\n                      WHERE (" + tablesCondition + ") AND \"column_name\" = '" + tableColumn.name + "' AND \"table_name\" = '" + table.name + "'";
+                                                                geographyColumnSql = "SELECT * FROM (\n                        SELECT\n                          \"f_table_schema\" \"table_schema\",\n                          \"f_table_name\" \"table_name\",\n                          \"f_geography_column\" \"column_name\",\n                          \"srid\",\n                          \"type\"\n                        FROM \"geography_columns\"\n                      ) AS _\n                      WHERE (" + tablesCondition + ") AND \"column_name\" = '" + tableColumn.name + "' AND \"table_name\" = '" + dbTable["table_name"] + "'";
                                                                 return [4 /*yield*/, this.query(geographyColumnSql)];
                                                             case 5:
                                                                 results = _a.sent();
@@ -2150,7 +2370,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                             table.foreignKeys = tableForeignKeyConstraints.map(function (dbForeignKey) {
                                                 var foreignKeys = dbForeignKeys.filter(function (dbFk) { return dbFk["constraint_name"] === dbForeignKey["constraint_name"]; });
                                                 // if referenced table located in currently used schema, we don't need to concat schema name to table name.
-                                                var schema = dbForeignKey["referenced_table_schema"] === currentSchema ? undefined : dbForeignKey["referenced_table_schema"];
+                                                var schema = getSchemaFromKey(dbForeignKey, "referenced_table_schema");
                                                 var referencedTableName = _this.driver.buildTableName(dbForeignKey["referenced_table_name"], schema);
                                                 return new TableForeignKey_1.TableForeignKey({
                                                     name: dbForeignKey["constraint_name"],