3 files changed, 14 insertions, 0 deletions
diff --git a/activerecord/test/fixtures/db_definitions/schema.rb b/activerecord/test/fixtures/db_definitions/schema.rb
index 12dbcb8423..9b6b6987d2 100644
--- a/activerecord/test/fixtures/db_definitions/schema.rb
+++ b/activerecord/test/fixtures/db_definitions/schema.rb
@@ -335,4 +335,10 @@ ActiveRecord::Schema.define do
     t.column :parrot_id, :integer
     t.column :treasure_id, :integer
   end
+  
+  create_table :mateys, :id => false, :force => true do |t|
+    t.column :pirate_id, :integer
+    t.column :target_id, :integer
+    t.column :weight, :integer
+  end
 end
diff --git a/activerecord/test/fixtures/matey.rb b/activerecord/test/fixtures/matey.rb
new file mode 100644
index 0000000000..86442e0470
--- /dev/null
+++ b/activerecord/test/fixtures/matey.rb
@@ -0,0 +1,4 @@
+class Matey < ActiveRecord::Base
+  belongs_to :pirate
+  belongs_to :target, :class_name => 'Pirate', :foreign_key => 'target_id'
+end
diff --git a/activerecord/test/fixtures/mateys.yml b/activerecord/test/fixtures/mateys.yml
new file mode 100644
index 0000000000..9ecdd4ecd5
--- /dev/null
+++ b/activerecord/test/fixtures/mateys.yml
@@ -0,0 +1,4 @@
+blackbeard_to_redbeard:
+  pirate_id: <%= Fixtures.identify(:blackbeard) %>
+  target_id: <%= Fixtures.identify(:redbeard) %>
+  weight: 10