pg 0.17.1 → 0.17.2.pre.546

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76e0a053a21b6714395f5ccf1bd43c9caa235584
-  data.tar.gz: 6d1021ba6991c151049c33f0963f22c5c1262a75
+  metadata.gz: 637de7550ad54596f1d2296e620abf62627bfd15
+  data.tar.gz: 7ddb6d5c72f909b0378360011aa13c020f0d88cf
 SHA512:
-  metadata.gz: 3b91c230861ffd1e08fd835ce16245f9abe9344f435f558fbd8987cf6db81255473445a0ea7c1cbb8f602f2eb6bd2ea1ac446cfba484939bb9635ba67ef4060b
-  data.tar.gz: 3219c6f4aaebb9ba597e1ae772b74edb19e27b80f1f60c16537a85f4790e427d040ebfdd46d8e44a626994a5599cdbf9fc82ce3ab269c5f3b7b77b5a80fccc3c
+  metadata.gz: ce2fa474c1921e469990bdb6c99a2bd73a0568197946639850f6d1da126acb8d7e36137b78f156417fbc46f63f42e6d0cae61301127ce05954818a58be4e5d23
+  data.tar.gz: 9525dd2c6a8805c0aaca253c3cf497533a7077e466bdf2ea0c25ecf1c0d47e4053639766d73cbfad548d5b8568453e82b83e73280f0f9dc552eee379a850c37b

data/Manifest.txt

@@ -51,7 +51,7 @@ sample/wal_shipper.rb
 sample/warehouse_partitions.rb
 spec/data/expected_trace.out
 spec/data/random_binary_data
-spec/lib/helpers.rb
+spec/helpers.rb
 spec/pg/connection_spec.rb
 spec/pg/result_spec.rb
 spec/pg_spec.rb

data/Rakefile

@@ -53,14 +53,16 @@ $hoespec = Hoe.spec 'pg' do
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
 	self.extra_rdoc_files.include( 'POSTGRES', 'LICENSE' )
 	self.extra_rdoc_files.include( 'ext/*.c' )
+	self.license :BSD
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
 	self.dependency 'rake-compiler', '~> 0.9', :developer
-	self.dependency 'hoe', '~> 3.5.1', :developer
-	self.dependency 'hoe-deveiate', '~> 0.2', :developer
+	self.dependency 'hoe', '~> 3.12', :developer
+	self.dependency 'hoe-deveiate', '~> 0.6', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
+	self.dependency 'rspec', '~> 3.0', :developer
 
 	self.spec_extras[:licenses] = ['BSD', 'Ruby', 'GPL']
 	self.spec_extras[:extensions] = [ 'ext/extconf.rb' ]

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v 97c3ec224be9 2013/12/09 16:34:26 kanis $
+ * $Id: pg_connection.c,v 6c2444dc63e1 2013/12/30 16:49:29 lars $
  *
  */
 
@@ -1522,7 +1522,7 @@ pgconn_escape_identifier(VALUE self, VALUE string)
  * Then call Connection#get_result repeatedly, until it returns nil.
  *
  * Each (but the last) received Result has exactly one row and a
- * Result#result_status of PGRES_SINGLE_TUPLE. The last row has
+ * Result#result_status of PGRES_SINGLE_TUPLE. The last Result has
  * zero rows and is used to indicate a successful execution of the query.
  * All of these Result objects will contain the same row description data
  * (column names, types, etc) that an ordinary Result object for the query

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id: pg_result.c,v 8255d4f73334 2013/08/18 20:40:08 lars $
+ * $Id: pg_result.c,v 738d4c4125a1 2014/07/23 18:10:52 mina $
  *
  */
 
@@ -299,7 +299,7 @@ pgresult_ntuples(VALUE self)
 
 /*
  * call-seq:
- *    res.nfields() -> Fixnum
+ *    res.nfields() -> Integer
  *
  * Returns the number of columns in the query result.
  */
@@ -370,7 +370,7 @@ pgresult_fnumber(VALUE self, VALUE name)
 
 /*
  * call-seq:
- *    res.ftable( column_number ) -> Fixnum
+ *    res.ftable( column_number ) -> Integer
  *
  * Returns the Oid of the table from which the column _column_number_
  * was fetched.
@@ -389,7 +389,7 @@ pgresult_ftable(VALUE self, VALUE column_number)
 		rb_raise(rb_eArgError,"Invalid column index: %d", col_number);
 
 	n = PQftable(pgresult, col_number);
-	return INT2FIX(n);
+	return UINT2NUM(n);
 }
 
 /*
@@ -440,7 +440,7 @@ pgresult_fformat(VALUE self, VALUE column_number)
 
 /*
  * call-seq:
- *    res.ftype( column_number )
+ *    res.ftype( column_number )  -> Integer
  *
  * Returns the data type associated with _column_number_.
  *
@@ -464,7 +464,7 @@ pgresult_ftype(VALUE self, VALUE index)
 	if (i < 0 || i >= PQnfields(result)) {
 		rb_raise(rb_eArgError, "invalid field number %d", i);
 	}
-	return INT2NUM(PQftype(result, i));
+	return UINT2NUM(PQftype(result, i));
 }
 
 /*
@@ -640,7 +640,7 @@ pgresult_paramtype(VALUE self, VALUE param_number)
 	PGresult *result;
 
 	result = pgresult_get(self);
-	return INT2FIX(PQparamtype(result,NUM2INT(param_number)));
+	return UINT2NUM(PQparamtype(result,NUM2INT(param_number)));
 }
 
 /*
@@ -659,7 +659,7 @@ pgresult_cmd_status(VALUE self)
 
 /*
  * call-seq:
- *    res.cmd_tuples() -> Fixnum
+ *    res.cmd_tuples() -> Integer
  *
  * Returns the number of tuples (rows) affected by the SQL command.
  *
@@ -681,7 +681,7 @@ pgresult_cmd_tuples(VALUE self)
 
 /*
  * call-seq:
- *    res.oid_value() -> Fixnum
+ *    res.oid_value() -> Integer
  *
  * Returns the +oid+ of the inserted row if applicable,
  * otherwise +nil+.
@@ -693,7 +693,7 @@ pgresult_oid_value(VALUE self)
 	if (n == InvalidOid)
 		return Qnil;
 	else
-		return INT2FIX(n);
+		return UINT2NUM(n);
 }
 
 /* Utility methods not in libpq */

