diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-14 11:04:08 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-14 11:04:08 -0800 |
| commit | 24d598fad1a80c3ec1875588be577a37f9e4f9f9 (patch) | |
| tree | b91fd9e05cbf51da34617200e19b56de5e462b7b /lib/arel/visitors | |
| parent | 7c48c8360e1b4e90f2a0c5ef15590355c4bf0856 (diff) | |
| download | rails-24d598fad1a80c3ec1875588be577a37f9e4f9f9.tar.gz rails-24d598fad1a80c3ec1875588be577a37f9e4f9f9.tar.bz2 rails-24d598fad1a80c3ec1875588be577a37f9e4f9f9.zip | |
string join should be a unary op
Diffstat (limited to 'lib/arel/visitors')
| -rw-r--r-- | lib/arel/visitors/depth_first.rb | 5 | ||||
| -rw-r--r-- | lib/arel/visitors/join_sql.rb | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/arel/visitors/depth_first.rb b/lib/arel/visitors/depth_first.rb index 5ebd1296dd..eec356af4c 100644 --- a/lib/arel/visitors/depth_first.rb +++ b/lib/arel/visitors/depth_first.rb @@ -67,10 +67,13 @@ module Arel alias :visit_Arel_Nodes_Or :binary alias :visit_Arel_Nodes_Ordering :binary alias :visit_Arel_Nodes_OuterJoin :binary - alias :visit_Arel_Nodes_StringJoin :binary alias :visit_Arel_Nodes_TableAlias :binary alias :visit_Arel_Nodes_Values :binary + def visit_Arel_Nodes_StringJoin o + visit o.left + end + def visit_Arel_Attribute o visit o.relation visit o.name diff --git a/lib/arel/visitors/join_sql.rb b/lib/arel/visitors/join_sql.rb index 8c31934cd0..1cdd7eb5ca 100644 --- a/lib/arel/visitors/join_sql.rb +++ b/lib/arel/visitors/join_sql.rb @@ -14,13 +14,6 @@ module Arel def visit_Arel_Nodes_SelectCore o o.source.right.map { |j| visit j }.join ' ' end - - def visit_Arel_Nodes_StringJoin o - [ - (visit o.left if Nodes::Join === o.left), - visit(o.right) - ].compact.join ' ' - end end end end |