pg 0.18.0 → 1.1.4

data/Rakefile.cross

@@ -1,4 +1,4 @@
-#!/usr/bin/env rake
+# -*- rake -*-
 
 require 'uri'
 require 'tempfile'
@@ -21,17 +21,28 @@ end
 class CrossLibrary < OpenStruct
 	include Rake::DSL
 
-	def initialize(for_platform, openssl_config)
+	def initialize(for_platform, openssl_config, toolchain)
 		super()
 
 		self.for_platform               = for_platform
 		self.openssl_config             = openssl_config
+		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.1i'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.3.5'
-
-		self.compile_home               = Pathname( "./build" ).expand_path
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.1a'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '11.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
+			# Symlinks don't work -> use home directory instead
+			self.compile_home               = Pathname( "~/.ruby-pg-build" ).expand_path
+		else
+			self.compile_home               = Pathname( "./build" ).expand_path
+		end
 		self.static_sourcesdir          = compile_home + 'sources'
 		self.static_builddir            = compile_home + 'builds' + for_platform
 
@@ -43,8 +54,8 @@ class CrossLibrary < OpenStruct
 		self.openssl_tarball            = static_sourcesdir + File.basename( openssl_source_uri.path )
 		self.openssl_makefile           = static_openssl_builddir + 'Makefile'
 
-		self.libssleay32                = static_openssl_builddir + 'libssleay32.a'
-		self.libeay32                   = static_openssl_builddir + 'libeay32.a'
+		self.libssl                     = static_openssl_builddir + 'libssl.a'
+		self.libcrypto                  = static_openssl_builddir + 'libcrypto.a'
 
 		self.openssl_patches            = Rake::FileList[ (MISCDIR + "openssl-#{openssl_version}.*.patch").to_s ]
 
@@ -67,23 +78,10 @@ class CrossLibrary < OpenStruct
 		self.postgresql_lib             = static_postgresql_libdir + 'libpq.dll'
 		self.postgresql_patches         = Rake::FileList[ (MISCDIR + "postgresql-#{postgresql_version}.*.patch").to_s ]
 
-		# Use rake-compilers config.yml to determine the toolchain that was used
-		# to build Ruby for this platform.
-		self.host_platform = begin
-			config_file = YAML.load_file(File.expand_path("~/.rake-compiler/config.yml"))
-			_, rbfile = config_file.find{|key, fname| key.start_with?("rbconfig-#{for_platform}-") }
-			IO.read(rbfile).match(/CONFIG\["CC"\] = "(.*)"/)[1].sub(/\-gcc/, '')
-		rescue
-			nil
-		end
-
-
 		# clean intermediate files and folders
 		CLEAN.include( static_builddir.to_s )
 
 
-		ENV['RUBY_CC_VERSION'] ||= '1.9.3:2.0.0'
-
 		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}"
@@ -126,11 +124,9 @@ class CrossLibrary < OpenStruct
 		end
 
 		self.cmd_prelude = [
-			'env',
-			"CC=#{host_platform}-gcc",
+			"env",
+			"CROSS_COMPILE=#{host_platform}-",
 			"CFLAGS=-DDSO_WIN32",
-			"AR=#{host_platform}-ar",
-			"RANLIB=#{host_platform}-ranlib"
 		]
 
 
@@ -145,7 +141,7 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static openssl libraries"
-		task :openssl_libs => [ libssleay32, libeay32 ]
+		task :openssl_libs => [ libssl, libcrypto ]
 
 		task :compile_static_openssl => openssl_makefile do |t|
 			chdir( static_openssl_builddir ) do
@@ -156,14 +152,14 @@ class CrossLibrary < OpenStruct
 			end
 		end
 
-		desc "compile static #{libeay32}"
-		file libeay32 => :compile_static_openssl do |t|
-			FileUtils.cp( static_openssl_builddir + 'libcrypto.a', libeay32.to_s )
+		desc "compile static #{libssl}"
+		file libssl => :compile_static_openssl do |t|
+			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
-		desc "compile static #{libssleay32}"
-		file libssleay32 => :compile_static_openssl do |t|
-			FileUtils.cp( static_openssl_builddir + 'libssl.a', libssleay32.to_s )
+		desc "compile static #{libcrypto}"
+		file libcrypto => :compile_static_openssl do |t|
+			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
 
