pg 1.0.0 → 1.1.0.pre20180730144600

data/spec/pg/basic_type_mapping_spec.rb

@@ -1,9 +1,25 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative '../helpers'
 
 require 'pg'
+require 'time'
+
+def restore_type(types)
+	[0, 1].each do |format|
+		[types].flatten.each do |type|
+			PG::BasicTypeRegistry.alias_type(format, "restore_#{type}", type)
+		end
+	end
+	yield
+ensure
+	[0, 1].each do |format|
+		[types].flatten.each do |type|
+			PG::BasicTypeRegistry.alias_type(format, type, "restore_#{type}")
+		end
+	end
+end
 
 describe 'Basic type mapping' do
 
@@ -42,6 +58,30 @@ describe 'Basic type mapping' do
 
 			expect( result_typenames(res) ).to eq( ['bigint[]', 'bigint[]', 'double precision[]', 'text[]'] )
 		end
+
+		it "should do bigdecimal param encoding" do
+			large = ('123456790'*10) << '.' << ('012345679')
+			res = @conn.exec_params( "SELECT $1::numeric,$2::numeric",
+				[BigDecimal.new('1'), BigDecimal.new(large)], nil, basic_type_mapping )
+
+			expect( res.values ).to eq( [
+					[ "1.0", large ],
+			] )
+
+			expect( result_typenames(res) ).to eq( ['numeric', 'numeric'] )
+		end
+
+		it "should do IPAddr param encoding" do
+			res = @conn.exec_params( "SELECT $1::inet,$2::inet,$3::cidr,$4::cidr",
+				['1.2.3.4', IPAddr.new('1234::5678'), '1.2.3.4', IPAddr.new('1234:5678::/32')], nil, basic_type_mapping )
+
+			expect( res.values ).to eq( [
+					[ '1.2.3.4', '1234::5678', '1.2.3.4/32', '1234:5678::/32'],
+			] )
+
+			expect( result_typenames(res) ).to eq( ['inet', 'inet', 'cidr', 'cidr'] )
+		end
+
 	end
 
 
@@ -78,14 +118,14 @@ describe 'Basic type mapping' do
 
 			it "should do boolean type conversions" do
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT true::BOOLEAN, false::BOOLEAN, NULL::BOOLEAN", [], format )
+					res = @conn.exec_params( "SELECT true::BOOLEAN, false::BOOLEAN, NULL::BOOLEAN", [], format )
 					expect( res.values ).to eq( [[true, false, nil]] )
 				end
 			end
 
 			it "should do binary type conversions" do
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT E'\\\\000\\\\377'::BYTEA", [], format )
+					res = @conn.exec_params( "SELECT E'\\\\000\\\\377'::BYTEA", [], format )
 					expect( res.values ).to eq( [[["00ff"].pack("H*")]] )
 					expect( res.values[0][0].encoding ).to eq( Encoding::ASCII_8BIT ) if Object.const_defined? :Encoding
 				end
@@ -93,7 +133,7 @@ describe 'Basic type mapping' do
 
 			it "should do integer type conversions" do
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT -8999::INT2, -899999999::INT4, -8999999999999999999::INT8", [], format )
+					res = @conn.exec_params( "SELECT -8999::INT2, -899999999::INT4, -8999999999999999999::INT8", [], format )
 					expect( res.values ).to eq( [[-8999, -899999999, -8999999999999999999]] )
 				end
 			end
@@ -101,7 +141,7 @@ describe 'Basic type mapping' do
 			it "should do string type conversions" do
 				@conn.internal_encoding = 'utf-8' if Object.const_defined? :Encoding
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT 'abcäöü'::TEXT", [], format )
+					res = @conn.exec_params( "SELECT 'abcäöü'::TEXT", [], format )
 					expect( res.values ).to eq( [['abcäöü']] )
 					expect( res.values[0][0].encoding ).to eq( Encoding::UTF_8 ) if Object.const_defined? :Encoding
 				end
