2646 Commits

Author SHA1 Message Date
freshsun
b34d03c45e update index.js to work with aliyun rds
aliyun rds return a simplified version "PostgreSQL x.x.x", and function checkVersion failed to handle it
2016-03-24 22:17:02 +08:00
wubzz
5f65345894 Merge pull request #1132 from rfink/master
Add syntactic sugar - andWhereBetween and andWhereNotBetween
2016-03-24 14:38:31 +01:00
Ryan Fink
dc92ff2b71 Merged upstream 2016-03-24 09:22:07 -04:00
Rhys van der Waerden
32fec2bfc1 Merge pull request #1292 from light24bulbs/master
update liftoff dependency so that coffeescript knexfiles and configurations are supported again.
2016-03-18 14:13:09 +11:00
Rhys van der Waerden
4fb7e3d997 Merge pull request #1294 from gnarmedia/patch-1
Fix typo
2016-03-18 14:12:26 +11:00
Adam Murphy
4c272717b9 Fix typo
sue/sure
2016-03-17 20:00:51 -07:00
light24bulbs
ed7e7e7b0f update liftoff dependency so that coffeescript knexfiles and configurations are no longer broken
Suggest adding coffeescript to test process if continued support is desired.
2016-03-17 13:11:20 -07:00
Mikael Lepistö
c69e649fde Merge pull request #1289 from maxcnunes/wrap-index
Wrap index names
2016-03-17 09:01:49 +02:00
Max Claus Nunes
8d6264e96b wrap index names 2016-03-16 21:52:51 -03:00
Mikael Lepistö
990cb8958b Merge pull request #956 from harriha/docs/migration-config
Improve tests and docs for migrate API
2016-03-16 23:19:43 +02:00
harriha
0008de1587 Add basic unit tests for migrate 2016-03-16 22:29:17 +02:00
harriha
76657638b6 Move default configs to CONFIG_DEFAULT, add disableTransactions 2016-03-16 22:29:16 +02:00
harriha
1ab562f01c Add a mention about disableTransactions to migration config docs 2016-03-16 22:29:15 +02:00
harriha
3a64f9503a Fix and improve migration config option docs
- Add descriptions for each config option, formatting them as a list
- Remove 'database' which seemed to be obsolete
2016-03-16 22:29:14 +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
wubzz
729a5748bb Add reflect and fix transaction settled 2016-03-16 17:52:18 +01:00
Mikael Lepistö
4189968b53 Merge pull request #601 from joeframbach/postgres_inherits
Add inherits to postgres. Updated dialect-specific methods.
2016-03-16 10:55:30 +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
b32fadf1e8 Prevent potential regression of argument tz (timezone) 2016-03-15 21:53:23 +01: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
7f4813f59b Changes to Bluebird usage according to 3.0 changelog 2016-03-15 20:52:42 +01:00
wubzz
231b5d08e1 Update bluebird dependency 2.9.24 -> 3.3.4. Fixes #1216 2016-03-15 20:37:29 +01:00
wubzz
e1ed3851a8 Merge pull request #1242 from wubzz/update_lodash_dependency
Update lodash from 3.7.0 -> 4.6.0
2016-03-15 19:57:48 +01:00
wubzz
c8e73c392c Fix broken import in tablebuilder 2016-03-15 18:15:27 +01:00
wubzz
3b7070f2e5 Replace 'findWhere' with 'find' 2016-03-15 18:12:42 +01:00
wubzz
c79453ac3a Change _.pluck -> _.map in all tests 2016-03-15 18:12:40 +01:00
wubzz
d1c3d7429d Fix mysql processResponse 'pluck' -> 'map' 2016-03-15 18:12:39 +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
blah238
71209a3f91 Merge pull request #1277 from joepie91/patch-1
Fix a few hyperlinks in the changelog
2016-03-14 16:39:47 -05:00
Sven Slootweg
649715a4c5 Fix a few hyperlinks in the changelog
The hash (#) was missing for two hyperlinks. This fixes that.
2016-03-14 22:32:26 +01:00
Mikael Lepistö
8b3ca28557 Merge pull request #1270 from wubzz/bugfix/enforce_callback_in_tablebuilder
Add TypeError if missing callback in Schema .createTable/.table
2016-03-14 10:15:45 +02:00
wubzz
faca736ed5 Fix jshint issues 2016-03-11 23:32:43 +01:00
wubzz
2738697f42 Add a TypeError when failing to supply a callback function to .createTable and .table. 2016-03-11 23:22:30 +01:00
Mikael Lepistö
3ebf7959a4 Merge pull request #1251 from wubzz/bugfix/named_bindings
Update regex for named bindings
2016-03-11 23:59:30 +02:00
wubzz
20f8ac59e5 Added information to documentation and clarified existing documentation for named bindings. 2016-03-11 20:42: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
86e9c16268 If a named binding is left undefined, then don't replace anything. 2016-03-11 20:41:23 +01:00
wubzz
934811ccd4 Handle empty bindings and dont add an extra space. 2016-03-11 20:41:22 +01:00
wubzz
b614a2f81c Update regex for named bindings 2016-03-11 20:41:19 +01:00
wubzz
de22fd4a9e Merge pull request #1257 from jurko-gospodnetic/fix-trx-callback-throw-handling
Fix transaction callback throw handling
2016-03-09 13:31:29 +01:00
Jurko Gospodnetić
19477f6832 merge changes from master 2016-03-09 07:11:17 +01:00
Rhys van der Waerden
e5acb0498d Merge pull request #1262 from jurko-gospodnetic/code-cleanup
Add missing dots at ends of comments in util/make-knex.js (stylistic)
2016-03-09 17:06:06 +11:00
Jurko Gospodnetić
c9df3f2195 add missing dots at ends of comments in util/make-knex.js (stylistic) 2016-03-09 07:01:15 +01:00
wubzz
adcfeb5611 Merge pull request #1261 from raijinsetsu/master
Update documentation for table.foreign
2016-03-08 19:20:15 +01:00