data/lib/pg.rb

@@ -19,7 +19,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.17.1'
+	VERSION = '0.17.2.pre.546'
 
 	# VCS revision
 	REVISION = %q$Revision: 22d57e3a2b37 $

data/spec/{lib/helpers.rb → helpers.rb}

@@ -9,6 +9,38 @@ TEST_DIRECTORY = Pathname.getwd + "tmp_test_specs"
 
 module PG::TestingHelpers
 
+	### Automatically set up the database when it's used, and wrap a transaction around
+	### examples that don't disable it.
+	def self::included( mod )
+		super
+
+		if mod.respond_to?( :around )
+
+			mod.before( :all ) { @conn = setup_testing_db(described_class.name) }
+
+			mod.around( :each ) do |example|
+				begin
+					@conn.exec( 'BEGIN' ) unless example.metadata[:without_transaction]
+					if PG.respond_to?( :library_version )
+						desc = example.source_location.join(':')
+						@conn.exec_params %Q{SET application_name TO '%s'} %
+							[@conn.escape_string(desc.slice(-60))]
+					end
+					example.run
+				ensure
+					@conn.exec( 'ROLLBACK' ) unless example.metadata[:without_transaction]
+				end
+			end
+
+			mod.after( :all ) { teardown_testing_db(@conn) }
+		end
+
+	end
+
+
+	#
+	# Examples
+	#
 
 	# Set some ANSI escape code constants (Shamelessly stolen from Perl's
 	# Term::ANSIColor by Russ Allbery <rra@stanford.edu> and Zenin <zenin@best.com>
@@ -121,28 +153,9 @@ module PG::TestingHelpers
 		end
 
 		# Eliminate the noise of creating/tearing down the database by
-		# redirecting STDERR/STDOUT to a logfile if the Ruby interpreter
-		# supports fork()
+		# redirecting STDERR/STDOUT to a logfile
 		logfh = File.open( logpath, File::WRONLY|File::CREAT|File::APPEND )
-		begin
-			pid = fork
-		rescue NotImplementedError
-			logfh.close
-			system( *cmd )
-		else
-			if pid
-				logfh.close
-			else
-				$stdout.reopen( logfh )
-				$stderr.reopen( $stdout )
-				$stderr.puts( ">>> " + cmd.shelljoin )
-				exec( *cmd )
-				$stderr.puts "After the exec()?!??!"
-				exit!
-			end
-
-			Process.wait( pid )
-		end
+		system( *cmd, [STDOUT, STDERR] => logfh )
 
 		raise "Command failed: [%s]" % [cmd.join(' ')] unless $?.success?
 	end
@@ -248,29 +261,19 @@ module PG::TestingHelpers
 		end
 	end
 
-	def connection_string_should_contain_application_name(conn_args, app_name)
-		conn_name = conn_args.match(/application_name='(.*)'/)[1]
-		conn_name.should include(app_name[0..10])
-		conn_name.should include(app_name[-10..-1])
-		conn_name.length.should <= 64
-	end
-
-	# Ensure the connection is in a clean execution status.
-	def verify_clean_exec_status
-		@conn.send_query( "VALUES (1)" )
-		@conn.get_last_result.values.should == [["1"]]
-	end
 end
 
 
 RSpec.configure do |config|
-	ruby_version_vec = RUBY_VERSION.split('.').map {|c| c.to_i }.pack( "N*" )
-
 	config.include( PG::TestingHelpers )
-	config.treat_symbols_as_metadata_keys_with_true_values = true
 
-	config.mock_with :rspec
-	config.filter_run_excluding :ruby_19 if ruby_version_vec <= [1,9,1].pack( "N*" )
+	config.run_all_when_everything_filtered = true
+	config.filter_run :focus
+	config.order = 'random'
+	config.mock_with( :rspec ) do |mock|
+		mock.syntax = :expect
+	end
+
 	if RUBY_PLATFORM =~ /mingw|mswin/
 		config.filter_run_excluding :unix
 	else

data/spec/pg/connection_spec.rb

@@ -1,49 +1,14 @@
 #!/usr/bin/env rspec
 #encoding: utf-8
 
