Changeset 488

Timestamp:

01/24/05 13:02:50 (4 years ago)

Author:

david

Message:

Fixed that the dynamic finders didnt treat nil as a "IS NULL" but rather "= NULL" case #515 [Demetrius]

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that the dynamic finders didn't treat nil as a "IS NULL" but rather "= NULL" case #515 [Demetrius]
-
-* Added bind-named arrays for interpolating a group of ids or strings in conditions #528 [bitsweat]

trunk/activerecord/lib/active_record/base.rb

@@ -669 +669 @@
-            finder, attributes = ($1 == "all_by" ? :find_all : :find_first), $2.split("_and_")
-            attributes.each { |attr_name| super unless column_methods_hash[attr_name.intern] }
-
+
+
+
-            send(finder, [conditions, *arguments[0...attributes.length]], *arguments[attributes.length..-1])
-          else

trunk/activerecord/test/finder_test.rb

@@ -193 +193 @@
-
-    assert_equal [], Topic.find_all_by_title("The First Topic!!")
+  end
+  
+  def test_find_by_nil_attribute
+    topic = Topic.find_by_last_read nil
+    assert_not_nil topic
+    assert_nil topic.last_read
+  end
+  
+  def test_find_all_by_nil_attribute
+    topics = Topic.find_all_by_last_read nil
+    assert_equal 1, topics.size
+    assert_nil topics[0].last_read
+  end
+  
+  def test_find_by_nil_and_not_nil_attributes
+    topic = Topic.find_by_last_read_and_author_name nil, "Mary"
+    assert_equal "Mary", topic.author_name
+  end
+
+  def test_find_all_by_nil_and_not_nil_attributes
+    topics = Topic.find_all_by_last_read_and_author_name nil, "Mary"
+    assert_equal 1, topics.size
+    assert_equal "Mary", topics[0].author_name
-  end
-