Skip to content

Backport #3544 to 3-2-stable #7723

Merged
merged 1 commit into from Sep 21, 2012

5 participants

@steveklabnik
Ruby on Rails member

Rename field_changed? to _field_changed? so that users can create a field named field
Conflicts:

activerecord/lib/active_record/core.rb
activerecord/test/cases/dirty_test.rb
@carlosantoniodasilva carlosantoniodasilva commented on an outdated diff Sep 21, 2012
activerecord/test/cases/dirty_test.rb
@@ -521,18 +521,17 @@ def test_previous_changes
assert !pirate.previous_changes.key?('created_on')
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?
@carlosantoniodasilva
Ruby on Rails member

I think this test shouldn't be killed, should it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@carlosantoniodasilva
Ruby on Rails member

I think it'd be good to add a changelog entry for that, wdyt?

@steveklabnik
Ruby on Rails member

CHANGELOG: sure.

Test getting killed: yeah, whoops. I wasn't 100% sure...

@tenderlove tenderlove Merge pull request #3544 from amatsuda/_field_changed
Rename field_changed? to _field_changed? so that users can create a field named field
Conflicts:

	activerecord/lib/active_record/core.rb
	activerecord/test/cases/dirty_test.rb
b8fba55
@steveklabnik
Ruby on Rails member

Updated, and CHANGELOG added.

@rafaelfranca rafaelfranca merged commit 7b545ff into rails:3-2-stable Sep 21, 2012
@carlosantoniodasilva
Ruby on Rails member

❤️

@steveklabnik
Ruby on Rails member

❤️ ❤️ ❤️

@clemens
clemens commented Sep 22, 2012

<6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.