diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-05-04 15:13:58 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-05-04 15:13:58 -0700 |
commit | a98c9bdbdd233ff60457450deea80d2015ee1193 (patch) | |
tree | a937b86901c900356980332a64bf936ef3687c95 /lib/arel | |
parent | 6d105c7f891a14316eab47dfff3bf1b94f3204e7 (diff) | |
download | rails-a98c9bdbdd233ff60457450deea80d2015ee1193.tar.gz rails-a98c9bdbdd233ff60457450deea80d2015ee1193.tar.bz2 rails-a98c9bdbdd233ff60457450deea80d2015ee1193.zip |
Revert "Merge pull request #482 from kirs/multiple-insert"
This reverts commit 6d105c7f891a14316eab47dfff3bf1b94f3204e7, reversing
changes made to 437aa3a4bb8ad4f3f4eba299dbb1112852f9c7ac.
This broke Active Record when the values are sql literals
Diffstat (limited to 'lib/arel')
-rw-r--r-- | lib/arel/insert_manager.rb | 6 | ||||
-rw-r--r-- | lib/arel/nodes.rb | 1 | ||||
-rw-r--r-- | lib/arel/nodes/tuple.rb | 13 | ||||
-rw-r--r-- | lib/arel/visitors/to_sql.rb | 14 |
4 files changed, 2 insertions, 32 deletions
diff --git a/lib/arel/insert_manager.rb b/lib/arel/insert_manager.rb index 3c95ca6443..f9a598e8b7 100644 --- a/lib/arel/insert_manager.rb +++ b/lib/arel/insert_manager.rb @@ -37,12 +37,8 @@ module Arel self end - def create_values values, columns = nil + def create_values values, columns Nodes::Values.new values, columns end - - def create_tuple values - Nodes::Tuple.new values - end end end diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index d178e8d2ed..8c9815a96b 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -6,7 +6,6 @@ require 'arel/nodes/select_core' require 'arel/nodes/insert_statement' require 'arel/nodes/update_statement' require 'arel/nodes/bind_param' -require 'arel/nodes/tuple' # terminal diff --git a/lib/arel/nodes/tuple.rb b/lib/arel/nodes/tuple.rb deleted file mode 100644 index 4e088a79aa..0000000000 --- a/lib/arel/nodes/tuple.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true -module Arel - module Nodes - class Tuple < Node - attr_reader :values - - def initialize(values) - @values = values - super() - end - end - end -end diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index 7143d4e76a..486c51a183 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -131,7 +131,6 @@ module Arel end if o.values - collector << " VALUES" maybe_visit o.values, collector elsif o.select maybe_visit o.select, collector @@ -167,19 +166,8 @@ module Arel collector << "FALSE" end - def visit_Arel_Nodes_Tuple o, collector - len = o.values.length - 1 - o.values.each_with_index { |value, i| - collector = visit value, collector - unless i == len - collector << COMMA - end - } - collector - end - def visit_Arel_Nodes_Values o, collector - collector << "(" + collector << "VALUES (" len = o.expressions.length - 1 o.expressions.each_with_index { |value, i| |