aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-08-19 16:29:26 -0300
committerEmilio Tagua <miloops@gmail.com>2009-08-19 16:29:26 -0300
commitb32474020c4ec2f2b9c78bd580466c494eac6eb3 (patch)
treec38c24619c5f2d75db3b55a46f77cdbe87465abb
parentccf5f2c4a20a9a275dd86f251fa026eee7f344c5 (diff)
downloadrails-b32474020c4ec2f2b9c78bd580466c494eac6eb3.tar.gz
rails-b32474020c4ec2f2b9c78bd580466c494eac6eb3.tar.bz2
rails-b32474020c4ec2f2b9c78bd580466c494eac6eb3.zip
Don't sanitize_sql where it doesn't make sense.
-rwxr-xr-xactiverecord/lib/active_record/associations.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 4c07e6be07..1f1ae93bb6 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1695,7 +1695,7 @@ module ActiveRecord
end
def construct_finder_sql_with_included_associations(options, join_dependency)
- sanitize_sql(construct_finder_arel_with_included_associations(options, join_dependency).to_sql)
+ construct_finder_arel_with_included_associations(options, join_dependency).to_sql
end
def construct_arel_limited_ids_condition(options, join_dependency)
@@ -1733,7 +1733,7 @@ module ActiveRecord
offset(construct_limit(options[:offset], scope)).
select(connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", construct_order(options[:order], scope(:find)).join(",")))
- sanitize_sql(relation.to_sql)
+ relation.to_sql
end
def tables_in_string(string)