fix: synchronizing View with schema broken for oracle (#9602)

* fix view+schema broken for oracle

* apply prettier

* fixed missing schema in loadViews();
added test (with .only)

* removed .only

Co-authored-by: James Jurach <James.Jurach@apiture.com>
Co-authored-by: Alex Messer <dmzt08@gmail.com>

src/driver/oracle/OracleQueryRunner.ts

@@ -2242,17 +2242,25 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
         const currentDatabase = await this.getCurrentDatabase()
         const currentSchema = await this.getCurrentSchema()
 
-        const viewNamesString = viewNames
-            .map((name) => "'" + name + "'")
-            .join(", ")
+        const viewsCondition = viewNames
+            .map((viewName) => this.driver.parseTableName(viewName))
+            .map(({ schema, tableName }) => {
+                if (!schema) {
+                    schema = this.driver.options.schema || currentSchema
+                }
+
+                return `("T"."schema" = '${schema}' AND "T"."name" = '${tableName}')`
+            })
+            .join(" OR ")
+
         let query =
             `SELECT "T".* FROM ${this.escapePath(
                 this.getTypeormMetadataTableName(),
             )} "T" ` +
             `INNER JOIN "USER_OBJECTS" "O" ON "O"."OBJECT_NAME" = "T"."name" AND "O"."OBJECT_TYPE" IN ( 'MATERIALIZED VIEW', 'VIEW' ) ` +
-            `WHERE "T"."type" IN ( '${MetadataTableType.MATERIALIZED_VIEW}', '${MetadataTableType.VIEW}' )`
-        if (viewNamesString.length > 0)
-            query += ` AND "T"."name" IN (${viewNamesString})`
+            `WHERE "T"."type" IN ('${MetadataTableType.MATERIALIZED_VIEW}', '${MetadataTableType.VIEW}')`
+        if (viewsCondition.length > 0) query += ` AND ${viewsCondition}`
+
         const dbViews = await this.query(query)
         return dbViews.map((dbView: any) => {
             const parsedName = this.driver.parseTableName(dbView["name"])
@@ -2848,9 +2856,11 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
         const type = view.materialized
             ? MetadataTableType.MATERIALIZED_VIEW
             : MetadataTableType.VIEW
+        const { schema, tableName } = this.driver.parseTableName(view)
         return this.insertTypeormMetadataSql({
             type: type,
-            name: view.name,
+            name: tableName,
+            schema: schema,
             value: expression,
         })
     }

test/github-issues/9601/entity/Foo.ts

@@ -0,0 +1,14 @@
+import {
+    Entity,
+    PrimaryGeneratedColumn,
+    UpdateDateColumn,
+} from "../../../../src"
+
+@Entity({ name: "foo", schema: "SYSTEM" })
+export class Foo {
+    @PrimaryGeneratedColumn({ name: "id" })
+    id: number
+
+    @UpdateDateColumn({ name: "updated_at" })
+    updatedAt: Date
+}

test/github-issues/9601/entity/FooView.ts

@@ -0,0 +1,13 @@
+import { DataSource, ViewColumn, ViewEntity } from "../../../../src"
+import { Foo } from "./Foo"
+
+@ViewEntity({
+    name: "foo_view",
+    schema: "SYSTEM",
+    expression: (connection: DataSource) =>
+        connection.createQueryBuilder(Foo, "foo").select(`foo.updatedAt`),
+})
+export class FooView {
+    @ViewColumn()
+    updatedAt: Date
+}

test/github-issues/9601/issue-9601.ts

@@ -0,0 +1,43 @@
+import "reflect-metadata"
+import { DataSource } from "../../../src/index"
+import {
+    closeTestingConnections,
+    createTestingConnections,
+} from "../../utils/test-utils"
+
+describe("github issues > #9601 view+schema+synchronize broken for oracle", () => {
+    let connections: DataSource[]
+    before(
+        async () =>
+            (connections = await createTestingConnections({
+                entities: [__dirname + "/entity/*{.js,.ts}"],
+                schemaCreate: false,
+                dropSchema: true,
+                enabledDrivers: ["oracle"],
+            })),
+    )
+    after(() => closeTestingConnections(connections))
+
+    it("should recognize model changes", () =>
+        Promise.all(
+            connections.map(async (connection) => {
+                const sqlInMemory = await connection.driver
+                    .createSchemaBuilder()
+                    .log()
+                sqlInMemory.upQueries.length.should.be.greaterThan(0)
+                sqlInMemory.downQueries.length.should.be.greaterThan(0)
+            }),
+        ))
+
+    it("should not generate queries when no model changes", () =>
+        Promise.all(
+            connections.map(async (connection) => {
+                await connection.driver.createSchemaBuilder().build()
+                const sqlInMemory = await connection.driver
+                    .createSchemaBuilder()
+                    .log()
+                sqlInMemory.upQueries.length.should.be.equal(0)
+                sqlInMemory.downQueries.length.should.be.equal(0)
+            }),
+        ))
+})