16 files changed, 143 insertions, 36 deletions
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index a9f1993842..4f389e9249 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -23,6 +23,12 @@ module ActiveRecord
       end
     end
 
+    def test_create_record_with_pk_as_zero
+      Book.create(id: 0)
+      assert_equal 0, Book.find(0).id
+      assert_nothing_raised { Book.destroy(0) }
+    end
+
     def test_tables
       tables = nil
       ActiveSupport::Deprecation.silence { tables = @connection.tables }
diff --git a/activerecord/test/cases/adapters/mysql2/boolean_test.rb b/activerecord/test/cases/adapters/mysql2/boolean_test.rb
index 8575df9e43..739bb275ce 100644
--- a/activerecord/test/cases/adapters/mysql2/boolean_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/boolean_test.rb
@@ -43,11 +43,16 @@ class Mysql2BooleanTest < ActiveRecord::Mysql2TestCase
 
     boolean = BooleanType.create!(archived: true, published: true)
     attributes = boolean.reload.attributes_before_type_cast
-
     assert_equal 1, attributes["archived"]
     assert_equal "1", attributes["published"]
 
+    boolean = BooleanType.create!(archived: false, published: false)
+    attributes = boolean.reload.attributes_before_type_cast
+    assert_equal 0, attributes["archived"]
+    assert_equal "0", attributes["published"]
+
     assert_equal 1, @connection.type_cast(true)
+    assert_equal 0, @connection.type_cast(false)
   end
 
   test "test type casting without emulated booleans" do
@@ -55,11 +60,16 @@ class Mysql2BooleanTest < ActiveRecord::Mysql2TestCase
 
     boolean = BooleanType.create!(archived: true, published: true)
     attributes = boolean.reload.attributes_before_type_cast
-
     assert_equal 1, attributes["archived"]
     assert_equal "1", attributes["published"]
 
+    boolean = BooleanType.create!(archived: false, published: false)
+    attributes = boolean.reload.attributes_before_type_cast
+    assert_equal 0, attributes["archived"]
+    assert_equal "0", attributes["published"]
+
     assert_equal 1, @connection.type_cast(true)
+    assert_equal 0, @connection.type_cast(false)
   end
 
   test "with booleans stored as 1 and 0" do
diff --git a/activerecord/test/cases/adapters/mysql2/datetime_precision_quoting_test.rb b/activerecord/test/cases/adapters/mysql2/datetime_precision_quoting_test.rb
new file mode 100644
index 0000000000..e349c67c93
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql2/datetime_precision_quoting_test.rb
@@ -0,0 +1,45 @@
+require "cases/helper"
+
+class Mysql2DatetimePrecisionQuotingTest < ActiveRecord::Mysql2TestCase
+  setup do
+    @connection = ActiveRecord::Base.connection
+  end
+
+  test 'microsecond precision for MySQL gte 5.6.4' do
+    stub_version '5.6.4'
+    assert_microsecond_precision
+  end
+
+  test 'no microsecond precision for MySQL lt 5.6.4' do
+    stub_version '5.6.3'
+    assert_no_microsecond_precision
+  end
+
+  test 'microsecond precision for MariaDB gte 5.3.0' do
+    stub_version '5.5.5-10.1.8-MariaDB-log'
+    assert_microsecond_precision
+  end
+
+  test 'no microsecond precision for MariaDB lt 5.3.0' do
+    stub_version '5.2.9-MariaDB'
+    assert_no_microsecond_precision
+  end
+
+  private
+    def assert_microsecond_precision
+      assert_match_quoted_microsecond_datetime(/\.000001\z/)
+    end
+
+    def assert_no_microsecond_precision
+      assert_match_quoted_microsecond_datetime(/\d\z/)
+    end
+
+    def assert_match_quoted_microsecond_datetime(match)
+      assert_match match, @connection.quoted_date(Time.now.change(usec: 1))
+    end
+
+    def stub_version(full_version_string)
+      @connection.stubs(:full_version).returns(full_version_string)
+      @connection.remove_instance_variable(:@version) if @connection.instance_variable_defined?(:@version)
+    end
+end
diff --git a/activerecord/test/cases/adapters/mysql2/quoting_test.rb b/activerecord/test/cases/adapters/mysql2/quoting_test.rb
deleted file mode 100644
index 2de7e1b526..0000000000
--- a/activerecord/test/cases/adapters/mysql2/quoting_test.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "cases/helper"
-
-class Mysql2QuotingTest < ActiveRecord::Mysql2TestCase
-  setup do
-    @connection = ActiveRecord::Base.connection
-  end
-
-  test 'quoted date precision for gte 5.6.4' do
-    @connection.stubs(:full_version).returns('5.6.4')
-    @connection.remove_instance_variable(:@version) if @connection.instance_variable_defined?(:@version)
-    t = Time.now.change(usec: 1)
-    assert_match(/\.000001\z/, @connection.quoted_date(t))
-  end
-
-  test 'quoted date precision for lt 5.6.4' do
-    @connection.stubs(:full_version).returns('5.6.3')
-    @connection.remove_instance_variable(:@version) if @connection.instance_variable_defined?(:@version)
-    t = Time.now.change(usec: 1)
-    assert_no_match(/\.000001\z/, @connection.quoted_date(t))
-  end
-end
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index bb8c9fa19c..aff0dabee7 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -11,7 +11,9 @@ require 'models/tagging'
 require 'models/author'
 require 'models/owner'
 require 'models/pet'
