typeorm 0.2.28 → 0.2.32

package/driver/postgres/PostgresQueryRunner.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PostgresQueryRunner = void 0;
 var tslib_1 = require("tslib");
 var QueryFailedError_1 = require("../../error/QueryFailedError");
 var QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
@@ -17,6 +18,7 @@ var View_1 = require("../../schema-builder/view/View");
 var Broadcaster_1 = require("../../subscriber/Broadcaster");
 var OrmUtils_1 = require("../../util/OrmUtils");
 var Query_1 = require("../Query");
+var BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -97,21 +99,38 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.isTransactionActive)
                             throw new TransactionAlreadyStartedError_1.TransactionAlreadyStartedError();
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionStartEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2:
                         this.isTransactionActive = true;
                         return [4 /*yield*/, this.query("START TRANSACTION")];
-                    case 1:
+                    case 3:
                         _a.sent();
-                        if (!isolationLevel) return [3 /*break*/, 3];
+                        if (!isolationLevel) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
-                    case 2:
+                    case 4:
                         _a.sent();
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
+                        _a.label = 5;
+                    case 5:
+                        afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 7];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 6:
+                        _a.sent();
+                        _a.label = 7;
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -122,16 +141,31 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.commitTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                        return [4 /*yield*/, this.query("COMMIT")];
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionCommitEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.query("COMMIT")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionCommitEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -142,16 +176,31 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.rollbackTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                        return [4 /*yield*/, this.query("ROLLBACK")];
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionRollbackEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.query("ROLLBACK")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionRollbackEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -160,53 +209,47 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      * Executes a given SQL query.
      */
     PostgresQueryRunner.prototype.query = function (query, parameters) {
-        var _this = this;
-        if (this.isReleased)
-            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-        return new Promise(function (ok, fail) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var databaseConnection, queryStartTime_1, err_1;
-            var _this = this;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var databaseConnection, queryStartTime, result, maxQueryExecutionTime, queryEndTime, queryExecutionTime, err_1;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
                         return [4 /*yield*/, this.connect()];
                     case 1:
                         databaseConnection = _a.sent();
                         this.driver.connection.logger.logQuery(query, parameters, this);
-                        queryStartTime_1 = +new Date();
-                        databaseConnection.query(query, parameters, function (err, result) {
-                            // log slow queries if maxQueryExecution time is set
-                            var maxQueryExecutionTime = _this.driver.connection.options.maxQueryExecutionTime;
-                            var queryEndTime = +new Date();
-                            var queryExecutionTime = queryEndTime - queryStartTime_1;
-                            if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime)
-                                _this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, _this);
-                            if (err) {
-                                _this.driver.connection.logger.logQueryError(err, query, parameters, _this);
-                                fail(new QueryFailedError_1.QueryFailedError(query, parameters, err));
-                            }
-                            else {
-                                switch (result.command) {
-                                    case "DELETE":
-                                    case "UPDATE":
-                                        // for UPDATE and DELETE query additionally return number of affected rows
-                                        ok([result.rows, result.rowCount]);
-                                        break;
-                                    default:
-                                        ok(result.rows);
-                                }
-                            }
-                        });
-                        return [3 /*break*/, 3];
+                        _a.label = 2;
                     case 2:
+                        _a.trys.push([2, 4, , 5]);
+                        queryStartTime = +new Date();
+                        return [4 /*yield*/, databaseConnection.query(query, parameters)];
+                    case 3:
+                        result = _a.sent();
+                        maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
+                        queryEndTime = +new Date();
+                        queryExecutionTime = queryEndTime - queryStartTime;
+                        if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime)
+                            this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+                        switch (result.command) {
+                            case "DELETE":
+                            case "UPDATE":
+                                // for UPDATE and DELETE query additionally return number of affected rows
+                                return [2 /*return*/, [result.rows, result.rowCount]];
+                                break;
+                            default:
+                                return [2 /*return*/, result.rows];
+                        }
+                        return [3 /*break*/, 5];
+                    case 4:
                         err_1 = _a.sent();
-                        fail(err_1);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        this.driver.connection.logger.logQueryError(err_1, query, parameters, this);
+                        throw new QueryFailedError_1.QueryFailedError(query, parameters, err_1);
+                    case 5: return [2 /*return*/];
                 }
             });
-        }); });
+        });
     };
     /**
      * Returns raw data stream.
@@ -401,43 +444,58 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
         if (createForeignKeys === void 0) { createForeignKeys = true; }
         if (createIndices === void 0) { createIndices = true; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var isTableExist, upQueries, downQueries;
+            var isTableExist, upQueries, downQueries, enumColumns, createdEnumTypes, enumColumns_1, enumColumns_1_1, column, hasEnum, enumName, e_1_1;
+            var e_1, _a;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!ifNotExist) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.hasTable(table)];
                     case 1:
-                        isTableExist = _a.sent();
+                        isTableExist = _b.sent();
                         if (isTableExist)
                             return [2 /*return*/, Promise.resolve()];
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
                         upQueries = [];
                         downQueries = [];
-                        // if table have column with ENUM type, we must create this type in postgres.
-                        return [4 /*yield*/, Promise.all(table.columns
-                                .filter(function (column) { return column.type === "enum" || column.type === "simple-enum"; })
-                                .map(function (column) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var hasEnum;
-                                return tslib_1.__generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.hasEnumType(table, column)];
-                                        case 1:
-                                            hasEnum = _a.sent();
-                                            // TODO: Should also check if values of existing type matches expected ones
-                                            if (!hasEnum) {
-                                                upQueries.push(this.createEnumTypeSql(table, column));
-                                                downQueries.push(this.dropEnumTypeSql(table, column));
-                                            }
-                                            return [2 /*return*/, Promise.resolve()];
-                                    }
-                                });
-                            }); }))];
+                        enumColumns = table.columns.filter(function (column) { return column.type === "enum" || column.type === "simple-enum"; });
+                        createdEnumTypes = [];
+                        _b.label = 3;
                     case 3:
