typeorm 0.2.40-dev.ae858ad → 0.2.41-dev.15ad5ac

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -18,6 +18,7 @@ import { Query } from "../Query";
 import { VersionUtils } from "../../util/VersionUtils";
 import { TypeORMError } from "../../error";
 import { QueryResult } from "../../query-runner/QueryResult";
+import { MetadataTableType } from "../types/MetadataTableType";
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -219,23 +220,25 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime)
                             this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
                         result = new QueryResult();
-                        if (raw === null || raw === void 0 ? void 0 : raw.hasOwnProperty('rows')) {
-                            result.records = raw.rows;
-                        }
-                        if (raw === null || raw === void 0 ? void 0 : raw.hasOwnProperty('rowCount')) {
-                            result.affected = raw.rowCount;
-                        }
-                        switch (raw.command) {
-                            case "DELETE":
-                            case "UPDATE":
-                                // for UPDATE and DELETE query additionally return number of affected rows
-                                result.raw = [raw.rows, raw.rowCount];
-                                break;
-                            default:
-                                result.raw = raw.rows;
-                        }
-                        if (!useStructuredResult) {
-                            return [2 /*return*/, result.raw];
+                        if (raw) {
+                            if (raw.hasOwnProperty('rows')) {
+                                result.records = raw.rows;
+                            }
+                            if (raw.hasOwnProperty('rowCount')) {
+                                result.affected = raw.rowCount;
+                            }
+                            switch (raw.command) {
+                                case "DELETE":
+                                case "UPDATE":
+                                    // for UPDATE and DELETE query additionally return number of affected rows
+                                    result.raw = [raw.rows, raw.rowCount];
+                                    break;
+                                default:
+                                    result.raw = raw.rows;
+                            }
+                            if (!useStructuredResult) {
+                                return [2 /*return*/, result.raw];
+                            }
                         }
                         return [2 /*return*/, result];
                     case 4:
@@ -506,35 +509,35 @@ 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, enumColumns, createdEnumTypes, enumColumns_1, enumColumns_1_1, column, hasEnum, enumName, e_1_1;
-            var e_1, _a;
+            var isTableExist, upQueries, downQueries, enumColumns, createdEnumTypes, enumColumns_1, enumColumns_1_1, column, hasEnum, enumName, e_1_1, generatedColumns, generatedColumns_1, generatedColumns_1_1, column, tableNameWithSchema, tableName, schema, insertQuery, deleteQuery, e_2_1;
+            var e_1, _a, e_2, _b;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (!ifNotExist) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.hasTable(table)];
                     case 1:
-                        isTableExist = _b.sent();
+                        isTableExist = _c.sent();
                         if (isTableExist)
                             return [2 /*return*/, Promise.resolve()];
-                        _b.label = 2;
+                        _c.label = 2;
                     case 2:
                         upQueries = [];
                         downQueries = [];
                         enumColumns = table.columns.filter(function (column) { return column.type === "enum" || column.type === "simple-enum"; });
                         createdEnumTypes = [];
-                        _b.label = 3;
+                        _c.label = 3;
                     case 3:
-                        _b.trys.push([3, 8, 9, 10]);
+                        _c.trys.push([3, 8, 9, 10]);
                         enumColumns_1 = __values(enumColumns), enumColumns_1_1 = enumColumns_1.next();
-                        _b.label = 4;
+                        _c.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();
+                        hasEnum = _c.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) {
@@ -542,13 +545,13 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(this.createEnumTypeSql(table, column, enumName));
                             downQueries.push(this.dropEnumTypeSql(table, column, enumName));
                         }
-                        _b.label = 6;
+                        _c.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_1 = _c.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 10];
                     case 9:
@@ -558,6 +561,54 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
                     case 10:
+                        generatedColumns = table.columns.filter(function (column) { return column.generatedType === "STORED" && column.asExpression; });
+                        _c.label = 11;
+                    case 11:
+                        _c.trys.push([11, 16, 17, 18]);
+                        generatedColumns_1 = __values(generatedColumns), generatedColumns_1_1 = generatedColumns_1.next();
+                        _c.label = 12;
+                    case 12:
+                        if (!!generatedColumns_1_1.done) return [3 /*break*/, 15];
+                        column = generatedColumns_1_1.value;
+                        return [4 /*yield*/, this.getTableNameWithSchema(table.name)];
+                    case 13:
+                        tableNameWithSchema = (_c.sent()).split('.');
+                        tableName = tableNameWithSchema[1];
+                        schema = tableNameWithSchema[0];
+                        insertQuery = this.insertTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: column.name,
+                            value: column.asExpression
+                        });
+                        deleteQuery = this.deleteTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: column.name
+                        });
+                        upQueries.push(deleteQuery);
+                        upQueries.push(insertQuery);
+                        downQueries.push(deleteQuery);
+                        _c.label = 14;
+                    case 14:
+                        generatedColumns_1_1 = generatedColumns_1.next();
+                        return [3 /*break*/, 12];
+                    case 15: return [3 /*break*/, 18];
+                    case 16:
+                        e_2_1 = _c.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 18];
+                    case 17:
+                        try {
+                            if (generatedColumns_1_1 && !generatedColumns_1_1.done && (_b = generatedColumns_1.return)) _b.call(generatedColumns_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 18:
                         upQueries.push(this.createTableSql(table, createForeignKeys));
                         downQueries.push(this.dropTableSql(table));
                         // if createForeignKeys is true, we must drop created foreign keys in down query.
@@ -574,8 +625,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             });
                         }
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
-                    case 11:
-                        _b.sent();
+                    case 19:
+                        _c.sent();
                         return [2 /*return*/];
                 }
             });
@@ -693,8 +744,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, _b, schemaName, oldTableName, columnNames, oldPkName, newPkName, enumColumns, enumColumns_2, enumColumns_2_1, column, oldEnumType, e_2_1;
-            var e_2, _c;
+            var upQueries, downQueries, oldTable, _a, newTable, _b, schemaName, oldTableName, columnNames, oldPkName, newPkName, enumColumns, enumColumns_2, enumColumns_2_1, column, oldEnumType, e_3_1;
+            var e_3, _c;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -792,14 +843,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 5];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_2_1 = _d.sent();
-                        e_2 = { error: e_2_1 };
+                        e_3_1 = _d.sent();
+                        e_3 = { error: e_3_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
                             if (enumColumns_2_1 && !enumColumns_2_1.done && (_c = enumColumns_2.return)) _c.call(enumColumns_2);
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 11: return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
                     case 12:
@@ -814,7 +865,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.addColumn = function (tableOrName, column) {
         return __awaiter(this, void 0, void 0, function () {
-            var table, _a, clonedTable, upQueries, downQueries, hasEnum, primaryColumns, pkName_1, columnNames_1, pkName, columnNames, columnIndex, uniqueConstraint;
+            var table, _a, clonedTable, upQueries, downQueries, hasEnum, primaryColumns, pkName_1, columnNames_1, pkName, columnNames, columnIndex, uniqueConstraint, tableNameWithSchema, tableName, schema, insertQuery, deleteQuery;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -873,13 +924,39 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + uniqueConstraint.name + "\" UNIQUE (\"" + column.name + "\")"));
                             downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP CONSTRAINT \"" + uniqueConstraint.name + "\""));
                         }
