diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-30 21:04:33 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-30 21:04:33 -0500 |
| commit | 56a5da89dbcdd6d73f26f5c1be6221b684574b2b (patch) | |
| tree | 577fbc16d37ed54bbda1a2a7477894caa6a7bfff /activerecord/test/cases/dirty_test.rb | |
| parent | 5df076ad0965dc684afff8a019fd9f92a53ada76 (diff) | |
| parent | 58c3ec1b7b7ee073edf9c245de5d06426be60a25 (diff) | |
| download | rails-56a5da89dbcdd6d73f26f5c1be6221b684574b2b.tar.gz rails-56a5da89dbcdd6d73f26f5c1be6221b684574b2b.tar.bz2 rails-56a5da89dbcdd6d73f26f5c1be6221b684574b2b.zip | |
Merge branch 'master' into sprockets
Conflicts:
railties/lib/rails/application/configuration.rb
Diffstat (limited to 'activerecord/test/cases/dirty_test.rb')
| -rw-r--r-- | activerecord/test/cases/dirty_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb index a6738fb654..b1ce846218 100644 --- a/activerecord/test/cases/dirty_test.rb +++ b/activerecord/test/cases/dirty_test.rb @@ -413,7 +413,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_attribute :author_name, 'John' + topic.update_column :author_name, 'John' topic = Topic.first assert_not_nil topic.content end |