From cd6ddc865a68d126a845d03337e1c7f775588db2 Mon Sep 17 00:00:00 2001 From: Doug Cole Date: Sat, 7 Apr 2012 18:23:26 -0700 Subject: refactor configuration of insert_returning --- .../adapters/postgresql/postgresql_adapter_test.rb | 34 ++++++++++------------ 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb') diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb index 3073b9f011..92e31a3e44 100644 --- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb +++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb @@ -50,38 +50,30 @@ module ActiveRecord end def test_insert_sql_with_returning_disabled - @connection.disable_insert_returning! - id = @connection.insert_sql("insert into postgresql_partitioned_table_parent (number) VALUES (1)") - expect = @connection.query('select max(id) from postgresql_partitioned_table_parent').first.first + connection = connection_without_insert_returning + id = connection.insert_sql("insert into postgresql_partitioned_table_parent (number) VALUES (1)") + expect = connection.query('select max(id) from postgresql_partitioned_table_parent').first.first assert_equal expect, id - ensure - @connection.enable_insert_returning! end def test_exec_insert_with_returning_disabled - @connection.disable_insert_returning! - result = @connection.exec_insert("insert into postgresql_partitioned_table_parent (number) VALUES (1)", nil, [], 'id', 'postgresql_partitioned_table_parent_id_seq') - expect = @connection.query('select max(id) from postgresql_partitioned_table_parent').first.first + connection = connection_without_insert_returning + result = connection.exec_insert("insert into postgresql_partitioned_table_parent (number) VALUES (1)", nil, [], 'id', 'postgresql_partitioned_table_parent_id_seq') + expect = connection.query('select max(id) from postgresql_partitioned_table_parent').first.first assert_equal expect, result.rows.first.first - ensure - @connection.enable_insert_returning! end def test_exec_insert_with_returning_disabled_and_no_sequence_name_given - @connection.disable_insert_returning! - result = @connection.exec_insert("insert into postgresql_partitioned_table_parent (number) VALUES (1)", nil, [], 'id') - expect = @connection.query('select max(id) from postgresql_partitioned_table_parent').first.first + connection = connection_without_insert_returning + result = connection.exec_insert("insert into postgresql_partitioned_table_parent (number) VALUES (1)", nil, [], 'id') + expect = connection.query('select max(id) from postgresql_partitioned_table_parent').first.first assert_equal expect, result.rows.first.first - ensure - @connection.enable_insert_returning! end def test_sql_for_insert_with_returning_disabled - @connection.disable_insert_returning! - result = @connection.sql_for_insert('sql', nil, nil, nil, 'binds') + connection = connection_without_insert_returning + result = connection.sql_for_insert('sql', nil, nil, nil, 'binds') assert_equal ['sql', 'binds'], result - ensure - @connection.enable_insert_returning! end def test_serial_sequence @@ -239,6 +231,10 @@ module ActiveRecord ctx.exec_insert(sql, 'SQL', binds) end + + def connection_without_insert_returning + ActiveRecord::Base.postgresql_connection(ActiveRecord::Base.configurations['arunit'].merge(:insert_returning => false)) + end end end end -- cgit v1.2.3