pg 0.21.0 → 1.2.3

data/spec/pg/connection_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 #encoding: utf-8
 
 require_relative '../helpers'
@@ -118,6 +118,19 @@ describe PG::Connection do
 		expect( described_class.parse_connect_args ).to eq( '' )
 	end
 
+	it "connects successfully with connection string" do
+		conninfo_with_colon_in_password = "host=localhost user=a port=555 dbname=test password=a:a"
+
+		string = described_class.parse_connect_args( conninfo_with_colon_in_password )
+
+		expect( string ).to be_a( String )
+		expect( string ).to match( %r{(^|\s)user=a} )
+		expect( string ).to match( %r{(^|\s)password=a:a} )
+		expect( string ).to match( %r{(^|\s)host=localhost} )
+		expect( string ).to match( %r{(^|\s)port=555} )
+		expect( string ).to match( %r{(^|\s)dbname=test} )
+	end
+
 	it "connects successfully with connection string" do
 		tmpconn = described_class.connect( @conninfo )
 		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
@@ -139,7 +152,7 @@ describe PG::Connection do
 		tmpconn.finish
 	end
 
-	it "connects using a hash of optional connection parameters", :postgresql_90 do
+	it "connects using a hash of optional connection parameters" do
 		tmpconn = described_class.connect(
 			:host => 'localhost',
 			:port => @port,
@@ -160,56 +173,94 @@ describe PG::Connection do
 		end
 	end
 
-	it "can connect asynchronously", :socket_io do
+	it "can connect asynchronously" 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
 
-	it "can connect asynchronously for the duration of a block", :socket_io do
+	it "can connect asynchronously for the duration of a block" do
 		conn = nil
 
 		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" 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
+
+		it "can use conn.reset_start to restart the connection" do
+			ios = IO.pipe
+			conn = described_class.connect_start( @conninfo )
+			wait_for_polling_ok(conn)
+
+			# Close the two pipe file descriptors, so that the file descriptor of
+			# newly established connection is probably distinct from the previous one.
+			ios.each(&:close)
+			conn.reset_start
+			wait_for_polling_ok(conn, :reset_poll)
+
+			# The new connection should work even when the file descriptor has changed.
+			conn.send_query("SELECT 1")
+			res = wait_for_query_result(conn)
+			expect( res.values ).to eq([["1"]])
+
+			conn.close
+		end
+
+		it "should properly close a socket IO when GC'ed" do
+			# This results in
+			#    Errno::ENOTSOCK: An operation was attempted on something that is not a socket.
+			# on Windows when rb_w32_unwrap_io_handle() isn't called in pgconn_gc_free().
+			5.times do
+				conn = described_class.connect( @conninfo )
+				conn.socket_io.close
+			end
+			GC.start
+			IO.pipe.each(&:close)
+		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/)
@@ -219,7 +270,7 @@ describe PG::Connection do
 		described_class.connect(@conninfo).finish
 		sleep 0.5
 		res = @conn.exec(%[SELECT COUNT(*) AS n FROM pg_stat_activity
-							WHERE usename IS NOT NULL])
+							WHERE usename IS NOT NULL AND application_name != ''])
 		# there's still the global @conn, but should be no more
 		expect( res[0]['n'] ).to eq( '1' )
 	end
@@ -228,7 +279,7 @@ describe PG::Connection do
 		expect( @conn.db ).to eq( "test" )
 		expect( @conn.user ).to be_a_kind_of( String )
 		expect( @conn.pass ).to eq( "" )
-		expect( @conn.port ).to eq( 54321 )
+		expect( @conn.port ).to eq( @port )
 		expect( @conn.tty ).to eq( "" )
 		expect( @conn.options ).to eq( "" )
 	end
@@ -237,7 +288,20 @@ describe PG::Connection do
 		expect( @conn.host ).to eq( "localhost" )
 	end
 
