typeorm 1.1.1 → 1.1.2

package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js

@@ -312,21 +312,23 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         upQueries.push(this.dropTableSql(table, ifExists));
         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);
+        const generatedColumns = table.columns.filter((column) => column.generatedType);
         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);
+            if (column.asExpression) {
+                const insertQuery = this.insertTypeormMetadataSql({
+                    table: table.name,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                downQueries.push(insertQuery);
+            }
         }
         await this.executeQueries(upQueries, downQueries);
     }
@@ -401,6 +403,20 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 return;
             index.name = this.dataSource.namingStrategy.indexName(newTable, index.columnNames, index.where);
         });
+        const hasGeneratedColumns = oldTable.columns.some((col) => col.generatedType);
+        if (hasGeneratedColumns) {
+            const updateQuery = this.updateTypeormMetadataSql({
+                table: oldTable.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                valueToSet: { table: newTable.name },
+            });
+            const revertUpdateQuery = this.updateTypeormMetadataSql({
+                table: newTable.name,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                valueToSet: { table: oldTable.name },
+            });
+            await this.executeQueries(updateQuery, revertUpdateQuery);
+        }
         // rename old table;
         oldTable.name = newTable.name;
         // recreate table with new constraint names
@@ -1589,7 +1605,6 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             // we should delete record from "typeorm_metadata" if generated column was removed
             // or it was changed to non-generated
             return (column.generatedType &&
-                column.asExpression &&
                 (!newTableColumn ||
                     (!newTableColumn.generatedType &&
                         !newTableColumn.asExpression)));
@@ -1600,14 +1615,16 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
-            const insertQuery = this.insertTypeormMetadataSql({
-                table: oldTable.name,
-                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: oldTable.name,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                downQueries.push(insertQuery);
+            }
         });
         // Step 2: add data for new generated columns
         newTable.columns
@@ -1631,7 +1648,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // Step 3: update changed expressions
         newTable.columns
-            .filter((column) => column.generatedType && column.asExpression)
+            .filter((column) => column.generatedType)
             .forEach((column) => {
             const oldColumn = oldTable.columns.find((c) => c.name === column.name &&
                 c.generatedType &&
@@ -1645,27 +1662,31 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: oldColumn.name,
             });
-            const insertQuery = this.insertTypeormMetadataSql({
-                table: newTable.name,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: column.name,
-                value: column.asExpression,
-            });
             upQueries.push(deleteQuery);
-            upQueries.push(insertQuery);
+            if (column.asExpression) {
+                const insertQuery = this.insertTypeormMetadataSql({
+                    table: newTable.name,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                upQueries.push(insertQuery);
+            }
             // revert update
-            const revertInsertQuery = this.insertTypeormMetadataSql({
-                table: newTable.name,
-                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
-                name: oldColumn.name,
-                value: oldColumn.asExpression,
-            });
+            if (oldColumn.asExpression) {
+                const revertInsertQuery = this.insertTypeormMetadataSql({
+                    table: newTable.name,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: oldColumn.name,
+                    value: oldColumn.asExpression,
+                });
+                downQueries.push(revertInsertQuery);
+            }
             const revertDeleteQuery = this.deleteTypeormMetadataSql({
                 table: oldTable.name,
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
-            downQueries.push(revertInsertQuery);
             downQueries.push(revertDeleteQuery);
         });
         await this.executeQueries(upQueries, downQueries);