Changeset 504

Timestamp:

01/25/05 12:45:01 (4 years ago)

Author:

david

Message:

Added the option of supplying an array of ids and attributes to Base#update, so that multiple records can be updated at once (inspired by #526/Duane Johnson). Added the option of supplying an array of attributes to Base#create, so that multiple records can be created at once. Added that Base#delete and Base#destroy both can take an array of ids to delete/destroy #336. Added that has_many association build and create methods can take arrays of record data like Base#create and Base#build to build/create multiple records at once.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/association_collection.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_association.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (3 diffs)
• trunk/activerecord/test/associations_test.rb (modified) (2 diffs)
• trunk/activerecord/test/base_test.rb (modified) (3 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
-
+
+
+
+
+
+
+
+
+
+
-
-* Added ActiveRecord::Base.timestamps_gmt that can be set to true to make the automated timestamping use GMT instead of local time #520 [Scott Baron]

trunk/activerecord/lib/active_record/associations/association_collection.rb

@@ -54 +54 @@
-      def create(attributes = {})
-        # Can't use Base.create since the foreign key may be a protected attribute.
-
-
-
+
+
+
+
+
+
+
-      end
-

trunk/activerecord/lib/active_record/associations/has_many_association.rb

@@ -10 +10 @@
-
-      def build(attributes = {})
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-      end
-

trunk/activerecord/lib/active_record/base.rb

@@ -341 +341 @@
-      # fail under validations, the unsaved object is still returned.
-      def create(attributes = nil)
-
-
-
+
+
+
+
+
+
+
-      end
-
@@ -349 +353 @@
-      # and returns it. If the save fail under validations, the unsaved object is still returned.
-      def update(id, attributes)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      def delete(id)
-= ?
+IN (?)
-      end
-      
-      # Destroys the record with the given +id+ by instantiating the object and calling #destroy (all the callbacks are the triggered).
+      # If an array of ids is provided, all of them are destroyed.
-      def destroy(id)
-
+id.is_a?(Array) ? id.each { |id| destroy(id) } : 
-      end
-
@@ -374 +384 @@
-      end
-
-      # Updates several records at a time using the pattern of a hash that contains id => {attributes} pairs as contained in +id_and_attributes_pairs+.
-      # If there are certain conditions that must be met in order for the update to occur, an optional block
-      # containing a conditional statement may be used.  Example:
-      #   Person.update_collection { 23 => { "first_name" => "John", "last_name" => "Peterson" },
-      #                        25 => { "first_name" => "Duane", "last_name" => "Johnson" } }
-      #
-      #   # Updates only those records whose first name begins with 'duane' or 'Duane'
-      #   Person.update_collection @params['people'] do |activerecord_object, new_attributes|
-      #     activerecord_object.first_name =~ /^[dD]uane.*/
-      #   end
-      #
-      # The conditional block may also be of use when you have more than one kind of key in the +id_and_attributes_pairs+ hash.
-      # For example, if you have a view that contains form elements of both existing and new records, you might end up with
-      # a hash that looks like this:
-      #   @params['people'] = { "1" => { "first_name" => "Bob", "last_name" => "Schilling" },
-      #                         "2" => { "first_name" => "Joe", "last_name" => "Tycoon" },
-      #                         "new_person" => { "first_name" => "Mary", "last_name" => "Smith" } }
-      # In such a case, you could discriminate against 'updating' the new_person record with the following code:
-      #   Person.update_collection(@params['people']) { |ar, attrs| ar.id.to_i > 0 }
-      #
-      # This works because the to_i method converts all non-integer strings to 0.
-      def update_collection(id_and_attributes_pairs)
-        updated_records = Array.new
-
-        transaction do
-          records = find(id_and_attributes_pairs.keys)          
-          id_and_attributes_pairs.each do |id, attrs|
-            record = records.select { |r| r.id.to_s == id }.first
-
-            # Update each record unless the closure is false
-            if (!block_given? || (block_given? && yield(record, attrs)))
-              record.update_attributes(attrs)
-              updated_records << record
-            end
-          end
-        end
-
-        return updated_records
-      end
-      
-          
-      # Destroys the objects for all the records that matches the +condition+ by instantiating each object and calling
-      # the destroy method. Example:

trunk/activerecord/test/associations_test.rb

@@ -387 +387 @@
-  end
-
+  def test_build_many
+    new_clients = @signals37.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}])
+    assert_equal 2, new_clients.size
+
+    assert @signals37.save
+    assert_equal 3, @signals37.clients_of_firm(true).size
+  end
+
-  def test_invalid_build
-    new_client = @signals37.clients_of_firm.build
@@ -403 +411 @@
-    assert_equal new_client, @signals37.clients_of_firm.last
-    assert_equal new_client, @signals37.clients_of_firm(true).last
+  end
+  
+  def test_create_many
+    @signals37.clients_of_firm.create([{"name" => "Another Client"}, {"name" => "Another Client II"}])
+    assert_equal 3, @signals37.clients_of_firm(true).size
-  end
-

trunk/activerecord/test/base_test.rb

@@ -115 +115 @@
-    assert_equal("New Topic", topicReloaded.title)
-  end
+  
+  def test_create_many
+    topics = Topic.create([ { "title" => "first" }, { "title" => "second" }])
+    assert_equal 2, topics.size
+    assert_equal "first", topics.first.title
+  end
-
-  def test_create_columns_not_equal_attributes
@@ -257 +263 @@
-  
-  def test_destroy_all
-(2, Topic.find_all.size)
+ 2, Topic.find_all.size
-
-    Topic.destroy_all "author_name = 'Mary'"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def test_boolean_attributes
-    assert ! Topic.find(1).approved?
@@ -293 +309 @@
-  end
-
-collection
-ids_and_attributes
-_collection(ids_and_attribut
+many
+topic_data
+(topic_data.keys, topic_data.valu
-
-    assert_equal 2, updated.size
-    assert_equal "1 updated", Topic.find(1).content
-    assert_equal "2 updated", Topic.find(2).content
-
-    ids_and_attributes["1"]["content"] = "one updated"
-    ids_and_attributes["2"]["content"] = "two updated"
-    updated = Topic.update_collection(ids_and_attributes) { |ar, attrs| ar.id == 1 }
-
-    assert_equal 1, updated.size
-    assert_equal "one updated", Topic.find(1).content
-    assert_equal "2 updated", Topic.find(2).content
-  end