From a98c9bdbdd233ff60457450deea80d2015ee1193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 4 May 2017 15:13:58 -0700
Subject: 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
---
 lib/arel/insert_manager.rb  |  6 +-----
 lib/arel/nodes.rb           |  1 -
 lib/arel/nodes/tuple.rb     | 13 -------------
 lib/arel/visitors/to_sql.rb | 14 +-------------
 4 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 lib/arel/nodes/tuple.rb

(limited to 'lib')

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|
-- 
cgit v1.2.3