1 files changed, 57 insertions, 4 deletions

diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index b1ce846218..9a2a5a4e3c 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -79,6 +79,17 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
+  def test_setting_time_attributes_with_time_zone_field_to_itself_should_not_be_marked_as_a_change
+    in_time_zone 'Paris' do
+      target = Class.new(ActiveRecord::Base)
+      target.table_name = 'pirates'
+
+      pirate = target.create
+      pirate.created_on = pirate.created_on
+      assert !pirate.created_on_changed?
+    end
+  end
+
   def test_time_attributes_changes_without_time_zone_by_skip
     in_time_zone 'Paris' do
       target = Class.new(ActiveRecord::Base)
@@ -190,7 +201,7 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
-  def test_nullable_integer_zero_to_string_zero_not_marked_as_changed
+  def test_integer_zero_to_string_zero_not_marked_as_changed
     pirate = Pirate.new
     pirate.parrot_id = 0
     pirate.catchphrase = 'arrr'
@@ -202,6 +213,19 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.changed?
   end
 
+  def test_integer_zero_to_integer_zero_not_marked_as_changed
+    pirate = Pirate.new
+    pirate.parrot_id = 0
+    pirate.catchphrase = 'arrr'
+    assert pirate.save!
+
+    assert !pirate.changed?
+
+    pirate.parrot_id = 0
+    assert !pirate.changed?
+  end
+
+
   def test_zero_to_blank_marked_as_changed
     pirate = Pirate.new
     pirate.catchphrase = "Yarrrr, me hearties"
@@ -288,7 +312,7 @@ class DirtyTest < ActiveRecord::TestCase
 
     with_partial_updates Pirate, false do
       assert_queries(2) { 2.times { pirate.save! } }
-      Pirate.update_all({ :updated_on => old_updated_on }, :id => pirate.id)
+      Pirate.where(id: pirate.id).update_all(:updated_on => old_updated_on)
     end
 
     with_partial_updates Pirate, true do
@@ -306,7 +330,7 @@ class DirtyTest < ActiveRecord::TestCase
 
     with_partial_updates Person, false do
       assert_queries(2) { 2.times { person.save! } }
-      Person.update_all({ :first_name => 'baz' }, :id => person.id)
+      Person.where(id: person.id).update_all(:first_name => 'baz')
     end
 
     with_partial_updates Person, true do
@@ -413,7 +437,7 @@ class DirtyTest < ActiveRecord::TestCase
     with_partial_updates(Topic) do
       Topic.create!(:author_name => 'Bill', :content => {:a => "a"})
       topic = Topic.select('id, author_name').first
-      topic.update_column :author_name, 'John'
+      topic.update_columns author_name: 'John'
       topic = Topic.first
       assert_not_nil topic.content
     end
@@ -497,6 +521,35 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.previous_changes.key?('created_on')
   end
 
+  if ActiveRecord::Base.connection.supports_migrations?
+    class Testings < ActiveRecord::Base; end
+    def test_field_named_field
+      ActiveRecord::Base.connection.create_table :testings do |t|
+        t.string :field
+      end
+      assert_nothing_raised do
+        Testings.new.attributes
+      end
+    ensure
+      ActiveRecord::Base.connection.drop_table :testings rescue nil
+    end
+  end
+
+  def test_setting_time_attributes_with_time_zone_field_to_same_time_should_not_be_marked_as_a_change
+    in_time_zone 'Paris' do
+      target = Class.new(ActiveRecord::Base)
+      target.table_name = 'pirates'
+
+      created_on = Time.now
+
+      pirate = target.create(:created_on => created_on)
+      pirate.reload # Here mysql truncate the usec value to 0
+
+      pirate.created_on = created_on
+      assert !pirate.created_on_changed?
+    end
+  end
+
   private
     def with_partial_updates(klass, on = true)
       old = klass.partial_updates?