25 Commits

Author SHA1 Message Date
Byron Wong
d42dba05ce share code for throwing not implemented error 2016-05-27 14:47:12 -07:00
Byron Wong
ea5cbec4e7 Kill queries after timeout for MySQL 2016-05-26 12:00:47 -07:00
Rhys van der Waerden
06e3447440 Remove duplicate spaces in assignments.
These were previously horizontally aligned. The esnext conversion disrupted them all.
2016-05-18 19:59:24 +10:00
Rhys van der Waerden
3846b7182c Make codebase conform to ESLint rules
Just a couple of changes.
2016-05-17 01:01:34 +10:00
wubzz
f097e9147b Make sure 'raw' respects the "not" flag in the query builder. Fixes #1402 2016-05-14 22:36:13 +02:00
wubzz
34d9a7650e Merge pull request #1269 from wubzz/bugfix/fix_valuesForUndefined_actual_query
Fix valuesForUndefined actual query being executed. Fixes #1268
2016-03-27 17:28:41 +02:00
Ryan Fink
dc92ff2b71 Merged upstream 2016-03-24 09:22:07 -04:00
wubzz
b32fadf1e8 Prevent potential regression of argument tz (timezone) 2016-03-15 21:53:23 +01:00
wubzz
1d27fb8550 Update lodash from 3.7.0 -> 4.6.0 2016-03-15 18:11:13 +01:00
Jurko Gospodnetić
16a076c1a0 trim trailing spaces
Only left alone ones in `test/tape/transactions.js` which would just
cause unnecessary conflicts and get cleaned up by separate pull
request #1257 anyway.
2016-03-08 08:44:01 +01:00
Rhys van der Waerden
a42766afb1 Merge pull request #1164 from wubzz/bugfix/orWhere_with_object_should_be_and
Bugfix/or where with object should be and
2016-02-18 18:41:26 +11:00
wubzz
942877c0fe OrWhere({..}) Treat as 'AND', not 'OR'. Fixes #1118 2016-02-18 06:28:14 +01:00
wubzz
6dfe653c42 Add .timeout() fn to QueryBuilder. 2016-02-15 17:06:08 +01:00
Ryan Fink
4985a65bfc Add syntactic sugar - andWhereBetween and andWhereNotBetween 2016-01-09 07:35:12 -05:00
Rhys van der Waerden
84472e6e7e Merge pull request #1081 from tgriesser/fix/1080
Include `_debug` property in `QueryBuilder#clone`.
2015-12-10 15:31:14 +11:00
Rhys van der Waerden
8ef5d5899d Include _debug property in QueryBuilder#clone.
Adds a test for `QueryBuilder#clone`. Changes `clone()` behaviour to transfer the debug flag (`QueryBuilder#_debug`) to the cloned instance.

Fixes #1080
2015-11-30 00:21:08 +11:00
Hannah Wolfe
f72892b5b9 Distinct modifier support for aggregate functions
closes #1028

- add support for count(distinct *), avg(distinct *) and sum(distinct *)
- min and max don't really make sense with distinct, so didn't add those
2015-11-09 12:48:42 +00:00
Daniel Teixeira
8e780a8115 rename .using to .withSchema 2015-08-14 19:17:06 -03:00
Daniel Teixeira
17df5c6542 add basic schema support on queries 2015-08-09 20:38:26 -03:00
Jani Evakallio
cb89930155 Add queryBuilder as first parameter to queryBuilder.modify 2015-07-16 15:49:30 +01:00
Jani Evakallio
299bbfa60b Rename compose to modify 2015-07-16 15:15:04 +01:00
Jani Evakallio
c9bfbf3d01 Add compose method to query builder 2015-07-09 15:33:53 +01:00
Tim Griesser
d0faa82a0f QueryBuilder -> Builder 2015-05-12 21:48:02 -04:00
Tim Griesser
521a6f9e97 Remove use strict, assumed in ES6 2015-05-09 14:01:19 -04:00
Tim Griesser
7e884cb325 Babel src -> lib, remove gulp 2015-05-09 13:58:18 -04:00