diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-21 06:14:37 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-21 06:14:37 -0700 |
commit | 7b545ff911a3f9bd3c9b179a2c6ac6b70bab3ee0 (patch) | |
tree | e2a8c1966ef8650d609c0740e67d67ed5a444386 /activerecord/test/cases | |
parent | 98f80218d4a588bd4bcace2ae534b9a791d381f9 (diff) | |
parent | b8fba557e139830cbc180bc11dbf92990f53edc5 (diff) | |
download | rails-7b545ff911a3f9bd3c9b179a2c6ac6b70bab3ee0.tar.gz rails-7b545ff911a3f9bd3c9b179a2c6ac6b70bab3ee0.tar.bz2 rails-7b545ff911a3f9bd3c9b179a2c6ac6b70bab3ee0.zip |
Merge pull request #7723 from steveklabnik/backport_3554
Backport #3544 to 3-2-stable
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/dirty_test.rb | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb index 3bd2e909d7..4fc7e77786 100644 --- a/activerecord/test/cases/dirty_test.rb +++ b/activerecord/test/cases/dirty_test.rb @@ -521,6 +521,20 @@ 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) @@ -530,7 +544,7 @@ class DirtyTest < ActiveRecord::TestCase 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 |