typeorm 0.3.6-dev.1197d1d → 0.3.6-dev.2d8afbe

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -386,7 +386,6 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                 type: MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
-            upQueries.push(deleteQuery);
             upQueries.push(insertQuery);
             downQueries.push(deleteQuery);
         }
@@ -434,6 +433,30 @@ export class PostgresQueryRunner extends BaseQueryRunner {
             table.foreignKeys.forEach((foreignKey) => upQueries.push(this.dropForeignKeySql(table, foreignKey)));
         upQueries.push(this.dropTableSql(table));
         downQueries.push(this.createTableSql(table, createForeignKeys));
+        // if table had columns with generated type, we must remove the expression from the metadata table
+        const generatedColumns = table.columns.filter((column) => column.generatedType && column.asExpression);
+        for (const column of generatedColumns) {
+            const tableNameWithSchema = (await this.getTableNameWithSchema(table.name)).split(".");
+            const tableName = tableNameWithSchema[1];
+            const schema = tableNameWithSchema[0];
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                database: this.driver.database,
+                schema,
+                table: tableName,
+                type: MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            const insertQuery = this.insertTypeormMetadataSql({
+                database: this.driver.database,
+                schema,
+                table: tableName,
+                type: MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+                value: column.asExpression,
+            });
+            upQueries.push(deleteQuery);
+            downQueries.push(insertQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -623,7 +646,6 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                 type: MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
-            upQueries.push(deleteQuery);
             upQueries.push(insertQuery);
             downQueries.push(deleteQuery);
         }
@@ -994,15 +1016,6 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                         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,
-                        table: tableName,
-                        type: MetadataTableType.GENERATED_COLUMN,
-                        name: newColumn.name,
-                    }));
                     downQueries.push(this.insertTypeormMetadataSql({
                         database: this.driver.database,
                         schema,
@@ -1011,6 +1024,17 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                         name: oldColumn.name,
                         value: oldColumn.asExpression,
                     }));
+                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(table, oldColumn)}`));
+                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${newColumn.name}"`));
+                    // downQueries.push(
+                    //     this.deleteTypeormMetadataSql({
+                    //         database: this.driver.database,
+                    //         schema,
+                    //         table: tableName,
+                    //         type: MetadataTableType.GENERATED_COLUMN,
+                    //         name: newColumn.name,
+                    //     }),
+                    // )
                 }
             }
         }
@@ -1102,14 +1126,14 @@ export class PostgresQueryRunner extends BaseQueryRunner {
             const tableNameWithSchema = (await this.getTableNameWithSchema(table.name)).split(".");
             const tableName = tableNameWithSchema[1];
             const schema = tableNameWithSchema[0];
-            const insertQuery = this.deleteTypeormMetadataSql({
+            const deleteQuery = this.deleteTypeormMetadataSql({
                 database: this.driver.database,
                 schema,
                 table: tableName,
                 type: MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
-            const deleteQuery = this.insertTypeormMetadataSql({
+            const insertQuery = this.insertTypeormMetadataSql({
                 database: this.driver.database,
                 schema,
                 table: tableName,
@@ -1117,8 +1141,8 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                 name: column.name,
                 value: column.asExpression,
             });
-            upQueries.push(insertQuery);
-            downQueries.push(deleteQuery);
+            upQueries.push(deleteQuery);
+            downQueries.push(insertQuery);
         }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.removeColumn(column);
@@ -1867,13 +1891,14 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                     // In postgres there is no VIRTUAL generated column type
                     tableColumn.generatedType = "STORED";
                     // We cannot relay on information_schema.columns.generation_expression, because it is formatted different.
-                    const asExpressionQuery = `SELECT * FROM "${this.connection.metadataTableName}" ` +
-                        ` WHERE "table" = '${dbTable["table_name"]}'` +
-                        ` AND "name" = '${tableColumn.name}'` +
-                        ` AND "schema" = '${dbTable["table_schema"]}'` +
-                        ` AND "database" = '${this.driver.database}'` +
-                        ` AND "type" = '${MetadataTableType.GENERATED_COLUMN}'`;
-                    const results = await this.query(asExpressionQuery);
+                    const asExpressionQuery = await this.selectTypeormMetadataSql({
+                        database: currentDatabase,
+                        schema: dbTable["table_schema"],
+                        table: dbTable["table_name"],
+                        type: MetadataTableType.GENERATED_COLUMN,
+                        name: tableColumn.name,
+                    });
+                    const results = await this.query(asExpressionQuery.query, asExpressionQuery.parameters);
                     if (results[0] && results[0].value) {
                         tableColumn.asExpression = results[0].value;
                     }
@@ -2446,25 +2471,22 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         else if (!column.isGenerated || column.type === "uuid") {
             c += " " + this.connection.driver.createFullType(column);
         }
-        // CHARACTER SET, COLLATE, NOT NULL and DEFAULT do not exist on generated (virtual) columns
-        // Also, postgres only supports the stored generated column type
+        // 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}`;
-        }
+        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;
     }
     /**