pg 0.14.1-x86-mingw32 → 0.15.0.pre.432-x86-mingw32

data/ext/pg_result.c

@@ -37,7 +37,7 @@ pg_new_result(PGresult *result, VALUE rb_pgconn)
 
 /*
  * call-seq:
- *    res.result -> nil
+ *    res.check -> nil
  *
  * Raises appropriate exception if PG::Result is in a bad state.
  */
@@ -728,22 +728,20 @@ pgresult_aref(VALUE self, VALUE index)
 	return tuple;
 }
 
-
 /*
  * call-seq:
- *    res.values -> Array
+ *    res.each_row { |row| ... }
  *
- * Returns all tuples as an array of arrays.
+ * Yields each row of the result. The row is a list of column values.
  */
 static VALUE
-pgresult_values(VALUE self)
+pgresult_each_row(VALUE self)
 {
 	PGresult* result = (PGresult*) pgresult_get(self);
 	int row;
 	int field;
 	int num_rows = PQntuples(result);
 	int num_fields = PQnfields(result);
-	VALUE ary = rb_ary_new2(num_rows);
 
 	for ( row = 0; row < num_rows; row++ ) {
 		VALUE new_row = rb_ary_new2(num_fields);
@@ -768,11 +766,10 @@ pgresult_values(VALUE self)
 				rb_ary_store( new_row, field, val );
 			}
 		}
-
-		rb_ary_store( ary, row, new_row );
+		rb_yield( new_row );
 	}
 
-	return ary;
+	return Qnil;
 }
 
 
@@ -839,7 +836,7 @@ static VALUE
 pgresult_field_values( VALUE self, VALUE field )
 {
 	PGresult *result = pgresult_get( self );
-	const char *fieldname = RSTRING_PTR( field );
+	const char *fieldname = StringValuePtr( field );
 	int fnum = PQfnumber( result, fieldname );
 
 	if ( fnum < 0 )
@@ -934,7 +931,7 @@ init_pg_result()
 	rb_define_method(rb_cPGresult, "[]", pgresult_aref, 1);
 	rb_define_method(rb_cPGresult, "each", pgresult_each, 0);
 	rb_define_method(rb_cPGresult, "fields", pgresult_fields, 0);
-	rb_define_method(rb_cPGresult, "values", pgresult_values, 0);
+	rb_define_method(rb_cPGresult, "each_row", pgresult_each_row, 0);
 	rb_define_method(rb_cPGresult, "column_values", pgresult_column_values, 1);
 	rb_define_method(rb_cPGresult, "field_values", pgresult_field_values, 1);
 }

data/lib/pg.rb

@@ -19,7 +19,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.14.1'
+	VERSION = '0.15.0.pre.432'
 
 	# VCS revision
 	REVISION = %q$Revision$

data/lib/pg/connection.rb

@@ -23,11 +23,19 @@ class PG::Connection
 		# This will be swapped soon for code that makes options like those required for
 		# PQconnectdbParams()/PQconnectStartParams(). For now, stick to an options string for
 		# PQconnectdb()/PQconnectStart().
-		connopts = []
+
+		# Parameter 'fallback_application_name' was introduced in PostgreSQL 9.0
+		# together with PQescapeLiteral().
+		if PG::Connection.instance_methods.find{|m| m.to_sym == :escape_literal }
+			appname = PG::Connection.quote_connstr( $0 )
+			connopts = ["fallback_application_name=#{appname}"]
+		else
+			connopts = []
+		end
 
 		# Handle an options hash first
 		if args.last.is_a?( Hash )
-			opthash = args.pop 
+			opthash = args.pop
 			opthash.each do |key, val|
 				connopts.push( "%s=%s" % [key, PG::Connection.quote_connstr(val)] )
 			end
@@ -58,6 +66,18 @@ class PG::Connection
 	end
 
 
+	### Fetch a memoized IO object created from the Connection's underlying socket.
+	### Using this avoids the problem of the underlying connection being closed by
+	### Ruby when an IO created using <tt>IO.for_fd(conn.socket)</tt> goes out of scope.
+	def socket_io
+		unless @socket_io
+			@socket_io = IO.for_fd( self.socket )
+			@socket_io.autoclose = false if @socket_io.respond_to?( :autoclose= )
+		end
+
+		return @socket_io
+	end
+
 end # class PG::Connection
 
 # Backward-compatible alias

