aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-31 07:50:15 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-31 07:50:15 +0000
commitbe827f9348a703b3048cb7728d0de6d019279bd9 (patch)
tree951f051662b7c26754fa31ea05dce255523014ee /activerecord/test/models
parente59978aa867ef07e16ad64f73f1ed5cafa98d0ea (diff)
downloadrails-be827f9348a703b3048cb7728d0de6d019279bd9.tar.gz
rails-be827f9348a703b3048cb7728d0de6d019279bd9.tar.bz2
rails-be827f9348a703b3048cb7728d0de6d019279bd9.zip
Fixed preloading belongs_to associations which reference a custom foreign key. References #9640.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8762 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/models')
-rw-r--r--activerecord/test/models/owner.rb4
-rw-r--r--activerecord/test/models/pet.rb4
2 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb
new file mode 100644
index 0000000000..dbaf2ce688
--- /dev/null
+++ b/activerecord/test/models/owner.rb
@@ -0,0 +1,4 @@
+class Owner < ActiveRecord::Base
+ set_primary_key :owner_id
+ has_many :pets
+end \ No newline at end of file
diff --git a/activerecord/test/models/pet.rb b/activerecord/test/models/pet.rb
new file mode 100644
index 0000000000..889ce46f33
--- /dev/null
+++ b/activerecord/test/models/pet.rb
@@ -0,0 +1,4 @@
+class Pet < ActiveRecord::Base
+ set_primary_key :pet_id
+ belongs_to :owner
+end \ No newline at end of file