npm - typeorm - Versions diffs - 1.1.1 → 1.1.2 - Mend

typeorm 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (66) hide show

package/browser/driver/sap/SapQueryRunner.js CHANGED Viewed

@@ -520,7 +520,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (dropForeignKeys)
             table.foreignKeys.forEach((foreignKey) => upQueries.push(this.dropForeignKeySql(table, foreignKey)));
         // if table has column with generated type, we must add the expression to the metadata table
-        const generatedColumns = table.columns.filter((column) => column.asExpression);
+        const generatedColumns = table.columns.filter((column) => column.asExpression != null);
         if (generatedColumns.length > 0) {
             const parsedTableName = this.driver.parseTableName(table);
             parsedTableName.schema ??= await this.getCurrentSchema();
@@ -531,15 +531,17 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                     name: column.name,
                 });
-                const insertQuery = this.insertTypeormMetadataSql({
-                    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({
+                        schema: parsedTableName.schema,
+                        table: parsedTableName.tableName,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: column.name,
+                        value: column.asExpression,
+                    });
+                    downQueries.push(insertQuery);
+                }
             }
         }
         upQueries.push(this.dropTableSql(table));
@@ -605,7 +607,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // rename table
         upQueries.push(new Query_1.Query(`RENAME TABLE ${this.escapePath(oldTable)} TO ${this.escapePath(newTable)}`));
         downQueries.push(new Query_1.Query(`RENAME TABLE ${this.escapePath(newTable)} TO ${this.escapePath(oldTable)}`));
-        const hasGeneratedColumns = oldTable.columns.some((col) => col.asExpression);
+        const hasGeneratedColumns = oldTable.columns.some((col) => col.asExpression != null);
         if (hasGeneratedColumns) {
             const schema = schemaName ?? (await this.getCurrentSchema());
             const updateQuery = this.updateTypeormMetadataSql({
@@ -930,7 +932,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} ADD CONSTRAINT "${newPkName}" PRIMARY KEY (${columnNamesString})`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} DROP CONSTRAINT "${newPkName}"`));
                 }
-                if (oldColumn.asExpression) {
+                if (oldColumn.asExpression != null) {
                     const parsedTableName = this.driver.parseTableName(table);
                     parsedTableName.schema ??= await this.getCurrentSchema();
                     const updateQuery = this.updateTypeormMetadataSql({
@@ -1220,22 +1222,24 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(this.dropCheckConstraintSql(table, columnCheck));
             downQueries.push(this.createCheckConstraintSql(table, columnCheck));
         }
-        if (column.asExpression) {
+        if (column.asExpression != null) {
             const deleteQuery = this.deleteTypeormMetadataSql({
                 schema: parsedTableName.schema,
                 table: parsedTableName.tableName,
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
-            const insertQuery = this.insertTypeormMetadataSql({
-                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({
+                    schema: parsedTableName.schema,
+                    table: parsedTableName.tableName,
+                    type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                    name: column.name,
+                    value: column.asExpression,
+                });
+                downQueries.push(insertQuery);
+            }
         }
         upQueries.push(new Query_1.Query(this.dropColumnSql(table, column)));
         downQueries.push(new Query_1.Query(this.addColumnSql(table, column)));