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
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
Arsalan Ahmad
d52806529c Prevent attempt to create migrations table again if it already exists when defining migrations table inside a schema 2016-02-01 18:35:08 +05:00
Mikael Lepistö
4b1344979f Merge pull request #1174 from elhigu/ignore-keys-with-undefined-value-from-update 
Removes object keys with value undefined from being added to DB in update.
 2016-02-01 11:57:27 +02: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
Mikael Lepistö
064d416a8e Merge pull request #1168 from wubzz/bugfix/proxy_query-error_event_in_transaction 
Proxy query-error event in transaction
 2016-01-30 17:11:26 +02:00
Mikael Lepistö
460b6d5a33 Merge pull request #1167 from wubzz/bugfix/tablecompiler_dropconstraint_wrap_name 
Tablecompiler dropPrimary wrap constraint name
 2016-01-30 17:03:33 +02:00
wubzz
0d20e5b534 .raw bindings should allow single Non-Array values. 2016-01-30 14:52:07 +01:00
wubzz
decd42856f Merge remote-tracking branch 'refs/remotes/tgriesser/master' into bugfix/proxy_query-error_event_in_transaction 2016-01-30 01:58:26 +01:00
wubzz
3f12e3f0a8 error -> err for consistency 2016-01-30 01:58:23 +01:00
wubzz
389865adf7 Merge remote-tracking branch 'refs/remotes/tgriesser/master' 2016-01-30 01:12:50 +01:00
blah238
c16cb5483e Merge pull request #1169 from wubzz/bugfix/debug_with_raw_shows_no_info 
Debug with raw shows no info
 2016-01-29 17:53:59 -06:00
wubzz
94397de4fc Fix the condition for _debug on .raw 2016-01-30 00:18:23 +01:00
wubzz
31dbb3acb3 Proxy query-error event from trx to main obj 2016-01-30 00:07:04 +01:00
wubzz
82b38740b7 Forgot to commit the updated Test for dropPrimary 2016-01-29 23:55:51 +01:00
wubzz
beda452715 Wrap dropConstraint with "" for pg tablecompiler 2016-01-29 23:42:36 +01:00
wubzz
e76dd15761 Merge remote-tracking branch 'refs/remotes/tgriesser/master' 2016-01-28 22:22:02 +01:00
Mikael Lepistö
d092682b1f Merge pull request #1155 from gergelyke/master 
fix(promise): require the standard interface, not the internal one
 2016-01-28 22:39:16 +02:00
Mikael Lepistö
5a94bc9b17 Merge pull request #1163 from wubzz/feature/add_new_event_query-error 
Feature/add new event query error
 2016-01-28 22:20:34 +02:00
wubzz
0a5fa372c9 Fixed indentation, arrow fn in place of bind 2016-01-28 21:15:23 +01:00
wubzz
a28e64d2a2 Add to the documentation about 'query-error' event. 2016-01-28 20:46:08 +01:00
wubzz
9c3bf330d9 Add a new event 'query-error' for when an error occurs. 2016-01-28 19:57:26 +01:00
Mikael Lepistö
0b1c813cde Merge pull request #1161 from lourd/master 
[Docs] Fixes #1148, closes errant <code> tag in docs
 2016-01-28 00:13:33 +02:00
Louis DeScioli
cd1f771ce9 Fixes #1148, closes errant <code> tag 
- There was a closing </column> instead of </code>
 2016-01-27 16:56:14 -05:00
wubzz
99c07ef1d9 Merge remote-tracking branch 'refs/remotes/tgriesser/master' 2016-01-27 21:05:21 +01:00
Mikael Lepistö
1f2d53f4b0 Merge pull request #1095 from gmichael225/sqlite3-dialect-escaping 
Sqlite3 dialect escaping
 2016-01-27 16:53:15 +02:00
Rhys van der Waerden
5453a2bca9 Merge pull request #1157 from techniq/patch-3 
Fix typos in foreign key docs
 2016-01-27 16:00:58 +11:00
Sean Lynch
a2ea077710 Fix typos in foreign key docs 
These slipped in as part of #1156
 2016-01-26 23:59:55 -05:00
Rhys van der Waerden
e88075dfa7 Merge pull request #1156 from techniq/patch-2 
Add docs for table foreign key modification functions, foreign/dropForeign
 2016-01-27 15:53:32 +11:00
Sean Lynch
937ba73b8b Add docs for table foreign key modification functions, foreign/dropForeign 2016-01-26 23:41:51 -05:00
gmichael225
537159cdf7 Removed old lib file 2016-01-27 11:09:03 +11:00
Gergely Nemeth
526a1f9a46 fix(promise): require the standard interface, not the internal one 2016-01-26 16:34:35 +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
Alexander Sagen
d25c87a941 Merge branch 'master' of github.com:tgriesser/knex 2016-01-25 02:17:22 +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
Rhys van der Waerden
c27abc740b Merge pull request #1149 from elhigu/remove-generated-lib-code-from-repository 
Remove generated lib from repository and run build in prepublish
 2016-01-22 13:37:32 +11:00
Mikael Lepistö
7140a48226 Remove generated lib from repository and run build in prepublish 2016-01-21 09:59:30 +02: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
Rhys van der Waerden
ddafbf9145 Merge pull request #1101 from galenandrew/fixEnvConfigErrorCLI 
Fix error with CLI trying to select environment config for "basic configuration"
 2015-12-23 09:53:12 +11:00
Rhys van der Waerden
61ffec916f Merge pull request #1107 from w3cj/master 
Add migrate:rollback to CLI section
 2015-12-23 09:48:29 +11:00
CJ R
bc4640c5ae fix wording on CLI migrate:rollback 2015-12-22 15:19:16 -07:00
CJ R
86feee2d83 Add migrate:rollback to CLI section 2015-12-22 14:58:16 -07:00
Sky Morey
f5c7afdd00 Merge pull request #1097 from BclEx/master 
mssql additional changes
 2015-12-17 11:18:26 -06:00
Andrew Turner
aa34750f8a add documentation for NODE_ENV as an environment selector in CLI 2015-12-17 10:57:18 -06:00
Andrew Turner
a7891874e3 default to basic config if env specific config does not exist 2015-12-17 10:57:11 -06:00
Isaac Lessard
6d2706771a 2616: removed double words 
deleted 'specifies' from ...object, which may specify specifies the... on line 2616
 2015-12-17 08:39:55 -07:00
Rhys van der Waerden
98dff98b4a Merge pull request #1099 from danoc/patch-1 
Add missing `=` in documentation
 2015-12-17 10:09:08 +11:00
Daniel O'Connor
1ba7a4f0a2 Fixes #1098 - Add missing = in documentation 2015-12-16 13:33:36 -08:00