diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-04 21:50:44 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-04 21:50:44 -0300 |
| commit | de843c86518e4ac871d4bb5b0873bb6c184ac304 (patch) | |
| tree | d9d7a3668fe219bce3ae7f7e1954f208b1df6d1b /lib/arel/sql | |
| parent | f44853a5aa7f4481d99a3af4585f3a51272bc7f7 (diff) | |
| download | rails-de843c86518e4ac871d4bb5b0873bb6c184ac304.tar.gz rails-de843c86518e4ac871d4bb5b0873bb6c184ac304.tar.bz2 rails-de843c86518e4ac871d4bb5b0873bb6c184ac304.zip | |
Fixes for PostgreSQL: always alias expresions and quote values.
Diffstat (limited to 'lib/arel/sql')
| -rw-r--r-- | lib/arel/sql/formatters.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/arel/sql/formatters.rb b/lib/arel/sql/formatters.rb index aa10952d04..d8618ca2cc 100644 --- a/lib/arel/sql/formatters.rb +++ b/lib/arel/sql/formatters.rb @@ -25,7 +25,7 @@ module Arel if expression.function_sql == "DISTINCT" "#{expression.function_sql} #{expression.attribute.to_sql(self)}" + (expression.alias ? " AS #{quote_column_name(expression.alias)}" : '') else - "#{expression.function_sql}(#{expression.attribute.to_sql(self)})" + (expression.alias ? " AS #{quote_column_name(expression.alias)}" : '') + "#{expression.function_sql}(#{expression.attribute.to_sql(self)})" + (expression.alias ? " AS #{quote_column_name(expression.alias)}" : " AS #{expression.function_sql.to_s.downcase}_id") end end @@ -69,7 +69,7 @@ module Arel end def value(value) - value.to_sql(self) + quote value.to_sql(self) end def scalar(value, column = nil) |