Created
June 23, 2010 14:15
-
-
Save miloops/449969 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/arel/engines/sql/relations/compiler.rb b/lib/arel/engines/sql/relations/compiler.rb | |
index 374967b..05a8f16 100644 | |
--- a/lib/arel/engines/sql/relations/compiler.rb | |
+++ b/lib/arel/engines/sql/relations/compiler.rb | |
@@ -8,17 +8,28 @@ module Arel | |
end | |
def select_sql | |
- query = build_query \ | |
- "SELECT #{select_clauses.join(', ')}", | |
- "FROM #{from_clauses}", | |
+ if relation.projections.size == 1 && relation.projections.first.is_a?(Count) && (taken.present? || wheres.present?) | |
+ subquery = build_query("SELECT 1 FROM #{from_clauses}", build_clauses) | |
+ query = "SELECT #{select_clauses.join(', ')} FROM (#{subquery})" | |
+ else | |
+ query = build_query \ | |
+ "SELECT #{select_clauses.join(', ')}", | |
+ "FROM #{from_clauses}", | |
+ build_clauses | |
+ end | |
+ query | |
+ end | |
+ | |
+ def build_clauses | |
+ clauses = build_query "", | |
(joins(self) unless joins(self).blank? ), | |
("WHERE #{where_clauses.join(' AND ')}" unless wheres.blank? ), | |
("GROUP BY #{group_clauses.join(', ')}" unless groupings.blank? ), | |
("HAVING #{having_clauses.join(' AND ')}" unless havings.blank? ), | |
("ORDER BY #{order_clauses.join(', ')}" unless orders.blank? ) | |
- engine.add_limit_offset!(query,{ :limit => taken, :offset => skipped }) if taken || skipped | |
- query << " #{locked}" unless locked.blank? | |
- query | |
+ clauses << " #{locked}" unless locked.blank? | |
+ engine.add_limit_offset!(clauses,{ :limit => taken, :offset => skipped }) if taken || skipped | |
+ clauses | |
end | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment