diff options
| -rw-r--r-- | lib/arel/engines/sql/relations/compiler.rb | 7 | ||||
| -rw-r--r-- | spec/engines/sql/unit/relations/take_spec.rb | 8 |
2 files changed, 8 insertions, 7 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 diff --git a/spec/engines/sql/unit/relations/take_spec.rb b/spec/engines/sql/unit/relations/take_spec.rb index 1e0d3e3cfe..ad46190f7e 100644 --- a/spec/engines/sql/unit/relations/take_spec.rb +++ b/spec/engines/sql/unit/relations/take_spec.rb @@ -58,15 +58,15 @@ module Arel adapter_is :mysql do sql.should be_like(%Q{ - SELECT COUNT(`users`.`id`) AS count_id - FROM (SELECT 1 FROM `users` LIMIT 4) + SELECT COUNT(*) AS count_id + FROM (SELECT 1 FROM `users` LIMIT 4) AS subquery }) end adapter_is_not :mysql, :oracle do sql.should be_like(%Q{ - SELECT COUNT("users"."id") AS count_id - FROM (SELECT 1 FROM "users" LIMIT 4) + SELECT COUNT(*) AS count_id + FROM (SELECT 1 FROM "users" LIMIT 4) AS subquery }) end end |