-	EXPECTED_TRACE_OUTPUT = %{
+	it "can set error verbosity" do
+		old = @conn.set_error_verbosity( PG::PQERRORS_TERSE )
+		new = @conn.set_error_verbosity( old )
+		expect( new ).to eq( PG::PQERRORS_TERSE )
+	end
+
+	it "can set error context visibility", :postgresql_96 do
+		old = @conn.set_error_context_visibility( PG::PQSHOW_CONTEXT_NEVER )
+		new = @conn.set_error_context_visibility( old )
+		expect( new ).to eq( PG::PQSHOW_CONTEXT_NEVER )
+	end
+
+	let(:expected_trace_output) do
+		%{
 		To backend> Msg Q
 		To backend> "SELECT 1 AS one"
 		To backend> Msg complete, length 21
@@ -265,6 +329,7 @@ describe PG::Connection do
 		From backend (#4)> 5
 		From backend> T
 		}.gsub( /^\t{2}/, '' ).lstrip
+	end
 
 	it "trace and untrace client-server communication", :unix do
 			# be careful to explicitly close files so that the
@@ -275,23 +340,20 @@ describe PG::Connection do
 			@conn.trace( trace_io )
 			trace_io.close
 
-			res = @conn.exec("SELECT 1 AS one")
+			@conn.exec("SELECT 1 AS one")
 			@conn.untrace
 
-			res = @conn.exec("SELECT 2 AS two")
+			@conn.exec("SELECT 2 AS two")
 
 			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 )
 		end
@@ -308,8 +370,6 @@ describe PG::Connection do
 	end
 
 	it "can stop a thread that runs a blocking query with async_exec" do
-		pending "this does not work on Rubinius" if RUBY_ENGINE=='rbx'
-
 		start = Time.now
 		t = Thread.new do
 			@conn.async_exec( 'select pg_sleep(10)' )
@@ -323,24 +383,16 @@ describe PG::Connection do
 
 	it "should work together with signal handlers", :unix do
 		signal_received = false
-		trap 'USR1' do
+		trap 'USR2' do
 			signal_received = true
 		end
 
 		Thread.new do
 			sleep 0.1
-			Process.kill("USR1", Process.pid)
+			Process.kill("USR2", Process.pid)
 		end
 		@conn.exec("select pg_sleep(0.3)")
 		expect( signal_received ).to be_truthy
-
-		signal_received = false
-		Thread.new do
-			sleep 0.1
-			Process.kill("USR1", Process.pid)
-		end
-		@conn.async_exec("select pg_sleep(0.3)")
-		expect( signal_received ).to be_truthy
 	end
 
 
@@ -388,22 +440,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'] ] )
@@ -524,7 +565,7 @@ describe PG::Connection do
 		@conn.exec( 'UNLISTEN woo' )
 	end
 
-	it "can receive notices while waiting for NOTIFY without exceeding the timeout", :postgresql_90 do
+	it "can receive notices while waiting for NOTIFY without exceeding the timeout" do
 		notices = []
 		@conn.set_notice_processor do |msg|
 			notices << [msg, Time.now]
@@ -534,7 +575,7 @@ describe PG::Connection do
 		expect( @conn.wait_for_notify( 1 ) ).to be_nil
 		expect( notices.first ).to_not be_nil
 		et = Time.now
-		expect( (et - notices.first[1]) ).to be >= 0.4
+		expect( (et - notices.first[1]) ).to be >= 0.3
 		expect( (et - st) ).to be >= 0.9
 		expect( (et - st) ).to be < 1.4
 	end
@@ -586,7 +627,7 @@ describe PG::Connection do
 		expect( @conn ).to still_be_usable
 	end
 
-	it "can handle server errors in #copy_data for output", :postgresql_90 do
+	it "can handle server errors in #copy_data for output" do
 		@conn.exec "ROLLBACK"
 		@conn.transaction do
 			@conn.exec( "CREATE FUNCTION errfunc() RETURNS int AS $$ BEGIN RAISE 'test-error'; END; $$ LANGUAGE plpgsql;" )
@@ -638,7 +679,7 @@ describe PG::Connection do
 				@conn.copy_data( "COPY copytable FROM STDOUT" ) do |res|
 					@conn.put_copy_data "xyz\n"
 				end
-			}.to raise_error(PG::Error, /invalid input syntax for integer/)
+			}.to raise_error(PG::Error, /invalid input syntax for .*integer/)
 		end
 		expect( @conn ).to still_be_usable
 	end
@@ -718,11 +759,6 @@ describe PG::Connection do
 		expect( (finish - start) ).to be_within( 0.2 ).of( 0.3 )
 	end
 
-
-	it "can encrypt a string given a password and username" do
-		expect( described_class.encrypt_password("postgres", "postgres") ).to match( /\S+/ )
-	end
-
 	it "can return the default connection options" do
 		expect( described_class.conndefaults ).to be_a( Array )
 		expect( described_class.conndefaults ).to all( be_a(Hash) )
@@ -733,7 +769,7 @@ describe PG::Connection do
 	it "can return the default connection options as a Hash" do
 		expect( described_class.conndefaults_hash ).to be_a( Hash )
 		expect( described_class.conndefaults_hash ).to include( :user, :password, :dbname, :host, :port )
-		expect( ['5432', '54321'] ).to include( described_class.conndefaults_hash[:port] )
+		expect( ['5432', '54321', @port.to_s] ).to include( described_class.conndefaults_hash[:port] )
 		expect( @conn.conndefaults_hash ).to eq( described_class.conndefaults_hash )
 	end
 
@@ -779,18 +815,52 @@ describe PG::Connection do
 		end
 	end
 
+	describe "deprecated password encryption method" do
+		it "can encrypt password for a given user" do
+			expect( described_class.encrypt_password("postgres", "postgres") ).to match( /\S+/ )
+		end
 
-	it "raises an appropriate error if either of the required arguments for encrypt_password " +
-	   "is not valid" do
-		expect {
-			described_class.encrypt_password( nil, nil )
-		}.to raise_error( TypeError )
-		expect {
-			described_class.encrypt_password( "postgres", nil )
-		}.to raise_error( TypeError )
-		expect {
-			described_class.encrypt_password( nil, "postgres" )
-		}.to raise_error( TypeError )
+		it "raises an appropriate error if either of the required arguments is not valid" do
+			expect {
+				described_class.encrypt_password( nil, nil )
+			}.to raise_error( TypeError )
+			expect {
+				described_class.encrypt_password( "postgres", nil )
+			}.to raise_error( TypeError )
+			expect {
+				described_class.encrypt_password( nil, "postgres" )
+			}.to raise_error( TypeError )
+		end
+	end
+
+	describe "password encryption method", :postgresql_10 do
+		it "can encrypt without algorithm" do
+			expect( @conn.encrypt_password("postgres", "postgres") ).to match( /\S+/ )
+			expect( @conn.encrypt_password("postgres", "postgres", nil) ).to match( /\S+/ )
+		end
+
+		it "can encrypt with algorithm" do
+			expect( @conn.encrypt_password("postgres", "postgres", "md5") ).to match( /md5\S+/i )
+			expect( @conn.encrypt_password("postgres", "postgres", "scram-sha-256") ).to match( /SCRAM-SHA-256\S+/i )
+		end
+
+		it "raises an appropriate error if either of the required arguments is not valid" do
+			expect {
+				@conn.encrypt_password( nil, nil )
+			}.to raise_error( TypeError )
+			expect {
+				@conn.encrypt_password( "postgres", nil )
+			}.to raise_error( TypeError )
+			expect {
+				@conn.encrypt_password( nil, "postgres" )
+			}.to raise_error( TypeError )
+			expect {
+				@conn.encrypt_password( "postgres", "postgres", :invalid )
+			}.to raise_error( TypeError )
+			expect {
+				@conn.encrypt_password( "postgres", "postgres", "invalid" )
+			}.to raise_error( PG::Error, /unrecognized/ )
+		end
 	end
 
 
