aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-26 09:41:04 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-26 09:41:43 -0800
commit33fda1ca568fa1f41eb494ae9e99055c304d7aeb (patch)
treee73d921009f5705e7e5d2807e03b9330a3ba8a41 /activerecord/test
parentef7fc6ebb3fc7688c11ee664b9748b6c0ed4eb7b (diff)
downloadrails-33fda1ca568fa1f41eb494ae9e99055c304d7aeb.tar.gz
rails-33fda1ca568fa1f41eb494ae9e99055c304d7aeb.tar.bz2
rails-33fda1ca568fa1f41eb494ae9e99055c304d7aeb.zip
Merge pull request #4696 from rafaelfranca/issue-4653
Remove extra attributes from HABTM join tables in AR tests
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/schema/schema.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index e2cd7ce9e4..f4226d4720 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -724,8 +724,6 @@ ActiveRecord::Schema.define do
create_table :countries_treaties, :force => true, :id => false do |t|
t.string :country_id, :null => false
t.string :treaty_id, :null => false
- t.datetime :created_at
- t.datetime :updated_at
end
create_table :liquid, :force => true do |t|