Commits · 0e4e704543ce2547cdc82dbfb4e29fb96ba23b1d · public / sequelize

27 Jan, 2016 1 commit

QueryInterface.upsert accepts values by field name (.field) but picked primary k… · 0e4e7045

…ey values for the where clause using attribute name. I modified upsert so that .field is taken into account when collecting data for the upsert where clause. I've also added a failing test case which now passes.

committed Jan 26, 2016

0e4e7045 Browse Files

22 Jan, 2016 2 commits
- Merge pull request #5268 from tornillo/master · 7330ad8b
```
Fix Instance.reload issues
```
  Mick Hansen committed Jan 22, 2016
  7330ad8b Browse Files
- Fix Instance.reload issues · d60ab0e3
```
Fix error message

Fix test

Fix changelog

Fix jshint error
```
  tornillo committed Jan 22, 2016
  d60ab0e3 Browse Files
21 Jan, 2016 10 commits
- 3.18.0 · 47ac7b4b
  Mick Hansen committed Jan 21, 2016
  
  47ac7b4b Browse Files
- changelog for 3.18.0 · 990e95e8
  Mick Hansen committed Jan 21, 2016
  
  990e95e8 Browse Files
- fix(include): hasMany.separate should use foreign key field for grouped limit an… · e2dd7da9
```
…d only apply grouped limit if more than one instance being requested
```
  Mick Hansen committed Jan 21, 2016
  e2dd7da9 Browse Files
- Merge pull request #5274 from sequelize/4958merge · 5a36157e
```
Reroll #4958
```
  Jan Aagaard Meier committed Jan 21, 2016
  5a36157e Browse Files
- mssql not allow +timezone datetime format · 4d0af10d
  zhuqingling committed Jan 20, 2016
  
  4d0af10d
- Merge pull request #5272 from sequelize/4464merge · 967b9d08
```
Merge PR #4464 and add tests
```
  Jan Aagaard Meier committed Jan 20, 2016
  967b9d08 Browse Files
- Merge PR #4464 and add tests · b47f5cdd
  Jan Aagaard Meier committed Jan 20, 2016
  
  b47f5cdd Browse Files
- Merge pull request #5263 from EToreo/master · 680b4328
```
Added retry and options to retry when queries fail with SQL_BUSY state.
```
  Mick Hansen committed Jan 20, 2016
  680b4328 Browse Files
- Pulled changes in from sequelize:master · 9ad93d24
  Eric Thompson committed Jan 20, 2016
  
  9ad93d24
- Corrected retry query unit test to only run on sqlite. · c1fc0fa9
  Eric Thompson committed Jan 20, 2016
  
  c1fc0fa9 Browse Files
20 Jan, 2016 8 commits
- Merge pull request #5260 from sdebionne/fix/pg-error-detail · eca0a902
```
errDetail may be undefined in Postgres formatError
```
  Mick Hansen committed Jan 20, 2016
  eca0a902 Browse Files
- Merge pull request #5262 from sequelize/greenkeeper-babel-core-6.4.5 · d17bf667
```
babel-core@6.4.5 breaks build ⚠️
```
  Mick Hansen committed Jan 20, 2016
  d17bf667 Browse Files
- Merge pull request #5226 from sushantdhiman/fix-5092 · e6ddc697
```
Fix 5092
```
  Mick Hansen committed Jan 20, 2016
  e6ddc697 Browse Files
