Revert "Add update_columns and the suggestion of using update_columns

instead of update_column"

This reverts commit 9fa06c3d9811113259cb6e00a3a8454b3974add7.

This reverts commit 17a64de4980683da3ca3c185205013a29a8cf88d.

This reverts commit def9c85ffbdcf63e6c412b6bd4abafaa32ccdb5c, reversing
changes made to 6b7d26cf3c061907aedc44f7f36776c9b36950fd.

Reason: This was supposed to be released with 3.2.7 before the
suggestion to use update_column. Since it was not release now is not
good to suggest to use another method because it will confusing the
people.

3 files changed, 2 insertions, 76 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index bdadb73ab8..129b3109d6 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -17,7 +17,7 @@
 
     *Steve Klabnik*
 
-*   `update_attribute` has been deprecated. Use `update_columns` if
+*   `update_attribute` has been deprecated. Use `update_column` if
     you want to bypass mass-assignment protection, validations, callbacks,
     and touching of updated_at. Otherwise please use `update_attributes`.
 
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index d4c9e4f6cf..c9e3fc5b05 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -179,7 +179,7 @@ module ActiveRecord
     #
     def update_attribute(name, value)
       name = name.to_s
-      ActiveSupport::Deprecation.warn("update_attribute is deprecated and will be removed in Rails 4. If you want to skip mass-assignment protection, callbacks, and modifying updated_at, use update_columns. If you do want those things, use update_attributes.")
+      ActiveSupport::Deprecation.warn("update_attribute is deprecated and will be removed in Rails 4. If you want to skip mass-assignment protection, callbacks, and modifying updated_at, use update_column. If you do want those things, use update_attributes.")
       raise ActiveRecordError, "#{name} is marked as readonly" if self.class.readonly_attributes.include?(name)
       send("#{name}=", value)
       save(:validate => false)
@@ -229,23 +229,6 @@ module ActiveRecord
       end
     end
 
-    # Updates the attributes from the passed-in hash, without calling save.
-    #
-    # * Validation is skipped.
-    # * Callbacks are skipped.
-    # * updated_at/updated_on column is not updated if that column is available.
-    #
-    # Raises an +ActiveRecordError+ when called on new objects, or when at least
-    # one of the attributes is marked as readonly.
-    def update_columns(attributes)
-      raise ActiveRecordError, "can not update on a new record object" unless persisted?
-      attributes.each_key {|key| raise ActiveRecordError, "#{key.to_s} is marked as readonly" if self.class.readonly_attributes.include?(key.to_s) }
-      attributes.each do |k,v|
-        raw_write_attribute(k,v)
-      end
-      self.class.where(self.class.primary_key => id).update_all(attributes) == 1
-    end
-
     # Initializes +attribute+ to zero if +nil+ and adds the value passed as +by+ (default is 1).
     # The increment is performed directly on the underlying attribute, no setter is invoked.
     # Only makes sense for number-based attributes. Returns +self+.
diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index b66c9bf7ce..aec4f99e71 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -524,63 +524,6 @@ class PersistencesTest < ActiveRecord::TestCase
     assert_equal 'super_title', t.title
   end
 
-  def test_update_columns
-    topic = Topic.find(1)
-    topic.update_columns("approved" => true, :title => "Sebastian Topic")
-    assert topic.approved?
-    assert_equal "Sebastian Topic", topic.title
-    topic.reload
-    assert topic.approved?
-    assert_equal "Sebastian Topic", topic.title
-  end
-
-  def test_update_columns_should_raise_exception_if_new_record
-    topic = Topic.new
-    assert_raises(ActiveRecord::ActiveRecordError) { topic.update_columns(:approved => false) }
-  end
-
-  def test_update_columns_should_not_leave_the_object_dirty
-    topic = Topic.find(1)
-    topic.update_attributes("content" => "Have a nice day", :author_name => "Jose")
-
-    topic.reload
-    topic.update_columns(:content => "You too", "author_name" => "Sebastian")
-    assert_equal [], topic.changed
-
-    topic.reload
-    topic.update_columns(:content => "Have a nice day", :author_name => "Jose")
-    assert_equal [], topic.changed
-  end
-
-  def test_update_columns_with_one_readonly_attribute
-    minivan = Minivan.find('m1')
-    prev_color = minivan.color
-    prev_name = minivan.name
-    assert_raises(ActiveRecord::ActiveRecordError) { minivan.update_columns(:name => "My old minivan", :color => 'black') }
-    assert_equal prev_color, minivan.color
-    assert_equal prev_name, minivan.name
-
-    minivan.reload
-    assert_equal prev_color, minivan.color
-    assert_equal prev_name, minivan.name
-  end
-
-  def test_update_columns_should_not_modify_updated_at
-    developer = Developer.find(1)
-    prev_month = Time.now.prev_month
-
-    developer.update_column(:updated_at, prev_month)
-    assert_equal prev_month, developer.updated_at
-
-    developer.update_columns(:salary => 80000)
-    assert_equal prev_month, developer.updated_at
-    assert_equal 80000, developer.salary
-
-    developer.reload
-    assert_equal prev_month.to_i, developer.updated_at.to_i
-    assert_equal 80000, developer.salary
-  end
-
   def test_update_attributes
     topic = Topic.find(1)
     assert !topic.approved?