pg 1.5.9-x86-mingw32 → 1.6.0.rc1-x86-mingw32

data/lib/pg/connection.rb

@@ -356,21 +356,18 @@ class PG::Connection
 		end
 	end
 
-	# Method 'ssl_attribute' was introduced in PostgreSQL 9.5.
-	if self.instance_methods.find{|m| m.to_sym == :ssl_attribute }
-		# call-seq:
-		#   conn.ssl_attributes -> Hash<String,String>
-		#
-		# Returns SSL-related information about the connection as key/value pairs
-		#
-		# The available attributes varies depending on the SSL library being used,
-		# and the type of connection.
-		#
-		# See also #ssl_attribute
-		def ssl_attributes
-			ssl_attribute_names.each.with_object({}) do |n,h|
-				h[n] = ssl_attribute(n)
-			end
+	# call-seq:
+	#   conn.ssl_attributes -> Hash<String,String>
+	#
+	# Returns SSL-related information about the connection as key/value pairs
+	#
+	# The available attributes varies depending on the SSL library being used,
+	# and the type of connection.
+	#
+	# See also #ssl_attribute
+	def ssl_attributes
+		ssl_attribute_names.each.with_object({}) do |n,h|
+			h[n] = ssl_attribute(n)
 		end
 	end
 
@@ -539,6 +536,25 @@ class PG::Connection
 	end
 	alias async_put_copy_end put_copy_end
 
+	if method_defined? :send_pipeline_sync
+		# call-seq:
+		#    conn.pipeline_sync
+		#
+		# Marks a synchronization point in a pipeline by sending a sync message and flushing the send buffer.
+		# This serves as the delimiter of an implicit transaction and an error recovery point.
+		#
+		# See enter_pipeline_mode
+		#
+		# Raises PG::Error if the connection is not in pipeline mode or sending a sync message failed.
+		#
+		# Available since PostgreSQL-14
+		def pipeline_sync(*args)
+			send_pipeline_sync(*args)
+			flush
+		end
+		alias async_pipeline_sync pipeline_sync
+	end
+
 	if method_defined? :sync_encrypt_password
 		# call-seq:
 		#    conn.encrypt_password( password, username, algorithm=nil ) -> String
@@ -586,128 +602,144 @@ class PG::Connection
 	end
 	alias async_reset reset
 
-	# call-seq:
-	#    conn.cancel() -> String
-	#
-	# Requests cancellation of the command currently being
-	# processed.
-	#
-	# Returns +nil+ on success, or a string containing the
-	# error message if a failure occurs.
-	def cancel
-		be_pid = backend_pid
-		be_key = backend_key
-		cancel_request = [0x10, 1234, 5678, be_pid, be_key].pack("NnnNN")
-
-		if Fiber.respond_to?(:scheduler) && Fiber.scheduler && RUBY_PLATFORM =~ /mingw|mswin/
-			# Ruby's nonblocking IO is not really supported on Windows.
-			# We work around by using threads and explicit calls to wait_readable/wait_writable.
-			cl = Thread.new(socket_io.remote_address) { |ra| ra.connect }.value
-			begin
-				cl.write_nonblock(cancel_request)
-			rescue IO::WaitReadable, Errno::EINTR
-				cl.wait_writable
-				retry
-			end
-			begin
-				cl.read_nonblock(1)
-			rescue IO::WaitReadable, Errno::EINTR
-				cl.wait_readable
-				retry
-			rescue EOFError
-			end
-		elsif RUBY_ENGINE == 'truffleruby'
-			begin
-				cl = socket_io.remote_address.connect
-			rescue NotImplementedError
-				# Workaround for truffleruby < 21.3.0
-				cl2 = Socket.for_fd(socket_io.fileno)
-				cl2.autoclose = false
-				adr = cl2.remote_address
-				if adr.ip?
-					cl = TCPSocket.new(adr.ip_address, adr.ip_port)
-					cl.autoclose = false
-				else
-					cl = UNIXSocket.new(adr.unix_path)
-					cl.autoclose = false
+	if defined?(PG::CancelConnection)
+		# PostgreSQL-17+
+
+		def sync_cancel
+			cancon = PG::CancelConnection.new(self)
+			cancon.sync_cancel
+		rescue PG::Error => err
+			err.to_s
+		end
+
+		# call-seq:
+		#    conn.cancel() -> String
+		#
+		# Requests cancellation of the command currently being
+		# processed.
+		#
+		# Returns +nil+ on success, or a string containing the
+		# error message if a failure occurs.
+		#
+		# On PostgreSQL-17+ client libaray the class PG::CancelConnection is used.
+		# On older client library a pure ruby implementation is used.
+		def cancel
+			cancon = PG::CancelConnection.new(self)
+			cancon.async_connect_timeout = conninfo_hash[:connect_timeout]
+			cancon.async_cancel
+		rescue PG::Error => err
+			err.to_s
+		end
+
+	else
+
+		# PostgreSQL < 17
+
+		def cancel
+			be_pid = backend_pid
+			be_key = backend_key
+			cancel_request = [0x10, 1234, 5678, be_pid, be_key].pack("NnnNN")
+
+			if Fiber.respond_to?(:scheduler) && Fiber.scheduler && RUBY_PLATFORM =~ /mingw|mswin/
+				# Ruby's nonblocking IO is not really supported on Windows.
+				# We work around by using threads and explicit calls to wait_readable/wait_writable.
+				cl = Thread.new(socket_io.remote_address) { |ra| ra.connect }.value
+				begin
+					cl.write_nonblock(cancel_request)
+				rescue IO::WaitReadable, Errno::EINTR
+					cl.wait_writable
+					retry
 				end
+				begin
+					cl.read_nonblock(1)
+				rescue IO::WaitReadable, Errno::EINTR
+					cl.wait_readable
+					retry
+				rescue EOFError
+				end
+			else
+				cl = socket_io.remote_address.connect
+				# Send CANCEL_REQUEST_CODE and parameters
+				cl.write(cancel_request)
+				# Wait for the postmaster to close the connection, which indicates that it's processed the request.
+				cl.read(1)
 			end
-			cl.write(cancel_request)
-			cl.read(1)
-		else
-			cl = socket_io.remote_address.connect
-			# Send CANCEL_REQUEST_CODE and parameters
-			cl.write(cancel_request)
-			# Wait for the postmaster to close the connection, which indicates that it's processed the request.
-			cl.read(1)
-		end
 
-		cl.close
-		nil
-	rescue SystemCallError => err
-		err.to_s
+			cl.close
+			nil
+		rescue SystemCallError => err
+			err.to_s
+		end
 	end
 	alias async_cancel cancel
 
-	private def async_connect_or_reset(poll_meth)
+	module Pollable
 		# Track the progress of the connection, waiting for the socket to become readable/writable before polling it
+		private def polling_loop(poll_meth, connect_timeout)
+			if (timeo = connect_timeout.to_i) && timeo > 0
+				host_count = conninfo_hash[:host].to_s.count(",") + 1
+				stop_time = timeo * host_count + Process.clock_gettime(Process::CLOCK_MONOTONIC)
+			end
 
-		if (timeo = conninfo_hash[:connect_timeout].to_i) && timeo > 0
-			host_count = conninfo_hash[:host].to_s.count(",") + 1
-			stop_time = timeo * host_count + Process.clock_gettime(Process::CLOCK_MONOTONIC)
-		end
-
-		poll_status = PG::PGRES_POLLING_WRITING
-		until poll_status == PG::PGRES_POLLING_OK ||
-				poll_status == PG::PGRES_POLLING_FAILED
-
-			# Set single timeout to parameter "connect_timeout" but
-			# don't exceed total connection time of number-of-hosts * connect_timeout.
-			timeout = [timeo, stop_time - Process.clock_gettime(Process::CLOCK_MONOTONIC)].min if stop_time
-			event = if !timeout || timeout >= 0
-				# If the socket needs to read, wait 'til it becomes readable to poll again
-				case poll_status
-				when PG::PGRES_POLLING_READING
-					if defined?(IO::READABLE) # ruby-3.0+
-						socket_io.wait(IO::READABLE | IO::PRIORITY, timeout)
-					else
-						IO.select([socket_io], nil, [socket_io], timeout)
+			poll_status = PG::PGRES_POLLING_WRITING
+			until poll_status == PG::PGRES_POLLING_OK ||
+					poll_status == PG::PGRES_POLLING_FAILED
+
+				# Set single timeout to parameter "connect_timeout" but
+				# don't exceed total connection time of number-of-hosts * connect_timeout.
+				timeout = [timeo, stop_time - Process.clock_gettime(Process::CLOCK_MONOTONIC)].min if stop_time
+				event = if !timeout || timeout >= 0
+					# If the socket needs to read, wait 'til it becomes readable to poll again
+					case poll_status
+					when PG::PGRES_POLLING_READING
+						if defined?(IO::READABLE) # ruby-3.0+
+							socket_io.wait(IO::READABLE | IO::PRIORITY, timeout)
+						else
+							IO.select([socket_io], nil, [socket_io], timeout)
+						end
+
+					# ...and the same for when the socket needs to write
+					when PG::PGRES_POLLING_WRITING
+						if defined?(IO::WRITABLE) # ruby-3.0+
+							# Use wait instead of wait_readable, since connection errors are delivered as
+							# exceptional/priority events on Windows.
+							socket_io.wait(IO::WRITABLE | IO::PRIORITY, timeout)
+						else
+							# io#wait on ruby-2.x doesn't wait for priority, so fallback to IO.select
+							IO.select(nil, [socket_io], [socket_io], timeout)
+						end
 					end
