From 79b88e875b407f8418932fb757999909c2083b89 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 2 Jul 2013 16:11:29 -0700 Subject: fix to_sql output on eager loaded relations --- activerecord/lib/active_record/relation.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/relation.rb') diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 18fdac2600..612f376c55 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -501,7 +501,15 @@ module ActiveRecord # User.where(name: 'Oscar').to_sql # # => SELECT "users".* FROM "users" WHERE "users"."name" = 'Oscar' def to_sql - @to_sql ||= klass.connection.to_sql(arel, bind_values.dup) + @to_sql ||= begin + if eager_loading? + join_dependency = construct_join_dependency + relation = construct_relation_for_association_find(join_dependency) + klass.connection.to_sql(relation.arel, relation.bind_values) + else + klass.connection.to_sql(arel, bind_values.dup) + end + end end # Returns a hash of where conditions. -- cgit v1.2.3