aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/schema
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-07 13:28:46 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-07 13:28:46 -0300
commit2e3e171e311d158cd22e70f1760f3c5c35729e6c (patch)
treeac3dff62dd1b3fdef0a509c4447d9bc617e81fdd /activerecord/test/schema
parentd3adfd6d3b6bb07f4e4d56b017eff1ff740523ff (diff)
parent1dc98c143c4bf84ccfb55b30c7d41b29b62d50cf (diff)
downloadrails-2e3e171e311d158cd22e70f1760f3c5c35729e6c.tar.gz
rails-2e3e171e311d158cd22e70f1760f3c5c35729e6c.tar.bz2
rails-2e3e171e311d158cd22e70f1760f3c5c35729e6c.zip
Merge pull request #9105 from bemurphy/cache_key_updated_on
cache_key consults updated_on timestamp if present Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r--activerecord/test/schema/schema.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index cd9835259a..118271b594 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -219,6 +219,8 @@ ActiveRecord::Schema.define do
t.integer :salary, :default => 70000
t.datetime :created_at
t.datetime :updated_at
+ t.datetime :created_on
+ t.datetime :updated_on
end
create_table :developers_projects, :force => true, :id => false do |t|