diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-03-18 07:04:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 07:04:01 +0900 |
| commit | aa225455a01e57016e0a28f5d88f6a751ef7b5d2 (patch) | |
| tree | 0bed1c0321dbe226e6017c4f8ee9022fdc08a243 /activerecord/lib/arel/visitors | |
| parent | 2d5d537d19d62e9c132cf49f7dbc9eb8ff9190e3 (diff) | |
| parent | 187870db2fcc58aa0da8bb3f26711664fd5ed611 (diff) | |
| download | rails-aa225455a01e57016e0a28f5d88f6a751ef7b5d2.tar.gz rails-aa225455a01e57016e0a28f5d88f6a751ef7b5d2.tar.bz2 rails-aa225455a01e57016e0a28f5d88f6a751ef7b5d2.zip | |
Merge pull request #35653 from kamipo/remove_arel_nodes_values
Get rid of `Arel::Nodes::Values`
Diffstat (limited to 'activerecord/lib/arel/visitors')
| -rw-r--r-- | activerecord/lib/arel/visitors/depth_first.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/arel/visitors/dot.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/arel/visitors/to_sql.rb | 21 |
3 files changed, 4 insertions, 23 deletions
diff --git a/activerecord/lib/arel/visitors/depth_first.rb b/activerecord/lib/arel/visitors/depth_first.rb index 892d670c79..109afb7402 100644 --- a/activerecord/lib/arel/visitors/depth_first.rb +++ b/activerecord/lib/arel/visitors/depth_first.rb @@ -36,6 +36,7 @@ module Arel # :nodoc: all alias :visit_Arel_Nodes_Descending :unary alias :visit_Arel_Nodes_UnqualifiedColumn :unary alias :visit_Arel_Nodes_OptimizerHints :unary + alias :visit_Arel_Nodes_ValuesList :unary def function(o) visit o.expressions @@ -103,7 +104,6 @@ module Arel # :nodoc: all alias :visit_Arel_Nodes_Regexp :binary alias :visit_Arel_Nodes_RightOuterJoin :binary alias :visit_Arel_Nodes_TableAlias :binary - alias :visit_Arel_Nodes_Values :binary alias :visit_Arel_Nodes_When :binary def visit_Arel_Nodes_StringJoin(o) diff --git a/activerecord/lib/arel/visitors/dot.rb b/activerecord/lib/arel/visitors/dot.rb index ffcbb7a7ab..37803ce0c0 100644 --- a/activerecord/lib/arel/visitors/dot.rb +++ b/activerecord/lib/arel/visitors/dot.rb @@ -46,8 +46,8 @@ module Arel # :nodoc: all visit_edge o, "distinct" end - def visit_Arel_Nodes_Values(o) - visit_edge o, "expressions" + def visit_Arel_Nodes_ValuesList(o) + visit_edge o, "rows" end def visit_Arel_Nodes_StringJoin(o) diff --git a/activerecord/lib/arel/visitors/to_sql.rb b/activerecord/lib/arel/visitors/to_sql.rb index 72efac72bf..583f920290 100644 --- a/activerecord/lib/arel/visitors/to_sql.rb +++ b/activerecord/lib/arel/visitors/to_sql.rb @@ -159,7 +159,7 @@ module Arel # :nodoc: all when Nodes::SqlLiteral, Nodes::BindParam collector = visit(value, collector) else - collector << quote(value) + collector << quote(value).to_s end collector << COMMA unless k == row_len end @@ -169,25 +169,6 @@ module Arel # :nodoc: all collector end - def visit_Arel_Nodes_Values(o, collector) - collector << "VALUES (" - - len = o.expressions.length - 1 - o.expressions.each_with_index { |value, i| - case value - when Nodes::SqlLiteral, Nodes::BindParam - collector = visit value, collector - else - collector << quote(value).to_s - end - unless i == len - collector << COMMA - end - } - - collector << ")" - end - def visit_Arel_Nodes_SelectStatement(o, collector) if o.with collector = visit o.with, collector |