@@ -832,7 +902,7 @@ describe PG::Connection do
 	end
 
 
-	it "can connect asynchronously", :socket_io do
+	it "handles server close while asynchronous connect" 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
@@ -844,11 +914,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 "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 #async_exec" do
+	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' } )
@@ -861,7 +949,21 @@ describe PG::Connection do
 		expect { conn.finish }.to raise_error( PG::ConnectionBad, /connection is closed/i )
 	end
 
-	it "closes the IO fetched from #socket_io when the connection is closed", :without_transaction, :socket_io do
+	it "can use conn.reset to restart the connection" do
+		ios = IO.pipe
+		conn = PG.connect( @conninfo )
+
+		# Close the two pipe file descriptors, so that the file descriptor of
+		# newly established connection is probably distinct from the previous one.
+		ios.each(&:close)
+		conn.reset
+
+		# The new connection should work even when the file descriptor has changed.
+		expect( conn.exec("SELECT 1").values ).to eq([["1"]])
+		conn.close
+	end
+
+	it "closes the IO fetched from #socket_io when the connection is closed", :without_transaction do
 		conn = PG.connect( @conninfo )
 		io = conn.socket_io
 		conn.finish
@@ -869,7 +971,7 @@ describe PG::Connection do
 		expect { conn.socket_io }.to raise_error( PG::ConnectionBad, /connection is closed/i )
 	end
 
-	it "closes the IO fetched from #socket_io when the connection is reset", :without_transaction, :socket_io do
+	it "closes the IO fetched from #socket_io when the connection is reset", :without_transaction do
 		conn = PG.connect( @conninfo )
 		io = conn.socket_io
 		conn.reset
