typeorm 0.3.5 → 0.3.6-dev.0418ebc

package/browser/driver/oracle/OracleQueryRunner.js

@@ -346,6 +346,23 @@ export class OracleQueryRunner extends 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.GENERATED_COLUMN,
+                name: column.name,
+                value: column.asExpression,
+            });
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                table: table.name,
+                type: MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            upQueries.push(insertQuery);
+            downQueries.push(deleteQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -378,6 +395,23 @@ export class OracleQueryRunner extends 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.GENERATED_COLUMN,
+                name: column.name,
+            });
+            const insertQuery = this.insertTypeormMetadataSql({
+                table: table.name,
+                type: MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+                value: column.asExpression,
+            });
+            upQueries.push(deleteQuery);
+            downQueries.push(insertQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
@@ -515,6 +549,21 @@ export class OracleQueryRunner extends BaseQueryRunner {
             upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${uniqueConstraint.name}" UNIQUE ("${column.name}")`));
             downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${uniqueConstraint.name}"`));
         }
+        if (column.generatedType && column.asExpression) {
+            const insertQuery = this.insertTypeormMetadataSql({
+                table: table.name,
+                type: MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+                value: column.asExpression,
+            });
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                table: table.name,
+                type: MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            upQueries.push(insertQuery);
+            downQueries.push(deleteQuery);
+        }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.addColumn(column);
         this.replaceCachedTable(table, clonedTable);
@@ -567,7 +616,9 @@ export class OracleQueryRunner extends 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);
@@ -807,6 +858,21 @@ export class OracleQueryRunner extends BaseQueryRunner {
         }
         upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${column.name}"`));
         downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(column)}`));
+        if (column.generatedType && column.asExpression) {
+            const deleteQuery = this.deleteTypeormMetadataSql({
+                table: table.name,
+                type: MetadataTableType.GENERATED_COLUMN,
+                name: column.name,
+            });
+            const insertQuery = this.insertTypeormMetadataSql({
+                table: table.name,
+                type: 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);
@@ -1243,7 +1309,7 @@ export class OracleQueryRunner extends 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();
             const owner = dbTable["OWNER"] === currentSchema &&
                 (!this.driver.options.schema ||
@@ -1254,11 +1320,13 @@ export class OracleQueryRunner extends 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"] ===
@@ -1273,12 +1341,14 @@ export class OracleQueryRunner extends 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();
                 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
@@ -1296,30 +1366,36 @@ export class OracleQueryRunner extends 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";
+                tableColumn.isNullable =
+                    dbColumn["NULLABLE"] === "Y";
                 tableColumn.isUnique =
-                    uniqueConstraints.length > 0 && !isConstraintComposite;
+                    uniqueConstraints.length > 0 &&
+                        !isConstraintComposite;
                 tableColumn.isPrimary = isPrimary;
                 tableColumn.isGenerated =
                     dbColumn["IDENTITY_COLUMN"] === "YES";
@@ -1328,11 +1404,27 @@ export class OracleQueryRunner extends 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.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.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"]);
@@ -1346,7 +1438,8 @@ export class OracleQueryRunner extends BaseQueryRunner {
             });
             // find check constraints of table, group them by constraint name and build TableCheck.
             const tableCheckConstraints = 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"]);
@@ -1363,9 +1456,11 @@ export class OracleQueryRunner extends BaseQueryRunner {
             });
             // find foreign key constraints of table, group them by constraint name and build TableForeignKey.
             const tableForeignKeyConstraints = 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"]);
@@ -1392,7 +1487,7 @@ export class OracleQueryRunner extends BaseQueryRunner {
                 });
             });
             return table;
-        });
+        }));
     }
     /**
      * Builds and returns SQL for create table.
@@ -1620,6 +1715,8 @@ export class OracleQueryRunner extends 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;