pg 1.6.3 → 1.7.0

data/ext/gvl_wrappers.h

@@ -15,13 +15,18 @@
 #ifndef __gvl_wrappers_h
 #define __gvl_wrappers_h
 
+#include <ruby/version.h>
 #include <ruby/thread.h>
 
 #ifdef RUBY_EXTCONF_H
 #	include RUBY_EXTCONF_H
 #endif
 
-#ifndef HAVE_PQSETCHUNKEDROWSMODE
+#if RUBY_API_VERSION_MAJOR < 4
+extern int ruby_thread_has_gvl_p(void);
+#endif
+
+#ifndef LIBPQ_HAS_CHUNK_MODE
 typedef struct pg_cancel_conn PGcancelConn;
 #endif
 
@@ -83,20 +88,35 @@ typedef struct pg_cancel_conn PGcancelConn;
 	}
 
 #ifdef ENABLE_GVL_UNLOCK
-#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; ) \
-	}
+	#if RUBY_API_VERSION_MAJOR >= 4 || defined(TRUFFLERUBY)
+		#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){ \
+				struct gvl_wrapper_##name##_params params = { \
+					{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
+				}; \
+				if (ruby_thread_has_gvl_p()) { \
+					gvl_##name##_skeleton(&params); \
+				} else { \
+					rb_thread_call_with_gvl(gvl_##name##_skeleton, &params); \
+				} \
+				when_non_void( return params.retval; ) \
+			}
+	#endif
 #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){ \
-		when_non_void( return ) \
-			name( FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname ); \
-	}
+	#define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
+		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
+			when_non_void( return ) \
+				name( FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname ); \
+		}
 #endif
 
 #define GVL_TYPE_VOID(string)
@@ -105,174 +125,34 @@ typedef struct pg_cancel_conn PGcancelConn;
 
 /*
  * Definitions of blocking functions and their parameters
+ *
+ * ATTENTION:
+ * Do not GVL-release functions that take pointers to ruby objects.
+ * If the ruby object is relocated by `GC.compact` from a second thread, before the pointer is used, it is no longer valid.
+ * That can lead to a crash or to wrong data.
+ * This issue has been raised in https://github.com/ged/ruby-pg/issues/738 and https://github.com/ged/ruby-pg/issues/721 .
  */
 
-#define FOR_EACH_PARAM_OF_PQconnectdb(param)
-
 #define FOR_EACH_PARAM_OF_PQconnectStart(param)
-
 #define FOR_EACH_PARAM_OF_PQconnectPoll(param)
 
-#define FOR_EACH_PARAM_OF_PQreset(param)
-
 #define FOR_EACH_PARAM_OF_PQresetStart(param)
-
 #define FOR_EACH_PARAM_OF_PQresetPoll(param)
 
 #define FOR_EACH_PARAM_OF_PQping(param)
 