-BEGIN {
-	require 'pathname'
+require_relative '../helpers'
 
-	basedir = Pathname( __FILE__ ).dirname.parent.parent
-	libdir = basedir + 'lib'
-
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-require 'rspec'
-require 'spec/lib/helpers'
 require 'timeout'
 require 'socket'
 require 'pg'
 
 describe PG::Connection do
 
-	before( :all ) do
-		@conn = setup_testing_db( described_class.name )
-	end
-
-	before( :each ) do
-		@conn.exec( 'BEGIN' ) unless example.metadata[:without_transaction]
-		if PG.respond_to?( :library_version )
-			@conn.exec_params %Q{SET application_name TO '%s'} %
-				[@conn.escape_string(example.description[0,60])]
-		end
-	end
-
-	after( :each ) do
-		@conn.exec( 'ROLLBACK' ) unless example.metadata[:without_transaction]
-	end
-
-	after( :all ) do
-		teardown_testing_db( @conn )
-	end
-
-
-	#
-	# Examples
-	#
-
 	it "can create a connection option string from a Hash of options" do
 		optstring = described_class.parse_connect_args(
 			:host => 'pgsql.example.com',
@@ -51,54 +16,55 @@ describe PG::Connection do
 			'sslmode' => 'require'
 		  )
 
-		optstring.should be_a( String )
-		optstring.should =~ /(^|\s)host='pgsql.example.com'/
-		optstring.should =~ /(^|\s)dbname='db01'/
-		optstring.should =~ /(^|\s)sslmode='require'/
+		expect( optstring ).to be_a( String )
+		expect( optstring ).to match( /(^|\s)host='pgsql.example.com'/ )
+		expect( optstring ).to match( /(^|\s)dbname='db01'/ )
+		expect( optstring ).to match( /(^|\s)sslmode='require'/ )
 	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,
 		                                       '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'/
+		expect( optstring ).to be_a( String )
+		expect( optstring ).to match( /(^|\s)host='pgsql.example.com'/ )
+		expect( optstring ).to match( /(^|\s)dbname='sales'/ )
+		expect( optstring ).to match( /(^|\s)options='-c geqo=off'/ )
 
-		optstring.should_not =~ /port=/
-		optstring.should_not =~ /tty=/
+		expect( optstring ).to_not match( /port=/ )
+		expect( optstring ).to_not match( /tty=/ )
 	end
 
 	it "can create a connection option string from a mix of positional and hash parameters" do
 		optstring = described_class.parse_connect_args( 'pgsql.example.com',
 		                                       :dbname => 'licensing', :user => 'jrandom' )
 
-		optstring.should be_a( String )
-		optstring.should =~ /(^|\s)host='pgsql.example.com'/
-		optstring.should =~ /(^|\s)dbname='licensing'/
-		optstring.should =~ /(^|\s)user='jrandom'/
+		expect( optstring ).to be_a( String )
+		expect( optstring ).to match( /(^|\s)host='pgsql.example.com'/ )
+		expect( optstring ).to match( /(^|\s)dbname='licensing'/ )
+		expect( optstring ).to match( /(^|\s)user='jrandom'/ )
 	end
 
 	it "escapes single quotes and backslashes in connection parameters" do
-		described_class.parse_connect_args( "DB 'browser' \\" ).
-			should =~ /host='DB \\'browser\\' \\\\'/
+		expect(
+			described_class.parse_connect_args( "DB 'browser' \\" )
+		).to match( /host='DB \\'browser\\' \\\\'/ )
 
 	end
 
 	it "connects with defaults if no connection parameters are given" do
-		described_class.parse_connect_args.should == ''
+		expect( described_class.parse_connect_args ).to eq( '' )
 	end
 
 	it "connects successfully with connection string" do
 		tmpconn = described_class.connect(@conninfo)
-		tmpconn.status.should == PG::CONNECTION_OK
+		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		tmpconn.finish
 	end
 
 	it "connects using 7 arguments converted to strings" do
 		tmpconn = described_class.connect('localhost', @port, nil, nil, :test, nil, nil)
-		tmpconn.status.should == PG::CONNECTION_OK
+		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		tmpconn.finish
 	end
 
@@ -107,7 +73,7 @@ describe PG::Connection do
 			:host => 'localhost',
 			:port => @port,
 			:dbname => :test)
-		tmpconn.status.should == PG::CONNECTION_OK
+		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		tmpconn.finish
 	end
 
@@ -117,7 +83,7 @@ describe PG::Connection do
 			:port => @port,
 			:dbname => :test,
 			:keepalives => 1)
-		tmpconn.status.should == PG::CONNECTION_OK
+		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		tmpconn.finish
 	end
 
@@ -129,7 +95,7 @@ describe PG::Connection do
 
 	it "can connect asynchronously", :socket_io do
 		tmpconn = described_class.connect_start( @conninfo )
-		tmpconn.should be_a( described_class )
+		expect( tmpconn ).to be_a( described_class )
 		socket = tmpconn.socket_io
 		status = tmpconn.connect_poll
 
@@ -145,7 +111,7 @@ describe PG::Connection do
 			status = tmpconn.connect_poll
 		end
 
-		tmpconn.status.should == PG::CONNECTION_OK
+		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		tmpconn.finish
 	end
 
@@ -153,7 +119,7 @@ describe PG::Connection do
 		conn = nil
 
 		described_class.connect_start(@conninfo) do |tmpconn|
-			tmpconn.should be_a( described_class )
+			expect( tmpconn ).to be_a( described_class )
 			conn = tmpconn
 			socket = tmpconn.socket_io
 			status = tmpconn.connect_poll
@@ -171,10 +137,10 @@ describe PG::Connection do
 				status = tmpconn.connect_poll
 			end
 
-			tmpconn.status.should == PG::CONNECTION_OK
+			expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		end
 
-		conn.should be_finished()
+		expect( conn ).to be_finished()
 	end
 
 	it "raises proper error when sending fails" do
@@ -188,7 +154,7 @@ describe PG::Connection do
 		res = @conn.exec(%[SELECT COUNT(*) AS n FROM pg_stat_activity
 							WHERE usename IS NOT NULL])
 		# there's still the global @conn, but should be no more
-		res[0]['n'].should == '1'
+		expect( res[0]['n'] ).to eq( '1' )
 	end
 
 
@@ -248,7 +214,7 @@ describe PG::Connection do
 				expected_trace_output.sub!( /From backend> "SELECT 1"/, 'From backend> "SELECT"' )
 			end
 
-			trace_data.should == expected_trace_output
+			expect( trace_data ).to eq( expected_trace_output )
 		end
 
 	it "allows a query to be cancelled" do
@@ -259,7 +225,7 @@ describe PG::Connection do
 		if(tmpres.result_status != PG::PGRES_TUPLES_OK)
 			error = true
 		end
