pg 1.2.1-x86-mingw32 → 1.3.0.rc2-x86-mingw32

data/History.rdoc

@@ -1,3 +1,89 @@
+== v1.3.0 [YYY-MM-DD] Michael Granger <ged@FaerieMUD.org>
+
+Install Enhancements:
+- Print some install help if libpq wasn't found. #396
+  This should help to pick the necessary package without googling.
+- Update Windows fat binary gem to OpenSSL-1.1.1m and PostgreSQL-14.1.
+- Add binary Windows gems for Ruby 3.0 and 3.1.
+- Make the library path of libpq available in ruby as PG::POSTGRESQL_LIB_PATH and add it to the search paths on Windows similar to +rpath+ on Unix systems. #373
+- Fall back to pkg-config if pg_config is not found. #380
+- Add option to extconf.rb to disable nogvl-wrapping of libpq functions.
+  All methods (except PG::Connection.ping) are nonblocking now, so that GVL unlock is in theory no longer necessary.
+  However it can have some advantage in concurrency, so that GVL unlock is still enabled by default.
+  Use:
+  - gem inst pg -- --disable-gvl-unlock
+
+API Enhancements:
+- Add full compatibility to Fiber.scheduler introduced in Ruby-3.0. #397
+  - Add async_connect and async_send methods and add specific specs for Fiber.scheduler #342
+  - Add async_get_result and async_get_last_result
+  - Add async_get_copy_data
+  - Implement async_put_copy_data/async_put_copy_end
+  - Implement async_reset method using the nonblocking libpq API
+  - Add async_set_client_encoding which is compatible to scheduler
+  - Add async_cancel as a nonblocking version of conn#cancel
+  - Add async_encrypt_password
+  - Run Connection.ping in a second thread.
+  - Make discard_results scheduler friendly
+  - Do all socket waiting through the conn.socket_io object.
+  - Avoid PG.connect blocking while address resolution by automatically providing the +hostaddr+ parameter.
+- Add support for pipeline mode of PostgreSQL-14. #401
+- Allow specification of multiple hosts in PostgreSQL URI. #387
+- Add new method conn.backend_key - used to implement our own cancel method.
+
+Type cast enhancements:
+- Add PG::BasicTypeMapForQueries::BinaryData for encoding of bytea columns. #348
+- Reduce time to build coder maps and permit to reuse them for several type maps per PG::BasicTypeRegistry::CoderMapsBundle.new(conn) . #376
+- Make BasicTypeRegistry a class and use a global default instance of it.
+  Now a local type registry can be instanciated and given to the type map, to avoid changing shared global states.
+- Allow PG::BasicTypeMapForQueries to take a Proc as callback for undefined types.
+
+Other Enhancements:
+- Convert all PG classes implemented in C to TypedData objects. #349
+- Support ObjectSpace.memsize_of(obj) on all classes implemented in C. #393
+- Make all PG objects implemented in C memory moveable and therefore GC.compact friendly. #349
+- Update errorcodes and error classes to PostgreSQL-14.0.
+- Add PG::CONNECTION_* constants for conn.status of newer PostgreSQL versions.
+- Add better support for logical replication. #339
+- Change conn.socket_io to read+write mode and to a BasicSocket object instead of IO.
+- Use rb_io_wait() and the conn.socket_io object if available and remove Windows specific wait functions.
+  Fall back to rb_wait_for_single_fd() on ruby < 3.0, which works on Windows as well.
+
+Bugfixes:
+- Release GVL while calling PQping which is a blocking method, but it didn't release GVL so far.
+- Fix Connection#transaction to no longer block on interrupts, for instance when pressing Ctrl-C and cancel a running query. #390
+- Avoid casting of OIDs to fix compat with Redshift database. #369
+- Call conn.block before each conn.get_result call to avoid possible blocking in case of a slow network and multiple query results.
+- Sporadic Errno::ENOTSOCK when using conn.socket_io on Windows #398
+
+Deprecated:
+- Add deprecation warning to PG::BasicTypeRegistry.register_type and siblings.
+
+Removed:
+- Remove support of ruby-2.2, 2.3 and 2.4. Minimum is ruby-2.5 now.
+- Remove support for PostgreSQL-9.2. Minimum is PostgreSQL-9.3 now.
+
+Repository:
+- Replace Hoe by Bundler for gem packaging
+- Add Github Actions CI and testing of source and binary gems.
+
+
+== 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:
@@ -38,7 +124,7 @@ Other enhancements:
 - Improve performance of PG::Result#stream_each_tuple .
 - Store client encoding in data part of PG::Connection and PG::Result objects, so that we no longer use ruby's internal encoding bits. #280
 - Update Windows fat binary gem to OpenSSL-1.1.1d and PostgreSQL-12.1.
