3 files changed, 45 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index 146b77a95c..65328522c3 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -52,6 +52,36 @@ module ActiveRecord
         assert_equal str, value
       end
 
+      def test_pk_and_sequence_for
+        pk, seq = @conn.pk_and_sequence_for('ex')
+        assert_equal 'id', pk
+        assert_equal @conn.default_sequence_name('ex', 'id'), seq
+      end
+
+      def test_pk_and_sequence_for_with_non_standard_primary_key
+        @conn.exec_query('drop table if exists ex_with_non_standard_pk')
+        @conn.exec_query(<<-eosql)
+          CREATE TABLE `ex_with_non_standard_pk` (
+            `code` INT(11) DEFAULT NULL auto_increment,
+             PRIMARY KEY  (`code`))
+        eosql
+        pk, seq = @conn.pk_and_sequence_for('ex_with_non_standard_pk')
+        assert_equal 'code', pk
+        assert_equal @conn.default_sequence_name('ex_with_non_standard_pk', 'code'), seq
+      end
+
+      def test_pk_and_sequence_for_with_custom_index_type_pk
+        @conn.exec_query('drop table if exists ex_with_custom_index_type_pk')
+        @conn.exec_query(<<-eosql)
+          CREATE TABLE `ex_with_custom_index_type_pk` (
+            `id` INT(11) DEFAULT NULL auto_increment,
+             PRIMARY KEY  USING BTREE (`id`))
+        eosql
+        pk, seq = @conn.pk_and_sequence_for('ex_with_custom_index_type_pk')
+        assert_equal 'id', pk
+        assert_equal @conn.default_sequence_name('ex_with_custom_index_type_pk', 'id'), seq
+      end
+
       private
       def insert(ctx, data)
         binds   = data.map { |name, value|
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 28bf1c60e5..4cc1378026 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1096,10 +1096,23 @@ class EagerAssociationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_deep_including_through_habtm
+    posts = Post.find(:all, :include => {:categories => :categorizations}, :order => "posts.id")
+    assert_no_queries { assert_equal 2, posts[0].categories[0].categorizations.length }
+    assert_no_queries { assert_equal 1, posts[0].categories[1].categorizations.length }
+    assert_no_queries { assert_equal 2, posts[1].categories[0].categorizations.length }
+  end
+
   test "scoping with a circular preload" do
     assert_equal Comment.find(1), Comment.preload(:post => :comments).scoping { Comment.find(1) }
   end
 
+  test "circular preload does not modify unscoped" do
+    expected = FirstPost.unscoped.find(2)
+    FirstPost.preload(:comments => :first_post).find(1)
+    assert_equal expected, FirstPost.unscoped.find(2)
+  end
+
   test "preload ignores the scoping" do
     assert_equal(
       Comment.find(1).post,
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb
index 88b139d931..bca937a299 100644
--- a/activerecord/test/models/comment.rb
+++ b/activerecord/test/models/comment.rb
@@ -11,6 +11,8 @@ class Comment < ActiveRecord::Base
   belongs_to :post, :counter_cache => true
   has_many :ratings
 
+  belongs_to :first_post, :foreign_key => :post_id
+
   has_many :children, :class_name => 'Comment', :foreign_key => :parent_id
   belongs_to :parent, :class_name => 'Comment', :counter_cache => :children_count