-
-				# ...and the same for when the socket needs to write
-				when PG::PGRES_POLLING_WRITING
-					if defined?(IO::WRITABLE) # ruby-3.0+
-						# Use wait instead of wait_readable, since connection errors are delivered as
-						# exceptional/priority events on Windows.
-						socket_io.wait(IO::WRITABLE | IO::PRIORITY, timeout)
+				end
+				# connection to server at "localhost" (127.0.0.1), port 5433 failed: timeout expired (PG::ConnectionBad)
+				# connection to server on socket "/var/run/postgresql/.s.PGSQL.5433" failed: No such file or directory
+				unless event
+					if self.class.send(:host_is_named_pipe?, host)
+						connhost = "on socket \"#{host}\""
+					elsif respond_to?(:hostaddr)
+						connhost = "at \"#{host}\" (#{hostaddr}), port #{port}"
 					else
-						# io#wait on ruby-2.x doesn't wait for priority, so fallback to IO.select
-						IO.select(nil, [socket_io], [socket_io], timeout)
+						connhost = "at \"#{host}\", port #{port}"
 					end
+					raise PG::ConnectionBad.new("connection to server #{connhost} failed: timeout expired", connection: self)
 				end
-			end
-			# connection to server at "localhost" (127.0.0.1), port 5433 failed: timeout expired (PG::ConnectionBad)
-			# connection to server on socket "/var/run/postgresql/.s.PGSQL.5433" failed: No such file or directory
-			unless event
-				if self.class.send(:host_is_named_pipe?, host)
-					connhost = "on socket \"#{host}\""
-				elsif respond_to?(:hostaddr)
-					connhost = "at \"#{host}\" (#{hostaddr}), port #{port}"
-				else
-					connhost = "at \"#{host}\", port #{port}"
-				end
-				raise PG::ConnectionBad.new("connection to server #{connhost} failed: timeout expired", connection: self)
+
+				# Check to see if it's finished or failed yet
+				poll_status = send( poll_meth )
 			end
 
-			# Check to see if it's finished or failed yet
-			poll_status = send( poll_meth )
+			unless status == PG::CONNECTION_OK
+				msg = error_message
+				finish
+				raise PG::ConnectionBad.new(msg, connection: self)
+			end
 		end
+	end
 
-		unless status == PG::CONNECTION_OK
-			msg = error_message
-			finish
-			raise PG::ConnectionBad.new(msg, connection: self)
-		end
+	include Pollable
+
+	private def async_connect_or_reset(poll_meth)
+		# Track the progress of the connection, waiting for the socket to become readable/writable before polling it
+		polling_loop(poll_meth, conninfo_hash[:connect_timeout])
 
 		# Set connection to nonblocking to handle all blocking states in ruby.
 		# That way a fiber scheduler is able to handle IO requests.
@@ -825,6 +857,14 @@ class PG::Connection
 			iopts = PG::Connection.conninfo_parse(option_string).each_with_object({}){|h, o| o[h[:keyword].to_sym] = h[:val] if h[:val] }
 			iopts = PG::Connection.conndefaults.each_with_object({}){|h, o| o[h[:keyword].to_sym] = h[:val] if h[:val] }.merge(iopts)
 
+			if PG::BUNDLED_LIBPQ_WITH_UNIXSOCKET && iopts[:host].to_s.empty?
+				# Many distors patch the hardcoded default UnixSocket path in libpq to /var/run/postgresql instead of /tmp .
+				# We simply try them all.
+				iopts[:host] = "/var/run/postgresql" + # Ubuntu, Debian, Fedora, Opensuse
+					",/run/postgresql" + # Alpine, Archlinux, Gentoo
+					",/tmp" # Stock PostgreSQL
+			end
+
 			iopts_for_reset = iopts
 			if iopts[:hostaddr]
 				# hostaddr is provided -> no need to resolve hostnames