-		error.should == true
+		expect( error ).to eq( true )
 	end
 
 	it "can stop a thread that runs a blocking query with async_exec" do
@@ -271,7 +237,7 @@ describe PG::Connection do
 
 		t.kill
 		t.join
-		(Time.now - start).should < 10
+		expect( (Time.now - start) ).to be < 10
 	end
 
 	it "should work together with signal handlers" do
@@ -285,7 +251,7 @@ describe PG::Connection do
 			Process.kill("USR1", Process.pid)
 		end
 		@conn.exec("select pg_sleep(0.3)")
-		signal_received.should be_true
+		expect( signal_received ).to be_truthy
 
 		signal_received = false
 		Thread.new do
@@ -293,7 +259,7 @@ describe PG::Connection do
 			Process.kill("USR1", Process.pid)
 		end
 		@conn.async_exec("select pg_sleep(0.3)")
-		signal_received.should be_true
+		expect( signal_received ).to be_truthy
 	end
 
 
@@ -313,7 +279,7 @@ describe PG::Connection do
 		}.to raise_exception( RuntimeError, /all pie is gone/i )
 
 		res = @conn.exec( "SELECT * FROM pie" )
-		res.ntuples.should == 0
+		expect( res.ntuples ).to eq( 0 )
 	end
 
 	it "returns the block result from Connection#transaction" do
@@ -323,7 +289,7 @@ describe PG::Connection do
 		res = @conn.transaction do
 			"transaction result"
 		end
-		res.should == "transaction result"
+		expect( res ).to eq( "transaction result" )
 	end
 
 	it "not read past the end of a large object" do
@@ -331,9 +297,9 @@ describe PG::Connection do
 			oid = @conn.lo_create( 0 )
 			fd = @conn.lo_open( oid, PG::INV_READ|PG::INV_WRITE )
 			@conn.lo_write( fd, "foobar" )
-			@conn.lo_read( fd, 10 ).should be_nil()
+			expect( @conn.lo_read( fd, 10 ) ).to be_nil()
 			@conn.lo_lseek( fd, 0, PG::SEEK_SET )
-			@conn.lo_read( fd, 10 ).should == 'foobar'
+			expect( @conn.lo_read( fd, 10 ) ).to eq( 'foobar' )
 		end
 	end
 
@@ -345,7 +311,7 @@ describe PG::Connection do
 		@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'] ]
+		expect( res.values ).to eq( [ ['Wally'], ['Sally'] ] )
 	end
 
 	it "supports explicitly calling #exec_params" do
@@ -355,7 +321,7 @@ describe PG::Connection do
 		@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'] ]
+		expect( res.values ).to eq( [ ['Wally'], ['Sally'] ] )
 	end
 
 
@@ -373,7 +339,7 @@ describe PG::Connection do
 			end
 		end
 
-		@conn.wait_for_notify( 10 ).should == 'woo'
+		expect( @conn.wait_for_notify( 10 ) ).to eq( 'woo' )
 		@conn.exec( 'UNLISTEN woo' )
 
 		t.join
@@ -395,8 +361,8 @@ describe PG::Connection do
 
 		eventpid = event = nil
 		@conn.wait_for_notify( 10 ) {|*args| event, eventpid = args }
-		event.should == 'woo'
-		eventpid.should be_an( Integer )
+		expect( event ).to eq( 'woo' )
+		expect( eventpid ).to be_an( Integer )
 
 		@conn.exec( 'UNLISTEN woo' )
 
@@ -423,8 +389,8 @@ describe PG::Connection do
 			channels << @conn.wait_for_notify( 2 )
 		end
 
-		channels.should have( 3 ).members
-		channels.should include( 'woo', 'war', 'woz' )
+		expect( channels.size ).to eq( 3 )
+		expect( channels ).to include( 'woo', 'war', 'woz' )
 
 		@conn.exec( 'UNLISTEN woz' )
 		@conn.exec( 'UNLISTEN war' )
@@ -446,7 +412,7 @@ describe PG::Connection do
 		# Cause the notification to buffer, but not be read yet
 		@conn.exec( 'SELECT 1' )
 
-		@conn.wait_for_notify( 10 ).should == 'woo'
+		expect( @conn.wait_for_notify( 10 ) ).to eq( 'woo' )
 		@conn.exec( 'UNLISTEN woo' )
 	end
 
@@ -457,41 +423,42 @@ describe PG::Connection do
 		end
 		st = Time.now
 		@conn.send_query "SELECT pg_sleep(0.5); do $$ BEGIN RAISE NOTICE 'woohoo'; END; $$ LANGUAGE plpgsql;"
-		@conn.wait_for_notify( 1 ).should be_nil
-		notices.first.should_not be_nil
+		expect( @conn.wait_for_notify( 1 ) ).to be_nil
+		expect( notices.first ).to_not be_nil
 		et = Time.now
-		(et - notices.first[1]).should >= 0.4
-		(et - st).should >= 0.9
-		(et - st).should < 1.4
+		expect( (et - notices.first[1]) ).to be >= 0.4
+		expect( (et - st) ).to be >= 0.9
+		expect( (et - st) ).to be < 1.4
 	end
 
 	it "yields the result if block is given to exec" do
 		rval = @conn.exec( "select 1234::int as a union select 5678::int as a" ) do |result|
 			values = []
-			result.should be_kind_of( PG::Result )
-			result.ntuples.should == 2
+			expect( result ).to be_kind_of( PG::Result )
+			expect( result.ntuples ).to eq( 2 )
 			result.each do |tuple|
 				values << tuple['a']
 			end
 			values
 		end
 