-#define FOR_EACH_PARAM_OF_PQexec(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQexecParams(param) \
-	param(PGconn *, conn) \
-	param(const char *, command) \
-	param(int, nParams) \
-	param(const Oid *, paramTypes) \
-	param(const char * const *, paramValues) \
-	param(const int *, paramLengths) \
-	param(const int *, paramFormats)
-
-#define FOR_EACH_PARAM_OF_PQexecPrepared(param) \
-	param(PGconn *, conn) \
-	param(const char *, stmtName) \
-	param(int, nParams) \
-	param(const char * const *, paramValues) \
-	param(const int *, paramLengths) \
-	param(const int *, paramFormats)
-
-#define FOR_EACH_PARAM_OF_PQprepare(param) \
-	param(PGconn *, conn) \
-	param(const char *, stmtName) \
-	param(const char *, query) \
-	param(int, nParams)
-
-#define FOR_EACH_PARAM_OF_PQdescribePrepared(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQdescribePortal(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQclosePrepared(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQclosePortal(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQgetResult(param)
-
-#define FOR_EACH_PARAM_OF_PQputCopyData(param) \
-	param(PGconn *, conn) \
-	param(const char *, buffer)
-
-#define FOR_EACH_PARAM_OF_PQputCopyEnd(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQgetCopyData(param) \
-	param(PGconn *, conn) \
-	param(char **, buffer)
-
-#define FOR_EACH_PARAM_OF_PQnotifies(param)
-
-#define FOR_EACH_PARAM_OF_PQsendQuery(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQsendQueryParams(param) \
-	param(PGconn *, conn) \
-	param(const char *, command) \
-	param(int, nParams) \
-	param(const Oid *, paramTypes) \
-	param(const char *const *, paramValues) \
-	param(const int *, paramLengths) \
-	param(const int *, paramFormats)
-
-#define FOR_EACH_PARAM_OF_PQsendPrepare(param) \
-	param(PGconn *, conn) \
-	param(const char *, stmtName) \
-	param(const char *, query) \
-	param(int, nParams)
-
-#define FOR_EACH_PARAM_OF_PQsendQueryPrepared(param) \
-	param(PGconn *, conn) \
-	param(const char *, stmtName) \
-	param(int, nParams) \
-	param(const char *const *, paramValues) \
-	param(const int *, paramLengths) \
-	param(const int *, paramFormats)
-
-#define FOR_EACH_PARAM_OF_PQsendDescribePrepared(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQsendDescribePortal(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQsendClosePrepared(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQsendClosePortal(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQpipelineSync(param)
-
-#define FOR_EACH_PARAM_OF_PQsendPipelineSync(param)
-
-#define FOR_EACH_PARAM_OF_PQsetClientEncoding(param) \
-	param(PGconn *, conn)
-
-#define FOR_EACH_PARAM_OF_PQisBusy(param)
-
-#define FOR_EACH_PARAM_OF_PQcancelBlocking(param)
 #define FOR_EACH_PARAM_OF_PQcancelStart(param)
 #define FOR_EACH_PARAM_OF_PQcancelPoll(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)
-
 /* function( name, void_or_nonvoid, returntype, lastparamtype, lastparamname ) */
 #define FOR_EACH_BLOCKING_FUNCTION(function) \
-	function(PQconnectdb, GVL_TYPE_NONVOID, PGconn *, const char *, conninfo) \
 	function(PQconnectStart, GVL_TYPE_NONVOID, PGconn *, const char *, conninfo) \
 	function(PQconnectPoll, GVL_TYPE_NONVOID, PostgresPollingStatusType, PGconn *, conn) \
-	function(PQreset, GVL_TYPE_VOID, void, PGconn *, conn) \
 	function(PQresetStart, GVL_TYPE_NONVOID, int, PGconn *, conn) \
 	function(PQresetPoll, GVL_TYPE_NONVOID, PostgresPollingStatusType, PGconn *, conn) \
 	function(PQping, GVL_TYPE_NONVOID, PGPing, const char *, conninfo) \
-	function(PQexec, GVL_TYPE_NONVOID, PGresult *, const char *, command) \
-	function(PQexecParams, GVL_TYPE_NONVOID, PGresult *, int, resultFormat) \
-	function(PQexecPrepared, GVL_TYPE_NONVOID, PGresult *, int, resultFormat) \
-	function(PQprepare, GVL_TYPE_NONVOID, PGresult *, const Oid *, paramTypes) \
-	function(PQdescribePrepared, GVL_TYPE_NONVOID, PGresult *, const char *, stmtName) \
-	function(PQdescribePortal, GVL_TYPE_NONVOID, PGresult *, const char *, portalName) \
-	function(PQclosePrepared, GVL_TYPE_NONVOID, PGresult *, const char *, stmtName) \
-	function(PQclosePortal, GVL_TYPE_NONVOID, PGresult *, const char *, portalName) \
-	function(PQgetResult, GVL_TYPE_NONVOID, PGresult *, PGconn *, conn) \
-	function(PQputCopyData, GVL_TYPE_NONVOID, int, int, nbytes) \
-	function(PQputCopyEnd, GVL_TYPE_NONVOID, int, const char *, errormsg) \
-	function(PQgetCopyData, GVL_TYPE_NONVOID, int, int, async) \
-	function(PQnotifies, GVL_TYPE_NONVOID, PGnotify *, PGconn *, conn) \
-	function(PQsendQuery, GVL_TYPE_NONVOID, int, const char *, query) \
-	function(PQsendQueryParams, GVL_TYPE_NONVOID, int, int, resultFormat) \
-	function(PQsendPrepare, GVL_TYPE_NONVOID, int, const Oid *, paramTypes) \
-	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(PQsendClosePrepared, GVL_TYPE_NONVOID, int, const char *, stmt) \
-	function(PQsendClosePortal, GVL_TYPE_NONVOID, int, const char *, portal) \
-	function(PQpipelineSync, GVL_TYPE_NONVOID, int, PGconn *, conn) \
-	function(PQsendPipelineSync, GVL_TYPE_NONVOID, int, PGconn *, conn) \
-	function(PQsetClientEncoding, GVL_TYPE_NONVOID, int, const char *, encoding) \
-	function(PQisBusy, GVL_TYPE_NONVOID, int, PGconn *, conn) \
-	function(PQcancelBlocking, GVL_TYPE_NONVOID, int, PGcancelConn *, conn) \
 	function(PQcancelStart, GVL_TYPE_NONVOID, int, PGcancelConn *, conn) \
 	function(PQcancelPoll, GVL_TYPE_NONVOID, PostgresPollingStatusType, PGcancelConn *, 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 );
 

data/ext/pg.c

@@ -212,10 +212,10 @@ pg_get_rb_encoding_as_pg_encoding( rb_encoding *enc )
  *
  */
 char *
