typeorm 1.1.1 → 1.1.2

package/driver/oracle/OracleQueryRunner.js

@@ -396,20 +396,23 @@ class OracleQueryRunner 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 && column.asExpression);
-        for (const column of generatedColumns) {
-            const insertQuery = this.insertTypeormMetadataSql({
-                table: table.name,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-                value: column.asExpression,
-            });
-            const deleteQuery = this.deleteTypeormMetadataSql({
-                table: table.name,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-            });
-            upQueries.push(insertQuery);
-            downQueries.push(deleteQuery);
+        if (generatedColumns.length > 0) {
+            const { tableName } = this.driver.parseTableName(table);
+            for (const column of generatedColumns) {
+                const insertQuery = this.insertTypeormMetadataSql({
+                    table: tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                const deleteQuery = this.deleteTypeormMetadataSql({
+                    table: tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                });
+                upQueries.push(insertQuery);
+                downQueries.push(deleteQuery);
+            }
         }
         await this.executeQueries(upQueries, downQueries);
     }
@@ -449,21 +452,26 @@ class OracleQueryRunner 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 deleteQuery = this.deleteTypeormMetadataSql({
-                table: table.name,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-            });
-            const insertQuery = this.insertTypeormMetadataSql({
-                table: table.name,
-                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 { tableName } = this.driver.parseTableName(table);
+            for (const column of generatedColumns) {
+                const deleteQuery = this.deleteTypeormMetadataSql({
+                    table: tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                });
+                upQueries.push(deleteQuery);
+                if (column.asExpression) {
+                    const insertQuery = this.insertTypeormMetadataSql({
+                        table: tableName,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: column.name,
+                        value: column.asExpression,
+                    });
+                    downQueries.push(insertQuery);
+                }
+            }
         }
         await this.executeQueries(upQueries, downQueries);
     }
@@ -523,6 +531,21 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // rename table
         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);
+        if (hasGeneratedColumns) {
+            const updateQuery = this.updateTypeormMetadataSql({
+                table: oldTableName,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                valueToSet: { table: newTableName },
+            });
+            const revertUpdateQuery = this.updateTypeormMetadataSql({
+                table: newTableName,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                valueToSet: { table: oldTableName },
+            });
+            upQueries.push(updateQuery);
+            downQueries.push(revertUpdateQuery);
+        }
         // rename primary key constraint
         if (newTable.primaryColumns.length > 0 &&
             !newTable.primaryColumns[0].primaryKeyConstraintName) {
@@ -636,14 +659,15 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${uniqueConstraint.name}"`));
         }
         if (column.generatedType && column.asExpression) {
+            const { tableName } = this.driver.parseTableName(table);
             const insertQuery = this.insertTypeormMetadataSql({
-                table: table.name,
+                table: tableName,
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
             const deleteQuery = this.deleteTypeormMetadataSql({
-                table: table.name,
+                table: tableName,
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
@@ -728,6 +752,23 @@ class OracleQueryRunner 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) {
+                    const { tableName } = this.driver.parseTableName(table);
+                    const updateQuery = this.updateTypeormMetadataSql({
+                        table: tableName,
+                        name: oldColumn.name,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        valueToSet: { name: newColumn.name },
+                    });
+                    const revertUpdateQuery = this.updateTypeormMetadataSql({
+                        table: tableName,
+                        name: newColumn.name,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        valueToSet: { name: oldColumn.name },
+                    });
+                    upQueries.push(updateQuery);
+                    downQueries.push(revertUpdateQuery);
+                }
                 // rename column primary key constraint
                 if (oldColumn.isPrimary === true &&
                     !oldColumn.primaryKeyConstraintName) {
@@ -983,20 +1024,23 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${column.name}"`));
         downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(column)}`));
-        if (column.generatedType && column.asExpression) {
+        if (column.generatedType) {
+            const { tableName } = this.driver.parseTableName(table);
             const deleteQuery = this.deleteTypeormMetadataSql({
-                table: table.name,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-            });
-            const insertQuery = this.insertTypeormMetadataSql({
-                table: table.name,
+                table: 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({
+                    table: tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                downQueries.push(insertQuery);
+            }
         }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.removeColumn(column);