diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-06-07 16:26:28 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-06-07 16:26:28 +0200 |
| commit | 16f595f1b6cb8d248c93c5fd2c7033771edf2426 (patch) | |
| tree | cd6b396c2a770bbc12ec195e62232a483f58042f | |
| parent | 23a751c2e15800c1b4aa96c10d1bfebc56fa30b9 (diff) | |
| download | rails-16f595f1b6cb8d248c93c5fd2c7033771edf2426.tar.gz rails-16f595f1b6cb8d248c93c5fd2c7033771edf2426.tar.bz2 rails-16f595f1b6cb8d248c93c5fd2c7033771edf2426.zip | |
changelog for #15556 and credit @kuldeepaggarwal [Kuldeep Aggarwal]
This is a follow up to #15556
@kuldeepaggarwal did submit this patch way back (#13624).
| -rw-r--r-- | activerecord/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 5167ffbdeb..e7e414571d 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,9 @@ +* Make timezone aware attributes work with PostgreSQL array columns. + + Fixes #13402. + + *Kuldeep Aggarwal*, *Sean Griffin* + * `ActiveRecord::SchemaMigration` has no primary key regardless of the `primary_key_prefix_type` configuration. diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index 7db7d306a4..44a679a550 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -60,8 +60,6 @@ module ActiveRecord value.map { |v| convert_value_to_time_zone(v) } elsif value.respond_to?(:in_time_zone) value.in_time_zone - else - nil end end end |