pg 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c640c9fcec2200f5de6f54e4966312d71998eeda8df38e4b103318871b0332e
-  data.tar.gz: 5d298acf56930ebbbb96908bd69d34bcc2c59eb9b0567436d2c6b8793b6153d8
+  metadata.gz: 0bbf07a6db2bae71c6f6eee0b440f27f84ae21de66dbd97536499425cdbc9b54
+  data.tar.gz: 8860905a7fdb97cd007530b831ee8bf39f06c2c79d52361c7a825f897374830f
 SHA512:
-  metadata.gz: aa78484afbafd0533fdc2fca192c946c5914ffd30a748c11d4a0dc8401b6dbeb925bebcd3ed7fb78c85f578341dc86dc652975ac28e91fa458034d205a928b4f
-  data.tar.gz: 3ad1e7faf70460a1324adb3ca0e6cd11371870f57dd4a5d996fdb9cbba1db2800fa409acacadd39024d38e6e2983e455d2432db90ac2f28f3dd684d3b7984e66
+  metadata.gz: 5a304ec0488a34e03f257769d710dfd1b4e7261023c88bf91945f0c7af99178885c32ba920931dda01776dbc2a613de66d8cf86ee10d57c231ae44fba2544acf
+  data.tar.gz: 88aaaedfd420a601836c3c924b9e6c6e97770f9d16de62c6121c8420967ef43501c2988d8006e9d3261388af570590cadf27a806c72ca574796d76be013e4831

data/History.rdoc

@@ -1,3 +1,19 @@
+== v1.2.3 [2020-03-18] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Fix possible segfault at `PG::Coder#encode`, `decode` or their implicit calls through
+  a typemap after GC.compact. #327
+- Fix possible segfault in `PG::TypeMapByClass` after GC.compact. #328
+
+
+== v1.2.2 [2020-01-06] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Add a binary gem for Ruby 2.7.
+
+
 == v1.2.1 [2020-01-02] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/README.rdoc

@@ -39,7 +39,7 @@ A small example usage:
 * Ruby 2.2 or newer
 * PostgreSQL 9.2.x or later (with headers, -dev packages, etc).
 
-It usually work with earlier versions of Ruby/PostgreSQL as well, but those are
+It usually works with earlier versions of Ruby/PostgreSQL as well, but those are
 not regularly tested.
 
 

data/Rakefile

@@ -35,6 +35,8 @@ TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
 
 CLOBBER.include( TEST_DIRECTORY.to_s )
 CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
+CLEAN.include "lib/*/libpq.dll"
+CLEAN.include "lib/pg_ext.*"
 
 # Set up Hoe plugins
 Hoe.plugin :mercurial
@@ -61,7 +63,7 @@ $hoespec = Hoe.spec 'pg' do
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
 	self.dependency 'rake-compiler', '~> 1.0', :developer
-	self.dependency 'rake-compiler-dock', ['~> 0.7.0'], :developer
+	self.dependency 'rake-compiler-dock', ['~> 1.0'], :developer
 	self.dependency 'hoe-deveiate', '~> 0.9', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
 	self.dependency 'rspec', '~> 3.5', :developer
@@ -113,7 +115,7 @@ Rake::ExtensionTask.new do |ext|
 	ext.lib_dir        = 'lib'
 	ext.source_pattern = "*.{c,h}"
 	ext.cross_compile  = true