@@ -207,7 +203,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"
+				cmd << "LIBS=-lwsock32 -lgdi32 -lws2_32"
 				cmd << "CPPFLAGS=-I#{static_openssl_builddir}/include"
 
 				run( *cmd )
@@ -217,11 +213,16 @@ class CrossLibrary < OpenStruct
 
 		# make libpq.dll
 		task postgresql_lib => [ postgresql_global_makefile ] do |t|
+			# Work around missing dependency to libcommon in PostgreSQL-9.4.0
+			chdir( static_postgresql_srcdir + "common" ) do
+				sh 'make', "-j#{NUM_CPUS}"
+			end
+
 			chdir( postgresql_lib.dirname ) do
 				sh 'make',
 					"-j#{NUM_CPUS}",
 					postgresql_lib.basename.to_s,
-					'SHLIB_LINK=-lssleay32 -leay32 -lcrypt32 -lgdi32 -lsecur32 -lwsock32 -lws2_32'
+					'SHLIB_LINK=-lssl -lcrypto -lcrypt32 -lgdi32 -lsecur32 -lwsock32 -lws2_32'
 			end
 		end
 
@@ -230,7 +231,7 @@ class CrossLibrary < OpenStruct
 		task :libpq => postgresql_lib
 
 		# copy libpq.dll to lib dir
-		dest_libpq = "lib/#{for_platform}/#{postgresql_lib.basename}"
+		dest_libpq = "lib/#{postgresql_lib.basename}"
 		directory File.dirname(dest_libpq)
 		file dest_libpq => [postgresql_lib, File.dirname(dest_libpq)] do
 			cp postgresql_lib, dest_libpq
@@ -246,10 +247,10 @@ end
 
 if File.exist?(File.expand_path("~/.rake-compiler/config.yml"))
 	CrossLibraries = [
-		['i386-mingw32', 'mingw'],
-		['x64-mingw32', 'mingw64'],
-	].map do |platform, openssl_config|
-		CrossLibrary.new platform, openssl_config
+		['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
 	end
 else
 	$stderr.puts "Cross-compilation disabled -- rake-compiler not properly installed"
@@ -278,3 +279,20 @@ ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
     sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
   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
+end

data/ext/errorcodes.def

@@ -186,6 +186,10 @@
   VALUE klass = define_error_class( "InvalidParameterValue", "22" );
   register_error_class( "22023", klass );
 }
