diff options
author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-05-18 16:11:08 -0700 |
---|---|---|
committer | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-05-18 16:11:08 -0700 |
commit | 32ad530b825f4cdac51e579306548ca695471039 (patch) | |
tree | df137bf2e7dfd37d086c3b6b3df291c1b940e23f /lib/arel/sql | |
parent | 7a068384b74813b3ea9a309d237c6ce8e8fde5d6 (diff) | |
download | rails-32ad530b825f4cdac51e579306548ca695471039.tar.gz rails-32ad530b825f4cdac51e579306548ca695471039.tar.bz2 rails-32ad530b825f4cdac51e579306548ca695471039.zip |
rename refactor of circle
Diffstat (limited to 'lib/arel/sql')
-rw-r--r-- | lib/arel/sql/formatters.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/arel/sql/formatters.rb b/lib/arel/sql/formatters.rb index 5eab65726e..cc7a1fa7d5 100644 --- a/lib/arel/sql/formatters.rb +++ b/lib/arel/sql/formatters.rb @@ -20,8 +20,8 @@ module Arel "#{expression.function_sql}(#{expression.attribute.to_sql(self)})" + (expression.alias ? " AS #{quote_column_name(expression.alias)}" : '') end - def select(select_sql, name) - "(#{select_sql}) AS #{quote_table_name(name.to_s)}" + def select(select_sql, table) + "(#{select_sql}) AS #{quote_table_name(table)}" end def value(value) @@ -67,24 +67,24 @@ module Arel quote(value, column) end - def select(select_sql, name) + def select(select_sql, table) "(#{select_sql})" end end class SelectStatement < Formatter - def select(select_sql, name) + def select(select_sql, table) select_sql end end class TableReference < Formatter - def select(select_sql, name) - "(#{select_sql}) AS #{quote_table_name(name)}" + def select(select_sql, table) + "(#{select_sql}) AS #{quote_table_name(table)}" end def table(table) - quote_table_name(table.name) + (table.name != name_for(table) ? " AS " + engine.quote_table_name(name_for(table)) : '') + quote_table_name(table.name) + (table.name != name_for(table) ? " AS " + quote_table_name(name_for(table)) : '') end end |