typeorm 1.1.1 → 1.1.2

package/driver/postgres/PostgresQueryRunner.js

@@ -432,27 +432,28 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         // if table have column with generated type, we must add the expression to the metadata table
         const generatedColumns = table.columns.filter((column) => column.generatedType === "STORED" && column.asExpression);
-        for (const column of generatedColumns) {
-            const tableNameWithSchema = (await this.getTableNameWithSchema(table.name)).split(".");
-            const tableName = tableNameWithSchema[1];
-            const schema = tableNameWithSchema[0];
-            const insertQuery = this.insertTypeormMetadataSql({
-                database: this.driver.database,
-                schema,
-                table: tableName,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-                value: column.asExpression,
-            });
-            const deleteQuery = this.deleteTypeormMetadataSql({
-                database: this.driver.database,
-                schema,
-                table: tableName,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-            });
-            upQueries.push(insertQuery);
-            downQueries.push(deleteQuery);
+        if (generatedColumns.length > 0) {
+            const parsedTableName = this.driver.parseTableName(table);
+            parsedTableName.schema ??= await this.getCurrentSchema();
+            for (const column of generatedColumns) {
+                const insertQuery = this.insertTypeormMetadataSql({
+                    database: this.driver.database,
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                const deleteQuery = this.deleteTypeormMetadataSql({
+                    database: this.driver.database,
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                });
+                upQueries.push(insertQuery);
+                downQueries.push(deleteQuery);
+            }
         }
         upQueries.push(this.createTableSql(table, createForeignKeys));
         downQueries.push(this.dropTableSql(table));
@@ -508,28 +509,31 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         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_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-            });
-            const insertQuery = this.insertTypeormMetadataSql({
-                database: this.driver.database,
-                schema,
-                table: tableName,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-                value: column.asExpression,
-            });
-            upQueries.push(deleteQuery);
-            downQueries.push(insertQuery);
+        const generatedColumns = table.columns.filter((column) => column.generatedType);
+        if (generatedColumns.length > 0) {
+            const parsedTableName = this.driver.parseTableName(table);
+            parsedTableName.schema ??= await this.getCurrentSchema();
+            for (const column of generatedColumns) {
+                const deleteQuery = this.deleteTypeormMetadataSql({
+                    database: this.driver.database,
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                });
+                upQueries.push(deleteQuery);
+                if (column.asExpression) {
+                    const insertQuery = this.insertTypeormMetadataSql({
+                        database: this.driver.database,
+                        schema: parsedTableName.schema,
+                        table: parsedTableName.tableName,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: column.name,
+                        value: column.asExpression,
+                    });
+                    downQueries.push(insertQuery);
+                }
+            }
         }
         await this.executeQueries(upQueries, downQueries);
     }
@@ -588,12 +592,32 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             ? oldTableOrName
             : await this.getCachedTable(oldTableOrName);
         const newTable = oldTable.clone();
-        const { schema: schemaName, tableName: oldTableName } = this.driver.parseTableName(oldTable);
+        let { schema: schemaName, tableName: oldTableName } = this.driver.parseTableName(oldTable);
+        schemaName ??= await this.getCurrentSchema();
         newTable.name = schemaName
             ? `${schemaName}.${newTableName}`
             : newTableName;
         upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(oldTable)} RENAME TO "${newTableName}"`));
         downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME TO "${oldTableName}"`));