+{
+  VALUE klass = define_error_class( "InvalidPrecedingOrFollowingSize", "22" );
+  register_error_class( "22013", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidRegularExpression", "22" );
   register_error_class( "2201B", klass );
@@ -198,6 +202,14 @@
   VALUE klass = define_error_class( "InvalidRowCountInResultOffsetClause", "22" );
   register_error_class( "2201X", klass );
 }
+{
+  VALUE klass = define_error_class( "InvalidTablesampleArgument", "22" );
+  register_error_class( "2202H", klass );
+}
+{
+  VALUE klass = define_error_class( "InvalidTablesampleRepeat", "22" );
+  register_error_class( "2202G", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidTimeZoneDisplacementValue", "22" );
   register_error_class( "22009", klass );
@@ -222,6 +234,10 @@
   VALUE klass = define_error_class( "NumericValueOutOfRange", "22" );
   register_error_class( "22003", klass );
 }
+{
+  VALUE klass = define_error_class( "SequenceGeneratorLimitExceeded", "22" );
+  register_error_class( "2200H", klass );
+}
 {
   VALUE klass = define_error_class( "StringDataLengthMismatch", "22" );
   register_error_class( "22026", klass );
@@ -365,6 +381,10 @@
   VALUE klass = define_error_class( "InFailedSqlTransaction", "25" );
   register_error_class( "25P02", klass );
 }
+{
+  VALUE klass = define_error_class( "IdleInTransactionSessionTimeout", "25" );
+  register_error_class( "25P03", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidSqlStatementName", NULL );
   register_error_class( "26000", klass );
@@ -466,6 +486,10 @@
   VALUE klass = define_error_class( "ERIESrfProtocolViolated", "39" );
   register_error_class( "39P02", klass );
 }
+{
+  VALUE klass = define_error_class( "ERIEEventTriggerProtocolViolated", "39" );
+  register_error_class( "39P03", klass );
+}
 {
   VALUE klass = define_error_class( "SavepointException", NULL );
   register_error_class( "3B000", klass );
@@ -571,6 +595,10 @@
   VALUE klass = define_error_class( "WrongObjectType", "42" );
   register_error_class( "42809", klass );
 }
+{
+  VALUE klass = define_error_class( "GeneratedAlways", "42" );
+  register_error_class( "428C9", klass );
+}
 {
   VALUE klass = define_error_class( "UndefinedColumn", "42" );
   register_error_class( "42703", klass );
@@ -781,6 +809,11 @@
   VALUE klass = define_error_class( "DuplicateFile", "58" );
   register_error_class( "58P02", klass );
 }
+{
+  VALUE klass = define_error_class( "SnapshotTooOld", NULL );
+  register_error_class( "72000", klass );
+  register_error_class( "72", klass );
+}
 {
   VALUE klass = define_error_class( "ConfigFileError", NULL );
   register_error_class( "F0000", klass );
@@ -916,6 +949,10 @@
   VALUE klass = define_error_class( "TooManyRows", "P0" );
   register_error_class( "P0003", klass );
 }
+{
+  VALUE klass = define_error_class( "AssertFailure", "P0" );
+  register_error_class( "P0004", klass );
+}
 {
   VALUE klass = define_error_class( "InternalError", NULL );
   register_error_class( "XX000", klass );

data/ext/errorcodes.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 def camelize(lower_case_and_underscored_word)
 	lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }

data/ext/errorcodes.txt

@@ -2,7 +2,7 @@
 # errcodes.txt
 #      PostgreSQL error codes
 #
-# Copyright (c) 2003-2013, PostgreSQL Global Development Group
+# Copyright (c) 2003-2018, 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
@@ -15,6 +15,9 @@
 #   src/pl/plpgsql/src/plerrcodes.h
 #      a list of PL/pgSQL condition names and their SQLSTATE codes
 #
+#   src/pl/tcl/pltclerrcodes.h
+#      the same, for PL/Tcl
+#
 #   doc/src/sgml/errcodes-list.sgml
 #      a SGML table of error codes for inclusion in the documentation
 #
@@ -174,15 +177,19 @@ Section: Class 22 - Data Exception
 22P06    E    ERRCODE_NONSTANDARD_USE_OF_ESCAPE_CHARACTER                    nonstandard_use_of_escape_character
 22010    E    ERRCODE_INVALID_INDICATOR_PARAMETER_VALUE                      invalid_indicator_parameter_value
 22023    E    ERRCODE_INVALID_PARAMETER_VALUE                                invalid_parameter_value
+22013    E    ERRCODE_INVALID_PRECEDING_OR_FOLLOWING_SIZE                    invalid_preceding_or_following_size
 2201B    E    ERRCODE_INVALID_REGULAR_EXPRESSION                             invalid_regular_expression
 2201W    E    ERRCODE_INVALID_ROW_COUNT_IN_LIMIT_CLAUSE                      invalid_row_count_in_limit_clause
 2201X    E    ERRCODE_INVALID_ROW_COUNT_IN_RESULT_OFFSET_CLAUSE              invalid_row_count_in_result_offset_clause
+2202H    E    ERRCODE_INVALID_TABLESAMPLE_ARGUMENT                           invalid_tablesample_argument
+2202G    E    ERRCODE_INVALID_TABLESAMPLE_REPEAT                             invalid_tablesample_repeat
 22009    E    ERRCODE_INVALID_TIME_ZONE_DISPLACEMENT_VALUE                   invalid_time_zone_displacement_value
 2200C    E    ERRCODE_INVALID_USE_OF_ESCAPE_CHARACTER                        invalid_use_of_escape_character
 2200G    E    ERRCODE_MOST_SPECIFIC_TYPE_MISMATCH                            most_specific_type_mismatch
 22004    E    ERRCODE_NULL_VALUE_NOT_ALLOWED                                 null_value_not_allowed
 22002    E    ERRCODE_NULL_VALUE_NO_INDICATOR_PARAMETER                      null_value_no_indicator_parameter
 22003    E    ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE                             numeric_value_out_of_range
+2200H    E    ERRCODE_SEQUENCE_GENERATOR_LIMIT_EXCEEDED                      sequence_generator_limit_exceeded
 22026    E    ERRCODE_STRING_DATA_LENGTH_MISMATCH                            string_data_length_mismatch
 22001    E    ERRCODE_STRING_DATA_RIGHT_TRUNCATION                           string_data_right_truncation
 22011    E    ERRCODE_SUBSTRING_ERROR                                        substring_error
@@ -227,6 +234,7 @@ Section: Class 25 - Invalid Transaction State
 25007    E    ERRCODE_SCHEMA_AND_DATA_STATEMENT_MIXING_NOT_SUPPORTED         schema_and_data_statement_mixing_not_supported
 25P01    E    ERRCODE_NO_ACTIVE_SQL_TRANSACTION                              no_active_sql_transaction
 25P02    E    ERRCODE_IN_FAILED_SQL_TRANSACTION                              in_failed_sql_transaction
+25P03    E    ERRCODE_IDLE_IN_TRANSACTION_SESSION_TIMEOUT                    idle_in_transaction_session_timeout
 
 Section: Class 26 - Invalid SQL Statement Name
 
@@ -278,6 +286,7 @@ Section: Class 39 - External Routine Invocation Exception
 39004    E    ERRCODE_E_R_I_E_NULL_VALUE_NOT_ALLOWED                         null_value_not_allowed
 39P01    E    ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED                      trigger_protocol_violated
 39P02    E    ERRCODE_E_R_I_E_SRF_PROTOCOL_VIOLATED                          srf_protocol_violated
+39P03    E    ERRCODE_E_R_I_E_EVENT_TRIGGER_PROTOCOL_VIOLATED                event_trigger_protocol_violated
 
 Section: Class 3B - Savepoint Exception
 
@@ -319,6 +328,7 @@ Section: Class 42 - Syntax Error or Access Rule Violation
 42P21    E    ERRCODE_COLLATION_MISMATCH                                     collation_mismatch
 42P22    E    ERRCODE_INDETERMINATE_COLLATION                                indeterminate_collation
 42809    E    ERRCODE_WRONG_OBJECT_TYPE                                      wrong_object_type
+428C9    E    ERRCODE_GENERATED_ALWAYS                                       generated_always
 
 # Note: for ERRCODE purposes, we divide namable objects into these categories:
 # databases, schemas, prepared statements, cursors, tables, columns,
@@ -410,6 +420,10 @@ Section: Class 58 - System Error (errors external to PostgreSQL itself)
 58P01    E    ERRCODE_UNDEFINED_FILE                                         undefined_file
 58P02    E    ERRCODE_DUPLICATE_FILE                                         duplicate_file
 
+Section: Class 72 - Snapshot Failure
+# (class borrowed from Oracle)
+72000    E    ERRCODE_SNAPSHOT_TOO_OLD                                       snapshot_too_old
+
 Section: Class F0 - Configuration File Error
 
 # (PostgreSQL-specific error class)
@@ -454,6 +468,7 @@ P0000    E    ERRCODE_PLPGSQL_ERROR                                          plp
 P0001    E    ERRCODE_RAISE_EXCEPTION                                        raise_exception
 P0002    E    ERRCODE_NO_DATA_FOUND                                          no_data_found
 P0003    E    ERRCODE_TOO_MANY_ROWS                                          too_many_rows
+P0004    E    ERRCODE_ASSERT_FAILURE                                         assert_failure
 
 Section: Class XX - Internal Error
 

data/ext/extconf.rb

@@ -24,7 +24,11 @@ if enable_config("windows-cross")
 else
 	# Native build
 
-	if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_executable('pg_config') )
+	pgconfig = with_config('pg-config') ||
+		with_config('pg_config') ||
+		find_executable('pg_config')
+
+	if pgconfig && pgconfig != 'ignore'
 		$stderr.puts "Using config values from %s" % [ pgconfig ]
 		incdir = `"#{pgconfig}" --includedir`.chomp
 		libdir = `"#{pgconfig}" --libdir`.chomp
@@ -43,6 +47,9 @@ else
 	end
 end
 
+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"
@@ -53,47 +60,34 @@ abort "Can't find the PostgreSQL client library (libpq)" unless
 	have_library( 'libpq', 'PQconnectdb', ['libpq-fe.h'] ) ||
 	have_library( 'ms/libpq', 'PQconnectdb', ['libpq-fe.h'] )
 
+if /mingw/ =~ RUBY_PLATFORM && RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
+	# Work around: https://sourceware.org/bugzilla/show_bug.cgi?id=22504
+	checking_for "workaround gcc version with link issue" do
+		`#{RbConfig::MAKEFILE_CONFIG['CC']} --version`.chomp =~ /\s(\d+)\.\d+\.\d+(\s|$)/ &&
+			$1.to_i >= 6 &&
+			have_library(':libpq.lib') # Prefer linking to libpq.lib over libpq.dll if available
+	end
+end
+
 # optional headers/functions
-have_func 'PQconnectionUsedPassword' or
+have_func 'PQsetSingleRowMode' or
 	abort "Your PostgreSQL is too old. Either install an older version " +
-	      "of this gem or upgrade your database."
-have_func 'PQisthreadsafe'
-have_func 'PQprepare'
-have_func 'PQexecParams'
-have_func 'PQescapeString'
-have_func 'PQescapeStringConn'
-have_func 'PQescapeLiteral'
-have_func 'PQescapeIdentifier'
-have_func 'PQgetCancel'
-have_func 'lo_create'
-have_func 'pg_encoding_to_char'
-have_func 'pg_char_to_encoding'
-have_func 'PQsetClientEncoding'
-have_func 'PQlibVersion'
-have_func 'PQping'
-have_func 'PQsetSingleRowMode'
+	      "of this gem or upgrade your database to at least PostgreSQL-9.2."
 have_func 'PQconninfo'
-have_func 'PQhostaddr'
-
-have_func 'rb_encdb_alias'
-have_func 'rb_enc_alias'
-have_func 'rb_thread_call_without_gvl'
-have_func 'rb_thread_call_with_gvl'
-have_func 'rb_thread_fd_select'
-have_func 'rb_w32_wrap_io_handle'
-have_func 'rb_str_modify_expand'
-have_func 'rb_hash_dup'
-
-have_const 'PGRES_COPY_BOTH', 'libpq-fe.h'
-have_const 'PGRES_SINGLE_TUPLE', 'libpq-fe.h'
-have_const 'PG_DIAG_TABLE_NAME', 'libpq-fe.h'
+have_func 'PQsslAttribute'
+have_func 'PQencryptPasswordConn'
+have_func 'timegm'
+have_func 'rb_gc_adjust_memory_usage'
 
-$defs.push( "-DHAVE_ST_NOTIFY_EXTRA" ) if
-	have_struct_member 'struct pgNotify', 'extra', 'libpq-fe.h'
+have_const 'PG_DIAG_TABLE_NAME', 'libpq-fe.h'
 
 # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
 have_header 'unistd.h'
-have_header 'ruby/st.h' or have_header 'st.h' or abort "pg currently requires the ruby/st.h header"
+have_header 'inttypes.h'
+
+checking_for "C99 variable length arrays" do
+	$defs.push( "-DHAVE_VARIABLE_LENGTH_ARRAYS" ) if try_compile('void test_vla(int l){ int vla[l]; }')
+end
 
 create_header()
 create_makefile( "pg_ext" )

data/ext/gvl_wrappers.c

@@ -5,6 +5,10 @@
 
 #include "pg.h"
 
+#ifndef HAVE_PQENCRYPTPASSWORDCONN
+char *PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user, const char *algorithm){return NULL;}
+#endif
+
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_WRAPPER_STRUCT );
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_SKELETON );
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB );

data/ext/gvl_wrappers.h

@@ -15,14 +15,7 @@
 #ifndef __gvl_wrappers_h
 #define __gvl_wrappers_h
 
-#if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
-extern void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
-#endif
-
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
-				 rb_unblock_function_t *ubf, void *data2);
-#endif
+#include <ruby/thread.h>
 
 #define DEFINE_PARAM_LIST1(type, name) \
 	name,
@@ -53,21 +46,14 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 		return NULL; \
 	}
 
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-	#define DEFINE_GVL_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
-		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
-			struct gvl_wrapper_##name##_params params = { \
-				{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
-			}; \
-			rb_thread_call_without_gvl(gvl_##name##_skeleton, &params, RUBY_UBF_IO, 0); \
-			when_non_void( return params.retval; ) \
-		}
-#else
-	#define DEFINE_GVL_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
-		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
-			return name( FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname ); \
-		}
-#endif
+#define DEFINE_GVL_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
+	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
+		struct gvl_wrapper_##name##_params params = { \
+			{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
+		}; \
+		rb_thread_call_without_gvl(gvl_##name##_skeleton, &params, RUBY_UBF_IO, 0); \
+		when_non_void( return params.retval; ) \
+	}
 
 #define DEFINE_GVL_STUB_DECL(name, when_non_void, rettype, lastparamtype, lastparamname) \
 	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname);
@@ -80,21 +66,14 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 		return NULL; \
 	}
 
-#if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
-	#define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
-		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
-			struct gvl_wrapper_##name##_params params = { \
-				{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
-			}; \
-			rb_thread_call_with_gvl(gvl_##name##_skeleton, &params); \
-			when_non_void( return params.retval; ) \
-		}
-#else
-	#define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
-		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
-			return name( FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname ); \
-		}
-#endif
+#define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
+	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
+		struct gvl_wrapper_##name##_params params = { \
+			{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
+		}; \
+		rb_thread_call_with_gvl(gvl_##name##_skeleton, &params); \
+		when_non_void( return params.retval; ) \
+	}
 
 #define GVL_TYPE_VOID(string)
 #define GVL_TYPE_NONVOID(string) string
@@ -195,8 +174,16 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 #define FOR_EACH_PARAM_OF_PQsendDescribePortal(param) \
 	param(PGconn *, conn)
 
+#define FOR_EACH_PARAM_OF_PQsetClientEncoding(param) \
+	param(PGconn *, conn)
+
 #define FOR_EACH_PARAM_OF_PQisBusy(param)
 
+#define FOR_EACH_PARAM_OF_PQencryptPasswordConn(param) \
+	param(PGconn *, conn) \
+	param(const char *, passwd) \
+	param(const char *, user)
+
 #define FOR_EACH_PARAM_OF_PQcancel(param) \
 	param(PGcancel *, cancel) \
 	param(char *, errbuf)
@@ -226,10 +213,11 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 	function(PQsendQueryPrepared, GVL_TYPE_NONVOID, int, int, resultFormat) \
 	function(PQsendDescribePrepared, GVL_TYPE_NONVOID, int, const char *, stmt) \
 	function(PQsendDescribePortal, GVL_TYPE_NONVOID, int, const char *, portal) \
+	function(PQsetClientEncoding, GVL_TYPE_NONVOID, int, const char *, encoding) \
 	function(PQisBusy, GVL_TYPE_NONVOID, int, PGconn *, conn) \
+	function(PQencryptPasswordConn, GVL_TYPE_NONVOID, char *, const char *, algorithm) \
 	function(PQcancel, GVL_TYPE_NONVOID, int, int, errbufsize);
 
-
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL );