pg 1.2.3 → 1.5.4

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,82 +16,23 @@ LIBDIR  = BASEDIR + 'lib'
 EXTDIR  = BASEDIR + 'ext'
 PKGDIR  = BASEDIR + 'pkg'
 TMPDIR  = BASEDIR + 'tmp'
+TESTDIR = BASEDIR + "tmp_test_*"
 
 DLEXT   = RbConfig::CONFIG['DLEXT']
 EXT     = LIBDIR + "pg_ext.#{DLEXT}"
 
 GEMSPEC = 'pg.gemspec'
 
-TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
-
-CLOBBER.include( TEST_DIRECTORY.to_s )
+CLEAN.include( TESTDIR.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
-Hoe.plugin :signing
-Hoe.plugin :deveiate
-Hoe.plugin :bundler
-
-Hoe.plugins.delete :rubyforge
-Hoe.plugins.delete :compiler
+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', ['~> 1.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
@@ -110,7 +42,7 @@ 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}"
@@ -135,58 +67,31 @@ Rake::ExtensionTask.new do |ext|
 	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
-end
+require 'rdoc/task'
 
-
-# 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
+RDoc::Task.new( 'docs' ) do |rdoc|
+	rdoc.options = $gem_spec.rdoc_options
+	rdoc.rdoc_files = $gem_spec.extra_rdoc_files
+	rdoc.generator = :fivefish
+	rdoc.rdoc_dir = 'doc'
 end
 
-# Rebuild the ChangeLog immediately before release
-task :prerelease => 'ChangeLog'
-
+desc "Build the source gem #{$gem_spec.full_name}.gem into the pkg directory"
+task :gem => :build
 
-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_15_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}"
@@ -199,19 +104,12 @@ file 'ext/pg_errors.c' => ['ext/errorcodes.def'] do
 	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
+desc "Translate readme"
+task :translate do
+  cd "translation" do
+    # po4a's lexer might change, so record its version for reference
+    sh "LANG=C po4a --version > .po4a-version"
 
+    sh "po4a po4a.cfg"
+  end
+end

data/Rakefile.cross

@@ -7,6 +7,7 @@ require 'rake/clean'
 require 'rake/extensiontask'
 require 'rake/extensioncompiler'
 require 'ostruct'
+require_relative 'rakelib/task_extension'
 
 MISCDIR = BASEDIR + 'misc'
 
@@ -20,6 +21,7 @@ end
 
 class CrossLibrary < OpenStruct
 	include Rake::DSL
+	prepend TaskExtension
 
 	def initialize(for_platform, openssl_config, toolchain)
 		super()
@@ -29,8 +31,8 @@ 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'] || '3.1.0'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '15.2'
 
 		# Check if symlinks work in the current working directory.
 		# This fails, if rake-compiler-dock is running on a Windows box.
@@ -125,7 +127,7 @@ class CrossLibrary < OpenStruct
 		file openssl_makefile => static_openssl_builddir do |t|
 			chdir( static_openssl_builddir ) do
 				cmd = cmd_prelude.dup
-				cmd << "./Configure" << openssl_config
+				cmd << "./Configure" << "-static" << openssl_config
 
 				run( *cmd )
 			end
@@ -144,14 +146,10 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static #{libssl}"
-		file libssl => "compile_static_openssl:#{for_platform}" do |t|
-			rm t.name.gsub(/\.a$/, ".dll.a")
-		end
+		file libssl => "compile_static_openssl:#{for_platform}"
 
 		desc "compile static #{libcrypto}"
-		file libcrypto => "compile_static_openssl:#{for_platform}" do |t|
-			rm t.name.gsub(/\.a$/, ".dll.a")
-		end
+		file libcrypto => "compile_static_openssl:#{for_platform}"
 
 
 
@@ -194,7 +192,7 @@ class CrossLibrary < OpenStruct
 				cmd << "CFLAGS=-L#{static_openssl_builddir}"
 				cmd << "LDFLAGS=-L#{static_openssl_builddir}"
 				cmd << "LDFLAGS_SL=-L#{static_openssl_builddir}"
