yujunjun/knex
1
0
Fork 0
mirror of https://github.com/knex/knex.git synced 2025-11-12 16:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,084 Commits 36 Branches 183 Tags
Commit Graph

1117 Commits

Author SHA1 Message Date
wubzz
a5ece5e2df Merge pull request #1226 from jurko-gospodnetic/fix-nested-transactions 
Fixed nested transactions
 2016-03-07 14:54:04 +01:00
Ngoc Tran
60f8062cfe Fixes #1220, https://github.com/tgriesser/knex/issues/1220, inTable(undefined) fails silently error by making sure it throws an error if the user passes an undefined table name. 2016-03-07 03:33:17 -08:00
wubzz
93d018a817 Change assertion 2016-02-26 20:32:34 +01:00
wubzz
b6860b6b37 Add 'query-response to documentation, and add some assertions to the test. 2016-02-26 20:01:18 +01:00
wubzz
840d2d1299 Add 'query-response' event. Fixes #1203 2016-02-26 19:51:35 +01:00
Jurko Gospodnetić
675c684d3b test sibling nested transactions 2016-02-25 12:32:09 +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
Mikael Lepistö
9f270f069a Merge pull request #1201 from wubzz/feature/add_timeout_to_querybuilder 
Add .timeout(ms) to QueryBuilder
 2016-02-17 10:45:54 +02:00
Mikael Lepistö
96aa4d8d91 Merge pull request #1147 from alexrsagen/master 
Add collate for columns (MySQL)
 2016-02-15 20:09:43 +02:00
wubzz
6dfe653c42 Add .timeout() fn to QueryBuilder. 2016-02-15 17:06:08 +01:00
Rhys van der Waerden
19e4a1c3dd Merge pull request #1196 from elhigu/batch-insert-input-validation 
batchInsert batchSize parameter validation
 2016-02-15 19:39:37 +11:00
Mikael Lepistö
bccf1280d9 Smoke test to verify _runBatch return value 2016-02-13 14:49:25 +02:00
Mikael Lepistö
ce6ada96e3 batchInsert batchSize parameter validation 2016-02-11 11:49:55 +02:00
Rhys van der Waerden
5ebbeb07b4 Merge branch 'bugfix/make_raw_backwards_compatible' of https://github.com/wubzz/knex into wubzz-bugfix/make_raw_backwards_compatible 2016-02-06 14:08:30 +11:00
Mikael Lepistö
8d75d3dace Merge pull request #1182 from wubzz/feature/knex_batchInsert 
knex.batchInsert
 2016-02-04 22:20:19 +02:00
wubzz
7484892e6c Slight change to test (trigger build) 2016-02-04 18:17:32 +01:00
wubzz
deb8266393 Update test and add Docs 2016-02-04 17:26:16 +01:00
wubzz
c75f8e25e8 Added test for JS Date 2016-02-04 16:58:35 +01:00
Mikael Lepistö
081f77f014 Merge pull request #1177 from wubzz/bugfix/knex_hangs_when_pool_is_filled_with_trs 
Bugfix/knex hangs when pool is filled with trs
 2016-02-04 00:06:27 +02:00
wubzz
4244bb1ec2 Simplify the test and lower the time to 1sec 2016-02-03 22:50:45 +01:00
wubzz
efe022bfe1 Lower values in Test, prevent hanging for too long 2016-02-02 21:33:11 +01:00
wubzz
8fc6962ab1 Add a knex.batchInsert as discussed in #757 2016-02-02 21:19:36 +01:00
Alejandro Oviedo
a1e6dbb0f7 fixes bug when using dot in as identifier 2016-02-02 14:46:18 -03:00
wubzz
57bac6cd58 Fix some indentation and test comment 2016-02-01 21:27:30 +01:00
wubzz
80ee5a8021 select version() => select 1 = 1 for test 
version() doesn't exist in all dbs.
 2016-02-01 20:54:14 +01:00
wubzz
eb80e008ae Merge remote-tracking branch 'refs/remotes/tgriesser/master' into bugfix/knex_hangs_when_pool_is_filled_with_trs 2016-02-01 20:40:07 +01:00
wubzz
eea94a8896 TimeoutError when acquiring con is not possible 2016-02-01 20:40:06 +01:00
Mikael Lepistö
79a77ac932 Removes object keys with value undefined from being added to DB in update. Clean version of pq #962 fixes issue #961. 2016-02-01 11:51:02 +02:00
wubzz
0d20e5b534 .raw bindings should allow single Non-Array values. 2016-01-30 14:52:07 +01:00
wubzz
82b38740b7 Forgot to commit the updated Test for dropPrimary 2016-01-29 23:55:51 +01:00
Mikael Konutgan
aa142f20f7 Add option to timestamps to be not null and default to the current 
timestamp
 2016-01-25 16:35:58 +01:00
gmichael225
b130ad66e2 Merge remote-tracking branch 'root/master' into sqlite3-dialect-escaping 
# Conflicts:
#	lib/dialects/sqlite3/index.js
 2016-01-25 07:43:03 +11:00
Alexander Sagen
2317279e8c Add collate for columns (MySQL) 
This had been requested in #599 a year ago, but a PR was never created.

I have included a test that passed when i ran it.
 2016-01-19 23:06:25 +01:00
Ryan Fink
4985a65bfc Add syntactic sugar - andWhereBetween and andWhereNotBetween 2016-01-09 07:35:12 -05:00
gmichael225
4b2c0efff1 SQL compliant escaping, removed dialect-specific escaping for now 2015-12-24 11:33:48 +11:00
Sky Morey
eed0004031 mssql: added top (?) back to fix that error. also removed loading of empty file 2015-12-15 16:48:19 -06:00
Sky Morey
03f4993642 Merge branch 'master' of github.com:tgriesser/knex 2015-12-15 14:57:14 -06:00
Sky Morey
ae256f2943 mssql limit and offset for sql2012 2015-12-15 14:56:56 -06:00
Mikael Lepistö
9236ca95e3 Fixed typo and moved LockError emitting to inside _getLock function 2015-12-15 21:47:59 +02:00
Mikael Lepistö
d510b2377f Made tests compatible with node 0.10 and 0.12 2015-12-15 21:37:01 +02:00
Mikael Lepistö
4ae8974a95 Command to migration client to allow freeing migration lock manually 2015-12-15 21:37:01 +02:00
Mikael Lepistö
8f8fe5979e Fixed error messages to be more descriptive and minor refactoring 2015-12-15 21:37:01 +02:00
Dustin Martin
b323013b20 Add migration locking so multiple services cannot try to run migrations 
at same time
 2015-12-15 21:37:01 +02:00
Sky Morey
fbbda0731b removed test sqlserver from test/knexfile.js 2015-12-14 16:21:27 -06:00
Sky Morey
f99d3952a1 changed mssql to compact create format. changed unique index to unique constraint 2015-12-14 16:20:45 -06:00
Sky Morey
aa8df07711 merge 2015-12-14 11:10:46 -06:00
Sky Morey
10b415ed7d turned off mssql from build test 2015-12-14 11:01:54 -06:00
Sky Morey
371815d7e6 made SCHEMA upper case for mssql 2015-12-14 09:56:53 -06:00
Michael G
91b159db2d Added test for SQLite single-quote escaping as per http://www.sqlite.org/lang_expr.html 2015-12-14 18:38:56 +11:00