+                        if (!(column.generatedType === "STORED" && column.asExpression)) return [3 /*break*/, 7];
+                        return [4 /*yield*/, this.getTableNameWithSchema(table.name)];
+                    case 6:
+                        tableNameWithSchema = (_b.sent()).split('.');
+                        tableName = tableNameWithSchema[1];
+                        schema = tableNameWithSchema[0];
+                        insertQuery = this.insertTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: column.name,
+                            value: column.asExpression
+                        });
+                        deleteQuery = this.deleteTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: column.name
+                        });
+                        upQueries.push(deleteQuery);
+                        upQueries.push(insertQuery);
+                        downQueries.push(deleteQuery);
+                        _b.label = 7;
+                    case 7:
                         // create column's comment
                         if (column.comment) {
                             upQueries.push(new Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + column.name + "\" IS " + this.escapeComment(column.comment)));
                             downQueries.push(new Query("COMMENT ON COLUMN " + this.escapePath(table) + ".\"" + column.name + "\" IS " + this.escapeComment(column.comment)));
                         }
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
-                    case 6:
+                    case 8:
                         _b.sent();
                         clonedTable.addColumn(column);
                         this.replaceCachedTable(table, clonedTable);
@@ -893,8 +970,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_3_1;
-            var e_3, _a;
+            var columns_1, columns_1_1, column, e_4_1;
+            var e_4, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -913,14 +990,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_3_1 = _b.sent();
-                        e_3 = { error: e_3_1 };
+                        e_4_1 = _b.sent();
+                        e_4 = { error: e_4_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_3) throw e_3.error; }
+                        finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -965,7 +1042,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, defaultValueChanged, oldColumn, oldEnumType, primaryColumns, columnNames, oldPkName, newPkName, sequencePath, sequenceName, newSequencePath, newSequenceName, 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 table, _a, clonedTable, upQueries, downQueries, defaultValueChanged, oldColumn, oldEnumType, primaryColumns, columnNames, oldPkName, newPkName, sequencePath, sequenceName, newSequencePath, newSequenceName, 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, tableNameWithSchema, tableName, schema;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -988,7 +1065,11 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             : table.columns.find(function (column) { return column.name === oldTableColumnOrName; });
                         if (!oldColumn)
                             throw new TypeORMError("Column \"" + oldTableColumnOrName + "\" was not found in the \"" + table.name + "\" table.");
-                        if (!(oldColumn.type !== newColumn.type || oldColumn.length !== newColumn.length || newColumn.isArray !== oldColumn.isArray)) return [3 /*break*/, 6];
+                        if (!(oldColumn.type !== newColumn.type
+                            || oldColumn.length !== newColumn.length
+                            || newColumn.isArray !== oldColumn.isArray
+                            || (!oldColumn.generatedType && newColumn.generatedType === "STORED")
+                            || (oldColumn.asExpression !== newColumn.asExpression && newColumn.generatedType === "STORED"))) return [3 /*break*/, 6];
                         // To avoid data conversion, we just recreate column
                         return [4 /*yield*/, this.dropColumn(table, oldColumn)];
                     case 4:
@@ -999,7 +1080,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         _b.sent();
                         // update cloned table
                         clonedTable = table.clone();
-                        return [3 /*break*/, 10];
+                        return [3 /*break*/, 11];
                     case 6:
                         if (!(oldColumn.name !== newColumn.name)) return [3 /*break*/, 9];
                         // rename column
@@ -1185,7 +1266,9 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                 downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + uniqueConstraint.name + "\" UNIQUE (\"" + newColumn.name + "\")"));
                             }
                         }
-                        if (oldColumn.isGenerated !== newColumn.isGenerated && newColumn.generationStrategy !== "uuid") {
+                        if (oldColumn.isGenerated !== newColumn.isGenerated &&
+                            newColumn.generationStrategy !== "uuid" &&
+                            newColumn.generationStrategy !== "identity") {
                             if (newColumn.isGenerated === true) {
                                 upQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS " + this.escapePath(this.buildSequencePath(table, newColumn)) + " OWNED BY " + this.escapePath(table) + ".\"" + newColumn.name + "\""));
                                 downQueries.push(new Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
@@ -1219,9 +1302,45 @@ 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 = 10;
-                    case 10: return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
-                    case 11:
+                        if (!(newColumn.generatedType !== oldColumn.generatedType)) return [3 /*break*/, 11];
+                        if (!(!newColumn.generatedType || newColumn.generatedType === "VIRTUAL")) return [3 /*break*/, 11];
+                        return [4 /*yield*/, this.getTableNameWithSchema(table.name)];
+                    case 10:
+                        tableNameWithSchema = (_b.sent()).split('.');
+                        tableName = tableNameWithSchema[1];
+                        schema = tableNameWithSchema[0];
+                        upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " RENAME COLUMN \"" + oldColumn.name + "\" TO \"TEMP_OLD_" + oldColumn.name + "\""));
+                        upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD " + this.buildCreateColumnSql(table, newColumn)));
+                        upQueries.push(new Query("UPDATE " + this.escapePath(table) + " SET \"" + newColumn.name + "\" = \"TEMP_OLD_" + oldColumn.name + "\""));
+                        upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP COLUMN \"TEMP_OLD_" + oldColumn.name + "\""));
+                        upQueries.push(this.deleteTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: oldColumn.name
+                        }));
+                        // However, we can't copy it back on downgrade. It needs to regenerate.
+                        downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " DROP COLUMN \"" + newColumn.name + "\""));
+                        downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ADD " + this.buildCreateColumnSql(table, oldColumn)));
+                        downQueries.push(this.deleteTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: newColumn.name
+                        }));
+                        downQueries.push(this.insertTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: oldColumn.name,
+                            value: oldColumn.asExpression
+                        }));
+                        _b.label = 11;
+                    case 11: return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
+                    case 12:
                         _b.sent();
                         this.replaceCachedTable(table, clonedTable);
                         return [2 /*return*/];
@@ -1234,8 +1353,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_4_1;
-            var e_4, _b;
+            var changedColumns_1, changedColumns_1_1, _a, oldColumn, newColumn, e_5_1;
+            var e_5, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -1254,14 +1373,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_4_1 = _c.sent();
-                        e_4 = { error: e_4_1 };
+                        e_5_1 = _c.sent();
+                        e_5 = { error: e_5_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_4) throw e_4.error; }
+                        finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1273,7 +1392,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.dropColumn = function (tableOrName, columnOrName) {
         return __awaiter(this, void 0, void 0, function () {
-            var table, _a, column, clonedTable, upQueries, downQueries, pkName, columnNames, tableColumn, pkName_2, columnNames_2, columnIndex, columnCheck, columnUnique, hasEnum, enumType, escapedEnumName;
+            var table, _a, column, clonedTable, upQueries, downQueries, pkName, columnNames, tableColumn, pkName_2, columnNames_2, columnIndex, columnCheck, columnUnique, hasEnum, enumType, escapedEnumName, tableNameWithSchema, tableName, schema, insertQuery, deleteQuery;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1340,8 +1459,33 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         upQueries.push(this.dropEnumTypeSql(table, column, escapedEnumName));
                         downQueries.push(this.createEnumTypeSql(table, column, escapedEnumName));
                         _b.label = 6;
-                    case 6: return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
+                    case 6:
+                        if (!(column.generatedType === "STORED")) return [3 /*break*/, 8];
+                        return [4 /*yield*/, this.getTableNameWithSchema(table.name)];
                     case 7:
+                        tableNameWithSchema = (_b.sent()).split('.');
+                        tableName = tableNameWithSchema[1];
+                        schema = tableNameWithSchema[0];
+                        insertQuery = this.deleteTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: column.name
+                        });
+                        deleteQuery = this.insertTypeormMetadataSql({
+                            database: this.driver.database,
+                            schema: schema,
+                            table: tableName,
+                            type: MetadataTableType.GENERATED_COLUMN,
+                            name: column.name,
+                            value: column.asExpression
+                        });
+                        upQueries.push(insertQuery);
+                        downQueries.push(deleteQuery);
+                        _b.label = 8;
+                    case 8: return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
+                    case 9:
                         _b.sent();
                         clonedTable.removeColumn(column);
                         this.replaceCachedTable(table, clonedTable);
@@ -1355,8 +1499,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_5_1;
-            var e_5, _a;
+            var columns_2, columns_2_1, column, e_6_1;
+            var e_6, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1375,14 +1519,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 (columns_2_1 && !columns_2_1.done && (_a = columns_2.return)) _a.call(columns_2);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1538,8 +1682,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_6_1;
-            var e_6, _a;
+            var uniqueConstraints_1, uniqueConstraints_1_1, uniqueConstraint, e_7_1;
+            var e_7, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1558,14 +1702,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_1_1 && !uniqueConstraints_1_1.done && (_a = uniqueConstraints_1.return)) _a.call(uniqueConstraints_1);
                         }
-                        finally { if (e_6) throw e_6.error; }
+                        finally { if (e_7) throw e_7.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1609,8 +1753,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_7_1;
-            var e_7, _a;
+            var uniqueConstraints_2, uniqueConstraints_2_1, uniqueConstraint, e_8_1;
+            var e_8, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1629,14 +1773,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 (uniqueConstraints_2_1 && !uniqueConstraints_2_1.done && (_a = uniqueConstraints_2.return)) _a.call(uniqueConstraints_2);
                         }
-                        finally { if (e_7) throw e_7.error; }
+                        finally { if (e_8) throw e_8.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1884,8 +2028,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_8_1;
-            var e_8, _a;
+            var foreignKeys_1, foreignKeys_1_1, foreignKey, e_9_1;
+            var e_9, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1904,14 +2048,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_1_1 && !foreignKeys_1_1.done && (_a = foreignKeys_1.return)) _a.call(foreignKeys_1);
                         }
-                        finally { if (e_8) throw e_8.error; }
+                        finally { if (e_9) throw e_9.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1955,8 +2099,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_9_1;
-            var e_9, _a;
+            var foreignKeys_2, foreignKeys_2_1, foreignKey, e_10_1;
+            var e_10, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1975,14 +2119,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 (foreignKeys_2_1 && !foreignKeys_2_1.done && (_a = foreignKeys_2.return)) _a.call(foreignKeys_2);
                         }
-                        finally { if (e_9) throw e_9.error; }
+                        finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -2026,8 +2170,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_10_1;
-            var e_10, _a;
+            var indices_1, indices_1_1, index, e_11_1;
+            var e_11, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -2046,14 +2190,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_1_1 && !indices_1_1.done && (_a = indices_1.return)) _a.call(indices_1);
                         }
-                        finally { if (e_10) throw e_10.error; }
+                        finally { if (e_11) throw e_11.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -2097,8 +2241,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_11_1;
-            var e_11, _a;
+            var indices_2, indices_2_1, index, e_12_1;
+            var e_12, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -2117,14 +2261,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_11_1 = _b.sent();
-                        e_11 = { error: e_11_1 };
+                        e_12_1 = _b.sent();
+                        e_12 = { error: e_12_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_11) throw e_11.error; }
+                        finally { if (e_12) throw e_12.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -2268,7 +2412,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         query = "SELECT \"t\".* FROM " + this.escapePath(this.getTypeormMetadataTableName()) + " \"t\" " +
                             "INNER JOIN \"pg_catalog\".\"pg_class\" \"c\" ON \"c\".\"relname\" = \"t\".\"name\" " +
                             "INNER JOIN \"pg_namespace\" \"n\" ON \"n\".\"oid\" = \"c\".\"relnamespace\" AND \"n\".\"nspname\" = \"t\".\"schema\" " +
-                            ("WHERE \"t\".\"type\" IN ('VIEW', 'MATERIALIZED_VIEW') " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
+                            ("WHERE \"t\".\"type\" IN ('" + MetadataTableType.VIEW + "', '" + MetadataTableType.MATERIALIZED_VIEW + "') " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
                         return [4 /*yield*/, this.query(query)];
                     case 4:
                         dbViews = _a.sent();
@@ -2279,7 +2423,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                 view.schema = dbView["schema"];
                                 view.name = _this.driver.buildTableName(dbView["name"], schema);
                                 view.expression = dbView["value"];
-                                view.materialized = dbView["type"] === "MATERIALIZED_VIEW";
+                                view.materialized = dbView["type"] === MetadataTableType.MATERIALIZED_VIEW;
                                 return view;
                             })];
                 }
@@ -2430,7 +2574,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                             return [4 /*yield*/, Promise.all(dbColumns
                                                     .filter(function (dbColumn) { return (dbColumn["table_name"] === dbTable["table_name"] && dbColumn["table_schema"] === dbTable["table_schema"]); })
                                                     .map(function (dbColumn) { return __awaiter(_this, void 0, void 0, function () {
-                                                    var columnConstraints, tableColumn, name_1, builtEnumName, enumName, sql, results, type, geometryColumnSql, results, geographyColumnSql, results, length_1, match, uniqueConstraint, isConstraintComposite, serialDefaultName, serialDefaultPath, defaultWithoutQuotes;
+                                                    var columnConstraints, tableColumn, name_1, builtEnumName, enumName, sql, results, type, geometryColumnSql, results, geographyColumnSql, results, length_1, match, uniqueConstraints, isConstraintComposite, serialDefaultName, serialDefaultPath, defaultWithoutQuotes, asExpressionQuery, results;
                                                     return __generator(this, function (_a) {
                                                         switch (_a.label) {
                                                             case 0:
@@ -2529,14 +2673,18 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                 }
                                                                 tableColumn.isNullable = dbColumn["is_nullable"] === "YES";
                                                                 tableColumn.isPrimary = !!columnConstraints.find(function (constraint) { return constraint["constraint_type"] === "PRIMARY"; });
-                                                                uniqueConstraint = columnConstraints.find(function (constraint) { return constraint["constraint_type"] === "UNIQUE"; });
-                                                                isConstraintComposite = uniqueConstraint
-                                                                    ? !!dbConstraints.find(function (dbConstraint) { return dbConstraint["constraint_type"] === "UNIQUE"
+                                                                uniqueConstraints = columnConstraints.filter(function (constraint) { return constraint["constraint_type"] === "UNIQUE"; });
+                                                                isConstraintComposite = uniqueConstraints.every(function (uniqueConstraint) {
+                                                                    return dbConstraints.some(function (dbConstraint) { return dbConstraint["constraint_type"] === "UNIQUE"
                                                                         && dbConstraint["constraint_name"] === uniqueConstraint["constraint_name"]
-                                                                        && dbConstraint["column_name"] !== dbColumn["column_name"]; })
-                                                                    : false;
-                                                                tableColumn.isUnique = !!uniqueConstraint && !isConstraintComposite;
-                                                                if (dbColumn["column_default"] !== null && dbColumn["column_default"] !== undefined) {
+                                                                        && dbConstraint["column_name"] !== dbColumn["column_name"]; });
+                                                                });
+                                                                tableColumn.isUnique = uniqueConstraints.length > 0 && !isConstraintComposite;
+                                                                if (dbColumn.is_identity === "YES") { // Postgres 10+ Identity column
+                                                                    tableColumn.isGenerated = true;
+                                                                    tableColumn.generationStrategy = "identity";
+                                                                }
+                                                                else if (dbColumn["column_default"] !== null && dbColumn["column_default"] !== undefined) {
                                                                     serialDefaultName = "nextval('" + this.buildSequenceName(table, dbColumn["column_name"]) + "'::regclass)";
                                                                     serialDefaultPath = "nextval('" + this.buildSequencePath(table, dbColumn["column_name"]) + "'::regclass)";
                                                                     defaultWithoutQuotes = dbColumn["column_default"].replace(/"/g, "");
@@ -2552,10 +2700,30 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                         tableColumn.default = dbColumn["column_default"];
                                                                     }
                                                                     else {
-                                                                        tableColumn.default = dbColumn["column_default"].replace(/::[\w\s\[\]\"]+/g, "");
+                                                                        tableColumn.default = dbColumn["column_default"].replace(/::[\w\s\.\[\]\"]+/g, "");
                                                                         tableColumn.default = tableColumn.default.replace(/^(-?\d+)$/, "'$1'");
                                                                     }
                                                                 }
+                                                                if (!(dbColumn["is_generated"] === "ALWAYS" && dbColumn["generation_expression"])) return [3 /*break*/, 9];
+                                                                // In postgres there is no VIRTUAL generated column type
+                                                                tableColumn.generatedType = "STORED";
+                                                                asExpressionQuery = "SELECT * FROM \"typeorm_metadata\" "
+                                                                    + (" WHERE \"table\" = '" + dbTable["table_name"] + "'")
+                                                                    + (" AND \"name\" = '" + tableColumn.name + "'")
+                                                                    + (" AND \"schema\" = '" + dbTable["table_schema"] + "'")
+                                                                    + (" AND \"database\" = '" + this.driver.database + "'")
+                                                                    + (" AND \"type\" = '" + MetadataTableType.GENERATED_COLUMN + "'");
+                                                                return [4 /*yield*/, this.query(asExpressionQuery)];
+                                                            case 8:
+                                                                results = _a.sent();
+                                                                if (results[0] && results[0].value) {
+                                                                    tableColumn.asExpression = results[0].value;
+                                                                }
+                                                                else {
+                                                                    tableColumn.asExpression = "";
+                                                                }
+                                                                _a.label = 9;
+                                                            case 9:
                                                                 tableColumn.comment = dbColumn["description"] ? dbColumn["description"] : undefined;
                                                                 if (dbColumn["character_set_name"])
                                                                     tableColumn.charset = dbColumn["character_set_name"];
@@ -2753,24 +2921,19 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
     };
     PostgresQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentSchema, _a, schema, name, type, expression, _b, query, parameters;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var currentSchema, _a, schema, name, type, expression;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getCurrentSchema()];
                     case 1:
-                        currentSchema = _c.sent();
+                        currentSchema = _b.sent();
                         _a = this.driver.parseTableName(view), schema = _a.schema, name = _a.tableName;
                         if (!schema) {
                             schema = currentSchema;
                         }
-                        type = view.materialized ? "MATERIALIZED_VIEW" : "VIEW";
+                        type = view.materialized ? MetadataTableType.MATERIALIZED_VIEW : MetadataTableType.VIEW;
                         expression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
-                        _b = __read(this.connection.createQueryBuilder()
-                            .insert()
-                            .into(this.getTypeormMetadataTableName())
-                            .values({ type: type, schema: schema, name: name, value: expression })
-                            .getQueryAndParameters(), 2), query = _b[0], parameters = _b[1];
-                        return [2 /*return*/, new Query(query, parameters)];
+                        return [2 /*return*/, this.insertTypeormMetadataSql({ type: type, schema: schema, name: name, value: expression })];
                 }
             });
         });
@@ -2787,25 +2950,18 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.deleteViewDefinitionSql = function (view) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentSchema, _a, schema, name, type, qb, _b, query, parameters;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var currentSchema, _a, schema, name, type;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getCurrentSchema()];
                     case 1:
-                        currentSchema = _c.sent();
+                        currentSchema = _b.sent();
                         _a = this.driver.parseTableName(view), schema = _a.schema, name = _a.tableName;
                         if (!schema) {
                             schema = currentSchema;
                         }
-                        type = view.materialized ? "MATERIALIZED_VIEW" : "VIEW";
-                        qb = this.connection.createQueryBuilder();
-                        _b = __read(qb.delete()
-                            .from(this.getTypeormMetadataTableName())
-                            .where(qb.escape("type") + " = :type", { type: type })
-                            .andWhere(qb.escape("schema") + " = :schema", { schema: schema })
-                            .andWhere(qb.escape("name") + " = :name", { name: name })
-                            .getQueryAndParameters(), 2), query = _b[0], parameters = _b[1];
-                        return [2 /*return*/, new Query(query, parameters)];
+                        type = view.materialized ? MetadataTableType.MATERIALIZED_VIEW : MetadataTableType.VIEW;
+                        return [2 /*return*/, this.deleteTypeormMetadataSql({ type: type, schema: schema, name: name })];
                 }
             });
         });
@@ -3056,18 +3212,45 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
         }
         return "\"" + tableName + "\"";
     };
+    /**
+     * Get the table name with table schema
+     * Note: Without ' or "
+     */
+    PostgresQueryRunner.prototype.getTableNameWithSchema = function (target) {
+        return __awaiter(this, void 0, void 0, function () {
+            var tableName, schemaResult, schema;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        tableName = target instanceof Table ? target.name : target;
+                        if (!(tableName.indexOf(".") === -1)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.query("SELECT current_schema()")];
+                    case 1:
+                        schemaResult = _a.sent();
+                        schema = schemaResult[0]["current_schema"];
+                        return [2 /*return*/, schema + "." + tableName];
+                    case 2: return [2 /*return*/, tableName.split(".")[0] + "." + tableName.split(".")[1]];
+                }
+            });
+        });
+    };
     /**
      * Builds a query for create column.
      */
     PostgresQueryRunner.prototype.buildCreateColumnSql = function (table, column) {
         var c = "\"" + column.name + "\"";
         if (column.isGenerated === true && column.generationStrategy !== "uuid") {
-            if (column.type === "integer" || column.type === "int" || column.type === "int4")
-                c += " SERIAL";
-            if (column.type === "smallint" || column.type === "int2")
-                c += " SMALLSERIAL";
-            if (column.type === "bigint" || column.type === "int8")
-                c += " BIGSERIAL";
+            if (column.generationStrategy === "identity") { // Postgres 10+ Identity generated column
+                c += " " + column.type + " GENERATED BY DEFAULT AS IDENTITY";
+            }
+            else { // classic SERIAL primary column
+                if (column.type === "integer" || column.type === "int" || column.type === "int4")
+                    c += " SERIAL";
+                if (column.type === "smallint" || column.type === "int2")
+                    c += " SMALLSERIAL";
+                if (column.type === "bigint" || column.type === "int8")
+                    c += " BIGSERIAL";
+            }
         }
         if (column.type === "enum" || column.type === "simple-enum") {
             c += " " + this.buildEnumName(table, column);
@@ -3077,16 +3260,23 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
         else if (!column.isGenerated || column.type === "uuid") {
             c += " " + this.connection.driver.createFullType(column);
         }
-        if (column.charset)
-            c += " CHARACTER SET \"" + column.charset + "\"";
-        if (column.collation)
-            c += " COLLATE \"" + column.collation + "\"";
-        if (column.isNullable !== true)
-            c += " NOT NULL";
-        if (column.default !== undefined && column.default !== null)
-            c += " DEFAULT " + column.default;
-        if (column.isGenerated && column.generationStrategy === "uuid" && !column.default)
-            c += " DEFAULT " + this.driver.uuidGenerator;
+        // CHARACTER SET, COLLATE, NOT NULL and DEFAULT do not exist on generated (virtual) columns
+        // Also, postgres only supports the stored generated column type
+        if (column.generatedType === "STORED" && column.asExpression) {
+            c += " GENERATED ALWAYS AS (" + column.asExpression + ") STORED";
+        }
+        else {
+            if (column.charset)
+                c += " CHARACTER SET \"" + column.charset + "\"";
+            if (column.collation)
+                c += " COLLATE \"" + column.collation + "\"";
+            if (column.isNullable !== true)
+                c += " NOT NULL";
+            if (column.default !== undefined && column.default !== null)
+                c += " DEFAULT " + column.default;
+            if (column.isGenerated && column.generationStrategy === "uuid" && !column.default)
+                c += " DEFAULT " + this.driver.uuidGenerator;
+        }
         return c;
     };
     /**