-				cmd << "LIBS=-lwsock32 -lgdi32 -lws2_32"
+				cmd << "LIBS=-lwsock32 -lgdi32 -lws2_32 -lcrypt32"
 				cmd << "CPPFLAGS=-I#{static_openssl_builddir}/include"
 
 				run( *cmd )
@@ -250,6 +248,7 @@ class CrossLibrary < OpenStruct
 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|
@@ -272,7 +271,7 @@ 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
+	# 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"
@@ -287,11 +286,11 @@ end
 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
+	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/#{$hoespec.spec.full_name}-#{platform}.gem MAKE="make -j`nproc`"
+			rake native:#{platform} pkg/#{$gem_spec.full_name}-#{platform}.gem MAKE="make -j`nproc`" RUBY_CC_VERSION=3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0
 		EOT
 	end
 	desc "Build the windows binary gems"

data/certs/ged.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID+DCCAmCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+REM9RmFlcmllTVVEL0RDPW9yZzAeFw0yMjAxMDcyMzU4MTRaFw0yMzAxMDcyMzU4
+MTRaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+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
+9w0BAQsFAAOCAYEASrm1AbEoxACZ9WXJH3R5axV3U0CA4xaETlL2YT+2nOfVBMQ9
+0ZlkPx6j4ghKJgAIi1TMfDM2JyPJsppQh8tiNccDjWc62UZRY/dq26cMqf/lcI+a
+6YBuEYvzZfearwVs8tHnXtwYV3WSCoCOQaB+nq2lA1O+nkKNl41WOsVbNama5jx3
+8cQtVSEEmZy6jIDJ8c5TmBJ7BQUDEUEWA/A3V42Xyctoj7DvUXWE0lP+X6ypAVSr
+lFh3TS64D7NTvxkmg7natUoCvobl6kGl4yMaqE4YRTlfuzhpf91TSOntClqrAOsS
+K1s56WndQj3IoBocdY9mQhDZLtLHofSkymoP8btBlj5SsN24TiF0VMSZlctSCYZg
+GKyHim/MMlIfGOWsgfioq5jzwmql7W4CDubbb8Lkg70v+hN2E/MnNVAcNE3gyaGc
+P5YP5BAbNW+gvd3QHRiWTTuhgHrdDnGdXg93N2M5KHn1ug8BtPLQwlcFwEpKnlLn
+btEP+7EplFuoiMfd
+-----END CERTIFICATE-----

data/certs/larskanis-2022.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yMjAyMTQxMzMwNTZaFw0yMzAy
+MTQxMzMwNTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjgYEwfzAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOIdbSMr3VFrTCO9/cTM0
+0exHzBcwIgYDVR0RBBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwIgYDVR0S
+BBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwDQYJKoZIhvcNAQELBQADggGB
+AFWP7F/y3Oq3NgrqUOnjKOeDaBa7AqNhHS+PZg+C90lnJzMgOs4KKgZYxqSQVSab
+SCEmzIO/StkXY4NpJ4fYLrHemf/fJy1wPyu+fNdp5SEEUwEo+2toRFlzTe4u4LdS
+QC636nPPTMt8H3xz2wf/lUIUeo2Qc95Qt2BQM465ibbG9kmA3c7Sopx6yOabYOAl
+KPRbOSEPiWYcF9Suuz8Gdf8jxEtPlnZiwRvnYJ+IHMq3XQCJWPpMzdDMbtlgHbXE
+vq1zOTLMSYAS0UB3uionR4yo1hLz60odwkCm7qf0o2Ci/5OjtB0a89VuyqRU2vUJ
+QH95WBjDJ6lCCW7J0mrMPnJQSUFTmufsU6jOChvPaCeAzW1YwrsP/YKnvwueG7ip
+VOdW6RitjtFxhS7evRL0201+KUvLz12zZWWjOcujlQs64QprxOtiv/MiisKb1Ng+
+oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
+nA==
+-----END CERTIFICATE-----

