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

fix(adminPanel): Fix UsedBy queries for data elements and data-tables #5585

Merged
merged 1 commit into from
Apr 12, 2024
Merged

fix(adminPanel): Fix UsedBy queries for data elements and data-tables #5585

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
5 changes: 4 additions & 1 deletion packages/database/src/TupaiaDatabase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,11 @@ function getColSelector(connection, inputColStr) {

const params = inputColStr.split(jsonOperatorPattern);
const allButFirst = params.slice(1);
const lastIndexOfLookupAsText = inputColStr.lastIndexOf('->>');
const lastIndexOfLookupAsJson = inputColStr.lastIndexOf('->');
const selector = lastIndexOfLookupAsText >= lastIndexOfLookupAsJson ? '#>>' : '#>';

// Turn `config->item->>colour` into `config #>> '{item,colour}'`
// For some reason, Knex fails when we try to convert it to `config->'item'->>'colour'`
return connection.raw(`?? #>> '{${allButFirst.map(() => '??').join(',')}}'`, params);
return connection.raw(`?? ${selector} '{${allButFirst.map(() => '??').join(',')}}'`, params);
}