aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/insert_manager.rb6
-rw-r--r--lib/arel/nodes.rb1
-rw-r--r--lib/arel/nodes/tuple.rb13
-rw-r--r--lib/arel/visitors/to_sql.rb14
4 files changed, 32 insertions, 2 deletions
diff --git a/lib/arel/insert_manager.rb b/lib/arel/insert_manager.rb
index f9a598e8b7..3c95ca6443 100644
--- a/lib/arel/insert_manager.rb
+++ b/lib/arel/insert_manager.rb
@@ -37,8 +37,12 @@ module Arel
self
end
- def create_values values, columns
+ def create_values values, columns = nil
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 8c9815a96b..d178e8d2ed 100644
--- a/lib/arel/nodes.rb
+++ b/lib/arel/nodes.rb
@@ -6,6 +6,7 @@ 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
new file mode 100644
index 0000000000..4e088a79aa
--- /dev/null
+++ b/lib/arel/nodes/tuple.rb
@@ -0,0 +1,13 @@
+# 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 486c51a183..7143d4e76a 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -131,6 +131,7 @@ module Arel
end
if o.values
+ collector << " VALUES"
maybe_visit o.values, collector
elsif o.select
maybe_visit o.select, collector
@@ -166,8 +167,19 @@ 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 << "VALUES ("
+ collector << "("
len = o.expressions.length - 1
o.expressions.each_with_index { |value, i|