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 for selecting specific fields in population for one-to-one relationship #1613

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for selecting specific fields in population for one-to-one relationship #1613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
682f1e3
Fix for selecting specific fields in population for one-to-one relati…
TahaBoulehmi Nov 19, 2019
1653710
Updating the comment
TahaBoulehmi Nov 19, 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
11 changes: 8 additions & 3 deletions lib/waterline/utils/query/forge-stage-two-query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ module.exports = function forgeStageTwoQuery(query, orm) {
// Otherwise, this simply must be `true`. Otherwise it's invalid.
else {

if (query.populates[populateAttrName] !== true) {
if (query.populates[populateAttrName] !== true && (_.isUndefined(query.populates[populateAttrName].select) && _.isUndefined(query.populates[populateAttrName].omit))) {
throw buildUsageError(
'E_INVALID_POPULATES',
'Could not populate `'+populateAttrName+'`. '+
Expand All @@ -886,14 +886,19 @@ module.exports = function forgeStageTwoQuery(query, orm) {
'since it generally wouldn\'t make any sense. But that\'s the trouble-- it '+
'looks like some sort of a subcriteria (or something) _was_ provided!\n'+
'(Note that subcriterias consisting ONLY of `omit` or `select` are a special '+
'case that _does_ make sense. This usage will be supported in a future version '+
'of Waterline.)\n'+
'case that _does_ make sense.\n'+
'\n'+
'Here\'s what was passed in:\n'+
util.inspect(query.populates[populateAttrName], {depth: 5}),
query.using
);
}//-•
else {
query.populates[populateAttrName] = {
select: query.populates[populateAttrName].select? query.populates[populateAttrName].select : undefined,
omit: query.populates[populateAttrName].omit? query.populates[populateAttrName].omit : undefined
};
}

}//>-•

Expand Down