diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-06 17:50:45 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-06 17:53:06 -0200 |
| commit | b71e08f8ba0447971553452a00917d00020edd35 (patch) | |
| tree | 9cbd1f697da46c6f33dacefe85849ddd1aaadaf9 /activerecord/CHANGELOG.md | |
| parent | e26fa7b9216443c4dfcb887694afbefa70a9e450 (diff) | |
| download | rails-b71e08f8ba0447971553452a00917d00020edd35.tar.gz rails-b71e08f8ba0447971553452a00917d00020edd35.tar.bz2 rails-b71e08f8ba0447971553452a00917d00020edd35.zip | |
Raise ArgumentError when passing nil to Relation#merge
nil or false should not be valid argument to the merge method.
Closes #12264
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 5ca93b3cd3..46d10d5bff 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,10 @@ +* Raise `ArgumentError` when passing `nil` or `false` to `Relation#merge`. + + These are not valid values to merge in a relation so it should warn the users + early. + + *Rafael Mendonça França* + * Use `SCHEMA` instead of `DB_STRUCTURE` for specifiying structure file. This makes the db:structure tasks consistent with test:load_structure. |