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:04 -0800
commit5ac5acd63ee107ecc1bbe1677891e05864da96de (patch)
treea4f7cf51a6f236817321fa75bd48d01020143492 /activerecord/test
parent7ba3ecca341a7d770738274f78fb85d3e7695619 (diff)
parent06dcd9c0fb3868130c674048af16b4563d478324 (diff)
downloadrails-5ac5acd63ee107ecc1bbe1677891e05864da96de.tar.gz
rails-5ac5acd63ee107ecc1bbe1677891e05864da96de.tar.bz2
rails-5ac5acd63ee107ecc1bbe1677891e05864da96de.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 8a29089011..fb4ea4223d 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -712,8 +712,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|