@@ -109,7 +149,7 @@ describe 'Basic type mapping' do
 
 			it "should do float type conversions" do
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT -8.999e3::FLOAT4,
+					res = @conn.exec_params( "SELECT -8.999e3::FLOAT4,
 														8.999e10::FLOAT4,
 														-8999999999e-99::FLOAT8,
 														NULL::FLOAT4,
@@ -127,35 +167,107 @@ describe 'Basic type mapping' do
 				end
 			end
 
-			it "should do datetime without time zone type conversions" do
-				[0].each do |format|
-					res = @conn.exec( "SELECT CAST('2013-12-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
-																		CAST('1913-12-31 23:58:59.123-03' AS TIMESTAMP WITHOUT TIME ZONE),
-																		CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
-																		CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], format )
-					expect( res.getvalue(0,0) ).to eq( Time.new(2013, 12, 31, 23, 58, 59) )
-					expect( res.getvalue(0,1) ).to be_within(1e-3).of(Time.new(1913, 12, 31, 23, 58, 59.123))
-					expect( res.getvalue(0,2) ).to eq( 'infinity' )
-					expect( res.getvalue(0,3) ).to eq( '-infinity' )
+			it "should do text datetime without time zone type conversions" do
+				# for backward compat text timestamps without time zone are treated as local times
+				res = @conn.exec_params( "SELECT CAST('2013-12-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('294276-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], 0 )
+				expect( res.getvalue(0,0) ).to eq( Time.new(2013, 12, 31, 23, 58, 59) )
+				expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.new(1913, 12, 31, 23, 58, 59.1231).iso8601(3) )
+				expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.new(-4713, 11, 24, 23, 58, 59.1231).iso8601(3) )
+				expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.new(294276, 12, 31, 23, 58, 59.1231).iso8601(3) )
+				expect( res.getvalue(0,4) ).to eq( 'infinity' )
+				expect( res.getvalue(0,5) ).to eq( '-infinity' )
+			end
+
+			[1, 0].each do |format|
+				it "should convert format #{format} timestamps per TimestampUtc" do
+					restore_type("timestamp") do
+						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampUtc
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
+						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('294276-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], format )
+						expect( res.getvalue(0,0).iso8601(3) ).to eq( Time.utc(2013, 7, 31, 23, 58, 59).iso8601(3) )
+						expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.utc(1913, 12, 31, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.utc(-4713, 11, 24, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.utc(294276, 12, 31, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,4) ).to eq( 'infinity' )
+						expect( res.getvalue(0,5) ).to eq( '-infinity' )
+					end
 				end
 			end
 
-			it "should do datetime with time zone type conversions" do
-				[0].each do |format|
-					res = @conn.exec( "SELECT CAST('2013-12-31 23:58:59+02' AS TIMESTAMP WITH TIME ZONE),
-																		CAST('1913-12-31 23:58:59.123-03' AS TIMESTAMP WITH TIME ZONE),
+			[1, 0].each do |format|
+				it "should convert format #{format} timestamps per TimestampUtcToLocal" do
+					restore_type("timestamp") do
+						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampUtcToLocal
+						PG::BasicTypeRegistry.register_type 1, 'timestamp', nil, PG::BinaryDecoder::TimestampUtcToLocal
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
+						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('294276-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], format )
+						expect( res.getvalue(0,0).iso8601(3) ).to eq( Time.utc(2013, 7, 31, 23, 58, 59).getlocal.iso8601(3) )
+						expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.utc(1913, 12, 31, 23, 58, 59.1231).getlocal.iso8601(3) )
+						expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.utc(-4713, 11, 24, 23, 58, 59.1231).getlocal.iso8601(3) )
+						expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.utc(294276, 12, 31, 23, 58, 59.1231).getlocal.iso8601(3) )
+						expect( res.getvalue(0,4) ).to eq( 'infinity' )
+						expect( res.getvalue(0,5) ).to eq( '-infinity' )
+					end
+				end
+			end
+
+			[1, 0].each do |format|
+				it "should convert format #{format} timestamps per TimestampLocal" do
+					restore_type("timestamp") do
+						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampLocal
+						PG::BasicTypeRegistry.register_type 1, 'timestamp', nil, PG::BinaryDecoder::TimestampLocal
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
+						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('1913-12-31 23:58:59.1231' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('294276-12-31 23:58:59.1231+03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], format )
+						expect( res.getvalue(0,0).iso8601(3) ).to eq( Time.new(2013, 7, 31, 23, 58, 59).iso8601(3) )
+						expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.new(1913, 12, 31, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.new(-4713, 11, 24, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.new(294276, 12, 31, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,4) ).to eq( 'infinity' )
+						expect( res.getvalue(0,5) ).to eq( '-infinity' )
+					end
+				end
+			end
+
+			[0, 1].each do |format|
+				it "should convert format #{format} timestamps with time zone" do
+					res = @conn.exec_params( "SELECT CAST('2013-12-31 23:58:59+02' AS TIMESTAMP WITH TIME ZONE),
+																		CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITH TIME ZONE),
+																		CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITH TIME ZONE),
+																		CAST('294276-12-31 23:58:59.1231+03' AS TIMESTAMP WITH TIME ZONE),
 																		CAST('infinity' AS TIMESTAMP WITH TIME ZONE),
 																		CAST('-infinity' AS TIMESTAMP WITH TIME ZONE)", [], format )
-					expect( res.getvalue(0,0) ).to eq( Time.new(2013, 12, 31, 23, 58, 59, "+02:00") )
-					expect( res.getvalue(0,1) ).to be_within(1e-3).of(Time.new(1913, 12, 31, 23, 58, 59.123, "-03:00"))
-					expect( res.getvalue(0,2) ).to eq( 'infinity' )
-					expect( res.getvalue(0,3) ).to eq( '-infinity' )
+					expect( res.getvalue(0,0).iso8601(3) ).to eq( Time.new(2013, 12, 31, 23, 58, 59, "+02:00").getlocal.iso8601(3) )
+					expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.new(1913, 12, 31, 23, 58, 59.1231, "-03:00").getlocal.iso8601(3) )
+					expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.new(-4713, 11, 24, 23, 58, 59.1231, "-03:00").getlocal.iso8601(3) )
+					expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.new(294276, 12, 31, 23, 58, 59.1231, "+03:00").getlocal.iso8601(3) )
+					expect( res.getvalue(0,4) ).to eq( 'infinity' )
+					expect( res.getvalue(0,5) ).to eq( '-infinity' )
 				end
 			end
 
 			it "should do date type conversions" do
 				[0].each do |format|
