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 /test | |
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 'test')
-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 |
3 files changed, 3 insertions, 22 deletions
diff --git a/test/test_insert_manager.rb b/test/test_insert_manager.rb index 46549c1ae4..b9ee6f76ac 100644 --- a/test/test_insert_manager.rb +++ b/test/test_insert_manager.rb @@ -28,25 +28,6 @@ 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 e83d04d2bd..9877d24541 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 '(NULL)' + im = @relation.compile_insert 'VALUES(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 52f9855545..31279b0ae2 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 '(?)' + sql.must_be_like 'VALUES (?)' end it 'can define a dispatch method' do |