data/certs/larskanis-2023.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEBDCCAmygAwIBAgIBAjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yMzAyMTUxNzQxMTVaFw0yNDAy
+MTUxNzQxMTVaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjOTA3MAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ4h1tIyvdUWtMI739xMzTR
+7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEAQAcuTARfiiVUVx5KURICfdTM2Kd7LhOn
+qt3Vs4ANGvT226LEp3RnQ+kWGQYMRb3cw3LY2TNQRPlnZxE994mgjBscN4fbjXqO
+T0JbVpeszRZa5k1goggbnWT7CO7yU7WcHh13DaSubY7HUpAJn2xz9w2stxQfN/EE
+VMlnDJ1P7mUHAvpK8X9j9h7Xlc1niViT18MYwux8mboVTryrLr+clATUkkM3yBF0
+RV+c34ReW5eXO9Tr6aKTxh/pFC9ggDT6jOxuJgSvG8HWJzVf4NDvMavIas4KYjiI
+BU6CpWaG5NxicqL3BERi52U43HV08br+LNVpb7Rekgve/PJuSFnAR015bhSRXe5U
+vBioD1qW2ZW9tXg8Ww2IfDaO5a1So5Xby51rhNlyo6ATj2NkuLWZUKPKHhAz0TKm
+Dzx/gFSOrRoCt2mXNgrmcAfr386AfaMvCh7cXqdxZwmVo7ILZCYXck0pajvubsDd
+NUIIFkVXvd1odFyK9LF1RFAtxn/iAmpx
+-----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 );
@@ -362,6 +366,10 @@
   VALUE klass = define_error_class( "SqlJsonScalarRequired", "22" );
   register_error_class( "2203F", klass );
 }
+{
+  VALUE klass = define_error_class( "SqlJsonItemCannotBeCastToTargetType", "22" );
+  register_error_class( "2203G", klass );
+}
 {
   VALUE klass = define_error_class( "IntegrityConstraintViolation", NULL );
   register_error_class( "23000", klass );
@@ -856,6 +864,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 );

data/ext/errorcodes.txt

@@ -2,7 +2,7 @@
 # errcodes.txt
 #      PostgreSQL error codes
 #
-# Copyright (c) 2003-2019, PostgreSQL Global Development Group
+# Copyright (c) 2003-2022, PostgreSQL Global Development Group
 #
 # This list serves as the basis for generating source files containing error
 # codes. It is kept in a common format to make sure all these source files have
@@ -207,6 +207,7 @@ Section: Class 22 - Data Exception
 2200S    E    ERRCODE_INVALID_XML_COMMENT                                    invalid_xml_comment
 2200T    E    ERRCODE_INVALID_XML_PROCESSING_INSTRUCTION                     invalid_xml_processing_instruction
 22030    E    ERRCODE_DUPLICATE_JSON_OBJECT_KEY_VALUE                        duplicate_json_object_key_value
+22031    E    ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION        invalid_argument_for_sql_json_datetime_function
 22032    E    ERRCODE_INVALID_JSON_TEXT                                      invalid_json_text
 22033    E    ERRCODE_INVALID_SQL_JSON_SUBSCRIPT                             invalid_sql_json_subscript
 22034    E    ERRCODE_MORE_THAN_ONE_SQL_JSON_ITEM                            more_than_one_sql_json_item
@@ -221,6 +222,7 @@ Section: Class 22 - Data Exception
 2203D    E    ERRCODE_TOO_MANY_JSON_ARRAY_ELEMENTS                           too_many_json_array_elements
 2203E    E    ERRCODE_TOO_MANY_JSON_OBJECT_MEMBERS                           too_many_json_object_members
 2203F    E    ERRCODE_SQL_JSON_SCALAR_REQUIRED                               sql_json_scalar_required
+2203G    E    ERRCODE_SQL_JSON_ITEM_CANNOT_BE_CAST_TO_TARGET_TYPE            sql_json_item_cannot_be_cast_to_target_type
 
 Section: Class 23 - Integrity Constraint Violation
 
@@ -427,6 +429,7 @@ Section: Class 57 - Operator Intervention
 57P02    E    ERRCODE_CRASH_SHUTDOWN                                         crash_shutdown
 57P03    E    ERRCODE_CANNOT_CONNECT_NOW                                     cannot_connect_now
 57P04    E    ERRCODE_DATABASE_DROPPED                                       database_dropped
+57P05    E    ERRCODE_IDLE_SESSION_TIMEOUT                                   idle_session_timeout
 
 Section: Class 58 - System Error (errors external to PostgreSQL itself)
 

data/ext/extconf.rb

@@ -15,6 +15,13 @@ if pgdir = with_config( 'pg' )
 	ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPARATOR + ENV['PATH']
 end
 
+if enable_config("gvl-unlock", true)
+	$defs.push( "-DENABLE_GVL_UNLOCK" )
+	$stderr.puts "Calling libpq with GVL unlocked"
+else
+	$stderr.puts "Calling libpq with GVL locked"
+end
+
 if enable_config("windows-cross")
 	# Avoid dependency to external libgcc.dll on x86-mingw32
 	$LDFLAGS << " -static-libgcc"
@@ -30,35 +37,101 @@ else
 
 	if pgconfig && pgconfig != 'ignore'
 		$stderr.puts "Using config values from %s" % [ pgconfig ]
-		incdir = `"#{pgconfig}" --includedir`.chomp
-		libdir = `"#{pgconfig}" --libdir`.chomp
+		incdir = IO.popen([pgconfig, "--includedir"], &:read).chomp
+		libdir = IO.popen([pgconfig, "--libdir"], &:read).chomp
 		dir_config 'pg', incdir, libdir
 
-		# Try to use runtime path linker option, even if RbConfig doesn't know about it.
-		# The rpath option is usually set implicit by dir_config(), but so far not
-		# on MacOS-X.
-		if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
-			$LDFLAGS << " -Wl,-rpath,#{libdir}"
+		# Windows traditionally stores DLLs beside executables, not in libdir
+		dlldir = RUBY_PLATFORM=~/mingw|mswin/ ? IO.popen([pgconfig, "--bindir"], &:read).chomp : libdir
+
+	elsif checking_for "libpq per pkg-config" do
+			_cflags, ldflags, _libs = pkg_config("libpq")
+			dlldir = ldflags && ldflags[/-L([^ ]+)/] && $1
 		end
+
 	else
-		$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
-			" --with-pg-config=/path/to/pg_config"
-		dir_config 'pg'
+		incdir, libdir = dir_config 'pg'
+		dlldir = libdir
 	end
+
+	# Try to use runtime path linker option, even if RbConfig doesn't know about it.
+	# The rpath option is usually set implicit by dir_config(), but so far not
+	# on MacOS-X.
+	if dlldir && RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
+		append_ldflags "-Wl,-rpath,#{dlldir.quote}"
+	end
+
+	if /mswin/ =~ RUBY_PLATFORM
+		$libs = append_library($libs, 'ws2_32')
+	end
+end
+
+$stderr.puts "Using libpq from #{dlldir}"
+
+File.write("postgresql_lib_path.rb", <<-EOT)
+module PG
+	POSTGRESQL_LIB_PATH = #{dlldir.inspect}
 end
+EOT
+$INSTALLFILES = {
+	"./postgresql_lib_path.rb" => "$(RUBYLIBDIR)/pg/"
+}
 
 if RUBY_VERSION >= '2.3.0' && /solaris/ =~ RUBY_PLATFORM
 	append_cppflags( '-D__EXTENSIONS__' )
 end
 
-find_header( 'libpq-fe.h' ) or abort "Can't find the 'libpq-fe.h header"
-find_header( 'libpq/libpq-fs.h' ) or abort "Can't find the 'libpq/libpq-fs.h header"
-find_header( 'pg_config_manual.h' ) or abort "Can't find the 'pg_config_manual.h' header"
+begin
+	find_header( 'libpq-fe.h' ) or abort "Can't find the 'libpq-fe.h header"
+	find_header( 'libpq/libpq-fs.h' ) or abort "Can't find the 'libpq/libpq-fs.h header"
+	find_header( 'pg_config_manual.h' ) or abort "Can't find the 'pg_config_manual.h' header"
+
+	abort "Can't find the PostgreSQL client library (libpq)" unless
+		have_library( 'pq', 'PQconnectdb', ['libpq-fe.h'] ) ||
+		have_library( 'libpq', 'PQconnectdb', ['libpq-fe.h'] ) ||
+		have_library( 'ms/libpq', 'PQconnectdb', ['libpq-fe.h'] )
+
+rescue SystemExit
+	install_text = case RUBY_PLATFORM
+	when /linux/
+	<<-EOT
+Please install libpq or postgresql client package like so:
+  sudo apt install libpq-dev
+  sudo yum install postgresql-devel
+  sudo zypper in postgresql-devel
+  sudo pacman -S postgresql-libs
+EOT
+	when /darwin/
+	<<-EOT
+Please install libpq or postgresql client package like so:
+  brew install libpq
+EOT
+	when /mingw/
+	<<-EOT
+Please install libpq or postgresql client package like so:
+  ridk exec sh -c "pacman -S ${MINGW_PACKAGE_PREFIX}-postgresql"
+EOT
+	else
+	<<-EOT
+Please install libpq or postgresql client package.
+EOT
+	end
+
+	$stderr.puts <<-EOT
+*****************************************************************************
+
+Unable to find PostgreSQL client library.
+
+#{install_text}
+or try again with:
+  gem install pg -- --with-pg-config=/path/to/pg_config
 