@@ -889,155 +991,147 @@ describe PG::Connection do
 		expect{ conn.block }.to raise_error(PG::ConnectionBad, /can't get socket descriptor/)
 	end
 
-	context "under PostgreSQL 9", :postgresql_90 do
+	it "sets the fallback_application_name on new connections" do
+		conn_string = PG::Connection.parse_connect_args( 'dbname=test' )
 
-		before( :each ) do
-			pending "only works with a PostgreSQL >= 9.0 server" if @conn.server_version < 9_00_00
-		end
+		conn_name = conn_string[ /application_name='(.*?)'/, 1 ]
+		expect( conn_name ).to include( $0[0..10] )
+		expect( conn_name ).to include( $0[-10..-1] )
+		expect( conn_name.length ).to be <= 64
+	end
 
-		it "sets the fallback_application_name on new connections" do
+	it "sets a shortened fallback_application_name on new connections" do
+		old_0 = $0
+		begin
+			$0 = "/this/is/a/very/long/path/with/many/directories/to/our/beloved/ruby"
 			conn_string = PG::Connection.parse_connect_args( 'dbname=test' )
-
 			conn_name = conn_string[ /application_name='(.*?)'/, 1 ]
 			expect( conn_name ).to include( $0[0..10] )
 			expect( conn_name ).to include( $0[-10..-1] )
 			expect( conn_name.length ).to be <= 64
+		ensure
+			$0 = old_0
 		end
+	end
 
-		it "sets a shortened fallback_application_name on new connections" do
-			old_0 = $0
-			begin
-				$0 = "/this/is/a/very/long/path/with/many/directories/to/our/beloved/ruby"
-				conn_string = PG::Connection.parse_connect_args( 'dbname=test' )
-				conn_name = conn_string[ /application_name='(.*?)'/, 1 ]
-				expect( conn_name ).to include( $0[0..10] )
-				expect( conn_name ).to include( $0[-10..-1] )
-				expect( conn_name.length ).to be <= 64
-			ensure
-				$0 = old_0
-			end
-		end
-
-		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
-		    "any number of arguments" do
-
-			@conn.exec( 'ROLLBACK' )
-			@conn.exec( 'LISTEN knees' )
+	it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+			"any number of arguments" do
 
-			conn = described_class.connect( @conninfo )
-			conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
-			conn.finish
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN knees' )
 
-			event, pid, msg = nil
-			@conn.wait_for_notify( 10 ) do |*args|
-				event, pid, msg = *args
-			end
-			@conn.exec( 'UNLISTEN knees' )
+		conn = described_class.connect( @conninfo )
+		conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+		conn.finish
 
-			expect( event ).to eq( 'knees' )
-			expect( pid ).to be_a_kind_of( Integer )
-			expect( msg ).to eq( 'skirt and boots' )
+		event, pid, msg = nil
+		@conn.wait_for_notify( 10 ) do |*args|
+			event, pid, msg = *args
 		end
+		@conn.exec( 'UNLISTEN knees' )
 
-		it "accepts nil as the timeout in #wait_for_notify " do
-			@conn.exec( 'ROLLBACK' )
-			@conn.exec( 'LISTEN knees' )
+		expect( event ).to eq( 'knees' )
+		expect( pid ).to be_a_kind_of( Integer )
+		expect( msg ).to eq( 'skirt and boots' )
+	end
 
-			conn = described_class.connect( @conninfo )
-			conn.exec( %Q{NOTIFY knees} )
-			conn.finish
+	it "accepts nil as the timeout in #wait_for_notify " do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN knees' )
 
-			event, pid = nil
-			@conn.wait_for_notify( nil ) do |*args|
-				event, pid = *args
-			end
-			@conn.exec( 'UNLISTEN knees' )
+		conn = described_class.connect( @conninfo )
+		conn.exec( %Q{NOTIFY knees} )
+		conn.finish
 
-			expect( event ).to eq( 'knees' )
-			expect( pid ).to be_a_kind_of( Integer )
+		event, pid = nil
+		@conn.wait_for_notify( nil ) do |*args|
+			event, pid = *args
 		end
+		@conn.exec( 'UNLISTEN knees' )
 
-		it "sends nil as the payload if the notification wasn't given one" do
-			@conn.exec( 'ROLLBACK' )
-			@conn.exec( 'LISTEN knees' )
+		expect( event ).to eq( 'knees' )
+		expect( pid ).to be_a_kind_of( Integer )
+	end
 
-			conn = described_class.connect( @conninfo )
-			conn.exec( %Q{NOTIFY knees} )
-			conn.finish
+	it "sends nil as the payload if the notification wasn't given one" do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN knees' )
 
-			payload = :notnil
-			@conn.wait_for_notify( nil ) do |*args|
-				payload = args[ 2 ]
-			end
-			@conn.exec( 'UNLISTEN knees' )
+		conn = described_class.connect( @conninfo )
+		conn.exec( %Q{NOTIFY knees} )
+		conn.finish
 
-			expect( payload ).to be_nil()
+		payload = :notnil
+		@conn.wait_for_notify( nil ) do |*args|
+			payload = args[ 2 ]
 		end
+		@conn.exec( 'UNLISTEN knees' )
 
-		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
-		   "two arguments" do
+		expect( payload ).to be_nil()
+	end
 
-			@conn.exec( 'ROLLBACK' )
-			@conn.exec( 'LISTEN knees' )
+	it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+			"two arguments" do
 
-			conn = described_class.connect( @conninfo )
-			conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
-			conn.finish
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN knees' )
 
-			event, pid, msg = nil
-			@conn.wait_for_notify( 10 ) do |arg1, arg2|
-				event, pid, msg = arg1, arg2
-			end
-			@conn.exec( 'UNLISTEN knees' )
+		conn = described_class.connect( @conninfo )
+		conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+		conn.finish
 
-			expect( event ).to eq( 'knees' )
-			expect( pid ).to be_a_kind_of( Integer )
-			expect( msg ).to be_nil()
+		event, pid, msg = nil
+		@conn.wait_for_notify( 10 ) do |arg1, arg2|
+			event, pid, msg = arg1, arg2
 		end
+		@conn.exec( 'UNLISTEN knees' )
 
-		it "calls the block supplied to wait_for_notify with the notify payload if it " +
-		   "doesn't accept arguments" do
+		expect( event ).to eq( 'knees' )
+		expect( pid ).to be_a_kind_of( Integer )
+		expect( msg ).to be_nil()
+	end
 
-			@conn.exec( 'ROLLBACK' )
-			@conn.exec( 'LISTEN knees' )
+	it "calls the block supplied to wait_for_notify with the notify payload if it " +
+			"doesn't accept arguments" do
 
-			conn = described_class.connect( @conninfo )
-			conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
-			conn.finish
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN knees' )
 
-			notification_received = false
-			@conn.wait_for_notify( 10 ) do
-				notification_received = true
-			end
-			@conn.exec( 'UNLISTEN knees' )
+		conn = described_class.connect( @conninfo )
+		conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+		conn.finish
 
-			expect( notification_received ).to be_truthy()
+		notification_received = false
+		@conn.wait_for_notify( 10 ) do
+			notification_received = true
 		end
+		@conn.exec( 'UNLISTEN knees' )
 
-		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
-		   "three arguments" do
+		expect( notification_received ).to be_truthy()
+	end
 
-			@conn.exec( 'ROLLBACK' )
-			@conn.exec( 'LISTEN knees' )
+	it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+			"three arguments" do
 
-			conn = described_class.connect( @conninfo )
-			conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
-			conn.finish
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN knees' )
 
-			event, pid, msg = nil
-			@conn.wait_for_notify( 10 ) do |arg1, arg2, arg3|
-				event, pid, msg = arg1, arg2, arg3
-			end
-			@conn.exec( 'UNLISTEN knees' )
+		conn = described_class.connect( @conninfo )
+		conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+		conn.finish
 
-			expect( event ).to eq( 'knees' )
-			expect( pid ).to be_a_kind_of( Integer )
-			expect( msg ).to eq( 'skirt and boots' )
+		event, pid, msg = nil
+		@conn.wait_for_notify( 10 ) do |arg1, arg2, arg3|
+			event, pid, msg = arg1, arg2, arg3
 		end
+		@conn.exec( 'UNLISTEN knees' )
 
+		expect( event ).to eq( 'knees' )
+		expect( pid ).to be_a_kind_of( Integer )
+		expect( msg ).to eq( 'skirt and boots' )
 	end
 
-	context "under PostgreSQL 9.1 client library", :postgresql_91, :without_transaction do
+	context "server ping", :without_transaction do
 
 		it "pings successfully with connection string" do
 			ping = described_class.ping(@conninfo)
@@ -1065,125 +1159,119 @@ describe PG::Connection do
 			expect( ping ).to eq( PG::PQPING_NO_RESPONSE )
 		end
 
-		it "returns correct response when ping connection arguments are wrong" do
+		it "returns error when ping connection arguments are wrong" do
 			ping = described_class.ping('localhost', 'localhost', nil, nil, :test, nil, nil)
-			expect( ping ).to eq( PG::PQPING_NO_ATTEMPT )
+			expect( ping ).to_not eq( PG::PQPING_OK )
 		end
 
+		it "returns correct response when ping connection arguments are wrong" do
+			ping = described_class.ping(
+				:host => 'localhost',
+				:invalid_option => 9999,
+				:dbname => :test)
+			expect( ping ).to eq( PG::PQPING_NO_ATTEMPT )
+		end
 
 	end
 
-	context "under PostgreSQL 9.2 client library", :postgresql_92 do
-		describe "set_single_row_mode" do
+	describe "set_single_row_mode" do
 
-			it "raises an error when called at the wrong time" do
-				expect {
-					@conn.set_single_row_mode
-				}.to raise_error(PG::Error)
+		it "raises an error when called at the wrong time" do
+			expect {
+				@conn.set_single_row_mode
+			}.to raise_error(PG::Error)
+		end
+
+		it "should work in single row mode" do
+			@conn.send_query( "SELECT generate_series(1,10)" )
+			@conn.set_single_row_mode
+
+			results = []
+			loop do
+				@conn.block
+				res = @conn.get_result or break
+				results << res
 			end
+			expect( results.length ).to eq( 11 )
+			results[0..-2].each do |res|
+				expect( res.result_status ).to eq( PG::PGRES_SINGLE_TUPLE )
+				values = res.field_values('generate_series')
+				expect( values.length ).to eq( 1 )
+				expect( values.first.to_i ).to be > 0
+			end
+			expect( results.last.result_status ).to eq( PG::PGRES_TUPLES_OK )
+			expect( results.last.ntuples ).to eq( 0 )
+		end
 
-			it "should work in single row mode" do
-				@conn.send_query( "SELECT generate_series(1,10)" )
-				@conn.set_single_row_mode
+		it "should receive rows before entire query is finished" do
+			@conn.send_query( "SELECT generate_series(0,999), NULL UNION ALL SELECT 1000, pg_sleep(1);" )
+			@conn.set_single_row_mode
 
-				results = []
-				loop do
-					@conn.block
-					res = @conn.get_result or break
-					results << res
-				end
-				expect( results.length ).to eq( 11 )
-				results[0..-2].each do |res|
-					expect( res.result_status ).to eq( PG::PGRES_SINGLE_TUPLE )
-					values = res.field_values('generate_series')
-					expect( values.length ).to eq( 1 )
-					expect( values.first.to_i ).to be > 0
-				end
-				expect( results.last.result_status ).to eq( PG::PGRES_TUPLES_OK )
-				expect( results.last.ntuples ).to eq( 0 )
+			start_time = Time.now
+			first_row_time = nil
+			loop do
+				res = @conn.get_result or break
+				res.check
+				first_row_time = Time.now unless first_row_time
 			end
+			expect( (Time.now - start_time) ).to be >= 0.9
+			expect( (first_row_time - start_time) ).to be < 0.9
+		end
 
-			it "should receive rows before entire query is finished" do
-				@conn.send_query( "SELECT generate_series(0,999), NULL UNION ALL SELECT 1000, pg_sleep(1);" )
-				@conn.set_single_row_mode
+		it "should receive rows before entire query fails" do
+			@conn.exec( "CREATE FUNCTION errfunc() RETURNS int AS $$ BEGIN RAISE 'test-error'; END; $$ LANGUAGE plpgsql;" )
+			@conn.send_query( "SELECT generate_series(0,999), NULL UNION ALL SELECT 1000, errfunc();" )
+			@conn.set_single_row_mode
 
-				start_time = Time.now
-				first_row_time = nil
+			first_result = nil
+			expect do
 				loop do
 					res = @conn.get_result or break
 					res.check
-					first_row_time = Time.now unless first_row_time
+					first_result ||= res
 				end
-				expect( (Time.now - start_time) ).to be >= 0.9
-				expect( (first_row_time - start_time) ).to be < 0.9
-			end
-
-			it "should receive rows before entire query fails" do
-				@conn.exec( "CREATE FUNCTION errfunc() RETURNS int AS $$ BEGIN RAISE 'test-error'; END; $$ LANGUAGE plpgsql;" )
-				@conn.send_query( "SELECT generate_series(0,999), NULL UNION ALL SELECT 1000, errfunc();" )
-				@conn.set_single_row_mode
-
-				first_result = nil
-				expect do
-					loop do
-						res = @conn.get_result or break
-						res.check
-						first_result ||= res
-					end
-				end.to raise_error(PG::Error)
-				expect( first_result.kind_of?(PG::Result) ).to be_truthy
-				expect( first_result.result_status ).to eq( PG::PGRES_SINGLE_TUPLE )
-			end
+			end.to raise_error(PG::Error)
+			expect( first_result.kind_of?(PG::Result) ).to be_truthy
+			expect( first_result.result_status ).to eq( PG::PGRES_SINGLE_TUPLE )
 		end
+
 	end
 
-	context "multinationalization support", :ruby_19 do
+	context "multinationalization support" do
 
 		describe "rubyforge #22925: m17n support" do
 			it "should return results in the same encoding as the client (iso-8859-1)" do
-				out_string = nil
-				@conn.transaction do |conn|
-					conn.internal_encoding = 'iso8859-1'
-					res = conn.exec("VALUES ('fantasia')", [], 0)
-					out_string = res[0]['column1']
-				end
+				@conn.internal_encoding = 'iso8859-1'
+				res = @conn.exec_params("VALUES ('fantasia')", [], 0)
+				out_string = res[0]['column1']
 				expect( out_string ).to eq( 'fantasia' )
 				expect( out_string.encoding ).to eq( Encoding::ISO8859_1 )
 			end
 
 			it "should return results in the same encoding as the client (utf-8)" do
-				out_string = nil
-				@conn.transaction do |conn|
-					conn.internal_encoding = 'utf-8'
-					res = conn.exec("VALUES ('世界線航跡蔵')", [], 0)
-					out_string = res[0]['column1']
-				end
+				@conn.internal_encoding = 'utf-8'
+				res = @conn.exec_params("VALUES ('世界線航跡蔵')", [], 0)
+				out_string = res[0]['column1']
 				expect( out_string ).to eq( '世界線航跡蔵' )
 				expect( out_string.encoding ).to eq( Encoding::UTF_8 )
 			end
 
 			it "should return results in the same encoding as the client (EUC-JP)" do
-				out_string = nil
-				@conn.transaction do |conn|
-					conn.internal_encoding = 'EUC-JP'
-					stmt = "VALUES ('世界線航跡蔵')".encode('EUC-JP')
-					res = conn.exec(stmt, [], 0)
-					out_string = res[0]['column1']
-				end
+				@conn.internal_encoding = 'EUC-JP'
+				stmt = "VALUES ('世界線航跡蔵')".encode('EUC-JP')
+				res = @conn.exec_params(stmt, [], 0)
+				out_string = res[0]['column1']
 				expect( out_string ).to eq( '世界線航跡蔵'.encode('EUC-JP') )
 				expect( out_string.encoding ).to eq( Encoding::EUC_JP )
 			end
 
 			it "returns the results in the correct encoding even if the client_encoding has " +
 			   "changed since the results were fetched" do
-				out_string = nil
-				@conn.transaction do |conn|
-					conn.internal_encoding = 'EUC-JP'
-					stmt = "VALUES ('世界線航跡蔵')".encode('EUC-JP')
-					res = conn.exec(stmt, [], 0)
-					conn.internal_encoding = 'utf-8'
-					out_string = res[0]['column1']
-				end
+				@conn.internal_encoding = 'EUC-JP'
+				stmt = "VALUES ('世界線航跡蔵')".encode('EUC-JP')
+				res = @conn.exec_params(stmt, [], 0)
+				@conn.internal_encoding = 'utf-8'
+				out_string = res[0]['column1']
 				expect( out_string ).to eq( '世界線航跡蔵'.encode('EUC-JP') )
 				expect( out_string.encoding ).to eq( Encoding::EUC_JP )
 			end
@@ -1193,53 +1281,90 @@ describe PG::Connection do
 				expect( @conn.internal_encoding ).to eq( Encoding::ASCII_8BIT )
 			end
 
+			it "the connection should use JOHAB dummy encoding when it's set to JOHAB" do
+				@conn.set_client_encoding "JOHAB"
+				val = @conn.exec("SELECT chr(x'3391'::int)").values[0][0]
+				expect( val.encoding.name ).to eq( "JOHAB" )
+				expect( val.unpack("H*")[0] ).to eq( "dc65" )
+			end
+
+			it "can retrieve server encoding as text" do
+				enc = @conn.parameter_status "server_encoding"
+				expect( enc ).to eq( "UTF8" )
+			end
+
+			it "can retrieve server encoding as ruby encoding" do
+				expect( @conn.external_encoding ).to eq( Encoding::UTF_8 )
+			end
+
 			it "uses the client encoding for escaped string" do
-				original = "Möhre to\0 escape".encode( "utf-16be" )
+				original = "Möhre to 'scape".encode( "utf-16be" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape( original )
 				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
-				expect( escaped ).to eq( "Möhre to".encode(Encoding::EUC_JP) )
+				expect( escaped ).to eq( "Möhre to ''scape".encode(Encoding::EUC_JP) )
 			end
 
-			it "uses the client encoding for escaped literal", :postgresql_90 do
-				original = "Möhre to\0 escape".encode( "utf-16be" )
+			it "uses the client encoding for escaped literal" do
+				original = "Möhre to 'scape".encode( "utf-16be" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape_literal( original )
 				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
-				expect( escaped ).to eq( "'Möhre to'".encode(Encoding::EUC_JP) )
+				expect( escaped ).to eq( "'Möhre to ''scape'".encode(Encoding::EUC_JP) )
 			end
 
-			it "uses the client encoding for escaped identifier", :postgresql_90 do
-				original = "Möhre to\0 escape".encode( "utf-16le" )
+			it "uses the client encoding for escaped identifier" do
+				original = "Möhre to 'scape".encode( "utf-16le" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape_identifier( original )
 				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
-				expect( escaped ).to eq( "\"Möhre to\"".encode(Encoding::EUC_JP) )
+				expect( escaped ).to eq( "\"Möhre to 'scape\"".encode(Encoding::EUC_JP) )
 			end
 
 			it "uses the client encoding for quote_ident" do
-				original = "Möhre to\0 escape".encode( "utf-16le" )
+				original = "Möhre to 'scape".encode( "utf-16le" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.quote_ident( original )
 				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
-				expect( escaped ).to eq( "\"Möhre to\"".encode(Encoding::EUC_JP) )
+				expect( escaped ).to eq( "\"Möhre to 'scape\"".encode(Encoding::EUC_JP) )
 			end
 
 			it "uses the previous string encoding for escaped string" do
-				original = "Möhre to\0 escape".encode( "iso-8859-1" )
+				original = "Möhre to 'scape".encode( "iso-8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = described_class.escape( original )
 				expect( escaped.encoding ).to eq( Encoding::ISO8859_1 )
-				expect( escaped ).to eq( "Möhre to".encode(Encoding::ISO8859_1) )
+				expect( escaped ).to eq( "Möhre to ''scape".encode(Encoding::ISO8859_1) )
 			end
 
 			it "uses the previous string encoding for quote_ident" do
-				original = "Möhre to\0 escape".encode( "iso-8859-1" )
+				original = "Möhre to 'scape".encode( "iso-8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = described_class.quote_ident( original )
 				expect( escaped.encoding ).to eq( Encoding::ISO8859_1 )
-				expect( escaped.encode ).to eq( "\"Möhre to\"".encode(Encoding::ISO8859_1) )
+				expect( escaped.encode ).to eq( "\"Möhre to 'scape\"".encode(Encoding::ISO8859_1) )
+			end
+
+			it "raises appropriate error if set_client_encoding is called with invalid arguments" do
+				expect { @conn.set_client_encoding( "invalid" ) }.to raise_error(PG::Error, /invalid value/)
+				expect { @conn.set_client_encoding( :invalid ) }.to raise_error(TypeError)
+				expect { @conn.set_client_encoding( nil ) }.to raise_error(TypeError)
+			end
+
+			it "can use an encoding with high index for client encoding" do
+				# Allocate a lot of encoding indices, so that MRI's ENCODING_INLINE_MAX is exceeded
+				unless Encoding.name_list.include?("pgtest-0")
+					256.times do |eidx|
+						Encoding::UTF_8.replicate("pgtest-#{eidx}")
+					end
+				end
+
+				# Now allocate the JOHAB encoding with an unusual high index
+				@conn.set_client_encoding "JOHAB"
+				val = @conn.exec("SELECT chr(x'3391'::int)").values[0][0]
+				expect( val.encoding.name ).to eq( "JOHAB" )
 			end
+
 		end
 
 		describe "respect and convert character encoding of input strings" do
@@ -1253,22 +1378,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"),
@@ -1293,8 +1407,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
@@ -1328,9 +1442,54 @@ describe PG::Connection do
 			end
 		end
 
+		it "rejects command strings with zero bytes" do
+			expect{ @conn.exec( "SELECT 1;\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.exec_params( "SELECT 1;\x00", [] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.prepare( "abc\x00", "SELECT 1;" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.prepare( "abc", "SELECT 1;\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.exec_prepared( "abc\x00", [] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.describe_prepared( "abc\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.describe_portal( "abc\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query( "SELECT 1;\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query_params( "SELECT 1;\x00", [] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_prepare( "abc\x00", "SELECT 1;" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_prepare( "abc", "SELECT 1;\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query_prepared( "abc\x00", [] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_describe_prepared( "abc\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_describe_portal( "abc\x00" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects query params with zero bytes" do
+			expect{ @conn.exec_params( "SELECT 1;\x00", ["ab\x00"] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.exec_prepared( "abc\x00", ["ab\x00"] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query_params( "SELECT 1;\x00", ["ab\x00"] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query_prepared( "abc\x00", ["ab\x00"] ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects string with zero bytes in escape" do
+			expect{ @conn.escape( "ab\x00cd" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects string with zero bytes in escape_literal" do
+			expect{ @conn.escape_literal( "ab\x00cd" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects string with zero bytes in escape_identifier" do
+			expect{ @conn.escape_identifier( "ab\x00cd" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects string with zero bytes in quote_ident" do
+			expect{ described_class.quote_ident( "ab\x00cd" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects Array with string with zero bytes" do
+			original = ["xyz", "2\x00"]
+			expect{ described_class.quote_ident( original ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
 		it "can quote bigger strings with quote_ident" do
 			original = "'01234567\"" * 100
-			escaped = described_class.quote_ident( original + "\0afterzero" )
+			escaped = described_class.quote_ident( original )
 			expect( escaped ).to eq( "\"" + original.gsub("\"", "\"\"") + "\"" )
 		end
 
@@ -1349,7 +1508,7 @@ describe PG::Connection do
 
 		describe "Ruby 1.9.x default_internal encoding" do
 
-			it "honors the Encoding.default_internal if it's set and the synchronous interface is used" do
+			it "honors the Encoding.default_internal if it's set and the synchronous interface is used", :without_transaction do
 				@conn.transaction do |txn_conn|
 					txn_conn.internal_encoding = Encoding::ISO8859_1
 					txn_conn.exec( "CREATE TABLE defaultinternaltest ( foo text )" )
@@ -1408,7 +1567,7 @@ describe PG::Connection do
 			conn.finish if conn
 		end
 
-		it "handles clearing result in or after set_notice_receiver", :postgresql_90 do
+		it "handles clearing result in or after set_notice_receiver" do
 			r = nil
 			@conn.set_notice_receiver do |result|
 				r = result
@@ -1423,7 +1582,7 @@ describe PG::Connection do
 			@conn.set_notice_receiver
 		end
 
-		it "receives properly encoded messages in the notice callbacks", :postgresql_90 do
+		it "receives properly encoded messages in the notice callbacks" do
 			[:receiver, :processor].each do |kind|
 				notices = []
 				@conn.internal_encoding = 'utf-8'
@@ -1451,9 +1610,8 @@ describe PG::Connection do
 			end
 		end
 
-		it "receives properly encoded text from wait_for_notify", :postgresql_90 do
+		it "receives properly encoded text from wait_for_notify", :without_transaction do
 			@conn.internal_encoding = 'utf-8'
-			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN "Möhre"' )
 			@conn.exec( %Q{NOTIFY "Möhre", '世界線航跡蔵'} )
 			event, pid, msg = nil
@@ -1464,13 +1622,13 @@ describe PG::Connection do
 
 			expect( event ).to eq( "Möhre" )
 			expect( event.encoding ).to eq( Encoding::UTF_8 )
+			expect( pid ).to be_a_kind_of(Integer)
 			expect( msg ).to eq( '世界線航跡蔵' )
 			expect( msg.encoding ).to eq( Encoding::UTF_8 )
 		end
 
-		it "returns properly encoded text from notifies", :postgresql_90 do
+		it "returns properly encoded text from notifies", :without_transaction do
 			@conn.internal_encoding = 'utf-8'
-			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN "Möhre"' )
 			@conn.exec( %Q{NOTIFY "Möhre", '世界線航跡蔵'} )
 			@conn.exec( 'UNLISTEN "Möhre"' )
@@ -1484,7 +1642,7 @@ describe PG::Connection do
 		end
 	end
 
-	context "OS thread support", :ruby_19 do
+	context "OS thread support" do
 		it "Connection#exec shouldn't block a second thread" do
 			t = Thread.new do
 				@conn.exec( "select pg_sleep(1)" )
@@ -1524,9 +1682,14 @@ describe PG::Connection do
 		end
 
 		it "shouldn't type map params unless requested" do
-			expect{
-				@conn.exec_params( "SELECT $1", [5] )
-			}.to raise_error(PG::IndeterminateDatatype)
+			if @conn.server_version < 100000
+				expect{
+					@conn.exec_params( "SELECT $1", [5] )
+				}.to raise_error(PG::IndeterminateDatatype)
+			else
+				# PostgreSQL-10 maps to TEXT type (OID 25)
+				expect( @conn.exec_params( "SELECT $1", [5] ).ftype(0)).to eq(25)
+			end
 		end
 
 		it "should raise an error on invalid encoder to put_copy_data" do
@@ -1540,12 +1703,12 @@ describe PG::Connection do
 			row_encoder = PG::TextEncoder::CopyRow.new type_map: tm
 
 			@conn.exec( "CREATE TEMP TABLE copytable (col1 TEXT)" )
-			res2 = @conn.copy_data( "COPY copytable FROM STDOUT" ) do |res|
+			@conn.copy_data( "COPY copytable FROM STDOUT" ) do |res|
 				@conn.put_copy_data [1], row_encoder
 				@conn.put_copy_data ["2"], row_encoder
 			end
 
-			res2 = @conn.copy_data( "COPY copytable FROM STDOUT", row_encoder ) do |res|
+			@conn.copy_data( "COPY copytable FROM STDOUT", row_encoder ) do |res|
 				@conn.put_copy_data [3]
 				@conn.put_copy_data ["4"]
 			end
@@ -1595,7 +1758,7 @@ describe PG::Connection do
 
 			it "can process #copy_data input queries with row encoder and respects character encoding" do
 				@conn2.exec( "CREATE TEMP TABLE copytable (col1 TEXT)" )
-				res2 = @conn2.copy_data( "COPY copytable FROM STDOUT" ) do |res|
+				@conn2.copy_data( "COPY copytable FROM STDOUT" ) do |res|
 					@conn2.put_copy_data [1]
 					@conn2.put_copy_data ["Möhre".encode("utf-16le")]
 				end
@@ -1646,7 +1809,7 @@ describe PG::Connection do
 			it "can process #copy_data output with row decoder and respects character encoding" do
 				@conn2.internal_encoding = Encoding::ISO8859_1
 				rows = []
-				res2 = @conn2.copy_data( "COPY (VALUES('1'), ('Möhre')) TO STDOUT".encode("utf-16le") ) do |res|
+				@conn2.copy_data( "COPY (VALUES('1'), ('Möhre')) TO STDOUT".encode("utf-16le") ) do |res|
 					while row=@conn2.get_copy_data
 						rows << row
 					end
@@ -1673,4 +1836,114 @@ describe PG::Connection do
 			end
 		end
 	end
+
+	describe :field_name_type do
+		before :each do
+			@conn2 = PG.connect(@conninfo)
+		end
+		after :each do
+			@conn2.close
+		end
+
+		it "uses string field names per default" do
+			expect(@conn2.field_name_type).to eq(:string)
+		end
+
+		it "can set string field names" do
+			@conn2.field_name_type = :string
+			expect(@conn2.field_name_type).to eq(:string)
+			res = @conn2.exec("SELECT 1 as az")
+			expect(res.field_name_type).to eq(:string)
+			expect(res.fields).to eq(["az"])
+		end
+
+		it "can set symbol field names" do
+			@conn2.field_name_type = :symbol
+			expect(@conn2.field_name_type).to eq(:symbol)
+			res = @conn2.exec("SELECT 1 as az")
+			expect(res.field_name_type).to eq(:symbol)
+			expect(res.fields).to eq([:az])
+		end
+
+		it "can't set invalid values" do
+			expect{ @conn2.field_name_type = :sym }.to raise_error(ArgumentError, /invalid argument :sym/)
+			expect{ @conn2.field_name_type = "symbol" }.to raise_error(ArgumentError, /invalid argument "symbol"/)
+		end
+	end
+
+	describe "deprecated forms of methods" do
+		if PG::VERSION < "2"
+			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 "should respond_to socket", :unix do
+				expect( @conn.socket ).to eq( @conn.socket_io.fileno )
+			end
+		else
+			# Method forwarding removed by PG::VERSION >= "2"
+			it "shouldn't forward exec to exec_params" do
+				expect do
+					@conn.exec("VALUES($1::INT)", [7])
+				end.to raise_error(ArgumentError)
+			end
+
+			it "shouldn't forward exec_params to exec" do
+				expect do
+					@conn.exec_params("VALUES(3); VALUES(4)")
+				end.to raise_error(ArgumentError)
+			end
+
+			it "shouldn't forward send_query to send_query_params" do
+				expect do
+					@conn.send_query("VALUES($1)", [5])
+				end.to raise_error(ArgumentError)
+			end
+
+			it "shouldn't forward async_exec_params to async_exec" do
+				expect do
+					@conn.async_exec_params("VALUES(1)")
+				end.to raise_error(ArgumentError)
+			end
+
+			it "shouldn't respond_to socket" do
+				expect do
+					@conn.socket
+				end.to raise_error(ArgumentError)
+			end
+		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