-					res = @conn.exec( "SELECT CAST('2113-12-31' AS DATE),
+					res = @conn.exec_params( "SELECT CAST('2113-12-31' AS DATE),
 																		CAST('1913-12-31' AS DATE),
 																		CAST('infinity' AS DATE),
 																		CAST('-infinity' AS DATE)", [], format )
@@ -166,10 +278,31 @@ describe 'Basic type mapping' do
 				end
 			end
 
+			it "should do numeric type conversions" do
+				[0].each do |format|
+					small = '123456790123.12'
+					large = ('123456790'*10) << '.' << ('012345679')
+					numerics = [
+						'1',
+						'1.0',
+						'1.2',
+						small,
+						large,
+					]
+					sql_numerics = numerics.map { |v| "CAST(#{v} AS numeric)" }
+					res = @conn.exec_params( "SELECT #{sql_numerics.join(',')}", [], format )
+					expect( res.getvalue(0,0) ).to eq( BigDecimal('1') )
+					expect( res.getvalue(0,1) ).to eq( BigDecimal('1') )
+					expect( res.getvalue(0,2) ).to eq( BigDecimal('1.2') )
+					expect( res.getvalue(0,3) ).to eq( BigDecimal(small) )
+					expect( res.getvalue(0,4) ).to eq( BigDecimal(large) )
+				end
+			end
+
 			it "should do JSON conversions", :postgresql_94 do
 				[0].each do |format|
 					['JSON', 'JSONB'].each do |type|
-						res = @conn.exec( "SELECT CAST('123' AS #{type}),
+						res = @conn.exec_params( "SELECT CAST('123' AS #{type}),
 																			CAST('12.3' AS #{type}),
 																			CAST('true' AS #{type}),
 																			CAST('false' AS #{type}),
@@ -189,7 +322,7 @@ describe 'Basic type mapping' do
 
 			it "should do array type conversions" do
 				[0].each do |format|
-					res = @conn.exec( "SELECT CAST('{1,2,3}' AS INT2[]), CAST('{{1,2},{3,4}}' AS INT2[][]),
+					res = @conn.exec_params( "SELECT CAST('{1,2,3}' AS INT2[]), CAST('{{1,2},{3,4}}' AS INT2[][]),
 															CAST('{1,2,3}' AS INT4[]),
 															CAST('{1,2,3}' AS INT8[]),
 															CAST('{1,2,3}' AS TEXT[]),
@@ -207,6 +340,76 @@ describe 'Basic type mapping' do
 					expect( res.getvalue(0,7) ).to eq( [1.0,2.0,3.0] )
 				end
 			end
+
+			it "should do inet type conversions" do
+				[0].each do |format|
+					vals = [
+						'1.2.3.4',
+						'0.0.0.0/0',
+						'1.0.0.0/8',
+						'1.2.0.0/16',
+						'1.2.3.0/24',
+						'1.2.3.4/24',
+						'1.2.3.4/32',
+						'1.2.3.128/25',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012',
+						'::/0',
+						'1234:3456::/32',
+						'1234:3456:5678:789a::/64',
+						'1234:3456:5678:789a:9abc:bced::/96',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/128',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/0',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/32',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/64',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/96',
+					]
+					sql_vals = vals.map{|v| "CAST('#{v}' AS inet)"}
+					res = @conn.exec_params(("SELECT " + sql_vals.join(', ')), [], format )
+					vals.each_with_index do |v, i|
+						val = res.getvalue(0,i)
+						expect( res.getvalue(0,i) ).to eq( IPAddr.new(v) )
+					end
+				end
+			end
+
+			it "should do cidr type conversions" do
+				[0].each do |format|
+					vals = [
+						'0.0.0.0/0',
+						'1.0.0.0/8',
+						'1.2.0.0/16',
+						'1.2.3.0/24',
+						'1.2.3.4/32',
+						'1.2.3.128/25',
+						'::/0',
+						'1234:3456::/32',
+						'1234:3456:5678:789a::/64',
+						'1234:3456:5678:789a:9abc:bced::/96',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/128',
+					]
+					sql_vals = vals.map { |v| "CAST('#{v}' AS cidr)" }
+					res = @conn.exec_params(("SELECT " + sql_vals.join(', ')), [], format )
+					vals.each_with_index do |v, i|
+					  val = res.getvalue(0,i)
+						ip, prefix = v.split('/', 2)
+					  expect( val.to_s ).to eq( ip )
+						if val.respond_to?(:prefix)
+							val_prefix = val.prefix
+						else
+					    default_prefix = (val.family == Socket::AF_INET ? 32 : 128)
+							range = val.to_range
+							val_prefix	= default_prefix - Math.log(((range.end.to_i - range.begin.to_i) + 1), 2).to_i
+						end
+						if v.include?('/')
+						  expect( val_prefix ).to eq( prefix.to_i )
+						elsif v.include?('.')
+						  expect( val_prefix ).to eq( 32 )
+					  else
+						  expect( val_prefix ).to eq( 128 )
+						end
+					end
+				end
+			end
 		end
 
 		context "with usage of result oids for copy decoder selection" do

data/spec/pg/connection_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 #encoding: utf-8
 
 require_relative '../helpers'
@@ -176,21 +176,8 @@ describe PG::Connection do
 	it "can connect asynchronously", :socket_io do
 		tmpconn = described_class.connect_start( @conninfo )
 		expect( tmpconn ).to be_a( described_class )
-		socket = tmpconn.socket_io
-		status = tmpconn.connect_poll
-
-		while status != PG::PGRES_POLLING_OK
-			if status == PG::PGRES_POLLING_READING
-				select( [socket], [], [], 5.0 ) or
-					raise "Asynchronous connection timed out!"
-
-			elsif status == PG::PGRES_POLLING_WRITING
-				select( [], [socket], [], 5.0 ) or
-					raise "Asynchronous connection timed out!"
-			end
-			status = tmpconn.connect_poll
-		end
 
+		wait_for_polling_ok(tmpconn)
 		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		tmpconn.finish
 	end
@@ -201,28 +188,48 @@ describe PG::Connection do
 		described_class.connect_start(@conninfo) do |tmpconn|
 			expect( tmpconn ).to be_a( described_class )
 			conn = tmpconn
-			socket = tmpconn.socket_io
-			status = tmpconn.connect_poll
-
-			while status != PG::PGRES_POLLING_OK
-				if status == PG::PGRES_POLLING_READING
-					if(not select([socket],[],[],5.0))
-						raise "Asynchronous connection timed out!"
-					end
-				elsif(status == PG::PGRES_POLLING_WRITING)
-					if(not select([],[socket],[],5.0))
-						raise "Asynchronous connection timed out!"
-					end
-				end
-				status = tmpconn.connect_poll
-			end
 
+			wait_for_polling_ok(tmpconn)
 			expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		end
 
 		expect( conn ).to be_finished()
 	end
 
+	context "with async established connection", :socket_io do
+		before :each do
+			@conn2 = described_class.connect_start( @conninfo )
+			wait_for_polling_ok(@conn2)
+			expect( @conn2 ).to still_be_usable
+		end
+
+		after :each do
+			expect( @conn2 ).to still_be_usable
+			@conn2.close
+		end
+
+		it "conn.send_query and IO.select work" do
+			@conn2.send_query("SELECT 1")
+			res = wait_for_query_result(@conn2)
+			expect( res.values ).to eq([["1"]])
+		end
+
+		it "conn.send_query and conn.block work" do
+			@conn2.send_query("SELECT 2")
+			@conn2.block
+			res = @conn2.get_last_result
+			expect( res.values ).to eq([["2"]])
+		end
+
+		it "conn.async_query works" do
+			res = @conn2.async_query("SELECT 3")
+			expect( res.values ).to eq([["3"]])
+			expect( @conn2 ).to still_be_usable
+
+			res = @conn2.query("SELECT 4")
+		end
+	end
+
 	it "raises proper error when sending fails" do
 		conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
 		expect{ conn.exec 'SELECT 1' }.to raise_error(PG::UnableToSend, /no connection/)
@@ -295,18 +302,15 @@ describe PG::Connection do
 
 			trace_data = trace_file.read
 
-			expected_trace_output = EXPECTED_TRACE_OUTPUT.dup
-			# For PostgreSQL < 9.0, the output will be different:
-			# -From backend (#4)> 13
-			# -From backend> "SELECT 1"
-			# +From backend (#4)> 11
-			# +From backend> "SELECT"
-			if @conn.server_version < 90000
-				expected_trace_output.sub!( /From backend \(#4\)> 13/, 'From backend (#4)> 11' )
-				expected_trace_output.sub!( /From backend> "SELECT 1"/, 'From backend> "SELECT"' )
-			end
+			# For async_exec the output will be different:
+			#  From backend> Z
+			#  From backend (#4)> 5
+			# +From backend> Z
+			# +From backend (#4)> 5
+			#  From backend> T
+			trace_data.sub!( /(From backend> Z\nFrom backend \(#4\)> 5\n){3}/m, '\\1\\1' )
 
-			expect( trace_data ).to eq( expected_trace_output )
+			expect( trace_data ).to eq( EXPECTED_TRACE_OUTPUT )
 		end
 
 	it "allows a query to be cancelled" do
@@ -401,22 +405,11 @@ describe PG::Connection do
 		end
 	end
 
-
-	it "supports parameters passed to #exec (backward compatibility)" do
-		@conn.exec( "CREATE TABLE students ( name TEXT, age INTEGER )" )
-		@conn.exec( "INSERT INTO students VALUES( $1, $2 )", ['Wally', 8] )
-		@conn.exec( "INSERT INTO students VALUES( $1, $2 )", ['Sally', 6] )
-		@conn.exec( "INSERT INTO students VALUES( $1, $2 )", ['Dorothy', 4] )
-
-		res = @conn.exec( "SELECT name FROM students WHERE age >= $1", [6] )
-		expect( res.values ).to eq( [ ['Wally'], ['Sally'] ] )
-	end
-
 	it "supports explicitly calling #exec_params" do
 		@conn.exec( "CREATE TABLE students ( name TEXT, age INTEGER )" )
-		@conn.exec( "INSERT INTO students VALUES( $1, $2 )", ['Wally', 8] )
-		@conn.exec( "INSERT INTO students VALUES( $1, $2 )", ['Sally', 6] )
-		@conn.exec( "INSERT INTO students VALUES( $1, $2 )", ['Dorothy', 4] )
+		@conn.exec_params( "INSERT INTO students VALUES( $1, $2 )", ['Wally', 8] )
+		@conn.exec_params( "INSERT INTO students VALUES( $1, $2 )", ['Sally', 6] )
+		@conn.exec_params( "INSERT INTO students VALUES( $1, $2 )", ['Dorothy', 4] )
 
 		res = @conn.exec_params( "SELECT name FROM students WHERE age >= $1", [6] )
 		expect( res.values ).to eq( [ ['Wally'], ['Sally'] ] )
@@ -874,7 +867,7 @@ describe PG::Connection do
 	end
 
 
-	it "can connect asynchronously", :socket_io do
+	it "handles server close while asynchronous connect", :socket_io do
 		serv = TCPServer.new( '127.0.0.1', 54320 )
 		conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
 		expect( [PG::PGRES_POLLING_WRITING, PG::CONNECTION_OK] ).to include conn.connect_poll
@@ -886,11 +879,29 @@ describe PG::Connection do
 		expect( conn.connect_poll ).to eq( PG::PGRES_POLLING_FAILED )
 	end
 
-	it "discards previous results (if any) before waiting on an #async_exec"
+	it "discards previous results at #discard_results" do
+		@conn.send_query( "select 1" )
+		@conn.discard_results
+		@conn.send_query( "select 41 as one" )
+		res = @conn.get_last_result
+		expect( res.to_a ).to eq( [{ 'one' => '41' }] )
+	end
+
+	it "discards previous results (if any) before waiting on #exec" do
+		@conn.send_query( "select 1" )
+		res = @conn.exec( "select 42 as one" )
+		expect( res.to_a ).to eq( [{ 'one' => '42' }] )
+	end
 
-	it "calls the block if one is provided to #async_exec" do
+	it "discards previous errors before waiting on #exec", :without_transaction do
+		@conn.send_query( "ERROR" )
+		res = @conn.exec( "select 43 as one" )
+		expect( res.to_a ).to eq( [{ 'one' => '43' }] )
+	end
+
+	it "calls the block if one is provided to #exec" do
 		result = nil
-		@conn.async_exec( "select 47 as one" ) do |pg_res|
+		@conn.exec( "select 47 as one" ) do |pg_res|
 			result = pg_res[0]
 		end
 		expect( result ).to eq( { 'one' => '47' } )
@@ -928,7 +939,7 @@ describe PG::Connection do
 		end
 		serv.close
 		expect{ conn.block }.to raise_error(PG::ConnectionBad, /server closed the connection unexpectedly/)
-		expect{ conn.block }.to raise_error(PG::ConnectionBad, /can't get socket descriptor/)
+		expect{ conn.block }.to raise_error(PG::ConnectionBad, /connection not open/)
 	end
 
 	it "sets the fallback_application_name on new connections" do
@@ -1176,7 +1187,7 @@ describe PG::Connection do
 				out_string = nil
 				@conn.transaction do |conn|
 					conn.internal_encoding = 'iso8859-1'
-					res = conn.exec("VALUES ('fantasia')", [], 0)
+					res = conn.exec_params("VALUES ('fantasia')", [], 0)
 					out_string = res[0]['column1']
 				end
 				expect( out_string ).to eq( 'fantasia' )
@@ -1187,7 +1198,7 @@ describe PG::Connection do
 				out_string = nil
 				@conn.transaction do |conn|
 					conn.internal_encoding = 'utf-8'
-					res = conn.exec("VALUES ('世界線航跡蔵')", [], 0)
+					res = conn.exec_params("VALUES ('世界線航跡蔵')", [], 0)
 					out_string = res[0]['column1']
 				end
 				expect( out_string ).to eq( '世界線航跡蔵' )
@@ -1199,7 +1210,7 @@ describe PG::Connection do
 				@conn.transaction do |conn|
 					conn.internal_encoding = 'EUC-JP'
 					stmt = "VALUES ('世界線航跡蔵')".encode('EUC-JP')
-					res = conn.exec(stmt, [], 0)
+					res = conn.exec_params(stmt, [], 0)
 					out_string = res[0]['column1']
 				end
 				expect( out_string ).to eq( '世界線航跡蔵'.encode('EUC-JP') )
@@ -1212,7 +1223,7 @@ describe PG::Connection do
 				@conn.transaction do |conn|
 					conn.internal_encoding = 'EUC-JP'
 					stmt = "VALUES ('世界線航跡蔵')".encode('EUC-JP')
-					res = conn.exec(stmt, [], 0)
+					res = conn.exec_params(stmt, [], 0)
 					conn.internal_encoding = 'utf-8'
 					out_string = res[0]['column1']
 				end
@@ -1291,22 +1302,11 @@ describe PG::Connection do
 				expect( r.values ).to eq( [['grün', 'grün', 't', 'grün']] )
 			end
 
-			it "should convert query string and parameters to #async_exec" do
-				r = @conn.async_exec("VALUES( $1, $2, $1=$2, 'grün')".encode("cp936"),
-				                  ['grün'.encode('cp850'), 'grün'.encode('utf-16le')])
-				expect( r.values ).to eq( [['grün', 'grün', 't', 'grün']] )
-			end
-
 			it "should convert query string to #exec" do
 				r = @conn.exec("SELECT 'grün'".encode("utf-16be"))
 				expect( r.values ).to eq( [['grün']] )
 			end
 
-			it "should convert query string to #async_exec" do
-				r = @conn.async_exec("SELECT 'grün'".encode("utf-16le"))
-				expect( r.values ).to eq( [['grün']] )
-			end
-
 			it "should convert strings and parameters to #prepare and #exec_prepared" do
 				@conn.prepare("weiß1".encode("utf-16be"), "VALUES( $1, $2, $1=$2, 'grün')".encode("cp850"))
 				r = @conn.exec_prepared("weiß1".encode("utf-32le"),
@@ -1331,8 +1331,8 @@ describe PG::Connection do
 				expect( @conn.get_last_result.values ).to eq( [['grün']] )
 			end
 
-			it "should convert query string and parameters to #send_query" do
-				@conn.send_query("VALUES( $1, $2, $1=$2, 'grün')".encode("utf-16le"),
+			it "should convert query string and parameters to #send_query_params" do
+				@conn.send_query_params("VALUES( $1, $2, $1=$2, 'grün')".encode("utf-16le"),
 				                  ['grün'.encode('utf-32be'), 'grün'.encode('iso-8859-1')])
 				expect( @conn.get_last_result.values ).to eq( [['grün', 'grün', 't', 'grün']] )
 			end
@@ -1716,4 +1716,43 @@ describe PG::Connection do
 			end
 		end
 	end
+
+	describe "deprecated forms of methods" do
+		it "should forward exec to exec_params" do
+			res = @conn.exec("VALUES($1::INT)", [7]).values
+			expect(res).to eq( [["7"]] )
+			res = @conn.exec("VALUES($1::INT)", [7], 1).values
+			expect(res).to eq( [[[7].pack("N")]] )
+			res = @conn.exec("VALUES(8)", [], 1).values
+			expect(res).to eq( [[[8].pack("N")]] )
+		end
+
+		it "should forward exec_params to exec" do
+			res = @conn.exec_params("VALUES(3); VALUES(4)").values
+			expect(res).to eq( [["4"]] )
+			res = @conn.exec_params("VALUES(3); VALUES(4)", nil).values
+			expect(res).to eq( [["4"]] )
+			res = @conn.exec_params("VALUES(3); VALUES(4)", nil, nil).values
+			expect(res).to eq( [["4"]] )
+			res = @conn.exec_params("VALUES(3); VALUES(4)", nil, 1).values
+			expect(res).to eq( [["4"]] )
+			res = @conn.exec_params("VALUES(3); VALUES(4)", nil, nil, nil).values
+			expect(res).to eq( [["4"]] )
+			expect{
+				@conn.exec_params("VALUES(3); VALUES(4)", nil, nil, nil, nil).values
+			}.to raise_error(ArgumentError)
+		end
+
+		it "should forward send_query to send_query_params" do
+			@conn.send_query("VALUES($1)", [5])
+			expect(@conn.get_last_result.values).to eq( [["5"]] )
+		end
+
+		it "shouldn't forward send_query_params to send_query" do
+			expect{ @conn.send_query_params("VALUES(4)").values }
+				.to raise_error(ArgumentError)
+			expect{ @conn.send_query_params("VALUES(4)", nil).values }
+				.to raise_error(TypeError)
+		end
+	end
 end