- fix(#5092): passing model and option to getWhereConditions in deleteQuery · 27d2426a
  Sushant committed Jan 20, 2016
  
  27d2426a Browse Files
- fix(#5092): test fail when destroy JSONB data with where · 5ad75762
  Sushant committed Jan 20, 2016
  
  5ad75762 Browse Files
- Added retry and options to retry when queries fail with SQL_BUSY state. · 7882c9a4
  Eric Thompson committed Jan 19, 2016
  
  7882c9a4 Browse Files
- chore(package): update babel-core to version 6.4.5 · 0427103f
```
http://greenkeeper.io/
```
  greenkeeperio-bot committed Jan 20, 2016
  0427103f Browse Files
- errDetail may be undefined · e1162d56
  Samuel Debionne committed Jan 19, 2016
  
  e1162d56
19 Jan, 2016 11 commits
- Merge pull request #5255 from tornillo/master · ad124e3b
```
Fix jshint errors
```
  Mick Hansen committed Jan 19, 2016
  ad124e3b Browse Files
- Fix jshint errors · 1213f503
  tornillo committed Jan 19, 2016
  
  1213f503
- Merge pull request #5253 from tornillo/master · c1f37c53
```
Prevent Promise (bluebird) warnings in tests (part 2)
```
  Mick Hansen committed Jan 19, 2016
  c1f37c53 Browse Files
- Merge pull request #5238 from ajfranzoia/support-bulk-silent · f0862463
```
Support silent: true in bulk update
```
  Mick Hansen committed Jan 19, 2016
  f0862463 Browse Files
- Prevent Promise (bluebird) warnings in tests (part 2) · db688a53
  tornillo committed Jan 19, 2016
  
  db688a53 Browse Files
- Merge pull request #5249 from rmzg/master · a9d473d9
```
Updated the fix for user defined attributes overwriting builtins.
```
  Jan Aagaard Meier committed Jan 18, 2016
  a9d473d9 Browse Files
- Merge pull request #5221 from sequelize/greenkeeper-jshint-2.9.1 · aa099574
```
jshint@2.9.1 breaks build ⚠️
```
  Jan Aagaard Meier committed Jan 18, 2016
  aa099574 Browse Files
- Merge pull request #5244 from sequelize/greenkeeper-generic-pool-2.4.0 · 8760076b
```
Update generic-pool to version 2.4.0 🚀
```
  Jan Aagaard Meier committed Jan 18, 2016
  8760076b Browse Files
- Merge pull request #5250 from tornillo/master · a79602ec
```
Prevent Promise (bluebird) warnings
```
  Jan Aagaard Meier committed Jan 18, 2016
  a79602ec Browse Files
- Merge pull request #5231 from seegno-forks/enhancement/add-if-exists-to-drop-schema · 1f429abc
```
Add `IF EXISTS` to Postgres drop schema query
```
  Mick Hansen committed Jan 18, 2016
  1f429abc Browse Files
- Prevent Promise (bluebird) warnings · 01e8d333
  tornillo committed Jan 18, 2016
  
  01e8d333 Browse Files
18 Jan, 2016 5 commits
- Add `IF EXISTS` to Postgres drop schema query · 058acb95
  Nuno Sousa committed Jan 18, 2016
  
  058acb95 Browse Files
- Updated the fix for user defined attributes overwriting builtins. · 719701bd
```
More appropriate fix for the merge: https://github.com/sequelize/sequelize/pull/5219
Now uses hasOwnProperty to more accurately check if the user attribute
matches a builtin.
```
  Robert Grimes committed Jan 18, 2016
  719701bd Browse Files
- fix: intermittent test failure · fac5fabf
  Mick Hansen committed Jan 18, 2016
  
  fac5fabf Browse Files
- chore(package): update generic-pool to version 2.4.0 · 910fb290
```
http://greenkeeper.io/
```
  greenkeeperio-bot committed Jan 18, 2016
  910fb290 Browse Files
- Support silent: true in bulk update · ec456f59
  Augusto Franzoia committed Jan 17, 2016
  
  ec456f59
17 Jan, 2016 3 commits
- Merge pull request #5219 from rmzg/master · 3b656127
```
Fixes a bug with user defined attribute names overwriting builtins.
```
  Mick Hansen committed Jan 17, 2016
  3b656127 Browse Files
- Merge pull request #5236 from ajfranzoia/fixes-jshint-2.9.1 · 731ccd00
```
Code fixes for jshint@2.9.1
```
  Mick Hansen committed Jan 17, 2016
  731ccd00 Browse Files
- Fixes for jshint@2.9.1 · 72c0fb8b
  Augusto Franzoia committed Jan 17, 2016
  
  72c0fb8b Browse Files