typeorm 0.3.6-dev.9d331b1 → 0.3.6-dev.bbdc20f

package/driver/sqlserver/SqlServerQueryRunner.js

@@ -457,6 +457,31 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 downQueries.push(this.dropIndexSql(table, index));
             });
         }
+        // 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 parsedTableName = this.driver.parseTableName(table);
+            if (!parsedTableName.schema) {
+                parsedTableName.schema = await this.getCurrentSchema();
+            }
+            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,
+            });
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                database: parsedTableName.database,
+                schema: parsedTableName.schema,
+                table: parsedTableName.tableName,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            upQueries.push(insertQuery);
+            downQueries.push(deleteQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -489,6 +514,31 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             table.foreignKeys.forEach((foreignKey) => upQueries.push(this.dropForeignKeySql(table, foreignKey)));
         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 parsedTableName = this.driver.parseTableName(table);
+            if (!parsedTableName.schema) {
+                parsedTableName.schema = await this.getCurrentSchema();
+            }
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                database: parsedTableName.database,
+                schema: parsedTableName.schema,
+                table: parsedTableName.tableName,
+                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);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -554,7 +604,8 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         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}"`));
         // rename primary key constraint
-        if (newTable.primaryColumns.length > 0) {
+        if (newTable.primaryColumns.length > 0 &&
+            !newTable.primaryColumns[0].primaryKeyConstraintName) {
             const columnNames = newTable.primaryColumns.map((column) => column.name);
             const oldPkName = this.connection.namingStrategy.primaryKeyName(oldTable, columnNames);
             const newPkName = this.connection.namingStrategy.primaryKeyName(newTable, columnNames);
@@ -564,6 +615,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         // rename unique constraints
         newTable.uniques.forEach((unique) => {
+            const oldUniqueName = this.connection.namingStrategy.uniqueConstraintName(oldTable, unique.columnNames);
+            // Skip renaming if Unique has user defined constraint name
+            if (unique.name !== oldUniqueName)
+                return;
             // build new constraint name
             const newUniqueName = this.connection.namingStrategy.uniqueConstraintName(newTable, unique.columnNames);
             // build queries
@@ -574,6 +629,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // rename index constraints
         newTable.indices.forEach((index) => {
+            const oldIndexName = this.connection.namingStrategy.indexName(oldTable, index.columnNames, index.where);
+            // Skip renaming if Index has user defined constraint name
+            if (index.name !== oldIndexName)
+                return;
             // build new constraint name
             const newIndexName = this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
             // build queries
@@ -584,6 +643,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // rename foreign key constraints
         newTable.foreignKeys.forEach((foreignKey) => {
+            const oldForeignKeyName = this.connection.namingStrategy.foreignKeyName(oldTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            // Skip renaming if foreign key has user defined constraint name
+            if (foreignKey.name !== oldForeignKeyName)
+                return;
             // build new constraint name
             const newForeignKeyName = this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
             // build queries
@@ -619,7 +682,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             const primaryColumns = clonedTable.primaryColumns;
             // if table already have primary key, me must drop it and recreate again
             if (primaryColumns.length > 0) {
-                const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                const pkName = primaryColumns[0].primaryKeyConstraintName
+                    ? primaryColumns[0].primaryKeyConstraintName
+                    : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                 const columnNames = primaryColumns
                     .map((column) => `"${column.name}"`)
                     .join(", ");
@@ -627,7 +692,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
             }
             primaryColumns.push(column);
-            const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+            const pkName = primaryColumns[0].primaryKeyConstraintName
+                ? primaryColumns[0].primaryKeyConstraintName
+                : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
             const columnNames = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -656,6 +723,29 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             const defaultName = this.connection.namingStrategy.defaultConstraintName(table, column.name);
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${defaultName}"`));
         }
+        if (column.generatedType && column.asExpression) {
+            const parsedTableName = this.driver.parseTableName(table);
+            if (!parsedTableName.schema) {
+                parsedTableName.schema = await this.getCurrentSchema();
+            }
+            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,
+            });
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                database: parsedTableName.database,
+                schema: parsedTableName.schema,
+                table: parsedTableName.tableName,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            upQueries.push(insertQuery);
+            downQueries.push(deleteQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.addColumn(column);
         this.replaceCachedTable(table, clonedTable);
@@ -708,7 +798,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if ((newColumn.isGenerated !== oldColumn.isGenerated &&
             newColumn.generationStrategy !== "uuid") ||
             newColumn.type !== oldColumn.type ||
-            newColumn.length !== oldColumn.length) {
+            newColumn.length !== oldColumn.length ||
+            newColumn.asExpression !== oldColumn.asExpression ||
+            newColumn.generatedType !== oldColumn.generatedType) {
             // SQL Server does not support changing of IDENTITY column, so we must drop column and recreate it again.
             // Also, we recreate column if column type changed
             await this.dropColumn(table, oldColumn);
@@ -740,7 +832,9 @@ 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}"`));
-                if (oldColumn.isPrimary === true) {
+                // rename column primary key constraint
+                if (oldColumn.isPrimary === true &&
+                    !oldColumn.primaryKeyConstraintName) {
                     const primaryColumns = clonedTable.primaryColumns;
                     // build old primary constraint name
                     const columnNames = primaryColumns.map((column) => column.name);
@@ -756,6 +850,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 }
                 // rename index constraints
                 clonedTable.findColumnIndices(oldColumn).forEach((index) => {
+                    const oldIndexName = this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
+                    // Skip renaming if Index has user defined constraint name
+                    if (index.name !== oldIndexName)
+                        return;
                     // build new constraint name
                     index.columnNames.splice(index.columnNames.indexOf(oldColumn.name), 1);
                     index.columnNames.push(newColumn.name);
@@ -770,6 +868,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 clonedTable
                     .findColumnForeignKeys(oldColumn)
                     .forEach((foreignKey) => {
+                    const foreignKeyName = this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+                    // Skip renaming if foreign key has user defined constraint name
+                    if (foreignKey.name !== foreignKeyName)
+                        return;
                     // build new constraint name
                     foreignKey.columnNames.splice(foreignKey.columnNames.indexOf(oldColumn.name), 1);
                     foreignKey.columnNames.push(newColumn.name);
@@ -794,6 +896,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 });
                 // rename unique constraints
                 clonedTable.findColumnUniques(oldColumn).forEach((unique) => {
+                    const oldUniqueName = this.connection.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
+                    // Skip renaming if Unique has user defined constraint name
+                    if (unique.name !== oldUniqueName)
+                        return;
                     // build new constraint name
                     unique.columnNames.splice(unique.columnNames.indexOf(oldColumn.name), 1);
                     unique.columnNames.push(newColumn.name);
@@ -832,7 +938,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const primaryColumns = clonedTable.primaryColumns;
                 // if primary column state changed, we must always drop existed constraint.
                 if (primaryColumns.length > 0) {
-                    const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                    const pkName = primaryColumns[0].primaryKeyConstraintName
+                        ? primaryColumns[0].primaryKeyConstraintName
+                        : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                     const columnNames = primaryColumns
                         .map((column) => `"${column.name}"`)
                         .join(", ");
@@ -844,7 +952,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     // update column in table
                     const column = clonedTable.columns.find((column) => column.name === newColumn.name);
                     column.isPrimary = true;
-                    const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                    const pkName = primaryColumns[0].primaryKeyConstraintName
+                        ? primaryColumns[0].primaryKeyConstraintName
+                        : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                     const columnNames = primaryColumns
                         .map((column) => `"${column.name}"`)
                         .join(", ");
@@ -859,7 +969,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     column.isPrimary = false;
                     // if we have another primary keys, we must recreate constraint.
                     if (primaryColumns.length > 0) {
-                        const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                        const pkName = primaryColumns[0]
+                            .primaryKeyConstraintName
+                            ? primaryColumns[0].primaryKeyConstraintName
+                            : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                         const columnNames = primaryColumns
                             .map((column) => `"${column.name}"`)
                             .join(", ");
@@ -932,7 +1045,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const downQueries = [];
         // drop primary key constraint
         if (column.isPrimary) {
-            const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
+            const pkName = column.primaryKeyConstraintName
+                ? column.primaryKeyConstraintName
+                : this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
             const columnNames = clonedTable.primaryColumns
                 .map((primaryColumn) => `"${primaryColumn.name}"`)
                 .join(", ");
@@ -943,7 +1058,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             tableColumn.isPrimary = false;
             // if primary key have multiple columns, we must recreate it without dropped column
             if (clonedTable.primaryColumns.length > 0) {
-                const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
+                const pkName = clonedTable.primaryColumns[0]
+                    .primaryKeyConstraintName
+                    ? clonedTable.primaryColumns[0].primaryKeyConstraintName
+                    : this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
                 const columnNames = clonedTable.primaryColumns
                     .map((primaryColumn) => `"${primaryColumn.name}"`)
                     .join(", ");
@@ -982,6 +1100,29 @@ 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) {
+            const parsedTableName = this.driver.parseTableName(table);
+            if (!parsedTableName.schema) {
+                parsedTableName.schema = await this.getCurrentSchema();
+            }
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                database: parsedTableName.database,
+                schema: parsedTableName.schema,
+                table: parsedTableName.tableName,
+                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);
+        }
         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)}`));
         await this.executeQueries(upQueries, downQueries);
@@ -999,12 +1140,12 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Creates a new primary key.
      */
-    async createPrimaryKey(tableOrName, columnNames) {
+    async createPrimaryKey(tableOrName, columnNames, constraintName) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const clonedTable = table.clone();
-        const up = this.createPrimaryKeySql(table, columnNames);
+        const up = this.createPrimaryKeySql(table, columnNames, constraintName);
         // mark columns as primary, because dropPrimaryKeySql build constraint name from table primary column names.
         clonedTable.columns.forEach((column) => {
             if (columnNames.find((columnName) => columnName === column.name))
@@ -1028,7 +1169,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // if table already have primary columns, we must drop them.
         const primaryColumns = clonedTable.primaryColumns;
         if (primaryColumns.length > 0) {
-            const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+            const pkName = primaryColumns[0].primaryKeyConstraintName
+                ? primaryColumns[0].primaryKeyConstraintName
+                : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
             const columnNamesString = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -1039,7 +1182,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         clonedTable.columns
             .filter((column) => columnNames.indexOf(column.name) !== -1)
             .forEach((column) => (column.isPrimary = true));
-        const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+        const pkName = primaryColumns[0].primaryKeyConstraintName
+            ? primaryColumns[0].primaryKeyConstraintName
+            : this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
         const columnNamesString = columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
@@ -1051,12 +1196,12 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Drops a primary key.
      */
-    async dropPrimaryKey(tableOrName) {
+    async dropPrimaryKey(tableOrName, constraintName) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const up = this.dropPrimaryKeySql(table);
-        const down = this.createPrimaryKeySql(table, table.primaryColumns.map((column) => column.name));
+        const down = this.createPrimaryKeySql(table, table.primaryColumns.map((column) => column.name), constraintName);
         await this.executeQueries(up, down);
         table.primaryColumns.forEach((column) => {
             column.isPrimary = false;
@@ -1430,12 +1575,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const currentDatabase = await this.getCurrentDatabase();
         const dbTables = [];
         if (!tableNames) {
-            const databasesSql = `
-                SELECT DISTINCT
-                    "name"
-                FROM "master"."dbo"."sysdatabases"
-                WHERE "name" NOT IN ('master', 'model', 'msdb')
-            `;
+            const databasesSql = `SELECT DISTINCT "name" ` +
+                `FROM "master"."dbo"."sysdatabases" ` +
+                `WHERE "name" NOT IN ('master', 'model', 'msdb')`;
             const dbDatabases = await this.query(databasesSql);
             const tablesSql = dbDatabases
                 .map(({ name }) => {
@@ -1500,7 +1642,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             const condition = tables
                 .map(({ TABLE_SCHEMA, TABLE_NAME }) => `("TABLE_SCHEMA" = '${TABLE_SCHEMA}' AND "TABLE_NAME" = '${TABLE_NAME}')`)
                 .join("OR");
-            return `SELECT * FROM "${TABLE_CATALOG}"."INFORMATION_SCHEMA"."COLUMNS" WHERE (${condition})`;
+            return (`SELECT "COLUMNS".*, "cc"."is_persisted", "cc"."definition" ` +
+                `FROM "${TABLE_CATALOG}"."INFORMATION_SCHEMA"."COLUMNS" ` +
+                `LEFT JOIN "sys"."computed_columns" "cc" ON COL_NAME("cc"."object_id", "cc"."column_id") = "column_name" ` +
+                `WHERE (${condition})`);
         })
             .join(" UNION ALL ");
         const constraintsSql = Object.entries(dbTablesByCatalog)
@@ -1600,13 +1745,14 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             table.name = this.driver.buildTableName(dbTable["TABLE_NAME"], schema, db);
             const defaultCollation = dbCollations.find((dbCollation) => dbCollation["NAME"] === dbTable["TABLE_CATALOG"]);
             // create columns from the loaded columns
-            table.columns = dbColumns
-                .filter((dbColumn) => dbColumn["TABLE_NAME"] === dbTable["TABLE_NAME"] &&
+            table.columns = await Promise.all(dbColumns
+                .filter((dbColumn) => dbColumn["TABLE_NAME"] ===
+                dbTable["TABLE_NAME"] &&
                 dbColumn["TABLE_SCHEMA"] ===
                     dbTable["TABLE_SCHEMA"] &&
                 dbColumn["TABLE_CATALOG"] ===
                     dbTable["TABLE_CATALOG"])
-                .map((dbColumn) => {
+                .map(async (dbColumn) => {
                 const columnConstraints = dbConstraints.filter((dbConstraint) => dbConstraint["TABLE_NAME"] ===
                     dbColumn["TABLE_NAME"] &&
                     dbConstraint["TABLE_SCHEMA"] ===
@@ -1628,7 +1774,6 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         dbConstraint["COLUMN_NAME"] !==
                             dbColumn["COLUMN_NAME"]);
                 });
-                const isPrimary = !!columnConstraints.find((constraint) => constraint["CONSTRAINT_TYPE"] === "PRIMARY KEY");
                 const isGenerated = !!dbIdentityColumns.find((column) => column["TABLE_NAME"] ===
                     dbColumn["TABLE_NAME"] &&
                     column["TABLE_SCHEMA"] ===
@@ -1639,7 +1784,8 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         dbColumn["COLUMN_NAME"]);
                 const tableColumn = new TableColumn_1.TableColumn();
                 tableColumn.name = dbColumn["COLUMN_NAME"];
-                tableColumn.type = dbColumn["DATA_TYPE"].toLowerCase();
+                tableColumn.type =
+                    dbColumn["DATA_TYPE"].toLowerCase();
                 // check only columns that have length property
                 if (this.driver.withLengthColumnTypes.indexOf(tableColumn.type) !== -1 &&
                     dbColumn["CHARACTER_MAXIMUM_LENGTH"]) {
@@ -1662,7 +1808,8 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                             dbColumn["NUMERIC_PRECISION"];
                     if (dbColumn["NUMERIC_SCALE"] !== null &&
                         !this.isDefaultColumnScale(table, tableColumn, dbColumn["NUMERIC_SCALE"]))
-                        tableColumn.scale = dbColumn["NUMERIC_SCALE"];
+                        tableColumn.scale =
+                            dbColumn["NUMERIC_SCALE"];
                 }
                 if (tableColumn.type === "nvarchar") {
                     // Check if this is an enum
@@ -1687,6 +1834,33 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         }
                     }
                 }
+                const primaryConstraint = columnConstraints.find((constraint) => constraint["CONSTRAINT_TYPE"] ===
+                    "PRIMARY KEY");
+                if (primaryConstraint) {
+                    tableColumn.isPrimary = true;
+                    // find another columns involved in primary key constraint
+                    const anotherPrimaryConstraints = dbConstraints.filter((constraint) => constraint["TABLE_NAME"] ===
+                        dbColumn["TABLE_NAME"] &&
+                        constraint["TABLE_SCHEMA"] ===
+                            dbColumn["TABLE_SCHEMA"] &&
+                        constraint["TABLE_CATALOG"] ===
+                            dbColumn["TABLE_CATALOG"] &&
+                        constraint["COLUMN_NAME"] !==
+                            dbColumn["COLUMN_NAME"] &&
+                        constraint["CONSTRAINT_TYPE"] ===
+                            "PRIMARY KEY");
+                    // collect all column names
+                    const columnNames = anotherPrimaryConstraints.map((constraint) => constraint["COLUMN_NAME"]);
+                    columnNames.push(dbColumn["COLUMN_NAME"]);
+                    // build default primary key constraint name
+                    const pkName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
+                    // if primary key has user-defined constraint name, write it in table column
+                    if (primaryConstraint["CONSTRAINT_NAME"] !==
+                        pkName) {
+                        tableColumn.primaryKeyConstraintName =
+                            primaryConstraint["CONSTRAINT_NAME"];
+                    }
+                }
                 tableColumn.default =
                     dbColumn["COLUMN_DEFAULT"] !== null &&
                         dbColumn["COLUMN_DEFAULT"] !== undefined
@@ -1694,7 +1868,6 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         : undefined;
                 tableColumn.isNullable =
                     dbColumn["IS_NULLABLE"] === "YES";
-                tableColumn.isPrimary = isPrimary;
                 tableColumn.isUnique =
                     uniqueConstraints.length > 0 &&
                         !isConstraintComposite;
@@ -1722,8 +1895,31 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                             ? dbColumn["DATETIME_PRECISION"]
                             : undefined;
                 }
+                if (dbColumn["is_persisted"] !== null &&
+                    dbColumn["is_persisted"] !== undefined &&
+                    dbColumn["definition"]) {
+                    tableColumn.generatedType =
+                        dbColumn["is_persisted"] === true
+                            ? "STORED"
+                            : "VIRTUAL";
+                    // We cannot relay on information_schema.columns.generation_expression, because it is formatted different.
+                    const asExpressionQuery = await this.selectTypeormMetadataSql({
+                        database: dbTable["TABLE_CATALOG"],
+                        schema: dbTable["TABLE_SCHEMA"],
+                        table: dbTable["TABLE_NAME"],
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
+                        name: tableColumn.name,
+                    });
+                    const results = await this.query(asExpressionQuery.query, asExpressionQuery.parameters);
+                    if (results[0] && results[0].value) {
+                        tableColumn.asExpression = results[0].value;
+                    }
+                    else {
+                        tableColumn.asExpression = "";
+                    }
+                }
                 return tableColumn;
-            });
+            }));
             // find unique constraints of table, group them by constraint name and build TableUnique.
             const tableUniqueConstraints = OrmUtils_1.OrmUtils.uniq(dbConstraints.filter((dbConstraint) => dbConstraint["TABLE_NAME"] ===
                 dbTable["TABLE_NAME"] &&
@@ -1878,7 +2074,9 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         const primaryColumns = table.columns.filter((column) => column.isPrimary);
         if (primaryColumns.length > 0) {
-            const primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, primaryColumns.map((column) => column.name));
+            const primaryKeyName = primaryColumns[0].primaryKeyConstraintName
+                ? primaryColumns[0].primaryKeyConstraintName
+                : this.connection.namingStrategy.primaryKeyName(table, primaryColumns.map((column) => column.name));
             const columnNames = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -1969,8 +2167,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Builds create primary key sql.
      */
-    createPrimaryKeySql(table, columnNames) {
-        const primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
+    createPrimaryKeySql(table, columnNames, constraintName) {
+        const primaryKeyName = constraintName
+            ? constraintName
+            : this.connection.namingStrategy.primaryKeyName(table, columnNames);
         const columnNamesString = columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
@@ -1981,7 +2181,10 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
      */
     dropPrimaryKeySql(table) {
         const columnNames = table.primaryColumns.map((column) => column.name);
-        const primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
+        const constraintName = table.primaryColumns[0].primaryKeyConstraintName;
+        const primaryKeyName = constraintName
+            ? constraintName
+            : this.connection.namingStrategy.primaryKeyName(table, columnNames);
         return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${primaryKeyName}"`);
     }
     /**
@@ -2100,8 +2303,19 @@ class SqlServerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         if (column.collation)
             c += " COLLATE " + column.collation;
-        if (column.isNullable !== true)
-            c += " NOT NULL";
+        if (column.asExpression) {
+            c += ` AS (${column.asExpression})`;
+            if (column.generatedType === "STORED") {
+                c += ` PERSISTED`;
+                // NOT NULL can be specified for computed columns only if PERSISTED is also specified
+                if (column.isNullable !== true)
+                    c += " NOT NULL";
+            }
+        }
+        else {
+            if (column.isNullable !== true)
+                c += " NOT NULL";
+        }
         if (column.isGenerated === true &&
             column.generationStrategy === "increment" &&
             !skipIdentity)