这是indexloc提供的服务，不要输入任何密码
Skip to content

fix relationship page breaks if array fk relationship exists with table in another schema #2459

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

Merged
merged 3 commits into from
Jul 2, 2019
Merged

fix relationship page breaks if array fk relationship exists with table in another schema #2459

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f323287
fix relationship page breaks if array fk relationship exists with tab…
arvi3411301 Jul 2, 2019
eee1434
Merge branch 'master' into issue-217
rikinsk Jul 2, 2019
9c32215
Merge branch 'master' into issue-217
rikinsk Jul 2, 2019
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
17 changes: 10 additions & 7 deletions console/src/components/Services/Data/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ const findFKConstraint = (curTable, column) => {
);
};

const findOppFKConstraint = (curTable, column) => {
const fkConstraints = curTable.opp_foreign_key_constraints;
return fkConstraints.find(
fk =>
Object.keys(fk.column_mapping).length === column.length &&
Object.keys(fk.column_mapping).join(',') === column.join(',')
);
};

export const findTableFromRel = (schemas, curTable, rel) => {
let rTable = null;
let rSchema = 'public';
Expand Down Expand Up @@ -132,7 +141,6 @@ export const findAllFromRel = (schemas, curTable, rel) => {
// for object relationship
if (rel.rel_type === 'object') {
relMeta.lcol = [foreignKeyConstraintOn];

const fkc = findFKConstraint(curTable, relMeta.lcol);
if (fkc) {
relMeta.rTable = fkc.ref_table;
Expand All @@ -152,12 +160,7 @@ export const findAllFromRel = (schemas, curTable, rel) => {
relMeta.rTable = rTableConfig;
relMeta.rSchema = 'public';
}

const rtableSchema = schemas.find(
x =>
x.table_name === relMeta.rTable && x.table_schema === relMeta.rSchema
);
const rfkc = findFKConstraint(rtableSchema, relMeta.rcol);
const rfkc = findOppFKConstraint(curTable, relMeta.rcol);
relMeta.lcol = [rfkc.column_mapping[relMeta.rcol]];
}
}
Expand Down