lib/arel/engines/sql/formatters.rb in arel-0.2.1 vs lib/arel/engines/sql/formatters.rb in arel-0.3.0

@@ -91,29 +91,29 @@
       end
     end
 
     class TableReference < Formatter
       def select(select_sql, table)
-        "(#{select_sql}) AS #{quote_table_name(name_for(table))}"
+        "(#{select_sql}) #{quote_table_name(name_for(table))}"
       end
 
       def table(table)
         if table.name =~ /\s/
           table.name
         else
           quote_table_name(table.name) +
-            (table.name != name_for(table) ? " AS " + quote_table_name(name_for(table)) : '')
+            (table.name != name_for(table) ? " #{quote_table_name(name_for(table))}" : '')
         end
       end
     end
 
     class Attribute < WhereCondition
       def scalar(scalar)
         quote(scalar, environment.column)
       end
 
       def range(left, right)
-        "#{left} AND #{right}"
+        "#{scalar(left)} AND #{scalar(right)}"
       end
     end
 
     class Value < WhereCondition
     end