13 files changed, 106 insertions, 26 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb
new file mode 100644
index 0000000000..9ecd901eac
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql2/schema_migrations_test.rb
@@ -0,0 +1,26 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class Mysql2Adapter
+      class SchemaMigrationsTest < ActiveRecord::TestCase
+        def test_initializes_schema_migrations_for_encoding_utf8mb4
+          conn = ActiveRecord::Base.connection
+
+          smtn = ActiveRecord::Migrator.schema_migrations_table_name
+          conn.drop_table(smtn) if conn.table_exists?(smtn)
+
+          config = conn.instance_variable_get(:@config)
+          original_encoding = config[:encoding]
+
+          config[:encoding] = 'utf8mb4'
+          conn.initialize_schema_migrations_table
+
+          assert conn.column_exists?(smtn, :version, :string, limit: Mysql2Adapter::MAX_INDEX_LENGTH_FOR_UTF8MB4)
+        ensure
+          config[:encoding] = original_encoding
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 1ddd380f23..781b87741d 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -789,6 +789,37 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_calling_update_attributes_on_id_changes_the_counter_cache
+    topic = Topic.order("id ASC").first
+    original_count = topic.replies.to_a.size
+    assert_equal original_count, topic.replies_count
+
+    first_reply = topic.replies.first
+    first_reply.update_attributes(:parent_id => nil)
+    assert_equal original_count - 1, topic.reload.replies_count
+
+    first_reply.update_attributes(:parent_id => topic.id)
+    assert_equal original_count, topic.reload.replies_count
+  end
+
+  def test_calling_update_attributes_changing_ids_doesnt_change_counter_cache
+    topic1 = Topic.find(1)
+    topic2 = Topic.find(3)
+    original_count1 = topic1.replies.to_a.size
+    original_count2 = topic2.replies.to_a.size
+
+    reply1 = topic1.replies.first
+    reply2 = topic2.replies.first
+
+    reply1.update_attributes(:parent_id => topic2.id)
+    assert_equal original_count1 - 1, topic1.reload.replies_count
+    assert_equal original_count2 + 1, topic2.reload.replies_count
+
+    reply2.update_attributes(:parent_id => topic1.id)
+    assert_equal original_count1, topic1.reload.replies_count
+    assert_equal original_count2, topic2.reload.replies_count
+  end
+
   def test_deleting_a_collection
     force_signal37_to_load_all_clients_of_firm
     companies(:first_firm).clients_of_firm.create("name" => "Another Client")
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 960c27da3e..445322486c 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -307,20 +307,6 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal("last_read", ex.errors[0].attribute)
   end
 
-  def test_initialize_abstract_class
-    e = assert_raises(NotImplementedError) do
-      FirstAbstractClass.new
-    end
-    assert_equal("FirstAbstractClass is an abstract class and can not be instantiated.", e.message)
-  end
-
-  def test_initialize_base
-    e = assert_raises(NotImplementedError) do
-      ActiveRecord::Base.new
-    end
-    assert_equal("ActiveRecord::Base is an abstract class and can not be instantiated.", e.message)
-  end
-
   def test_create_after_initialize_without_block
     cb = CustomBulb.create(:name => 'Dude')
     assert_equal('Dude', cb.name)
diff --git a/activerecord/test/cases/counter_cache_test.rb b/activerecord/test/cases/counter_cache_test.rb
index 7de2ceae88..7d06fb5093 100644
--- a/activerecord/test/cases/counter_cache_test.rb
+++ b/activerecord/test/cases/counter_cache_test.rb
@@ -118,7 +118,7 @@ class CounterCacheTest < ActiveRecord::TestCase
   test "reset the right counter if two have the same foreign key" do
     michael = people(:michael)
     assert_nothing_raised(ActiveRecord::StatementInvalid) do
-      Person.reset_counters(michael.id, :followers)
+      Person.reset_counters(michael.id, :friends_too)
     end
   end
 
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index 0b9ccbf60a..99d54e7526 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -172,6 +172,20 @@ class InheritanceTest < ActiveRecord::TestCase
     assert_equal Firm, firm.class
   end
 
