typeorm 0.2.41 → 0.2.42-dev.02400da

package/driver/postgres/PostgresQueryRunner.js

@@ -1269,20 +1269,43 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                 downQueries.push(new Query_1.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_1.Query("CREATE SEQUENCE IF NOT EXISTS " + this.escapePath(this.buildSequencePath(table, newColumn)) + " OWNED BY " + this.escapePath(table) + ".\"" + newColumn.name + "\""));
-                                downQueries.push(new Query_1.Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
-                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
-                                downQueries.push(new Query_1.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_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + oldColumn.name + "\" DROP DEFAULT"));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + oldColumn.name + "\" SET DEFAULT " + this.driver.uuidGenerator));
+                                }
+                                else if (oldColumn.generationStrategy === "increment") {
+                                    upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
+                                    upQueries.push(new Query_1.Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
+                                    downQueries.push(new Query_1.Query("CREATE SEQUENCE IF NOT EXISTS " + this.escapePath(this.buildSequencePath(table, newColumn)) + " OWNED BY " + this.escapePath(table) + ".\"" + newColumn.name + "\""));
+                                }
                             }
-                            else {
-                                upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
-                                downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
-                                upQueries.push(new Query_1.Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
-                                downQueries.push(new Query_1.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_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + this.driver.uuidGenerator));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                                }
+                                else {
+                                    upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT " + this.driver.uuidGenerator));
+                                }
+                            }
+                            else if (newColumn.generationStrategy === "increment") {
+                                if (newColumn.isGenerated === true) {
+                                    upQueries.push(new Query_1.Query("CREATE SEQUENCE IF NOT EXISTS " + this.escapePath(this.buildSequencePath(table, newColumn)) + " OWNED BY " + this.escapePath(table) + ".\"" + newColumn.name + "\""));
+                                    downQueries.push(new Query_1.Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
+                                    upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                                }
+                                else {
+                                    upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" DROP DEFAULT"));
+                                    downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ALTER COLUMN \"" + newColumn.name + "\" SET DEFAULT nextval('" + this.escapePath(this.buildSequencePath(table, newColumn)) + "')"));
+                                    upQueries.push(new Query_1.Query("DROP SEQUENCE " + this.escapePath(this.buildSequencePath(table, newColumn))));
+                                    downQueries.push(new Query_1.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
@@ -2227,7 +2250,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         index = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
                         if (!index)
-                            throw new error_1.TypeORMError("Supplied index was not found in table " + table.name);
+                            throw new error_1.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)];
@@ -2687,6 +2710,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                                 if (dbColumn.is_identity === "YES") { // Postgres 10+ Identity column
                                                                     tableColumn.isGenerated = true;
                                                                     tableColumn.generationStrategy = "identity";
+                                                                    tableColumn.generatedIdentity = dbColumn.identity_generation;
                                                                 }
                                                                 else if (dbColumn["column_default"] !== null && dbColumn["column_default"] !== undefined) {
                                                                     serialDefaultName = "nextval('" + this.buildSequenceName(table, dbColumn["column_name"]) + "'::regclass)";
@@ -2711,7 +2735,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"] + "'")
@@ -2749,7 +2773,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                 var uniques = dbConstraints.filter(function (dbC) { return dbC["constraint_name"] === constraint["constraint_name"]; });
                                                 return new TableUnique_1.TableUnique({
                                                     name: constraint["constraint_name"],
-                                                    columnNames: uniques.map(function (u) { return u["column_name"]; })
+                                                    columnNames: uniques.map(function (u) { return u["column_name"]; }),
+                                                    deferrable: constraint["deferrable"] ? constraint["deferred"] : undefined,
                                                 });
                                             });
                                             tableCheckConstraints = OrmUtils_1.OrmUtils.uniq(dbConstraints.filter(function (dbConstraint) {
@@ -2788,6 +2813,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                                                 return new TableForeignKey_1.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"],
@@ -2844,7 +2870,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
             var uniquesSql = table.uniques.map(function (unique) {
                 var uniqueName = unique.name ? unique.name : _this.connection.namingStrategy.uniqueConstraintName(table, unique.columnNames);
                 var columnNames = unique.columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
-                return "CONSTRAINT \"" + uniqueName + "\" UNIQUE (" + columnNames + ")";
+                var constraint = "CONSTRAINT \"" + uniqueName + "\" UNIQUE (" + columnNames + ")";
+                if (unique.deferrable)
+                    constraint += " DEFERRABLE " + unique.deferrable;
+                return constraint;
             }).join(", ");
             sql += ", " + uniquesSql;
         }
@@ -3076,7 +3105,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.createUniqueConstraintSql = function (table, uniqueConstraint) {
         var columnNames = uniqueConstraint.columnNames.map(function (column) { return "\"" + column + "\""; }).join(", ");
-        return new Query_1.Query("ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + uniqueConstraint.name + "\" UNIQUE (" + columnNames + ")");
+        var sql = "ALTER TABLE " + this.escapePath(table) + " ADD CONSTRAINT \"" + uniqueConstraint.name + "\" UNIQUE (" + columnNames + ")";
+        if (uniqueConstraint.deferrable)
+            sql += " DEFERRABLE " + uniqueConstraint.deferrable;
+        return new Query_1.Query(sql);
     };
     /**
      * Builds drop unique constraint sql.
@@ -3245,7 +3277,8 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
         var c = "\"" + column.name + "\"";
         if (column.isGenerated === true && column.generationStrategy !== "uuid") {
             if (column.generationStrategy === "identity") { // Postgres 10+ Identity generated column
-                c += " " + column.type + " GENERATED BY DEFAULT AS IDENTITY";
+                var generatedIdentityOrDefault = column.generatedIdentity || "BY DEFAULT";
+                c += " " + column.type + " GENERATED " + generatedIdentityOrDefault + " AS IDENTITY";
             }
             else { // classic SERIAL primary column
                 if (column.type === "integer" || column.type === "int" || column.type === "int4")