-		rval.should have( 2 ).members
-		rval.should include( '5678', '1234' )
+		expect( rval.size ).to eq( 2 )
+		expect( rval ).to include( '5678', '1234' )
 	end
 
 	it "can process #copy_data output queries" do
 		rows = []
 		res2 = @conn.copy_data( "COPY (SELECT 1 UNION ALL SELECT 2) TO STDOUT" ) do |res|
-			res.result_status.should == PG::PGRES_COPY_OUT
-			res.nfields.should == 1
+			expect( res.result_status ).to eq( PG::PGRES_COPY_OUT )
+			expect( res.nfields ).to eq( 1 )
 			while row=@conn.get_copy_data
 				rows << row
 			end
 		end
-		rows.should == ["1\n", "2\n"]
-		res2.result_status.should == PG::PGRES_COMMAND_OK
-		verify_clean_exec_status
+		expect( rows ).to eq( ["1\n", "2\n"] )
+		expect( res2.result_status ).to eq( PG::PGRES_COMMAND_OK )
+		@conn.send_query( "VALUES (1)" )
+		expect( @conn.get_last_result.values ).to eq( [["1"]] )
 	end
 
 	it "can handle incomplete #copy_data output queries" do
@@ -500,7 +467,8 @@ describe PG::Connection do
 				@conn.get_copy_data
 			end
 		}.to raise_error(PG::NotAllCopyDataRetrieved, /Not all/)
-		verify_clean_exec_status
+		@conn.send_query( "VALUES (1)" )
+		expect( @conn.get_last_result.values ).to eq( [["1"]] )
 	end
 
 	it "can handle client errors in #copy_data for output" do
@@ -509,7 +477,8 @@ describe PG::Connection do
 				raise "boom"
 			end
 		}.to raise_error(RuntimeError, "boom")
-		verify_clean_exec_status
+		@conn.send_query( "VALUES (1)" )
+		expect( @conn.get_last_result.values ).to eq( [["1"]] )
 	end
 
 	it "can handle server errors in #copy_data for output" do
@@ -523,23 +492,25 @@ describe PG::Connection do
 				end
 			}.to raise_error(PG::Error, /test-error/)
 		end
-		verify_clean_exec_status
+		@conn.send_query( "VALUES (1)" )
+		expect( @conn.get_last_result.values ).to eq( [["1"]] )
 	end
 
 	it "can process #copy_data input queries" do
 		@conn.exec( "CREATE TEMP TABLE copytable (col1 TEXT)" )
 		res2 = @conn.copy_data( "COPY copytable FROM STDOUT" ) do |res|
-			res.result_status.should == PG::PGRES_COPY_IN
-			res.nfields.should == 1
+			expect( res.result_status ).to eq( PG::PGRES_COPY_IN )
+			expect( res.nfields ).to eq( 1 )
 			@conn.put_copy_data "1\n"
 			@conn.put_copy_data "2\n"
 		end
-		res2.result_status.should == PG::PGRES_COMMAND_OK
+		expect( res2.result_status ).to eq( PG::PGRES_COMMAND_OK )
 
-		verify_clean_exec_status
+		@conn.send_query( "VALUES (1)" )
+		expect( @conn.get_last_result.values ).to eq( [["1"]] )
 
 		res = @conn.exec( "SELECT * FROM copytable ORDER BY col1" )
-		res.values.should == [["1"], ["2"]]
+		expect( res.values ).to eq( [["1"], ["2"]] )
 	end
 
 	it "can handle client errors in #copy_data for input" do
@@ -552,7 +523,8 @@ describe PG::Connection do
 				end
 			}.to raise_error(RuntimeError, "boom")
 		end
-		verify_clean_exec_status
+		@conn.send_query( "VALUES (1)" )
+		expect( @conn.get_last_result.values ).to eq( [["1"]] )
 	end
 
 	it "can handle server errors in #copy_data for input" do
@@ -565,7 +537,8 @@ describe PG::Connection do
 				end
 			}.to raise_error(PG::Error, /invalid input syntax for integer/)
 		end
-		verify_clean_exec_status
+		@conn.send_query( "VALUES (1)" )
+		expect( @conn.get_last_result.values ).to eq( [["1"]] )
 	end
 
 	it "should raise an error for non copy statements in #copy_data" do
@@ -573,7 +546,8 @@ describe PG::Connection do
 			@conn.copy_data( "SELECT 1" ){}
 		}.to raise_error(ArgumentError, /no COPY/)
 
-		verify_clean_exec_status
+		@conn.send_query( "VALUES (1)" )
+		expect( @conn.get_last_result.values ).to eq( [["1"]] )
 	end
 
 	it "correctly finishes COPY queries passed to #async_exec" do
@@ -589,8 +563,8 @@ describe PG::Connection do
 			results << data if data
 		end until data.nil?
 
-		results.should have( 2 ).members
-		results.should include( "1\n", "2\n" )
+		expect( results.size ).to eq( 2 )
+		expect( results ).to include( "1\n", "2\n" )
 	end
 
 
@@ -602,10 +576,10 @@ describe PG::Connection do
 		end
 
 		sleep 0.5
-		t.should be_alive()
+		expect( t ).to be_alive()
 		@conn.cancel
 		t.join
-		(Time.now - start).should < 3
+		expect( (Time.now - start) ).to be < 3
 	end
 
 	it "described_class#block should allow a timeout" do
@@ -615,13 +589,12 @@ describe PG::Connection do
 		@conn.block( 0.1 )
 		finish = Time.now
 
-		(finish - start).should be_within( 0.05 ).of( 0.1 )
+		expect( (finish - start) ).to be_within( 0.05 ).of( 0.1 )
 	end
 
 
 	it "can encrypt a string given a password and username" do
-		described_class.encrypt_password("postgres", "postgres").
-			should =~ /\S+/
+		expect( described_class.encrypt_password("postgres", "postgres") ).to match( /\S+/ )
 	end
 
 