@@ -897,14 +937,29 @@ class PG::Connection
 		private_constant :REDIRECT_CLASS_METHODS
 
 		# These methods are affected by PQsetnonblocking
-		REDIRECT_SEND_METHODS = PG.make_shareable({
+		REDIRECT_SEND_METHODS = {
 			:isnonblocking => [:async_isnonblocking, :sync_isnonblocking],
 			:nonblocking? => [:async_isnonblocking, :sync_isnonblocking],
 			:put_copy_data => [:async_put_copy_data, :sync_put_copy_data],
 			:put_copy_end => [:async_put_copy_end, :sync_put_copy_end],
 			:flush => [:async_flush, :sync_flush],
-		})
+		}
 		private_constant :REDIRECT_SEND_METHODS
+		if PG::Connection.instance_methods.include? :sync_pipeline_sync
+			if PG::Connection.instance_methods.include? :send_pipeline_sync
+				# PostgreSQL-17+
+				REDIRECT_SEND_METHODS.merge!({
+					:pipeline_sync => [:async_pipeline_sync, :sync_pipeline_sync],
+				})
+			else
+				# PostgreSQL-14+
+				REDIRECT_SEND_METHODS.merge!({
+					:pipeline_sync => [:sync_pipeline_sync, :sync_pipeline_sync],
+				})
+			end
+		end
+		PG.make_shareable(REDIRECT_SEND_METHODS)
+
 		REDIRECT_METHODS = {
 			:exec => [:async_exec, :sync_exec],
 			:query => [:async_exec, :sync_exec],
@@ -921,12 +976,13 @@ class PG::Connection
 			:set_client_encoding => [:async_set_client_encoding, :sync_set_client_encoding],
 			:client_encoding= => [:async_set_client_encoding, :sync_set_client_encoding],
 			:cancel => [:async_cancel, :sync_cancel],
+			:encrypt_password => [:async_encrypt_password, :sync_encrypt_password],
 		}
 		private_constant :REDIRECT_METHODS
-
-		if PG::Connection.instance_methods.include? :async_encrypt_password
+		if PG::Connection.instance_methods.include? :async_close_prepared
 			REDIRECT_METHODS.merge!({
-				:encrypt_password => [:async_encrypt_password, :sync_encrypt_password],
+				:close_prepared => [:async_close_prepared, :sync_close_prepared],
+				:close_portal => [:async_close_portal, :sync_close_portal],
 			})
 		end
 		PG.make_shareable(REDIRECT_METHODS)

data/lib/pg/version.rb

@@ -1,4 +1,4 @@
 module PG
 	# Library version
-	VERSION = '1.5.9'
+	VERSION = '1.6.0.rc1'
 end

data/lib/pg.rb

@@ -6,11 +6,12 @@
 module PG
 
 	# Is this file part of a fat binary gem with bundled libpq?
-	bundled_libpq_path = File.join(__dir__, RUBY_PLATFORM.gsub(/^i386-/, "x86-"))
-	if File.exist?(bundled_libpq_path)
+	# This path must be enabled by add_dll_directory on Windows.
+	gplat = Gem::Platform.local
+	bundled_libpq_path = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/lib", __dir__)].first
+	if bundled_libpq_path
 		POSTGRESQL_LIB_PATH = bundled_libpq_path
 	else
-		bundled_libpq_path = nil
 		# Try to load libpq path as found by extconf.rb
 		begin
 			require "pg/postgresql_lib_path"
@@ -22,7 +23,8 @@ module PG
 	end
 
 	add_dll_path = proc do |path, &block|
-		if RUBY_PLATFORM =~/(mswin|mingw)/i && path && File.exist?(path)
+		if RUBY_PLATFORM =~/(mswin|mingw)/i && path
+			BUNDLED_LIBPQ_WITH_UNIXSOCKET = false
 			begin
 				require 'ruby_installer/runtime'
 				RubyInstaller::Runtime.add_dll_directory(path, &block)
@@ -33,19 +35,21 @@ module PG
 				ENV['PATH'] = old_path
 			end
 		else
-			# No need to set a load path manually - it's set as library rpath.
+			# libpq is found by a relative rpath in the cross compiled extension dll
+			# or by the system library loader
 			block.call
+			BUNDLED_LIBPQ_WITH_UNIXSOCKET = RUBY_PLATFORM=~/linux/i && PG::IS_BINARY_GEM
 		end
 	end
 
 	# Add a load path to the one retrieved from pg_config
 	add_dll_path.call(POSTGRESQL_LIB_PATH) do
