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

833 Commits

Author SHA1 Message Date
Byron Wong
89302b2e92 "maria" instead of "mariasql" 2016-05-26 17:04:30 -07:00
Byron Wong
c0a45b58a2 address wubzz's comments, improvements 
* add timeout to acquiring connection inside `cancelQuery` + test
* use `KILL QUERY :id` instead of `KILL :id` so the connection is preserved
 2016-05-26 16:56:15 -07:00
Byron Wong
ea5cbec4e7 Kill queries after timeout for MySQL 2016-05-26 12:00:47 -07:00
Rhys van der Waerden
327671f678 Merge pull request #1427 from vellotis/fix-version-on-constructor 
Expose Knex version also on the constructor
 2016-05-22 18:59:44 +10:00
wubzz
9118e05f23 Merge pull request #1431 from wubzz/bugfix/inconsistency_of_primary_and_dropPrimary 
Ensure .primary() and .dropPrimary() are the same across all dialects.
 2016-05-20 15:34:46 +02:00
Rhys van der Waerden
25ca625aa5 Merge pull request #1428 from vellotis/ft-1424 
Allow using custom Client/Dialect
 2016-05-20 17:19:21 +10:00
Kaarel Raspel
6cbceefdb8 Inherit knex instance VERSION property from constructor 2016-05-19 23:48:24 +03:00
wubzz
4e5d152847 Fix indentation of oracle schema unit file 2016-05-19 22:35:33 +02:00
wubzz
c2c31ce859 Change default constraintName in .primary() to match docs and .dropPrimary() 2016-05-19 22:13:09 +02:00
wubzz
4ba581b362 Fix some unit tests 2016-05-19 21:36:30 +02:00
wubzz
5a6ab64d06 Ensure .primary() and .dropPrimary() are the same across all dialects. 2016-05-19 21:30:17 +02:00
Mikael Lepistö
69e33c7f64 Pass valueForUndefined also to transacting client. Fixes #1423 2016-05-19 18:53:29 +03:00
Kaarel Raspel
41344a9399 Fix configs in tests 2016-05-19 13:33:13 +03:00
Alex Whitman
202ddddddb Use calling transaction with batchInsert 2016-05-19 11:07:29 +01:00
Kaarel Raspel
eed3d91c7f Refactor and tests 
- Test for implemented case
- Test for currently untested case
 2016-05-19 12:48:59 +03:00
Rhys van der Waerden
2e7650a8e4 Remove JSHint comments 2016-05-18 20:07:33 +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
Rhys van der Waerden
a06b44a29c Merge pull request #1397 from atiertant/join-nest-statements 
Allow joins to nest conditional statements
 2016-05-14 11:19:51 +10:00
Rhys van der Waerden
815c6ce8f0 Merge pull request #1401 from nickwhiteley/master 
#1348 MSSQL adding and dropping multiple columns fix
 2016-05-14 10:06:08 +10:00
Nick Whiteley
4161dab19e #1348 MSSQL adding and dropping multiple columns fix 2016-05-12 10:24:29 +01:00
Mikael Lepistö
c935b583cb Insert tests were ran before DB was initialized (schema / migrate / seed). 2016-05-12 10:43:33 +03:00
Mikael Lepistö
9114bdd8b3 Changed implementation of replacing undefined with DEFAULT already in query compiler for every dialect. 2016-05-12 10:24:42 +03:00
Mikael Lepistö
9fab58c2b2 Evaluated multi insert default for undefined already in query compiler 2016-05-12 10:24:42 +03:00
Alexandre Tiertant
f3c78f6c85 add test 2016-05-12 09:09:42 +02:00
wubzz
59d9ff89cd Remove mysql from assertions 2016-05-11 17:49:18 +02:00
wubzz
6bd4b8ac32 Only assert returning values on supported dialects. 2016-05-11 17:31:33 +02:00
wubzz
2f44a48fa8 BatchInsert remake proposal. Fixes #1391 2016-05-09 19:01:00 +02:00
wubzz
8a303f1a96 Merge pull request #1342 from h0vhannes/mssql-conn-urls 
Correct connection URL parsing for MSSQL
 2016-04-29 12:32:01 +02:00
Wolfgang Faust
a7f609aa4f mssql dialect: Fix integration tests that check for quoted wrappers. 
PR #1289 made it quote the index/constraint names, but did not update the tests accordingly.
 2016-04-21 20:56:41 +00:00
Hovhannes Kuloghlyan
8e41a332b9 Add parse URL connection string tests for MSSQL 2016-04-12 03:59:31 +04:00
wubzz
d3b1fcc4b8 Fixed test, forgot ES6 is not supported in the test suite. 2016-04-01 23:39:04 +02:00
wubzz
0b45356456 .renameColumn should not drop defaultValue or nullable state. Currently this happens for mysql. Fixes #933 2016-04-01 23:37:12 +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
wubzz
3a925c30e1 Ensure events are triggered on the builder as well as the client. 2016-03-24 19:12:29 +01:00
Ryan Fink
dc92ff2b71 Merged upstream 2016-03-24 09:22:07 -04:00
Max Claus Nunes
8d6264e96b wrap index names 2016-03-16 21:52:51 -03:00
harriha
0008de1587 Add basic unit tests for migrate 2016-03-16 22:29:17 +02:00
Mikael Lepistö
cb1bea1d57 Merge pull request #1279 from wubzz/update_bluebird_dependency 
Update bluebird dependency 2.9.24 -> 3.3.4. Fixes #1216
 2016-03-16 20:04:58 +02:00
Joe Frambach
cf8222d9eb Add inherits to postgres. Updated dialect-specific methods. 2016-03-15 16:40:49 -07:00
Mikael Lepistö
2f531190bb Merge pull request #1109 from kmikael/timestamps-now 
Add option to timestamps to be not null and default to the current timestamp
 2016-03-15 23:09:16 +02:00
wubzz
a152d92408 Only call prepBindings when a client is set on the instance of Raw. Also add a test so this does not break in the future. 2016-03-15 21:47:59 +01:00
wubzz
f286da2796 Preserve original bindings at all times. Move prepBindings calls to toSQL() instead. Enforce 'bindings' to always be present in .toSQL() resultset. 2016-03-15 21:47:59 +01:00
wubzz
02281ef91b Fix valuesForUndefined actual query being executed. Fixes #1268 2016-03-15 21:47:58 +01:00
wubzz
6621e3b0ce Fix promisify in knexfile.js 2016-03-15 21:14:17 +01:00
wubzz
c79453ac3a Change _.pluck -> _.map in all tests 2016-03-15 18:12:40 +01:00
wubzz
9d2514df3f Fix logger.js _.contains -> _.includes 2016-03-15 18:12:38 +01:00
wubzz
f37824a11e Fix indentation? 2016-03-15 18:12:36 +01:00
wubzz
1d27fb8550 Update lodash from 3.7.0 -> 4.6.0 2016-03-15 18:11:13 +01:00
wubzz
faca736ed5 Fix jshint issues 2016-03-11 23:32:43 +01:00