+  def test_new_with_abstract_class
+    e = assert_raises(NotImplementedError) do
+      AbstractCompany.new
+    end
+    assert_equal("AbstractCompany is an abstract class and can not be instantiated.", e.message)
+  end
+
+  def test_new_with_ar_base
+    e = assert_raises(NotImplementedError) do
+      ActiveRecord::Base.new
+    end
+    assert_equal("ActiveRecord::Base is an abstract class and can not be instantiated.", e.message)
+  end
+
   def test_new_with_invalid_type
     assert_raise(ActiveRecord::SubclassNotFound) { Company.new(:type => 'InvalidType') }
   end
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index a0a3e6cb0d..0c896beb1d 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -341,9 +341,6 @@ end
 # is so cumbersome. Will deadlock Ruby threads if the underlying db.execute
 # blocks, so separate script called by Kernel#system is needed.
 # (See exec vs. async_exec in the PostgreSQL adapter.)
-
-# TODO: The Sybase, and OpenBase adapters currently have no support for pessimistic locking
-
 unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter) || in_memory_db?
   class PessimisticLockingTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index fed1b4a8e8..9008c2785e 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1227,10 +1227,11 @@ class RelationTest < ActiveRecord::TestCase
   def test_turn_off_eager_loading_with_conditions_on_joins
     original_value = ActiveRecord::Base.disable_implicit_join_references
     ActiveRecord::Base.disable_implicit_join_references = true
+
     scope = Topic.where(author_email_address: 'my.example@gmail.com').includes(:replies)
     assert_not scope.eager_loading?
   ensure
-     ActiveRecord::Base.time_zone_aware_attributes = original_value
+    ActiveRecord::Base.disable_implicit_join_references = original_value
   end
 
   def test_ordering_with_extra_spaces
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index dadcca5b7f..816bd62751 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -71,7 +71,7 @@ module ActiveRecord
         return skip("only tested on mysql")
       end
 
