kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge branch 'v1' of github.com:flavorjones/arel into v1

Browse source 
* 'v1' of github.com:flavorjones/arel:
  sql visitor should emit a table alias name when visiting an attribute, if a table alias exists.
  dot visitor for binary nodes

Conflicts:
	lib/arel/visitors/dot.rb
This commit is contained in:
Aaron Patterson 2010-09-14 10:07:34 -07:00
commit 81faff66f8
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/arel/visitors/dot.rb
View file

@ -92,7 +92,12 @@ module Arel
visit_edge o, "left"
visit_edge o, "right"
end
alias :visit_Arel_Nodes_And :visit_Arel_Nodes_Equality
alias :visit_Arel_Nodes_And :visit_Arel_Nodes_Equality
alias :visit_Arel_Nodes_Or :visit_Arel_Nodes_Equality
alias :visit_Arel_Nodes_NotEqual :visit_Arel_Nodes_Equality
alias :visit_Arel_Nodes_GreaterThan :visit_Arel_Nodes_Equality
alias :visit_Arel_Nodes_GreaterThanOrEqual :visit_Arel_Nodes_Equality
alias :visit_Arel_Nodes_Assignment :visit_Arel_Nodes_Equality
def visit_String o
@node_stack.last.fields << o

3
lib/arel/visitors/to_sql.rb
View file

@ -190,7 +190,8 @@ module Arel
end
def visit_Arel_Attributes_Attribute o
"#{quote_table_name o.relation.name}.#{quote_column_name o.name}"
join_name = o.relation.table_alias || o.relation.name
"#{quote_table_name join_name}.#{quote_column_name o.name}"
end
alias :visit_Arel_Attributes_Integer :visit_Arel_Attributes_Attribute
alias :visit_Arel_Attributes_String :visit_Arel_Attributes_Attribute