Skip to content

Merge in Master #1

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
wulfsolter merged 5 commits into from
Mar 21, 2020
Merged

Merge in Master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbbf1a8
Include model name in findOne error message
Oct 15, 2019
764bcc6
Fix typo: Recursivly -> Recursively
Dec 3, 2019
bc95862
Merge pull request #1612 from alxndrsn/findoneerrormsg
rachaelshaw Jan 6, 2020
40c1610
Merge pull request #1614 from alxndrsn/typos
rachaelshaw Jan 6, 2020
014f2e8
Merge remote-tracking branch 'origin/afterFindLifecycle'
wulfsolter Mar 20, 2020
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
4 changes: 3 additions & 1 deletion lib/waterline/methods/find-one.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,9 @@ module.exports = function findOne( /* criteria?, populates?, explicitCbMaybe?, m
if (populatedRecords.length > 1) {
return done(flaverr({
message:
'More than one matching record found for `.findOne()`:\n'+
'More than one matching record found for `'+
modelIdentity[0].toUpperCase()+modelIdentity.substring(1)+
'.findOne()`:\n'+
'···\n'+
_.pluck(populatedRecords, WLModel.primaryKey)+'\n'+
'···\n'+
Expand Down
2 changes: 1 addition & 1 deletion lib/waterline/utils/system/transformer-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Transformation.prototype.serializeCriteria = function(values) {
});
}

// Recursivly parse attributes to handle nested criteria
// Recursively parse attributes to handle nested criteria
recursiveParse(values);

return values;
Expand Down