+require 'models/pet_treasure'
 require 'models/toy'
+require 'models/treasure'
 require 'models/contract'
 require 'models/company'
 require 'models/developer'
@@ -1082,6 +1084,18 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert_equal [], person.posts
   end
 
+  def test_preloading_empty_through_with_polymorphic_source_association
+    owner = Owner.create!(name: "Rainbow Unicat")
+    pet = Pet.create!(owner: owner)
+    person = Person.create!(first_name: "Gaga")
+    treasure = Treasure.create!(looter: person)
+    non_looted_treasure = Treasure.create!()
+    PetTreasure.create!(pet: pet, treasure: treasure, rainbow_color: "Ultra violet indigo")
+    PetTreasure.create!(pet: pet, treasure: non_looted_treasure, rainbow_color: "Ultra violet indigo")
+
+    assert_equal [person], Owner.where(name: "Rainbow Unicat").includes(pets: :persons).first.persons.to_a
+  end
+
   def test_explicitly_joining_join_table
     assert_equal owners(:blackbeard).toys, owners(:blackbeard).toys.with_pet
   end
diff --git a/activerecord/test/cases/date_time_precision_test.rb b/activerecord/test/cases/date_time_precision_test.rb
index e996d142a2..f8664d83bd 100644
--- a/activerecord/test/cases/date_time_precision_test.rb
+++ b/activerecord/test/cases/date_time_precision_test.rb
@@ -1,7 +1,7 @@
 require 'cases/helper'
 require 'support/schema_dumping_helper'
 
-if ActiveRecord::Base.connection.supports_datetime_with_precision?
+if subsecond_precision_supported?
 class DateTimePrecisionTest < ActiveRecord::TestCase
   include SchemaDumpingHelper
   self.use_transactional_tests = false
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index cd1967c373..a3f8d26100 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -37,8 +37,8 @@ class DirtyTest < ActiveRecord::TestCase
   def test_attribute_changes
     # New record - no changes.
     pirate = Pirate.new
-    assert !pirate.catchphrase_changed?
-    assert_nil pirate.catchphrase_change
+    assert_equal false, pirate.catchphrase_changed?
+    assert_equal false, pirate.non_validated_parrot_id_changed?
 
     # Change catchphrase.
     pirate.catchphrase = 'arrr'
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 692c6bf2d0..f03df2d99e 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -652,11 +652,16 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::RecordNotFound) { Topic.where(approved: true).find(1) }
   end
 
-  def test_find_on_hash_conditions_with_explicit_table_name
+  def test_find_on_hash_conditions_with_qualified_attribute_dot_notation_string
     assert Topic.where('topics.approved' => false).find(1)
     assert_raise(ActiveRecord::RecordNotFound) { Topic.where('topics.approved' => true).find(1) }
   end
 
+  def test_find_on_hash_conditions_with_qualified_attribute_dot_notation_symbol
+    assert Topic.where('topics.approved': false).find(1)
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.where('topics.approved': true).find(1) }
+  end
+
   def test_find_on_hash_conditions_with_hashed_table_name
     assert Topic.where(topics: { approved: false }).find(1)
     assert_raise(ActiveRecord::RecordNotFound) { Topic.where(topics: { approved: true }).find(1) }
diff --git a/activerecord/test/cases/fixture_set/file_test.rb b/activerecord/test/cases/fixture_set/file_test.rb
index 242e7a9bec..e64b90507e 100644
--- a/activerecord/test/cases/fixture_set/file_test.rb
+++ b/activerecord/test/cases/fixture_set/file_test.rb
@@ -135,6 +135,12 @@ END
         end
       end
 
+      def test_erb_filename
+        filename = 'filename.yaml'
+        erb = File.new(filename).send(:prepare_erb, "<% Rails.env %>\n")
+        assert_equal erb.filename, filename
+      end
+
       private
       def tmp_yaml(name, contents)
         t = Tempfile.new name
diff --git a/activerecord/test/cases/scoping/named_scoping_test.rb b/activerecord/test/cases/scoping/named_scoping_test.rb
index acba97bbb8..96c94eefa0 100644
--- a/activerecord/test/cases/scoping/named_scoping_test.rb
+++ b/activerecord/test/cases/scoping/named_scoping_test.rb
@@ -544,4 +544,24 @@ class NamedScopingTest < ActiveRecord::TestCase
     assert_equal 1, SpecialComment.where(body: 'go crazy').created.count
   end
 