-- Add support for TruffleRuby. It is regulary tested as part of our CI.
+- Add support for TruffleRuby. It is regularly tested as part of our CI.
 - Enable +frozen_string_literal+ in all pg's ruby files
 
 Bugfixes:
@@ -101,10 +187,10 @@ Deprecated (disable warnings per PG_SKIP_DEPRECATION_WARNING=1):
 - Forwarding conn.async_exec_params to conn.async_exec is deprecated.
 
 PG::Connection enhancements:
-- Provide PG::Connection#sync_* and PG::Connection#async_* query methods for explicit calling syncronous or asynchronous libpq API.
+- Provide PG::Connection#sync_* and PG::Connection#async_* query methods for explicit calling synchronous or asynchronous libpq API.
 - Make PG::Connection#exec and siblings switchable between sync and async API per PG::Connection.async_api= and change the default to async flavors.
 - Add async flavors of exec_params, prepare, exec_prepared, describe_prepared and describe_portal.
-  They are identical to their syncronous counterpart, but make use of PostgreSQL's async API.
+  They are identical to their synchronous counterpart, but make use of PostgreSQL's async API.
 - Replace `rb_thread_fd_select()` by faster `rb_wait_for_single_fd()` in `conn.block` and `conn.async_exec` .
 - Add PG::Connection#discard_results .
 - Raise an ArgumentError for strings containing zero bytes by #escape, #escape_literal, #escape_identifier, #quote_ident and PG::TextEncoder::Identifier. These methods previously truncated strings.
@@ -259,7 +345,7 @@ Bugfixes:
 - Revert addition of PG::Connection#hostaddr [#202].
 - Fix decoding of fractional timezones and timestamps [#203]
 - Fixes for non-C99 compilers
-- Avoid possible symbol name clash when linking againt static libpq.
+- Avoid possible symbol name clash when linking against static libpq.
 
 
 == v0.18.1 [2015-01-05] Michael Granger <ged@FaerieMUD.org>
@@ -295,7 +381,7 @@ Enhancements:
 Bugfixes:
 
 - Fix compatibility with signal handlers defined in Ruby. This reverts
-  cancelation of queries running on top of the blocking libpq API (like
+  cancellation of queries running on top of the blocking libpq API (like
   Connection#exec) in case of signals. As an alternative the #async_exec
   can be used, which is reverted to use the non-blocking API, again.
 - Wrap PQcancel to be called without GVL. It internally waits for
@@ -373,7 +459,7 @@ Enhancements:
 
 - Tested under Ruby 2.0.0p0.
 - Add single row mode of PostgreSQL 9.2.
-- Set fallback_application_name to programm name $0. Thanks to Will Leinweber
+- Set fallback_application_name to program name $0. Thanks to Will Leinweber
   for the patch.
 - Release Ruby's GVL while calls to blocking libpq functions to allow better
   concurrency in threaded applications.
@@ -381,7 +467,7 @@ Enhancements:
 - Make use of rb_thread_fd_select() on Ruby 1.9 and avoid deprecated
   rb_thread_select().
 - Add an example of how to insert array data using a prepared statement (#145).
-- Add continous integration tests on travis-ci.org.
+- Add continuous integration tests on travis-ci.org.
 - Add PG::Result#each_row for iterative over result sets by row. Thanks to
   Aaron Patterson for the patch.
 - Add a PG::Connection#socket_io method for fetching a (non-autoclosing) IO

data/Manifest.txt

@@ -1,6 +1,5 @@
 .gemtest
 BSDL
-ChangeLog
 Contributors.rdoc
 History.rdoc
 LICENSE

data/README.rdoc

@@ -2,6 +2,7 @@
 
 home :: https://github.com/ged/ruby-pg
 docs :: http://deveiate.org/code/pg
+clog :: link:/History.rdoc
 
 {<img src="https://badges.gitter.im/Join%20Chat.svg" alt="Join the chat at https://gitter.im/ged/ruby-pg">}[https://gitter.im/ged/ruby-pg?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge]
 
@@ -10,7 +11,7 @@ docs :: http://deveiate.org/code/pg
 
 Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-It works with {PostgreSQL 9.2 and later}[http://www.postgresql.org/support/versioning/].
+It works with {PostgreSQL 9.3 and later}[http://www.postgresql.org/support/versioning/].
 
 A small example usage:
 
@@ -24,22 +25,22 @@ A small example usage:
     puts "     PID | User             | Query"
     result.each do |row|
       puts " %7d | %-16s | %s " %
-        row.values_at('procpid', 'usename', 'current_query')
+        row.values_at('pid', 'usename', 'query')
     end
   end
 
 == Build Status
 
-{<img src="https://travis-ci.org/ged/ruby-pg.svg?branch=master" alt="Build Status Travis-CI" />}[https://travis-ci.org/ged/ruby-pg]
+{<img src="https://github.com/ged/ruby-pg/actions/workflows/source-gem.yml/badge.svg?branch=master" alt="Build Status Github Actions" />}[https://github.com/ged/ruby-pg/actions/workflows/source-gem.yml]
 {<img src="https://ci.appveyor.com/api/projects/status/gjx5axouf3b1wicp?svg=true" alt="Build Status Appveyor" />}[https://ci.appveyor.com/project/ged/ruby-pg-9j8l3]
-
+{<img src="https://app.travis-ci.com/larskanis/ruby-pg.svg?branch=master" alt="Build Status" />}[https://app.travis-ci.com/larskanis/ruby-pg]
 
 == Requirements
 
-* Ruby 2.2 or newer
-* PostgreSQL 9.2.x or later (with headers, -dev packages, etc).
+* Ruby 2.4 or newer
+* PostgreSQL 9.3.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

@@ -3,20 +3,11 @@
 require 'rbconfig'
 require 'pathname'
 require 'tmpdir'
-
-begin
-	require 'rake/extensiontask'
-rescue LoadError
-	abort "This Rakefile requires rake-compiler (gem install rake-compiler)"
-end
-
-begin
-	require 'hoe'
-rescue LoadError
-	abort "This Rakefile requires hoe (gem install hoe)"
-end
-
+require 'rake/extensiontask'
 require 'rake/clean'
+require 'rspec/core/rake_task'
+require 'bundler'
+require 'bundler/gem_helper'
 
 # Build directory constants
 BASEDIR = Pathname( __FILE__ ).dirname
@@ -25,80 +16,23 @@ LIBDIR  = BASEDIR + 'lib'
 EXTDIR  = BASEDIR + 'ext'
 PKGDIR  = BASEDIR + 'pkg'
 TMPDIR  = BASEDIR + 'tmp'
+TESTDIR = BASEDIR + "tmp_test_specs"
 
 DLEXT   = RbConfig::CONFIG['DLEXT']
 EXT     = LIBDIR + "pg_ext.#{DLEXT}"
 
 GEMSPEC = 'pg.gemspec'
 
-TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
-
-CLOBBER.include( TEST_DIRECTORY.to_s )
+CLOBBER.include( TESTDIR.to_s )
 CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
-
-# Set up Hoe plugins
-Hoe.plugin :mercurial
-Hoe.plugin :signing
-Hoe.plugin :deveiate
-Hoe.plugin :bundler
-
-Hoe.plugins.delete :rubyforge
-Hoe.plugins.delete :compiler
+CLEAN.include "lib/*/libpq.dll"
+CLEAN.include "lib/pg_ext.*"
+CLEAN.include "lib/pg/postgresql_lib_path.rb"
 
 load 'Rakefile.cross'
 
-
-# Hoe specification
-$hoespec = Hoe.spec 'pg' do
-	self.readme_file = 'README.rdoc'
-	self.history_file = 'History.rdoc'
-	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
-	self.extra_rdoc_files.include( 'POSTGRES', 'LICENSE' )
-	self.extra_rdoc_files.include( 'ext/*.c' )
-	self.license 'BSD-2-Clause'
-
-	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
-	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 'hoe-deveiate', '~> 0.9', :developer
-	self.dependency 'hoe-bundler', '~> 1.0', :developer
-	self.dependency 'rspec', '~> 3.5', :developer
-	self.dependency 'rdoc', '~> 5.1', :developer
-
-	self.spec_extras[:extensions] = [ 'ext/extconf.rb' ]
-
-	self.require_ruby_version( '>= 2.2' )
-
-	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
-	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
-
-	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
-end
-
-ENV['VERSION'] ||= $hoespec.spec.version.to_s
-
-# Tests should pass before checking in
-task 'hg:precheckin' => [ :check_history, :check_manifest, :spec, :gemspec ]
-
-# Support for 'rvm specs'
-task :specs => :spec
-
-# Compile before testing
-task :spec => :compile
-
-# gem-testers support
-task :test do
-	# rake-compiler always wants to copy the compiled extension into lib/, but
-	# we don't want testers to have to re-compile, especially since that
-	# often fails because they can't (and shouldn't have to) write to tmp/ in
-	# the installed gem dir. So we clear the task rake-compiler set up
-	# to break the dependency between :spec and :compile when running under
-	# rubygems-test, and then run :spec.
-	Rake::Task[ EXT.to_s ].clear if File.exist?(EXT.to_s)
-	Rake::Task[ :spec ].execute
-end
+Bundler::GemHelper.install_tasks
+$gem_spec = Bundler.load_gemspec(GEMSPEC)
 
 desc "Turn on warnings and debugging in the build."
 task :maint do
@@ -108,12 +42,12 @@ end
 # Rake-compiler task
 Rake::ExtensionTask.new do |ext|
 	ext.name           = 'pg_ext'
-	ext.gem_spec       = $hoespec.spec
+	ext.gem_spec       = $gem_spec
 	ext.ext_dir        = '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,62 +63,36 @@ 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
 
+RSpec::Core::RakeTask.new(:spec).rspec_opts = "--profile -cfdoc"
+task :test => :spec
 
 # Use the fivefish formatter for docs generated from development checkout
-if File.directory?( '.hg' )
-	require 'rdoc/task'
-
-	Rake::Task[ 'docs' ].clear
-	RDoc::Task.new( 'docs' ) do |rdoc|
-		rdoc.main = "README.rdoc"
-		rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb", 'ext/**/*.{c,h}' )
-		rdoc.generator = :fivefish
-		rdoc.title = "PG: The Ruby PostgreSQL Driver"
-		rdoc.rdoc_dir = 'doc'
-	end
+require 'rdoc/task'
+
+RDoc::Task.new( 'docs' ) do |rdoc|
+	rdoc.main = "README.rdoc"
+	rdoc.rdoc_files.include( "*.rdoc", "lib/**/*.rb", 'ext/**/*.{c,h}' )
+	rdoc.generator = :fivefish
+	rdoc.title = "PG: The Ruby PostgreSQL Driver"
+	rdoc.rdoc_dir = 'doc'
 end
 
+desc "Build the source gem #{$gem_spec.full_name}.gem into the pkg directory"
+task :gem => :build
 
-# Make the ChangeLog update if the repo has changed since it was last built
-file '.hg/branch' do
-	warn "WARNING: You need the Mercurial repo to update the ChangeLog"
-end
-Rake::Task["ChangeLog"].clear
-file 'ChangeLog' do |task|
-	if File.exist?('.hg/branch')
-		$stderr.puts "Updating the changelog..."
-		begin
-			include Hoe::MercurialHelpers
-			content = make_changelog()
-		rescue NameError
-			abort "Packaging tasks require the hoe-mercurial plugin (gem install hoe-mercurial)"
-		end
-		File.open( task.name, 'w', 0644 ) do |fh|
-			fh.print( content )
-		end
-	else
-		touch 'ChangeLog'
-	end
-end
-
-# Rebuild the ChangeLog immediately before release
-task :prerelease => 'ChangeLog'
-
-
-desc "Stop any Postmaster instances that remain after testing."
-task :cleanup_testing_dbs do
-    require 'spec/lib/helpers'
-    PgTestingHelpers.stop_existing_postmasters()
-    Rake::Task[:clean].invoke
+task :clobber do
+	puts "Stop any Postmaster instances that remain after testing."
+	require_relative 'spec/helpers'
+	PG::TestingHelpers.stop_existing_postmasters()
 end
 
 desc "Update list of server error codes"
 task :update_error_codes do
-	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL_12_0"
+	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL_14_0"
 
 	ERRORCODES_TXT = "ext/errorcodes.txt"
 	sh "wget #{URL_ERRORCODES_TXT.inspect} -O #{ERRORCODES_TXT.inspect} || curl #{URL_ERRORCODES_TXT.inspect} -o #{ERRORCODES_TXT.inspect}"
@@ -196,20 +104,3 @@ file 'ext/pg_errors.c' => ['ext/errorcodes.def'] do
 	# trigger compilation of changed errorcodes.def
 	touch 'ext/pg_errors.c'
 end
-
-task :gemspec => GEMSPEC
-file GEMSPEC => __FILE__
-task GEMSPEC do |task|
-	spec = $hoespec.spec
-	spec.files.delete( '.gemtest' )
-	spec.signing_key = nil
-	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
-	spec.cert_chain = [ 'certs/ged.pem' ]
-	File.open( task.name, 'w' ) do |fh|
-		fh.write( spec.to_ruby )
-	end
-end
-
-CLOBBER.include( '*.gemspec' )
-task :default => :gemspec
-

data/Rakefile.cross

@@ -29,15 +29,15 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.1d'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '12.1'
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.1m'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '14.1'
 
 		# Check if symlinks work in the current working directory.
 		# This fails, if rake-compiler-dock is running on a Windows box.
 		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,28 @@ 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 = [
+	['x64-mingw-ucrt', 'mingw64', 'x86_64-w64-mingw32'],
+	['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 +269,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 accessible 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}" => ['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/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0:2.5.0
+		EOT
+	end
+	desc "Build the windows binary gems"
+	multitask 'gem:windows' => "gem:windows:#{platform}"
 end

data/certs/ged.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID+DCCAmCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+REM9RmFlcmllTVVEL0RDPW9yZzAeFw0yMDEyMjQyMDU1MjlaFw0yMTEyMjQyMDU1
+MjlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
+L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
+M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
+5PU2AEbf04GGSrmqADGWXeaslaoRdb1fu/0M5qfPTRn5V39sWD9umuDAF9qqil/x
+Sl6phTvgBrG8GExHbNZpLARd3xrBYLEFsX7RvBn2UPfgsrtvpdXjsHGfpT3IPN+B
+vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI
+dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
+ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
+N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DANBgkqhkiG
+9w0BAQsFAAOCAYEAMYegZanJi8zq7QKPT7wqXefX4C88I5JWeBHR3PvvWK0CwyMV
+peyiu5I13w/lYX+HUZjE4qsSpJMJFXWl4WZCOo+AMprOcf0PxfuJpxCej5D4tavf
+vRfhahSw7XJrcZih/3J+/UgoH7R05MJ+8LTcy3HGrB3a0vTafjm8OY7Xpa0LJDoN
+JDqxK321VIHyTibbKeA1hWSE6ljlQDvFbTqiCj3Ulp1jTv3TOlvRl8fqcfhxUJI0
++5Q82jJODjEN+GaWs0V+NlrbU94cXwS2PH5dXogftB5YYA5Ex8A0ikZ73xns4Hdo
+XxdLdd92F5ovxA23j/rKe/IDwqr6FpDkU3nPXH/Qp0TVGv9zZnVJc/Z6ChkuWj8z
+pW7JAyyiiHZgKKDReDrA2LA7Zs3o/7KA6UtUH0FHf8LYhcK+pfHk6RtjRe65ffw+
+MCh97sQ/Z/MOusb5+QddBmB+k8EicXyGNl4b5L4XpL7fIQu+Y96TB3JEJlShxFD9
+k9FjI4d9EP54gS/4
+-----END CERTIFICATE-----

data/ext/errorcodes.def

@@ -306,6 +306,10 @@
   VALUE klass = define_error_class( "DuplicateJsonObjectKeyValue", "22" );
   register_error_class( "22030", klass );
 }
+{
+  VALUE klass = define_error_class( "InvalidArgumentForSqlJsonDatetimeFunction", "22" );
+  register_error_class( "22031", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidJsonText", "22" );
   register_error_class( "22032", klass );
@@ -856,6 +860,10 @@
   VALUE klass = define_error_class( "DatabaseDropped", "57" );
   register_error_class( "57P04", klass );
 }
+{
+  VALUE klass = define_error_class( "IdleSessionTimeout", "57" );
+  register_error_class( "57P05", klass );
+}
 {
   VALUE klass = define_error_class( "SystemError", NULL );
   register_error_class( "58000", klass );