+        const hasGeneratedColumns = oldTable.columns.some((col) => col.generatedType === "STORED");
+        if (hasGeneratedColumns) {
+            const updateQuery = this.updateTypeormMetadataSql({
+                database: this.driver.database,
+                schema: schemaName,
+                table: oldTableName,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                valueToSet: { table: newTableName },
+            });
+            const revertUpdateQuery = this.updateTypeormMetadataSql({
+                database: this.driver.database,
+                schema: schemaName,
+                table: newTableName,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                valueToSet: { table: oldTableName },
+            });
+            upQueries.push(updateQuery);
+            downQueries.push(revertUpdateQuery);
+        }
         // rename column primary key constraint if it has default constraint name
         if (newTable.primaryColumns.length > 0 &&
             !newTable.primaryColumns[0].primaryKeyConstraintName) {
@@ -739,21 +763,20 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${uniqueConstraint.name}"`));
         }
         if (column.generatedType === "STORED" && column.asExpression) {
-            const tableNameWithSchema = (await this.getTableNameWithSchema(table.name)).split(".");
-            const tableName = tableNameWithSchema[1];
-            const schema = tableNameWithSchema[0];
+            const parsedTableName = this.driver.parseTableName(table);
+            parsedTableName.schema ??= await this.getCurrentSchema();
             const insertQuery = this.insertTypeormMetadataSql({
                 database: this.driver.database,
-                schema,
-                table: tableName,
+                schema: parsedTableName.schema,
+                table: parsedTableName.tableName,
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
             const deleteQuery = this.deleteTypeormMetadataSql({
                 database: this.driver.database,
-                schema,
-                table: tableName,
+                schema: parsedTableName.schema,
+                table: parsedTableName.tableName,
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
@@ -844,6 +867,28 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 // rename column
                 upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME COLUMN "${oldColumn.name}" TO "${newColumn.name}"`));
                 downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME COLUMN "${newColumn.name}" TO "${oldColumn.name}"`));
+                if (oldColumn.generatedType === "STORED") {
+                    const parsedTableName = this.driver.parseTableName(table);
+                    parsedTableName.schema ??= await this.getCurrentSchema();
+                    const updateQuery = this.updateTypeormMetadataSql({
+                        database: this.driver.database,
+                        schema: parsedTableName.schema,
+                        table: parsedTableName.tableName,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: oldColumn.name,
+                        valueToSet: { name: newColumn.name },
+                    });
+                    const revertUpdateQuery = this.updateTypeormMetadataSql({
+                        database: this.driver.database,
+                        schema: parsedTableName.schema,
+                        table: parsedTableName.tableName,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: newColumn.name,
+                        valueToSet: { name: oldColumn.name },
+                    });
+                    upQueries.push(updateQuery);
+                    downQueries.push(revertUpdateQuery);
+                }
                 // rename ENUM type
                 if (oldColumn.type === "enum" ||
                     oldColumn.type === "simple-enum") {
@@ -1169,25 +1214,24 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 if (!newColumn.generatedType ||
                     newColumn.generatedType === "VIRTUAL") {
                     // We can copy the generated data to the new column
-                    const tableNameWithSchema = (await this.getTableNameWithSchema(table.name)).split(".");
-                    const tableName = tableNameWithSchema[1];
-                    const schema = tableNameWithSchema[0];
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME COLUMN "${oldColumn.name}" TO "TEMP_OLD_${oldColumn.name}"`));
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(table, newColumn)}`));
                     upQueries.push(new Query_1.Query(`UPDATE ${this.escapePath(table)} SET "${newColumn.name}" = "TEMP_OLD_${oldColumn.name}"`));
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "TEMP_OLD_${oldColumn.name}"`));
+                    const parsedTableName = this.driver.parseTableName(table);
+                    parsedTableName.schema ??= await this.getCurrentSchema();
                     upQueries.push(this.deleteTypeormMetadataSql({
                         database: this.driver.database,
-                        schema,
-                        table: tableName,
+                        schema: parsedTableName.schema,
+                        table: parsedTableName.tableName,
                         type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                         name: oldColumn.name,
                     }));
                     // However, we can't copy it back on downgrade. It needs to regenerate.
                     downQueries.push(this.insertTypeormMetadataSql({
                         database: this.driver.database,
-                        schema,
-                        table: tableName,
+                        schema: parsedTableName.schema,
+                        table: parsedTableName.tableName,
                         type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                         name: oldColumn.name,
                         value: oldColumn.asExpression,
@@ -1304,26 +1348,27 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             }
         }
         if (column.generatedType === "STORED") {
-            const tableNameWithSchema = (await this.getTableNameWithSchema(table.name)).split(".");
-            const tableName = tableNameWithSchema[1];
-            const schema = tableNameWithSchema[0];
+            const parsedTableName = this.driver.parseTableName(table);
+            parsedTableName.schema ??= await this.getCurrentSchema();
             const deleteQuery = this.deleteTypeormMetadataSql({
                 database: this.driver.database,
-                schema,
-                table: tableName,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-            });
-            const insertQuery = this.insertTypeormMetadataSql({
-                database: this.driver.database,
-                schema,
-                table: tableName,
+                schema: parsedTableName.schema,
+                table: parsedTableName.tableName,
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
-                value: column.asExpression,
             });
             upQueries.push(deleteQuery);
-            downQueries.push(insertQuery);
+            if (column.asExpression) {
+                const insertQuery = this.insertTypeormMetadataSql({
+                    database: this.driver.database,
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                downQueries.push(insertQuery);
+            }
         }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.removeColumn(column);