4 files changed, 48 insertions, 1 deletions
diff --git a/activerecord/test/models/bulb.rb b/activerecord/test/models/bulb.rb
index 888afc7604..ab3caa3f79 100644
--- a/activerecord/test/models/bulb.rb
+++ b/activerecord/test/models/bulb.rb
@@ -1,6 +1,6 @@
 class Bulb < ActiveRecord::Base
   default_scope where(:name => 'defaulty')
-  belongs_to :car
+  belongs_to :car, :touch => true
 
   attr_protected :car_id, :frickinawesome
 
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 4dc9fff9fd..f8b758b3c2 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -63,6 +63,15 @@ class Developer < ActiveRecord::Base
       self.all
     end
   end
+
+  after_find :track_instance_count
+  cattr_accessor :instance_count
+
+  def track_instance_count
+    self.class.instance_count ||= 0
+    self.class.instance_count += 1
+  end
+  private :track_instance_count
 end
 
 class AuditLog < ActiveRecord::Base
@@ -236,3 +245,8 @@ class ThreadsafeDeveloper < ActiveRecord::Base
     limit(1)
   end
 end
+
+class CachedDeveloper < ActiveRecord::Base
+  self.table_name = "developers"
+  self.cache_timestamp_format = :nsec
+end
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index 5b92227f4a..07c529d685 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -86,3 +86,30 @@ class TightPerson < ActiveRecord::Base
 end
 
 class TightDescendant < TightPerson; end
+
+class RichPerson < ActiveRecord::Base
+  self.table_name = 'people'
+
+  has_and_belongs_to_many :treasures, :join_table => 'peoples_treasures'
+end
+
+class Insure
+  INSURES = %W{life annuality}
+
+  def self.load mask
+    INSURES.select do |insure|
+      (1 << INSURES.index(insure)) & mask.to_i > 0
+    end
+  end
+
+  def self.dump insures
+    numbers = insures.map { |insure| INSURES.index(insure) }
+    numbers.inject(0) { |sum, n| sum + (1 << n) }
+  end
+end
+
+class SerializedPerson < ActiveRecord::Base
+  self.table_name = 'people'
+
+  serialize :insures, Insure
+end
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 1a1a18166a..5166fefe81 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -112,6 +112,12 @@ class ImportantTopic < Topic
   serialize :important, Hash
 end
 
+class BlankTopic < Topic
+  def blank?
+    true
+  end
+end
+
 module Web
   class Topic < ActiveRecord::Base
     has_many :replies, :dependent => :destroy, :foreign_key => "parent_id", :class_name => 'Web::Reply'