2 files changed, 5 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index 64edcc1ef3..7cf73f7eb3 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -163,19 +163,17 @@ module ActiveRecord
     def perform_calculation(operation, column_name, options = {})
       operation = operation.to_s.downcase
 
+      distinct = nil
+
       if operation == "count"
         column_name ||= (select_for_count || :all)
 
-        joins = arel.joins(arel)
-        if joins.present? && joins =~ /LEFT OUTER/i
+        if arel.joins(arel) =~ /LEFT OUTER/i
           distinct = true
           column_name = @klass.primary_key if column_name == :all
         end
 
-        distinct = nil if column_name.to_s =~ /\s*DISTINCT\s+/i
-        distinct ||= options[:distinct]
-      else
-        distinct = nil
+        distinct = nil if column_name =~ /\s*DISTINCT\s+/i
       end
 
       distinct = options[:distinct] || distinct
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 0bf0b37900..0b5e9b4fb2 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -229,7 +229,7 @@ module ActiveRecord
           arel.project(selects.last)
         end
       else
-        arel.project(@klass.quoted_table_name + '.*')
+        arel.project(Arel::SqlLiteral.new(@klass.quoted_table_name + '.*'))
       end
     end