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.

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

Bugfix/or where with object should be and #1164

Merged
merged 2 commits into from Feb 18, 2016

Conversation

@wubzz
Copy link
Member

@wubzz wubzz commented Jan 28, 2016

This is a PR for #1118. There may be better ways of solving this..

Previously, orWhere({...}) would generate or-or-or, it will now generate a wrapped and-and-and instead.

@rhys-vdw
Copy link
Member

@rhys-vdw rhys-vdw commented Feb 17, 2016

@wubzz This looks good to me. I think it might deserve an example in the docs, if you don't mind.

@wubzz wubzz force-pushed the wubzz:bugfix/orWhere_with_object_should_be_and branch from 09eb6e2 to 7aa0e12 Feb 18, 2016
@wubzz
Copy link
Member Author

@wubzz wubzz commented Feb 18, 2016

@rhys-vdw I agree. Added example code with a description. Hope the description will suffice.

rhys-vdw added a commit that referenced this pull request Feb 18, 2016
…_be_and

Bugfix/or where with object should be and
@rhys-vdw rhys-vdw merged commit a42766a into knex:master Feb 18, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@rhys-vdw
Copy link
Member

@rhys-vdw rhys-vdw commented Feb 18, 2016

Thanks dude. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants