aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Dalessio <mike@csa.net>2010-09-14 08:47:08 -0400
committerMike Dalessio <mike@csa.net>2010-09-14 08:47:08 -0400
commitbe852b9c2650b4584bdd70651b12521bbcb356d7 (patch)
treea8262cc7edeee9f1b03d45fdf8ca3647be3d0237
parent5c9b50e93fcb3683c742815095104283c8f9bf07 (diff)
downloadrails-be852b9c2650b4584bdd70651b12521bbcb356d7.tar.gz
rails-be852b9c2650b4584bdd70651b12521bbcb356d7.tar.bz2
rails-be852b9c2650b4584bdd70651b12521bbcb356d7.zip
sql visitor should emit a table alias name when visiting an attribute, if a table alias exists.
-rw-r--r--lib/arel/visitors/to_sql.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 391d2ff1c4..2660c7d284 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -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