-abort "Can't find the PostgreSQL client library (libpq)" unless
-	have_library( 'pq', 'PQconnectdb', ['libpq-fe.h'] ) ||
-	have_library( 'libpq', 'PQconnectdb', ['libpq-fe.h'] ) ||
-	have_library( 'ms/libpq', 'PQconnectdb', ['libpq-fe.h'] )
+or set library paths manually with:
+  gem install pg -- --with-pg-include=/path/to/libpq-fe.h/ --with-pg-lib=/path/to/libpq.so/
+
+EOT
+	raise
+end
 
 if /mingw/ =~ RUBY_PLATFORM && RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
 	# Work around: https://sourceware.org/bugzilla/show_bug.cgi?id=22504
@@ -69,21 +142,27 @@ if /mingw/ =~ RUBY_PLATFORM && RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
 	end
 end
 
-# optional headers/functions
-have_func 'PQsetSingleRowMode' or
+have_func 'PQconninfo', 'libpq-fe.h' or
 	abort "Your PostgreSQL is too old. Either install an older version " +
-	      "of this gem or upgrade your database to at least PostgreSQL-9.2."
-have_func 'PQconninfo' # since PostgreSQL-9.3
-have_func 'PQsslAttribute' # since PostgreSQL-9.5
-have_func 'PQresultVerboseErrorMessage' # since PostgreSQL-9.6
-have_func 'PQencryptPasswordConn' # since PostgreSQL-10
-have_func 'PQresultMemorySize' # since PostgreSQL-12
+	      "of this gem or upgrade your database to at least PostgreSQL-9.3."
+# optional headers/functions
+have_func 'PQsslAttribute', 'libpq-fe.h' # since PostgreSQL-9.5
+have_func 'PQresultVerboseErrorMessage', 'libpq-fe.h' # since PostgreSQL-9.6
+have_func 'PQencryptPasswordConn', 'libpq-fe.h' # since PostgreSQL-10
+have_func 'PQresultMemorySize', 'libpq-fe.h' # since PostgreSQL-12
+have_func 'PQenterPipelineMode', 'libpq-fe.h' do |src| # since PostgreSQL-14
+  # Ensure header files fit as well
+  src + " int con(){ return PGRES_PIPELINE_SYNC; }"
+end
 have_func 'timegm'
 have_func 'rb_gc_adjust_memory_usage' # since ruby-2.4
+have_func 'rb_gc_mark_movable' # since ruby-2.7
+have_func 'rb_io_wait' # since ruby-3.0
 
 # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
 have_header 'unistd.h'
 have_header 'inttypes.h'
+have_header('ruby/fiber/scheduler.h') if RUBY_PLATFORM=~/mingw|mswin/
 
 checking_for "C99 variable length arrays" do
 	$defs.push( "-DHAVE_VARIABLE_LENGTH_ARRAYS" ) if try_compile('void test_vla(int l){ int vla[l]; }')

data/ext/gvl_wrappers.c

@@ -9,9 +9,13 @@
 char *PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user, const char *algorithm){return NULL;}
 #endif
 
+#ifdef ENABLE_GVL_UNLOCK
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_WRAPPER_STRUCT );
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_SKELETON );
+#endif
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB );
+#ifdef ENABLE_GVL_UNLOCK
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVL_WRAPPER_STRUCT );
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVLCB_SKELETON );
+#endif
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVLCB_STUB );