Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: support table names between schemas in oracle #7951

Merged
merged 1 commit into from
Jul 24, 2021
Merged

fix: support table names between schemas in oracle #7951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/driver/oracle/OracleQueryRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,12 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {

// create columns from the loaded columns
table.columns = dbColumns
.filter(dbColumn => dbColumn["TABLE_NAME"] === table.name)
.filter(
dbColumn => (
dbColumn["OWNER"] === dbTable["OWNER"] &&
dbColumn["TABLE_NAME"] === dbTable["TABLE_NAME"]
)
)
.map(dbColumn => {
const columnConstraints = dbConstraints.filter(
dbConstraint => (
Expand Down Expand Up @@ -1416,7 +1421,13 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
}), dbConstraint => dbConstraint["CONSTRAINT_NAME"]);

table.checks = tableCheckConstraints.map(constraint => {
const checks = dbConstraints.filter(dbC => dbC["CONSTRAINT_NAME"] === constraint["CONSTRAINT_NAME"]);
const checks = dbConstraints.filter(
dbC => (
dbC["TABLE_NAME"] === constraint["TABLE_NAME"] &&
dbC["OWNER"] === constraint["OWNER"] &&
dbC["CONSTRAINT_NAME"] === constraint["CONSTRAINT_NAME"]
)
);
return new TableCheck({
name: constraint["CONSTRAINT_NAME"],
columnNames: checks.map(c => c["COLUMN_NAME"]),
Expand All @@ -1425,9 +1436,10 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
});

// find foreign key constraints of table, group them by constraint name and build TableForeignKey.
const tableForeignKeyConstraints = OrmUtils.uniq(dbForeignKeys.filter(dbForeignKey => {
return dbForeignKey["TABLE_NAME"] === table.name;
}), dbForeignKey => dbForeignKey["CONSTRAINT_NAME"]);
const tableForeignKeyConstraints = OrmUtils.uniq(dbForeignKeys.filter(dbForeignKey => (
dbForeignKey["OWNER"] === dbTable["OWNER"] &&
dbForeignKey["TABLE_NAME"] === dbTable["TABLE_NAME"]
)), dbForeignKey => dbForeignKey["CONSTRAINT_NAME"]);

table.foreignKeys = tableForeignKeyConstraints.map(dbForeignKey => {
const foreignKeys = dbForeignKeys.filter(dbFk => (
Expand All @@ -1439,6 +1451,7 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
name: dbForeignKey["CONSTRAINT_NAME"],
columnNames: foreignKeys.map(dbFk => dbFk["COLUMN_NAME"]),
referencedDatabase: table.database,
referencedSchema: dbForeignKey["OWNER"],
referencedTableName: dbForeignKey["REFERENCED_TABLE_NAME"],
referencedColumnNames: foreignKeys.map(dbFk => dbFk["REFERENCED_COLUMN_NAME"]),
onDelete: dbForeignKey["ON_DELETE"],
Expand Down