@@ -641,15 +614,15 @@ describe PG::Connection do
 
 	it "allows fetching a column of values from a result by column number" do
 		res = @conn.exec( 'VALUES (1,2),(2,3),(3,4)' )
-		res.column_values( 0 ).should == %w[1 2 3]
-		res.column_values( 1 ).should == %w[2 3 4]
+		expect( res.column_values( 0 ) ).to eq( %w[1 2 3] )
+		expect( res.column_values( 1 ) ).to eq( %w[2 3 4] )
 	end
 
 
 	it "allows fetching a column of values from a result by field name" do
 		res = @conn.exec( 'VALUES (1,2),(2,3),(3,4)' )
-		res.field_values( 'column1' ).should == %w[1 2 3]
-		res.field_values( 'column2' ).should == %w[2 3 4]
+		expect( res.field_values( 'column1' ) ).to eq( %w[1 2 3] )
+		expect( res.field_values( 'column2' ) ).to eq( %w[2 3 4] )
 	end
 
 
@@ -680,13 +653,13 @@ describe PG::Connection do
 	it "can connect asynchronously", :socket_io do
 		serv = TCPServer.new( '127.0.0.1', 54320 )
 		conn = described_class.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
-		[PG::PGRES_POLLING_WRITING, PG::CONNECTION_OK].should include conn.connect_poll
+		expect( [PG::PGRES_POLLING_WRITING, PG::CONNECTION_OK] ).to include conn.connect_poll
 		select( nil, [conn.socket_io], nil, 0.2 )
 		serv.close
 		if conn.connect_poll == PG::PGRES_POLLING_READING
 			select( [conn.socket_io], nil, nil, 0.2 )
 		end
-		conn.connect_poll.should == PG::PGRES_POLLING_FAILED
+		expect( conn.connect_poll ).to eq( PG::PGRES_POLLING_FAILED )
 	end
 
 	it "discards previous results (if any) before waiting on an #async_exec"
@@ -696,7 +669,7 @@ describe PG::Connection do
 		@conn.async_exec( "select 47 as one" ) do |pg_res|
 			result = pg_res[0]
 		end
-		result.should == { 'one' => '47' }
+		expect( result ).to eq( { 'one' => '47' } )
 	end
 
 	it "raises a rescue-able error if #finish is called twice", :without_transaction do
@@ -710,7 +683,7 @@ describe PG::Connection do
 		conn = PG.connect( @conninfo )
 		io = conn.socket_io
 		conn.finish
-		io.should be_closed()
+		expect( io ).to be_closed()
 		expect { conn.socket_io }.to raise_error( PG::ConnectionBad, /connection is closed/i )
 	end
 
@@ -718,8 +691,8 @@ describe PG::Connection do
 		conn = PG.connect( @conninfo )
 		io = conn.socket_io
 		conn.reset
-		io.should be_closed()
-		conn.socket_io.should_not equal( io )
+		expect( io ).to be_closed()
+		expect( conn.socket_io ).to_not equal( io )
 		conn.finish
 	end
 
@@ -742,7 +715,11 @@ describe PG::Connection do
 
 		it "sets the fallback_application_name on new connections" do
 			conn_string = PG::Connection.parse_connect_args( 'dbname=test' )
-			connection_string_should_contain_application_name(conn_string, $0)
+
+			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 a shortened fallback_application_name on new connections" do
@@ -750,7 +727,10 @@ describe PG::Connection do
 			begin
 				$0 = "/this/is/a/very/long/path/with/many/directories/to/our/beloved/ruby"
 				conn_string = PG::Connection.parse_connect_args( 'dbname=test' )
-				connection_string_should_contain_application_name(conn_string, $0)
+				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
@@ -772,9 +752,9 @@ describe PG::Connection do
 			end
 			@conn.exec( 'UNLISTEN knees' )
 
-			event.should == 'knees'
-			pid.should be_a_kind_of( Integer )
-			msg.should == 'skirt and boots'
+			expect( event ).to eq( 'knees' )
+			expect( pid ).to be_a_kind_of( Integer )
+			expect( msg ).to eq( 'skirt and boots' )
 		end
 
 		it "accepts nil as the timeout in #wait_for_notify " do
@@ -791,8 +771,8 @@ describe PG::Connection do
 			end
 			@conn.exec( 'UNLISTEN knees' )
 
-			event.should == 'knees'
-			pid.should be_a_kind_of( Integer )
+			expect( event ).to eq( 'knees' )
+			expect( pid ).to be_a_kind_of( Integer )
 		end
 
 		it "sends nil as the payload if the notification wasn't given one" do
@@ -809,7 +789,7 @@ describe PG::Connection do
 			end
 			@conn.exec( 'UNLISTEN knees' )
 
-			payload.should be_nil()
+			expect( payload ).to be_nil()
 		end
 
 		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
@@ -828,9 +808,9 @@ describe PG::Connection do
 			end
 			@conn.exec( 'UNLISTEN knees' )
 
-			event.should == 'knees'
-			pid.should be_a_kind_of( Integer )
-			msg.should be_nil()
+			expect( event ).to eq( 'knees' )
+			expect( pid ).to be_a_kind_of( Integer )
+			expect( msg ).to be_nil()
 		end
 
 		it "calls the block supplied to wait_for_notify with the notify payload if it " +
@@ -849,7 +829,7 @@ describe PG::Connection do
 			end
 			@conn.exec( 'UNLISTEN knees' )
 
-			notification_received.should be_true()
+			expect( notification_received ).to be_truthy()
 		end
 
 		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
@@ -868,9 +848,9 @@ describe PG::Connection do
 			end
 			@conn.exec( 'UNLISTEN knees' )
 