-	ext.cross_platform = CrossLibraries.map &:for_platform
+	ext.cross_platform = CrossLibraries.map(&:for_platform)
 
 	ext.cross_config_options += CrossLibraries.map do |lib|
 		{
@@ -129,7 +131,7 @@ Rake::ExtensionTask.new do |ext|
 
 	# Add libpq.dll to windows binary gemspec
 	ext.cross_compiling do |spec|
-		spec.files << "lib/libpq.dll"
+		spec.files << "lib/#{spec.platform}/libpq.dll"
 	end
 end
 

data/Rakefile.cross

@@ -37,7 +37,7 @@ class CrossLibrary < OpenStruct
 		begin
 			FileUtils.rm_f '.test_symlink'
 			FileUtils.ln_s '/', '.test_symlink'
-		rescue SystemCallError
+		rescue NotImplementedError, SystemCallError
 			# Symlinks don't work -> use home directory instead
 			self.compile_home               = Pathname( "~/.ruby-pg-build" ).expand_path
 		else
@@ -45,6 +45,8 @@ class CrossLibrary < OpenStruct
 		end
 		self.static_sourcesdir          = compile_home + 'sources'
 		self.static_builddir            = compile_home + 'builds' + for_platform
+		CLOBBER.include( static_sourcesdir )
+		CLEAN.include( static_builddir )
 
 		# Static OpenSSL build vars
 		self.static_openssl_builddir    = static_builddir + "openssl-#{openssl_version}"
@@ -81,17 +83,6 @@ class CrossLibrary < OpenStruct
 		# clean intermediate files and folders
 		CLEAN.include( static_builddir.to_s )
 
-
-		def download(url, save_to)
-			part = save_to+".part"
-			sh "wget #{url.to_s.inspect} -O #{part.inspect} || curl #{url.to_s.inspect} -o #{part.inspect}"
-			FileUtils.mv part, save_to
-		end
-
-		def run(*args)
-			sh *args
-		end
-
 		#####################################################################
 		### C R O S S - C O M P I L A T I O N - T A S K S
 		#####################################################################
@@ -141,9 +132,9 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static openssl libraries"
-		task :openssl_libs => [ libssl, libcrypto ]
+		task "openssl_libs:#{for_platform}" => [ libssl, libcrypto ]
 
-		task :compile_static_openssl => openssl_makefile do |t|
+		task "compile_static_openssl:#{for_platform}" => openssl_makefile do |t|
 			chdir( static_openssl_builddir ) do
 				cmd = cmd_prelude.dup
 				cmd << 'make' << "-j#{NUM_CPUS}" << 'build_libs'
@@ -153,12 +144,12 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static #{libssl}"
-		file libssl => :compile_static_openssl do |t|
+		file libssl => "compile_static_openssl:#{for_platform}" do |t|
 			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
 		desc "compile static #{libcrypto}"
-		file libcrypto => :compile_static_openssl do |t|
+		file libcrypto => "compile_static_openssl:#{for_platform}" do |t|
 			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
@@ -189,7 +180,7 @@ class CrossLibrary < OpenStruct
 		end
 
 		# generate the makefile in a clean build location
-		file postgresql_global_makefile => [ static_postgresql_builddir, :openssl_libs ] do |t|
+		file postgresql_global_makefile => [ static_postgresql_builddir, "openssl_libs:#{for_platform}" ] do |t|
 			options = [
 				"--target=#{host_platform}",
 				"--host=#{host_platform}",
@@ -231,10 +222,10 @@ class CrossLibrary < OpenStruct
 
 
 		#desc 'compile libpg.a'
-		task :libpq => postgresql_lib
+		task "native:#{for_platform}" => postgresql_lib
 
 		# copy libpq.dll to lib dir
-		dest_libpq = "lib/#{postgresql_lib.basename}"
+		dest_libpq = "lib/#{for_platform}/#{postgresql_lib.basename}"
 		directory File.dirname(dest_libpq)
 		file dest_libpq => [postgresql_lib, File.dirname(dest_libpq)] do
 			cp postgresql_lib, dest_libpq
@@ -246,22 +237,27 @@ class CrossLibrary < OpenStruct
 			cp postgresql_lib, stage_libpq
 		end
 	end
-end
 
-if File.exist?(File.expand_path("~/.rake-compiler/config.yml"))
-	CrossLibraries = [
-		['i386-mingw32', 'mingw', 'i686-w64-mingw32'],
-		['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
-	].map do |platform, openssl_config, toolchain|
-		CrossLibrary.new platform, openssl_config, toolchain
+	def download(url, save_to)
+		part = save_to+".part"
+		sh "wget #{url.to_s.inspect} -O #{part.inspect} || curl #{url.to_s.inspect} -o #{part.inspect}"
+		FileUtils.mv part, save_to
 	end
-else
-	$stderr.puts "Cross-compilation disabled -- rake-compiler not properly installed"
-	CrossLibraries = []
+
+	def run(*args)
+		sh(*args)
+	end
+end
+
+CrossLibraries = [
+	['x86-mingw32', 'mingw', 'i686-w64-mingw32'],
+	['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
+].map do |platform, openssl_config, toolchain|
+	CrossLibrary.new platform, openssl_config, toolchain
 end
 
 desc 'cross compile pg for win32'
-task :cross => [ :mingw32, :libpq ]
+task :cross => [ :mingw32 ]
 
 task :mingw32 do
 	# Use Rake::ExtensionCompiler helpers to find the proper host
@@ -272,30 +268,32 @@ task :mingw32 do
 	end
 end
 
-# To reduce the gem file size strip mingw32 dlls before packaging
-ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
-  task "tmp/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so" do |t|
-    sh "i686-w64-mingw32-strip -S tmp/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
-  end
-
-  task "tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so" do |t|
-    sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
-  end
+task 'gem:windows:prepare' do
+	require 'io/console'
+	require 'rake_compiler_dock'
+
+	# Copy gem signing key and certs to be accessable from the docker container
+	mkdir_p 'build/gem'
+	sh "cp ~/.gem/gem-*.pem build/gem/ || true"
+	sh "bundle package"
+	begin
+		OpenSSL::PKey.read(File.read(File.expand_path("~/.gem/gem-private_key.pem")), ENV["GEM_PRIVATE_KEY_PASSPHRASE"] || "")
+	rescue OpenSSL::PKey::PKeyError
+		ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = STDIN.getpass("Enter passphrase of gem signature key: ")
+		retry
+	end
 end
 
-desc "Build the windows binary gems"
-task 'gem:windows' => ['ChangeLog'] do
-  require 'rake_compiler_dock'
-
-  # Copy gem signing key and certs to be accessable from the docker container
-  mkdir_p 'build/gem'
-  sh "cp ~/.gem/gem-*.pem build/gem/ || true"
-  sh "bundle package"
-
-  RakeCompilerDock.sh <<-EOT
-    mkdir ~/.gem &&
-    (cp build/gem/gem-*.pem ~/.gem/ || true) &&
-    bundle install --local &&
-    rake cross native gem MAKE="make -j`nproc`"
-  EOT
+CrossLibraries.each do |xlib|
+	platform = xlib.for_platform
+	desc "Build fat binary gem for platform #{platform}"
+	task "gem:windows:#{platform}" => ['ChangeLog', 'gem:windows:prepare', xlib.openssl_tarball, xlib.postgresql_tarball] do
+		RakeCompilerDock.sh <<-EOT, platform: platform
+			(cp build/gem/gem-*.pem ~/.gem/ || true) &&
+			bundle install --local &&
+			rake native:#{platform} pkg/#{$hoespec.spec.full_name}-#{platform}.gem MAKE="make -j`nproc`"
+		EOT
+	end
+	desc "Build the windows binary gems"
+	multitask 'gem:windows' => "gem:windows:#{platform}"
 end

data/ext/pg.h

@@ -304,6 +304,7 @@ VALUE pg_obj_to_i                                      _(( VALUE ));
 VALUE pg_tmbc_allocate                                 _(( void ));
 void pg_coder_init_encoder                             _(( VALUE ));
 void pg_coder_init_decoder                             _(( VALUE ));
+void pg_coder_mark                                     _(( t_pg_coder * ));
 char *pg_rb_str_ensure_capa                            _(( VALUE, long, char *, char ** ));
 
 #define PG_RB_STR_ENSURE_CAPA( str, expand_len, curr_ptr, end_ptr ) \

data/ext/pg_coder.c

@@ -61,11 +61,23 @@ pg_coder_init_decoder( VALUE self )
 	rb_iv_set( self, "@name", Qnil );
 }
 
+void
+pg_coder_mark(t_pg_coder *this)
+{
+	rb_gc_mark(this->coder_obj);
+}
+
+static void
+pg_composite_coder_mark(t_pg_composite_coder *this)
+{
+	pg_coder_mark(&this->comp);
+}
+
 static VALUE
 pg_simple_encoder_allocate( VALUE klass )
 {
 	t_pg_coder *this;
-	VALUE self = Data_Make_Struct( klass, t_pg_coder, NULL, -1, this );
+	VALUE self = Data_Make_Struct( klass, t_pg_coder, pg_coder_mark, -1, this );
 	pg_coder_init_encoder( self );
 	return self;
 }
@@ -74,7 +86,7 @@ static VALUE
 pg_composite_encoder_allocate( VALUE klass )
 {
 	t_pg_composite_coder *this;
-	VALUE self = Data_Make_Struct( klass, t_pg_composite_coder, NULL, -1, this );
+	VALUE self = Data_Make_Struct( klass, t_pg_composite_coder, pg_composite_coder_mark, -1, this );
 	pg_coder_init_encoder( self );
 	this->elem = NULL;
 	this->needs_quotation = 1;
@@ -87,7 +99,7 @@ static VALUE
 pg_simple_decoder_allocate( VALUE klass )
 {
 	t_pg_coder *this;
-	VALUE self = Data_Make_Struct( klass, t_pg_coder, NULL, -1, this );
+	VALUE self = Data_Make_Struct( klass, t_pg_coder, pg_coder_mark, -1, this );
 	pg_coder_init_decoder( self );
 	return self;
 }
@@ -96,7 +108,7 @@ static VALUE
 pg_composite_decoder_allocate( VALUE klass )
 {
 	t_pg_composite_coder *this;
-	VALUE self = Data_Make_Struct( klass, t_pg_composite_coder, NULL, -1, this );
+	VALUE self = Data_Make_Struct( klass, t_pg_composite_coder, pg_composite_coder_mark, -1, this );
 	pg_coder_init_decoder( self );
 	this->elem = NULL;
 	this->needs_quotation = 1;

data/ext/pg_copy_coder.c

@@ -23,6 +23,7 @@ typedef struct {
 static void
 pg_copycoder_mark( t_pg_copycoder *this )
 {
+	pg_coder_mark(&this->comp);
 	rb_gc_mark(this->typemap);
 	rb_gc_mark(this->null_string);
 }

data/ext/pg_record_coder.c

@@ -18,6 +18,7 @@ typedef struct {
 static void
 pg_recordcoder_mark( t_pg_recordcoder *this )
 {
+	pg_coder_mark(&this->comp);
 	rb_gc_mark(this->typemap);
 }
 

data/ext/pg_type_map_by_class.c

@@ -126,7 +126,11 @@ pg_tmbk_mark( t_tmbk *this )
 {
 	rb_gc_mark(this->typemap.default_typemap);
 	rb_gc_mark(this->klass_to_coder);
-	/* All coders are in the Hash, so no need to mark the cache. */
+	rb_gc_mark(this->self);
+	/* Clear the cache, to be safe from changes of klass VALUE by GC.compact.
+	 * TODO: Move cache clearing to compactation callback provided by Ruby-2.7+.
+	 */
+	memset(&this->cache_row, 0, sizeof(this->cache_row));
 }
 
 static VALUE

data/lib/pg.rb

@@ -22,7 +22,8 @@ rescue LoadError
 		end
 
 		# Temporary add this directory for DLL search, so that libpq.dll can be found.
-		add_dll_path.call(__dir__) do
+		# mingw32-platform strings differ (RUBY_PLATFORM=i386-mingw32 vs. x86-mingw32 for rubygems)
+		add_dll_path.call(File.join(__dir__, RUBY_PLATFORM.gsub(/^i386-/, "x86-"))) do
 			require "#{major_minor}/pg_ext"
 		end
 	else
@@ -36,7 +37,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '1.2.1'
+	VERSION = '1.2.3'
 
 	# VCS revision
 	REVISION = %q$Revision: 6f611e78845a $

data/lib/pg/basic_type_mapping.rb

@@ -118,13 +118,13 @@ module PG::BasicTypeRegistry
 	def build_coder_maps(connection)
 		if supports_ranges?(connection)
 			result = connection.exec <<-SQL
-				SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype
+				SELECT t.oid, t.typname::text, t.typelem, t.typdelim, t.typinput::text, r.rngsubtype
 				FROM pg_type as t
 				LEFT JOIN pg_range as r ON oid = rngtypid
 			SQL
 		else
 			result = connection.exec <<-SQL
-				SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput
+				SELECT t.oid, t.typname::text, t.typelem, t.typdelim, t.typinput::text
 				FROM pg_type as t
 			SQL
 		end

data/spec/helpers.rb

@@ -225,7 +225,7 @@ module PG::TestingHelpers
 		rescue => err
 			$stderr.puts "%p during test setup: %s" % [ err.class, err.message ]
 			$stderr.puts "See #{@logfile} for details."
-			$stderr.puts *err.backtrace if $DEBUG
+			$stderr.puts err.backtrace if $DEBUG
 			fail
 		end
 
@@ -370,8 +370,6 @@ RSpec.configure do |config|
 	else
 		config.filter_run_excluding :windows
 	end
-	config.filter_run_excluding :socket_io unless
-		PG::Connection.instance_methods.map( &:to_sym ).include?( :socket_io )
 
 	config.filter_run_excluding( :postgresql_93 ) if PG.library_version <  90300
 	config.filter_run_excluding( :postgresql_94 ) if PG.library_version <  90400

data/spec/pg/basic_type_mapping_spec.rb

@@ -21,14 +21,6 @@ ensure
 	end
 end
 
-def expect_to_typecase_result_value_warning
-	warning = 'Warning: no type cast defined for type "name" with oid 19. '\
-		"Please cast this type explicitly to TEXT to be safe for future changes.\n"\
-		'Warning: no type cast defined for type "regproc" with oid 24. '\
-		"Please cast this type explicitly to TEXT to be safe for future changes.\n"
-	expect { yield }.to output(warning).to_stderr
-end
-
 describe 'Basic type mapping' do
 
 	describe PG::BasicTypeMapForQueries do
@@ -318,9 +310,7 @@ describe 'Basic type mapping' do
 				it "should convert format #{format} timestamps per TimestampUtc" do
 					restore_type("timestamp") do
 						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampUtc
-						expect_to_typecase_result_value_warning do
-							@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
-						end
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
 						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
 																			CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
 																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
@@ -342,9 +332,7 @@ describe 'Basic type mapping' do
 					restore_type("timestamp") do
 						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampUtcToLocal
 						PG::BasicTypeRegistry.register_type 1, 'timestamp', nil, PG::BinaryDecoder::TimestampUtcToLocal
-						expect_to_typecase_result_value_warning do
-							@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
-						end
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
 						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
 																			CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
 																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
@@ -366,9 +354,7 @@ describe 'Basic type mapping' do
 					restore_type("timestamp") do
 						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampLocal
 						PG::BasicTypeRegistry.register_type 1, 'timestamp', nil, PG::BinaryDecoder::TimestampLocal
-						expect_to_typecase_result_value_warning do
-							@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
-						end
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
 						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59' AS TIMESTAMP WITHOUT TIME ZONE),
 																			CAST('1913-12-31 23:58:59.1231' AS TIMESTAMP WITHOUT TIME ZONE),
 																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
@@ -503,7 +489,6 @@ describe 'Basic type mapping' do
 					sql_vals = vals.map{|v| "CAST('#{v}' AS inet)"}
 					res = @conn.exec_params(("SELECT " + sql_vals.join(', ')), [], format )
 					vals.each_with_index do |v, i|
-						val = res.getvalue(0,i)
 						expect( res.getvalue(0,i) ).to eq( IPAddr.new(v) )
 					end
 				end
@@ -527,22 +512,22 @@ describe 'Basic type mapping' do
 					sql_vals = vals.map { |v| "CAST('#{v}' AS cidr)" }
 					res = @conn.exec_params(("SELECT " + sql_vals.join(', ')), [], format )
 					vals.each_with_index do |v, i|
-					  val = res.getvalue(0,i)
+						val = res.getvalue(0,i)
 						ip, prefix = v.split('/', 2)
-					  expect( val.to_s ).to eq( ip )
+						expect( val.to_s ).to eq( ip )
 						if val.respond_to?(:prefix)
 							val_prefix = val.prefix
 						else
-					    default_prefix = (val.family == Socket::AF_INET ? 32 : 128)
+							default_prefix = (val.family == Socket::AF_INET ? 32 : 128)
 							range = val.to_range
 							val_prefix	= default_prefix - Math.log(((range.end.to_i - range.begin.to_i) + 1), 2).to_i
 						end
 						if v.include?('/')
-						  expect( val_prefix ).to eq( prefix.to_i )
+							expect( val_prefix ).to eq( prefix.to_i )
 						elsif v.include?('.')
-						  expect( val_prefix ).to eq( 32 )
-					  else
-						  expect( val_prefix ).to eq( 128 )
+							expect( val_prefix ).to eq( 32 )
+						else
+							expect( val_prefix ).to eq( 128 )
 						end
 					end
 				end

data/spec/pg/connection_spec.rb

@@ -173,7 +173,7 @@ 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 )
 
@@ -182,7 +182,7 @@ describe PG::Connection do
 		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|
@@ -196,7 +196,7 @@ describe PG::Connection do
 		expect( conn ).to be_finished()
 	end
 
-	context "with async established connection", :socket_io do
+	context "with async established connection" do
 		before :each do
 			@conn2 = described_class.connect_start( @conninfo )
 			wait_for_polling_ok(@conn2)
@@ -340,10 +340,10 @@ 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
 
@@ -902,7 +902,7 @@ describe PG::Connection do
 	end
 
 
-	it "handles server close while asynchronous connect", :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
@@ -963,7 +963,7 @@ describe PG::Connection do
 		conn.close
 	end
 
-	it "closes the IO fetched from #socket_io when the connection is closed", :without_transaction, :socket_io do
+	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
@@ -971,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
@@ -1622,6 +1622,7 @@ 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
@@ -1702,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
@@ -1757,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
@@ -1808,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
@@ -1871,34 +1872,71 @@ describe PG::Connection do
 	end
 
 	describe "deprecated forms of methods" do
-		it "should forward exec to exec_params" do
-			res = @conn.exec("VALUES($1::INT)", [7]).values
-			expect(res).to eq( [["7"]] )
-			res = @conn.exec("VALUES($1::INT)", [7], 1).values
-			expect(res).to eq( [[[7].pack("N")]] )
-			res = @conn.exec("VALUES(8)", [], 1).values
-			expect(res).to eq( [[[8].pack("N")]] )
-		end
-
-		it "should forward exec_params to exec" do
-			res = @conn.exec_params("VALUES(3); VALUES(4)").values
-			expect(res).to eq( [["4"]] )
-			res = @conn.exec_params("VALUES(3); VALUES(4)", nil).values
-			expect(res).to eq( [["4"]] )
-			res = @conn.exec_params("VALUES(3); VALUES(4)", nil, nil).values
-			expect(res).to eq( [["4"]] )
-			res = @conn.exec_params("VALUES(3); VALUES(4)", nil, 1).values
-			expect(res).to eq( [["4"]] )
-			res = @conn.exec_params("VALUES(3); VALUES(4)", nil, nil, nil).values
-			expect(res).to eq( [["4"]] )
-			expect{
-				@conn.exec_params("VALUES(3); VALUES(4)", nil, nil, nil, nil).values
-			}.to raise_error(ArgumentError)
-		end
+		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 "should forward send_query to send_query_params" do
-			@conn.send_query("VALUES($1)", [5])
-			expect(@conn.get_last_result.values).to eq( [["5"]] )
+			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

data/spec/pg/result_spec.rb

@@ -300,7 +300,7 @@ describe PG::Result do
 	it "detects division by zero as SQLSTATE 22012" do
 		sqlstate = nil
 		begin
-			res = @conn.exec("SELECT 1/0")
+			@conn.exec("SELECT 1/0")
 		rescue PG::Error => e
 			sqlstate = e.result.result_error_field( PG::PG_DIAG_SQLSTATE ).to_i
 		end

data/spec/pg/type_map_by_class_spec.rb

@@ -132,7 +132,7 @@ describe PG::TypeMapByClass do
 	it "should raise error on invalid coder object" do
 		tm[TrueClass] = "dummy"
 		expect{
-			res = @conn.exec_params( "SELECT $1", [true], 0, tm )
+			@conn.exec_params( "SELECT $1", [true], 0, tm )
 		}.to raise_error(NoMethodError, /undefined method.*call/)
 	end
 end

data/spec/pg/type_map_by_oid_spec.rb

@@ -54,8 +54,8 @@ describe PG::TypeMapByOid do
 	end
 
 	it "should check format when deleting coders" do
-		expect{ tm.rm_coder 2, 123 }.to raise_error(ArgumentError)
-		expect{ tm.rm_coder -1, 123 }.to raise_error(ArgumentError)
+		expect{ tm.rm_coder(2, 123) }.to raise_error(ArgumentError)
+		expect{ tm.rm_coder(-1, 123) }.to raise_error(ArgumentError)
 	end
 
 	it "should check format when adding coders" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Michael Granger
@@ -11,9 +11,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEwMDkwMDM2NTdaFw0yMDEwMDgwMDM2
-  NTdaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  MIID+DCCAmCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEyMjQyMDE5NTFaFw0yMDEyMjMyMDE5
+  NTFaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
   hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
   L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
   M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -22,20 +22,19 @@ cert_chain:
   vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI
   dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
   ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
-  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
-  FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
-  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAFqsr6o0SvQRgjQVmhbQvExRnCMCoW1yb
-  FJiN7A5RA2Iy2E61OG1Ul5nGmaDmx/PNB/6JIbIV3B9Uq8aTZx4uOjK7r8vMl1/t
-  ZfY7r6HejJfXlcO2m6JDMbpdyEVv916LncBkzZRz6vnnNCx+31f15FKddxujpAFd
-  qpn3JRQY+oj7ZkoccL/IUiDpxQWeS3oOoz9qr2kVTp8R50InZimt79FqCl/1m66W
-  kdOuf+wM3DDx7Rt4IVNHrhGlyfMr7xjKW1Q3gll+pMN1DT6Ajx/t3JDSEg7BnnEW
-  r7AciSO6J4ApUdqyG+coLFlGdtgFTgRHv7ihbQtDI7Z/LV7A4Spn1j2PK3j0Omri
-  kSl1hPVigRytfgdVGiLXzvkkrkgj9EknCaj5UHbac7XvVBrljXj9hsnnqTANaKsg
-  jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
-  XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
+  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DANBgkqhkiG
+  9w0BAQsFAAOCAYEAifxlz7x0EfT3fjhM520ZEIrWa+tLMuLKNefkY18u8tZnx4EX
+  Xxwh3tna3fvNfrOrdY5leIj1dbv4FTRg+gIBnIxAySqvpGvI/Axg5EdYbwninCLL
+  LAKCmRo+5QwaPMYN2zdHIjGrp8jg1neCo5zy6tVvyTv0DMI6FLrydVJYduMMDFSy
+  gQKR1rVOcCJtnBnLCF9+kKEUKohAHOmGsE7OBZFnjMIpH5yUDUVJKByv0gIipFt0
+  1T6zff6oVU0w8WBiNKR381+6sF3wIZVnVY0XeJg6hNL+YecE8ILxLhHTmtT/BO0S
+  3xPze9uXDR+iD6HYl8KU5QEg/dXFPhfQb512vVkTJDZvMcwu6PxDUjHFChLjAji/
+  AZXjg1C5E9znTkeUR8ieU9F1MOKoiH57a5lYSTI8Ga8PpsNXTxNeXc16Ob26CqrJ
+  83uuAYSy65yXDGXXPVBeKPVnYrqp91pqpS5Nh7wfuiCrE8lgU8PATh7K4BV1UhAT
+  0MHbAT42wTYkfUj3
   -----END CERTIFICATE-----
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -99,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -317,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/]