typeorm 0.2.42-dev.e52b26c → 0.2.42-dev.f7c1f7d

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -1266,20 +1266,43 @@ 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" &&
-                            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))));
-                                upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
-                                downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                        if (oldColumn.isGenerated !== newColumn.isGenerated) {
+                            // if old column was "generated", we should clear defaults
+                            if (oldColumn.isGenerated) {
+                                if (oldColumn.generationStrategy === "uuid") {
+                                    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 " + this.driver.uuidGenerator));
+                                }
+                                else if (oldColumn.generationStrategy === "increment") {
+                                    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 nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
+                                    upQueries.push(new Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
+                                    downQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS " + this.escapePath(this.buildSequencePath(table, newColumn)) + " OWNED BY " + this.escapePath(table) + ".\"" + newColumn.name + "\""));
+                                }
                             }
-                            else {
-                                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 nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
-                                upQueries.push(new Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
-                                downQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS " + this.escapePath(this.buildSequencePath(table, newColumn)) + " OWNED BY " + this.escapePath(table) + ".\"" + newColumn.name + "\""));
+                            if (newColumn.generationStrategy === "uuid") {
+                                if (newColumn.isGenerated === true) {
+                                    upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + this.driver.uuidGenerator));
+                                    downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                                }
+                                else {
+                                    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 " + this.driver.uuidGenerator));
+                                }
+                            }
+                            else if (newColumn.generationStrategy === "increment") {
+                                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))));
+                                    upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
+                                    downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                                }
+                                else {
+                                    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 nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
+                                    upQueries.push(new Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
+                                    downQueries.push(new Query("CREATE SEQUENCE IF NOT EXISTS " + this.escapePath(this.buildSequencePath(table, newColumn)) + " OWNED BY " + this.escapePath(table) + ".\"" + newColumn.name + "\""));
+                                }
                             }
                         }
                         // the default might have changed when the enum changed
@@ -2224,7 +2247,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         index = indexOrName instanceof TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
                         if (!index)
-                            throw new TypeORMError("Supplied index was not found in table " + table.name);
+                            throw new TypeORMError("Supplied index " + indexOrName + " was not found in table " + table.name);
                         up = this.dropIndexSql(table, index);
                         down = this.createIndexSql(table, index);
                         return [4 /*yield*/, this.executeQueries(up, down)];
@@ -2708,7 +2731,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                 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\" "
+                                                                asExpressionQuery = "SELECT * FROM \"" + this.connection.metadataTableName + "\" "
                                                                     + (" WHERE \"table\" = '" + dbTable["table_name"] + "'")
                                                                     + (" AND \"name\" = '" + tableColumn.name + "'")
                                                                     + (" AND \"schema\" = '" + dbTable["table_schema"] + "'")
@@ -2786,6 +2809,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                 return new TableForeignKey({
                                                     name: dbForeignKey["constraint_name"],
                                                     columnNames: foreignKeys.map(function (dbFk) { return dbFk["column_name"]; }),
+                                                    referencedSchema: dbForeignKey["referenced_table_schema"],
                                                     referencedTableName: referencedTableName,
                                                     referencedColumnNames: foreignKeys.map(function (dbFk) { return dbFk["referenced_column_name"]; }),
                                                     onDelete: dbForeignKey["on_delete"],