yujunjun/knex
1
0
Fork 0
mirror of https://github.com/knex/knex.git synced 2025-08-08 08:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,646 Commits 33 Branches 183 Tags
Commit Graph

2646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul McFreely
e8e913fc53 Fix small link bug 
The link for "whereNot" was directed to "where".
 2016-02-23 10:10: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
7aa0e129b2 Add to documentation about .orWhere wrapping the statement 2016-02-18 06:35:38 +01: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
Rhys van der Waerden
83467873f5 Merge pull request #1206 from BKStephens/master 
Fixing typo in documentation
 2016-02-16 09:01:02 +11:00
Ben Stephens
4080ebb61f Fixing typo in documentation 
dropForeign in side navbar was dropForeignx
 2016-02-15 13:13:39 -08:00
Mikael Lepistö
92b2a6bc27 Merge pull request #1205 from jharting/cli-no-local-install 
Fix CLI failing with TypeError if knex installation missing
 2016-02-15 23:12:34 +02:00
Jozef Hartinger
724d82bdb5 Fix CLI failing with TypeError if knex installation missing 
When run without local knex installation CLI currently fails with a nice error message in some cases and with TypeError with other cases (migrate:make, seed:make). This changes aligns the behavior to always show the expected error message.
 2016-02-15 21:46:39 +01: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
31ae460d9b release 0.10.0 0.10.0 2016-02-15 19:59:03 +11:00
Rhys van der Waerden
7a68f19e2c Preparation for 0.10.0 2016-02-15 19:58:07 +11: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
Rhys van der Waerden
ef462f0f2a Merge branch 'elhigu-fixed-regression-running-migrations-through-cli' 2016-02-15 19:34:24 +11:00
Rhys van der Waerden
861a2ffbf8 Simplify promise code with '.tap' 2016-02-15 19:34:23 +11:00
Mikael Lepistö
bccf1280d9 Smoke test to verify _runBatch return value 2016-02-13 14:49:25 +02:00
Mikael Lepistö
1214f74ee1 Fixed regression in migration function return value. 2016-02-13 14:49:25 +02:00
Alexander Sagen
2fae475059 Documentate chainable "collate" 
Also fixed the code example for "comment".
 2016-02-12 15:29:30 +01:00
Mikael Lepistö
ce6ada96e3 batchInsert batchSize parameter validation 2016-02-11 11:49:55 +02:00
Mikael Lepistö
f5c6858f10 Merge pull request #1195 from elhigu/update-readme-for-0-10 
Removed confusing version numbers and added info to change log.
 2016-02-11 09:51:04 +02:00
Mikael Lepistö
7ca517d3b5 Merge pull request #1194 from elhigu/batch-insert-default-batch-size-1000 
Default batch size 1000 for batchInsert and validate batch size parameter to be > 0
 2016-02-11 09:50:10 +02:00
Mikael Lepistö
556898047c Removed confusing version numbers and added info to change log. 2016-02-11 09:35:05 +02:00
Mikael Lepistö
5eda4f4871 Updated batchInsert documentation 2016-02-11 09:33:05 +02:00
Mikael Lepistö
e6268dc348 Default batch size 1000 for batchInsert and validate batch size parameter to be > 0 2016-02-11 08:36:50 +02:00
Mikael Lepistö
ab0922a6ea Collaborator info / etiquette 2016-02-10 10:44:16 +02:00
Rhys van der Waerden
bd8ea22d97 Merge pull request #1193 from tgriesser/0.10 
0.10
 2016-02-10 19:15:11 +11:00
Rhys van der Waerden
f5697e3b4e release 0.10.0-rc1 0.10.0-rc1 2016-02-08 22:46:12 +11:00
Rhys van der Waerden
cadbe6adc7 Prepare for 0.10.0 2016-02-08 22:44:46 +11:00
Rhys van der Waerden
1aefdfed5a Update index.html 2016-02-08 22:41:20 +11:00
Rhys van der Waerden
993c688e6f Update .raw docs 
Change title from "Raw Queries" to "Raw" (to match contents.

Detail gotcha regarding binding arrays in `knex.raw`.
 2016-02-06 14:41:21 +11: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ö
c2b779393f Merge pull request #980 from jtwebman/add_mysql2_options 
Add all supported Mysql2 dialect options
 2016-02-05 11:13:17 +02:00
JT Turner
c4fcfa8f76 Add all supported Mysql2 dialect options 2016-02-05 00:39:31 -08:00
Mikael Lepistö
ad3fd9021b Merge pull request #1175 from ArsalanDotMe/master 
Prevent attempt to create migrations table again if it already exists
 2016-02-04 23:45:09 +02: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
e2716aa219 Simplify batchInsert's return statement, -promise 2016-02-03 22:59:09 +01:00
wubzz
4244bb1ec2 Simplify the test and lower the time to 1sec 2016-02-03 22:50:45 +01:00
wubzz
5c73064c06 Update docs and wrap ternary 2016-02-03 20:56:47 +01:00
Mikael Lepistö
538cdee19e Merge pull request #1181 from a0viedo/alias-fix 
fixes bug when using dot in as identifier
 2016-02-03 10:00:32 +02: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
wubzz
12a6047ac1 Merge remote-tracking branch 'refs/remotes/tgriesser/master' 2016-02-02 19:21:38 +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