-		if bundled_libpq_path
-			# It's a Windows binary gem, try the <major>.<minor> subdirectory
+		begin
+			# Try the <major>.<minor> subdirectory for fat binary gems
 			major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
 				raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
 			require "#{major_minor}/pg_ext"
-		else
+		rescue LoadError
 			require 'pg_ext'
 		end
 	end
@@ -111,6 +115,7 @@ module PG
 	require 'pg/coder'
 	require 'pg/type_map_by_column'
 	require 'pg/connection'
+	require 'pg/cancel_connection'
 	require 'pg/result'
 	require 'pg/tuple'
 	autoload :VERSION, 'pg/version'

data/pg.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |spec|
   spec.email         = ["ged@FaerieMUD.org", "lars@greiz-reinsdorf.de"]
 
   spec.summary       = "Pg is the Ruby interface to the PostgreSQL RDBMS"
-  spec.description   = "Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL 9.3 and later."
+  spec.description   = "Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL 10 and later."
   spec.homepage      = "https://github.com/ged/ruby-pg"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/ged/ruby-pg"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0.rc1
 platform: x86-mingw32
 authors:
 - Michael Granger
@@ -34,10 +34,10 @@ cert_chain:
   5wFER6XhvvLDFAMh/jMg+s7Wd5SbSHgHNSUaUGVtdWkVPOer6oF0aLdZUR3CETkn
   5nWXZma/BUd3YgYA/Xumc6QQqIS4p7mr
   -----END CERTIFICATE-----
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL
-  9.3 and later.
+  10 and later.
 email:
 - ged@FaerieMUD.org
 - lars@greiz-reinsdorf.de
@@ -56,6 +56,7 @@ extra_rdoc_files:
 - ext/pg.h
 - ext/pg_binary_decoder.c
 - ext/pg_binary_encoder.c
+- ext/pg_cancel_connection.c
 - ext/pg_coder.c
 - ext/pg_connection.c
 - ext/pg_copy_coder.c
@@ -82,6 +83,7 @@ extra_rdoc_files:
 - lib/pg/binary_decoder/date.rb
 - lib/pg/binary_decoder/timestamp.rb
 - lib/pg/binary_encoder/timestamp.rb
+- lib/pg/cancel_connection.rb
 - lib/pg/coder.rb
 - lib/pg/connection.rb
 - lib/pg/exceptions.rb
@@ -112,7 +114,6 @@ files:
 - README.ja.md
 - README.md
 - Rakefile
-- Rakefile.cross
 - certs/ged.pem
 - certs/kanis@comcard.de.pem
 - certs/larskanis-2022.pem
@@ -128,6 +129,7 @@ files:
 - ext/pg.h
 - ext/pg_binary_decoder.c
 - ext/pg_binary_encoder.c
+- ext/pg_cancel_connection.c
 - ext/pg_coder.c
 - ext/pg_connection.c
 - ext/pg_copy_coder.c
@@ -149,8 +151,6 @@ files:
 - ext/vc/pg.sln
 - ext/vc/pg_18/pg.vcproj
 - ext/vc/pg_19/pg_19.vcproj
-- lib/2.5/pg_ext.so
-- lib/2.6/pg_ext.so
 - lib/2.7/pg_ext.so
 - lib/3.0/pg_ext.so
 - lib/3.1/pg_ext.so
@@ -164,6 +164,7 @@ files:
 - lib/pg/binary_decoder/date.rb
 - lib/pg/binary_decoder/timestamp.rb
 - lib/pg/binary_encoder/timestamp.rb
+- lib/pg/cancel_connection.rb
 - lib/pg/coder.rb
 - lib/pg/connection.rb
 - lib/pg/exceptions.rb
@@ -181,7 +182,6 @@ files:
 - lib/pg/tuple.rb
 - lib/pg/type_map_by_column.rb
 - lib/pg/version.rb
-- lib/x86-mingw32/libpq.dll
 - misc/openssl-pg-segfault.rb
 - misc/postgres/History.txt
 - misc/postgres/Manifest.txt
@@ -194,6 +194,7 @@ files:
 - misc/ruby-pg/Rakefile
 - misc/ruby-pg/lib/ruby/pg.rb
 - pg.gemspec
+- ports/x86-mingw32/lib/libpq.dll
 - rakelib/task_extension.rb
 - sample/array_insert.rb
 - sample/async_api.rb
@@ -234,15 +235,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.4.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.26
 signing_key: