diff options
| -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 | ||||
| -rw-r--r-- | test/test_insert_manager.rb | 19 | ||||
| -rw-r--r-- | test/test_table.rb | 4 | ||||
| -rw-r--r-- | test/visitors/test_to_sql.rb | 2 |
7 files changed, 54 insertions, 5 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| diff --git a/test/test_insert_manager.rb b/test/test_insert_manager.rb index b9ee6f76ac..46549c1ae4 100644 --- a/test/test_insert_manager.rb +++ b/test/test_insert_manager.rb @@ -28,6 +28,25 @@ module Arel } end + it 'inserts multiple values' do + table = Table.new(:users) + manager = Arel::InsertManager.new + manager.into table + + manager.columns << table[:id] + manager.columns << table[:name] + + manager.values = manager.create_tuple([ + manager.create_values(%w{ 1 david }), + manager.create_values(%w{ 2 kirs }), + manager.create_values(["3", Arel.sql('DEFAULT')], []), + ]) + + manager.to_sql.must_be_like %{ + INSERT INTO \"users\" (\"id\", \"name\") VALUES ('1', 'david'), ('2', 'kirs'), ('3', DEFAULT) + } + end + it "inserts false" do table = Table.new(:users) manager = Arel::InsertManager.new diff --git a/test/test_table.rb b/test/test_table.rb index 9877d24541..e83d04d2bd 100644 --- a/test/test_table.rb +++ b/test/test_table.rb @@ -42,10 +42,10 @@ module Arel end it 'should return an insert manager' do - im = @relation.compile_insert 'VALUES(NULL)' + im = @relation.compile_insert '(NULL)' assert_kind_of Arel::InsertManager, im im.into Table.new(:users) - assert_equal "INSERT INTO \"users\" VALUES(NULL)", im.to_sql + assert_equal "INSERT INTO \"users\" VALUES (NULL)", im.to_sql end describe 'skip' do diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb index 31279b0ae2..52f9855545 100644 --- a/test/visitors/test_to_sql.rb +++ b/test/visitors/test_to_sql.rb @@ -26,7 +26,7 @@ module Arel bp = Nodes::BindParam.new values = Nodes::Values.new([bp]) sql = compile values - sql.must_be_like 'VALUES (?)' + sql.must_be_like '(?)' end it 'can define a dispatch method' do |