pg 1.1.0.pre20180730171000 → 1.1.4

data/History.rdoc

@@ -1,12 +1,29 @@
-== v2.0.0 - far from release -
+== v1.1.4 [2019-01-08] Michael Granger <ged@FaerieMUD.org>
 
-Removed:
-- Removed query method variants deprecated in pg-1.1.0.
+- Fix PG::BinaryDecoder::Timestamp on 32 bit systems. # 284
+- Add new error-codes of PostgreSQL-11.
+- Add ruby-2.6 support for Windows fat binary gems and remove ruby-2.0 and 2.1.
 
 
-== v1.1.0 [YYYY-MM-DD] Michael Granger <ged@FaerieMUD.org>
+== v1.1.3 [2018-09-06] Michael Granger <ged@FaerieMUD.org>
 
-Deprecated:
+- Revert opimization that was sometimes causing EBADF in rb_wait_for_single_fd().
+
+
+== v1.1.2 [2018-08-28] Michael Granger <ged@FaerieMUD.org>
+
+- Don't generate aliases for JOHAB encoding.
+  This avoids linking to deprecated/private function rb_enc(db)_alias().
+
+
+== v1.1.1 [2018-08-27] Michael Granger <ged@FaerieMUD.org>
+
+- Reduce deprecation warnings to only one message per deprecation.
+
+
+== v1.1.0 [2018-08-24] Michael Granger <ged@FaerieMUD.org>
+
+Deprecated (disable warnings per PG_SKIP_DEPRECATION_WARNING=1):
 - Forwarding conn.exec to conn.exec_params is deprecated.
 - Forwarding conn.exec_params to conn.exec is deprecated.
 - Forwarding conn.async_exec to conn.async_exec_params.
@@ -20,10 +37,11 @@ PG::Connection enhancements:
   They are identical to their syncronous 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.
 
 Result retrieval enhancements:
 - Add PG::Result#tuple_values to retrieve all field values of a row as array.
-- Add PG::Tuple, PG::Result#tuple_values and PG::Result#stream_each_tuple .
+- Add PG::Tuple, PG::Result#tuple and PG::Result#stream_each_tuple .
   PG::Tuple offers a way to lazy cast result values.
 - Estimate PG::Result size allocated by libpq and notify the garbage collector about it when running on Ruby-2.4 or newer.
 - Make the estimated PG::Result size available to ObjectSpace.memsize_of(result) .

data/Manifest.txt

@@ -1,4 +1,72 @@
-# Manifest is built per Rakefile as part of `rake gem`.
-# These files are required to satisfy Hoe:
+.gemtest
+BSDL
+ChangeLog
+Contributors.rdoc
+History.rdoc
+LICENSE
+Manifest.txt
+POSTGRES
+README-OS_X.rdoc
+README-Windows.rdoc
+README.ja.rdoc
 README.rdoc
+Rakefile
+Rakefile.cross
+ext/errorcodes.def
+ext/errorcodes.rb
+ext/errorcodes.txt
+ext/extconf.rb
+ext/gvl_wrappers.c
+ext/gvl_wrappers.h
+ext/pg.c
+ext/pg.h
+ext/pg_binary_decoder.c
+ext/pg_binary_encoder.c
+ext/pg_coder.c
+ext/pg_connection.c
+ext/pg_copy_coder.c
+ext/pg_errors.c
+ext/pg_result.c
+ext/pg_text_decoder.c
+ext/pg_text_encoder.c
+ext/pg_tuple.c
+ext/pg_type_map.c
+ext/pg_type_map_all_strings.c
+ext/pg_type_map_by_class.c
+ext/pg_type_map_by_column.c
+ext/pg_type_map_by_mri_type.c
+ext/pg_type_map_by_oid.c
+ext/pg_type_map_in_ruby.c
+ext/util.c
+ext/util.h
+ext/vc/pg.sln
+ext/vc/pg_18/pg.vcproj
+ext/vc/pg_19/pg_19.vcproj
 lib/pg.rb
+lib/pg/basic_type_mapping.rb
+lib/pg/binary_decoder.rb
+lib/pg/coder.rb
+lib/pg/connection.rb
+lib/pg/constants.rb
+lib/pg/exceptions.rb
+lib/pg/result.rb
+lib/pg/text_decoder.rb
+lib/pg/text_encoder.rb
+lib/pg/tuple.rb
+lib/pg/type_map_by_column.rb
+spec/data/expected_trace.out
+spec/data/random_binary_data
+spec/helpers.rb
+spec/pg/basic_type_mapping_spec.rb
+spec/pg/connection_spec.rb
+spec/pg/connection_sync_spec.rb
+spec/pg/result_spec.rb
+spec/pg/tuple_spec.rb
+spec/pg/type_map_by_class_spec.rb
+spec/pg/type_map_by_column_spec.rb
+spec/pg/type_map_by_mri_type_spec.rb
+spec/pg/type_map_by_oid_spec.rb
+spec/pg/type_map_in_ruby_spec.rb
+spec/pg/type_map_spec.rb
+spec/pg/type_spec.rb
+spec/pg_spec.rb

data/Rakefile

@@ -55,14 +55,13 @@ $hoespec = Hoe.spec 'pg' do
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
 	self.extra_rdoc_files.include( 'POSTGRES', 'LICENSE' )
 	self.extra_rdoc_files.include( 'ext/*.c' )
-	self.spec_extras[:files] = `hg manifest || git ls-files`.split
 	self.license 'BSD-3-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.6', '>= 0.6.2'], :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
@@ -185,7 +184,7 @@ 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_10_4"
+	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL_11_1"
 
 	ERRORCODES_TXT = "ext/errorcodes.txt"
 	sh "wget #{URL_ERRORCODES_TXT.inspect} -O #{ERRORCODES_TXT.inspect} || curl #{URL_ERRORCODES_TXT.inspect} -o #{ERRORCODES_TXT.inspect}"

data/Rakefile.cross

@@ -29,8 +29,8 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.0h'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '10.4'
+		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.
@@ -293,6 +293,6 @@ task 'gem:windows' => ['ChangeLog'] do
     mkdir ~/.gem &&
     (cp build/gem/gem-*.pem ~/.gem/ || true) &&
     bundle install --local &&
-    rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 MAKE="make -j`nproc`"
+    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 );

data/ext/errorcodes.txt

@@ -2,7 +2,7 @@
 # errcodes.txt
 #      PostgreSQL error codes
 #
-# Copyright (c) 2003-2017, 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
@@ -177,6 +177,7 @@ 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

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id$
+ * $Id: pg.c,v 2d334508484a 2018/08/27 11:33:43 lars $
  *
  * Author/s:
  *
@@ -48,6 +48,7 @@
 
 #include "pg.h"
 
+int pg_skip_deprecation_warning;
 VALUE rb_mPG;
 VALUE rb_mPGconstants;
 
@@ -142,9 +143,6 @@ pg_find_or_create_johab(void)
 	}
 
 	enc_index = rb_define_dummy_encoding(aliases[0]);
-	for (i = 1; i < sizeof(aliases)/sizeof(aliases[0]); ++i) {
-		rb_enc_alias(aliases[i], aliases[0]);
-	}
 	return rb_enc_from_index(enc_index);
 }
 
@@ -381,6 +379,13 @@ pg_s_init_ssl(VALUE self, VALUE do_ssl)
 void
 Init_pg_ext()
 {
+	if( RTEST(rb_eval_string("ENV['PG_SKIP_DEPRECATION_WARNING']")) ){
+		/* Set all bits to disable all deprecation warnings. */
+		pg_skip_deprecation_warning = 0xFFFF;
+	} else {
+		pg_skip_deprecation_warning = 0;
+	}
+
 	rb_mPG = rb_define_module( "PG" );
 	rb_mPGconstants = rb_define_module_under( rb_mPG, "Constants" );
 

data/ext/pg.h

@@ -21,9 +21,6 @@
 #include "ruby/st.h"
 #include "ruby/encoding.h"
 
-/* exported by ruby-1.9.3+ but not declared */
-extern int rb_enc_alias(const char *, const char *);
-
 #define PG_ENCODING_SET_NOCHECK(obj,i) \
 	do { \
 		if ((i) < ENCODING_INLINE_MAX) \
@@ -104,11 +101,13 @@ typedef struct {
 	/* Kind of PG::Coder object for casting COPY rows to ruby values */
 	VALUE decoder_for_get_copy_data;
 
-	/* The connection socket, used for rb_wait_for_single_fd() */
-	int socket;
-
 	/* enable/disable guessing size of PGresult's allocated memory */
 	int guess_result_memsize;
+
+#if defined(_WIN32)
+	/* File descriptor to be used for rb_w32_unwrap_io_handle() */
+	int ruby_sd;
+#endif
 } t_pg_connection;
 
 typedef struct pg_coder t_pg_coder;
@@ -217,6 +216,7 @@ typedef struct {
  * Globals
  **************************************************************************/
 
+extern int pg_skip_deprecation_warning;
 extern VALUE rb_mPG;
 extern VALUE rb_ePGerror;
 extern VALUE rb_eServerError;
@@ -350,4 +350,16 @@ rb_encoding *pg_conn_enc_get                           _(( PGconn * ));
 void notice_receiver_proxy(void *arg, const PGresult *result);
 void notice_processor_proxy(void *arg, const char *message);
 
+/* reports if `-W' specified and PG_SKIP_DEPRECATION_WARNING environment variable isn't set
+ *
+ * message_id identifies the warning, so that it's reported only once.
+ */
+#define pg_deprecated(message_id, format_args) \
+	do { \
+		if( !(pg_skip_deprecation_warning & (1 << message_id)) ){ \
+			pg_skip_deprecation_warning |= 1 << message_id; \
+			rb_warning format_args; \
+		} \
+	} while(0);
+
 #endif /* end __pg_h */

data/ext/pg_binary_decoder.c

@@ -154,7 +154,8 @@ static VALUE
 pg_bin_dec_timestamp(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
 {
 	int64_t timestamp;
-	struct timespec ts;
+	int64_t sec;
+	int64_t nsec;
 	VALUE t;
 
 	if( len != sizeof(timestamp) ){
@@ -171,14 +172,17 @@ pg_bin_dec_timestamp(t_pg_coder *conv, const char *val, int len, int tuple, int
 		default:
 			/* PostgreSQL's timestamp is based on year 2000 and Ruby's time is based on 1970.
 			 * Adjust the 30 years difference. */
-			ts.tv_sec = (timestamp / 1000000) + 10957L * 24L * 3600L;
-			ts.tv_nsec = (timestamp % 1000000) * 1000;
+			sec = (timestamp / 1000000) + 10957L * 24L * 3600L;
+			nsec = (timestamp % 1000000) * 1000;
 
-#if (RUBY_API_VERSION_MAJOR > 2 || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 3)) && defined(NEGATIVE_TIME_T)
+#if (RUBY_API_VERSION_MAJOR > 2 || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 3)) && defined(NEGATIVE_TIME_T) && defined(SIZEOF_TIME_T) && SIZEOF_TIME_T >= 8
 			/* Fast path for time conversion */
-			t = rb_time_timespec_new(&ts, conv->flags & PG_CODER_TIMESTAMP_APP_LOCAL ? INT_MAX : INT_MAX-1);
+			{
+				struct timespec ts = {sec, nsec};
+				t = rb_time_timespec_new(&ts, conv->flags & PG_CODER_TIMESTAMP_APP_LOCAL ? INT_MAX : INT_MAX-1);
+			}
 #else
-			t = rb_funcall(rb_cTime, rb_intern("at"), 2, LL2NUM(ts.tv_sec), LL2NUM(ts.tv_nsec / 1000));
+			t = rb_funcall(rb_cTime, rb_intern("at"), 2, LL2NUM(sec), LL2NUM(nsec / 1000));
 			if( !(conv->flags & PG_CODER_TIMESTAMP_APP_LOCAL) ) {
 				t = rb_funcall(t, rb_intern("utc"), 0);
 			}

data/ext/pg_binary_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_binary_encoder.c,v e61a06f1f5ed 2015/12/25 21:14:21 lars $
  *
  */
 

data/ext/pg_connection.c

@@ -85,8 +85,7 @@ pgconn_close_socket_io( VALUE self )
 
 	if ( RTEST(socket_io) ) {
 #if defined(_WIN32)
-		int ruby_sd = NUM2INT(rb_funcall( socket_io, rb_intern("fileno"), 0 ));
-		if( rb_w32_unwrap_io_handle(ruby_sd) ){
+		if( rb_w32_unwrap_io_handle(this->ruby_sd) ){
 			rb_raise(rb_eConnectionBad, "Could not unwrap win32 socket handle");
 		}
 #endif
@@ -165,6 +164,10 @@ pgconn_gc_mark( t_pg_connection *this )
 static void
 pgconn_gc_free( t_pg_connection *this )
 {
+#if defined(_WIN32)
+	if ( RTEST(this->socket_io) )
+		rb_w32_unwrap_io_handle( this->ruby_sd );
+#endif
 	if (this->pgconn != NULL)
 		PQfinish( this->pgconn );
 
@@ -198,7 +201,6 @@ pgconn_s_allocate( VALUE klass )
 	this->decoder_for_get_copy_data = Qnil;
 	this->trace_stream = Qnil;
 	this->external_encoding = Qnil;
-	this->socket = -1;
 	this->guess_result_memsize = 1;
 
 	return self;
@@ -272,6 +274,7 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 	this = pg_get_connection( self );
 	conninfo = rb_funcall2( rb_cPGconn, rb_intern("parse_connect_args"), argc, argv );
 	this->pgconn = gvl_PQconnectdb(StringValueCStr(conninfo));
+
 	if(this->pgconn == NULL)
 		rb_raise(rb_ePGerror, "PQconnectdb() unable to allocate structure");
 
@@ -281,10 +284,6 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 		rb_exc_raise(error);
 	}
 
-	this->socket = PQsocket( this->pgconn );
-	if ( this->socket < 0 )
-		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
-
 	pgconn_set_default_encoding( self );
 
 	if (rb_block_given_p()) {
@@ -335,10 +334,6 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 		rb_exc_raise(error);
 	}
 
-	this->socket = PQsocket( this->pgconn );
-	if ( this->socket < 0 )
-		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
-
 	if ( rb_block_given_p() ) {
 		return rb_ensure( rb_yield, rb_conn, pgconn_finish, rb_conn );
 	}
@@ -902,6 +897,7 @@ pgconn_socket_io(VALUE self)
 
 		#ifdef _WIN32
 			ruby_sd = rb_w32_wrap_io_handle((HANDLE)(intptr_t)sd, O_RDWR|O_BINARY|O_NOINHERIT);
+			this->ruby_sd = ruby_sd;
 		#else
 			ruby_sd = sd;
 		#endif
@@ -969,7 +965,7 @@ static VALUE pgconn_exec_params( int, VALUE *, VALUE );
  *    conn.exec(sql) {|pg_result| block }
  *
  * Sends SQL query request specified by _sql_ to PostgreSQL.
- * Returns a PG::Result instance on success.
+ * On success, it returns a PG::Result instance with all result rows and columns.
  * On failure, it raises a PG::Error.
  *
  * For backward compatibility, if you pass more than one parameter to this method,
@@ -1006,7 +1002,7 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 		}
 		return rb_pgresult;
 	}
-	rb_warning("forwarding exec to exec_params is deprecated");
+	pg_deprecated(0, ("forwarding exec to exec_params is deprecated"));
 
 	/* Otherwise, just call #exec_params instead for backward-compatibility */
 	return pgconn_exec_params( argc, argv, self );
@@ -1321,7 +1317,7 @@ pgconn_exec_params( int argc, VALUE *argv, VALUE self )
 	 * is passed to #exec
 	 */
 	if ( NIL_P(paramsData.params) ) {
-		rb_warning("forwarding exec_params to exec is deprecated");
+		pg_deprecated(1, ("forwarding exec_params to exec is deprecated"));
 		return pgconn_exec( 1, argv, self );
 	}
 	pgconn_query_assign_typemap( self, &paramsData );
@@ -1587,7 +1583,7 @@ pgconn_s_escape(VALUE self, VALUE string)
 	int enc_idx;
 	int singleton = !rb_obj_is_kind_of(self, rb_cPGconn);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
 	enc_idx = ENCODING_GET( singleton ? string : self );
 	if( ENCODING_GET(string) != enc_idx ){
 		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
@@ -1703,7 +1699,7 @@ pgconn_escape_literal(VALUE self, VALUE string)
 	VALUE result = Qnil;
 	int enc_idx = ENCODING_GET(self);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
 	if( ENCODING_GET(string) != enc_idx ){
 		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
 	}
@@ -1745,7 +1741,7 @@ pgconn_escape_identifier(VALUE self, VALUE string)
 	VALUE result = Qnil;
 	int enc_idx = ENCODING_GET(self);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
 	if( ENCODING_GET(string) != enc_idx ){
 		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
 	}
@@ -1851,7 +1847,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 		return Qnil;
 	}
 
-	rb_warning("forwarding async_exec to async_exec_params and send_query to send_query_params is deprecated");
+	pg_deprecated(2, ("forwarding async_exec to async_exec_params and send_query to send_query_params is deprecated"));
 
 	/* If called with parameters, and optionally result_format,
 	 * use PQsendQueryParams
@@ -2337,15 +2333,18 @@ pgconn_notifies(VALUE self)
 int rb_w32_wait_events( HANDLE *events, int num, DWORD timeout );
 
 static void *
-wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*is_readable)(PGconn *) )
+wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readable)(PGconn *) )
 {
-	PGconn *conn = this->pgconn;
+	int sd = PQsocket( conn );
 	void *retval;
 	struct timeval aborttime={0,0}, currtime, waittime;
 	DWORD timeout_milisec = INFINITE;
 	DWORD wait_ret;
 	WSAEVENT hEvent;
 
+	if ( sd < 0 )
+		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
+
 	hEvent = WSACreateEvent();
 
 	/* Check for connection errors (PQisBusy is true on connection errors) */
@@ -2360,7 +2359,7 @@ wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*i
 	}
 
 	while ( !(retval=is_readable(conn)) ) {
-		if ( WSAEventSelect(this->socket, hEvent, FD_READ|FD_CLOSE) == SOCKET_ERROR ) {
+		if ( WSAEventSelect(sd, hEvent, FD_READ|FD_CLOSE) == SOCKET_ERROR ) {
 			WSACloseEvent( hEvent );
 			rb_raise( rb_eConnectionBad, "WSAEventSelect socket error: %d", WSAGetLastError() );
 		}
@@ -2412,13 +2411,16 @@ wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*i
 /* non Win32 */
 
 static void *
-wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*is_readable)(PGconn *))
+wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readable)(PGconn *))
 {
-	PGconn *conn = this->pgconn;
+	int sd = PQsocket( conn );
 	int ret;
 	void *retval;
 	struct timeval aborttime={0,0}, currtime, waittime;
 
+	if ( sd < 0 )
+		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
+
 	/* Check for connection errors (PQisBusy is true on connection errors) */
 	if ( PQconsumeInput(conn) == 0 )
 		rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
@@ -2437,7 +2439,7 @@ wait_socket_readable( t_pg_connection *this, struct timeval *ptimeout, void *(*i
 		/* Is the given timeout valid? */
 		if( !ptimeout || (waittime.tv_sec >= 0 && waittime.tv_usec >= 0) ){
 			/* Wait for the socket to become readable before checking again */
-			ret = rb_wait_for_single_fd( this->socket, RB_WAITFD_IN, ptimeout ? &waittime : NULL );
+			ret = rb_wait_for_single_fd( sd, RB_WAITFD_IN, ptimeout ? &waittime : NULL );
 		} else {
 			ret = 0;
 		}
@@ -2484,7 +2486,7 @@ notify_readable(PGconn *conn)
 static VALUE
 pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 {
-	t_pg_connection *this = pg_get_connection_safe( self );
+	PGconn *conn = pg_get_pgconn( self );
 	PGnotify *pnotification;
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
@@ -2500,7 +2502,7 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 		ptimeout = &timeout;
 	}
 
-	pnotification = (PGnotify*) wait_socket_readable( this, ptimeout, notify_readable);
+	pnotification = (PGnotify*) wait_socket_readable( conn, ptimeout, notify_readable);
 
 	/* Return nil if the select timed out */
 	if ( !pnotification ) return Qnil;
@@ -3078,7 +3080,7 @@ get_result_readable(PGconn *conn)
  */
 static VALUE
 pgconn_block( int argc, VALUE *argv, VALUE self ) {
-	t_pg_connection *this = pg_get_connection_safe( self );
+	PGconn *conn = pg_get_pgconn( self );
 
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
@@ -3093,7 +3095,7 @@ pgconn_block( int argc, VALUE *argv, VALUE self ) {
 		ptimeout = &timeout;
 	}
 
-	ret = wait_socket_readable( this, ptimeout, get_result_readable);
+	ret = wait_socket_readable( conn, ptimeout, get_result_readable);
 
 	if( !ret )
 		return Qfalse;
@@ -3223,7 +3225,7 @@ pgconn_async_exec_params(int argc, VALUE *argv, VALUE self)
 	pgconn_discard_results( self );
 	/* If called with no or nil parameters, use PQsendQuery for compatibility */
 	if ( argc == 1 || (argc >= 2 && argc <= 4 && NIL_P(argv[1]) )) {
-		rb_warning("forwarding async_exec_params to async_exec is deprecated");
+		pg_deprecated(3, ("forwarding async_exec_params to async_exec is deprecated"));
 		pgconn_send_query( argc, argv, self );
 	} else {
 		pgconn_send_query_params( argc, argv, self );