data/lib/pg/result.rb

@@ -4,7 +4,12 @@ require 'pg' unless defined?( PG )
 
 
 class PG::Result
-	
+
+	### Returns all tuples as an array of arrays
+	def values
+		return enum_for(:each_row).to_a
+	end
+
 end # class PG::Result
 
 # Backward-compatible alias

data/sample/array_insert.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'pg'
+
+c = PG.connect( dbname: 'test' )
+
+# this one works:
+c.exec( "DROP TABLE IF EXISTS foo" )
+c.exec( "CREATE TABLE foo (strings character varying[]);" )
+
+# But using a prepared statement works:
+c.set_error_verbosity( PG::PQERRORS_VERBOSE )
+c.prepare( 'stmt', "INSERT INTO foo VALUES ($1);" )
+
+# This won't work
+#c.exec_prepared( 'stmt', ["ARRAY['this','that']"] )
+
+# but this will:
+c.exec_prepared( 'stmt', ["{'this','that'}"] )
+

data/sample/async_api.rb

@@ -29,7 +29,7 @@ abort "Connection failed: %s" % [ conn.error_message ] if
 
 # Now grab a reference to the underlying socket so we know when the
 # connection is established
-socket = IO.for_fd( conn.socket )
+socket = conn.socket_io
 
 # Track the progress of the connection, waiting for the socket to become readable/writable
 # before polling it

data/sample/async_copyto.rb

@@ -9,7 +9,7 @@ $stderr.puts "Opening database connection ..."
 conn = PG.connect( :dbname => 'test' )
 conn.setnonblocking( true )
 
-socket = IO.for_fd( conn.socket )
+socket = conn.socket_io
 
 $stderr.puts "Running COPY command ..."
 buf = ''

data/sample/async_mixed.rb

@@ -26,7 +26,7 @@ conn = PG.connect( CONN_OPTS ) or abort "Unable to create a new connection!"
 abort "Connect failed: %s" % [ conn.error_message ] unless conn.status == PG::CONNECTION_OK
 
 # Now grab a reference to the underlying socket to select() on while the query is running
-socket = IO.for_fd( conn.socket )
+socket = conn.socket_io
 
 # Send the (asynchronous) query
 output_progress "Sending query"

data/spec/lib/helpers.rb

@@ -48,7 +48,7 @@ module PG::TestingHelpers
 		attributes = ANSI_ATTRIBUTES.values_at( *attributes ).compact.join(';')
 
 		# $stderr.puts "  attr is: %p" % [attributes]
-		if attributes.empty? 
+		if attributes.empty?
 			return ''
 		else
 			return "\e[%sm" % attributes
@@ -56,7 +56,7 @@ module PG::TestingHelpers
 	end
 
 
-	### Colorize the given +string+ with the specified +attributes+ and return it, handling 
+	### Colorize the given +string+ with the specified +attributes+ and return it, handling
 	### line-endings, color reset, etc.
 	def colorize( *args )
 		string = ''
@@ -110,9 +110,7 @@ module PG::TestingHelpers
 	end
 
 
-	NOFORK_PLATFORMS = %w{java}
-
-	### Run the specified command +cmd+ after redirecting stdout and stderr to the specified 
+	### Run the specified command +cmd+ after redirecting stdout and stderr to the specified
 	### +logpath+, failing if the execution fails.
 	def log_and_run( logpath, *cmd )
 		cmd.flatten!
@@ -126,11 +124,14 @@ module PG::TestingHelpers
 		# Eliminate the noise of creating/tearing down the database by
 		# redirecting STDERR/STDOUT to a logfile if the Ruby interpreter
 		# supports fork()
-		if NOFORK_PLATFORMS.include?( RUBY_PLATFORM )
+		logfh = File.open( logpath, File::WRONLY|File::CREAT|File::APPEND )
+		begin
+			pid = fork
+		rescue NotImplementedError
+			logfh.close
 			system( *cmd )
 		else
-			logfh = File.open( logpath, File::WRONLY|File::CREAT|File::APPEND )
-			if pid = fork
+			if pid
 				logfh.close
 			else
 				$stdout.reopen( logfh )
@@ -240,10 +241,15 @@ RSpec.configure do |config|
 
 	config.mock_with :rspec
 	config.filter_run_excluding :ruby_19 if ruby_version_vec <= [1,9,1].pack( "N*" )
+	config.filter_run_excluding :unix if RUBY_PLATFORM =~ /mingw|mswin/
 
 	config.filter_run_excluding :postgresql_90 unless
 		PG::Connection.instance_methods.map( &:to_sym ).include?( :escape_literal )
-	config.filter_run_excluding :postgresql_91 unless
-		PG.respond_to?( :library_version )
+
+	if !PG.respond_to?( :library_version )
+		config.filter_run_excluding( :postgresql_91, :postgresql_92 )
+	elsif PG.library_version < 90200
+		config.filter_run_excluding( :postgresql_92 )
+	end
 end
 

data/spec/pg/connection_spec.rb

@@ -41,7 +41,7 @@ describe PG::Connection do
 	#
 
 	it "can create a connection option string from a Hash of options" do
-		optstring = described_class.parse_connect_args( 
+		optstring = described_class.parse_connect_args(
 			:host => 'pgsql.example.com',
 			:dbname => 'db01',
 			'sslmode' => 'require'
@@ -54,14 +54,14 @@ describe PG::Connection do
 	end
 
 	it "can create a connection option string from positional parameters" do
-		optstring = described_class.parse_connect_args( 'pgsql.example.com', nil, '-c geqo=off', nil, 
+		optstring = described_class.parse_connect_args( 'pgsql.example.com', nil, '-c geqo=off', nil,
 		                                       'sales' )
 
 		optstring.should be_a( String )
 		optstring.should =~ /(^|\s)host='pgsql.example.com'/
 		optstring.should =~ /(^|\s)dbname='sales'/
 		optstring.should =~ /(^|\s)options='-c geqo=off'/
-		
+
 		optstring.should_not =~ /port=/
 		optstring.should_not =~ /tty=/
 	end
@@ -77,7 +77,8 @@ describe PG::Connection do
 	end
 
 	it "escapes single quotes and backslashes in connection parameters" do
-		described_class.parse_connect_args( "DB 'browser' \\" ).should == "host='DB \\'browser\\' \\\\'"
+		described_class.parse_connect_args( "DB 'browser' \\" ).
+			should =~ /host='DB \\'browser\\' \\\\'/
 
 	end
 
@@ -106,7 +107,7 @@ describe PG::Connection do
 		tmpconn.finish
 	end
 
-	it "connects using a hash of optional connection parameters" do
+	it "connects using a hash of optional connection parameters", :postgresql_90 do
 		tmpconn = described_class.connect(
 			:host => 'localhost',
 			:port => @port,
@@ -122,10 +123,10 @@ describe PG::Connection do
 		}.to raise_error( ArgumentError, /extra positional parameter/i )
 	end
 
-	it "can connect asynchronously" do
+	it "can connect asynchronously", :unix do
 		tmpconn = described_class.connect_start( @conninfo )
 		tmpconn.should be_a( described_class )
-		socket = IO.for_fd( tmpconn.socket )
+		socket = tmpconn.socket_io
 		status = tmpconn.connect_poll
 
 		while status != PG::PGRES_POLLING_OK
@@ -144,13 +145,13 @@ describe PG::Connection do
 		tmpconn.finish
 	end
 
-	it "can connect asynchronously for the duration of a block" do
+	it "can connect asynchronously for the duration of a block", :unix do
 		conn = nil
 
 		described_class.connect_start(@conninfo) do |tmpconn|
 			tmpconn.should be_a( described_class )
 			conn = tmpconn
-			socket = IO.for_fd(tmpconn.socket)
+			socket = tmpconn.socket_io
 			status = tmpconn.connect_poll
 
 			while status != PG::PGRES_POLLING_OK
@@ -285,39 +286,58 @@ describe PG::Connection do
 	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] )
+		res.values.should == [ ['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] )
+
+		res = @conn.exec_params( "SELECT name FROM students WHERE age >= $1", [6] )
+		res.values.should == [ ['Wally'], ['Sally'] ]
+	end
+
+
 	it "can wait for NOTIFY events" do
 		@conn.exec( 'ROLLBACK' )
 		@conn.exec( 'LISTEN woo' )
 
-		pid = fork do
+		t = Thread.new do
 			begin
 				conn = described_class.connect( @conninfo )
 				sleep 1
-				conn.exec( 'NOTIFY woo' )
+				conn.async_exec( 'NOTIFY woo' )
 			ensure
 				conn.finish
-				exit!
 			end
 		end
 
 		@conn.wait_for_notify( 10 ).should == 'woo'
 		@conn.exec( 'UNLISTEN woo' )
 
-		Process.wait( pid )
+		t.join
 	end
 
 	it "calls a block for NOTIFY events if one is given" do
 		@conn.exec( 'ROLLBACK' )
 		@conn.exec( 'LISTEN woo' )
 
-		pid = fork do
+		t = Thread.new do
 			begin
 				conn = described_class.connect( @conninfo )
 				sleep 1
-				conn.exec( 'NOTIFY woo' )
+				conn.async_exec( 'NOTIFY woo' )
 			ensure
 				conn.finish
-				exit!
 			end
 		end
 
@@ -328,7 +348,7 @@ describe PG::Connection do
 
 		@conn.exec( 'UNLISTEN woo' )
 
-		Process.wait( pid )
+		t.join
 	end
 
 	it "doesn't collapse sequential notifications" do
@@ -337,20 +357,15 @@ describe PG::Connection do
 		@conn.exec( 'LISTEN war' )
 		@conn.exec( 'LISTEN woz' )
 
-		pid = fork do
-			begin
-				conn = described_class.connect( @conninfo )
-				conn.exec( 'NOTIFY woo' )
-				conn.exec( 'NOTIFY war' )
-				conn.exec( 'NOTIFY woz' )
-			ensure
-				conn.finish
-				exit!
-			end
+		begin
+			conn = described_class.connect( @conninfo )
+			conn.exec( 'NOTIFY woo' )
+			conn.exec( 'NOTIFY war' )
+			conn.exec( 'NOTIFY woz' )
+		ensure
+			conn.finish
 		end
 
-		Process.wait( pid )
-
 		channels = []
 		3.times do
 			channels << @conn.wait_for_notify( 2 )
@@ -369,19 +384,13 @@ describe PG::Connection do
 		@conn.exec( 'ROLLBACK' )
 		@conn.exec( 'LISTEN woo' )
 
-		pid = fork do
-			begin
-				conn = described_class.connect( @conninfo )
-				conn.exec( 'NOTIFY woo' )
-			ensure
-				conn.finish
-				exit!
-			end
+		begin
+			conn = described_class.connect( @conninfo )
+			conn.exec( 'NOTIFY woo' )
+		ensure
+			conn.finish
 		end
 
-		# Wait for the forked child to send the notification
-		Process.wait( pid )
-
 		# Cause the notification to buffer, but not be read yet
 		@conn.exec( 'SELECT 1' )
 
@@ -424,16 +433,17 @@ describe PG::Connection do
 
 
 	it "described_class#block shouldn't block a second thread" do
+		start = Time.now
 		t = Thread.new do
 			@conn.send_query( "select pg_sleep(3)" )
 			@conn.block
 		end
 
-		# :FIXME: There's a race here, but hopefully it's pretty small.
+		sleep 0.5
 		t.should be_alive()
-
 		@conn.cancel
 		t.join
+		(Time.now - start).should < 3
 	end
 
 	it "described_class#block should allow a timeout" do
@@ -505,14 +515,14 @@ describe PG::Connection do
 	end
 
 
-	it "can connect asynchronously" do
+	it "can connect asynchronously", :unix do
 		serv = TCPServer.new( '127.0.0.1', 54320 )
 		conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
-		conn.connect_poll.should == PG::PGRES_POLLING_WRITING
-		select( nil, [IO.for_fd(conn.socket)], nil, 0.2 )
+		[PG::PGRES_POLLING_WRITING, PG::CONNECTION_OK].should include conn.connect_poll
+		select( nil, [conn.socket_io], nil, 0.2 )
 		serv.close
 		if conn.connect_poll == PG::PGRES_POLLING_READING
-			select( [IO.for_fd(conn.socket)], nil, nil, 0.2 )
+			select( [conn.socket_io], nil, nil, 0.2 )
 		end
 		conn.connect_poll.should == PG::PGRES_POLLING_FAILED
 	end
@@ -541,20 +551,19 @@ describe PG::Connection do
 			pending "only works with a PostgreSQL >= 9.0 server" if @conn.server_version < 9_00_00
 		end
 
+		it "sets the fallback_application_name on new connections" do
+			PG::Connection.parse_connect_args( 'dbname=test' ).should include( $0 )
+		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' )
 
-			pid = fork do
-				conn = described_class.connect( @conninfo )
-				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
-				conn.finish
-				exit!
-			end
-
-			Process.wait( pid )
+			conn = described_class.connect( @conninfo )
+			conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+			conn.finish
 
 			event, pid, msg = nil
 			@conn.wait_for_notify( 10 ) do |*args|
@@ -571,14 +580,9 @@ describe PG::Connection do
 			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN knees' )
 
-			pid = fork do
-				conn = described_class.connect( @conninfo )
-				conn.exec( %Q{NOTIFY knees} )
-				conn.finish
-				exit!
-			end
-
-			Process.wait( pid )
+			conn = described_class.connect( @conninfo )
+			conn.exec( %Q{NOTIFY knees} )
+			conn.finish
 
 			event, pid = nil
 			@conn.wait_for_notify( nil ) do |*args|
@@ -594,14 +598,9 @@ describe PG::Connection do
 			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN knees' )
 
-			pid = fork do
-				conn = described_class.connect( @conninfo )
-				conn.exec( %Q{NOTIFY knees} )
-				conn.finish
-				exit!
-			end
-
-			Process.wait( pid )
+			conn = described_class.connect( @conninfo )
+			conn.exec( %Q{NOTIFY knees} )
+			conn.finish
 
 			payload = :notnil
 			@conn.wait_for_notify( nil ) do |*args|
@@ -618,14 +617,9 @@ describe PG::Connection do
 			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN knees' )
 
-			pid = fork do
-				conn = described_class.connect( @conninfo )
-				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
-				conn.finish
-				exit!
-			end
-
-			Process.wait( pid )
+			conn = described_class.connect( @conninfo )
+			conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+			conn.finish
 
 			event, pid, msg = nil
 			@conn.wait_for_notify( 10 ) do |arg1, arg2|
@@ -644,14 +638,9 @@ describe PG::Connection do
 			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN knees' )
 
-			pid = fork do
-				conn = described_class.connect( @conninfo )
-				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
-				conn.finish
-				exit!
-			end
-
-			Process.wait( pid )
+			conn = described_class.connect( @conninfo )
+			conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+			conn.finish
 
 			notification_received = false
 			@conn.wait_for_notify( 10 ) do
@@ -668,14 +657,9 @@ describe PG::Connection do
 			@conn.exec( 'ROLLBACK' )
 			@conn.exec( 'LISTEN knees' )
 
-			pid = fork do
-				conn = described_class.connect( @conninfo )
-				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
-				conn.finish
-				exit!
-			end
-
-			Process.wait( pid )
+			conn = described_class.connect( @conninfo )
+			conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+			conn.finish
 
 			event, pid, msg = nil
 			@conn.wait_for_notify( 10 ) do |arg1, arg2, arg3|
@@ -726,22 +710,71 @@ describe PG::Connection do
 
 	end
 
-	context "multinationalization support", :ruby_19 do
+	context "under PostgreSQL 9.2 client library", :postgresql_92 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)
+			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
+				results.length.should == 11
+				results[0..-2].each do |res|
+					res.result_status.should == PG::PGRES_SINGLE_TUPLE
+					values = res.field_values('generate_series')
+					values.length.should == 1
+					values.first.to_i.should > 0
+				end
+				results.last.result_status.should == PG::PGRES_TUPLES_OK
+				results.last.ntuples.should == 0
+			end
 
-		it "should return the same bytes in text format that are sent as inline text" do
-			binary_file   = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
-			in_bytes      = File.open(binary_file, 'r:ASCII-8BIT').read
-			escaped_bytes = described_class.escape_bytea( in_bytes )
-			out_bytes     = nil
+			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
 
-			@conn.transaction do |conn|
-				conn.exec("SET standard_conforming_strings=on")
-				res = conn.exec("VALUES ('#{escaped_bytes}'::bytea)", [], 0)
-				out_bytes = described_class.unescape_bytea( res[0]['column1'] )
+				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
+				(Time.now - start_time).should >= 1.0
+				(first_row_time - start_time).should < 1.0
 			end
 
-			out_bytes.should == in_bytes
+			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)
+				first_result.kind_of?(PG::Result).should be_true
+				first_result.result_status.should == PG::PGRES_SINGLE_TUPLE
+			end
 		end
+	end
+
+	context "multinationalization support", :ruby_19 do
 
 		describe "rubyforge #22925: m17n support" do
 			it "should return results in the same encoding as the client (iso-8859-1)" do
@@ -818,7 +851,7 @@ describe PG::Connection do
 				escaped.encoding.should == Encoding::EUC_JP
 			end
 
-			it "escapes string as literal" do
+			it "escapes string as literal", :postgresql_90 do
 				original = "string to\0 escape"
 				escaped  = @conn.escape_literal( original )
 				escaped.should == "'string to'"
@@ -852,11 +885,11 @@ describe PG::Connection do
 			it "allows users of the async interface to set the client_encoding to the default_internal" do
 				begin
 					prev_encoding = Encoding.default_internal
-					Encoding.default_internal = Encoding::KOI8_U
+					Encoding.default_internal = Encoding::KOI8_R
 
 					@conn.set_default_encoding
 
-					@conn.internal_encoding.should == Encoding::KOI8_U
+					@conn.internal_encoding.should == Encoding::KOI8_R
 				ensure
 					Encoding.default_internal = prev_encoding
 				end
@@ -886,5 +919,76 @@ describe PG::Connection do
 			conn.finish if conn
 		end
 
+		it "receives properly encoded messages in the notice callbacks", :postgresql_90 do
+			[:receiver, :processor].each do |kind|
+				notices = []
+				@conn.internal_encoding = 'utf-8'
+				if kind == :processor
+					@conn.set_notice_processor do |msg|
+						notices << msg
+					end
+				else
+					@conn.set_notice_receiver do |result|
+						notices << result.error_message
+					end
+				end
+
+				3.times do
+					@conn.exec "do $$ BEGIN RAISE NOTICE '世界線航跡蔵'; END; $$ LANGUAGE plpgsql;"
+				end
+
+				notices.length.should == 3
+				notices.each do |notice|
+					notice.should =~ /^NOTICE:.*世界線航跡蔵/
+					notice.encoding.should == Encoding::UTF_8
+				end
+				@conn.set_notice_receiver
+				@conn.set_notice_processor
+			end
+		end
+
+		it "receives properly encoded text from wait_for_notify", :postgresql_90 do
+			@conn.internal_encoding = 'utf-8'
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN "Möhre"' )
+			@conn.exec( %Q{NOTIFY "Möhre", '世界線航跡蔵'} )
+			event, pid, msg = nil
+			@conn.wait_for_notify( 10 ) do |*args|
+				event, pid, msg = *args
+			end
+			@conn.exec( 'UNLISTEN "Möhre"' )
+
+			event.should == "Möhre"
+			event.encoding.should == Encoding::UTF_8
+			msg.should == '世界線航跡蔵'
+			msg.encoding.should == Encoding::UTF_8
+		end
+
+		it "returns properly encoded text from notifies", :postgresql_90 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"' )
+
+			notification = @conn.notifies
+			notification[:relname].should == "Möhre"
+			notification[:relname].encoding.should == Encoding::UTF_8
+			notification[:extra].should == '世界線航跡蔵'
+			notification[:extra].encoding.should == Encoding::UTF_8
+			notification[:be_pid].should > 0
+		end
+	end
+
+	context "OS thread support", :ruby_19 do
+		it "described_class#exec shouldn't block a second thread" do
+			t = Thread.new do
+				@conn.exec( "select pg_sleep(1)" )
+			end
+
+			sleep 0.5
+			t.should be_alive()
+			t.join
+		end
 	end
 end