typeorm 0.3.18-dev.48f5f85 → 0.3.18-dev.6d5b5d9

package/browser/driver/oracle/OracleQueryRunner.js

@@ -1380,7 +1380,11 @@ export class OracleQueryRunner extends BaseQueryRunner {
             table.columns = await Promise.all(dbColumns
                 .filter((dbColumn) => dbColumn["OWNER"] === dbTable["OWNER"] &&
                 dbColumn["TABLE_NAME"] ===
-                    dbTable["TABLE_NAME"])
+                    dbTable["TABLE_NAME"] &&
+                // Filter out auto-generated virtual columns,
+                // since TypeORM will have no info about them.
+                !(dbColumn["VIRTUAL_COLUMN"] === "YES" &&
+                    dbColumn["USER_GENERATED"] === "NO"))
                 .map(async (dbColumn) => {
                 const columnConstraints = dbConstraints.filter((dbConstraint) => dbConstraint["OWNER"] ===
                     dbColumn["OWNER"] &&
@@ -1554,14 +1558,42 @@ export class OracleQueryRunner extends BaseQueryRunner {
                     onUpdate: "NO ACTION", // Oracle does not have onUpdate option in FK's, but we need it for proper synchronization
                 });
             });
+            // Attempt to map auto-generated virtual columns to their
+            // referenced columns, through its 'DATA_DEFAULT' property.
+            //
+            // An example of this happening is when a column of type
+            // TIMESTAMP WITH TIME ZONE is indexed. Oracle will create a
+            // virtual column of type TIMESTAMP with a default value of
+            // SYS_EXTRACT_UTC(<column>).
+            const autoGenVirtualDbColumns = dbColumns
+                .filter((dbColumn) => dbColumn["OWNER"] === dbTable["OWNER"] &&
+                dbColumn["TABLE_NAME"] === dbTable["TABLE_NAME"] &&
+                dbColumn["VIRTUAL_COLUMN"] === "YES" &&
+                dbColumn["USER_GENERATED"] === "NO")
+                .reduce((acc, x) => {
+                const referencedDbColumn = dbColumns.find((dbColumn) => x["DATA_DEFAULT"].includes(dbColumn["COLUMN_NAME"]));
+                if (!referencedDbColumn)
+                    return acc;
+                return {
+                    ...acc,
+                    [x["COLUMN_NAME"]]: referencedDbColumn["COLUMN_NAME"],
+                };
+            }, {});
             // create TableIndex objects from the loaded indices
             table.indices = dbIndices
                 .filter((dbIndex) => dbIndex["TABLE_NAME"] === dbTable["TABLE_NAME"] &&
                 dbIndex["OWNER"] === dbTable["OWNER"])
                 .map((dbIndex) => {
+                //
+                const columnNames = dbIndex["COLUMN_NAMES"]
+                    .split(",")
+                    .map((columnName) => {
+                    var _a;
+                    return (_a = autoGenVirtualDbColumns[columnName]) !== null && _a !== void 0 ? _a : columnName;
+                });
                 return new TableIndex({
                     name: dbIndex["INDEX_NAME"],
-                    columnNames: dbIndex["COLUMN_NAMES"].split(","),
+                    columnNames,
                     isUnique: dbIndex["UNIQUENESS"] === "UNIQUE",
                 });
             });