From b17b9371c6a26484eb1984d45acffcdcd91b1ae1 Mon Sep 17 00:00:00 2001
From: Frederick Cheung <frederick.cheung@gmail.com>
Date: Sun, 21 Dec 2008 15:38:40 +0000
Subject: Fix configure_dependency_for_has_many not quoting conditions properly
 [#1461 state:resolved]

---
 activerecord/lib/active_record/associations.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 07bc50c886..5a60b13fd8 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1453,7 +1453,7 @@ module ActiveRecord
             dependent_conditions << sanitize_sql(reflection.options[:conditions]) if reflection.options[:conditions]
             dependent_conditions << extra_conditions if extra_conditions
             dependent_conditions = dependent_conditions.collect {|where| "(#{where})" }.join(" AND ")
-
+            dependent_conditions = dependent_conditions.gsub('@', '\@')
             case reflection.options[:dependent]
               when :destroy
                 method_name = "has_many_dependent_destroy_for_#{reflection.name}".to_sym
@@ -1467,7 +1467,7 @@ module ActiveRecord
                     delete_all_has_many_dependencies(record,
                       "#{reflection.name}",
                       #{reflection.class_name},
-                      "#{dependent_conditions}")
+                      %@#{dependent_conditions}@)
                   end
                 }
               when :nullify
@@ -1477,7 +1477,7 @@ module ActiveRecord
                       "#{reflection.name}",
                       #{reflection.class_name},
                       "#{reflection.primary_key_name}",
-                      "#{dependent_conditions}")
+                      %@#{dependent_conditions}@)
                   end
                 }
               else
-- 
cgit v1.2.3