pg 0.21.0-x64-mingw32 → 1.0.0-x64-mingw32

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id$
+ * $Id: pg_result.c,v 7c5d9608349f 2018/01/03 16:11:52 lars $
  *
  */
 
@@ -92,12 +92,8 @@ pg_result_check( VALUE self )
 		case PGRES_TUPLES_OK:
 		case PGRES_COPY_OUT:
 		case PGRES_COPY_IN:
-#ifdef HAVE_CONST_PGRES_COPY_BOTH
 		case PGRES_COPY_BOTH:
-#endif
-#ifdef HAVE_CONST_PGRES_SINGLE_TUPLE
 		case PGRES_SINGLE_TUPLE:
-#endif
 		case PGRES_EMPTY_QUERY:
 		case PGRES_COMMAND_OK:
 			return self;
@@ -1056,7 +1052,6 @@ pgresult_type_map_get(VALUE self)
 	return this->typemap;
 }
 
-#ifdef HAVE_PQSETSINGLEROWMODE
 /*
  * call-seq:
  *    res.stream_each{ |tuple| ... }
@@ -1087,6 +1082,8 @@ pgresult_type_map_get(VALUE self)
  *     # do something with the received row of the second query
  *   end
  *   conn.get_result  # => nil   (no more results)
+ *
+ * Available since PostgreSQL-9.2
  */
 static VALUE
 pgresult_stream_each(VALUE self)
@@ -1150,6 +1147,8 @@ pgresult_stream_each(VALUE self)
  *
  * This method works equally to #stream_each , but yields an Array of
  * values.
+ *
+ * Available since PostgreSQL-9.2
  */
 static VALUE
 pgresult_stream_each_row(VALUE self)
@@ -1210,7 +1209,6 @@ pgresult_stream_each_row(VALUE self)
 	/* never reached */
 	return self;
 }
-#endif
 
 
 void
@@ -1267,11 +1265,9 @@ init_pg_result()
 	rb_define_method(rb_cPGresult, "type_map=", pgresult_type_map_set, 1);
 	rb_define_method(rb_cPGresult, "type_map", pgresult_type_map_get, 0);
 
-#ifdef HAVE_PQSETSINGLEROWMODE
 	/******     PG::Result INSTANCE METHODS: streaming     ******/
 	rb_define_method(rb_cPGresult, "stream_each", pgresult_stream_each, 0);
 	rb_define_method(rb_cPGresult, "stream_each_row", pgresult_stream_each_row, 0);
-#endif
 }
 
 

data/ext/pg_text_decoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_decoder.c - PG::TextDecoder module
- * $Id$
+ * $Id: pg_text_decoder.c,v fcf731d3dff7 2015/09/08 12:25:06 jfali $
  *
  */
 

data/ext/pg_text_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_encoder.c - PG::TextEncoder module
- * $Id$
+ * $Id: pg_text_encoder.c,v e61a06f1f5ed 2015/12/25 21:14:21 lars $
  *
  */
 

data/ext/pg_type_map.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_type_map.c,v 2af122820861 2017/01/14 19:56:36 lars $
  *
  */
 

data/ext/pg_type_map_all_strings.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_all_strings.c - PG::TypeMapAllStrings class extension
- * $Id$
+ * $Id: pg_type_map_all_strings.c,v c53f993a4254 2014/12/12 21:57:29 lars $
  *
  * This is the default typemap.
  *

data/ext/pg_type_map_by_class.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_class.c - PG::TypeMapByClass class extension
- * $Id$
+ * $Id: pg_type_map_by_class.c,v eeb8a82c5328 2014/11/10 19:34:02 lars $
  *
  * This type map can be used to select value encoders based on the class
  * of the given value to be send.

data/ext/pg_type_map_by_column.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_type_map_by_column.c,v fcf731d3dff7 2015/09/08 12:25:06 jfali $
  *
  */
 

data/ext/pg_type_map_by_mri_type.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_mri_type.c - PG::TypeMapByMriType class extension
- * $Id$
+ * $Id: pg_type_map_by_mri_type.c,v 1269b8ad77b8 2015/02/06 16:38:23 lars $
  *
  * This type map can be used to select value encoders based on the MRI-internal
  * value type code.

data/ext/pg_type_map_by_oid.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_oid.c - PG::TypeMapByOid class extension
- * $Id$
+ * $Id: pg_type_map_by_oid.c,v c99d26015e3c 2014/12/12 20:58:25 lars $
  *
  */
 

data/ext/pg_type_map_in_ruby.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_in_ruby.c - PG::TypeMapInRuby class extension
- * $Id$
+ * $Id: pg_type_map_in_ruby.c,v 3d89d3aae4fd 2015/01/05 16:19:41 kanis $
  *
  */
 

data/ext/util.c

@@ -1,6 +1,6 @@
 /*
  * util.c - Utils for ruby-pg
- * $Id$
+ * $Id: util.c,v 5fb9170f6a7d 2015/06/29 11:15:12 kanis $
  *
  */
 

data/lib/pg.rb

@@ -35,10 +35,10 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.21.0'
+	VERSION = '1.0.0'
 
 	# VCS revision
-	REVISION = %q$Revision$
+	REVISION = %q$Revision: fef434914848 $
 
 	class NotAllCopyDataRetrieved < PG::Error
 	end
@@ -70,7 +70,3 @@ module PG
 end # module PG
 
 
-autoload :PGError,  'pg/deprecated_constants'
-autoload :PGconn,   'pg/deprecated_constants'
-autoload :PGresult, 'pg/deprecated_constants'
-

data/lib/pg/connection.rb

@@ -47,7 +47,7 @@ class PG::Connection
 
 		if args.length == 1
 			case args.first
-			when URI, URI.regexp
+			when URI, /\A#{URI.regexp}\z/
 				uri = URI(args.first)
 				options.merge!( Hash[URI.decode_www_form( uri.query )] ) if uri.query
 			when /=/
@@ -85,7 +85,7 @@ class PG::Connection
 
 
 	#  call-seq:
-	#     conn.copy_data( sql ) {|sql_result| ... } -> PG::Result
+	#     conn.copy_data( sql [, coder] ) {|sql_result| ... } -> PG::Result
 	#
 	# Execute a copy process for transfering data to or from the server.
 	#
@@ -109,6 +109,11 @@ class PG::Connection
 	# of blocking mode of operation, #copy_data is preferred to raw calls
 	# of #put_copy_data, #get_copy_data and #put_copy_end.
 	#
+	# _coder_ can be a PG::Coder derivation
+	# (typically PG::TextEncoder::CopyRow or PG::TextDecoder::CopyRow).
+	# This enables encoding of data fields given to #put_copy_data
+	# or decoding of fields received by #get_copy_data.
+	#
 	# Example with CSV input format:
 	#   conn.exec "create table my_table (a text,b text,c text,d text)"
 	#   conn.copy_data "COPY my_table FROM STDIN CSV" do

data/spec/helpers.rb

@@ -5,7 +5,9 @@ require 'rspec'
 require 'shellwords'
 require 'pg'
 
-TEST_DIRECTORY = Pathname.getwd + "tmp_test_specs"
+DEFAULT_TEST_DIR_STR = File.join(Dir.pwd, "tmp_test_specs")
+TEST_DIR_STR = ENV['RUBY_PG_TEST_DIR'] || DEFAULT_TEST_DIR_STR
+TEST_DIRECTORY = Pathname.new(TEST_DIR_STR)
 
 module PG::TestingHelpers
 
@@ -251,7 +253,7 @@ module PG::TestingHelpers
 
 	def check_for_lingering_connections( conn )
 		conn.exec( "SELECT * FROM pg_stat_activity" ) do |res|
-			conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid }
+			conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) }
 			unless conns.empty?
 				puts "Lingering connections remain:"
 				conns.each do |row|
@@ -339,14 +341,8 @@ RSpec.configure do |config|
 	config.filter_run_excluding :socket_io unless
 		PG::Connection.instance_methods.map( &:to_sym ).include?( :socket_io )
 
-	if PG.library_version < 90200
-		config.filter_run_excluding( :postgresql_92, :postgresql_93, :postgresql_94, :postgresql_95 )
-	elsif PG.library_version < 90300
-		config.filter_run_excluding( :postgresql_93, :postgresql_94, :postgresql_95 )
-	elsif PG.library_version < 90400
-		config.filter_run_excluding( :postgresql_94, :postgresql_95 )
-	elsif PG.library_version < 90500
-		config.filter_run_excluding( :postgresql_95 )
-	end
+	config.filter_run_excluding( :postgresql_93 ) if PG.library_version <  90300
+	config.filter_run_excluding( :postgresql_94 ) if PG.library_version <  90400
+	config.filter_run_excluding( :postgresql_95 ) if PG.library_version <  90500
+	config.filter_run_excluding( :postgresql_10 ) if PG.library_version < 100000
 end
-

data/spec/pg/connection_spec.rb

@@ -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,
@@ -219,7 +232,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
@@ -524,7 +537,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]
@@ -586,7 +599,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;" )
@@ -718,11 +731,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) )
@@ -779,18 +787,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
 
 
@@ -889,155 +931,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)
@@ -1070,71 +1104,69 @@ describe PG::Connection do
 			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
@@ -1201,7 +1233,7 @@ describe PG::Connection do
 				expect( escaped ).to eq( "Möhre to".encode(Encoding::EUC_JP) )
 			end
 
-			it "uses the client encoding for escaped literal", :postgresql_90 do
+			it "uses the client encoding for escaped literal" do
 				original = "Möhre to\0 escape".encode( "utf-16be" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape_literal( original )
@@ -1209,7 +1241,7 @@ describe PG::Connection do
 				expect( escaped ).to eq( "'Möhre to'".encode(Encoding::EUC_JP) )
 			end
 
-			it "uses the client encoding for escaped identifier", :postgresql_90 do
+			it "uses the client encoding for escaped identifier" do
 				original = "Möhre to\0 escape".encode( "utf-16le" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape_identifier( original )
@@ -1240,6 +1272,12 @@ describe PG::Connection do
 				expect( escaped.encoding ).to eq( Encoding::ISO8859_1 )
 				expect( escaped.encode ).to eq( "\"Möhre to\"".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
 		end
 
 		describe "respect and convert character encoding of input strings" do
@@ -1408,7 +1446,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 +1461,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,7 +1489,7 @@ 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" do
 			@conn.internal_encoding = 'utf-8'
 			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN "Möhre"' )
@@ -1468,7 +1506,7 @@ describe PG::Connection do
 			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" do
 			@conn.internal_encoding = 'utf-8'
 			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN "Möhre"' )
@@ -1524,9 +1562,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