-      @connection    = stub(:create_database => true, :execute => true)
+      @connection    = stub("Connection", create_database: true)
       @error         = Mysql::Error.new "Invalid permissions"
       @configuration = {
         'adapter'  => 'mysql',
@@ -90,6 +90,7 @@ module ActiveRecord
     end
 
     def test_root_password_is_requested
+      assert_permissions_granted_for "pat"
       skip "only if mysql is available" unless defined?(::Mysql)
       $stdin.expects(:gets).returns("secret\n")
 
@@ -97,6 +98,7 @@ module ActiveRecord
     end
 
     def test_connection_established_as_root
+      assert_permissions_granted_for "pat"
       ActiveRecord::Base.expects(:establish_connection).with(
         'adapter'  => 'mysql',
         'database' => nil,
@@ -108,6 +110,7 @@ module ActiveRecord
     end
 
     def test_database_created_by_root
+      assert_permissions_granted_for "pat"
       @connection.expects(:create_database).
         with('my-app-db', :charset => 'utf8', :collation => 'utf8_unicode_ci')
 
@@ -115,12 +118,18 @@ module ActiveRecord
     end
 
     def test_grant_privileges_for_normal_user
-      @connection.expects(:execute).with("GRANT ALL PRIVILEGES ON my-app-db.* TO 'pat'@'localhost' IDENTIFIED BY 'wossname' WITH GRANT OPTION;")
+      assert_permissions_granted_for "pat"
+      ActiveRecord::Tasks::DatabaseTasks.create @configuration
+    end
 
+    def test_do_not_grant_privileges_for_root_user
+      @configuration['username'] = 'root'
+      @configuration['password'] = ''
       ActiveRecord::Tasks::DatabaseTasks.create @configuration
     end
 
     def test_connection_established_as_normal_user
+      assert_permissions_granted_for "pat"
       ActiveRecord::Base.expects(:establish_connection).returns do
         ActiveRecord::Base.expects(:establish_connection).with(
           'adapter'  => 'mysql',
@@ -142,6 +151,13 @@ module ActiveRecord
 
       ActiveRecord::Tasks::DatabaseTasks.create @configuration
     end
+
+    private
+      def assert_permissions_granted_for(db_user)
+        db_name = @configuration['database']
+        db_password = @configuration['password']
+        @connection.expects(:execute).with("GRANT ALL PRIVILEGES ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}' WITH GRANT OPTION;")
+      end
   end
 
   class MySQLDBDropTest < ActiveRecord::TestCase
diff --git a/activerecord/test/fixtures/friendships.yml b/activerecord/test/fixtures/friendships.yml
index 1ee09175bf..ae0abe0162 100644
--- a/activerecord/test/fixtures/friendships.yml
+++ b/activerecord/test/fixtures/friendships.yml
@@ -1,4 +1,4 @@
 Connection 1:
   id: 1
-  person_id: 1
-  friend_id: 2
-\ No newline at end of file
+  friend_id: 1
+  follower_id: 2
diff --git a/activerecord/test/fixtures/people.yml b/activerecord/test/fixtures/people.yml
index e640a38f1f..0ec05e8d56 100644
--- a/activerecord/test/fixtures/people.yml
+++ b/activerecord/test/fixtures/people.yml
@@ -5,6 +5,7 @@ michael:
   number1_fan_id: 3
   gender: M
   followers_count: 1
+  friends_too_count: 1
 david:
   id: 2
   first_name: David
@@ -12,6 +13,7 @@ david:
   number1_fan_id: 1
   gender: M
   followers_count: 1
+  friends_too_count: 1
 susan:
   id: 3
   first_name: Susan
@@ -19,3 +21,4 @@ susan:
   number1_fan_id: 1
   gender: F
   followers_count: 1
+  friends_too_count: 1
diff --git a/activerecord/test/models/friendship.rb b/activerecord/test/models/friendship.rb
index 6b4f7acc38..4b411ca8e0 100644
--- a/activerecord/test/models/friendship.rb
+++ b/activerecord/test/models/friendship.rb
@@ -1,4 +1,6 @@
 class Friendship < ActiveRecord::Base
   belongs_to :friend, class_name: 'Person'
-  belongs_to :follower, foreign_key: 'friend_id', class_name: 'Person', counter_cache: :followers_count
+  # friend_too exists to test a bug, and probably shouldn't be used elsewhere
+  belongs_to :friend_too, foreign_key: 'friend_id', class_name: 'Person', counter_cache: :friends_too_count
+  belongs_to :follower, class_name: 'Person'
 end
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index fa717ef8d6..2985160d28 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -8,7 +8,10 @@ class Person < ActiveRecord::Base
   has_many :posts_with_no_comments, -> { includes(:comments).where('comments.id is null').references(:comments) },
                                     :through => :readers, :source => :post
 
-  has_many :followers, foreign_key: 'friend_id', class_name: 'Friendship'
+  has_many :friendships, foreign_key: 'friend_id'
+  # friends_too exists to test a bug, and probably shouldn't be used elsewhere
+  has_many :friends_too, foreign_key: 'friend_id', class_name: 'Friendship'
+  has_many :followers, through: :friendships
 
   has_many :references
   has_many :bad_references
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index ae779c702a..a952738e84 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -280,7 +280,7 @@ ActiveRecord::Schema.define do
 
   create_table :friendships, :force => true do |t|
     t.integer :friend_id
-    t.integer :person_id
+    t.integer :follower_id
   end
 
   create_table :goofy_string_id, :force => true, :id => false do |t|
@@ -494,6 +494,7 @@ ActiveRecord::Schema.define do
     t.integer    :lock_version, :null => false, :default => 0
     t.string     :comments
     t.integer    :followers_count, :default => 0
+    t.integer    :friends_too_count, :default => 0
     t.references :best_friend
     t.references :best_friend_of
     t.integer    :insures, null: false, default: 0