Changeset 4473

Timestamp:

06/20/06 22:48:52 (3 years ago)

Author:

sam

Message:

Added find_or_initialize_by_X which works like find_or_create_by_X but doesn't save the newly instantiated record

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (4 diffs)
• trunk/activerecord/test/finder_test.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added find_or_initialize_by_X which works like find_or_create_by_X but doesn't save the newly instantiated record. [Sam Stephenson]
-
-* Row locking. Provide a locking clause with the :lock finder option or true for the default "FOR UPDATE". Use the #lock! method to obtain a row lock on a single record (reloads the record with :lock => true). [Shugo Maeda]

trunk/activerecord/lib/active_record/base.rb

@@ -180 +180 @@
-  #   Tag.find_or_create_by_name("Summer") # equal to Tag.find_by_name("Summer")
-  #
+  # Use the <tt>find_or_initialize_by_</tt> finder if you want to return a new record without saving it first. Example:
+  #
+  #   # No 'Winter' tag exists
+  #   winter = Tag.find_or_initialize_by_name("Winter")
+  #   winter.new_record? # true
+  #
-  # == Saving arrays, hashes, and other non-mappable objects in text columns
-  #
@@ -1160 +1166 @@
-                send(deprecated_finder, conditions, *arguments[attribute_names.length..-1]) # deprecated API
-            end
-
+
+
-            attribute_names = extract_attribute_names_from_match(match)
-            super unless all_attributes_exists?(attribute_names)
@@ -1166 +1173 @@
-            options = { :conditions => construct_conditions_from_arguments(attribute_names, arguments) }
-            set_readonly_option!(options)
-create(
+send(instantiator, 
-          else
-            super
@@ -1178 +1185 @@
-        def determine_deprecated_finder(match)
-          match.captures.first == 'all_by' ? :find_all : :find_first
+        end
+
+        def determine_instantiator(match)
+          match.captures.first == 'initialize' ? :new : :create
-        end
-

trunk/activerecord/test/finder_test.rb

@@ -337 +337 @@
-    assert_equal number_of_companies + 1, Company.count
-    assert_equal sig38, Company.find_or_create_by_name("38signals")
+    assert !sig38.new_record?
-  end
-
@@ -344 +345 @@
-    assert_equal number_of_topics + 1, Topic.count
-    assert_equal another, Topic.find_or_create_by_title_and_author_name("Another topic", "John")
+    assert !another.new_record?
+  end
+  
+  def test_find_or_initialize_from_one_attribute
+    sig38 = Company.find_or_initialize_by_name("38signals")
+    assert_equal "38signals", sig38.name
+    assert sig38.new_record?
+  end
+  
+  def test_find_or_initialize_from_two_attributes
+    another = Topic.find_or_initialize_by_title_and_author_name("Another topic","John")
+    assert_equal "Another topic", another.title
+    assert_equal "John", another.author_name
+    assert another.new_record?
-  end
-