6 files changed, 38 insertions, 0 deletions
diff --git a/activerecord/test/models/aircraft.rb b/activerecord/test/models/aircraft.rb
new file mode 100644
index 0000000000..0c47aab539
--- /dev/null
+++ b/activerecord/test/models/aircraft.rb
@@ -0,0 +1,3 @@
+class Aircraft < ActiveRecord::Base
+  has_many :engines, :foreign_key => "car_id"
+end
diff --git a/activerecord/test/models/bulb.rb b/activerecord/test/models/bulb.rb
index c68d008c26..0dcc8d5970 100644
--- a/activerecord/test/models/bulb.rb
+++ b/activerecord/test/models/bulb.rb
@@ -2,6 +2,8 @@ class Bulb < ActiveRecord::Base
   default_scope where(:name => 'defaulty')
   belongs_to :car
 
+  attr_protected :car_id, :frickinawesome
+
   attr_reader :scope_after_initialize
 
   after_initialize :record_scope_after_initialize
@@ -9,4 +11,21 @@ class Bulb < ActiveRecord::Base
     @scope_after_initialize = self.class.scoped
   end
 
+  def color=(color)
+    self[:color] = color.upcase + "!"
+  end
+
+  def self.new(attributes = {}, options = {}, &block)
+    bulb_type = (attributes || {}).delete(:bulb_type)
+
+    if options && options[:as] == :admin && bulb_type.present?
+      bulb_class = "#{bulb_type.to_s.camelize}Bulb".constantize
+      bulb_class.new(attributes, options, &block)
+    else
+      super
+    end
+  end
 end
+
+class CustomBulb < Bulb
+end
+\ No newline at end of file
diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index b036f0f5c9..76f20b1061 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -2,6 +2,11 @@ class Car < ActiveRecord::Base
 
   has_many :bulbs
   has_many :foo_bulbs, :class_name => "Bulb", :conditions => { :name => 'foo' }
+  has_many :frickinawesome_bulbs, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+
+  has_one :bulb
+  has_one :frickinawesome_bulb, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+
   has_many :tyres
   has_many :engines
   has_many :wheels, :as => :wheelable
diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb
index 991e0e051f..11a0f4ff63 100644
--- a/activerecord/test/models/member.rb
+++ b/activerecord/test/models/member.rb
@@ -1,8 +1,10 @@
 class Member < ActiveRecord::Base
   has_one :current_membership
+  has_one :selected_membership
   has_one :membership
   has_many :fellow_members, :through => :club, :source => :members
   has_one :club, :through => :current_membership
+  has_one :selected_club, :through => :selected_membership, :source => :club
   has_one :favourite_club, :through => :membership, :conditions => ["memberships.favourite = ?", true], :source => :club
   has_one :hairy_club, :through => :membership, :conditions => {:clubs => {:name => "Moustache and Eyebrow Fancier Club"}}, :source => :club
   has_one :sponsor, :as => :sponsorable
diff --git a/activerecord/test/models/membership.rb b/activerecord/test/models/membership.rb
index 905f948c37..bcbb7e42c5 100644
--- a/activerecord/test/models/membership.rb
+++ b/activerecord/test/models/membership.rb
@@ -7,3 +7,9 @@ class CurrentMembership < Membership
   belongs_to :member
   belongs_to :club
 end
+
+class SelectedMembership < Membership
+  def self.default_scope
+    select("'1' as foo")
+  end
+end
diff --git a/activerecord/test/models/string_key_object.rb b/activerecord/test/models/string_key_object.rb
new file mode 100644
index 0000000000..f8d4c6e0e4
--- /dev/null
+++ b/activerecord/test/models/string_key_object.rb
@@ -0,0 +1,3 @@
+class StringKeyObject < ActiveRecord::Base
+  set_primary_key :id
+end