Added DISTINCT support. Modified when to quote or not columns and tables.

1 files changed, 17 insertions, 10 deletions

diff --git a/spec/arel/unit/relations/project_spec.rb b/spec/arel/unit/relations/project_spec.rb
index 93cbe5668a..7f531096f0 100644
--- a/spec/arel/unit/relations/project_spec.rb
+++ b/spec/arel/unit/relations/project_spec.rb
@@ -6,17 +6,17 @@ module Arel
       @relation = Table.new(:users)
       @attribute = @relation[:id]
     end
-    
+
     describe '#attributes' do
       before do
         @projection = Project.new(@relation, @attribute)
       end
-      
+
       it "manufactures attributes associated with the projection relation" do
         @projection.attributes.should == [@attribute].collect { |a| a.bind(@projection) }
       end
     end
-  
+
     describe '#to_sql' do
       describe 'when given an attribute' do
         it "manufactures sql with a limited select clause" do
@@ -26,19 +26,19 @@ module Arel
           ")
         end
       end
-      
+
       describe 'when given a relation' do
         before do
           @scalar_relation = Project.new(@relation, @relation[:name])
         end
-        
+
         it "manufactures sql with scalar selects" do
           Project.new(@relation, @scalar_relation).to_sql.should be_like("
             SELECT (SELECT `users`.`name` FROM `users`) AS `users` FROM `users`
           ")
         end
       end
-      
+
       describe 'when given a string' do
         it "passes the string through to the select clause" do
           Project.new(@relation, 'asdf').to_sql.should be_like("
@@ -46,7 +46,7 @@ module Arel
           ")
         end
       end
-      
+
       describe 'when given an expression' do
         it 'manufactures sql with expressions' do
           @relation.project(@attribute.count).to_sql.should be_like("
@@ -54,16 +54,23 @@ module Arel
             FROM `users`
           ")
         end
+
+        it 'manufactures sql with distinct expressions' do
+          @relation.project(@attribute.count(true)).to_sql.should be_like("
+            SELECT COUNT(DISTINCT `users`.`id`)
+            FROM `users`
+          ")
+        end
       end
     end
-    
+
     describe '#externalizable?' do
       describe 'when the projections are attributes' do
         it 'returns false' do
           Project.new(@relation, @attribute).should_not be_externalizable
         end
       end
-      
+
       describe 'when the projections include an aggregation' do
         it "obtains" do
           Project.new(@relation, @attribute.sum).should be_externalizable
@@ -71,4 +78,4 @@ module Arel
       end
     end
   end
-end
\ No newline at end of file
+end