833 Commits

Author SHA1 Message Date
wubzz
2738697f42 Add a TypeError when failing to supply a callback function to .createTable and .table. 2016-03-11 23:22:30 +01:00
wubzz
72a3617e2b Updated the tests for named bindings to accomodate for the decission not to process undefined values. 2016-03-11 20:42:29 +01:00
wubzz
b614a2f81c Update regex for named bindings 2016-03-11 20:41:19 +01:00
Jurko Gospodnetić
19477f6832 merge changes from master 2016-03-09 07:11:17 +01:00
wubzz
4a0456404a Merge pull request #1260 from wubzz/bugfix/add_timeout_to_raw_and_fix_test
Add .timeout to raw, and attempt to fix the timeout test
2016-03-08 13:54:54 +01:00
wubzz
3bf1256bf8 Add .timeout to raw, and attempt to fix the timeout test 2016-03-08 13:32:55 +01:00
wubzz
7cc827f6cf Merge pull request #1258 from jurko-gospodnetic/code-cleanup
Code cleanup (trimmed trailing spaces & removed tabs)
2016-03-08 13:13:48 +01:00
wubzz
4ef7759da5 Merge pull request #1250 from ngoctranfire/bugfix/fixes_inTable_undefined_fails_silently_#1220
Fixes inTable(undefined) silently fails bug from Issue #1220
2016-03-08 12:36:34 +01:00
Ngoc Tran
ac294c5d47 Renamed table name to more accurately reflect test. 2016-03-08 01:31:22 -08:00
Ngoc Tran
755ad78df4 Fixes #1220 bug to now throw TypeError if parameter passed into inTable() is not typeof === 'string'. 2016-03-08 01:28:58 -08: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
Jurko Gospodnetić
96bd74e0c1 remove now redundant test case
Already covered directly by the `transaction rollback on error throw`
test case.
2016-03-08 08:05:17 +01:00
Jurko Gospodnetić
3225ab45bc test transaction callback throwing an error 2016-03-08 07:50:54 +01:00
Jurko Gospodnetić
3d8131b5eb add missing tape assertion descriptions
The default `should be equal` description is not of much use in tracking
down failed assertions.
2016-03-08 07:50:20 +01:00
Jurko Gospodnetić
85b780d4fa sync test comments about oracle & mssql not reporting BEGIN/ROLLBACK as queries 2016-03-08 07:50:19 +01:00
Rod Calumpong
ab003ac7c9 Allow returning to be used with oracle update 2016-03-07 16:35:04 -08:00
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