Changeset 9082

Timestamp:

03/23/08 05:00:25 (4 months ago)

Author:

bitsweat

Message:

Fix merging blank conditions. Closes #10764 [mcmire, cavalle]

Files:

• trunk/activerecord/lib/active_record/base.rb (modified) (4 diffs)
• trunk/activerecord/test/cases/method_scoping_test.rb (modified) (3 diffs)

trunk/activerecord/lib/active_record/base.rb

@@ -1427 +1427 @@
-        end
-
+        # Merges conditions so that the result is a valid +condition+
+        def merge_conditions(*conditions)
+          segments = []
+
+          conditions.each do |condition|
+            unless condition.blank?
+              sql = sanitize_sql(condition)
+              segments << sql unless sql.blank?
+            end
+          end
+
+          "(#{segments.join(') AND (')})" unless segments.empty?
+        end
+
-        # Object#to_a is deprecated, though it does have the desired behavior
-        def safe_to_array(o)
@@ -1499 +1513 @@
-        def add_conditions!(sql, conditions, scope = :auto)
-          scope = scope(:find) if :auto == scope
-
-
-
-
-
-
+
+
+
+
+
-        end
-
@@ -1746 +1759 @@
-                      merge = hash[method][key] && params[key] # merge if both scopes have the same key
-                      if key == :conditions && merge
-[params[key], hash[method][key]].collect{ |sql| "( %s )" % sanitize_sql(sql) }.join(" AND "
+merge_conditions(params[key], hash[method][key]
-                      elsif key == :include && merge
-                        hash[method][key] = merge_includes(hash[method][key], params[key]).uniq
@@ -1940 +1953 @@
-        #     # => "status = NULL , group_id = 1"
-        def sanitize_sql_hash_for_assignment(attrs)
-conditions = 
+
-            "#{connection.quote_column_name(attr)} = #{quote_bound_value(value)}"
-          end.join(', ')

trunk/activerecord/test/cases/method_scoping_test.rb

@@ -151 +151 @@
-      Developer.with_scope(:find => { :conditions => 'salary = 80000' }) do
-        appended_condition = Developer.instance_eval('current_scoped_methods')[:find][:conditions]
- name = 'David' ) AND ( salary = 80000 
+name = 'David') AND (salary = 80000
-        assert_equal(1, Developer.count)
-      end
@@ -164 +164 @@
-      Developer.with_scope(:find => { :conditions => "name = 'David'" }) do
-        merged_option = Developer.instance_eval('current_scoped_methods')[:find]
- salary = 80000 ) AND ( name = 'David' 
+salary = 80000) AND (name = 'David'
-      end
-    end
@@ -272 +272 @@
-      Developer.with_scope(:find => { :conditions => ['salary > ?', 9000] }) do
-        assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+      end
+    end
+  end
+
+  def test_merged_scoped_find_on_blank_conditions
+    [nil, " ", [], {}].each do |blank|
+      Developer.with_scope(:find => {:conditions => blank}) do
+        Developer.with_scope(:find => {:conditions => blank}) do
+          assert_nothing_raised { Developer.find(:first) }
+        end
+      end
+    end
+  end
+
+  def test_merged_scoped_find_on_blank_bind_conditions
+    [ [""], ["",{}] ].each do |blank|
+      Developer.with_scope(:find => {:conditions => blank}) do
+        Developer.with_scope(:find => {:conditions => blank}) do
+          assert_nothing_raised { Developer.find(:first) }
+        end
-      end
-    end