3 files changed, 39 insertions, 17 deletions
diff --git a/activerecord/test/models/contact.rb b/activerecord/test/models/contact.rb
index 3d15c7fbed..a1cb8d62b6 100644
--- a/activerecord/test/models/contact.rb
+++ b/activerecord/test/models/contact.rb
@@ -1,25 +1,40 @@
-class Contact < ActiveRecord::Base
-  establish_connection(:adapter => 'fake')
+module ContactFakeColumns
+  def self.extended(base)
+    base.class_eval do
+      establish_connection(:adapter => 'fake')
+
+      connection.tables = [table_name]
+      connection.primary_keys = {
+        table_name => 'id'
+      }
+
+      column :name,           :string
+      column :age,            :integer
+      column :avatar,         :binary
+      column :created_at,     :datetime
+      column :awesome,        :boolean
+      column :preferences,    :string
+      column :alternative_id, :integer
+
+      serialize :preferences
 
-  connection.tables = ['contacts']
-  connection.primary_keys = {
-    'contacts' => 'id'
-  }
+      belongs_to :alternative, :class_name => 'Contact'
+    end
+  end
 
   # mock out self.columns so no pesky db is needed for these tests
-  def self.column(name, sql_type = nil, options = {})
-    connection.merge_column('contacts', name, sql_type, options)
+  def column(name, sql_type = nil, options = {})
+    connection.merge_column(table_name, name, sql_type, options)
   end
+end
 
-  column :name,           :string
-  column :age,            :integer
-  column :avatar,         :binary
-  column :created_at,     :datetime
-  column :awesome,        :boolean
-  column :preferences,    :string
-  column :alternative_id, :integer
+class Contact < ActiveRecord::Base
+  extend ContactFakeColumns
+end
 
-  serialize :preferences
+class ContactSti < ActiveRecord::Base
+  extend ContactFakeColumns
+  column :type, :string
 
-  belongs_to :alternative, :class_name => 'Contact'
+  def type; 'ContactSti' end
 end
diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb
index 11a0f4ff63..1f719b0858 100644
--- a/activerecord/test/models/member.rb
+++ b/activerecord/test/models/member.rb
@@ -30,3 +30,8 @@ class Member < ActiveRecord::Base
   has_many :current_memberships, :conditions => { :favourite => true }
   has_many :clubs, :through => :current_memberships
 end
+
+class SelfMember < ActiveRecord::Base
+  self.table_name = "members"
+  has_and_belongs_to_many :friends, :class_name => "SelfMember", :join_table => "member_friends"
+end
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 079e403444..fb27c9d4f0 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -58,6 +58,8 @@ class Topic < ActiveRecord::Base
     id
   end
 
+  alias_attribute :heading, :title
+
   before_validation :before_validation_for_transaction
   before_save :before_save_for_transaction
   before_destroy :before_destroy_for_transaction