aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-11-29 10:58:21 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-11-29 10:58:21 -0800
commitaae3c3538492f19f1c4e1fcfe6c942ff72a30ce1 (patch)
treee38cfaa13fb43dad7b1e21b8f30afd991a460948 /activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
parent439a7dc0e62858a5ed1fc397e36626f9be1d7c87 (diff)
downloadrails-aae3c3538492f19f1c4e1fcfe6c942ff72a30ce1.tar.gz
rails-aae3c3538492f19f1c4e1fcfe6c942ff72a30ce1.tar.bz2
rails-aae3c3538492f19f1c4e1fcfe6c942ff72a30ce1.zip
removing interpolate_sql from join associations
Diffstat (limited to 'activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
index e7d1ffa9f2..3db80d341f 100644
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
@@ -102,10 +102,6 @@ module ActiveRecord
ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
end
- def interpolate_sql(sql)
- instance_eval("%@#{sql.gsub('@', '\@')}@", __FILE__, __LINE__)
- end
-
private
def allocate_aliases
@@ -120,7 +116,7 @@ module ActiveRecord
end
def process_conditions(conditions, table_name)
- Arel.sql(interpolate_sql(sanitize_sql(conditions, table_name)))
+ Arel.sql(sanitize_sql(conditions, table_name))
end
def sanitize_sql(condition, table_name)