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

package/driver/oracle/OracleQueryRunner.js

@@ -349,6 +349,23 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 downQueries.push(this.dropIndexSql(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 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);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -381,6 +398,23 @@ class OracleQueryRunner 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 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);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -425,7 +459,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         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}"`));
         // 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);
@@ -435,6 +470,10 @@ class OracleQueryRunner 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
@@ -445,6 +484,10 @@ class OracleQueryRunner 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
@@ -455,6 +498,10 @@ class OracleQueryRunner 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
@@ -485,7 +532,9 @@ class OracleQueryRunner 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(", ");
@@ -493,7 +542,9 @@ class OracleQueryRunner 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(", ");
@@ -518,6 +569,21 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${uniqueConstraint.name}" UNIQUE ("${column.name}")`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${uniqueConstraint.name}"`));
         }
+        if (column.generatedType && column.asExpression) {
+            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);
+        }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.addColumn(column);
         this.replaceCachedTable(table, clonedTable);
@@ -570,7 +636,9 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if ((newColumn.isGenerated !== oldColumn.isGenerated &&
             newColumn.generationStrategy !== "uuid") ||
             oldColumn.type !== newColumn.type ||
-            oldColumn.length !== newColumn.length) {
+            oldColumn.length !== newColumn.length ||
+            oldColumn.generatedType !== newColumn.generatedType ||
+            oldColumn.asExpression !== newColumn.asExpression) {
             // Oracle 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);
@@ -584,7 +652,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 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}"`));
                 // rename column primary key constraint
-                if (oldColumn.isPrimary === true) {
+                if (oldColumn.isPrimary === true &&
+                    !oldColumn.primaryKeyConstraintName) {
                     const primaryColumns = clonedTable.primaryColumns;
                     // build old primary constraint name
                     const columnNames = primaryColumns.map((column) => column.name);
@@ -599,6 +668,10 @@ class OracleQueryRunner 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);
@@ -611,6 +684,10 @@ class OracleQueryRunner 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);
@@ -625,6 +702,10 @@ class OracleQueryRunner 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);
@@ -680,7 +761,9 @@ class OracleQueryRunner 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(", ");
@@ -692,7 +775,9 @@ class OracleQueryRunner 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(", ");
@@ -707,7 +792,10 @@ class OracleQueryRunner 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(", ");
@@ -765,7 +853,9 @@ class OracleQueryRunner 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(", ");
@@ -776,7 +866,10 @@ class OracleQueryRunner 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(", ");
@@ -810,6 +903,21 @@ 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) {
+            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);
+        }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.removeColumn(column);
         this.replaceCachedTable(table, clonedTable);
@@ -825,12 +933,12 @@ class OracleQueryRunner 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))
@@ -854,7 +962,9 @@ class OracleQueryRunner 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(", ");
@@ -865,7 +975,9 @@ class OracleQueryRunner 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(", ");
@@ -877,12 +989,12 @@ class OracleQueryRunner 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;
@@ -1246,7 +1358,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             this.query(constraintsSql),
         ]);
         // create tables for loaded tables
-        return dbTables.map((dbTable) => {
+        return await Promise.all(dbTables.map(async (dbTable) => {
             const table = new Table_1.Table();
             const owner = dbTable["OWNER"] === currentSchema &&
                 (!this.driver.options.schema ||
@@ -1257,11 +1369,13 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             table.schema = dbTable["OWNER"];
             table.name = this.driver.buildTableName(dbTable["TABLE_NAME"], owner);
             // create columns from the loaded columns
-            table.columns = dbColumns
+            table.columns = await Promise.all(dbColumns
                 .filter((dbColumn) => dbColumn["OWNER"] === dbTable["OWNER"] &&
-                dbColumn["TABLE_NAME"] === dbTable["TABLE_NAME"])
-                .map((dbColumn) => {
-                const columnConstraints = dbConstraints.filter((dbConstraint) => dbConstraint["OWNER"] === dbColumn["OWNER"] &&
+                dbColumn["TABLE_NAME"] ===
+                    dbTable["TABLE_NAME"])
+                .map(async (dbColumn) => {
+                const columnConstraints = dbConstraints.filter((dbConstraint) => dbConstraint["OWNER"] ===
+                    dbColumn["OWNER"] &&
                     dbConstraint["TABLE_NAME"] ===
                         dbColumn["TABLE_NAME"] &&
                     dbConstraint["COLUMN_NAME"] ===
@@ -1276,12 +1390,13 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                             dbColumn["COLUMN_NAME"] &&
                         dbConstraint["CONSTRAINT_NAME"] ===
                             uniqueConstraint["CONSTRAINT_NAME"] &&
-                        dbConstraint["CONSTRAINT_TYPE"] === "U");
+                        dbConstraint["CONSTRAINT_TYPE"] ===
+                            "U");
                 });
-                const isPrimary = !!columnConstraints.find((constraint) => constraint["CONSTRAINT_TYPE"] === "P");
                 const tableColumn = new TableColumn_1.TableColumn();
                 tableColumn.name = dbColumn["COLUMN_NAME"];
-                tableColumn.type = dbColumn["DATA_TYPE"].toLowerCase();
+                tableColumn.type =
+                    dbColumn["DATA_TYPE"].toLowerCase();
                 if (tableColumn.type.indexOf("(") !== -1)
                     tableColumn.type = tableColumn.type.replace(/\([0-9]*\)/, "");
                 // check only columns that have length property
@@ -1299,31 +1414,60 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     tableColumn.type === "float") {
                     if (dbColumn["DATA_PRECISION"] !== null &&
                         !this.isDefaultColumnPrecision(table, tableColumn, dbColumn["DATA_PRECISION"]))
-                        tableColumn.precision = dbColumn["DATA_PRECISION"];
+                        tableColumn.precision =
+                            dbColumn["DATA_PRECISION"];
                     if (dbColumn["DATA_SCALE"] !== null &&
                         !this.isDefaultColumnScale(table, tableColumn, dbColumn["DATA_SCALE"]))
                         tableColumn.scale = dbColumn["DATA_SCALE"];
                 }
                 else if ((tableColumn.type === "timestamp" ||
-                    tableColumn.type === "timestamp with time zone" ||
+                    tableColumn.type ===
+                        "timestamp with time zone" ||
                     tableColumn.type ===
                         "timestamp with local time zone") &&
                     dbColumn["DATA_SCALE"] !== null) {
-                    tableColumn.precision = !this.isDefaultColumnPrecision(table, tableColumn, dbColumn["DATA_SCALE"])
-                        ? dbColumn["DATA_SCALE"]
-                        : undefined;
+                    tableColumn.precision =
+                        !this.isDefaultColumnPrecision(table, tableColumn, dbColumn["DATA_SCALE"])
+                            ? dbColumn["DATA_SCALE"]
+                            : undefined;
                 }
                 tableColumn.default =
                     dbColumn["DATA_DEFAULT"] !== null &&
                         dbColumn["DATA_DEFAULT"] !== undefined &&
+                        dbColumn["VIRTUAL_COLUMN"] === "NO" &&
                         dbColumn["DATA_DEFAULT"].trim() !== "NULL"
                         ? (tableColumn.default =
                             dbColumn["DATA_DEFAULT"].trim())
                         : undefined;
-                tableColumn.isNullable = dbColumn["NULLABLE"] === "Y";
+                const primaryConstraint = columnConstraints.find((constraint) => constraint["CONSTRAINT_TYPE"] === "P");
+                if (primaryConstraint) {
+                    tableColumn.isPrimary = true;
+                    // find another columns involved in primary key constraint
+                    const anotherPrimaryConstraints = dbConstraints.filter((constraint) => constraint["OWNER"] ===
+                        dbColumn["OWNER"] &&
+                        constraint["TABLE_NAME"] ===
+                            dbColumn["TABLE_NAME"] &&
+                        constraint["COLUMN_NAME"] !==
+                            dbColumn["COLUMN_NAME"] &&
+                        constraint["CONSTRAINT_TYPE"] ===
+                            "P");
+                    // 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.isNullable =
+                    dbColumn["NULLABLE"] === "Y";
                 tableColumn.isUnique =
-                    uniqueConstraints.length > 0 && !isConstraintComposite;
-                tableColumn.isPrimary = isPrimary;
+                    uniqueConstraints.length > 0 &&
+                        !isConstraintComposite;
                 tableColumn.isGenerated =
                     dbColumn["IDENTITY_COLUMN"] === "YES";
                 if (tableColumn.isGenerated) {
@@ -1331,11 +1475,27 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     tableColumn.default = undefined;
                 }
                 tableColumn.comment = ""; // todo
+                if (dbColumn["VIRTUAL_COLUMN"] === "YES") {
+                    tableColumn.generatedType = "VIRTUAL";
+                    const asExpressionQuery = await this.selectTypeormMetadataSql({
+                        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) => {
-                return (dbConstraint["TABLE_NAME"] === dbTable["TABLE_NAME"] &&
+                return (dbConstraint["TABLE_NAME"] ===
+                    dbTable["TABLE_NAME"] &&
                     dbConstraint["OWNER"] === dbTable["OWNER"] &&
                     dbConstraint["CONSTRAINT_TYPE"] === "U");
             }), (dbConstraint) => dbConstraint["CONSTRAINT_NAME"]);
@@ -1349,7 +1509,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             });
             // find check constraints of table, group them by constraint name and build TableCheck.
             const tableCheckConstraints = OrmUtils_1.OrmUtils.uniq(dbConstraints.filter((dbConstraint) => {
-                return (dbConstraint["TABLE_NAME"] === dbTable["TABLE_NAME"] &&
+                return (dbConstraint["TABLE_NAME"] ===
+                    dbTable["TABLE_NAME"] &&
                     dbConstraint["OWNER"] === dbTable["OWNER"] &&
                     dbConstraint["CONSTRAINT_TYPE"] === "C");
             }), (dbConstraint) => dbConstraint["CONSTRAINT_NAME"]);
@@ -1366,9 +1527,11 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             });
             // find foreign key constraints of table, group them by constraint name and build TableForeignKey.
             const tableForeignKeyConstraints = OrmUtils_1.OrmUtils.uniq(dbForeignKeys.filter((dbForeignKey) => dbForeignKey["OWNER"] === dbTable["OWNER"] &&
-                dbForeignKey["TABLE_NAME"] === dbTable["TABLE_NAME"]), (dbForeignKey) => dbForeignKey["CONSTRAINT_NAME"]);
+                dbForeignKey["TABLE_NAME"] ===
+                    dbTable["TABLE_NAME"]), (dbForeignKey) => dbForeignKey["CONSTRAINT_NAME"]);
             table.foreignKeys = tableForeignKeyConstraints.map((dbForeignKey) => {
-                const foreignKeys = dbForeignKeys.filter((dbFk) => dbFk["TABLE_NAME"] === dbForeignKey["TABLE_NAME"] &&
+                const foreignKeys = dbForeignKeys.filter((dbFk) => dbFk["TABLE_NAME"] ===
+                    dbForeignKey["TABLE_NAME"] &&
                     dbFk["OWNER"] === dbForeignKey["OWNER"] &&
                     dbFk["CONSTRAINT_NAME"] ===
                         dbForeignKey["CONSTRAINT_NAME"]);
@@ -1395,7 +1558,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 });
             });
             return table;
-        });
+        }));
     }
     /**
      * Builds and returns SQL for create table.
@@ -1463,7 +1626,9 @@ class OracleQueryRunner 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(", ");
@@ -1540,8 +1705,10 @@ class OracleQueryRunner 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(", ");
@@ -1551,8 +1718,13 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
      * Builds drop primary key sql.
      */
     dropPrimaryKeySql(table) {
+        if (!table.primaryColumns.length)
+            throw new error_1.TypeORMError(`Table ${table} has no primary keys.`);
         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}"`);
     }
     /**
@@ -1623,6 +1795,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             c += " CHARACTER SET " + column.charset;
         if (column.collation)
             c += " COLLATE " + column.collation;
+        if (column.asExpression)
+            c += ` AS (${column.asExpression}) VIRTUAL`;
         if (column.default !== undefined && column.default !== null)
             // DEFAULT must be placed before NOT NULL
             c += " DEFAULT " + column.default;