typeorm 1.1.1 → 1.1.2

package/browser/driver/sqlserver/SqlServerQueryRunner.js

@@ -531,6 +531,7 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (generatedColumns.length > 0) {
             const parsedTableName = this.driver.parseTableName(table);
             parsedTableName.schema ??= await this.getCurrentSchema();
+            parsedTableName.database ??= await this.getCurrentDatabase();
             for (const column of generatedColumns) {
                 const insertQuery = this.insertTypeormMetadataSql({
                     database: parsedTableName.database,
@@ -589,10 +590,11 @@ class SqlServerQueryRunner 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);
+        const generatedColumns = table.columns.filter((column) => column.generatedType);
         if (generatedColumns.length > 0) {
             const parsedTableName = this.driver.parseTableName(table);
             parsedTableName.schema ??= await this.getCurrentSchema();
+            parsedTableName.database ??= await this.getCurrentDatabase();
             for (const column of generatedColumns) {
                 const deleteQuery = this.deleteTypeormMetadataSql({
                     database: parsedTableName.database,
@@ -601,16 +603,18 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                     name: column.name,
                 });
-                const insertQuery = this.insertTypeormMetadataSql({
-                    database: parsedTableName.database,
-                    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: parsedTableName.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);
@@ -670,21 +674,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             ? oldTableOrName
             : await this.getCachedTable(oldTableOrName);
         const newTable = oldTable.clone();
-        // we need database name and schema name to rename FK constraints
-        let dbName = undefined;
-        let schemaName = undefined;
-        let oldTableName = oldTable.name;
-        const splittedName = oldTable.name.split(".");
-        if (splittedName.length === 3) {
-            dbName = splittedName[0];
-            oldTableName = splittedName[2];
-            if (splittedName[1] !== "")
-                schemaName = splittedName[1];
-        }
-        else if (splittedName.length === 2) {
-            schemaName = splittedName[0];
-            oldTableName = splittedName[1];
-        }
+        let { tableName: oldTableName, database: dbName, schema: schemaName, } = this.driver.parseTableName(oldTable.name);
+        dbName ??= await this.getCurrentDatabase();
+        schemaName ??= await this.getCurrentSchema();
         newTable.name = this.driver.buildTableName(newTableName, schemaName, dbName);
         // if we have tables with database which differs from database specified in config, we must change currently used database.
         // This need because we can not rename objects from another database.
@@ -696,6 +688,25 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // rename table
         upQueries.push(new Query_1.Query(`EXEC sp_rename "${this.getTablePath(oldTable)}", "${newTableName}"`));
         downQueries.push(new Query_1.Query(`EXEC sp_rename "${this.getTablePath(newTable)}", "${oldTableName}"`));
+        const hasGeneratedColumns = oldTable.columns.some((col) => col.generatedType);
+        let updateMetadataQuery;
+        let revertMetadataQuery;
+        if (hasGeneratedColumns) {
+            updateMetadataQuery = this.updateTypeormMetadataSql({
+                database: dbName,
+                schema: schemaName,
+                table: oldTableName,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                valueToSet: { table: newTableName },
+            });
+            revertMetadataQuery = this.updateTypeormMetadataSql({
+                database: dbName,
+                schema: schemaName,
+                table: newTableName,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                valueToSet: { table: oldTableName },
+            });
+        }
         // rename primary key constraint
         if (newTable.primaryColumns.length > 0 &&
             !newTable.primaryColumns[0].primaryKeyConstraintName) {
@@ -753,6 +764,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(new Query_1.Query(`USE "${currentDB}"`));
             downQueries.push(new Query_1.Query(`USE "${dbName}"`));
         }
+        if (updateMetadataQuery)
+            upQueries.push(updateMetadataQuery);
+        if (revertMetadataQuery)
+            downQueries.push(revertMetadataQuery);
         await this.executeQueries(upQueries, downQueries);
         // rename old table and replace it in cached tabled;
         oldTable.name = newTable.name;
@@ -820,6 +835,7 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (column.generatedType && column.asExpression) {
             const parsedTableName = this.driver.parseTableName(table);
             parsedTableName.schema ??= await this.getCurrentSchema();
+            parsedTableName.database ??= await this.getCurrentDatabase();
             const insertQuery = this.insertTypeormMetadataSql({
                 database: parsedTableName.database,
                 schema: parsedTableName.schema,
@@ -914,17 +930,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         else {
             if (newColumn.name !== oldColumn.name) {
                 // we need database name and schema name to rename FK constraints
-                let dbName = undefined;
-                let schemaName = undefined;
-                const splittedName = table.name.split(".");
-                if (splittedName.length === 3) {
-                    dbName = splittedName[0];
-                    if (splittedName[1] !== "")
-                        schemaName = splittedName[1];
-                }
-                else if (splittedName.length === 2) {
-                    schemaName = splittedName[0];
-                }
+                let { database: dbName, schema: schemaName, tableName, } = this.driver.parseTableName(table);
+                schemaName ??= await this.getCurrentSchema();
+                dbName ??= await this.getCurrentDatabase();
                 // if we have tables with database which differs from database specified in config, we must change currently used database.
                 // This need because we can not rename objects from another database.
                 const currentDB = await this.getCurrentDatabase();
@@ -935,6 +943,26 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 // rename the column
                 upQueries.push(new Query_1.Query(`EXEC sp_rename "${this.getTablePath(table)}.${oldColumn.name}", "${newColumn.name}"`));
                 downQueries.push(new Query_1.Query(`EXEC sp_rename "${this.getTablePath(table)}.${newColumn.name}", "${oldColumn.name}"`));
+                let updateMetadataQuery;
+                let revertMetadataQuery;
+                if (oldColumn.generatedType) {
+                    updateMetadataQuery = this.updateTypeormMetadataSql({
+                        database: dbName,
+                        schema: schemaName,
+                        table: tableName,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: oldColumn.name,
+                        valueToSet: { name: newColumn.name },
+                    });
+                    revertMetadataQuery = this.updateTypeormMetadataSql({
+                        database: dbName,
+                        schema: schemaName,
+                        table: tableName,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: newColumn.name,
+                        valueToSet: { name: oldColumn.name },
+                    });
+                }
                 // rename column primary key constraint
                 if (oldColumn.isPrimary === true &&
                     !oldColumn.primaryKeyConstraintName) {
@@ -1028,6 +1056,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     upQueries.push(new Query_1.Query(`USE "${currentDB}"`));
                     downQueries.push(new Query_1.Query(`USE "${dbName}"`));
                 }
+                if (updateMetadataQuery)
+                    upQueries.push(updateMetadataQuery);
+                if (revertMetadataQuery)
+                    downQueries.push(revertMetadataQuery);
                 // rename old column in the Table object
                 const oldTableColumn = clonedTable.columns.find((column) => column.name === oldColumn.name);
                 clonedTable.columns[clonedTable.columns.indexOf(oldTableColumn)].name = newColumn.name;
@@ -1222,9 +1254,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${defaultName}"`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${defaultName}" DEFAULT ${column.default} FOR "${column.name}"`));
         }
-        if (column.generatedType && column.asExpression) {
+        if (column.generatedType) {
             const parsedTableName = this.driver.parseTableName(table);
             parsedTableName.schema ??= await this.getCurrentSchema();
+            parsedTableName.database ??= await this.getCurrentDatabase();
             const deleteQuery = this.deleteTypeormMetadataSql({
                 database: parsedTableName.database,
                 schema: parsedTableName.schema,
@@ -1232,16 +1265,18 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
-            const insertQuery = this.insertTypeormMetadataSql({
-                database: parsedTableName.database,
-                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: parsedTableName.database,
+                    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(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${column.name}"`));
         downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(table, column, false, false)}`));
@@ -1722,6 +1757,13 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     return this.query(dropTableSql);
                 }));
             }
+            if (database) {
+                const metadataTableName = this.getTypeormMetadataTableName();
+                const hasMetadataTable = await this.hasTable(metadataTableName);
+                if (hasMetadataTable) {
+                    await this.query(`DELETE FROM ${this.escapePath(metadataTableName)} WHERE "database" = @0`, [database]);
+                }
+            }
             if (!isAnotherTransactionActive)
                 await this.commitTransaction();
         }
@@ -1856,9 +1898,13 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .join("OR");
             return (`SELECT "COLUMNS".*, "cc"."is_persisted", "cc"."definition" ` +
                 `FROM "${TABLE_CATALOG}"."INFORMATION_SCHEMA"."COLUMNS" ` +
-                `LEFT JOIN "${TABLE_CATALOG}"."sys"."computed_columns" "cc" ON COL_NAME("cc"."object_id", "cc"."column_id") = "COLUMN_NAME" ` +
-                `AND OBJECT_NAME("cc"."object_id", DB_ID('${TABLE_CATALOG}')) = "TABLE_NAME" ` +
-                `AND OBJECT_SCHEMA_NAME("cc"."object_id", DB_ID('${TABLE_CATALOG}')) = "TABLE_SCHEMA" ` +
+                `LEFT JOIN "${TABLE_CATALOG}"."sys"."schemas" "ss" ON "ss"."name" = "TABLE_SCHEMA" ` +
+                `LEFT JOIN "${TABLE_CATALOG}"."sys"."tables" "st" ON "st"."name" = "TABLE_NAME" ` +
+                `AND "st"."schema_id" = "ss"."schema_id" ` +
+                `LEFT JOIN "${TABLE_CATALOG}"."sys"."columns" "sc" ON "sc"."object_id" = "st"."object_id" ` +
+                `AND "sc"."name" = "COLUMN_NAME" ` +
+                `LEFT JOIN "${TABLE_CATALOG}"."sys"."computed_columns" "cc" ON "cc"."object_id" = "sc"."object_id" ` +
+                `AND "cc"."column_id" = "sc"."column_id" ` +
                 `WHERE (${condition})`);
         })
             .join(" UNION ALL ");