aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/schema
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-02-13 09:11:33 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-02-13 09:11:33 -0800
commit04c0aea47ab6530af3e9e6aa7c8edb26e6dfdbe7 (patch)
tree33741d89dc5dcb35a18c07f66d406c182752884e /activerecord/test/schema
parent3a5a01f7f6af2456acab1b662f618f326002ee5f (diff)
parent9f8b4d1510f66597bbe8732e507173217df9f14d (diff)
downloadrails-04c0aea47ab6530af3e9e6aa7c8edb26e6dfdbe7.tar.gz
rails-04c0aea47ab6530af3e9e6aa7c8edb26e6dfdbe7.tar.bz2
rails-04c0aea47ab6530af3e9e6aa7c8edb26e6dfdbe7.zip
Merge pull request #5000 from flavorpill/master-with-multidb-association-fix
Fix associations with per-class/multiple database connections
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r--activerecord/test/schema/schema.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index d473680fdc..428a85ab4e 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -760,4 +760,9 @@ end
Course.connection.create_table :courses, :force => true do |t|
t.column :name, :string, :null => false
+ t.column :college_id, :integer
+end
+
+College.connection.create_table :colleges, :force => true do |t|
+ t.column :name, :string, :null => false
end