-pg_rb_str_ensure_capa( VALUE str, long expand_len, char *curr_ptr, char **end_ptr )
+pg_rb_str_ensure_capa( VALUE str, size_t expand_len, char *curr_ptr, char **end_ptr )
 {
-	long curr_len = curr_ptr - RSTRING_PTR(str);
-	long curr_capa = rb_str_capacity( str );
+	size_t curr_len = curr_ptr - RSTRING_PTR(str);
+	size_t curr_capa = rb_str_capacity( str );
 	if( curr_capa < curr_len + expand_len ){
 		rb_str_set_len( str, curr_len );
 		rb_str_modify_expand( str, (curr_len + expand_len) * 2 - curr_capa );
@@ -384,14 +384,10 @@ Init_pg_ext(void)
 	rb_define_const(rb_mPGconstants, "CONNECTION_SSL_STARTUP", INT2FIX(CONNECTION_SSL_STARTUP));
 	/* Internal state - PG.connect() needed. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_NEEDED", INT2FIX(CONNECTION_NEEDED));
-#if PG_MAJORVERSION_NUM >= 10
-	/* Checking if session is read-write. Available since PostgreSQL-10. */
+	/* Checking if session is read-write. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_CHECK_WRITABLE", INT2FIX(CONNECTION_CHECK_WRITABLE));
-#endif
-#if PG_MAJORVERSION_NUM >= 10
-	/* Consuming any extra messages. Available since PostgreSQL-10. */
+	/* Consuming any extra messages. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_CONSUME", INT2FIX(CONNECTION_CONSUME));
-#endif
 #if PG_MAJORVERSION_NUM >= 12
 	/* Negotiating GSSAPI. Available since PostgreSQL-12. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_GSS_STARTUP", INT2FIX(CONNECTION_GSS_STARTUP));
@@ -508,12 +504,12 @@ Init_pg_ext(void)
 	rb_define_const(rb_mPGconstants, "PGRES_COPY_BOTH", INT2FIX(PGRES_COPY_BOTH));
 	/* Result#result_status constant - Single tuple from larger resultset. */
 	rb_define_const(rb_mPGconstants, "PGRES_SINGLE_TUPLE", INT2FIX(PGRES_SINGLE_TUPLE));
-#ifdef HAVE_PQSETCHUNKEDROWSMODE
+#ifdef LIBPQ_HAS_CHUNK_MODE
 	/* Result#result_status constant - tuple chunk from larger resultset. */
 	rb_define_const(rb_mPGconstants, "PGRES_TUPLES_CHUNK", INT2FIX(PGRES_TUPLES_CHUNK));
 #endif
 
-#ifdef HAVE_PQENTERPIPELINEMODE
+#ifdef LIBPQ_HAS_PIPELINING
 	/* Result#result_status constant - The PG::Result represents a synchronization point in pipeline mode, requested by Connection#pipeline_sync.
 	 *
 	 * This status occurs only when pipeline mode has been selected. */
@@ -643,7 +639,7 @@ Init_pg_ext(void)
 	rb_define_const(rb_mPGconstants, "PG_DIAG_CONSTRAINT_NAME", INT2FIX(PG_DIAG_CONSTRAINT_NAME));
 #endif
 
-#ifdef HAVE_PQENTERPIPELINEMODE
+#ifdef LIBPQ_HAS_PIPELINING
 	/* Connection#pipeline_status constant
 	 *
 	 * The libpq connection is in pipeline mode.

data/ext/pg.h

@@ -82,12 +82,8 @@ typedef long suseconds_t;
 
 #define pg_gc_location(x) x = rb_gc_location(x)
 
-/* For compatibility with ruby < 3.0 */
-#ifndef RUBY_TYPED_FROZEN_SHAREABLE
-#define PG_RUBY_TYPED_FROZEN_SHAREABLE 0
-#else
-#define PG_RUBY_TYPED_FROZEN_SHAREABLE RUBY_TYPED_FROZEN_SHAREABLE
-#endif
+extern int ruby_native_thread_p(void);
+
 #define PG_ENC_IDX_BITS 28
 
 /* The data behind each PG::Connection object */
@@ -103,6 +99,8 @@ typedef struct {
 	VALUE notice_receiver;
 	/* Proc object that receives notices as String objects */
 	VALUE notice_processor;
+	/* Corresponding PG::Connection ruby object. Only used for the notice_receiver */
+	VALUE self;
 	/* Kind of PG::TypeMap object for casting query params */
 	VALUE type_map_for_queries;
 	/* Kind of PG::TypeMap object for casting result values */
@@ -116,7 +114,7 @@ typedef struct {
 	/* Ruby encoding index of the client/internal encoding */
 	int enc_idx : PG_ENC_IDX_BITS;
 	/* flags controlling Symbol/String field names */
-	unsigned int flags : 2;
+	unsigned int flags : 1;
 	/* enable automatic flushing of send data at the end of send_query calls */
 	unsigned int flush_data : 1;
 
@@ -151,7 +149,7 @@ typedef struct {
 	unsigned int autoclear : 1;
 
 	/* flags controlling Symbol/String field names */
-	unsigned int flags : 2;
+	unsigned int flags : 1;
 
 	/* Number of fields in fnames[] .
 	 * Set to -1 if fnames[] is not yet initialized.
@@ -181,9 +179,8 @@ typedef VALUE (* t_pg_typecast_result)(t_typemap *, VALUE, int, int);
 typedef t_pg_coder *(* t_pg_typecast_query_param)(t_typemap *, VALUE, int);
 typedef VALUE (* t_pg_typecast_copy_get)( t_typemap *, VALUE, int, int, int );
 
-#define PG_RESULT_FIELD_NAMES_MASK 0x03
+#define PG_RESULT_FIELD_NAMES_MASK 0x01
 #define PG_RESULT_FIELD_NAMES_SYMBOL 0x01
-#define PG_RESULT_FIELD_NAMES_STATIC_SYMBOL 0x02
 
 #define PG_CODER_TIMESTAMP_DB_UTC 0x0
 #define PG_CODER_TIMESTAMP_DB_LOCAL 0x1
@@ -320,7 +317,7 @@ VALUE pg_tmbc_allocate                                 _(( void ));
 void pg_coder_init_encoder                             _(( VALUE ));
 void pg_coder_init_decoder                             _(( VALUE ));
 void pg_coder_compact                                  _(( void * ));
-char *pg_rb_str_ensure_capa                            _(( VALUE, long, char *, char ** ));
+char *pg_rb_str_ensure_capa                            _(( VALUE, size_t, char *, char ** ));
 
 #define PG_RB_STR_ENSURE_CAPA( str, expand_len, curr_ptr, end_ptr ) \
 	do { \

data/ext/pg_binary_decoder.c

@@ -13,6 +13,7 @@
 
 VALUE rb_mPG_BinaryDecoder;
 static VALUE s_Date;
+static VALUE s_Date_GREGORIAN; /* Date::GREGORIAN */
 static ID s_id_new;
 
 
@@ -218,6 +219,7 @@ pg_bin_dec_array(t_pg_coder *conv, const char *input_line, int len, int tuple, i
 		cur_ptr += 8;
 	}
 	nitems = (int)nitems32;
+	if (nitems > (line_end_ptr - cur_ptr) / 4) goto length_error;
 
 	dim = 0;
 	arrays[dim] = rb_ary_new2(ndim == 0 ? 0 : dim_sizes[dim]);
@@ -403,7 +405,7 @@ pg_bin_dec_date(t_pg_coder *conv, const char *val, int len, int tuple, int field
 		default:
 			j2date(date + POSTGRES_EPOCH_JDATE, &year, &month, &day);
 
-			return rb_funcall(s_Date, s_id_new, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
+			return rb_funcall(s_Date, s_id_new, 4, INT2NUM(year), INT2NUM(month), INT2NUM(day), s_Date_GREGORIAN);
 	}
 }
 
@@ -412,8 +414,10 @@ static VALUE
 init_pg_bin_decoder_date(VALUE rb_mPG_BinaryDecoder)
 {
 	rb_require("date");
+	rb_gc_register_address(&s_Date);
+	rb_gc_register_address(&s_Date_GREGORIAN);
 	s_Date = rb_const_get(rb_cObject, rb_intern("Date"));
-	rb_gc_register_mark_object(s_Date);
+	s_Date_GREGORIAN = rb_const_get(s_Date, rb_intern("GREGORIAN"));
 	s_id_new = rb_intern("new");
 
 	/* dummy = rb_define_class_under( rb_mPG_BinaryDecoder, "Date", rb_cPG_SimpleDecoder ); */

data/ext/pg_binary_encoder.c

@@ -11,6 +11,8 @@
 #endif
 
 VALUE rb_mPG_BinaryEncoder;
+static ID s_id_gregorianP;
+static ID s_id_gregorian;
 static ID s_id_year;
 static ID s_id_month;
 static ID s_id_day;
@@ -272,6 +274,9 @@ pg_bin_enc_date(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate, i
 				write_nbo32(PG_INT32_MIN, out);
 				return 4;
 		} {
+			/* Only create a new gregorian Date object if necessary */
+			if( rb_funcall(value, s_id_gregorianP, 0) != Qtrue )
+				value = rb_funcall(value, s_id_gregorian, 0);
 			VALUE year = rb_funcall(value, s_id_year, 0);
 			VALUE month = rb_funcall(value, s_id_month, 0);
 			VALUE day = rb_funcall(value, s_id_day, 0);
@@ -554,6 +559,8 @@ pg_bin_enc_from_base64(t_pg_coder *conv, VALUE value, char *out, VALUE *intermed
 void
 init_pg_binary_encoder(void)
 {
+	s_id_gregorianP = rb_intern("gregorian?");
+	s_id_gregorian = rb_intern("gregorian");
 	s_id_year = rb_intern("year");
 	s_id_month = rb_intern("month");
 	s_id_day = rb_intern("day");

data/ext/pg_cancel_connection.c

@@ -6,14 +6,14 @@
  *
  * The class to represent a connection to cancel a query.
  *
- * On PostgreSQL-17+ client libaray this class is used to implement PG::Connection#cancel .
+ * On PostgreSQL-17+ client library this class is used to implement PG::Connection#cancel .
  * It works on older PostgreSQL server versions too.
  *
  * Available since PostgreSQL-17
  *
  */
 
-#ifdef HAVE_PQSETCHUNKEDROWSMODE
+#ifdef LIBPQ_HAS_CHUNK_MODE
 
 static VALUE rb_cPG_Cancon;
 static ID s_id_autoclose_set;
@@ -75,7 +75,7 @@ static const rb_data_type_t pg_cancon_type = {
 		pg_cancon_gc_compact,
 	},
 	0, 0,
-	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | PG_RUBY_TYPED_FROZEN_SHAREABLE,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 /*
@@ -155,7 +155,7 @@ pg_cancon_initialize(VALUE self, VALUE rb_conn)
  *
  * Requests that the server abandons processing of the current command in a blocking manner.
  *
- * This method directly calls +PQcancelBlocking+ of libpq, so that it doesn't respond to ruby interrupts and doesn't trigger the +Thread.scheduler+ .
+ * This method directly calls +PQcancelBlocking+ of libpq, so that it doesn't allow parallel threads, doesn't respond to ruby interrupts and doesn't trigger the +Thread.scheduler+ .
  * It is threrfore recommended to call #cancel instead.
  *
  */
@@ -165,7 +165,7 @@ pg_cancon_sync_cancel(VALUE self)
 	PGcancelConn *conn = pg_cancon_get_conn(self);
 
 	pg_cancon_close_socket_io( self );
-	if(gvl_PQcancelBlocking(conn) == 0)
+	if(PQcancelBlocking(conn) == 0)
 		pg_raise_conn_error( rb_eConnectionBad, self, "PQcancelBlocking %s", PQcancelErrorMessage(conn));
 	return Qnil;
 }
@@ -340,7 +340,7 @@ pg_cancon_finish(VALUE self)
 void
 init_pg_cancon(void)
 {
-#ifdef HAVE_PQSETCHUNKEDROWSMODE
+#ifdef LIBPQ_HAS_CHUNK_MODE
 	s_id_autoclose_set = rb_intern("autoclose=");
 
 	rb_cPG_Cancon = rb_define_class_under( rb_mPG, "CancelConnection", rb_cObject );

data/ext/pg_coder.c

@@ -101,7 +101,7 @@ const rb_data_type_t pg_coder_type = {
 	0,
 	// IMPORTANT: WB_PROTECTED objects must only use the RB_OBJ_WRITE()
 	// macro to update VALUE references, as to trigger write barriers.
-	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | PG_RUBY_TYPED_FROZEN_SHAREABLE,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static VALUE
@@ -123,7 +123,7 @@ static const rb_data_type_t pg_composite_coder_type = {
 	},
 	&pg_coder_type,
 	0,
-	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | PG_RUBY_TYPED_FROZEN_SHAREABLE,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static VALUE
@@ -505,7 +505,7 @@ static const rb_data_type_t pg_coder_cfunc_type = {
 	},
 	0,
 	0,
-	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | PG_RUBY_TYPED_FROZEN_SHAREABLE,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 VALUE
@@ -631,7 +631,7 @@ init_pg_coder(void)
 	/*
 	 * Name of the coder or the corresponding data type.
 	 *
-	 * This accessor is only used in PG::Coder#inspect .
+	 * This accessor is used by PG::Coder#inspect and PG::Connection#embed_params .
 	 */
 	rb_define_attr(   rb_cPG_Coder, "name", 1, 1 );