-			event.should == 'knees'
-			pid.should be_a_kind_of( Integer )
-			msg.should == 'skirt and boots'
+			expect( event ).to eq( 'knees' )
+			expect( pid ).to be_a_kind_of( Integer )
+			expect( msg ).to eq( 'skirt and boots' )
 		end
 
 	end
@@ -879,12 +859,12 @@ describe PG::Connection do
 
 		it "pings successfully with connection string" do
 			ping = described_class.ping(@conninfo)
-			ping.should == PG::PQPING_OK
+			expect( ping ).to eq( PG::PQPING_OK )
 		end
 
 		it "pings using 7 arguments converted to strings" do
 			ping = described_class.ping('localhost', @port, nil, nil, :test, nil, nil)
-			ping.should == PG::PQPING_OK
+			expect( ping ).to eq( PG::PQPING_OK )
 		end
 
 		it "pings using a hash of connection parameters" do
@@ -892,7 +872,7 @@ describe PG::Connection do
 				:host => 'localhost',
 				:port => @port,
 				:dbname => :test)
-			ping.should == PG::PQPING_OK
+			expect( ping ).to eq( PG::PQPING_OK )
 		end
 
 		it "returns correct response when ping connection cannot be established" do
@@ -900,12 +880,12 @@ describe PG::Connection do
 				:host => 'localhost',
 				:port => 9999,
 				:dbname => :test)
-			ping.should == PG::PQPING_NO_RESPONSE
+			expect( ping ).to eq( PG::PQPING_NO_RESPONSE )
 		end
 
 		it "returns correct response when ping connection arguments are wrong" do
 			ping = described_class.ping('localhost', 'localhost', nil, nil, :test, nil, nil)
-			ping.should == PG::PQPING_NO_ATTEMPT
+			expect( ping ).to eq( PG::PQPING_NO_ATTEMPT )
 		end
 
 
@@ -930,15 +910,15 @@ describe PG::Connection do
 					res = @conn.get_result or break
 					results << res
 				end
-				results.length.should == 11
+				expect( results.length ).to eq( 11 )
 				results[0..-2].each do |res|
-					res.result_status.should == PG::PGRES_SINGLE_TUPLE
+					expect( res.result_status ).to eq( PG::PGRES_SINGLE_TUPLE )
 					values = res.field_values('generate_series')
-					values.length.should == 1
-					values.first.to_i.should > 0
+					expect( values.length ).to eq( 1 )
+					expect( values.first.to_i ).to be > 0
 				end
-				results.last.result_status.should == PG::PGRES_TUPLES_OK
-				results.last.ntuples.should == 0
+				expect( results.last.result_status ).to eq( PG::PGRES_TUPLES_OK )
+				expect( results.last.ntuples ).to eq( 0 )
 			end
 
 			it "should receive rows before entire query is finished" do
@@ -952,8 +932,8 @@ describe PG::Connection do
 					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
+				expect( (Time.now - start_time) ).to be >= 1.0
+				expect( (first_row_time - start_time) ).to be < 1.0
 			end
 
 			it "should receive rows before entire query fails" do
@@ -969,8 +949,8 @@ describe PG::Connection do
 						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
+				expect( first_result.kind_of?(PG::Result) ).to be_truthy
+				expect( first_result.result_status ).to eq( PG::PGRES_SINGLE_TUPLE )
 			end
 		end
 	end
@@ -985,8 +965,8 @@ describe PG::Connection do
 					res = conn.exec("VALUES ('fantasia')", [], 0)
 					out_string = res[0]['column1']
 				end
-				out_string.should == 'fantasia'
-				out_string.encoding.should == Encoding::ISO8859_1
+				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
@@ -996,8 +976,8 @@ describe PG::Connection do
 					res = conn.exec("VALUES ('世界線航跡蔵')", [], 0)
 					out_string = res[0]['column1']
 				end
-				out_string.should == '世界線航跡蔵'
-				out_string.encoding.should == Encoding::UTF_8
+				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
@@ -1008,8 +988,8 @@ describe PG::Connection do
 					res = conn.exec(stmt, [], 0)
 					out_string = res[0]['column1']
 				end
-				out_string.should == '世界線航跡蔵'.encode('EUC-JP')
-				out_string.encoding.should == Encoding::EUC_JP
+				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 " +
@@ -1022,75 +1002,61 @@ describe PG::Connection do
 					conn.internal_encoding = 'utf-8'
 					out_string = res[0]['column1']
 				end
-				out_string.should == '世界線航跡蔵'.encode('EUC-JP')
-				out_string.encoding.should == Encoding::EUC_JP
+				expect( out_string ).to eq( '世界線航跡蔵'.encode('EUC-JP') )
+				expect( out_string.encoding ).to eq( Encoding::EUC_JP )
 			end
 
 			it "the connection should return ASCII-8BIT when it's set to SQL_ASCII" do
 				@conn.exec "SET client_encoding TO SQL_ASCII"
-				@conn.internal_encoding.should == Encoding::ASCII_8BIT
-			end
-
-			it "works around the unsupported JOHAB encoding by returning stuff in 'ASCII_8BIT'" do
-				pending "figuring out how to create a string in the JOHAB encoding" do
-					out_string = nil
-					@conn.transaction do |conn|
-						conn.exec( "set client_encoding = 'JOHAB';" )
-						stmt = "VALUES ('foo')".encode('JOHAB')
-						res = conn.exec( stmt, [], 0 )
-						out_string = res[0]['column1']
-					end
-					out_string.should == 'foo'.encode( Encoding::ASCII_8BIT )
-					out_string.encoding.should == Encoding::ASCII_8BIT
-				end
+				expect( @conn.internal_encoding ).to eq( Encoding::ASCII_8BIT )
 			end
 
 			it "uses the client encoding for escaped string" do
 				original = "string to\0 escape".force_encoding( "iso8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape( original )
-				escaped.encoding.should == Encoding::EUC_JP
-				escaped.should == "string to"
+				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
+				expect( escaped ).to eq( "string to" )
 			end
 
 			it "uses the client encoding for escaped literal", :postgresql_90 do
 				original = "string to\0 escape".force_encoding( "iso8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape_literal( original )
-				escaped.encoding.should == Encoding::EUC_JP
-				escaped.should == "'string to'"
+				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
+				expect( escaped ).to eq( "'string to'" )
 			end
 
 			it "uses the client encoding for escaped identifier", :postgresql_90 do
 				original = "string to\0 escape".force_encoding( "iso8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape_identifier( original )
-				escaped.encoding.should == Encoding::EUC_JP
-				escaped.should == "\"string to\""
+				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
+				expect( escaped ).to eq( "\"string to\"" )
 			end
 
 			it "uses the client encoding for quote_ident" do
 				original = "string to\0 escape".force_encoding( "iso8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.quote_ident( original )
-				escaped.encoding.should == Encoding::EUC_JP
-				escaped.should == "\"string to\""
+				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
+				expect( escaped ).to eq( "\"string to\"" )
 			end
 
 			it "uses the previous string encoding for escaped string" do
 				original = "string to\0 escape".force_encoding( "iso8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = described_class.escape( original )
-				escaped.encoding.should == Encoding::ISO8859_1
-				escaped.should == "string to"
+				expect( escaped.encoding ).to eq( Encoding::ISO8859_1 )
+				expect( escaped ).to eq( "string to" )
 			end
 
 			it "uses the previous string encoding for quote_ident" do
 				original = "string to\0 escape".force_encoding( "iso8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = described_class.quote_ident( original )
-				escaped.encoding.should == Encoding::ISO8859_1
-				escaped.should == "\"string to\""
+				expect( escaped.encoding ).to eq( Encoding::ISO8859_1 )
+				expect( escaped ).to eq( "\"string to\"" )
 			end
 
 		end
@@ -1110,9 +1076,9 @@ describe PG::Connection do
 					Encoding.default_internal = Encoding::UTF_8
 
 					conn = PG.connect( @conninfo )
-					conn.internal_encoding.should == Encoding::UTF_8
+					expect( conn.internal_encoding ).to eq( Encoding::UTF_8 )
 					res = conn.exec( "SELECT foo FROM defaultinternaltest" )
-					res[0]['foo'].encoding.should == Encoding::UTF_8
+					expect( res[0]['foo'].encoding ).to eq( Encoding::UTF_8 )
 				ensure
 					conn.finish if conn
 					Encoding.default_internal = prev_encoding
@@ -1126,7 +1092,7 @@ describe PG::Connection do
 
 					@conn.set_default_encoding
 
-					@conn.internal_encoding.should == Encoding::KOI8_R
+					expect( @conn.internal_encoding ).to eq( Encoding::KOI8_R )
 				ensure
 					Encoding.default_internal = prev_encoding
 				end
@@ -1147,7 +1113,7 @@ describe PG::Connection do
 					query = "INSERT INTO foo VALUES ('Côte d'Ivoire')".encode( 'iso-8859-15' )
 					conn.exec( query )
 				rescue => err
-					err.message.encoding.should == Encoding::ISO8859_15
+					expect( err.message.encoding ).to eq( Encoding::ISO8859_15 )
 				else
 					fail "No exception raised?!"
 				end
@@ -1174,10 +1140,10 @@ describe PG::Connection do
 					@conn.exec "do $$ BEGIN RAISE NOTICE '世界線航跡蔵'; END; $$ LANGUAGE plpgsql;"
 				end
 
-				notices.length.should == 3
+				expect( notices.length ).to eq( 3 )
 				notices.each do |notice|
-					notice.should =~ /^NOTICE:.*世界線航跡蔵/
-					notice.encoding.should == Encoding::UTF_8
+					expect( notice ).to match( /^NOTICE:.*世界線航跡蔵/ )
+					expect( notice.encoding ).to eq( Encoding::UTF_8 )
 				end
 				@conn.set_notice_receiver
 				@conn.set_notice_processor
@@ -1195,10 +1161,10 @@ describe PG::Connection do
 			end
 			@conn.exec( 'UNLISTEN "Möhre"' )
 
-			event.should == "Möhre"
-			event.encoding.should == Encoding::UTF_8
-			msg.should == '世界線航跡蔵'
-			msg.encoding.should == Encoding::UTF_8
+			expect( event ).to eq( "Möhre" )
+			expect( event.encoding ).to eq( Encoding::UTF_8 )
+			expect( msg ).to eq( '世界線航跡蔵' )
+			expect( msg.encoding ).to eq( Encoding::UTF_8 )
 		end
 
 		it "returns properly encoded text from notifies", :postgresql_90 do
@@ -1209,11 +1175,11 @@ describe PG::Connection do
 			@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
+			expect( notification[:relname] ).to eq( "Möhre" )
+			expect( notification[:relname].encoding ).to eq( Encoding::UTF_8 )
+			expect( notification[:extra] ).to eq( '世界線航跡蔵' )
+			expect( notification[:extra].encoding ).to eq( Encoding::UTF_8 )
+			expect( notification[:be_pid] ).to be > 0
 		end
 	end
 
@@ -1224,7 +1190,7 @@ describe PG::Connection do
 			end
 
 			sleep 0.5
-			t.should be_alive()
+			expect( t ).to be_alive()
 			t.join
 		end
 
@@ -1238,7 +1204,7 @@ describe PG::Connection do
 			end
 
 			sleep 0.5
-			t.should be_alive()
+			expect( t ).to be_alive()
 			serv.close
 			t.join
 		end