aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/persistence.rb
diff options
context:
space:
mode:
authorWashington Luiz <huoxito@gmail.com>2014-03-14 22:20:13 -0300
committerWashington Luiz <huoxito@gmail.com>2014-03-14 22:20:13 -0300
commitea3a73e720b5ffed6b6220dc9ce92776804cb06f (patch)
treef5e3b3783d9fef9a0e89ee4f032221bbdbd485d7 /activerecord/lib/active_record/persistence.rb
parentb4c96490eeb1fbb944e116c7703dd528b37fc08a (diff)
downloadrails-ea3a73e720b5ffed6b6220dc9ce92776804cb06f.tar.gz
rails-ea3a73e720b5ffed6b6220dc9ce92776804cb06f.tar.bz2
rails-ea3a73e720b5ffed6b6220dc9ce92776804cb06f.zip
Still touch associations when theres no timestamp
Prior to Rails 4.0.4 when touching a object which doesn't have timestamp attributes (updated_at / updated_on) rails would still touch all associations. After 73ba2c14cd7d7dfb2d132b18c47ade995401736f it updates associations but rollsback because `touch` would return nil since there's no timestamp attribute
Diffstat (limited to 'activerecord/lib/active_record/persistence.rb')
-rw-r--r--activerecord/lib/active_record/persistence.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 4e63206cf4..905289f398 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -452,6 +452,8 @@ module ActiveRecord
changed_attributes.except!(*changes.keys)
primary_key = self.class.primary_key
self.class.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
+ else
+ true
end
end