-                        // if table have column with ENUM type, we must create this type in postgres.
-                        _a.sent();
+                        _b.trys.push([3, 8, 9, 10]);
+                        enumColumns_1 = tslib_1.__values(enumColumns), enumColumns_1_1 = enumColumns_1.next();
+                        _b.label = 4;
+                    case 4:
+                        if (!!enumColumns_1_1.done) return [3 /*break*/, 7];
+                        column = enumColumns_1_1.value;
+                        return [4 /*yield*/, this.hasEnumType(table, column)];
+                    case 5:
+                        hasEnum = _b.sent();
+                        enumName = this.buildEnumName(table, column);
+                        // if enum with the same "enumName" is defined more then once, me must prevent double creation
+                        if (!hasEnum && createdEnumTypes.indexOf(enumName) === -1) {
+                            createdEnumTypes.push(enumName);
+                            upQueries.push(this.createEnumTypeSql(table, column, enumName));
+                            downQueries.push(this.dropEnumTypeSql(table, column, enumName));
+                        }
+                        _b.label = 6;
+                    case 6:
+                        enumColumns_1_1 = enumColumns_1.next();
+                        return [3 /*break*/, 4];
+                    case 7: return [3 /*break*/, 10];
+                    case 8:
+                        e_1_1 = _b.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 10];
+                    case 9:
+                        try {
+                            if (enumColumns_1_1 && !enumColumns_1_1.done && (_a = enumColumns_1.return)) _a.call(enumColumns_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 10:
                         upQueries.push(this.createTableSql(table, createForeignKeys));
                         downQueries.push(this.dropTableSql(table));
                         // if createForeignKeys is true, we must drop created foreign keys in down query.
@@ -454,8 +512,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             });
                         }
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
-                    case 4:
-                        _a.sent();
+                    case 11:
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -573,8 +631,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.renameTable = function (oldTableOrName, newTableName) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            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 upQueries, downQueries, oldTable, _a, newTable, oldTableName, schemaName, columnNames, oldPkName, newPkName, enumColumns, enumColumns_2, enumColumns_2_1, column, oldEnumType, e_2_1;
+            var e_2, _b;
             var _this = this;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
@@ -604,6 +662,17 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(newTable) + " RENAME CONSTRAINT \"" + oldPkName + "\" TO \"" + newPkName + "\""));
                             downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(newTable) + " RENAME CONSTRAINT \"" + newPkName + "\" TO \"" + oldPkName + "\""));
                         }
+                        // rename sequences
+                        newTable.columns.map(function (col) {
+                            if (col.isGenerated && col.generationStrategy === "increment") {
+                                var seqName = _this.buildSequenceName(oldTable, col.name, undefined, true, true);
+                                var newSeqName = _this.buildSequenceName(newTable, col.name, undefined, true, true);
+                                var up = schemaName ? "ALTER SEQUENCE \"" + schemaName + "\".\"" + seqName + "\" RENAME TO \"" + newSeqName + "\"" : "ALTER SEQUENCE \"" + seqName + "\" RENAME TO \"" + newSeqName + "\"";
+                                var down = schemaName ? "ALTER SEQUENCE \"" + schemaName + "\".\"" + newSeqName + "\" RENAME TO \"" + seqName + "\"" : "ALTER SEQUENCE \"" + newSeqName + "\" RENAME TO \"" + seqName + "\"";
+                                upQueries.push(new Query_1.Query(up));
+                                downQueries.push(new Query_1.Query(down));
+                            }
+                        });
                         // rename unique constraints
                         newTable.uniques.forEach(function (unique) {
                             // build new constraint name
@@ -641,11 +710,11 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         _c.label = 4;
                     case 4:
                         _c.trys.push([4, 9, 10, 11]);
-                        enumColumns_1 = tslib_1.__values(enumColumns), enumColumns_1_1 = enumColumns_1.next();
+                        enumColumns_2 = tslib_1.__values(enumColumns), enumColumns_2_1 = enumColumns_2.next();
                         _c.label = 5;
                     case 5:
-                        if (!!enumColumns_1_1.done) return [3 /*break*/, 8];
-                        column = enumColumns_1_1.value;
+                        if (!!enumColumns_2_1.done) return [3 /*break*/, 8];
+                        column = enumColumns_2_1.value;
                         return [4 /*yield*/, this.getEnumTypeName(oldTable, column)];
                     case 6:
                         oldEnumType = _c.sent();
@@ -653,18 +722,18 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         downQueries.push(new Query_1.Query("ALTER TYPE " + this.buildEnumName(newTable, column) + " RENAME TO \"" + oldEnumType.enumTypeName + "\""));
                         _c.label = 7;
                     case 7:
-                        enumColumns_1_1 = enumColumns_1.next();
+                        enumColumns_2_1 = enumColumns_2.next();
                         return [3 /*break*/, 5];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_1_1 = _c.sent();
-                        e_1 = { error: e_1_1 };
+                        e_2_1 = _c.sent();
+                        e_2 = { error: e_2_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
-                            if (enumColumns_1_1 && !enumColumns_1_1.done && (_b = enumColumns_1.return)) _b.call(enumColumns_1);
+                            if (enumColumns_2_1 && !enumColumns_2_1.done && (_b = enumColumns_2.return)) _b.call(enumColumns_2);
                         }
-                        finally { if (e_1) throw e_1.error; }
+                        finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
                     case 11: return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
                     case 12:
@@ -738,6 +807,11 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + uniqueConstraint.name + "\" UNIQUE (\"" + column.name + "\")"));
                             downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + uniqueConstraint.name + "\""));
                         }
+                        // create column's comment
+                        if (column.comment) {
+                            upQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + column.name + "\" IS " + this.escapeComment(column.comment)));
+                            downQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + column.name + "\" IS " + this.escapeComment(column.comment)));
+                        }
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
                     case 6:
                         _b.sent();
@@ -753,8 +827,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.addColumns = function (tableOrName, columns) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var columns_1, columns_1_1, column, e_2_1;
-            var e_2, _a;
+            var columns_1, columns_1_1, column, e_3_1;
+            var e_3, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -773,14 +847,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_2_1 = _b.sent();
-                        e_2 = { error: e_2_1 };
+                        e_3_1 = _b.sent();
+                        e_3 = { error: e_3_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; }
+                        finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -825,7 +899,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.changeColumn = function (tableOrName, oldTableColumnOrName, newColumn) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var table, _a, clonedTable, upQueries, downQueries, oldColumn, oldEnumType, primaryColumns, columnNames, oldPkName, newPkName, schema, seqName, newSeqName, up, down, oldTableColumn, enumName, arraySuffix, oldEnumName, oldEnumNameWithoutSchema, enumTypeBeforeColumnChange, upType, downType, primaryColumns, pkName, columnNames, column, pkName, columnNames, primaryColumn, column, pkName, columnNames, uniqueConstraint, uniqueConstraint;
+            var table, _a, clonedTable, upQueries, downQueries, defaultValueChanged, oldColumn, oldEnumType, primaryColumns, columnNames, oldPkName, newPkName, schema, seqName, newSeqName, up, down, oldTableColumn, arraySuffix, newEnumName, oldEnumName, oldEnumNameWithoutSchema, oldEnumNameWithSchema_old, oldEnumNameWithoutSchema_old, upType, downType, primaryColumns, pkName, columnNames, column, pkName, columnNames, primaryColumn, column, pkName, columnNames, uniqueConstraint, uniqueConstraint;
             var _this = this;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -842,12 +916,13 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         clonedTable = table.clone();
                         upQueries = [];
                         downQueries = [];
+                        defaultValueChanged = false;
                         oldColumn = oldTableColumnOrName instanceof TableColumn_1.TableColumn
                             ? oldTableColumnOrName
                             : table.columns.find(function (column) { return column.name === oldTableColumnOrName; });
                         if (!oldColumn)
                             throw new Error("Column \"" + oldTableColumnOrName + "\" was not found in the \"" + table.name + "\" table.");
-                        if (!(oldColumn.type !== newColumn.type || oldColumn.length !== newColumn.length)) return [3 /*break*/, 6];
+                        if (!(oldColumn.type !== newColumn.type || oldColumn.length !== newColumn.length || newColumn.isArray !== oldColumn.isArray)) return [3 /*break*/, 6];
                         // To avoid data conversion, we just recreate column
                         return [4 /*yield*/, this.dropColumn(table, oldColumn)];
                     case 4:
@@ -858,7 +933,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         _b.sent();
                         // update cloned table
                         clonedTable = table.clone();
-                        return [3 /*break*/, 12];
+                        return [3 /*break*/, 10];
                     case 6:
                         if (!(oldColumn.name !== newColumn.name)) return [3 /*break*/, 9];
                         // rename column
@@ -942,42 +1017,42 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + this.driver.createFullType(newColumn)));
                             downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + this.driver.createFullType(oldColumn)));
                         }
-                        if (!((newColumn.type === "enum" || newColumn.type === "simple-enum")
+                        if ((newColumn.type === "enum" || newColumn.type === "simple-enum")
                             && (oldColumn.type === "enum" || oldColumn.type === "simple-enum")
-                            && !OrmUtils_1.OrmUtils.isArraysEqual(newColumn.enum, oldColumn.enum))) return [3 /*break*/, 11];
-                        enumName = this.buildEnumName(table, newColumn);
-                        arraySuffix = newColumn.isArray ? "[]" : "";
-                        oldEnumName = this.buildEnumName(table, newColumn, true, false, true);
-                        oldEnumNameWithoutSchema = this.buildEnumName(table, newColumn, false, false, true);
-                        return [4 /*yield*/, this.getEnumTypeName(table, oldColumn)];
-                    case 10:
-                        enumTypeBeforeColumnChange = _b.sent();
-                        // rename old ENUM
-                        upQueries.push(new Query_1.Query("ALTER TYPE \"" + enumTypeBeforeColumnChange.enumTypeSchema + "\".\"" + enumTypeBeforeColumnChange.enumTypeName + "\" RENAME TO " + oldEnumNameWithoutSchema));
-                        downQueries.push(new Query_1.Query("ALTER TYPE " + oldEnumName + " RENAME TO  \"" + enumTypeBeforeColumnChange.enumTypeName + "\""));
-                        // create new ENUM
-                        upQueries.push(this.createEnumTypeSql(table, newColumn));
-                        downQueries.push(this.dropEnumTypeSql(table, oldColumn));
-                        // if column have default value, we must drop it to avoid issues with type casting
-                        if (newColumn.default !== null && newColumn.default !== undefined) {
-                            upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
-                            downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + newColumn.default));
-                        }
-                        upType = "" + enumName + arraySuffix + " USING \"" + newColumn.name + "\"::\"text\"::" + enumName + arraySuffix;
-                        downType = "" + oldEnumName + arraySuffix + " USING \"" + newColumn.name + "\"::\"text\"::" + oldEnumName + arraySuffix;
-                        // update column to use new type
-                        upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + upType));
-                        downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + downType));
-                        // if column have default value and we dropped it before, we must bring it back
-                        if (newColumn.default !== null && newColumn.default !== undefined) {
-                            upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + newColumn.default));
-                            downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                            && (!OrmUtils_1.OrmUtils.isArraysEqual(newColumn.enum, oldColumn.enum) || newColumn.enumName !== oldColumn.enumName)) {
+                            arraySuffix = newColumn.isArray ? "[]" : "";
+                            newEnumName = this.buildEnumName(table, newColumn);
+                            oldEnumName = this.buildEnumName(table, oldColumn);
+                            oldEnumNameWithoutSchema = this.buildEnumName(table, oldColumn, false);
+                            oldEnumNameWithSchema_old = this.buildEnumName(table, oldColumn, true, false, true);
+                            oldEnumNameWithoutSchema_old = this.buildEnumName(table, oldColumn, false, false, true);
+                            // rename old ENUM
+                            upQueries.push(new Query_1.Query("ALTER TYPE " + oldEnumName + " RENAME TO " + oldEnumNameWithoutSchema_old));
+                            downQueries.push(new Query_1.Query("ALTER TYPE " + oldEnumNameWithSchema_old + " RENAME TO " + oldEnumNameWithoutSchema));
+                            // create new ENUM
+                            upQueries.push(this.createEnumTypeSql(table, newColumn, newEnumName));
+                            downQueries.push(this.dropEnumTypeSql(table, newColumn, newEnumName));
+                            // if column have default value, we must drop it to avoid issues with type casting
+                            if (oldColumn.default !== null && oldColumn.default !== undefined) {
+                                // mark default as changed to prevent double update
+                                defaultValueChanged = true;
+                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + oldColumn.name + "\" DROP DEFAULT"));
+                                downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + oldColumn.name + "\" SET DEFAULT " + oldColumn.default));
+                            }
+                            upType = "" + newEnumName + arraySuffix + " USING \"" + newColumn.name + "\"::\"text\"::" + newEnumName + arraySuffix;
+                            downType = "" + oldEnumNameWithSchema_old + arraySuffix + " USING \"" + newColumn.name + "\"::\"text\"::" + oldEnumNameWithSchema_old + arraySuffix;
+                            // update column to use new type
+                            upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + upType));
+                            downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + downType));
+                            // restore column default or create new one
+                            if (newColumn.default !== null && newColumn.default !== undefined) {
+                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + newColumn.default));
+                                downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                            }
+                            // remove old ENUM
+                            upQueries.push(this.dropEnumTypeSql(table, oldColumn, oldEnumNameWithSchema_old));
+                            downQueries.push(this.createEnumTypeSql(table, oldColumn, oldEnumNameWithSchema_old));
                         }
-                        // remove old ENUM
-                        upQueries.push(this.dropEnumTypeSql(table, newColumn, oldEnumName));
-                        downQueries.push(this.createEnumTypeSql(table, oldColumn, oldEnumName));
-                        _b.label = 11;
-                    case 11:
                         if (oldColumn.isNullable !== newColumn.isNullable) {
                             if (newColumn.isNullable) {
                                 upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + oldColumn.name + "\" DROP NOT NULL"));
@@ -989,8 +1064,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             }
                         }
                         if (oldColumn.comment !== newColumn.comment) {
-                            upQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + oldColumn.name + "\" IS '" + newColumn.comment + "'"));
-                            downQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + newColumn.name + "\" IS '" + oldColumn.comment + "'"));
+                            upQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + oldColumn.name + "\" IS " + this.escapeComment(newColumn.comment)));
+                            downQueries.push(new Query_1.Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + newColumn.name + "\" IS " + this.escapeComment(oldColumn.comment)));
                         }
                         if (newColumn.isPrimary !== oldColumn.isPrimary) {
                             primaryColumns = clonedTable.primaryColumns;
@@ -1057,7 +1132,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                 downQueries.push(new Query_1.Query("CREATE SEQUENCE " + this.buildSequenceName(table, newColumn) + " OWNED BY " + this.escapePath(table) + ".\"" + newColumn.name + "\""));
                             }
                         }
-                        if (newColumn.default !== oldColumn.default) {
+                        // the default might have changed when the enum changed
+                        if (newColumn.default !== oldColumn.default && !defaultValueChanged) {
                             if (newColumn.default !== null && newColumn.default !== undefined) {
                                 upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + newColumn.default));
                                 if (oldColumn.default !== null && oldColumn.default !== undefined) {
@@ -1076,9 +1152,9 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + this.driver.createFullType(newColumn)));
                             downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + this.driver.createFullType(oldColumn)));
                         }
-                        _b.label = 12;
-                    case 12: return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
-                    case 13:
+                        _b.label = 10;
+                    case 10: return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
+                    case 11:
                         _b.sent();
                         this.replaceCachedTable(table, clonedTable);
                         return [2 /*return*/];
@@ -1091,8 +1167,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.changeColumns = function (tableOrName, changedColumns) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var changedColumns_1, changedColumns_1_1, _a, oldColumn, newColumn, e_3_1;
-            var e_3, _b;
+            var changedColumns_1, changedColumns_1_1, _a, oldColumn, newColumn, e_4_1;
+            var e_4, _b;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -1111,14 +1187,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_3_1 = _c.sent();
-                        e_3 = { error: e_3_1 };
+                        e_4_1 = _c.sent();
+                        e_4 = { error: e_4_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; }
+                        finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1212,8 +1288,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropColumns = function (tableOrName, columns) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var columns_2, columns_2_1, column, e_4_1;
-            var e_4, _a;
+            var columns_2, columns_2_1, column, e_5_1;
+            var e_5, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1232,14 +1308,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_4_1 = _b.sent();
-                        e_4 = { error: e_4_1 };
+                        e_5_1 = _b.sent();
+                        e_5 = { error: e_5_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; }
+                        finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1395,8 +1471,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createUniqueConstraints = function (tableOrName, uniqueConstraints) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var uniqueConstraints_1, uniqueConstraints_1_1, uniqueConstraint, e_5_1;
-            var e_5, _a;
+            var uniqueConstraints_1, uniqueConstraints_1_1, uniqueConstraint, e_6_1;
+            var e_6, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1415,14 +1491,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_5_1 = _b.sent();
-                        e_5 = { error: e_5_1 };
+                        e_6_1 = _b.sent();
+                        e_6 = { error: e_6_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; }
+                        finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1466,8 +1542,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropUniqueConstraints = function (tableOrName, uniqueConstraints) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var uniqueConstraints_2, uniqueConstraints_2_1, uniqueConstraint, e_6_1;
-            var e_6, _a;
+            var uniqueConstraints_2, uniqueConstraints_2_1, uniqueConstraint, e_7_1;
+            var e_7, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1486,14 +1562,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_6_1 = _b.sent();
-                        e_6 = { error: e_6_1 };
+                        e_7_1 = _b.sent();
+                        e_7 = { error: e_7_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; }
+                        finally { if (e_7) throw e_7.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1741,8 +1817,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createForeignKeys = function (tableOrName, foreignKeys) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var foreignKeys_1, foreignKeys_1_1, foreignKey, e_7_1;
-            var e_7, _a;
+            var foreignKeys_1, foreignKeys_1_1, foreignKey, e_8_1;
+            var e_8, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1761,14 +1837,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_7_1 = _b.sent();
-                        e_7 = { error: e_7_1 };
+                        e_8_1 = _b.sent();
+                        e_8 = { error: e_8_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; }
+                        finally { if (e_8) throw e_8.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1812,8 +1888,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropForeignKeys = function (tableOrName, foreignKeys) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var foreignKeys_2, foreignKeys_2_1, foreignKey, e_8_1;
-            var e_8, _a;
+            var foreignKeys_2, foreignKeys_2_1, foreignKey, e_9_1;
+            var e_9, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1832,14 +1908,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_8_1 = _b.sent();
-                        e_8 = { error: e_8_1 };
+                        e_9_1 = _b.sent();
+                        e_9 = { error: e_9_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; }
+                        finally { if (e_9) throw e_9.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1883,8 +1959,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createIndices = function (tableOrName, indices) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var indices_1, indices_1_1, index, e_9_1;
-            var e_9, _a;
+            var indices_1, indices_1_1, index, e_10_1;
+            var e_10, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1903,14 +1979,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_9_1 = _b.sent();
-                        e_9 = { error: e_9_1 };
+                        e_10_1 = _b.sent();
+                        e_10 = { error: e_10_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; }
+                        finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1954,8 +2030,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropIndices = function (tableOrName, indices) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var indices_2, indices_2_1, index, e_10_1;
-            var e_10, _a;
+            var indices_2, indices_2_1, index, e_11_1;
+            var e_11, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1974,14 +2050,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_10_1 = _b.sent();
-                        e_10 = { error: e_10_1 };
+                        e_11_1 = _b.sent();
+                        e_11 = { error: e_11_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; }
+                        finally { if (e_11) throw e_11.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -2119,7 +2195,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.loadTables = function (tableNames) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var currentSchemaQuery, currentSchema, tablesCondition, tablesSql, columnsSql, constraintsCondition, constraintsSql, indicesSql, foreignKeysCondition, foreignKeysSql, _a, dbTables, dbColumns, dbConstraints, dbIndices, dbForeignKeys;
+            var currentSchemaQuery, currentSchema, tablesCondition, tablesSql, columnsSql, constraintsCondition, constraintsSql, indicesSql, foreignKeysCondition, hasRelispartitionColumn, isPartitionCondition, foreignKeysSql, _a, dbTables, dbColumns, dbConstraints, dbIndices, dbForeignKeys;
             var _this = this;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -2140,7 +2216,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             return "(\"table_schema\" = '" + schema + "' AND \"table_name\" = '" + name + "')";
                         }).join(" OR ");
                         tablesSql = "SELECT * FROM \"information_schema\".\"tables\" WHERE " + tablesCondition;
-                        columnsSql = "SELECT *, ('\"' || \"udt_schema\" || '\".\"' || \"udt_name\" || '\"')::\"regtype\" AS \"regtype\" FROM \"information_schema\".\"columns\" WHERE " + tablesCondition;
+                        columnsSql = "\n            SELECT columns.*,\n              pg_catalog.col_description(('\"' || table_catalog || '\".\"' || table_schema || '\".\"' || table_name || '\"')::regclass::oid, ordinal_position) AS description,\n              ('\"' || \"udt_schema\" || '\".\"' || \"udt_name\" || '\"')::\"regtype\" AS \"regtype\",\n              pg_catalog.format_type(\"col_attr\".\"atttypid\", \"col_attr\".\"atttypmod\") AS \"format_type\"\n              FROM \"information_schema\".\"columns\"\n              LEFT JOIN \"pg_catalog\".\"pg_attribute\" AS \"col_attr\"\n              ON \"col_attr\".\"attname\" = \"columns\".\"column_name\"\n              AND \"col_attr\".\"attrelid\" = (\n                SELECT\n                  \"cls\".\"oid\" FROM \"pg_catalog\".\"pg_class\" AS \"cls\"\n                  LEFT JOIN \"pg_catalog\".\"pg_namespace\" AS \"ns\"\n                  ON \"ns\".\"oid\" = \"cls\".\"relnamespace\"\n                WHERE \"cls\".\"relname\" = \"columns\".\"table_name\"\n                AND \"ns\".\"nspname\" = \"columns\".\"table_schema\"\n              )\n            WHERE\n            " + tablesCondition;
                         constraintsCondition = tableNames.map(function (tableName) {
                             var _a = tslib_1.__read(tableName.split("."), 2), schema = _a[0], name = _a[1];
                             if (!name) {
@@ -2156,7 +2232,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             "INNER JOIN \"pg_class\" \"t\" ON \"t\".\"oid\" = \"cnst\".\"conrelid\" " +
                             "INNER JOIN \"pg_namespace\" \"ns\" ON \"ns\".\"oid\" = \"cnst\".\"connamespace\" " +
                             "LEFT JOIN \"pg_attribute\" \"a\" ON \"a\".\"attrelid\" = \"cnst\".\"conrelid\" AND \"a\".\"attnum\" = ANY (\"cnst\".\"conkey\") " +
-                            ("WHERE \"t\".\"relkind\" = 'r' AND (" + constraintsCondition + ")");
+                            ("WHERE \"t\".\"relkind\" IN ('r', 'p') AND (" + constraintsCondition + ")");
                         indicesSql = "SELECT \"ns\".\"nspname\" AS \"table_schema\", \"t\".\"relname\" AS \"table_name\", \"i\".\"relname\" AS \"constraint_name\", \"a\".\"attname\" AS \"column_name\", " +
                             "CASE \"ix\".\"indisunique\" WHEN 't' THEN 'TRUE' ELSE'FALSE' END AS \"is_unique\", pg_get_expr(\"ix\".\"indpred\", \"ix\".\"indrelid\") AS \"condition\", " +
                             "\"types\".\"typname\" AS \"type_name\" " +
@@ -2167,7 +2243,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             "INNER JOIN \"pg_class\" \"i\" ON \"i\".\"oid\" = \"ix\".\"indexrelid\" " +
                             "INNER JOIN \"pg_type\" \"types\" ON \"types\".\"oid\" = \"a\".\"atttypid\" " +
                             "LEFT JOIN \"pg_constraint\" \"cnst\" ON \"cnst\".\"conname\" = \"i\".\"relname\" " +
-                            ("WHERE \"t\".\"relkind\" = 'r' AND \"cnst\".\"contype\" IS NULL AND (" + constraintsCondition + ")");
+                            ("WHERE \"t\".\"relkind\" IN ('r', 'p') AND \"cnst\".\"contype\" IS NULL AND (" + constraintsCondition + ")");
                         foreignKeysCondition = tableNames.map(function (tableName) {
                             var _a = tslib_1.__read(tableName.split("."), 2), schema = _a[0], name = _a[1];
                             if (!name) {
@@ -2176,6 +2252,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             }
                             return "(\"ns\".\"nspname\" = '" + schema + "' AND \"cl\".\"relname\" = '" + name + "')";
                         }).join(" OR ");
+                        return [4 /*yield*/, this.hasSupportForPartitionedTables()];
+                    case 2:
+                        hasRelispartitionColumn = _b.sent();
+                        isPartitionCondition = hasRelispartitionColumn ? " AND \"cl\".\"relispartition\" = 'f'" : "";
                         foreignKeysSql = "SELECT \"con\".\"conname\" AS \"constraint_name\", \"con\".\"nspname\" AS \"table_schema\", \"con\".\"relname\" AS \"table_name\", \"att2\".\"attname\" AS \"column_name\", " +
                             "\"ns\".\"nspname\" AS \"referenced_table_schema\", \"cl\".\"relname\" AS \"referenced_table_name\", \"att\".\"attname\" AS \"referenced_column_name\", \"con\".\"confdeltype\" AS \"on_delete\", " +
                             "\"con\".\"confupdtype\" AS \"on_update\", \"con\".\"condeferrable\" AS \"deferrable\", \"con\".\"condeferred\" AS \"deferred\" " +
@@ -2191,7 +2271,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             ("WHERE \"con1\".\"contype\" = 'f' AND (" + foreignKeysCondition + ") ") +
                             ") \"con\" " +
                             "INNER JOIN \"pg_attribute\" \"att\" ON \"att\".\"attrelid\" = \"con\".\"confrelid\" AND \"att\".\"attnum\" = \"con\".\"child\" " +
-                            "INNER JOIN \"pg_class\" \"cl\" ON \"cl\".\"oid\" = \"con\".\"confrelid\" " +
+                            ("INNER JOIN \"pg_class\" \"cl\" ON \"cl\".\"oid\" = \"con\".\"confrelid\" " + isPartitionCondition) +
                             "INNER JOIN \"pg_namespace\" \"ns\" ON \"cl\".\"relnamespace\" = \"ns\".\"oid\" " +
                             "INNER JOIN \"pg_attribute\" \"att2\" ON \"att2\".\"attrelid\" = \"con\".\"conrelid\" AND \"att2\".\"attnum\" = \"con\".\"parent\"";
                         return [4 /*yield*/, Promise.all([
@@ -2201,7 +2281,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                 this.query(indicesSql),
                                 this.query(foreignKeysSql),
                             ])];
-                    case 2:
+                    case 3:
                         _a = tslib_1.__read.apply(void 0, [_b.sent(), 5]), dbTables = _a[0], dbColumns = _a[1], dbConstraints = _a[2], dbIndices = _a[3], dbForeignKeys = _a[4];
                         // if tables were not found in the db, no need to proceed
                         if (!dbTables.length)
@@ -2223,7 +2303,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                             return [4 /*yield*/, Promise.all(dbColumns
                                                     .filter(function (dbColumn) { return _this.driver.buildTableName(dbColumn["table_name"], dbColumn["table_schema"]) === tableFullName; })
                                                     .map(function (dbColumn) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                                    var columnConstraints, tableColumn, type, sql, results, geometryColumnSql, results, geographyColumnSql, results, length, uniqueConstraint, isConstraintComposite;
+                                                    var columnConstraints, tableColumn, type, enumTypeName, builtEnumName, sql, results, geometryColumnSql, results, geographyColumnSql, results, length, match, uniqueConstraint, isConstraintComposite;
                                                     var _this = this;
                                                     return tslib_1.__generator(this, function (_a) {
                                                         switch (_a.label) {
@@ -2262,40 +2342,55 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                     || tableColumn.type === "timestamp with time zone") {
                                                                     tableColumn.precision = !this.isDefaultColumnPrecision(table, tableColumn, dbColumn["datetime_precision"]) ? dbColumn["datetime_precision"] : undefined;
                                                                 }
-                                                                if (!(tableColumn.type.indexOf("enum") !== -1)) return [3 /*break*/, 2];
+                                                                if (!(tableColumn.type.indexOf("enum") !== -1)) return [3 /*break*/, 3];
+                                                                return [4 /*yield*/, this.getEnumTypeName(table, tableColumn)];
+                                                            case 1:
+                                                                enumTypeName = (_a.sent()).enumTypeName;
+                                                                builtEnumName = this.buildEnumName(table, tableColumn, false, true);
+                                                                if (builtEnumName !== enumTypeName)
+                                                                    tableColumn.enumName = enumTypeName;
                                                                 tableColumn.type = "enum";
                                                                 sql = "SELECT \"e\".\"enumlabel\" AS \"value\" FROM \"pg_enum\" \"e\" " +
                                                                     "INNER JOIN \"pg_type\" \"t\" ON \"t\".\"oid\" = \"e\".\"enumtypid\" " +
                                                                     "INNER JOIN \"pg_namespace\" \"n\" ON \"n\".\"oid\" = \"t\".\"typnamespace\" " +
-                                                                    ("WHERE \"n\".\"nspname\" = '" + dbTable["table_schema"] + "' AND \"t\".\"typname\" = '" + this.buildEnumName(table, tableColumn.name, false, true) + "'");
+                                                                    ("WHERE \"n\".\"nspname\" = '" + dbTable["table_schema"] + "' AND \"t\".\"typname\" = '" + this.buildEnumName(table, tableColumn, false, true) + "'");
                                                                 return [4 /*yield*/, this.query(sql)];
-                                                            case 1:
+                                                            case 2:
                                                                 results = _a.sent();
                                                                 tableColumn.enum = results.map(function (result) { return result["value"]; });
-                                                                _a.label = 2;
-                                                            case 2:
-                                                                if (!(tableColumn.type === "geometry")) return [3 /*break*/, 4];
+                                                                _a.label = 3;
+                                                            case 3:
+                                                                if (!(tableColumn.type === "geometry")) return [3 /*break*/, 5];
                                                                 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:
+                                                            case 4:
                                                                 results = _a.sent();
                                                                 tableColumn.spatialFeatureType = results[0].type;
                                                                 tableColumn.srid = results[0].srid;
-                                                                _a.label = 4;
-                                                            case 4:
-                                                                if (!(tableColumn.type === "geography")) return [3 /*break*/, 6];
+                                                                _a.label = 5;
+                                                            case 5:
+                                                                if (!(tableColumn.type === "geography")) return [3 /*break*/, 7];
                                                                 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:
+                                                            case 6:
                                                                 results = _a.sent();
                                                                 tableColumn.spatialFeatureType = results[0].type;
                                                                 tableColumn.srid = results[0].srid;
-                                                                _a.label = 6;
-                                                            case 6:
+                                                                _a.label = 7;
+                                                            case 7:
                                                                 // check only columns that have length property
-                                                                if (this.driver.withLengthColumnTypes.indexOf(tableColumn.type) !== -1 && dbColumn["character_maximum_length"]) {
-                                                                    length = dbColumn["character_maximum_length"].toString();
-                                                                    tableColumn.length = !this.isDefaultColumnLength(table, tableColumn, length) ? length : "";
+                                                                if (this.driver.withLengthColumnTypes.indexOf(tableColumn.type) !== -1) {
+                                                                    length = void 0;
+                                                                    if (tableColumn.isArray) {
+                                                                        match = /\((\d+)\)/.exec(dbColumn["format_type"]);
+                                                                        length = match ? match[1] : undefined;
+                                                                    }
+                                                                    else if (dbColumn["character_maximum_length"]) {
+                                                                        length = dbColumn["character_maximum_length"].toString();
+                                                                    }
+                                                                    if (length) {
+                                                                        tableColumn.length = !this.isDefaultColumnLength(table, tableColumn, length) ? length : "";
+                                                                    }
                                                                 }
                                                                 tableColumn.isNullable = dbColumn["is_nullable"] === "YES";
                                                                 tableColumn.isPrimary = !!columnConstraints.find(function (constraint) { return constraint["constraint_type"] === "PRIMARY"; });
@@ -2317,9 +2412,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                     }
                                                                     else {
                                                                         tableColumn.default = dbColumn["column_default"].replace(/::.*/, "");
+                                                                        tableColumn.default = tableColumn.default.replace(/^(-?\d+)$/, "'$1'");
                                                                     }
                                                                 }
-                                                                tableColumn.comment = ""; // dbColumn["COLUMN_COMMENT"];
+                                                                tableColumn.comment = dbColumn["description"] ? dbColumn["description"] : undefined;
                                                                 if (dbColumn["character_set_name"])
                                                                     tableColumn.charset = dbColumn["character_set_name"];
                                                                 if (dbColumn["collation_name"])
@@ -2472,6 +2568,9 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
             sql += ", CONSTRAINT \"" + primaryKeyName + "\" PRIMARY KEY (" + columnNames + ")";
         }
         sql += ")";
+        table.columns
+            .filter(function (it) { return it.comment; })
+            .forEach(function (it) { return sql += "; COMMENT ON COLUMN " + _this.escapePath(table) + ".\"" + it.name + "\" IS " + _this.escapeComment(it.comment); });
         return new Query_1.Query(sql);
     };
     /**
@@ -2734,31 +2833,26 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
             schema = table.name.split(".")[0];
             tableName = table.name.split(".")[1];
         }
+        var seqName = tableName + "_" + columnName + "_seq";
+        if (seqName.length > this.connection.driver.maxAliasLength) // note doesn't yet handle corner cases where .length differs from number of UTF-8 bytes
+            seqName = tableName.substring(0, 29) + "_" + columnName.substring(0, Math.max(29, 63 - tableName.length - 5)) + "_seq";
         if (schema && schema !== currentSchema && !skipSchema) {
-            return disableEscape ? schema + "." + tableName + "_" + columnName + "_seq" : "\"" + schema + "\".\"" + tableName + "_" + columnName + "_seq\"";
+            return disableEscape ? schema + "." + seqName : "\"" + schema + "\".\"" + seqName + "\"";
         }
         else {
-            return disableEscape ? tableName + "_" + columnName + "_seq" : "\"" + tableName + "_" + columnName + "_seq\"";
+            return disableEscape ? "" + seqName : "\"" + seqName + "\"";
         }
     };
     /**
      * Builds ENUM type name from given table and column.
      */
-    PostgresQueryRunner.prototype.buildEnumName = function (table, columnOrName, withSchema, disableEscape, toOld) {
+    PostgresQueryRunner.prototype.buildEnumName = function (table, column, withSchema, disableEscape, toOld) {
         if (withSchema === void 0) { withSchema = true; }
-        /**
-         * If enumName is specified in column options then use it instead
-         */
-        if (columnOrName instanceof TableColumn_1.TableColumn && columnOrName.enumName) {
-            var enumName_1 = columnOrName.enumName;
-            if (toOld)
-                enumName_1 = enumName_1 + "_old";
-            return disableEscape ? enumName_1 : "\"" + enumName_1 + "\"";
-        }
-        var columnName = columnOrName instanceof TableColumn_1.TableColumn ? columnOrName.name : columnOrName;
         var schema = table.name.indexOf(".") === -1 ? this.driver.options.schema : table.name.split(".")[0];
         var tableName = table.name.indexOf(".") === -1 ? table.name : table.name.split(".")[1];
-        var enumName = schema && withSchema ? schema + "." + tableName + "_" + columnName.toLowerCase() + "_enum" : tableName + "_" + columnName.toLowerCase() + "_enum";
+        var enumName = column.enumName ? column.enumName : tableName + "_" + column.name.toLowerCase() + "_enum";
+        if (schema && withSchema)
+            enumName = schema + "." + enumName;
         if (toOld)
             enumName = enumName + "_old";
         return enumName.split(".").map(function (i) {
@@ -2767,7 +2861,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
     };
     PostgresQueryRunner.prototype.getEnumTypeName = function (table, column) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var currentSchemaQuery, currentSchema, _a, schema, name, result;
+            var currentSchemaQuery, currentSchema, _a, schema, name, result, udtName;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.query("SELECT * FROM current_schema()")];
@@ -2783,14 +2877,30 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                 ("FROM \"information_schema\".\"columns\" WHERE \"table_schema\" = '" + schema + "' AND \"table_name\" = '" + name + "' AND \"column_name\"='" + column.name + "'"))];
                     case 2:
                         result = _b.sent();
+                        udtName = result[0]["udt_name"];
+                        if (udtName.indexOf("_") === 0) {
+                            udtName = udtName.substr(1, udtName.length);
+                        }
                         return [2 /*return*/, {
                                 enumTypeSchema: result[0]["udt_schema"],
-                                enumTypeName: result[0]["udt_name"]
+                                enumTypeName: udtName
                             }];
                 }
             });
         });
     };
+    /**
+     * Escapes a given comment so it's safe to include in a query.
+     */
+    PostgresQueryRunner.prototype.escapeComment = function (comment) {
+        if (!comment || comment.length === 0) {
+            return "NULL";
+        }
+        comment = comment
+            .replace(/'/g, "''")
+            .replace("\0", ""); // Null bytes aren't allowed in comments
+        return "'" + comment + "'";
+    };
     /**
      * Escapes given table or view path.
      */
@@ -2852,6 +2962,22 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
             c += " DEFAULT " + this.driver.uuidGenerator;
         return c;
     };
+    /**
+     * Checks if the PostgreSQL server has support for partitioned tables
+     */
+    PostgresQueryRunner.prototype.hasSupportForPartitionedTables = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var result;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.query("SELECT TRUE FROM information_schema.columns WHERE table_name = 'pg_class' and column_name = 'relispartition'")];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result.length ? true : false];
+                }
+            });
+        });
+    };
     return PostgresQueryRunner;
 }(BaseQueryRunner_1.BaseQueryRunner));
 exports.PostgresQueryRunner = PostgresQueryRunner;