+  def test_model_class_should_respond_to_empty
+    assert !Topic.empty?
+    Topic.delete_all
+    assert Topic.empty?
+  end
+
+  def test_model_class_should_respond_to_none
+    assert !Topic.none?
+    Topic.delete_all
+    assert Topic.none?
+  end
+
+  def test_model_class_should_respond_to_one
+    assert !Topic.one?
+    Topic.delete_all
+    assert !Topic.one?
+    Topic.create!
+    assert Topic.one?
+  end
+
 end
diff --git a/activerecord/test/cases/statement_cache_test.rb b/activerecord/test/cases/statement_cache_test.rb
index a704b861cb..104226010a 100644
--- a/activerecord/test/cases/statement_cache_test.rb
+++ b/activerecord/test/cases/statement_cache_test.rb
@@ -94,5 +94,17 @@ module ActiveRecord
       additional_books = cache.execute([], Book, Book.connection)
       assert first_books != additional_books
     end
+
+    def test_unprepared_statements_dont_share_a_cache_with_prepared_statements
+      Book.create(name: "my book")
+      Book.create(name: "my other book")
+
+      book = Book.find_by(name: "my book")
+      other_book = Book.connection.unprepared_statement do
+        Book.find_by(name: "my other book")
+      end
+
+      refute_equal book, other_book
+    end
   end
 end
diff --git a/activerecord/test/cases/time_precision_test.rb b/activerecord/test/cases/time_precision_test.rb
index 3b6e4dcc2b..628a8eb771 100644
--- a/activerecord/test/cases/time_precision_test.rb
+++ b/activerecord/test/cases/time_precision_test.rb
@@ -1,7 +1,7 @@
 require 'cases/helper'
 require 'support/schema_dumping_helper'
 
-if ActiveRecord::Base.connection.supports_datetime_with_precision?
+if subsecond_precision_supported?
 class TimePrecisionTest < ActiveRecord::TestCase
   include SchemaDumpingHelper
   self.use_transactional_tests = false
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb
index cedb774b10..ce8242cf2f 100644
--- a/activerecord/test/models/owner.rb
+++ b/activerecord/test/models/owner.rb
@@ -1,7 +1,8 @@
 class Owner < ActiveRecord::Base
   self.primary_key = :owner_id
   has_many :pets, -> { order 'pets.name desc' }
-  has_many :toys, :through => :pets
+  has_many :toys, through: :pets
+  has_many :persons, through: :pets
 
   belongs_to :last_pet, class_name: 'Pet'
   scope :including_last_pet, -> {
diff --git a/activerecord/test/models/pet.rb b/activerecord/test/models/pet.rb
index f7970d7aab..53489fa1b3 100644
--- a/activerecord/test/models/pet.rb
+++ b/activerecord/test/models/pet.rb
@@ -4,6 +4,9 @@ class Pet < ActiveRecord::Base
   self.primary_key = :pet_id
   belongs_to :owner, :touch => true
   has_many :toys
+  has_many :pet_treasures
+  has_many :treasures, through: :pet_treasures
+  has_many :persons, through: :treasures, source: :looter, source_type: 'Person'
 
   class << self
     attr_accessor :after_destroy_output
diff --git a/activerecord/test/models/pet_treasure.rb b/activerecord/test/models/pet_treasure.rb
new file mode 100644
index 0000000000..1fe7807ffe
--- /dev/null
+++ b/activerecord/test/models/pet_treasure.rb
@@ -0,0 +1,6 @@
+class PetTreasure < ActiveRecord::Base
+  self.table_name = "pets_treasures"
+
+  belongs_to :pet
+  belongs_to :treasure
+end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 01dbf2cee6..1027bcb365 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -1,10 +1,4 @@
 ActiveRecord::Schema.define do
-  def except(adapter_names_to_exclude)
-    unless [adapter_names_to_exclude].flatten.include?(adapter_name)
-      yield
-    end
-  end
-
   # ------------------------------------------------------------------- #
   #                                                                     #
   #   Please keep these create table statements in alphabetical order   #
@@ -620,6 +614,12 @@ ActiveRecord::Schema.define do
     end
   end
 
+  create_table :pets_treasures, force: true do |t|
+    t.column :treasure_id, :integer
+    t.column :pet_id, :integer
+    t.column :rainbow_color, :string
+  end
+
   create_table :pirates, force: true do |t|
     t.column :catchphrase, :string
     t.column :parrot_id, :integer
@@ -991,7 +991,7 @@ ActiveRecord::Schema.define do
   create_table :records, force: true do |t|
   end
 
-  except 'SQLite' do
+  if supports_foreign_keys?
     # fk_test_has_fk should be before fk_test_has_pk
     create_table :fk_test_has_fk, force: true do |t|
       t.integer :fk_id, null: false