diff options
author | Emilio Tagua <miloops@gmail.com> | 2010-06-23 13:04:59 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2010-06-23 13:04:59 -0300 |
commit | a040b1c0e68f7a5145a6decf6731be9c371fa24a (patch) | |
tree | 9c861e8fbf434c1b0938c3aaa40b32aff51d65cc /lib | |
parent | 71e92992e66f461acaabc3ac2f3ec6480167962e (diff) | |
download | rails-a040b1c0e68f7a5145a6decf6731be9c371fa24a.tar.gz rails-a040b1c0e68f7a5145a6decf6731be9c371fa24a.tar.bz2 rails-a040b1c0e68f7a5145a6decf6731be9c371fa24a.zip |
Don't use a subquery when there are joins. Use a required alias for the subquery.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/arel/engines/sql/relations/compiler.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/arel/engines/sql/relations/compiler.rb b/lib/arel/engines/sql/relations/compiler.rb index 2c2adc42fb..9684aa7d7d 100644 --- a/lib/arel/engines/sql/relations/compiler.rb +++ b/lib/arel/engines/sql/relations/compiler.rb @@ -8,9 +8,10 @@ module Arel end def select_sql - if relation.projections.first.is_a?(Count) && relation.projections.size == 1 && (taken.present? || wheres.present?) + if relation.projections.first.is_a?(Count) && relation.projections.size == 1 && + (taken.present? || wheres.present?) && joins(self).blank? subquery = build_query("SELECT 1 FROM #{from_clauses}", build_clauses) - query = "SELECT #{select_clauses.join(', ')} FROM (#{subquery})" + query = "SELECT COUNT(*) AS count_id FROM (#{subquery}) AS subquery" else query = build_query \ "SELECT #{select_clauses.join(', ')}", @@ -27,8 +28,8 @@ module Arel ("GROUP BY #{group_clauses.join(', ')}" unless groupings.blank? ), ("HAVING #{having_clauses.join(' AND ')}" unless havings.blank? ), ("ORDER BY #{order_clauses.join(', ')}" unless orders.blank? ) - clauses << " #{locked}" unless locked.blank? engine.add_limit_offset!(clauses,{ :limit => taken, :offset => skipped }) if taken || skipped + clauses << " #{locked}" unless locked.blank? clauses unless clauses.blank? end |