typeorm 0.2.31 → 0.2.32

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -441,43 +441,58 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
         if (createForeignKeys === void 0) { createForeignKeys = true; }
         if (createIndices === void 0) { createIndices = true; }
         return __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 __generator(this, function (_a) {
-                switch (_a.label) {
+            return __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 __awaiter(_this, void 0, void 0, function () {
-                                var hasEnum;
-                                return __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 = __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.
@@ -494,8 +509,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             });
                         }
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
-                    case 4:
-                        _a.sent();
+                    case 11:
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -613,8 +628,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.renameTable = function (oldTableOrName, newTableName) {
         return __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 __generator(this, function (_c) {
                 switch (_c.label) {
@@ -644,6 +659,17 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query("ALTER TABLE " + this.escapePath(newTable) + " RENAME CONSTRAINT \"" + oldPkName + "\" TO \"" + newPkName + "\""));
                             downQueries.push(new 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(up));
+                                downQueries.push(new Query(down));
+                            }
+                        });
                         // rename unique constraints
                         newTable.uniques.forEach(function (unique) {
                             // build new constraint name
@@ -681,11 +707,11 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         _c.label = 4;
                     case 4:
                         _c.trys.push([4, 9, 10, 11]);
-                        enumColumns_1 = __values(enumColumns), enumColumns_1_1 = enumColumns_1.next();
+                        enumColumns_2 = __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();
@@ -693,18 +719,18 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         downQueries.push(new 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:
@@ -798,8 +824,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.addColumns = function (tableOrName, columns) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -818,14 +844,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*/];
                 }
@@ -870,7 +896,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.changeColumn = function (tableOrName, oldTableColumnOrName, newColumn) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
@@ -887,12 +913,13 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         clonedTable = table.clone();
                         upQueries = [];
                         downQueries = [];
+                        defaultValueChanged = false;
                         oldColumn = oldTableColumnOrName instanceof 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:
@@ -903,7 +930,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
@@ -987,42 +1014,42 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + this.driver.createFullType(newColumn)));
                             downQueries.push(new 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.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("ALTER TYPE \"" + enumTypeBeforeColumnChange.enumTypeSchema + "\".\"" + enumTypeBeforeColumnChange.enumTypeName + "\" RENAME TO " + oldEnumNameWithoutSchema));
-                        downQueries.push(new 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("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
-                            downQueries.push(new 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("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + upType));
-                        downQueries.push(new 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("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + newColumn.default));
-                            downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                            && (!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("ALTER TYPE " + oldEnumName + " RENAME TO " + oldEnumNameWithoutSchema_old));
+                            downQueries.push(new 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("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + oldColumn.name + "\" DROP DEFAULT"));
+                                downQueries.push(new 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("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + upType));
+                            downQueries.push(new 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("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + newColumn.default));
+                                downQueries.push(new 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("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + oldColumn.name + "\" DROP NOT NULL"));
@@ -1102,7 +1129,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                 downQueries.push(new 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("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + newColumn.default));
                                 if (oldColumn.default !== null && oldColumn.default !== undefined) {
@@ -1121,9 +1149,9 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" TYPE " + this.driver.createFullType(newColumn)));
                             downQueries.push(new 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*/];
@@ -1136,8 +1164,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.changeColumns = function (tableOrName, changedColumns) {
         return __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 __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -1156,14 +1184,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*/];
                 }
@@ -1257,8 +1285,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropColumns = function (tableOrName, columns) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1277,14 +1305,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*/];
                 }
@@ -1440,8 +1468,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createUniqueConstraints = function (tableOrName, uniqueConstraints) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1460,14 +1488,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*/];
                 }
@@ -1511,8 +1539,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropUniqueConstraints = function (tableOrName, uniqueConstraints) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1531,14 +1559,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*/];
                 }
@@ -1786,8 +1814,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createForeignKeys = function (tableOrName, foreignKeys) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1806,14 +1834,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*/];
                 }
@@ -1857,8 +1885,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropForeignKeys = function (tableOrName, foreignKeys) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1877,14 +1905,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*/];
                 }
@@ -1928,8 +1956,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createIndices = function (tableOrName, indices) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1948,14 +1976,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*/];
                 }
@@ -1999,8 +2027,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropIndices = function (tableOrName, indices) {
         return __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 __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -2019,14 +2047,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*/];
                 }
@@ -2272,7 +2300,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 __awaiter(_this, void 0, void 0, function () {
-                                                    var columnConstraints, tableColumn, type, sql, results, geometryColumnSql, results, geographyColumnSql, results, length_1, match, uniqueConstraint, isConstraintComposite;
+                                                    var columnConstraints, tableColumn, type, enumTypeName, builtEnumName, sql, results, geometryColumnSql, results, geographyColumnSql, results, length_1, match, uniqueConstraint, isConstraintComposite;
                                                     var _this = this;
                                                     return __generator(this, function (_a) {
                                                         switch (_a.label) {
@@ -2311,36 +2339,42 @@ 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) {
                                                                     if (tableColumn.isArray) {
@@ -2377,7 +2411,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                         tableColumn.default = tableColumn.default.replace(/^(-?\d+)$/, "'$1'");
                                                                     }
                                                                 }
-                                                                tableColumn.comment = dbColumn["description"] == null ? undefined : dbColumn["description"];
+                                                                tableColumn.comment = dbColumn["description"] ? dbColumn["description"] : undefined;
                                                                 if (dbColumn["character_set_name"])
                                                                     tableColumn.charset = dbColumn["character_set_name"];
                                                                 if (dbColumn["collation_name"])
@@ -2808,21 +2842,13 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
     /**
      * 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 && 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 ? 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) {
@@ -2831,7 +2857,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
     };
     PostgresQueryRunner.prototype.getEnumTypeName = function (table, column) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentSchemaQuery, currentSchema, _a, schema, name, result;
+            var currentSchemaQuery, currentSchema, _a, schema, name, result, udtName;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.query("SELECT * FROM current_schema()")];
@@ -2847,9 +2873,13 @@ 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
                             }];
                 }
             });
@@ -2859,11 +2889,11 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      * Escapes a given comment so it's safe to include in a query.
      */
     PostgresQueryRunner.prototype.escapeComment = function (comment) {
-        if (comment === undefined || comment.length === 0) {
+        if (!comment || comment.length === 0) {
             return "NULL";
         }
         comment = comment
-            .replace("'", "''")
+            .replace(/'/g, "''")
             .replace("\0", ""); // Null bytes aren't allowed in comments
         return "'" + comment + "'";
     };