pg 0.21.0 → 1.5.3

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v 2e17f315848e 2017/01/14 20:05:06 lars $
+ * $Id$
  *
  */
 
@@ -12,30 +12,41 @@
 
 VALUE rb_cPGconn;
 static ID s_id_encode;
+static ID s_id_autoclose_set;
 static VALUE sym_type, sym_format, sym_value;
-
-static PQnoticeReceiver default_notice_receiver = NULL;
-static PQnoticeProcessor default_notice_processor = NULL;
+static VALUE sym_symbol, sym_string, sym_static_symbol;
 
 static VALUE pgconn_finish( VALUE );
-#ifdef M17N_SUPPORTED
 static VALUE pgconn_set_default_encoding( VALUE self );
-void pgconn_set_internal_encoding_index( VALUE );
-#endif
-
-#ifndef HAVE_RB_THREAD_FD_SELECT
-#define rb_fdset_t fd_set
-#define rb_fd_init(f)
-#define rb_fd_zero(f)  FD_ZERO(f)
-#define rb_fd_set(n, f)  FD_SET(n, f)
-#define rb_fd_term(f)
-#define rb_thread_fd_select rb_thread_select
-#endif
+static VALUE pgconn_wait_for_flush( VALUE self );
+static void pgconn_set_internal_encoding_index( VALUE );
+static const rb_data_type_t pg_connection_type;
+static VALUE pgconn_async_flush(VALUE self);
 
 /*
  * Global functions
  */
 
+/*
+ * Convenience function to raise connection errors
+ */
+#ifdef __GNUC__
+__attribute__((format(printf, 3, 4)))
+#endif
+static void
+pg_raise_conn_error( VALUE klass, VALUE self, const char *format, ...)
+{
+	VALUE msg, error;
+	va_list ap;
+
+	va_start(ap, format);
+	msg = rb_vsprintf(format, ap);
+	va_end(ap);
+	error = rb_exc_new_str(klass, msg);
+	rb_iv_set(error, "@connection", self);
+	rb_exc_raise(error);
+}
+
 /*
  * Fetch the PG::Connection object data pointer.
  */
@@ -43,7 +54,7 @@ t_pg_connection *
 pg_get_connection( VALUE self )
 {
 	t_pg_connection *this;
-	Data_Get_Struct( self, t_pg_connection, this);
+	TypedData_Get_Struct( self, t_pg_connection, &pg_connection_type, this);
 
 	return this;
 }
@@ -56,10 +67,10 @@ static t_pg_connection *
 pg_get_connection_safe( VALUE self )
 {
 	t_pg_connection *this;
-	Data_Get_Struct( self, t_pg_connection, this);
+	TypedData_Get_Struct( self, t_pg_connection, &pg_connection_type, this);
 
 	if ( !this->pgconn )
-		rb_raise( rb_eConnectionBad, "connection is closed" );
+		pg_raise_conn_error( rb_eConnectionBad, self, "connection is closed");
 
 	return this;
 }
@@ -75,10 +86,11 @@ PGconn *
 pg_get_pgconn( VALUE self )
 {
 	t_pg_connection *this;
-	Data_Get_Struct( self, t_pg_connection, this);
+	TypedData_Get_Struct( self, t_pg_connection, &pg_connection_type, this);
 
-	if ( !this->pgconn )
-		rb_raise( rb_eConnectionBad, "connection is closed" );
+	if ( !this->pgconn ){
+		pg_raise_conn_error( rb_eConnectionBad, self, "connection is closed");
+	}
 
 	return this->pgconn;
 }
@@ -95,16 +107,14 @@ pgconn_close_socket_io( VALUE self )
 	VALUE socket_io = this->socket_io;
 
 	if ( RTEST(socket_io) ) {
-#if defined(_WIN32) && defined(HAVE_RB_W32_WRAP_IO_HANDLE)
-		int ruby_sd = NUM2INT(rb_funcall( socket_io, rb_intern("fileno"), 0 ));
-		if( rb_w32_unwrap_io_handle(ruby_sd) ){
-			rb_raise(rb_eConnectionBad, "Could not unwrap win32 socket handle");
-		}
+#if defined(_WIN32)
+		if( rb_w32_unwrap_io_handle(this->ruby_sd) )
+			pg_raise_conn_error( rb_eConnectionBad, self, "Could not unwrap win32 socket handle");
 #endif
 		rb_funcall( socket_io, rb_intern("close"), 0 );
 	}
 
-	this->socket_io = Qnil;
+	RB_OBJ_WRITE(self, &this->socket_io, Qnil);
 }
 
 
@@ -156,17 +166,31 @@ static const char *pg_cstr_enc(VALUE str, int enc_idx){
  * GC Mark function
  */
 static void
-pgconn_gc_mark( t_pg_connection *this )
+pgconn_gc_mark( void *_this )
+{
+	t_pg_connection *this = (t_pg_connection *)_this;
+	rb_gc_mark_movable( this->socket_io );
+	rb_gc_mark_movable( this->notice_receiver );
+	rb_gc_mark_movable( this->notice_processor );
+	rb_gc_mark_movable( this->type_map_for_queries );
+	rb_gc_mark_movable( this->type_map_for_results );
+	rb_gc_mark_movable( this->trace_stream );
+	rb_gc_mark_movable( this->encoder_for_put_copy_data );
+	rb_gc_mark_movable( this->decoder_for_get_copy_data );
+}
+
+static void
+pgconn_gc_compact( void *_this )
 {
-	rb_gc_mark( this->socket_io );
-	rb_gc_mark( this->notice_receiver );
-	rb_gc_mark( this->notice_processor );
-	rb_gc_mark( this->type_map_for_queries );
-	rb_gc_mark( this->type_map_for_results );
-	rb_gc_mark( this->trace_stream );
-	rb_gc_mark( this->external_encoding );
-	rb_gc_mark( this->encoder_for_put_copy_data );
-	rb_gc_mark( this->decoder_for_get_copy_data );
+	t_pg_connection *this = (t_pg_connection *)_this;
+	pg_gc_location( this->socket_io );
+	pg_gc_location( this->notice_receiver );
+	pg_gc_location( this->notice_processor );
+	pg_gc_location( this->type_map_for_queries );
+	pg_gc_location( this->type_map_for_results );
+	pg_gc_location( this->trace_stream );
+	pg_gc_location( this->encoder_for_put_copy_data );
+	pg_gc_location( this->decoder_for_get_copy_data );
 }
 
 
@@ -174,14 +198,45 @@ pgconn_gc_mark( t_pg_connection *this )
  * GC Free function
  */
 static void
-pgconn_gc_free( t_pg_connection *this )
+pgconn_gc_free( void *_this )
 {
+	t_pg_connection *this = (t_pg_connection *)_this;
+#if defined(_WIN32)
+	if ( RTEST(this->socket_io) ) {
+		if( rb_w32_unwrap_io_handle(this->ruby_sd) ){
+			rb_warn("pg: Could not unwrap win32 socket handle by garbage collector");
+		}
+	}
+#endif
 	if (this->pgconn != NULL)
 		PQfinish( this->pgconn );
 
 	xfree(this);
 }
 
+/*
+ * Object Size function
+ */
+static size_t
+pgconn_memsize( const void *_this )
+{
+	const t_pg_connection *this = (const t_pg_connection *)_this;
+	return sizeof(*this);
+}
+
+static const rb_data_type_t pg_connection_type = {
+	"PG::Connection",
+	{
+		pgconn_gc_mark,
+		pgconn_gc_free,
+		pgconn_memsize,
+		pg_compact_callback(pgconn_gc_compact),
+	},
+	0,
+	0,
+	RUBY_TYPED_WB_PROTECTED,
+};
+
 
 /**************************************************************************
  * Class Methods
@@ -197,103 +252,40 @@ static VALUE
 pgconn_s_allocate( VALUE klass )
 {
 	t_pg_connection *this;
-	VALUE self = Data_Make_Struct( klass, t_pg_connection, pgconn_gc_mark, pgconn_gc_free, this );
+	VALUE self = TypedData_Make_Struct( klass, t_pg_connection, &pg_connection_type, this );
 
 	this->pgconn = NULL;
-	this->socket_io = Qnil;
-	this->notice_receiver = Qnil;
-	this->notice_processor = Qnil;
-	this->type_map_for_queries = pg_typemap_all_strings;
-	this->type_map_for_results = pg_typemap_all_strings;
-	this->encoder_for_put_copy_data = Qnil;
-	this->decoder_for_get_copy_data = Qnil;
-	this->trace_stream = Qnil;
-	this->external_encoding = Qnil;
+	RB_OBJ_WRITE(self, &this->socket_io, Qnil);
+	RB_OBJ_WRITE(self, &this->notice_receiver, Qnil);
+	RB_OBJ_WRITE(self, &this->notice_processor, Qnil);
+	RB_OBJ_WRITE(self, &this->type_map_for_queries, pg_typemap_all_strings);
+	RB_OBJ_WRITE(self, &this->type_map_for_results, pg_typemap_all_strings);
+	RB_OBJ_WRITE(self, &this->encoder_for_put_copy_data, Qnil);
+	RB_OBJ_WRITE(self, &this->decoder_for_get_copy_data, Qnil);
+	RB_OBJ_WRITE(self, &this->trace_stream, Qnil);
+	rb_ivar_set(self, rb_intern("@calls_to_put_copy_data"), INT2FIX(0));
 
 	return self;
 }
 
-
-/*
- * Document-method: new
- *
- * call-seq:
- *    PG::Connection.new -> conn
- *    PG::Connection.new(connection_hash) -> conn
- *    PG::Connection.new(connection_string) -> conn
- *    PG::Connection.new(host, port, options, tty, dbname, user, password) ->  conn
- *
- * Create a connection to the specified server.
- *
- * [+host+]
- *   server hostname
- * [+hostaddr+]
- *   server address (avoids hostname lookup, overrides +host+)
- * [+port+]
- *   server port number
- * [+dbname+]
- *   connecting database name
- * [+user+]
- *   login user name
- * [+password+]
- *   login password
- * [+connect_timeout+]
- *   maximum time to wait for connection to succeed
- * [+options+]
- *   backend options
- * [+tty+]
- *   (ignored in newer versions of PostgreSQL)
- * [+sslmode+]
- *   (disable|allow|prefer|require)
- * [+krbsrvname+]
- *   kerberos service name
- * [+gsslib+]
- *   GSS library to use for GSSAPI authentication
- * [+service+]
- *   service name to use for additional parameters
- *
- * Examples:
- *
- *   # Connect using all defaults
- *   PG::Connection.new
- *
- *   # As a Hash
- *   PG::Connection.new( :dbname => 'test', :port => 5432 )
- *
- *   # As a String
- *   PG::Connection.new( "dbname=test port=5432" )
- *
- *   # As an Array
- *   PG::Connection.new( nil, 5432, nil, nil, 'test', nil, nil )
- *
- * If the Ruby default internal encoding is set (i.e., Encoding.default_internal != nil), the
- * connection will have its +client_encoding+ set accordingly.
- *
- * Raises a PG::Error if the connection fails.
- */
 static VALUE
-pgconn_init(int argc, VALUE *argv, VALUE self)
+pgconn_s_sync_connect(int argc, VALUE *argv, VALUE klass)
 {
 	t_pg_connection *this;
 	VALUE conninfo;
-	VALUE error;
+	VALUE self = pgconn_s_allocate( klass );
 
 	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");
+		rb_raise(rb_ePGerror, "PQconnectdb() unable to allocate PGconn structure");
 
-	if (PQstatus(this->pgconn) == CONNECTION_BAD) {
-		error = rb_exc_new2(rb_eConnectionBad, PQerrorMessage(this->pgconn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+	if (PQstatus(this->pgconn) == CONNECTION_BAD)
+		pg_raise_conn_error( rb_eConnectionBad, self, "%s", PQerrorMessage(this->pgconn));
 
-#ifdef M17N_SUPPORTED
 	pgconn_set_default_encoding( self );
-#endif
 
 	if (rb_block_given_p()) {
 		return rb_ensure(rb_yield, self, pgconn_finish, self);
@@ -307,14 +299,16 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
  *    PG::Connection.connect_start(connection_string)     -> conn
  *    PG::Connection.connect_start(host, port, options, tty, dbname, login, password) ->  conn
  *
- * This is an asynchronous version of PG::Connection.connect().
+ * This is an asynchronous version of PG::Connection.new.
  *
  * Use #connect_poll to poll the status of the connection.
  *
  * NOTE: this does *not* set the connection's +client_encoding+ for you if
- * Encoding.default_internal is set. To set it after the connection is established,
+ * +Encoding.default_internal+ is set. To set it after the connection is established,
  * call #internal_encoding=. You can also set it automatically by setting
- * ENV['PGCLIENTENCODING'], or include the 'options' connection parameter.
+ * <code>ENV['PGCLIENTENCODING']</code>, or include the 'options' connection parameter.
+ *
+ * See also the 'sample' directory of this gem and the corresponding {libpq functions}[https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-PQCONNECTSTARTPARAMS].
  *
  */
 static VALUE
@@ -322,7 +316,6 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 {
 	VALUE rb_conn;
 	VALUE conninfo;
-	VALUE error;
 	t_pg_connection *this;
 
 	/*
@@ -335,13 +328,10 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 	this->pgconn = gvl_PQconnectStart( StringValueCStr(conninfo) );
 
 	if( this->pgconn == NULL )
-		rb_raise(rb_ePGerror, "PQconnectStart() unable to allocate structure");
+		rb_raise(rb_ePGerror, "PQconnectStart() unable to allocate PGconn structure");
 
-	if ( PQstatus(this->pgconn) == CONNECTION_BAD ) {
-		error = rb_exc_new2(rb_eConnectionBad, PQerrorMessage(this->pgconn));
-		rb_iv_set(error, "@connection", rb_conn);
-		rb_exc_raise(error);
-	}
+	if ( PQstatus(this->pgconn) == CONNECTION_BAD )
+		pg_raise_conn_error( rb_eConnectionBad, rb_conn, "%s", PQerrorMessage(this->pgconn));
 
 	if ( rb_block_given_p() ) {
 		return rb_ensure( rb_yield, rb_conn, pgconn_finish, rb_conn );
@@ -349,37 +339,17 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 	return rb_conn;
 }
 
-#ifdef HAVE_PQPING
-/*
- * call-seq:
- *    PG::Connection.ping(connection_hash)       -> Integer
- *    PG::Connection.ping(connection_string)     -> Integer
- *    PG::Connection.ping(host, port, options, tty, dbname, login, password) ->  Integer
- *
- * Check server status.
- *
- * Returns one of:
- * [+PQPING_OK+]
- *   server is accepting connections
- * [+PQPING_REJECT+]
- *   server is alive but rejecting connections
- * [+PQPING_NO_RESPONSE+]
- *   could not establish connection
- * [+PQPING_NO_ATTEMPT+]
- *   connection not attempted (bad params)
- */
 static VALUE
-pgconn_s_ping( int argc, VALUE *argv, VALUE klass )
+pgconn_s_sync_ping( int argc, VALUE *argv, VALUE klass )
 {
 	PGPing ping;
 	VALUE conninfo;
 
 	conninfo = rb_funcall2( klass, rb_intern("parse_connect_args"), argc, argv );
-	ping     = PQping( StringValueCStr(conninfo) );
+	ping     = gvl_PQping( StringValueCStr(conninfo) );
 
 	return INT2FIX((int)ping);
 }
-#endif
 
 
 /*
@@ -417,17 +387,71 @@ pgconn_s_conndefaults(VALUE self)
 	return array;
 }
 
+/*
+ * Document-method: PG::Connection.conninfo_parse
+ *
+ * call-seq:
+ *    PG::Connection.conninfo_parse(conninfo_string) -> Array
+ *
+ * Returns parsed connection options from the provided connection string as an array of hashes.
+ * Each hash has the same keys as PG::Connection.conndefaults() .
+ * The values from the +conninfo_string+ are stored in the +:val+ key.
+ */
+static VALUE
+pgconn_s_conninfo_parse(VALUE self, VALUE conninfo)
+{
+	VALUE array;
+	char *errmsg = NULL;
+	PQconninfoOption *options = PQconninfoParse(StringValueCStr(conninfo), &errmsg);
+	if(errmsg){
+		VALUE error = rb_str_new_cstr(errmsg);
+		PQfreemem(errmsg);
+		rb_raise(rb_ePGerror, "%"PRIsVALUE, error);
+	}
+	array = pgconn_make_conninfo_array( options );
+
+	PQconninfoFree(options);
+
+	UNUSED( self );
+
+	return array;
+}
+
+
+#ifdef HAVE_PQENCRYPTPASSWORDCONN
+static VALUE
+pgconn_sync_encrypt_password(int argc, VALUE *argv, VALUE self)
+{
+	char *encrypted = NULL;
+	VALUE rval = Qnil;
+	VALUE password, username, algorithm;
+	PGconn *conn = pg_get_pgconn(self);
+
+	rb_scan_args( argc, argv, "21", &password, &username, &algorithm );
+
+	Check_Type(password, T_STRING);
+	Check_Type(username, T_STRING);
+
+	encrypted = gvl_PQencryptPasswordConn(conn, StringValueCStr(password), StringValueCStr(username), RTEST(algorithm) ? StringValueCStr(algorithm) : NULL);
+	if ( encrypted ) {
+		rval = rb_str_new2( encrypted );
+		PQfreemem( encrypted );
+	} else {
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
+	}
+
+	return rval;
+}
+#endif
+
 
 /*
  * call-seq:
  *    PG::Connection.encrypt_password( password, username ) -> String
  *
- * This function is intended to be used by client applications that
- * send commands like: +ALTER USER joe PASSWORD 'pwd'+.
- * The arguments are the cleartext password, and the SQL name
- * of the user it is for.
+ * This is an older, deprecated version of #encrypt_password.
+ * The difference is that this function always uses +md5+ as the encryption algorithm.
  *
- * Return value is the encrypted password.
  */
 static VALUE
 pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
@@ -444,9 +468,6 @@ pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
 	rval = rb_str_new2( encrypted );
 	PQfreemem( encrypted );
 
-	OBJ_INFECT( rval, password );
-	OBJ_INFECT( rval, username );
-
 	return rval;
 }
 
@@ -470,17 +491,18 @@ pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
  *   the asynchronous connection is ready
  *
  * Example:
- *   conn = PG::Connection.connect_start("dbname=mydatabase")
- *   socket = conn.socket_io
+ *   require "io/wait"
+ *
+ *   conn = PG::Connection.connect_start(dbname: 'mydatabase')
  *   status = conn.connect_poll
  *   while(status != PG::PGRES_POLLING_OK) do
  *     # do some work while waiting for the connection to complete
  *     if(status == PG::PGRES_POLLING_READING)
- *       if(not select([socket], [], [], 10.0))
+ *       unless conn.socket_io.wait_readable(10.0)
  *         raise "Asynchronous connection timed out!"
  *       end
  *     elsif(status == PG::PGRES_POLLING_WRITING)
- *       if(not select([], [socket], [], 10.0))
+ *       unless conn.socket_io.wait_writable(10.0)
  *         raise "Asynchronous connection timed out!"
  *       end
  *     end
@@ -494,6 +516,9 @@ pgconn_connect_poll(VALUE self)
 {
 	PostgresPollingStatusType status;
 	status = gvl_PQconnectPoll(pg_get_pgconn(self));
+
+	pgconn_close_socket_io(self);
+
 	return INT2FIX((int)status);
 }
 
@@ -530,15 +555,8 @@ pgconn_finished_p( VALUE self )
 }
 
 
-/*
- * call-seq:
- *    conn.reset()
- *
- * Resets the backend connection. This method closes the
- * backend connection and tries to re-connect.
- */
 static VALUE
-pgconn_reset( VALUE self )
+pgconn_sync_reset( VALUE self )
 {
 	pgconn_close_socket_io( self );
 	gvl_PQreset( pg_get_pgconn(self) );
@@ -560,7 +578,7 @@ pgconn_reset_start(VALUE self)
 {
 	pgconn_close_socket_io( self );
 	if(gvl_PQresetStart(pg_get_pgconn(self)) == 0)
-		rb_raise(rb_eUnableToSend, "reset has failed");
+		pg_raise_conn_error( rb_eUnableToSend, self, "reset has failed");
 	return Qnil;
 }
 
@@ -577,6 +595,9 @@ pgconn_reset_poll(VALUE self)
 {
 	PostgresPollingStatusType status;
 	status = gvl_PQresetPoll(pg_get_pgconn(self));
+
+	pgconn_close_socket_io(self);
+
 	return INT2FIX((int)status);
 }
 
@@ -592,7 +613,7 @@ pgconn_db(VALUE self)
 {
 	char *db = PQdb(pg_get_pgconn(self));
 	if (!db) return Qnil;
-	return rb_tainted_str_new2(db);
+	return rb_str_new2(db);
 }
 
 /*
@@ -606,36 +627,67 @@ pgconn_user(VALUE self)
 {
 	char *user = PQuser(pg_get_pgconn(self));
 	if (!user) return Qnil;
-	return rb_tainted_str_new2(user);
+	return rb_str_new2(user);
 }
 
 /*
  * call-seq:
  *    conn.pass()
  *
- * Returns the authenticated user name.
+ * Returns the authenticated password.
  */
 static VALUE
 pgconn_pass(VALUE self)
 {
 	char *user = PQpass(pg_get_pgconn(self));
 	if (!user) return Qnil;
-	return rb_tainted_str_new2(user);
+	return rb_str_new2(user);
 }
 
 /*
  * call-seq:
  *    conn.host()
  *
- * Returns the connected server name.
+ * Returns the server host name of the active connection.
+ * This can be a host name, an IP address, or a directory path if the connection is via Unix socket.
+ * (The path case can be distinguished because it will always be an absolute path, beginning with +/+ .)
+ *
+ * If the connection parameters specified both host and hostaddr, then +host+ will return the host information.
+ * If only hostaddr was specified, then that is returned.
+ * If multiple hosts were specified in the connection parameters, +host+ returns the host actually connected to.
+ *
+ * If there is an error producing the host information (perhaps if the connection has not been fully established or there was an error), it returns an empty string.
+ *
+ * If multiple hosts were specified in the connection parameters, it is not possible to rely on the result of +host+ until the connection is established.
+ * The status of the connection can be checked using the function Connection#status .
  */
 static VALUE
 pgconn_host(VALUE self)
 {
 	char *host = PQhost(pg_get_pgconn(self));
 	if (!host) return Qnil;
-	return rb_tainted_str_new2(host);
+	return rb_str_new2(host);
+}
+
+/* PQhostaddr() appeared in PostgreSQL-12 together with PQresultMemorySize() */
+#if defined(HAVE_PQRESULTMEMORYSIZE)
+/*
+ * call-seq:
+ *    conn.hostaddr()
+ *
+ * Returns the server IP address of the active connection.
+ * This can be the address that a host name resolved to, or an IP address provided through the hostaddr parameter.
+ * If there is an error producing the host information (perhaps if the connection has not been fully established or there was an error), it returns an empty string.
+ *
+ */
+static VALUE
+pgconn_hostaddr(VALUE self)
+{
+	char *host = PQhostaddr(pg_get_pgconn(self));
+	if (!host) return Qnil;
+	return rb_str_new2(host);
 }
+#endif
 
 /*
  * call-seq:
@@ -647,21 +699,22 @@ static VALUE
 pgconn_port(VALUE self)
 {
 	char* port = PQport(pg_get_pgconn(self));
-	return INT2NUM(atol(port));
+	if (!port || port[0] == '\0')
+		return INT2NUM(DEF_PGPORT);
+	else
+		return INT2NUM(atoi(port));
 }
 
 /*
  * call-seq:
  *    conn.tty()
  *
- * Returns the connected pgtty. (Obsolete)
+ * Obsolete function.
  */
 static VALUE
 pgconn_tty(VALUE self)
 {
-	char *tty = PQtty(pg_get_pgconn(self));
-	if (!tty) return Qnil;
-	return rb_tainted_str_new2(tty);
+	return rb_str_new2("");
 }
 
 /*
@@ -675,17 +728,17 @@ pgconn_options(VALUE self)
 {
 	char *options = PQoptions(pg_get_pgconn(self));
 	if (!options) return Qnil;
-	return rb_tainted_str_new2(options);
+	return rb_str_new2(options);
 }
 
 
-#ifdef HAVE_PQCONNINFO
 /*
  * call-seq:
  *    conn.conninfo   -> hash
  *
  * Returns the connection options used by a live connection.
  *
+ * Available since PostgreSQL-9.3
  */
 static VALUE
 pgconn_conninfo( VALUE self )
@@ -698,14 +751,24 @@ pgconn_conninfo( VALUE self )
 
 	return array;
 }
-#endif
 
 
 /*
  * call-seq:
  *    conn.status()
  *
- * Returns status of connection : CONNECTION_OK or CONNECTION_BAD
+ * Returns the status of the connection, which is one:
+ *   PG::Constants::CONNECTION_OK
+ *   PG::Constants::CONNECTION_BAD
+ *
+ * ... and other constants of kind PG::Constants::CONNECTION_*
+ *
+ * This method returns the status of the last command from memory.
+ * It doesn't do any socket access hence is not suitable to test the connectivity.
+ * See check_socket for a way to verify the socket state.
+ *
+ * Example:
+ *   PG.constants.grep(/CONNECTION_/).find{|c| PG.const_get(c) == conn.status} # => :CONNECTION_OK
  */
 static VALUE
 pgconn_status(VALUE self)
@@ -755,7 +818,7 @@ pgconn_parameter_status(VALUE self, VALUE param_name)
 	if(ret == NULL)
 		return Qnil;
 	else
-		return rb_tainted_str_new2(ret);
+		return rb_str_new2(ret);
 }
 
 /*
@@ -793,20 +856,25 @@ pgconn_server_version(VALUE self)
  * call-seq:
  *    conn.error_message -> String
  *
- * Returns the error message about connection.
+ * Returns the error message most recently generated by an operation on the connection.
+ *
+ * Nearly all libpq functions will set a message for conn.error_message if they fail.
+ * Note that by libpq convention, a nonempty error_message result can consist of multiple lines, and will include a trailing newline.
  */
 static VALUE
 pgconn_error_message(VALUE self)
 {
 	char *error = PQerrorMessage(pg_get_pgconn(self));
 	if (!error) return Qnil;
-	return rb_tainted_str_new2(error);
+	return rb_str_new2(error);
 }
 
 /*
  * call-seq:
  *    conn.socket() -> Integer
  *
+ * This method is deprecated. Please use the more portable method #socket_io .
+ *
  * Returns the socket's file descriptor for this connection.
  * <tt>IO.for_fd()</tt> can be used to build a proper IO object to the socket.
  * If you do so, you will likely also want to set <tt>autoclose=false</tt>
@@ -815,69 +883,71 @@ pgconn_error_message(VALUE self)
  * creates an IO that's associated with the connection object itself,
  * and so won't go out of scope until the connection does.
  *
- * *Note:* On Windows the file descriptor is not really usable,
+ * *Note:* On Windows the file descriptor is not usable,
  * since it can not be used to build a Ruby IO object.
  */
 static VALUE
 pgconn_socket(VALUE self)
 {
 	int sd;
+	pg_deprecated(4, ("conn.socket is deprecated and should be replaced by conn.socket_io"));
+
 	if( (sd = PQsocket(pg_get_pgconn(self))) < 0)
-		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
+		pg_raise_conn_error( rb_eConnectionBad, self, "PQsocket() can't get socket descriptor");
+
 	return INT2NUM(sd);
 }
 
-
-#if !defined(_WIN32) || defined(HAVE_RB_W32_WRAP_IO_HANDLE)
-
 /*
  * call-seq:
  *    conn.socket_io() -> IO
  *
- * Fetch a memoized IO object created from the Connection's underlying socket.
- * This object can be used for IO.select to wait for events while running
- * asynchronous API calls.
+ * Fetch an IO object created from the Connection's underlying socket.
+ * This object can be used per <tt>socket_io.wait_readable</tt>, <tt>socket_io.wait_writable</tt> or for <tt>IO.select</tt> to wait for events while running asynchronous API calls.
+ * <tt>IO#wait_*able</tt> is is <tt>Fiber.scheduler</tt> compatible in contrast to <tt>IO.select</tt>.
  *
- * Using this instead of #socket avoids the problem of the underlying connection
- * being closed by Ruby when an IO created using <tt>IO.for_fd(conn.socket)</tt>
- * goes out of scope.
+ * The IO object can change while the connection is established, but is memorized afterwards.
+ * So be sure not to cache the IO object, but repeat calling <tt>conn.socket_io</tt> instead.
  *
- * This method can also be used on Windows but requires Ruby-2.0+.
+ * Using this method also works on Windows in contrast to using #socket .
+ * It also avoids the problem of the underlying connection being closed by Ruby when an IO created using <tt>IO.for_fd(conn.socket)</tt> goes out of scope.
  */
 static VALUE
 pgconn_socket_io(VALUE self)
 {
 	int sd;
 	int ruby_sd;
-	ID id_autoclose = rb_intern("autoclose=");
 	t_pg_connection *this = pg_get_connection_safe( self );
+	VALUE cSocket;
 	VALUE socket_io = this->socket_io;
 
 	if ( !RTEST(socket_io) ) {
-		if( (sd = PQsocket(this->pgconn)) < 0)
-			rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
+		if( (sd = PQsocket(this->pgconn)) < 0){
+			pg_raise_conn_error( rb_eConnectionBad, self, "PQsocket() can't get socket descriptor");
+		}
 
 		#ifdef _WIN32
 			ruby_sd = rb_w32_wrap_io_handle((HANDLE)(intptr_t)sd, O_RDWR|O_BINARY|O_NOINHERIT);
+			if( ruby_sd == -1 )
+				pg_raise_conn_error( rb_eConnectionBad, self, "Could not wrap win32 socket handle");
+
+			this->ruby_sd = ruby_sd;
 		#else
 			ruby_sd = sd;
 		#endif
 
-		socket_io = rb_funcall( rb_cIO, rb_intern("for_fd"), 1, INT2NUM(ruby_sd) );
+		cSocket = rb_const_get(rb_cObject, rb_intern("BasicSocket"));
+		socket_io = rb_funcall( cSocket, rb_intern("for_fd"), 1, INT2NUM(ruby_sd));
 
-		/* Disable autoclose feature, when supported */
-		if( rb_respond_to(socket_io, id_autoclose) ){
-			rb_funcall( socket_io, id_autoclose, 1, Qfalse );
-		}
+		/* Disable autoclose feature */
+		rb_funcall( socket_io, s_id_autoclose_set, 1, Qfalse );
 
-		this->socket_io = socket_io;
+		RB_OBJ_WRITE(self, &this->socket_io, socket_io);
 	}
 
 	return socket_io;
 }
 
-#endif
-
 /*
  * call-seq:
  *    conn.backend_pid() -> Integer
@@ -892,6 +962,51 @@ pgconn_backend_pid(VALUE self)
 	return INT2NUM(PQbackendPID(pg_get_pgconn(self)));
 }
 
+typedef struct
+{
+	struct sockaddr_storage addr;
+	socklen_t salen;
+} SockAddr;
+
+/* Copy of struct pg_cancel from libpq-int.h
+ *
+ * See https://github.com/postgres/postgres/blame/master/src/interfaces/libpq/libpq-int.h#L577-L586
+ */
+struct pg_cancel
+{
+	SockAddr	raddr;			/* Remote address */
+	int			be_pid;			/* PID of backend --- needed for cancels */
+	int			be_key;			/* key of backend --- needed for cancels */
+};
+
+/*
+ * call-seq:
+ *    conn.backend_key() -> Integer
+ *
+ * Returns the key of the backend server process for this connection.
+ * This key can be used to cancel queries on the server.
+ */
+static VALUE
+pgconn_backend_key(VALUE self)
+{
+	int be_key;
+	struct pg_cancel *cancel;
+	PGconn *conn = pg_get_pgconn(self);
+
+	cancel = (struct pg_cancel*)PQgetCancel(conn);
+	if(cancel == NULL)
+		pg_raise_conn_error( rb_ePGerror, self, "Invalid connection!");
+
+	if( cancel->be_pid != PQbackendPID(conn) )
+		rb_raise(rb_ePGerror,"Unexpected binary struct layout - please file a bug report at ruby-pg!");
+
+	be_key = cancel->be_key;
+
+	PQfreeCancel(cancel);
+
+	return INT2NUM(be_key);
+}
+
 /*
  * call-seq:
  *    conn.connection_needs_password() -> Boolean
@@ -922,44 +1037,35 @@ pgconn_connection_used_password(VALUE self)
 /* :TODO: get_ssl */
 
 
-static VALUE pgconn_exec_params( int, VALUE *, VALUE );
+static VALUE pgconn_sync_exec_params( int, VALUE *, VALUE );
 
 /*
  * call-seq:
- *    conn.exec(sql) -> PG::Result
- *    conn.exec(sql) {|pg_result| block }
- *
- * Sends SQL query request specified by _sql_ to PostgreSQL.
- * Returns a PG::Result instance on success.
- * On failure, it raises a PG::Error.
+ *    conn.sync_exec(sql) -> PG::Result
+ *    conn.sync_exec(sql) {|pg_result| block }
  *
- * For backward compatibility, if you pass more than one parameter to this method,
- * it will call #exec_params for you. New code should explicitly use #exec_params if
- * argument placeholders are used.
+ * This function has the same behavior as #async_exec, but is implemented using the synchronous command processing API of libpq.
+ * It's not recommended to use explicit sync or async variants but #exec instead, unless you have a good reason to do so.
  *
- * If the optional code block is given, it will be passed <i>result</i> as an argument,
- * and the PG::Result object will  automatically be cleared when the block terminates.
- * In this instance, <code>conn.exec</code> returns the value of the block.
+ * Both #sync_exec and #async_exec release the GVL while waiting for server response, so that concurrent threads will get executed.
+ * However #async_exec has two advantages:
  *
- * #exec is implemented on the synchronous command processing API of libpq, whereas
- * #async_exec is implemented on the asynchronous API.
- * #exec is somewhat faster that #async_exec, but blocks any signals to be processed until
- * the query is finished. This is most notably visible by a delayed reaction to Control+C.
- * Both methods ensure that other threads can process while waiting for the server to
- * complete the request.
+ * 1. #async_exec can be aborted by signals (like Ctrl-C), while #exec blocks signal processing until the query is answered.
+ * 2. Ruby VM gets notified about IO blocked operations and can pass them through <tt>Fiber.scheduler</tt>.
+ *    So only <tt>async_*</tt> methods are compatible to event based schedulers like the async gem.
  */
 static VALUE
-pgconn_exec(int argc, VALUE *argv, VALUE self)
+pgconn_sync_exec(int argc, VALUE *argv, VALUE self)
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	PGresult *result = NULL;
 	VALUE rb_pgresult;
 
-	/* If called with no parameters, use PQexec */
-	if ( argc == 1 ) {
+	/* If called with no or nil parameters, use PQexec for compatibility */
+	if ( argc == 1 || (argc >= 2 && argc <= 4 && NIL_P(argv[1]) )) {
 		VALUE query_str = argv[0];
 
-		result = gvl_PQexec(conn, pg_cstr_enc(query_str, ENCODING_GET(self)));
+		result = gvl_PQexec(this->pgconn, pg_cstr_enc(query_str, this->enc_idx));
 		rb_pgresult = pg_new_result(result, self);
 		pg_result_check(rb_pgresult);
 		if (rb_block_given_p()) {
@@ -967,11 +1073,10 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 		}
 		return rb_pgresult;
 	}
+	pg_deprecated(0, ("forwarding exec to exec_params is deprecated"));
 
 	/* Otherwise, just call #exec_params instead for backward-compatibility */
-	else {
-		return pgconn_exec_params( argc, argv, self );
-	}
+	return pgconn_sync_exec_params( argc, argv, self );
 
 }
 
@@ -1003,7 +1108,7 @@ struct query_params_data {
 	 * Filled by alloc_query_params()
 	 */
 
-	/* Wraps the pointer of allocated memory, if function parameters dont't
+	/* Wraps the pointer of allocated memory, if function parameters don't
 	 * fit in the memory_pool below.
 	 */
 	VALUE heap_pool;
@@ -1021,7 +1126,7 @@ struct query_params_data {
 	Oid *types;
 
 	/* This array takes the string values for the timeframe of the query,
-	 * if param value convertion is required
+	 * if param value conversion is required
 	 */
 	VALUE gc_array;
 
@@ -1035,8 +1140,9 @@ struct query_params_data {
 };
 
 static void
-free_typecast_heap_chain(struct linked_typecast_data *chain_entry)
+free_typecast_heap_chain(void *_chain_entry)
 {
+	struct linked_typecast_data *chain_entry = (struct linked_typecast_data *)_chain_entry;
 	while(chain_entry){
 		struct linked_typecast_data *next = chain_entry->next;
 		xfree(chain_entry);
@@ -1044,6 +1150,18 @@ free_typecast_heap_chain(struct linked_typecast_data *chain_entry)
 	}
 }
 
+static const rb_data_type_t pg_typecast_buffer_type = {
+	"PG::Connection typecast buffer chain",
+	{
+		(RUBY_DATA_FUNC) NULL,
+		free_typecast_heap_chain,
+		(size_t (*)(const void *))NULL,
+	},
+	0,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 static char *
 alloc_typecast_buf( VALUE *typecast_heap_chain, int len )
 {
@@ -1054,17 +1172,28 @@ alloc_typecast_buf( VALUE *typecast_heap_chain, int len )
 	/* Did we already wrap a memory chain per T_DATA object? */
 	if( NIL_P( *typecast_heap_chain ) ){
 		/* Leave free'ing of the buffer chain to the GC, when paramsData has left the stack */
-		*typecast_heap_chain = Data_Wrap_Struct( rb_cObject, NULL, free_typecast_heap_chain, allocated );
+		*typecast_heap_chain = TypedData_Wrap_Struct( rb_cObject, &pg_typecast_buffer_type, allocated );
 		allocated->next = NULL;
 	} else {
 		/* Append to the chain */
-		allocated->next = DATA_PTR( *typecast_heap_chain );
-		DATA_PTR( *typecast_heap_chain ) = allocated;
+		allocated->next = RTYPEDDATA_DATA( *typecast_heap_chain );
+		RTYPEDDATA_DATA( *typecast_heap_chain ) = allocated;
 	}
 
 	return &allocated->data[0];
 }
 
+static const rb_data_type_t pg_query_heap_pool_type = {
+	"PG::Connection query heap pool",
+	{
+		(RUBY_DATA_FUNC) NULL,
+		RUBY_TYPED_DEFAULT_FREE,
+		(size_t (*)(const void *))NULL,
+	},
+	0,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
 
 static int
 alloc_query_params(struct query_params_data *paramsData)
@@ -1079,7 +1208,7 @@ alloc_query_params(struct query_params_data *paramsData)
 
 	Check_Type(paramsData->params, T_ARRAY);
 
-	p_typemap = DATA_PTR( paramsData->typemap );
+	p_typemap = RTYPEDDATA_DATA( paramsData->typemap );
 	p_typemap->funcs.fit_to_query( paramsData->typemap, paramsData->params );
 
 	paramsData->heap_pool = Qnil;
@@ -1098,7 +1227,7 @@ alloc_query_params(struct query_params_data *paramsData)
 		/* Allocate one combined memory pool for all possible function parameters */
 		memory_pool = (char*)xmalloc( required_pool_size );
 		/* Leave free'ing of the buffer to the GC, when paramsData has left the stack */
-		paramsData->heap_pool = Data_Wrap_Struct( rb_cObject, NULL, -1, memory_pool );
+		paramsData->heap_pool = TypedData_Wrap_Struct( rb_cObject, &pg_query_heap_pool_type, memory_pool );
 		required_pool_size = 0;
 	}else{
 		/* Use stack memory for function parameters */
@@ -1211,85 +1340,52 @@ pgconn_query_assign_typemap( VALUE self, struct query_params_data *paramsData )
 		/* Use default typemap for queries. It's type is checked when assigned. */
 		paramsData->typemap = pg_get_connection(self)->type_map_for_queries;
 	}else{
+		t_typemap *tm;
+		UNUSED(tm);
+
 		/* Check type of method param */
-		if ( !rb_obj_is_kind_of(paramsData->typemap, rb_cTypeMap) ) {
-			rb_raise( rb_eTypeError, "wrong argument type %s (expected kind of PG::TypeMap)",
-					rb_obj_classname( paramsData->typemap ) );
-		}
-		Check_Type( paramsData->typemap, T_DATA );
+		TypedData_Get_Struct(paramsData->typemap, t_typemap, &pg_typemap_type, tm);
 	}
 }
 
 /*
  * call-seq:
- *    conn.exec_params(sql, params[, result_format[, type_map]] ) -> PG::Result
- *    conn.exec_params(sql, params[, result_format[, type_map]] ) {|pg_result| block }
- *
- * Sends SQL query request specified by +sql+ to PostgreSQL using placeholders
- * for parameters.
- *
- * Returns a PG::Result instance on success. On failure, it raises a PG::Error.
- *
- * +params+ is an array of the bind parameters for the SQL query.
- * Each element of the +params+ array may be either:
- *   a hash of the form:
- *     {:value  => String (value of bind parameter)
- *      :type   => Integer (oid of type of bind parameter)
- *      :format => Integer (0 for text, 1 for binary)
- *     }
- *   or, it may be a String. If it is a string, that is equivalent to the hash:
- *     { :value => <string value>, :type => 0, :format => 0 }
- *
- * PostgreSQL bind parameters are represented as $1, $1, $2, etc.,
- * inside the SQL query. The 0th element of the +params+ array is bound
- * to $1, the 1st element is bound to $2, etc. +nil+ is treated as +NULL+.
- *
- * If the types are not specified, they will be inferred by PostgreSQL.
- * Instead of specifying type oids, it's recommended to simply add
- * explicit casts in the query to ensure that the right type is used.
- *
- * For example: "SELECT $1::int"
+ *    conn.sync_exec_params(sql, params[, result_format[, type_map]] ) -> PG::Result
+ *    conn.sync_exec_params(sql, params[, result_format[, type_map]] ) {|pg_result| block }
  *
- * The optional +result_format+ should be 0 for text results, 1
- * for binary.
- *
- * type_map can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
- * This will type cast the params form various Ruby types before transmission
- * based on the encoders defined by the type map. When a type encoder is used
- * the format and oid of a given bind parameter are retrieved from the encoder
- * instead out of the hash form described above.
- *
- * If the optional code block is given, it will be passed <i>result</i> as an argument,
- * and the PG::Result object will  automatically be cleared when the block terminates.
- * In this instance, <code>conn.exec</code> returns the value of the block.
+ * This function has the same behavior as #async_exec_params, but is implemented using the synchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ * It's not recommended to use explicit sync or async variants but #exec_params instead, unless you have a good reason to do so.
  */
 static VALUE
-pgconn_exec_params( int argc, VALUE *argv, VALUE self )
+pgconn_sync_exec_params( int argc, VALUE *argv, VALUE self )
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	PGresult *result = NULL;
 	VALUE rb_pgresult;
 	VALUE command, in_res_fmt;
 	int nParams;
 	int resultFormat;
-	struct query_params_data paramsData = { ENCODING_GET(self) };
+	struct query_params_data paramsData = { this->enc_idx };
 
+	/* For compatibility we accept 1 to 4 parameters */
 	rb_scan_args(argc, argv, "13", &command, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 1;
 
 	/*
-	 * Handle the edge-case where the caller is coming from #exec, but passed an explict +nil+
-	 * for the second parameter.
+	 * For backward compatibility no or +nil+ for the second parameter
+	 * is passed to #exec
 	 */
 	if ( NIL_P(paramsData.params) ) {
-		return pgconn_exec( 1, argv, self );
+		pg_deprecated(1, ("forwarding exec_params to exec is deprecated"));
+		return pgconn_sync_exec( 1, argv, self );
 	}
 	pgconn_query_assign_typemap( self, &paramsData );
 
 	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
 	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQexecParams(conn, pg_cstr_enc(command, paramsData.enc_idx), nParams, paramsData.types,
+	result = gvl_PQexecParams(this->pgconn, pg_cstr_enc(command, paramsData.enc_idx), nParams, paramsData.types,
 		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats, resultFormat);
 
 	free_query_params( &paramsData );
@@ -1306,28 +1402,16 @@ pgconn_exec_params( int argc, VALUE *argv, VALUE self )
 
 /*
  * call-seq:
- *    conn.prepare(stmt_name, sql [, param_types ] ) -> PG::Result
- *
- * Prepares statement _sql_ with name _name_ to be executed later.
- * Returns a PG::Result instance on success.
- * On failure, it raises a PG::Error.
- *
- * +param_types+ is an optional parameter to specify the Oids of the
- * types of the parameters.
- *
- * If the types are not specified, they will be inferred by PostgreSQL.
- * Instead of specifying type oids, it's recommended to simply add
- * explicit casts in the query to ensure that the right type is used.
+ *    conn.sync_prepare(stmt_name, sql [, param_types ] ) -> PG::Result
  *
- * For example: "SELECT $1::int"
- *
- * PostgreSQL bind parameters are represented as $1, $1, $2, etc.,
- * inside the SQL query.
+ * This function has the same behavior as #async_prepare, but is implemented using the synchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ * It's not recommended to use explicit sync or async variants but #prepare instead, unless you have a good reason to do so.
  */
 static VALUE
-pgconn_prepare(int argc, VALUE *argv, VALUE self)
+pgconn_sync_prepare(int argc, VALUE *argv, VALUE self)
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	PGresult *result = NULL;
 	VALUE rb_pgresult;
 	VALUE name, command, in_paramtypes;
@@ -1337,7 +1421,7 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 	Oid *paramTypes = NULL;
 	const char *name_cstr;
 	const char *command_cstr;
-	int enc_idx = ENCODING_GET(self);
+	int enc_idx = this->enc_idx;
 
 	rb_scan_args(argc, argv, "21", &name, &command, &in_paramtypes);
 	name_cstr = pg_cstr_enc(name, enc_idx);
@@ -1355,7 +1439,7 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 				paramTypes[i] = NUM2UINT(param);
 		}
 	}
-	result = gvl_PQprepare(conn, name_cstr, command_cstr, nParams, paramTypes);
+	result = gvl_PQprepare(this->pgconn, name_cstr, command_cstr, nParams, paramTypes);
 
 	xfree(paramTypes);
 
@@ -1366,49 +1450,23 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.exec_prepared(statement_name [, params, result_format[, type_map]] ) -> PG::Result
- *    conn.exec_prepared(statement_name [, params, result_format[, type_map]] ) {|pg_result| block }
- *
- * Execute prepared named statement specified by _statement_name_.
- * Returns a PG::Result instance on success.
- * On failure, it raises a PG::Error.
- *
- * +params+ is an array of the optional bind parameters for the
- * SQL query. Each element of the +params+ array may be either:
- *   a hash of the form:
- *     {:value  => String (value of bind parameter)
- *      :format => Integer (0 for text, 1 for binary)
- *     }
- *   or, it may be a String. If it is a string, that is equivalent to the hash:
- *     { :value => <string value>, :format => 0 }
- *
- * PostgreSQL bind parameters are represented as $1, $1, $2, etc.,
- * inside the SQL query. The 0th element of the +params+ array is bound
- * to $1, the 1st element is bound to $2, etc. +nil+ is treated as +NULL+.
- *
- * The optional +result_format+ should be 0 for text results, 1
- * for binary.
- *
- * type_map can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
- * This will type cast the params form various Ruby types before transmission
- * based on the encoders defined by the type map. When a type encoder is used
- * the format and oid of a given bind parameter are retrieved from the encoder
- * instead out of the hash form described above.
+ *    conn.sync_exec_prepared(statement_name [, params, result_format[, type_map]] ) -> PG::Result
+ *    conn.sync_exec_prepared(statement_name [, params, result_format[, type_map]] ) {|pg_result| block }
  *
- * If the optional code block is given, it will be passed <i>result</i> as an argument,
- * and the PG::Result object will  automatically be cleared when the block terminates.
- * In this instance, <code>conn.exec_prepared</code> returns the value of the block.
+ * This function has the same behavior as #async_exec_prepared, but is implemented using the synchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ * It's not recommended to use explicit sync or async variants but #exec_prepared instead, unless you have a good reason to do so.
  */
 static VALUE
-pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
+pgconn_sync_exec_prepared(int argc, VALUE *argv, VALUE self)
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	PGresult *result = NULL;
 	VALUE rb_pgresult;
 	VALUE name, in_res_fmt;
 	int nParams;
 	int resultFormat;
-	struct query_params_data paramsData = { ENCODING_GET(self) };
+	struct query_params_data paramsData = { this->enc_idx };
 
 	rb_scan_args(argc, argv, "13", &name, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 0;
@@ -1421,7 +1479,7 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
 	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQexecPrepared(conn, pg_cstr_enc(name, paramsData.enc_idx), nParams,
+	result = gvl_PQexecPrepared(this->pgconn, pg_cstr_enc(name, paramsData.enc_idx), nParams,
 		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats,
 		resultFormat);
 
@@ -1438,25 +1496,26 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.describe_prepared( statement_name ) -> PG::Result
+ *    conn.sync_describe_prepared( statement_name ) -> PG::Result
  *
- * Retrieve information about the prepared statement
- * _statement_name_.
+ * This function has the same behavior as #async_describe_prepared, but is implemented using the synchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ * It's not recommended to use explicit sync or async variants but #describe_prepared instead, unless you have a good reason to do so.
  */
 static VALUE
-pgconn_describe_prepared(VALUE self, VALUE stmt_name)
+pgconn_sync_describe_prepared(VALUE self, VALUE stmt_name)
 {
 	PGresult *result;
 	VALUE rb_pgresult;
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	const char *stmt;
 	if(NIL_P(stmt_name)) {
 		stmt = NULL;
 	}
 	else {
-		stmt = pg_cstr_enc(stmt_name, ENCODING_GET(self));
+		stmt = pg_cstr_enc(stmt_name, this->enc_idx);
 	}
-	result = gvl_PQdescribePrepared(conn, stmt);
+	result = gvl_PQdescribePrepared(this->pgconn, stmt);
 	rb_pgresult = pg_new_result(result, self);
 	pg_result_check(rb_pgresult);
 	return rb_pgresult;
@@ -1465,25 +1524,26 @@ pgconn_describe_prepared(VALUE self, VALUE stmt_name)
 
 /*
  * call-seq:
- *    conn.describe_portal( portal_name ) -> PG::Result
+ *    conn.sync_describe_portal( portal_name ) -> PG::Result
  *
- * Retrieve information about the portal _portal_name_.
+ * This function has the same behavior as #async_describe_portal, but is implemented using the synchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ * It's not recommended to use explicit sync or async variants but #describe_portal instead, unless you have a good reason to do so.
  */
 static VALUE
-pgconn_describe_portal(self, stmt_name)
-	VALUE self, stmt_name;
+pgconn_sync_describe_portal(VALUE self, VALUE stmt_name)
 {
 	PGresult *result;
 	VALUE rb_pgresult;
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	const char *stmt;
 	if(NIL_P(stmt_name)) {
 		stmt = NULL;
 	}
 	else {
-		stmt = pg_cstr_enc(stmt_name, ENCODING_GET(self));
+		stmt = pg_cstr_enc(stmt_name, this->enc_idx);
 	}
-	result = gvl_PQdescribePortal(conn, stmt);
+	result = gvl_PQdescribePortal(this->pgconn, stmt);
 	rb_pgresult = pg_new_result(result, self);
 	pg_result_check(rb_pgresult);
 	return rb_pgresult;
@@ -1505,6 +1565,9 @@ pgconn_describe_portal(self, stmt_name)
  * * +PGRES_NONFATAL_ERROR+
  * * +PGRES_FATAL_ERROR+
  * * +PGRES_COPY_BOTH+
+ * * +PGRES_SINGLE_TUPLE+
+ * * +PGRES_PIPELINE_SYNC+
+ * * +PGRES_PIPELINE_ABORTED+
  */
 static VALUE
 pgconn_make_empty_pgresult(VALUE self, VALUE status)
@@ -1530,13 +1593,15 @@ pgconn_make_empty_pgresult(VALUE self, VALUE status)
  * Consider using exec_params, which avoids the need for passing values
  * inside of SQL commands.
  *
- * Encoding of escaped string will be equal to client encoding of connection.
+ * Character encoding of escaped string will be equal to client encoding of connection.
  *
  * NOTE: This class version of this method can only be used safely in client
  * programs that use a single PostgreSQL connection at a time (in this case it can
  * find out what it needs to know "behind the scenes"). It might give the wrong
  * results if used in programs that use multiple database connections; use the
  * same method on the connection object in such cases.
+ *
+ * See also convenience functions #escape_literal and #escape_identifier which also add proper quotes around the string.
  */
 static VALUE
 pgconn_s_escape(VALUE self, VALUE string)
@@ -1547,8 +1612,8 @@ 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);
-	enc_idx = ENCODING_GET( singleton ? string : self );
+	StringValueCStr(string);
+	enc_idx = singleton ? ENCODING_GET(string) : pg_get_connection(self)->enc_idx;
 	if( ENCODING_GET(string) != enc_idx ){
 		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
 	}
@@ -1558,14 +1623,13 @@ pgconn_s_escape(VALUE self, VALUE string)
 	if( !singleton ) {
 		size = PQescapeStringConn(pg_get_pgconn(self), RSTRING_PTR(result),
 			RSTRING_PTR(string), RSTRING_LEN(string), &error);
-		if(error) {
-			rb_raise(rb_ePGerror, "%s", PQerrorMessage(pg_get_pgconn(self)));
-		}
+		if(error)
+			pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(pg_get_pgconn(self)));
+
 	} else {
 		size = PQescapeString(RSTRING_PTR(result), RSTRING_PTR(string), RSTRING_LEN(string));
 	}
 	rb_str_set_len(result, size);
-	OBJ_INFECT(result, string);
 
 	return result;
 }
@@ -1611,7 +1675,6 @@ pgconn_s_escape_bytea(VALUE self, VALUE str)
 	}
 
 	ret = rb_str_new((char*)to, to_len - 1);
-	OBJ_INFECT(ret, str);
 	PQfreemem(to);
 	return ret;
 }
@@ -1641,50 +1704,42 @@ pgconn_s_unescape_bytea(VALUE self, VALUE str)
 	to = PQunescapeBytea(from, &to_len);
 
 	ret = rb_str_new((char*)to, to_len);
-	OBJ_INFECT(ret, str);
 	PQfreemem(to);
 	return ret;
 }
 
-#ifdef HAVE_PQESCAPELITERAL
 /*
  * call-seq:
  *    conn.escape_literal( str ) -> String
  *
  * Escape an arbitrary String +str+ as a literal.
+ *
+ * See also PG::TextEncoder::QuotedLiteral for a type cast integrated version of this function.
  */
 static VALUE
 pgconn_escape_literal(VALUE self, VALUE string)
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	char *escaped = NULL;
-	VALUE error;
 	VALUE result = Qnil;
-	int enc_idx = ENCODING_GET(self);
+	int enc_idx = this->enc_idx;
 
-	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));
 	}
 
-	escaped = PQescapeLiteral(conn, RSTRING_PTR(string), RSTRING_LEN(string));
+	escaped = PQescapeLiteral(this->pgconn, RSTRING_PTR(string), RSTRING_LEN(string));
 	if (escaped == NULL)
-	{
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-		return Qnil;
-	}
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(this->pgconn));
+
 	result = rb_str_new2(escaped);
 	PQfreemem(escaped);
-	OBJ_INFECT(result, string);
 	PG_ENCODING_SET_NOCHECK(result, enc_idx);
 
 	return result;
 }
-#endif
 
-#ifdef HAVE_PQESCAPEIDENTIFIER
 /*
  * call-seq:
  *    conn.escape_identifier( str ) -> String
@@ -1698,35 +1753,27 @@ pgconn_escape_literal(VALUE self, VALUE string)
 static VALUE
 pgconn_escape_identifier(VALUE self, VALUE string)
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	char *escaped = NULL;
-	VALUE error;
 	VALUE result = Qnil;
-	int enc_idx = ENCODING_GET(self);
+	int enc_idx = this->enc_idx;
 
-	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));
 	}
 
-	escaped = PQescapeIdentifier(conn, RSTRING_PTR(string), RSTRING_LEN(string));
+	escaped = PQescapeIdentifier(this->pgconn, RSTRING_PTR(string), RSTRING_LEN(string));
 	if (escaped == NULL)
-	{
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-		return Qnil;
-	}
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(this->pgconn));
+
 	result = rb_str_new2(escaped);
 	PQfreemem(escaped);
-	OBJ_INFECT(result, string);
 	PG_ENCODING_SET_NOCHECK(result, enc_idx);
 
 	return result;
 }
-#endif
 
-#ifdef HAVE_PQSETSINGLEROWMODE
 /*
  * call-seq:
  *    conn.set_single_row_mode -> self
@@ -1762,34 +1809,65 @@ pgconn_escape_identifier(VALUE self, VALUE string)
  *       # do something with the received row
  *     end
  *   end
- *
  */
 static VALUE
 pgconn_set_single_row_mode(VALUE self)
 {
 	PGconn *conn = pg_get_pgconn(self);
-	VALUE error;
 
+	rb_check_frozen(self);
 	if( PQsetSingleRowMode(conn) == 0 )
-	{
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
 
 	return self;
 }
-#endif
+
+static VALUE pgconn_send_query_params(int argc, VALUE *argv, VALUE self);
+
+/*
+ * call-seq:
+ *    conn.send_query(sql) -> nil
+ *
+ * Sends SQL query request specified by _sql_ to PostgreSQL for
+ * asynchronous processing, and immediately returns.
+ * On failure, it raises a PG::Error.
+ *
+ * For backward compatibility, if you pass more than one parameter to this method,
+ * it will call #send_query_params for you. New code should explicitly use #send_query_params if
+ * argument placeholders are used.
+ *
+ */
+static VALUE
+pgconn_send_query(int argc, VALUE *argv, VALUE self)
+{
+	t_pg_connection *this = pg_get_connection_safe( self );
+
+	/* If called with no or nil parameters, use PQexec for compatibility */
+	if ( argc == 1 || (argc >= 2 && argc <= 4 && NIL_P(argv[1]) )) {
+		if(gvl_PQsendQuery(this->pgconn, pg_cstr_enc(argv[0], this->enc_idx)) == 0)
+			pg_raise_conn_error( rb_eUnableToSend, self, "%s", PQerrorMessage(this->pgconn));
+
+		pgconn_wait_for_flush( self );
+		return Qnil;
+	}
+
+	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
+	 */
+	return pgconn_send_query_params( argc, argv, self);
+}
 
 /*
  * call-seq:
- *    conn.send_query(sql [, params, result_format[, type_map ]] ) -> nil
+ *    conn.send_query_params(sql, params [, result_format [, type_map ]] ) -> nil
  *
  * Sends SQL query request specified by _sql_ to PostgreSQL for
  * asynchronous processing, and immediately returns.
  * On failure, it raises a PG::Error.
  *
- * +params+ is an optional array of the bind parameters for the SQL query.
+ * +params+ is an array of the bind parameters for the SQL query.
  * Each element of the +params+ array may be either:
  *   a hash of the form:
  *     {:value  => String (value of bind parameter)
@@ -1799,7 +1877,7 @@ pgconn_set_single_row_mode(VALUE self)
  *   or, it may be a String. If it is a string, that is equivalent to the hash:
  *     { :value => <string value>, :type => 0, :format => 0 }
  *
- * PostgreSQL bind parameters are represented as $1, $1, $2, etc.,
+ * PostgreSQL bind parameters are represented as $1, $2, $3, etc.,
  * inside the SQL query. The 0th element of the +params+ array is bound
  * to $1, the 1st element is bound to $2, etc. +nil+ is treated as +NULL+.
  *
@@ -1812,55 +1890,39 @@ pgconn_set_single_row_mode(VALUE self)
  * The optional +result_format+ should be 0 for text results, 1
  * for binary.
  *
- * type_map can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
- * This will type cast the params form various Ruby types before transmission
+ * +type_map+ can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
+ * This will type cast the params from various Ruby types before transmission
  * based on the encoders defined by the type map. When a type encoder is used
  * the format and oid of a given bind parameter are retrieved from the encoder
  * instead out of the hash form described above.
  *
  */
 static VALUE
-pgconn_send_query(int argc, VALUE *argv, VALUE self)
+pgconn_send_query_params(int argc, VALUE *argv, VALUE self)
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	int result;
 	VALUE command, in_res_fmt;
-	VALUE error;
 	int nParams;
 	int resultFormat;
-	struct query_params_data paramsData = { ENCODING_GET(self) };
+	struct query_params_data paramsData = { this->enc_idx };
 
-	rb_scan_args(argc, argv, "13", &command, &paramsData.params, &in_res_fmt, &paramsData.typemap);
+	rb_scan_args(argc, argv, "22", &command, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 1;
 
-	/* If called with no parameters, use PQsendQuery */
-	if(NIL_P(paramsData.params)) {
-		if(gvl_PQsendQuery(conn, pg_cstr_enc(command, paramsData.enc_idx)) == 0) {
-			error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
-			rb_iv_set(error, "@connection", self);
-			rb_exc_raise(error);
-		}
-		return Qnil;
-	}
-
-	/* If called with parameters, and optionally result_format,
-	 * use PQsendQueryParams
-	 */
-
 	pgconn_query_assign_typemap( self, &paramsData );
 	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
 	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQsendQueryParams(conn, pg_cstr_enc(command, paramsData.enc_idx), nParams, paramsData.types,
+	result = gvl_PQsendQueryParams(this->pgconn, pg_cstr_enc(command, paramsData.enc_idx), nParams, paramsData.types,
 		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats, resultFormat);
 
 	free_query_params( &paramsData );
 
-	if(result == 0) {
-		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+	if(result == 0)
+		pg_raise_conn_error( rb_eUnableToSend, self, "%s", PQerrorMessage(this->pgconn));
+
+	pgconn_wait_for_flush( self );
 	return Qnil;
 }
 
@@ -1881,23 +1943,22 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
  *
  * For example: "SELECT $1::int"
  *
- * PostgreSQL bind parameters are represented as $1, $1, $2, etc.,
+ * PostgreSQL bind parameters are represented as $1, $2, $3, etc.,
  * inside the SQL query.
  */
 static VALUE
 pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	int result;
 	VALUE name, command, in_paramtypes;
 	VALUE param;
-	VALUE error;
 	int i = 0;
 	int nParams = 0;
 	Oid *paramTypes = NULL;
 	const char *name_cstr;
 	const char *command_cstr;
-	int enc_idx = ENCODING_GET(self);
+	int enc_idx = this->enc_idx;
 
 	rb_scan_args(argc, argv, "21", &name, &command, &in_paramtypes);
 	name_cstr = pg_cstr_enc(name, enc_idx);
@@ -1915,15 +1976,14 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 				paramTypes[i] = NUM2UINT(param);
 		}
 	}
-	result = gvl_PQsendPrepare(conn, name_cstr, command_cstr, nParams, paramTypes);
+	result = gvl_PQsendPrepare(this->pgconn, name_cstr, command_cstr, nParams, paramTypes);
 
 	xfree(paramTypes);
 
 	if(result == 0) {
-		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
+		pg_raise_conn_error( rb_eUnableToSend, self, "%s", PQerrorMessage(this->pgconn));
 	}
+	pgconn_wait_for_flush( self );
 	return Qnil;
 }
 
@@ -1945,15 +2005,15 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
  *   or, it may be a String. If it is a string, that is equivalent to the hash:
  *     { :value => <string value>, :format => 0 }
  *
- * PostgreSQL bind parameters are represented as $1, $1, $2, etc.,
+ * PostgreSQL bind parameters are represented as $1, $2, $3, etc.,
  * inside the SQL query. The 0th element of the +params+ array is bound
  * to $1, the 1st element is bound to $2, etc. +nil+ is treated as +NULL+.
  *
  * The optional +result_format+ should be 0 for text results, 1
  * for binary.
  *
- * type_map can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
- * This will type cast the params form various Ruby types before transmission
+ * +type_map+ can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
+ * This will type cast the params from various Ruby types before transmission
  * based on the encoders defined by the type map. When a type encoder is used
  * the format and oid of a given bind parameter are retrieved from the encoder
  * instead out of the hash form described above.
@@ -1962,37 +2022,34 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 static VALUE
 pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 {
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	int result;
 	VALUE name, in_res_fmt;
-	VALUE error;
 	int nParams;
 	int resultFormat;
-	struct query_params_data paramsData = { ENCODING_GET(self) };
+	struct query_params_data paramsData = { this->enc_idx };
 
 	rb_scan_args(argc, argv, "13", &name, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 0;
 
 	if(NIL_P(paramsData.params)) {
 		paramsData.params = rb_ary_new2(0);
-		resultFormat = 0;
 	}
 	pgconn_query_assign_typemap( self, &paramsData );
 
 	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
 	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQsendQueryPrepared(conn, pg_cstr_enc(name, paramsData.enc_idx), nParams,
+	result = gvl_PQsendQueryPrepared(this->pgconn, pg_cstr_enc(name, paramsData.enc_idx), nParams,
 		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats,
 		resultFormat);
 
 	free_query_params( &paramsData );
 
-	if(result == 0) {
-		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+	if(result == 0)
+		pg_raise_conn_error( rb_eUnableToSend, self, "%s", PQerrorMessage(this->pgconn));
+
+	pgconn_wait_for_flush( self );
 	return Qnil;
 }
 
@@ -2006,14 +2063,12 @@ pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 static VALUE
 pgconn_send_describe_prepared(VALUE self, VALUE stmt_name)
 {
-	VALUE error;
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	/* returns 0 on failure */
-	if(gvl_PQsendDescribePrepared(conn, pg_cstr_enc(stmt_name, ENCODING_GET(self))) == 0) {
-		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+	if(gvl_PQsendDescribePrepared(this->pgconn, pg_cstr_enc(stmt_name, this->enc_idx)) == 0)
+		pg_raise_conn_error( rb_eUnableToSend, self, "%s", PQerrorMessage(this->pgconn));
+
+	pgconn_wait_for_flush( self );
 	return Qnil;
 }
 
@@ -2028,36 +2083,18 @@ pgconn_send_describe_prepared(VALUE self, VALUE stmt_name)
 static VALUE
 pgconn_send_describe_portal(VALUE self, VALUE portal)
 {
-	VALUE error;
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	/* returns 0 on failure */
-	if(gvl_PQsendDescribePortal(conn, pg_cstr_enc(portal, ENCODING_GET(self))) == 0) {
-		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+	if(gvl_PQsendDescribePortal(this->pgconn, pg_cstr_enc(portal, this->enc_idx)) == 0)
+		pg_raise_conn_error( rb_eUnableToSend, self, "%s", PQerrorMessage(this->pgconn));
+
+	pgconn_wait_for_flush( self );
 	return Qnil;
 }
 
 
-/*
- * call-seq:
- *    conn.get_result() -> PG::Result
- *    conn.get_result() {|pg_result| block }
- *
- * Blocks waiting for the next result from a call to
- * #send_query (or another asynchronous command), and returns
- * it. Returns +nil+ if no more results are available.
- *
- * Note: call this function repeatedly until it returns +nil+, or else
- * you will not be able to issue further commands.
- *
- * If the optional code block is given, it will be passed <i>result</i> as an argument,
- * and the PG::Result object will  automatically be cleared when the block terminates.
- * In this instance, <code>conn.exec</code> returns the value of the block.
- */
 static VALUE
-pgconn_get_result(VALUE self)
+pgconn_sync_get_result(VALUE self)
 {
 	PGconn *conn = pg_get_pgconn(self);
 	PGresult *result;
@@ -2083,17 +2120,15 @@ pgconn_get_result(VALUE self)
  * or *notifies* to see if the state has changed.
  */
 static VALUE
-pgconn_consume_input(self)
-	VALUE self;
+pgconn_consume_input(VALUE self)
 {
-	VALUE error;
 	PGconn *conn = pg_get_pgconn(self);
 	/* returns 0 on error */
 	if(PQconsumeInput(conn) == 0) {
-		error = rb_exc_new2(rb_eConnectionBad, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
+		pgconn_close_socket_io(self);
+		pg_raise_conn_error( rb_eConnectionBad, self, "%s", PQerrorMessage(conn));
 	}
+
 	return Qnil;
 }
 
@@ -2102,38 +2137,20 @@ pgconn_consume_input(self)
  *    conn.is_busy() -> Boolean
  *
  * Returns +true+ if a command is busy, that is, if
- * PQgetResult would block. Otherwise returns +false+.
+ * #get_result would block. Otherwise returns +false+.
  */
 static VALUE
-pgconn_is_busy(self)
-	VALUE self;
+pgconn_is_busy(VALUE self)
 {
 	return gvl_PQisBusy(pg_get_pgconn(self)) ? Qtrue : Qfalse;
 }
 
-/*
- * call-seq:
- *    conn.setnonblocking(Boolean) -> nil
- *
- * Sets the nonblocking status of the connection.
- * In the blocking state, calls to #send_query
- * will block until the message is sent to the server,
- * but will not wait for the query results.
- * In the nonblocking state, calls to #send_query
- * will return an error if the socket is not ready for
- * writing.
- * Note: This function does not affect #exec, because
- * that function doesn't return until the server has
- * processed the query and returned the results.
- * Returns +nil+.
- */
 static VALUE
-pgconn_setnonblocking(self, state)
-	VALUE self, state;
+pgconn_sync_setnonblocking(VALUE self, VALUE state)
 {
 	int arg;
-	VALUE error;
 	PGconn *conn = pg_get_pgconn(self);
+	rb_check_frozen(self);
 	if(state == Qtrue)
 		arg = 1;
 	else if (state == Qfalse)
@@ -2141,69 +2158,33 @@ pgconn_setnonblocking(self, state)
 	else
 		rb_raise(rb_eArgError, "Boolean value expected");
 
-	if(PQsetnonblocking(conn, arg) == -1) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+	if(PQsetnonblocking(conn, arg) == -1)
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
+
 	return Qnil;
 }
 
 
-/*
- * call-seq:
- *    conn.isnonblocking() -> Boolean
- *
- * Returns +true+ if a command is busy, that is, if
- * PQgetResult would block. Otherwise returns +false+.
- */
 static VALUE
-pgconn_isnonblocking(self)
-	VALUE self;
+pgconn_sync_isnonblocking(VALUE self)
 {
 	return PQisnonblocking(pg_get_pgconn(self)) ? Qtrue : Qfalse;
 }
 
-/*
- * call-seq:
- *    conn.flush() -> Boolean
- *
- * Attempts to flush any queued output data to the server.
- * Returns +true+ if data is successfully flushed, +false+
- * if not (can only return +false+ if connection is
- * nonblocking.
- * Raises PG::Error if some other failure occurred.
- */
 static VALUE
-pgconn_flush(self)
-	VALUE self;
+pgconn_sync_flush(VALUE self)
 {
 	PGconn *conn = pg_get_pgconn(self);
-	int ret;
-	VALUE error;
-	ret = PQflush(conn);
-	if(ret == -1) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+	int ret = PQflush(conn);
+	if(ret == -1)
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
+
 	return (ret) ? Qfalse : Qtrue;
 }
 
-/*
- * call-seq:
- *    conn.cancel() -> String
- *
- * Requests cancellation of the command currently being
- * processed. (Only implemented in PostgreSQL >= 8.0)
- *
- * Returns +nil+ on success, or a string containing the
- * error message if a failure occurs.
- */
 static VALUE
-pgconn_cancel(VALUE self)
+pgconn_sync_cancel(VALUE self)
 {
-#ifdef HAVE_PQGETCANCEL
 	char errbuf[256];
 	PGcancel *cancel;
 	VALUE retval;
@@ -2211,9 +2192,9 @@ pgconn_cancel(VALUE self)
 
 	cancel = PQgetCancel(pg_get_pgconn(self));
 	if(cancel == NULL)
-		rb_raise(rb_ePGerror,"Invalid connection!");
+		pg_raise_conn_error( rb_ePGerror, self, "Invalid connection!");
 
-	ret = gvl_PQcancel(cancel, errbuf, 256);
+	ret = gvl_PQcancel(cancel, errbuf, sizeof(errbuf));
 	if(ret == 1)
 		retval = Qnil;
 	else
@@ -2221,9 +2202,6 @@ pgconn_cancel(VALUE self)
 
 	PQfreeCancel(cancel);
 	return retval;
-#else
-	rb_notimplement();
-#endif
 }
 
 
@@ -2237,7 +2215,7 @@ pgconn_cancel(VALUE self)
 static VALUE
 pgconn_notifies(VALUE self)
 {
-	PGconn* conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	PGnotify *notification;
 	VALUE hash;
 	VALUE sym_relname, sym_be_pid, sym_extra;
@@ -2247,17 +2225,17 @@ pgconn_notifies(VALUE self)
 	sym_be_pid = ID2SYM(rb_intern("be_pid"));
 	sym_extra = ID2SYM(rb_intern("extra"));
 
-	notification = gvl_PQnotifies(conn);
+	notification = gvl_PQnotifies(this->pgconn);
 	if (notification == NULL) {
 		return Qnil;
 	}
 
 	hash = rb_hash_new();
-	relname = rb_tainted_str_new2(notification->relname);
+	relname = rb_str_new2(notification->relname);
 	be_pid = INT2NUM(notification->be_pid);
-	extra = rb_tainted_str_new2(notification->extra);
-	PG_ENCODING_SET_NOCHECK( relname, ENCODING_GET(self) );
-	PG_ENCODING_SET_NOCHECK( extra, ENCODING_GET(self) );
+	extra = rb_str_new2(notification->extra);
+	PG_ENCODING_SET_NOCHECK( relname, this->enc_idx );
+	PG_ENCODING_SET_NOCHECK( extra, this->enc_idx );
 
 	rb_hash_aset(hash, sym_relname, relname);
 	rb_hash_aset(hash, sym_be_pid, be_pid);
@@ -2267,96 +2245,63 @@ pgconn_notifies(VALUE self)
 	return hash;
 }
 
-/* Win32 + Ruby 1.8 */
-#if !defined( HAVE_RUBY_VM_H ) && defined( _WIN32 )
+#if defined(_WIN32)
 
-/*
- * Duplicate the sockets from libpq and create temporary CRT FDs
+/* We use a specialized implementation of rb_io_wait() on Windows.
+ * This is because rb_io_wait() and rb_wait_for_single_fd() are very slow on Windows.
  */
-void create_crt_fd(fd_set *os_set, fd_set *crt_set)
-{
-	int i;
-	crt_set->fd_count = os_set->fd_count;
-	for (i = 0; i < os_set->fd_count; i++) {
-		WSAPROTOCOL_INFO wsa_pi;
-		/* dupicate the SOCKET */
-		int r = WSADuplicateSocket(os_set->fd_array[i], GetCurrentProcessId(), &wsa_pi);
-		SOCKET s = WSASocket(wsa_pi.iAddressFamily, wsa_pi.iSocketType, wsa_pi.iProtocol, &wsa_pi, 0, 0);
-		/* create the CRT fd so ruby can get back to the SOCKET */
-		int fd = _open_osfhandle(s, O_RDWR|O_BINARY);
-		os_set->fd_array[i] = s;
-		crt_set->fd_array[i] = fd;
-	}
-}
 
-/*
- * Clean up the CRT FDs from create_crt_fd()
- */
-void cleanup_crt_fd(fd_set *os_set, fd_set *crt_set)
-{
-	int i;
-	for (i = 0; i < os_set->fd_count; i++) {
-		/* cleanup the CRT fd */
-		_close(crt_set->fd_array[i]);
-		/* cleanup the duplicated SOCKET */
-		closesocket(os_set->fd_array[i]);
-	}
-}
+#if defined(HAVE_RUBY_FIBER_SCHEDULER_H)
+#include <ruby/fiber/scheduler.h>
 #endif
 
-/* Win32 + Ruby 1.9+ */
-#if defined( HAVE_RUBY_VM_H ) && defined( _WIN32 )
-/*
- * On Windows, use platform-specific strategies to wait for the socket
- * instead of rb_thread_select().
- */
+typedef enum {
+    PG_RUBY_IO_READABLE = RB_WAITFD_IN,
+    PG_RUBY_IO_WRITABLE = RB_WAITFD_OUT,
+    PG_RUBY_IO_PRIORITY = RB_WAITFD_PRI,
+} pg_rb_io_event_t;
 
 int rb_w32_wait_events( HANDLE *events, int num, DWORD timeout );
 
-/* If WIN32 and Ruby 1.9 do not use rb_thread_select() which sometimes hangs
- * and does not wait (nor sleep) any time even if timeout is given.
- * Instead use the Winsock events and rb_w32_wait_events(). */
+static VALUE
+pg_rb_thread_io_wait(VALUE io, VALUE events, VALUE timeout) {
+	rb_io_t *fptr;
+	struct timeval ptimeout;
 
-static void *
-wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readable)(PGconn *) )
-{
-	int sd = PQsocket( conn );
-	void *retval;
 	struct timeval aborttime={0,0}, currtime, waittime;
 	DWORD timeout_milisec = INFINITE;
-	DWORD wait_ret;
-	WSAEVENT hEvent;
+	HANDLE hEvent = WSACreateEvent();
 
-	if ( sd < 0 )
-		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
-
-	hEvent = WSACreateEvent();
+	long rb_events = NUM2UINT(events);
+	long w32_events = 0;
+	DWORD wait_ret;
 
-	/* Check for connection errors (PQisBusy is true on connection errors) */
-	if( PQconsumeInput(conn) == 0 ) {
-		WSACloseEvent( hEvent );
-		rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
-	}
+	GetOpenFile((io), fptr);
+	if( !NIL_P(timeout) ){
+		ptimeout.tv_sec = (time_t)(NUM2DBL(timeout));
+		ptimeout.tv_usec = (time_t)((NUM2DBL(timeout) - (double)ptimeout.tv_sec) * 1e6);
 
-	if ( ptimeout ) {
 		gettimeofday(&currtime, NULL);
-		timeradd(&currtime, ptimeout, &aborttime);
+		timeradd(&currtime, &ptimeout, &aborttime);
 	}
 
-	while ( !(retval=is_readable(conn)) ) {
-		if ( WSAEventSelect(sd, hEvent, FD_READ|FD_CLOSE) == SOCKET_ERROR ) {
+	if(rb_events & PG_RUBY_IO_READABLE) w32_events |= FD_READ | FD_ACCEPT | FD_CLOSE;
+	if(rb_events & PG_RUBY_IO_WRITABLE) w32_events |= FD_WRITE | FD_CONNECT;
+	if(rb_events & PG_RUBY_IO_PRIORITY) w32_events |= FD_OOB;
+
+	for(;;) {
+		if ( WSAEventSelect(_get_osfhandle(fptr->fd), hEvent, w32_events) == SOCKET_ERROR ) {
 			WSACloseEvent( hEvent );
 			rb_raise( rb_eConnectionBad, "WSAEventSelect socket error: %d", WSAGetLastError() );
 		}
 
-		if ( ptimeout ) {
+		if ( !NIL_P(timeout) ) {
 			gettimeofday(&currtime, NULL);
 			timersub(&aborttime, &currtime, &waittime);
 			timeout_milisec = (DWORD)( waittime.tv_sec * 1e3 + waittime.tv_usec / 1e3 );
 		}
 
-		/* Is the given timeout valid? */
-		if( !ptimeout || (waittime.tv_sec >= 0 && waittime.tv_usec >= 0) ){
+		if( NIL_P(timeout) || (waittime.tv_sec >= 0 && waittime.tv_usec >= 0) ){
 			/* Wait for the socket to become readable before checking again */
 			wait_ret = rb_w32_wait_events( &hEvent, 1, timeout_milisec );
 		} else {
@@ -2365,9 +2310,11 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 
 		if ( wait_ret == WAIT_TIMEOUT ) {
 			WSACloseEvent( hEvent );
-			return NULL;
+			return UINT2NUM(0);
 		} else if ( wait_ret == WAIT_OBJECT_0 ) {
+			WSACloseEvent( hEvent );
 			/* The event we were waiting for. */
+			return UINT2NUM(rb_events);
 		} else if ( wait_ret == WAIT_OBJECT_0 + 1) {
 			/* This indicates interruption from timer thread, GC, exception
 			 * from other threads etc... */
@@ -2379,42 +2326,66 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 			WSACloseEvent( hEvent );
 			rb_raise( rb_eConnectionBad, "Wait on socket abandoned (WaitForMultipleObjects)" );
 		}
-
-		/* Check for connection errors (PQisBusy is true on connection errors) */
-		if ( PQconsumeInput(conn) == 0 ) {
-			WSACloseEvent( hEvent );
-			rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
-		}
 	}
+}
 
-	WSACloseEvent( hEvent );
-	return retval;
+static VALUE
+pg_rb_io_wait(VALUE io, VALUE events, VALUE timeout) {
+#if defined(HAVE_RUBY_FIBER_SCHEDULER_H)
+	/* We don't support Fiber.scheduler on Windows ruby-3.0 because there is no fast way to check whether a scheduler is active.
+	 * Fortunatelly ruby-3.1 offers a C-API for it.
+	 */
+	VALUE scheduler = rb_fiber_scheduler_current();
+
+	if (!NIL_P(scheduler)) {
+		return rb_io_wait(io, events, timeout);
+	}
+#endif
+	return pg_rb_thread_io_wait(io, events, timeout);
 }
 
+#elif defined(HAVE_RB_IO_WAIT)
+
+/* Use our own function and constants names, to avoid conflicts with truffleruby-head on its road to ruby-3.0 compatibility. */
+#define pg_rb_io_wait rb_io_wait
+#define PG_RUBY_IO_READABLE RUBY_IO_READABLE
+#define PG_RUBY_IO_WRITABLE RUBY_IO_WRITABLE
+#define PG_RUBY_IO_PRIORITY RUBY_IO_PRIORITY
+
 #else
+/* For compat with ruby < 3.0 */
+
+typedef enum {
+    PG_RUBY_IO_READABLE = RB_WAITFD_IN,
+    PG_RUBY_IO_WRITABLE = RB_WAITFD_OUT,
+    PG_RUBY_IO_PRIORITY = RB_WAITFD_PRI,
+} pg_rb_io_event_t;
+
+static VALUE
+pg_rb_io_wait(VALUE io, VALUE events, VALUE timeout) {
+	rb_io_t *fptr;
+	struct timeval waittime;
+	int res;
+
+	GetOpenFile((io), fptr);
+	if( !NIL_P(timeout) ){
+		waittime.tv_sec = (time_t)(NUM2DBL(timeout));
+		waittime.tv_usec = (time_t)((NUM2DBL(timeout) - (double)waittime.tv_sec) * 1e6);
+	}
+	res = rb_wait_for_single_fd(fptr->fd, NUM2UINT(events), NIL_P(timeout) ? NULL : &waittime);
 
-/* non Win32 or Win32+Ruby-1.8 */
+	return UINT2NUM(res);
+}
+#endif
 
 static void *
-wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readable)(PGconn *))
+wait_socket_readable( VALUE self, struct timeval *ptimeout, void *(*is_readable)(PGconn *))
 {
-	int sd = PQsocket( conn );
-	int ret;
+	VALUE ret;
 	void *retval;
-	rb_fdset_t sd_rset;
 	struct timeval aborttime={0,0}, currtime, waittime;
-#ifdef _WIN32
-	rb_fdset_t crt_sd_rset;
-#endif
-
-	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) );
-
-	rb_fd_init( &sd_rset );
+	VALUE wait_timeout = Qnil;
+	PGconn *conn = pg_get_pgconn(self);
 
 	if ( ptimeout ) {
 		gettimeofday(&currtime, NULL);
@@ -2422,59 +2393,84 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 	}
 
 	while ( !(retval=is_readable(conn)) ) {
-		rb_fd_zero( &sd_rset );
-		rb_fd_set( sd, &sd_rset );
-
-#ifdef _WIN32
-		/* Ruby's FD_SET is modified on win32 to convert a file descriptor
-		 * to osfhandle, but we already get a osfhandle from PQsocket().
-		 * Therefore it's overwritten here. */
-		sd_rset.fd_array[0] = sd;
-		create_crt_fd(&sd_rset, &crt_sd_rset);
-#endif
-
 		if ( ptimeout ) {
 			gettimeofday(&currtime, NULL);
 			timersub(&aborttime, &currtime, &waittime);
+			wait_timeout = DBL2NUM((double)(waittime.tv_sec) + (double)(waittime.tv_usec) / 1000000.0);
 		}
 
 		/* 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_thread_fd_select( sd+1, &sd_rset, NULL, NULL, ptimeout ? &waittime : NULL );
-		} else {
-			ret = 0;
-		}
-
+			VALUE socket_io;
 
-#ifdef _WIN32
-		cleanup_crt_fd(&sd_rset, &crt_sd_rset);
-#endif
+			/* before we wait for data, make sure everything has been sent */
+			pgconn_async_flush(self);
+			if ((retval=is_readable(conn)))
+				return retval;
 
-		if ( ret < 0 ){
-			rb_fd_term( &sd_rset );
-			rb_sys_fail( "rb_thread_select()" );
+			socket_io = pgconn_socket_io(self);
+			/* Wait for the socket to become readable before checking again */
+			ret = pg_rb_io_wait(socket_io, RB_INT2NUM(PG_RUBY_IO_READABLE), wait_timeout);
+		} else {
+			ret = Qfalse;
 		}
 
 		/* Return false if the select() timed out */
-		if ( ret == 0 ){
-			rb_fd_term( &sd_rset );
+		if ( ret == Qfalse ){
 			return NULL;
 		}
 
 		/* Check for connection errors (PQisBusy is true on connection errors) */
 		if ( PQconsumeInput(conn) == 0 ){
-			rb_fd_term( &sd_rset );
-			rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
+			pgconn_close_socket_io(self);
+			pg_raise_conn_error(rb_eConnectionBad, self, "PQconsumeInput() %s", PQerrorMessage(conn));
 		}
 	}
 
-	rb_fd_term( &sd_rset );
 	return retval;
 }
 
+/*
+ * call-seq:
+ *    conn.flush() -> Boolean
+ *
+ * Attempts to flush any queued output data to the server.
+ * Returns +true+ if data is successfully flushed, +false+
+ * if not. It can only return +false+ if connection is
+ * in nonblocking mode.
+ * Raises PG::Error if some other failure occurred.
+ */
+static VALUE
+pgconn_async_flush(VALUE self)
+{
+	while( pgconn_sync_flush(self) == Qfalse ){
+		/* wait for the socket to become read- or write-ready */
+		int events;
+		VALUE socket_io = pgconn_socket_io(self);
+		events = RB_NUM2INT(pg_rb_io_wait(socket_io, RB_INT2NUM(PG_RUBY_IO_READABLE | PG_RUBY_IO_WRITABLE), Qnil));
+
+		if (events & PG_RUBY_IO_READABLE){
+			pgconn_consume_input(self);
+		}
+	}
+	return Qtrue;
+}
+
+static VALUE
+pgconn_wait_for_flush( VALUE self ){
+	if( !pg_get_connection_safe(self)->flush_data )
+		return Qnil;
+
+	return pgconn_async_flush(self);
+}
 
-#endif
+static VALUE
+pgconn_flush_data_set( VALUE self, VALUE enabled ){
+	t_pg_connection *conn = pg_get_connection(self);
+	rb_check_frozen(self);
+	conn->flush_data = RTEST(enabled);
+	return enabled;
+}
 
 static void *
 notify_readable(PGconn *conn)
@@ -2484,27 +2480,20 @@ notify_readable(PGconn *conn)
 
 /*
  * call-seq:
- *    conn.wait_for_notify( [ timeout ] ) -> String
- *    conn.wait_for_notify( [ timeout ] ) { |event, pid| block }
- *    conn.wait_for_notify( [ timeout ] ) { |event, pid, payload| block } # PostgreSQL 9.0
+ *    conn.wait_for_notify( [ timeout ] ) { |event, pid, payload| block } -> String
  *
  * Blocks while waiting for notification(s), or until the optional
  * _timeout_ is reached, whichever comes first.  _timeout_ is
  * measured in seconds and can be fractional.
  *
- * Returns +nil+ if _timeout_ is reached, the name of the NOTIFY
- * event otherwise.  If used in block form, passes the name of the
- * NOTIFY +event+ and the generating +pid+ into the block.
- *
- * Under PostgreSQL 9.0 and later, if the notification is sent with
- * the optional +payload+ string, it will be given to the block as the
- * third argument.
- *
+ * Returns +nil+ if _timeout_ is reached, the name of the NOTIFY event otherwise.
+ * If used in block form, passes the name of the NOTIFY +event+, the generating
+ * +pid+ and the optional +payload+ string into the block.
  */
 static VALUE
 pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 {
-	PGconn *conn = pg_get_pgconn( self );
+	t_pg_connection *this = pg_get_connection_safe( self );
 	PGnotify *pnotification;
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
@@ -2520,20 +2509,18 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 		ptimeout = &timeout;
 	}
 
-	pnotification = (PGnotify*) wait_socket_readable( conn, ptimeout, notify_readable);
+	pnotification = (PGnotify*) wait_socket_readable( self, ptimeout, notify_readable);
 
 	/* Return nil if the select timed out */
 	if ( !pnotification ) return Qnil;
 
-	relname = rb_tainted_str_new2( pnotification->relname );
-	PG_ENCODING_SET_NOCHECK( relname, ENCODING_GET(self) );
+	relname = rb_str_new2( pnotification->relname );
+	PG_ENCODING_SET_NOCHECK( relname, this->enc_idx );
 	be_pid = INT2NUM( pnotification->be_pid );
-#ifdef HAVE_ST_NOTIFY_EXTRA
 	if ( *pnotification->extra ) {
-		extra = rb_tainted_str_new2( pnotification->extra );
-		PG_ENCODING_SET_NOCHECK( extra, ENCODING_GET(self) );
+		extra = rb_str_new2( pnotification->extra );
+		PG_ENCODING_SET_NOCHECK( extra, this->enc_idx );
 	}
-#endif
 	PQfreemem( pnotification );
 
 	if ( rb_block_given_p() )
@@ -2543,27 +2530,8 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 }
 
 
-/*
- * call-seq:
- *    conn.put_copy_data( buffer [, encoder] ) -> Boolean
- *
- * Transmits _buffer_ as copy data to the server.
- * Returns true if the data was sent, false if it was
- * not sent (false is only possible if the connection
- * is in nonblocking mode, and this command would block).
- *
- * encoder can be a PG::Coder derivation (typically PG::TextEncoder::CopyRow).
- * This encodes the received data fields from an Array of Strings. Optionally
- * the encoder can type cast the fields form various Ruby types in one step,
- * if PG::TextEncoder::CopyRow#type_map is set accordingly.
- *
- * Raises an exception if an error occurs.
- *
- * See also #copy_data.
- *
- */
 static VALUE
-pgconn_put_copy_data(int argc, VALUE *argv, VALUE self)
+pgconn_sync_put_copy_data(int argc, VALUE *argv, VALUE self)
 {
 	int ret;
 	int len;
@@ -2580,18 +2548,16 @@ pgconn_put_copy_data(int argc, VALUE *argv, VALUE self)
 		if( NIL_P(this->encoder_for_put_copy_data) ){
 			buffer = value;
 		} else {
-			p_coder = DATA_PTR( this->encoder_for_put_copy_data );
+			p_coder = RTYPEDDATA_DATA( this->encoder_for_put_copy_data );
 		}
-	} else if( rb_obj_is_kind_of(encoder, rb_cPG_Coder) ) {
-		Data_Get_Struct( encoder, t_pg_coder, p_coder );
 	} else {
-		rb_raise( rb_eTypeError, "wrong encoder type %s (expected some kind of PG::Coder)",
-				rb_obj_classname( encoder ) );
+		/* Check argument type and use argument encoder */
+		TypedData_Get_Struct(encoder, t_pg_coder, &pg_coder_type, p_coder);
 	}
 
 	if( p_coder ){
 		t_pg_coder_enc_func enc_func;
-		int enc_idx = ENCODING_GET(self);
+		int enc_idx = this->enc_idx;
 
 		enc_func = pg_coder_enc_func( p_coder );
 		len = enc_func( p_coder, value, NULL, &intermediate, enc_idx);
@@ -2609,75 +2575,39 @@ pgconn_put_copy_data(int argc, VALUE *argv, VALUE self)
 	Check_Type(buffer, T_STRING);
 
 	ret = gvl_PQputCopyData(this->pgconn, RSTRING_PTR(buffer), RSTRING_LENINT(buffer));
-	if(ret == -1) {
-		VALUE error = rb_exc_new2(rb_ePGerror, PQerrorMessage(this->pgconn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
+	if(ret == -1)
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(this->pgconn));
+
 	RB_GC_GUARD(intermediate);
 	RB_GC_GUARD(buffer);
 
 	return (ret) ? Qtrue : Qfalse;
 }
 
-/*
- * call-seq:
- *    conn.put_copy_end( [ error_message ] ) -> Boolean
- *
- * Sends end-of-data indication to the server.
- *
- * _error_message_ is an optional parameter, and if set,
- * forces the COPY command to fail with the string
- * _error_message_.
- *
- * Returns true if the end-of-data was sent, false if it was
- * not sent (false is only possible if the connection
- * is in nonblocking mode, and this command would block).
- */
 static VALUE
-pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
+pgconn_sync_put_copy_end(int argc, VALUE *argv, VALUE self)
 {
 	VALUE str;
-	VALUE error;
 	int ret;
 	const char *error_message = NULL;
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 
 	if (rb_scan_args(argc, argv, "01", &str) == 0)
 		error_message = NULL;
 	else
-		error_message = pg_cstr_enc(str, ENCODING_GET(self));
+		error_message = pg_cstr_enc(str, this->enc_idx);
+
+	ret = gvl_PQputCopyEnd(this->pgconn, error_message);
+	if(ret == -1)
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(this->pgconn));
 
-	ret = gvl_PQputCopyEnd(conn, error_message);
-	if(ret == -1) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
-	}
 	return (ret) ? Qtrue : Qfalse;
 }
 
-/*
- * call-seq:
- *    conn.get_copy_data( [ async = false [, decoder = nil ]] ) -> String
- *
- * Return a string containing one row of data, +nil+
- * if the copy is done, or +false+ if the call would
- * block (only possible if _async_ is true).
- *
- * decoder can be a PG::Coder derivation (typically PG::TextDecoder::CopyRow).
- * This decodes the received data fields as Array of Strings. Optionally
- * the decoder can type cast the fields to various Ruby types in one step,
- * if PG::TextDecoder::CopyRow#type_map is set accordingly.
- *
- * See also #copy_data.
- *
- */
 static VALUE
-pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
+pgconn_sync_get_copy_data(int argc, VALUE *argv, VALUE self )
 {
 	VALUE async_in;
-	VALUE error;
 	VALUE result;
 	int ret;
 	char *buffer;
@@ -2689,20 +2619,16 @@ pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
 
 	if( NIL_P(decoder) ){
 		if( !NIL_P(this->decoder_for_get_copy_data) ){
-			p_coder = DATA_PTR( this->decoder_for_get_copy_data );
+			p_coder = RTYPEDDATA_DATA( this->decoder_for_get_copy_data );
 		}
-	} else if( rb_obj_is_kind_of(decoder, rb_cPG_Coder) ) {
-		Data_Get_Struct( decoder, t_pg_coder, p_coder );
 	} else {
-		rb_raise( rb_eTypeError, "wrong decoder type %s (expected some kind of PG::Coder)",
-				rb_obj_classname( decoder ) );
+		/* Check argument type and use argument decoder */
+		TypedData_Get_Struct(decoder, t_pg_coder, &pg_coder_type, p_coder);
 	}
 
 	ret = gvl_PQgetCopyData(this->pgconn, &buffer, RTEST(async_in));
-	if(ret == -2) { /* error */
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(this->pgconn));
-		rb_iv_set(error, "@connection", self);
-		rb_exc_raise(error);
+	if(ret == -2){ /* error */
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(this->pgconn));
 	}
 	if(ret == -1) { /* No data left */
 		return Qnil;
@@ -2713,9 +2639,9 @@ pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
 
 	if( p_coder ){
 		t_pg_coder_dec_func dec_func = pg_coder_dec_func( p_coder, p_coder->format );
-		result =  dec_func( p_coder, buffer, ret, 0, 0, ENCODING_GET(self) );
+		result =  dec_func( p_coder, buffer, ret, 0, 0, this->enc_idx );
 	} else {
-		result = rb_tainted_str_new(buffer, ret);
+		result = rb_str_new(buffer, ret);
 	}
 
 	PQfreemem(buffer);
@@ -2728,9 +2654,16 @@ pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
  *
  * Sets connection's verbosity to _verbosity_ and returns
  * the previous setting. Available settings are:
+ *
  * * PQERRORS_TERSE
  * * PQERRORS_DEFAULT
  * * PQERRORS_VERBOSE
+ * * PQERRORS_SQLSTATE
+ *
+ * Changing the verbosity does not affect the messages available from already-existing PG::Result objects, only subsequently-created ones.
+ * (But see PG::Result#verbose_error_message if you want to print a previous error with a different verbosity.)
+ *
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-control.html#LIBPQ-PQSETERRORVERBOSITY].
  */
 static VALUE
 pgconn_set_error_verbosity(VALUE self, VALUE in_verbosity)
@@ -2740,25 +2673,57 @@ pgconn_set_error_verbosity(VALUE self, VALUE in_verbosity)
 	return INT2FIX(PQsetErrorVerbosity(conn, verbosity));
 }
 
+#ifdef HAVE_PQRESULTVERBOSEERRORMESSAGE
 /*
  * call-seq:
- *    conn.trace( stream ) -> nil
+ *    conn.set_error_context_visibility( context_visibility ) -> Integer
  *
- * Enables tracing message passing between backend. The
- * trace message will be written to the stream _stream_,
- * which must implement a method +fileno+ that returns
- * a writable file descriptor.
+ * Sets connection's context display mode to _context_visibility_ and returns
+ * the previous setting. Available settings are:
+ * * PQSHOW_CONTEXT_NEVER
+ * * PQSHOW_CONTEXT_ERRORS
+ * * PQSHOW_CONTEXT_ALWAYS
+ *
+ * This mode controls whether the CONTEXT field is included in messages (unless the verbosity setting is TERSE, in which case CONTEXT is never shown).
+ * The NEVER mode never includes CONTEXT, while ALWAYS always includes it if available.
+ * In ERRORS mode (the default), CONTEXT fields are included only for error messages, not for notices and warnings.
+ *
+ * Changing this mode does not affect the messages available from already-existing PG::Result objects, only subsequently-created ones.
+ * (But see PG::Result#verbose_error_message if you want to print a previous error with a different display mode.)
+ *
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-control.html#LIBPQ-PQSETERRORCONTEXTVISIBILITY].
+ *
+ * Available since PostgreSQL-9.6
  */
 static VALUE
-pgconn_trace(VALUE self, VALUE stream)
+pgconn_set_error_context_visibility(VALUE self, VALUE in_context_visibility)
 {
-	VALUE fileno;
+	PGconn *conn = pg_get_pgconn(self);
+	PGContextVisibility context_visibility = NUM2INT(in_context_visibility);
+	return INT2FIX(PQsetErrorContextVisibility(conn, context_visibility));
+}
+#endif
+
+/*
+ * call-seq:
+ *    conn.trace( stream ) -> nil
+ *
+ * Enables tracing message passing between backend. The
+ * trace message will be written to the stream _stream_,
+ * which must implement a method +fileno+ that returns
+ * a writable file descriptor.
+ */
+static VALUE
+pgconn_trace(VALUE self, VALUE stream)
+{
+	VALUE fileno;
 	FILE *new_fp;
 	int old_fd, new_fd;
 	VALUE new_file;
 	t_pg_connection *this = pg_get_connection_safe( self );
 
-	if(rb_respond_to(stream,rb_intern("fileno")) == Qfalse)
+	rb_check_frozen(self);
+	if(!rb_respond_to(stream,rb_intern("fileno")))
 		rb_raise(rb_eArgError, "stream does not respond to method: fileno");
 
 	fileno = rb_funcall(stream, rb_intern("fileno"), 0);
@@ -2779,7 +2744,7 @@ pgconn_trace(VALUE self, VALUE stream)
 		rb_raise(rb_eArgError, "stream is not writable");
 
 	new_file = rb_funcall(rb_cIO, rb_intern("new"), 1, INT2NUM(new_fd));
-	this->trace_stream = new_file;
+	RB_OBJ_WRITE(self, &this->trace_stream, new_file);
 
 	PQtrace(this->pgconn, new_fp);
 	return Qnil;
@@ -2798,7 +2763,7 @@ pgconn_untrace(VALUE self)
 
 	PQuntrace(this->pgconn);
 	rb_funcall(this->trace_stream, rb_intern("close"), 0);
-	this->trace_stream = Qnil;
+	RB_OBJ_WRITE(self, &this->trace_stream, Qnil);
 	return Qnil;
 }
 
@@ -2857,13 +2822,14 @@ pgconn_set_notice_receiver(VALUE self)
 	VALUE proc, old_proc;
 	t_pg_connection *this = pg_get_connection_safe( self );
 
+	rb_check_frozen(self);
 	/* If default_notice_receiver is unset, assume that the current
 	 * notice receiver is the default, and save it to a global variable.
 	 * This should not be a problem because the default receiver is
 	 * always the same, so won't vary among connections.
 	 */
-	if(default_notice_receiver == NULL)
-		default_notice_receiver = PQsetNoticeReceiver(this->pgconn, NULL, NULL);
+	if(this->default_notice_receiver == NULL)
+		this->default_notice_receiver = PQsetNoticeReceiver(this->pgconn, NULL, NULL);
 
 	old_proc = this->notice_receiver;
 	if( rb_block_given_p() ) {
@@ -2872,10 +2838,10 @@ pgconn_set_notice_receiver(VALUE self)
 	} else {
 		/* if no block is given, set back to default */
 		proc = Qnil;
-		PQsetNoticeReceiver(this->pgconn, default_notice_receiver, NULL);
+		PQsetNoticeReceiver(this->pgconn, this->default_notice_receiver, NULL);
 	}
 
-	this->notice_receiver = proc;
+	RB_OBJ_WRITE(self, &this->notice_receiver, proc);
 	return old_proc;
 }
 
@@ -2890,10 +2856,10 @@ notice_processor_proxy(void *arg, const char *message)
 	VALUE self = (VALUE)arg;
 	t_pg_connection *this = pg_get_connection( self );
 
-	if (this->notice_receiver != Qnil) {
-		VALUE message_str = rb_tainted_str_new2(message);
-		PG_ENCODING_SET_NOCHECK( message_str, ENCODING_GET(self) );
-		rb_funcall(this->notice_receiver, rb_intern("call"), 1, message_str);
+	if (this->notice_processor != Qnil) {
+		VALUE message_str = rb_str_new2(message);
+		PG_ENCODING_SET_NOCHECK( message_str, this->enc_idx );
+		rb_funcall(this->notice_processor, rb_intern("call"), 1, message_str);
 	}
 	return;
 }
@@ -2902,7 +2868,7 @@ notice_processor_proxy(void *arg, const char *message)
  * call-seq:
  *   conn.set_notice_processor {|message| ... } -> Proc
  *
- * See #set_notice_receiver for the desription of what this and the
+ * See #set_notice_receiver for the description of what this and the
  * notice_processor methods do.
  *
  * This function takes a new block to act as the notice processor and returns
@@ -2917,25 +2883,26 @@ pgconn_set_notice_processor(VALUE self)
 	VALUE proc, old_proc;
 	t_pg_connection *this = pg_get_connection_safe( self );
 
+	rb_check_frozen(self);
 	/* If default_notice_processor is unset, assume that the current
 	 * notice processor is the default, and save it to a global variable.
 	 * This should not be a problem because the default processor is
 	 * always the same, so won't vary among connections.
 	 */
-	if(default_notice_processor == NULL)
-		default_notice_processor = PQsetNoticeProcessor(this->pgconn, NULL, NULL);
+	if(this->default_notice_processor == NULL)
+		this->default_notice_processor = PQsetNoticeProcessor(this->pgconn, NULL, NULL);
 
-	old_proc = this->notice_receiver;
+	old_proc = this->notice_processor;
 	if( rb_block_given_p() ) {
 		proc = rb_block_proc();
 		PQsetNoticeProcessor(this->pgconn, gvl_notice_processor_proxy, (void *)self);
 	} else {
 		/* if no block is given, set back to default */
 		proc = Qnil;
-		PQsetNoticeProcessor(this->pgconn, default_notice_processor, NULL);
+		PQsetNoticeProcessor(this->pgconn, this->default_notice_processor, NULL);
 	}
 
-	this->notice_receiver = proc;
+	RB_OBJ_WRITE(self, &this->notice_processor, proc);
 	return old_proc;
 }
 
@@ -2950,76 +2917,34 @@ static VALUE
 pgconn_get_client_encoding(VALUE self)
 {
 	char *encoding = (char *)pg_encoding_to_char(PQclientEncoding(pg_get_pgconn(self)));
-	return rb_tainted_str_new2(encoding);
+	return rb_str_new2(encoding);
 }
 
 
 /*
  * call-seq:
- *    conn.set_client_encoding( encoding )
+ *    conn.sync_set_client_encoding( encoding )
  *
- * Sets the client encoding to the _encoding_ String.
+ * This function has the same behavior as #async_set_client_encoding, but is implemented using the synchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ * It's not recommended to use explicit sync or async variants but #set_client_encoding instead, unless you have a good reason to do so.
  */
 static VALUE
-pgconn_set_client_encoding(VALUE self, VALUE str)
+pgconn_sync_set_client_encoding(VALUE self, VALUE str)
 {
 	PGconn *conn = pg_get_pgconn( self );
 
+	rb_check_frozen(self);
 	Check_Type(str, T_STRING);
 
-	if ( (gvl_PQsetClientEncoding(conn, StringValueCStr(str))) == -1 ) {
-		rb_raise(rb_ePGerror, "invalid encoding name: %s",StringValueCStr(str));
-	}
-#ifdef M17N_SUPPORTED
+	if ( (gvl_PQsetClientEncoding(conn, StringValueCStr(str))) == -1 )
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
+
 	pgconn_set_internal_encoding_index( self );
-#endif
 
 	return Qnil;
 }
 
-/*
- * call-seq:
- *    conn.transaction { |conn| ... } -> result of the block
- *
- * Executes a +BEGIN+ at the start of the block,
- * and a +COMMIT+ at the end of the block, or
- * +ROLLBACK+ if any exception occurs.
- */
-static VALUE
-pgconn_transaction(VALUE self)
-{
-	PGconn *conn = pg_get_pgconn(self);
-	PGresult *result;
-	VALUE rb_pgresult;
-	VALUE block_result = Qnil;
-	int status;
-
-	if (rb_block_given_p()) {
-		result = gvl_PQexec(conn, "BEGIN");
-		rb_pgresult = pg_new_result(result, self);
-		pg_result_check(rb_pgresult);
-		block_result = rb_protect(rb_yield, self, &status);
-		if(status == 0) {
-			result = gvl_PQexec(conn, "COMMIT");
-			rb_pgresult = pg_new_result(result, self);
-			pg_result_check(rb_pgresult);
-		}
-		else {
-			/* exception occurred, ROLLBACK and re-raise */
-			result = gvl_PQexec(conn, "ROLLBACK");
-			rb_pgresult = pg_new_result(result, self);
-			pg_result_check(rb_pgresult);
-			rb_jump_tag(status);
-		}
-
-	}
-	else {
-		/* no block supplied? */
-		rb_raise(rb_eArgError, "Must supply block for PG::Connection#transaction");
-	}
-	return block_result;
-}
-
 
 /*
  * call-seq:
@@ -3064,14 +2989,12 @@ pgconn_s_quote_ident(VALUE self, VALUE str_or_array)
 	int enc_idx;
 
 	if( rb_obj_is_kind_of(self, rb_cPGconn) ){
-		enc_idx = ENCODING_GET( self );
+		enc_idx = pg_get_connection(self)->enc_idx;
 	}else{
 		enc_idx = RB_TYPE_P(str_or_array, T_STRING) ? ENCODING_GET( str_or_array ) : rb_ascii8bit_encindex();
 	}
 	pg_text_enc_identifier(NULL, str_or_array, NULL, &ret, enc_idx);
 
-	OBJ_INFECT(ret, str_or_array);
-
 	return ret;
 }
 
@@ -3096,14 +3019,8 @@ get_result_readable(PGconn *conn)
  * If +true+ is returned, +conn.is_busy+ will return +false+
  * and +conn.get_result+ will not block.
  */
-static VALUE
+VALUE
 pgconn_block( int argc, VALUE *argv, VALUE self ) {
-	PGconn *conn = pg_get_pgconn( self );
-
-	/* If WIN32 and Ruby 1.9 do not use rb_thread_select() which sometimes hangs
-	 * and does not wait (nor sleep) any time even if timeout is given.
-	 * Instead use the Winsock events and rb_w32_wait_events(). */
-
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
 	VALUE timeout_in;
@@ -3117,7 +3034,7 @@ pgconn_block( int argc, VALUE *argv, VALUE self ) {
 		ptimeout = &timeout;
 	}
 
-	ret = wait_socket_readable( conn, ptimeout, get_result_readable);
+	ret = wait_socket_readable( self, ptimeout, get_result_readable);
 
 	if( !ret )
 		return Qfalse;
@@ -3126,6 +3043,42 @@ pgconn_block( int argc, VALUE *argv, VALUE self ) {
 }
 
 
+/*
+ * call-seq:
+ *    conn.sync_get_last_result( ) -> PG::Result
+ *
+ * This function has the same behavior as #async_get_last_result, but is implemented using the synchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ * It's not recommended to use explicit sync or async variants but #get_last_result instead, unless you have a good reason to do so.
+ */
+static VALUE
+pgconn_sync_get_last_result(VALUE self)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	VALUE rb_pgresult = Qnil;
+	PGresult *cur, *prev;
+
+
+	cur = prev = NULL;
+	while ((cur = gvl_PQgetResult(conn)) != NULL) {
+		int status;
+
+		if (prev) PQclear(prev);
+		prev = cur;
+
+		status = PQresultStatus(cur);
+		if (status == PGRES_COPY_OUT || status == PGRES_COPY_IN || status == PGRES_COPY_BOTH)
+			break;
+	}
+
+	if (prev) {
+		rb_pgresult = pg_new_result( prev, self );
+		pg_result_check(rb_pgresult);
+	}
+
+	return rb_pgresult;
+}
+
 /*
  * call-seq:
  *    conn.get_last_result( ) -> PG::Result
@@ -3136,27 +3089,36 @@ pgconn_block( int argc, VALUE *argv, VALUE self ) {
  * returns the last non-NULL result, or +nil+ if no
  * results are available.
  *
+ * If the last result contains a bad result_status, an
+ * appropriate exception is raised.
+ *
  * This function is similar to #get_result
  * except that it is designed to get one and only
- * one result.
+ * one result and that it checks the result state.
  */
 static VALUE
-pgconn_get_last_result(VALUE self)
+pgconn_async_get_last_result(VALUE self)
 {
 	PGconn *conn = pg_get_pgconn(self);
 	VALUE rb_pgresult = Qnil;
 	PGresult *cur, *prev;
 
-
 	cur = prev = NULL;
-	while ((cur = gvl_PQgetResult(conn)) != NULL) {
+	for(;;) {
 		int status;
 
+		/* wait for input (without blocking) before reading each result */
+		wait_socket_readable(self, NULL, get_result_readable);
+
+		cur = gvl_PQgetResult(conn);
+		if (cur == NULL)
+			break;
+
 		if (prev) PQclear(prev);
 		prev = cur;
 
 		status = PQresultStatus(cur);
-		if (status == PGRES_COPY_OUT || status == PGRES_COPY_IN)
+		if (status == PGRES_COPY_OUT || status == PGRES_COPY_IN || status == PGRES_COPY_BOTH)
 			break;
 	}
 
@@ -3170,25 +3132,132 @@ pgconn_get_last_result(VALUE self)
 
 /*
  * call-seq:
- *    conn.async_exec(sql [, params, result_format ] ) -> PG::Result
- *    conn.async_exec(sql [, params, result_format ] ) {|pg_result| block }
+ *    conn.discard_results()
+ *
+ * Silently discard any prior query result that application didn't eat.
+ * This is internally used prior to Connection#exec and sibling methods.
+ * It doesn't raise an exception on connection errors, but returns +false+ instead.
+ *
+ * Returns:
+ * * +nil+  when the connection is already idle
+ * * +true+  when some results have been discarded
+ * * +false+  when a failure occured and the connection was closed
+ *
+ */
+static VALUE
+pgconn_discard_results(VALUE self)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	VALUE socket_io;
+
+	switch( PQtransactionStatus(conn) ) {
+		case PQTRANS_IDLE:
+		case PQTRANS_INTRANS:
+		case PQTRANS_INERROR:
+			return Qnil;
+		default:;
+	}
+
+	socket_io = pgconn_socket_io(self);
+
+	for(;;) {
+		PGresult *cur;
+		int status;
+
+		/* pgconn_block() raises an exception in case of errors.
+		* To avoid this call pg_rb_io_wait() and PQconsumeInput() without rb_raise().
+		*/
+		while( gvl_PQisBusy(conn) ){
+			int events;
+
+			switch( PQflush(conn) ) {
+				case 1:
+					events = RB_NUM2INT(pg_rb_io_wait(socket_io, RB_INT2NUM(PG_RUBY_IO_READABLE | PG_RUBY_IO_WRITABLE), Qnil));
+					if (events & PG_RUBY_IO_READABLE){
+						if ( PQconsumeInput(conn) == 0 ) goto error;
+					}
+					break;
+				case 0:
+					pg_rb_io_wait(socket_io, RB_INT2NUM(PG_RUBY_IO_READABLE), Qnil);
+					if ( PQconsumeInput(conn) == 0 ) goto error;
+					break;
+				default:
+					goto error;
+			}
+		}
+
+		cur = gvl_PQgetResult(conn);
+		if( cur == NULL) break;
+
+		status = PQresultStatus(cur);
+		PQclear(cur);
+		if (status == PGRES_COPY_IN){
+			while( gvl_PQputCopyEnd(conn, "COPY terminated by new query or discard_results") == 0 ){
+				pgconn_async_flush(self);
+			}
+		}
+		if (status == PGRES_COPY_OUT){
+			for(;;) {
+				char *buffer = NULL;
+				int st = gvl_PQgetCopyData(conn, &buffer, 1);
+				if( st == 0 ) {
+					/* would block -> wait for readable data */
+					pg_rb_io_wait(socket_io, RB_INT2NUM(PG_RUBY_IO_READABLE), Qnil);
+					if ( PQconsumeInput(conn) == 0 ) goto error;
+				} else if( st > 0 ) {
+					/* some data retrieved -> discard it */
+					PQfreemem(buffer);
+				} else {
+					/* no more data */
+					break;
+				}
+			}
+		}
+	}
+
+	return Qtrue;
+
+error:
+	pgconn_close_socket_io(self);
+	return Qfalse;
+}
+
+/*
+ * call-seq:
+ *    conn.exec(sql) -> PG::Result
+ *    conn.exec(sql) {|pg_result| block }
+ *
+ * Sends SQL query request specified by _sql_ to PostgreSQL.
+ * 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,
+ * it will call #exec_params for you. New code should explicitly use #exec_params if
+ * argument placeholders are used.
+ *
+ * If the optional code block is given, it will be passed <i>result</i> as an argument,
+ * and the PG::Result object will  automatically be cleared when the block terminates.
+ * In this instance, <code>conn.exec</code> returns the value of the block.
+ *
+ * #exec is an alias for #async_exec which is almost identical to #sync_exec .
+ * #sync_exec is implemented on the simpler synchronous command processing API of libpq, whereas
+ * #async_exec is implemented on the asynchronous API and on ruby's IO mechanisms.
+ * Only #async_exec is compatible to <tt>Fiber.scheduler</tt> based asynchronous IO processing introduced in ruby-3.0.
+ * Both methods ensure that other threads can process while waiting for the server to
+ * complete the request, but #sync_exec blocks all signals to be processed until the query is finished.
+ * This is most notably visible by a delayed reaction to Control+C.
+ * It's not recommended to use explicit sync or async variants but #exec instead, unless you have a good reason to do so.
  *
- * This function has the same behavior as #exec,
- * but is implemented using the asynchronous command
- * processing API of libpq.
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-exec.html#LIBPQ-PQEXEC].
  */
 static VALUE
 pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 {
 	VALUE rb_pgresult = Qnil;
 
-	/* remove any remaining results from the queue */
-	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
-	pgconn_get_last_result( self );
-
+	pgconn_discard_results( self );
 	pgconn_send_query( argc, argv, self );
-	pgconn_block( 0, NULL, self );
-	rb_pgresult = pgconn_get_last_result( self );
+	rb_pgresult = pgconn_async_get_last_result( self );
 
 	if ( rb_block_given_p() ) {
 		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
@@ -3197,15 +3266,225 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 }
 
 
-#ifdef HAVE_PQSSLATTRIBUTE
-/* Since PostgreSQL-9.5: */
+/*
+ * call-seq:
+ *    conn.exec_params(sql, params [, result_format [, type_map ]] ) -> nil
+ *    conn.exec_params(sql, params [, result_format [, type_map ]] ) {|pg_result| block }
+ *
+ * Sends SQL query request specified by +sql+ to PostgreSQL using placeholders
+ * for parameters.
+ *
+ * Returns a PG::Result instance on success. On failure, it raises a PG::Error.
+ *
+ * +params+ is an array of the bind parameters for the SQL query.
+ * Each element of the +params+ array may be either:
+ *   a hash of the form:
+ *     {:value  => String (value of bind parameter)
+ *      :type   => Integer (oid of type of bind parameter)
+ *      :format => Integer (0 for text, 1 for binary)
+ *     }
+ *   or, it may be a String. If it is a string, that is equivalent to the hash:
+ *     { :value => <string value>, :type => 0, :format => 0 }
+ *
+ * PostgreSQL bind parameters are represented as $1, $2, $3, etc.,
+ * inside the SQL query. The 0th element of the +params+ array is bound
+ * to $1, the 1st element is bound to $2, etc. +nil+ is treated as +NULL+.
+ *
+ * If the types are not specified, they will be inferred by PostgreSQL.
+ * Instead of specifying type oids, it's recommended to simply add
+ * explicit casts in the query to ensure that the right type is used.
+ *
+ * For example: "SELECT $1::int"
+ *
+ * The optional +result_format+ should be 0 for text results, 1
+ * for binary.
+ *
+ * +type_map+ can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
+ * This will type cast the params from various Ruby types before transmission
+ * based on the encoders defined by the type map. When a type encoder is used
+ * the format and oid of a given bind parameter are retrieved from the encoder
+ * instead out of the hash form described above.
+ *
+ * If the optional code block is given, it will be passed <i>result</i> as an argument,
+ * and the PG::Result object will  automatically be cleared when the block terminates.
+ * In this instance, <code>conn.exec</code> returns the value of the block.
+ *
+ * The primary advantage of #exec_params over #exec is that parameter values can be separated from the command string, thus avoiding the need for tedious and error-prone quoting and escaping.
+ * Unlike #exec, #exec_params allows at most one SQL command in the given string.
+ * (There can be semicolons in it, but not more than one nonempty command.)
+ * This is a limitation of the underlying protocol, but has some usefulness as an extra defense against SQL-injection attacks.
+ *
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-exec.html#LIBPQ-PQEXECPARAMS].
+ */
+static VALUE
+pgconn_async_exec_params(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pgresult = Qnil;
+
+	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]) )) {
+		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 );
+	}
+	rb_pgresult = pgconn_async_get_last_result( self );
+
+	if ( rb_block_given_p() ) {
+		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
+	}
+	return rb_pgresult;
+}
+
+
+/*
+ * call-seq:
+ *    conn.prepare(stmt_name, sql [, param_types ] ) -> PG::Result
+ *
+ * Prepares statement _sql_ with name _name_ to be executed later.
+ * Returns a PG::Result instance on success.
+ * On failure, it raises a PG::Error.
+ *
+ * +param_types+ is an optional parameter to specify the Oids of the
+ * types of the parameters.
+ *
+ * If the types are not specified, they will be inferred by PostgreSQL.
+ * Instead of specifying type oids, it's recommended to simply add
+ * explicit casts in the query to ensure that the right type is used.
+ *
+ * For example: "SELECT $1::int"
+ *
+ * PostgreSQL bind parameters are represented as $1, $2, $3, etc.,
+ * inside the SQL query.
+ *
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-exec.html#LIBPQ-PQPREPARE].
+ */
+static VALUE
+pgconn_async_prepare(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pgresult = Qnil;
+
+	pgconn_discard_results( self );
+	pgconn_send_prepare( argc, argv, self );
+	rb_pgresult = pgconn_async_get_last_result( self );
+
+	if ( rb_block_given_p() ) {
+		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
+	}
+	return rb_pgresult;
+}
+
+
+/*
+ * call-seq:
+ *    conn.exec_prepared(statement_name [, params, result_format[, type_map]] ) -> PG::Result
+ *    conn.exec_prepared(statement_name [, params, result_format[, type_map]] ) {|pg_result| block }
+ *
+ * Execute prepared named statement specified by _statement_name_.
+ * Returns a PG::Result instance on success.
+ * On failure, it raises a PG::Error.
+ *
+ * +params+ is an array of the optional bind parameters for the
+ * SQL query. Each element of the +params+ array may be either:
+ *   a hash of the form:
+ *     {:value  => String (value of bind parameter)
+ *      :format => Integer (0 for text, 1 for binary)
+ *     }
+ *   or, it may be a String. If it is a string, that is equivalent to the hash:
+ *     { :value => <string value>, :format => 0 }
+ *
+ * PostgreSQL bind parameters are represented as $1, $2, $3, etc.,
+ * inside the SQL query. The 0th element of the +params+ array is bound
+ * to $1, the 1st element is bound to $2, etc. +nil+ is treated as +NULL+.
+ *
+ * The optional +result_format+ should be 0 for text results, 1
+ * for binary.
+ *
+ * +type_map+ can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
+ * This will type cast the params from various Ruby types before transmission
+ * based on the encoders defined by the type map. When a type encoder is used
+ * the format and oid of a given bind parameter are retrieved from the encoder
+ * instead out of the hash form described above.
+ *
+ * If the optional code block is given, it will be passed <i>result</i> as an argument,
+ * and the PG::Result object will  automatically be cleared when the block terminates.
+ * In this instance, <code>conn.exec_prepared</code> returns the value of the block.
+ *
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-exec.html#LIBPQ-PQEXECPREPARED].
+ */
+static VALUE
+pgconn_async_exec_prepared(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pgresult = Qnil;
+
+	pgconn_discard_results( self );
+	pgconn_send_query_prepared( argc, argv, self );
+	rb_pgresult = pgconn_async_get_last_result( self );
+
+	if ( rb_block_given_p() ) {
+		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
+	}
+	return rb_pgresult;
+}
+
+
+/*
+ * call-seq:
+ *    conn.describe_portal( portal_name ) -> PG::Result
+ *
+ * Retrieve information about the portal _portal_name_.
+ *
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-exec.html#LIBPQ-PQDESCRIBEPORTAL].
+ */
+static VALUE
+pgconn_async_describe_portal(VALUE self, VALUE portal)
+{
+	VALUE rb_pgresult = Qnil;
+
+	pgconn_discard_results( self );
+	pgconn_send_describe_portal( self, portal );
+	rb_pgresult = pgconn_async_get_last_result( self );
+
+	if ( rb_block_given_p() ) {
+		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
+	}
+	return rb_pgresult;
+}
+
+
+/*
+ * call-seq:
+ *    conn.describe_prepared( statement_name ) -> PG::Result
+ *
+ * Retrieve information about the prepared statement _statement_name_.
+ *
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-exec.html#LIBPQ-PQDESCRIBEPREPARED].
+ */
+static VALUE
+pgconn_async_describe_prepared(VALUE self, VALUE stmt_name)
+{
+	VALUE rb_pgresult = Qnil;
 
+	pgconn_discard_results( self );
+	pgconn_send_describe_prepared( self, stmt_name );
+	rb_pgresult = pgconn_async_get_last_result( self );
+
+	if ( rb_block_given_p() ) {
+		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
+	}
+	return rb_pgresult;
+}
+
+
+#ifdef HAVE_PQSSLATTRIBUTE
 /*
  * call-seq:
  *    conn.ssl_in_use? -> Boolean
  *
- * Returns +true+ if the connection uses SSL, +false+ if not.
+ * Returns +true+ if the connection uses SSL/TLS, +false+ if not.
  *
+ * Available since PostgreSQL-9.5
  */
 static VALUE
 pgconn_ssl_in_use(VALUE self)
@@ -3237,7 +3516,9 @@ pgconn_ssl_in_use(VALUE self)
  *   If SSL compression is in use, returns the name of the compression algorithm, or "on" if compression is used but the algorithm is not known. If compression is not in use, returns "off".
  *
  *
- * See also #ssl_attribute_names and http://www.postgresql.org/docs/current/interactive/libpq-status.html#LIBPQ-PQSSLATTRIBUTE
+ * See also #ssl_attribute_names and the {corresponding libpq function}[https://www.postgresql.org/docs/current/libpq-status.html#LIBPQ-PQSSLATTRIBUTE].
+ *
+ * Available since PostgreSQL-9.5
  */
 static VALUE
 pgconn_ssl_attribute(VALUE self, VALUE attribute_name)
@@ -3256,6 +3537,7 @@ pgconn_ssl_attribute(VALUE self, VALUE attribute_name)
  *
  * See also #ssl_attribute
  *
+ * Available since PostgreSQL-9.5
  */
 static VALUE
 pgconn_ssl_attribute_names(VALUE self)
@@ -3274,10 +3556,134 @@ pgconn_ssl_attribute_names(VALUE self)
 #endif
 
 
+#ifdef HAVE_PQENTERPIPELINEMODE
+/*
+ * call-seq:
+ *    conn.pipeline_status -> Integer
+ *
+ * Returns the current pipeline mode status of the libpq connection.
+ *
+ * PQpipelineStatus can return one of the following values:
+ *
+ * * PQ_PIPELINE_ON - The libpq connection is in pipeline mode.
+ * * PQ_PIPELINE_OFF - The libpq connection is not in pipeline mode.
+ * * PQ_PIPELINE_ABORTED - The libpq connection is in pipeline mode and an error occurred while processing the current pipeline.
+ *   The aborted flag is cleared when PQgetResult returns a result of type PGRES_PIPELINE_SYNC.
+ *
+ * Available since PostgreSQL-14
+ */
+static VALUE
+pgconn_pipeline_status(VALUE self)
+{
+	int res = PQpipelineStatus(pg_get_pgconn(self));
+	return INT2FIX(res);
+}
+
+
+/*
+ * call-seq:
+ *    conn.enter_pipeline_mode -> nil
+ *
+ * Causes a connection to enter pipeline mode if it is currently idle or already in pipeline mode.
+ *
+ * Raises PG::Error and has no effect if the connection is not currently idle, i.e., it has a result ready, or it is waiting for more input from the server, etc.
+ * This function does not actually send anything to the server, it just changes the libpq connection state.
+ *
+ * Available since PostgreSQL-14
+ */
+static VALUE
+pgconn_enter_pipeline_mode(VALUE self)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	int res = PQenterPipelineMode(conn);
+	if( res != 1 )
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
+
+	return Qnil;
+}
+
+/*
+ * call-seq:
+ *    conn.exit_pipeline_mode -> nil
+ *
+ * Causes a connection to exit pipeline mode if it is currently in pipeline mode with an empty queue and no pending results.
+ *
+ * Takes no action if not in pipeline mode.
+ * Raises PG::Error if the current statement isn't finished processing, or PQgetResult has not been called to collect results from all previously sent query.
+ *
+ * Available since PostgreSQL-14
+ */
+static VALUE
+pgconn_exit_pipeline_mode(VALUE self)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	int res = PQexitPipelineMode(conn);
+	if( res != 1 )
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
+
+	return Qnil;
+}
+
+
+/*
+ * call-seq:
+ *    conn.pipeline_sync -> nil
+ *
+ * Marks a synchronization point in a pipeline by sending a sync message and flushing the send buffer.
+ * This serves as the delimiter of an implicit transaction and an error recovery point; see Section 34.5.1.3 of the PostgreSQL documentation.
+ *
+ * Raises PG::Error if the connection is not in pipeline mode or sending a sync message failed.
+ *
+ * Available since PostgreSQL-14
+ */
+static VALUE
+pgconn_pipeline_sync(VALUE self)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	int res = PQpipelineSync(conn);
+	if( res != 1 )
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
+
+	return Qnil;
+}
+
+/*
+ * call-seq:
+ *    conn.pipeline_sync -> nil
+ *
+ * Sends a request for the server to flush its output buffer.
+ *
+ * The server flushes its output buffer automatically as a result of Connection#pipeline_sync being called, or on any request when not in pipeline mode.
+ * This function is useful to cause the server to flush its output buffer in pipeline mode without establishing a synchronization point.
+ * Note that the request is not itself flushed to the server automatically; use Connection#flush if necessary.
+ *
+ * Available since PostgreSQL-14
+ */
+static VALUE
+pgconn_send_flush_request(VALUE self)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	int res = PQsendFlushRequest(conn);
+	if( res != 1 )
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
+
+	return Qnil;
+}
+
+#endif
+
 /**************************************************************************
  * LARGE OBJECT SUPPORT
  **************************************************************************/
 
+#define BLOCKING_BEGIN(conn) do { \
+	int old_nonblocking = PQisnonblocking(conn); \
+	PQsetnonblocking(conn, 0);
+
+#define BLOCKING_END(th) \
+	PQsetnonblocking(conn, old_nonblocking); \
+} while(0);
+
 /*
  * call-seq:
  *    conn.lo_creat( [mode] ) -> Integer
@@ -3298,9 +3704,12 @@ pgconn_locreat(int argc, VALUE *argv, VALUE self)
 	else
 		mode = NUM2INT(nmode);
 
-	lo_oid = lo_creat(conn, mode);
+	BLOCKING_BEGIN(conn)
+		lo_oid = lo_creat(conn, mode);
+	BLOCKING_END(conn)
+
 	if (lo_oid == 0)
-		rb_raise(rb_ePGerror, "lo_creat failed");
+		pg_raise_conn_error( rb_ePGerror, self, "lo_creat failed");
 
 	return UINT2NUM(lo_oid);
 }
@@ -3321,7 +3730,7 @@ pgconn_locreate(VALUE self, VALUE in_lo_oid)
 
 	ret = lo_create(conn, lo_oid);
 	if (ret == InvalidOid)
-		rb_raise(rb_ePGerror, "lo_create failed");
+		pg_raise_conn_error( rb_ePGerror, self, "lo_create failed");
 
 	return UINT2NUM(ret);
 }
@@ -3343,9 +3752,12 @@ pgconn_loimport(VALUE self, VALUE filename)
 
 	Check_Type(filename, T_STRING);
 
-	lo_oid = lo_import(conn, StringValueCStr(filename));
+	BLOCKING_BEGIN(conn)
+		lo_oid = lo_import(conn, StringValueCStr(filename));
+	BLOCKING_END(conn)
+
 	if (lo_oid == 0) {
-		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
 	}
 	return UINT2NUM(lo_oid);
 }
@@ -3361,12 +3773,17 @@ pgconn_loexport(VALUE self, VALUE lo_oid, VALUE filename)
 {
 	PGconn *conn = pg_get_pgconn(self);
 	Oid oid;
+	int ret;
 	Check_Type(filename, T_STRING);
 
 	oid = NUM2UINT(lo_oid);
 
-	if (lo_export(conn, oid, StringValueCStr(filename)) < 0) {
-		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
+	BLOCKING_BEGIN(conn)
+		ret = lo_export(conn, oid, StringValueCStr(filename));
+	BLOCKING_END(conn)
+
+	if (ret < 0) {
+		pg_raise_conn_error( rb_ePGerror, self, "%s", PQerrorMessage(conn));
 	}
 	return Qnil;
 }
@@ -3396,8 +3813,12 @@ pgconn_loopen(int argc, VALUE *argv, VALUE self)
 	else
 		mode = NUM2INT(nmode);
 
-	if((fd = lo_open(conn, lo_oid, mode)) < 0) {
-		rb_raise(rb_ePGerror, "can't open large object: %s", PQerrorMessage(conn));
+	BLOCKING_BEGIN(conn)
+		fd = lo_open(conn, lo_oid, mode);
+	BLOCKING_END(conn)
+
+	if(fd < 0) {
+		pg_raise_conn_error( rb_ePGerror, self, "can't open large object: %s", PQerrorMessage(conn));
 	}
 	return INT2FIX(fd);
 }
@@ -3419,11 +3840,15 @@ pgconn_lowrite(VALUE self, VALUE in_lo_desc, VALUE buffer)
 	Check_Type(buffer, T_STRING);
 
 	if( RSTRING_LEN(buffer) < 0) {
-		rb_raise(rb_ePGerror, "write buffer zero string");
+		pg_raise_conn_error( rb_ePGerror, self, "write buffer zero string");
 	}
-	if((n = lo_write(conn, fd, StringValuePtr(buffer),
-				RSTRING_LEN(buffer))) < 0) {
-		rb_raise(rb_ePGerror, "lo_write failed: %s", PQerrorMessage(conn));
+	BLOCKING_BEGIN(conn)
+		n = lo_write(conn, fd, StringValuePtr(buffer),
+				RSTRING_LEN(buffer));
+	BLOCKING_END(conn)
+
+	if(n < 0) {
+		pg_raise_conn_error( rb_ePGerror, self, "lo_write failed: %s", PQerrorMessage(conn));
 	}
 
 	return INT2FIX(n);
@@ -3446,23 +3871,24 @@ pgconn_loread(VALUE self, VALUE in_lo_desc, VALUE in_len)
 	VALUE str;
 	char *buffer;
 
-  buffer = ALLOC_N(char, len);
-	if(buffer == NULL)
-		rb_raise(rb_eNoMemError, "ALLOC failed!");
+	if (len < 0)
+		pg_raise_conn_error( rb_ePGerror, self, "negative length %d given", len);
 
-	if (len < 0){
-		rb_raise(rb_ePGerror,"nagative length %d given", len);
-	}
+	buffer = ALLOC_N(char, len);
 
-	if((ret = lo_read(conn, lo_desc, buffer, len)) < 0)
-		rb_raise(rb_ePGerror, "lo_read failed");
+	BLOCKING_BEGIN(conn)
+		ret = lo_read(conn, lo_desc, buffer, len);
+	BLOCKING_END(conn)
+
+	if(ret < 0)
+		pg_raise_conn_error( rb_ePGerror, self, "lo_read failed");
 
 	if(ret == 0) {
 		xfree(buffer);
 		return Qnil;
 	}
 
-	str = rb_tainted_str_new(buffer, ret);
+	str = rb_str_new(buffer, ret);
 	xfree(buffer);
 
 	return str;
@@ -3484,8 +3910,12 @@ pgconn_lolseek(VALUE self, VALUE in_lo_desc, VALUE offset, VALUE whence)
 	int lo_desc = NUM2INT(in_lo_desc);
 	int ret;
 
-	if((ret = lo_lseek(conn, lo_desc, NUM2INT(offset), NUM2INT(whence))) < 0) {
-		rb_raise(rb_ePGerror, "lo_lseek failed");
+	BLOCKING_BEGIN(conn)
+		ret = lo_lseek(conn, lo_desc, NUM2INT(offset), NUM2INT(whence));
+	BLOCKING_END(conn)
+
+	if(ret < 0) {
+		pg_raise_conn_error( rb_ePGerror, self, "lo_lseek failed");
 	}
 
 	return INT2FIX(ret);
@@ -3504,8 +3934,12 @@ pgconn_lotell(VALUE self, VALUE in_lo_desc)
 	PGconn *conn = pg_get_pgconn(self);
 	int lo_desc = NUM2INT(in_lo_desc);
 
-	if((position = lo_tell(conn, lo_desc)) < 0)
-		rb_raise(rb_ePGerror,"lo_tell failed");
+	BLOCKING_BEGIN(conn)
+		position = lo_tell(conn, lo_desc);
+	BLOCKING_END(conn)
+
+	if(position < 0)
+		pg_raise_conn_error( rb_ePGerror, self, "lo_tell failed");
 
 	return INT2FIX(position);
 }
@@ -3522,9 +3956,14 @@ pgconn_lotruncate(VALUE self, VALUE in_lo_desc, VALUE in_len)
 	PGconn *conn = pg_get_pgconn(self);
 	int lo_desc = NUM2INT(in_lo_desc);
 	size_t len = NUM2INT(in_len);
+	int ret;
+
+	BLOCKING_BEGIN(conn)
+		ret = lo_truncate(conn,lo_desc,len);
+	BLOCKING_END(conn)
 
-	if(lo_truncate(conn,lo_desc,len) < 0)
-		rb_raise(rb_ePGerror,"lo_truncate failed");
+	if(ret < 0)
+		pg_raise_conn_error( rb_ePGerror, self, "lo_truncate failed");
 
 	return Qnil;
 }
@@ -3540,9 +3979,14 @@ pgconn_loclose(VALUE self, VALUE in_lo_desc)
 {
 	PGconn *conn = pg_get_pgconn(self);
 	int lo_desc = NUM2INT(in_lo_desc);
+	int ret;
+
+	BLOCKING_BEGIN(conn)
+		ret = lo_close(conn,lo_desc);
+	BLOCKING_END(conn)
 
-	if(lo_close(conn,lo_desc) < 0)
-		rb_raise(rb_ePGerror,"lo_close failed");
+	if(ret < 0)
+		pg_raise_conn_error( rb_ePGerror, self, "lo_close failed");
 
 	return Qnil;
 }
@@ -3558,22 +4002,28 @@ pgconn_lounlink(VALUE self, VALUE in_oid)
 {
 	PGconn *conn = pg_get_pgconn(self);
 	Oid oid = NUM2UINT(in_oid);
+	int ret;
+
+	BLOCKING_BEGIN(conn)
+		ret = lo_unlink(conn,oid);
+	BLOCKING_END(conn)
 
-	if(lo_unlink(conn,oid) < 0)
-		rb_raise(rb_ePGerror,"lo_unlink failed");
+	if(ret < 0)
+		pg_raise_conn_error( rb_ePGerror, self, "lo_unlink failed");
 
 	return Qnil;
 }
 
 
-#ifdef M17N_SUPPORTED
-
-void
+static void
 pgconn_set_internal_encoding_index( VALUE self )
 {
-	PGconn *conn = pg_get_pgconn(self);
-	rb_encoding *enc = pg_conn_enc_get( conn );
-	PG_ENCODING_SET_NOCHECK( self, rb_enc_to_index(enc));
+	int enc_idx;
+	t_pg_connection *this = pg_get_connection_safe( self );
+	rb_encoding *enc = pg_conn_enc_get( this->pgconn );
+	enc_idx = rb_enc_to_index(enc);
+	if( enc_idx >= (1<<(PG_ENC_IDX_BITS-1)) ) rb_raise(rb_eArgError, "unsupported encoding index %d", enc_idx);
+	this->enc_idx = enc_idx;
 }
 
 /*
@@ -3616,13 +4066,13 @@ static VALUE pgconn_external_encoding(VALUE self);
 static VALUE
 pgconn_internal_encoding_set(VALUE self, VALUE enc)
 {
-	VALUE enc_inspect;
+	rb_check_frozen(self);
 	if (NIL_P(enc)) {
-		pgconn_set_client_encoding( self, rb_usascii_str_new_cstr("SQL_ASCII") );
+		pgconn_sync_set_client_encoding( self, rb_usascii_str_new_cstr("SQL_ASCII") );
 		return enc;
 	}
 	else if ( TYPE(enc) == T_STRING && strcasecmp("JOHAB", StringValueCStr(enc)) == 0 ) {
-		pgconn_set_client_encoding(self, rb_usascii_str_new_cstr("JOHAB"));
+		pgconn_sync_set_client_encoding(self, rb_usascii_str_new_cstr("JOHAB"));
 		return enc;
 	}
 	else {
@@ -3637,11 +4087,6 @@ pgconn_internal_encoding_set(VALUE self, VALUE enc)
 		pgconn_set_internal_encoding_index( self );
 		return enc;
 	}
-
-	enc_inspect = rb_inspect(enc);
-	rb_raise( rb_ePGerror, "unknown encoding: %s", StringValueCStr(enc_inspect) );
-
-	return Qnil;
 }
 
 
@@ -3660,42 +4105,56 @@ pgconn_external_encoding(VALUE self)
 	rb_encoding *enc = NULL;
 	const char *pg_encname = NULL;
 
-	/* Use cached value if found */
-	if ( RTEST(this->external_encoding) ) return this->external_encoding;
-
 	pg_encname = PQparameterStatus( this->pgconn, "server_encoding" );
 	enc = pg_get_pg_encname_as_rb_encoding( pg_encname );
-	this->external_encoding = rb_enc_from_encoding( enc );
-
-	return this->external_encoding;
+	return rb_enc_from_encoding( enc );
 }
 
+/*
+ * call-seq:
+ *    conn.set_client_encoding( encoding )
+ *
+ * Sets the client encoding to the _encoding_ String.
+ */
+static VALUE
+pgconn_async_set_client_encoding(VALUE self, VALUE encname)
+{
+	VALUE query_format, query;
+
+	rb_check_frozen(self);
+	Check_Type(encname, T_STRING);
+	query_format = rb_str_new_cstr("set client_encoding to '%s'");
+	query = rb_funcall(query_format, rb_intern("%"), 1, encname);
+
+	pgconn_async_exec(1, &query, self);
+	pgconn_set_internal_encoding_index( self );
+
+	return Qnil;
+}
 
 static VALUE
 pgconn_set_client_encoding_async1( VALUE args )
 {
 	VALUE self = ((VALUE*)args)[0];
 	VALUE encname = ((VALUE*)args)[1];
-	VALUE query_format = rb_str_new_cstr("set client_encoding to '%s'");
-	VALUE query = rb_funcall(query_format, rb_intern("%"), 1, encname);
-
-	pgconn_async_exec(1, &query, self);
+	pgconn_async_set_client_encoding(self, encname);
 	return 0;
 }
 
 
 static VALUE
-pgconn_set_client_encoding_async2( VALUE arg )
+pgconn_set_client_encoding_async2( VALUE arg, VALUE ex )
 {
 	UNUSED(arg);
+	UNUSED(ex);
 	return 1;
 }
 
 
 static VALUE
-pgconn_set_client_encoding_async( VALUE self, const char *encname )
+pgconn_set_client_encoding_async( VALUE self, VALUE encname )
 {
-	VALUE args[] = { self, rb_str_new_cstr(encname) };
+	VALUE args[] = { self, encname };
 	return rb_rescue(pgconn_set_client_encoding_async1, (VALUE)&args, pgconn_set_client_encoding_async2, Qnil);
 }
 
@@ -3715,12 +4174,12 @@ pgconn_set_default_encoding( VALUE self )
 	rb_encoding *enc;
 	const char *encname;
 
+	rb_check_frozen(self);
 	if (( enc = rb_default_internal_encoding() )) {
 		encname = pg_get_rb_encoding_as_pg_encoding( enc );
-		if ( pgconn_set_client_encoding_async(self, encname) != 0 )
-			rb_warn( "Failed to set the default_internal encoding to %s: '%s'",
+		if ( pgconn_set_client_encoding_async(self, rb_str_new_cstr(encname)) != 0 )
+			rb_warning( "Failed to set the default_internal encoding to %s: '%s'",
 			         encname, PQerrorMessage(conn) );
-		pgconn_set_internal_encoding_index( self );
 		return rb_enc_from_encoding( enc );
 	} else {
 		pgconn_set_internal_encoding_index( self );
@@ -3729,8 +4188,6 @@ pgconn_set_default_encoding( VALUE self )
 }
 
 
-#endif /* M17N_SUPPORTED */
-
 /*
  * call-seq:
  *    res.type_map_for_queries = typemap
@@ -3744,13 +4201,14 @@ static VALUE
 pgconn_type_map_for_queries_set(VALUE self, VALUE typemap)
 {
 	t_pg_connection *this = pg_get_connection( self );
+	t_typemap *tm;
+	UNUSED(tm);
 
-	if ( !rb_obj_is_kind_of(typemap, rb_cTypeMap) ) {
-		rb_raise( rb_eTypeError, "wrong argument type %s (expected kind of PG::TypeMap)",
-				rb_obj_classname( typemap ) );
-	}
-	Check_Type(typemap, T_DATA);
-	this->type_map_for_queries = typemap;
+	rb_check_frozen(self);
+	/* Check type of method param */
+	TypedData_Get_Struct(typemap, t_typemap, &pg_typemap_type, tm);
+
+	RB_OBJ_WRITE(self, &this->type_map_for_queries, typemap);
 
 	return typemap;
 }
@@ -3784,13 +4242,12 @@ static VALUE
 pgconn_type_map_for_results_set(VALUE self, VALUE typemap)
 {
 	t_pg_connection *this = pg_get_connection( self );
+	t_typemap *tm;
+	UNUSED(tm);
 
-	if ( !rb_obj_is_kind_of(typemap, rb_cTypeMap) ) {
-		rb_raise( rb_eTypeError, "wrong argument type %s (expected kind of PG::TypeMap)",
-				rb_obj_classname( typemap ) );
-	}
-	Check_Type(typemap, T_DATA);
-	this->type_map_for_results = typemap;
+	rb_check_frozen(self);
+	TypedData_Get_Struct(typemap, t_typemap, &pg_typemap_type, tm);
+	RB_OBJ_WRITE(self, &this->type_map_for_results, typemap);
 
 	return typemap;
 }
@@ -3824,20 +4281,20 @@ pgconn_type_map_for_results_get(VALUE self)
  *
  */
 static VALUE
-pgconn_encoder_for_put_copy_data_set(VALUE self, VALUE typemap)
+pgconn_encoder_for_put_copy_data_set(VALUE self, VALUE encoder)
 {
 	t_pg_connection *this = pg_get_connection( self );
 
-	if( typemap != Qnil ){
-		if ( !rb_obj_is_kind_of(typemap, rb_cPG_Coder) ) {
-			rb_raise( rb_eTypeError, "wrong argument type %s (expected kind of PG::Coder)",
-					rb_obj_classname( typemap ) );
-		}
-		Check_Type(typemap, T_DATA);
+	rb_check_frozen(self);
+	if( encoder != Qnil ){
+		t_pg_coder *co;
+		UNUSED(co);
+		/* Check argument type */
+		TypedData_Get_Struct(encoder, t_pg_coder, &pg_coder_type, co);
 	}
-	this->encoder_for_put_copy_data = typemap;
+	RB_OBJ_WRITE(self, &this->encoder_for_put_copy_data, encoder);
 
-	return typemap;
+	return encoder;
 }
 
 /*
@@ -3873,20 +4330,20 @@ pgconn_encoder_for_put_copy_data_get(VALUE self)
  *
  */
 static VALUE
-pgconn_decoder_for_get_copy_data_set(VALUE self, VALUE typemap)
+pgconn_decoder_for_get_copy_data_set(VALUE self, VALUE decoder)
 {
 	t_pg_connection *this = pg_get_connection( self );
 
-	if( typemap != Qnil ){
-		if ( !rb_obj_is_kind_of(typemap, rb_cPG_Coder) ) {
-			rb_raise( rb_eTypeError, "wrong argument type %s (expected kind of PG::Coder)",
-					rb_obj_classname( typemap ) );
-		}
-		Check_Type(typemap, T_DATA);
+	rb_check_frozen(self);
+	if( decoder != Qnil ){
+		t_pg_coder *co;
+		UNUSED(co);
+		/* Check argument type */
+		TypedData_Get_Struct(decoder, t_pg_coder, &pg_coder_type, co);
 	}
-	this->decoder_for_get_copy_data = typemap;
+	RB_OBJ_WRITE(self, &this->decoder_for_get_copy_data, decoder);
 
-	return typemap;
+	return decoder;
 }
 
 /*
@@ -3909,28 +4366,83 @@ pgconn_decoder_for_get_copy_data_get(VALUE self)
 	return this->decoder_for_get_copy_data;
 }
 
+/*
+ * call-seq:
+ *    conn.field_name_type = Symbol
+ *
+ * Set default type of field names of results retrieved by this connection.
+ * It can be set to one of:
+ * * +:string+ to use String based field names
+ * * +:symbol+ to use Symbol based field names
+ *
+ * The default is +:string+ .
+ *
+ * Settings the type of field names affects only future results.
+ *
+ * See further description at PG::Result#field_name_type=
+ *
+ */
+static VALUE
+pgconn_field_name_type_set(VALUE self, VALUE sym)
+{
+	t_pg_connection *this = pg_get_connection( self );
+
+	rb_check_frozen(self);
+	this->flags &= ~PG_RESULT_FIELD_NAMES_MASK;
+	if( sym == sym_symbol ) this->flags |= PG_RESULT_FIELD_NAMES_SYMBOL;
+	else if ( sym == sym_static_symbol ) this->flags |= PG_RESULT_FIELD_NAMES_STATIC_SYMBOL;
+	else if ( sym == sym_string );
+	else rb_raise(rb_eArgError, "invalid argument %+"PRIsVALUE, sym);
+
+	return sym;
+}
+
+/*
+ * call-seq:
+ *    conn.field_name_type -> Symbol
+ *
+ * Get type of field names.
+ *
+ * See description at #field_name_type=
+ */
+static VALUE
+pgconn_field_name_type_get(VALUE self)
+{
+	t_pg_connection *this = pg_get_connection( self );
+
+	if( this->flags & PG_RESULT_FIELD_NAMES_SYMBOL ){
+		return sym_symbol;
+	} else if( this->flags & PG_RESULT_FIELD_NAMES_STATIC_SYMBOL ){
+		return sym_static_symbol;
+	} else {
+		return sym_string;
+	}
+}
+
 
 /*
  * Document-class: PG::Connection
  */
 void
-init_pg_connection()
+init_pg_connection(void)
 {
 	s_id_encode = rb_intern("encode");
+	s_id_autoclose_set = rb_intern("autoclose=");
 	sym_type = ID2SYM(rb_intern("type"));
 	sym_format = ID2SYM(rb_intern("format"));
 	sym_value = ID2SYM(rb_intern("value"));
+	sym_string = ID2SYM(rb_intern("string"));
+	sym_symbol = ID2SYM(rb_intern("symbol"));
+	sym_static_symbol = ID2SYM(rb_intern("static_symbol"));
 
 	rb_cPGconn = rb_define_class_under( rb_mPG, "Connection", rb_cObject );
+	/* Help rdoc to known the Constants module */
+	/* rb_mPGconstants = rb_define_module_under( rb_mPG, "Constants" ); */
 	rb_include_module(rb_cPGconn, rb_mPGconstants);
 
 	/******     PG::Connection CLASS METHODS     ******/
 	rb_define_alloc_func( rb_cPGconn, pgconn_s_allocate );
 
-	SINGLETON_ALIAS(rb_cPGconn, "connect", "new");
-	SINGLETON_ALIAS(rb_cPGconn, "open", "new");
-	SINGLETON_ALIAS(rb_cPGconn, "setdb", "new");
-	SINGLETON_ALIAS(rb_cPGconn, "setdblogin", "new");
 	rb_define_singleton_method(rb_cPGconn, "escape_string", pgconn_s_escape, 1);
 	SINGLETON_ALIAS(rb_cPGconn, "escape", "escape_string");
 	rb_define_singleton_method(rb_cPGconn, "escape_bytea", pgconn_s_escape_bytea, 1);
@@ -3939,16 +4451,15 @@ init_pg_connection()
 	rb_define_singleton_method(rb_cPGconn, "quote_ident", pgconn_s_quote_ident, 1);
 	rb_define_singleton_method(rb_cPGconn, "connect_start", pgconn_s_connect_start, -1);
 	rb_define_singleton_method(rb_cPGconn, "conndefaults", pgconn_s_conndefaults, 0);
-#ifdef HAVE_PQPING
-	rb_define_singleton_method(rb_cPGconn, "ping", pgconn_s_ping, -1);
-#endif
+	rb_define_singleton_method(rb_cPGconn, "conninfo_parse", pgconn_s_conninfo_parse, 1);
+	rb_define_singleton_method(rb_cPGconn, "sync_ping", pgconn_s_sync_ping, -1);
+	rb_define_singleton_method(rb_cPGconn, "sync_connect", pgconn_s_sync_connect, -1);
 
 	/******     PG::Connection INSTANCE METHODS: Connection Control     ******/
-	rb_define_method(rb_cPGconn, "initialize", pgconn_init, -1);
 	rb_define_method(rb_cPGconn, "connect_poll", pgconn_connect_poll, 0);
 	rb_define_method(rb_cPGconn, "finish", pgconn_finish, 0);
 	rb_define_method(rb_cPGconn, "finished?", pgconn_finished_p, 0);
-	rb_define_method(rb_cPGconn, "reset", pgconn_reset, 0);
+	rb_define_method(rb_cPGconn, "sync_reset", pgconn_sync_reset, 0);
 	rb_define_method(rb_cPGconn, "reset_start", pgconn_reset_start, 0);
 	rb_define_method(rb_cPGconn, "reset_poll", pgconn_reset_poll, 0);
 	rb_define_alias(rb_cPGconn, "close", "finish");
@@ -3958,11 +4469,12 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "user", pgconn_user, 0);
 	rb_define_method(rb_cPGconn, "pass", pgconn_pass, 0);
 	rb_define_method(rb_cPGconn, "host", pgconn_host, 0);
+#if defined(HAVE_PQRESULTMEMORYSIZE)
+	rb_define_method(rb_cPGconn, "hostaddr", pgconn_hostaddr, 0);
+#endif
 	rb_define_method(rb_cPGconn, "port", pgconn_port, 0);
 	rb_define_method(rb_cPGconn, "tty", pgconn_tty, 0);
-#ifdef HAVE_PQCONNINFO
 	rb_define_method(rb_cPGconn, "conninfo", pgconn_conninfo, 0);
-#endif
 	rb_define_method(rb_cPGconn, "options", pgconn_options, 0);
 	rb_define_method(rb_cPGconn, "status", pgconn_status, 0);
 	rb_define_method(rb_cPGconn, "transaction_status", pgconn_transaction_status, 0);
@@ -3971,64 +4483,78 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "server_version", pgconn_server_version, 0);
 	rb_define_method(rb_cPGconn, "error_message", pgconn_error_message, 0);
 	rb_define_method(rb_cPGconn, "socket", pgconn_socket, 0);
-#if !defined(_WIN32) || defined(HAVE_RB_W32_WRAP_IO_HANDLE)
 	rb_define_method(rb_cPGconn, "socket_io", pgconn_socket_io, 0);
-#endif
 	rb_define_method(rb_cPGconn, "backend_pid", pgconn_backend_pid, 0);
+	rb_define_method(rb_cPGconn, "backend_key", pgconn_backend_key, 0);
 	rb_define_method(rb_cPGconn, "connection_needs_password", pgconn_connection_needs_password, 0);
 	rb_define_method(rb_cPGconn, "connection_used_password", pgconn_connection_used_password, 0);
 	/* rb_define_method(rb_cPGconn, "getssl", pgconn_getssl, 0); */
 
 	/******     PG::Connection INSTANCE METHODS: Command Execution     ******/
-	rb_define_method(rb_cPGconn, "exec", pgconn_exec, -1);
-	rb_define_alias(rb_cPGconn, "query", "exec");
-	rb_define_method(rb_cPGconn, "exec_params", pgconn_exec_params, -1);
-	rb_define_method(rb_cPGconn, "prepare", pgconn_prepare, -1);
-	rb_define_method(rb_cPGconn, "exec_prepared", pgconn_exec_prepared, -1);
-	rb_define_method(rb_cPGconn, "describe_prepared", pgconn_describe_prepared, 1);
-	rb_define_method(rb_cPGconn, "describe_portal", pgconn_describe_portal, 1);
+	rb_define_method(rb_cPGconn, "sync_exec", pgconn_sync_exec, -1);
+	rb_define_method(rb_cPGconn, "sync_exec_params", pgconn_sync_exec_params, -1);
+	rb_define_method(rb_cPGconn, "sync_prepare", pgconn_sync_prepare, -1);
+	rb_define_method(rb_cPGconn, "sync_exec_prepared", pgconn_sync_exec_prepared, -1);
+	rb_define_method(rb_cPGconn, "sync_describe_prepared", pgconn_sync_describe_prepared, 1);
+	rb_define_method(rb_cPGconn, "sync_describe_portal", pgconn_sync_describe_portal, 1);
+
+	rb_define_method(rb_cPGconn, "exec", pgconn_async_exec, -1);
+	rb_define_method(rb_cPGconn, "exec_params", pgconn_async_exec_params, -1);
+	rb_define_method(rb_cPGconn, "prepare", pgconn_async_prepare, -1);
+	rb_define_method(rb_cPGconn, "exec_prepared", pgconn_async_exec_prepared, -1);
+	rb_define_method(rb_cPGconn, "describe_prepared", pgconn_async_describe_prepared, 1);
+	rb_define_method(rb_cPGconn, "describe_portal", pgconn_async_describe_portal, 1);
+
+	rb_define_alias(rb_cPGconn, "async_exec", "exec");
+	rb_define_alias(rb_cPGconn, "async_query", "async_exec");
+	rb_define_alias(rb_cPGconn, "async_exec_params", "exec_params");
+	rb_define_alias(rb_cPGconn, "async_prepare", "prepare");
+	rb_define_alias(rb_cPGconn, "async_exec_prepared", "exec_prepared");
+	rb_define_alias(rb_cPGconn, "async_describe_prepared", "describe_prepared");
+	rb_define_alias(rb_cPGconn, "async_describe_portal", "describe_portal");
+
 	rb_define_method(rb_cPGconn, "make_empty_pgresult", pgconn_make_empty_pgresult, 1);
 	rb_define_method(rb_cPGconn, "escape_string", pgconn_s_escape, 1);
 	rb_define_alias(rb_cPGconn, "escape", "escape_string");
-#ifdef HAVE_PQESCAPELITERAL
 	rb_define_method(rb_cPGconn, "escape_literal", pgconn_escape_literal, 1);
-#endif
-#ifdef HAVE_PQESCAPEIDENTIFIER
 	rb_define_method(rb_cPGconn, "escape_identifier", pgconn_escape_identifier, 1);
-#endif
 	rb_define_method(rb_cPGconn, "escape_bytea", pgconn_s_escape_bytea, 1);
 	rb_define_method(rb_cPGconn, "unescape_bytea", pgconn_s_unescape_bytea, 1);
-#ifdef HAVE_PQSETSINGLEROWMODE
 	rb_define_method(rb_cPGconn, "set_single_row_mode", pgconn_set_single_row_mode, 0);
-#endif
 
 	/******     PG::Connection INSTANCE METHODS: Asynchronous Command Processing     ******/
 	rb_define_method(rb_cPGconn, "send_query", pgconn_send_query, -1);
+	rb_define_method(rb_cPGconn, "send_query_params", pgconn_send_query_params, -1);
 	rb_define_method(rb_cPGconn, "send_prepare", pgconn_send_prepare, -1);
 	rb_define_method(rb_cPGconn, "send_query_prepared", pgconn_send_query_prepared, -1);
 	rb_define_method(rb_cPGconn, "send_describe_prepared", pgconn_send_describe_prepared, 1);
 	rb_define_method(rb_cPGconn, "send_describe_portal", pgconn_send_describe_portal, 1);
-	rb_define_method(rb_cPGconn, "get_result", pgconn_get_result, 0);
+	rb_define_method(rb_cPGconn, "sync_get_result", pgconn_sync_get_result, 0);
 	rb_define_method(rb_cPGconn, "consume_input", pgconn_consume_input, 0);
 	rb_define_method(rb_cPGconn, "is_busy", pgconn_is_busy, 0);
-	rb_define_method(rb_cPGconn, "setnonblocking", pgconn_setnonblocking, 1);
-	rb_define_method(rb_cPGconn, "isnonblocking", pgconn_isnonblocking, 0);
-	rb_define_alias(rb_cPGconn, "nonblocking?", "isnonblocking");
-	rb_define_method(rb_cPGconn, "flush", pgconn_flush, 0);
+	rb_define_method(rb_cPGconn, "sync_setnonblocking", pgconn_sync_setnonblocking, 1);
+	rb_define_method(rb_cPGconn, "sync_isnonblocking", pgconn_sync_isnonblocking, 0);
+	rb_define_method(rb_cPGconn, "sync_flush", pgconn_sync_flush, 0);
+	rb_define_method(rb_cPGconn, "flush", pgconn_async_flush, 0);
+	rb_define_alias(rb_cPGconn, "async_flush", "flush");
+	rb_define_method(rb_cPGconn, "discard_results", pgconn_discard_results, 0);
 
 	/******     PG::Connection INSTANCE METHODS: Cancelling Queries in Progress     ******/
-	rb_define_method(rb_cPGconn, "cancel", pgconn_cancel, 0);
+	rb_define_method(rb_cPGconn, "sync_cancel", pgconn_sync_cancel, 0);
 
 	/******     PG::Connection INSTANCE METHODS: NOTIFY     ******/
 	rb_define_method(rb_cPGconn, "notifies", pgconn_notifies, 0);
 
 	/******     PG::Connection INSTANCE METHODS: COPY     ******/
-	rb_define_method(rb_cPGconn, "put_copy_data", pgconn_put_copy_data, -1);
-	rb_define_method(rb_cPGconn, "put_copy_end", pgconn_put_copy_end, -1);
-	rb_define_method(rb_cPGconn, "get_copy_data", pgconn_get_copy_data, -1);
+	rb_define_method(rb_cPGconn, "sync_put_copy_data", pgconn_sync_put_copy_data, -1);
+	rb_define_method(rb_cPGconn, "sync_put_copy_end", pgconn_sync_put_copy_end, -1);
+	rb_define_method(rb_cPGconn, "sync_get_copy_data", pgconn_sync_get_copy_data, -1);
 
 	/******     PG::Connection INSTANCE METHODS: Control Functions     ******/
 	rb_define_method(rb_cPGconn, "set_error_verbosity", pgconn_set_error_verbosity, 1);
+#ifdef HAVE_PQRESULTVERBOSEERRORMESSAGE
+	rb_define_method(rb_cPGconn, "set_error_context_visibility", pgconn_set_error_context_visibility, 1 );
+#endif
 	rb_define_method(rb_cPGconn, "trace", pgconn_trace, 1);
 	rb_define_method(rb_cPGconn, "untrace", pgconn_untrace, 0);
 
@@ -4038,16 +4564,21 @@ init_pg_connection()
 
 	/******     PG::Connection INSTANCE METHODS: Other    ******/
 	rb_define_method(rb_cPGconn, "get_client_encoding", pgconn_get_client_encoding, 0);
-	rb_define_method(rb_cPGconn, "set_client_encoding", pgconn_set_client_encoding, 1);
+	rb_define_method(rb_cPGconn, "sync_set_client_encoding", pgconn_sync_set_client_encoding, 1);
+	rb_define_method(rb_cPGconn, "set_client_encoding", pgconn_async_set_client_encoding, 1);
+	rb_define_alias(rb_cPGconn, "async_set_client_encoding", "set_client_encoding");
 	rb_define_alias(rb_cPGconn, "client_encoding=", "set_client_encoding");
-	rb_define_method(rb_cPGconn, "transaction", pgconn_transaction, 0);
 	rb_define_method(rb_cPGconn, "block", pgconn_block, -1);
+	rb_define_private_method(rb_cPGconn, "flush_data=", pgconn_flush_data_set, 1);
 	rb_define_method(rb_cPGconn, "wait_for_notify", pgconn_wait_for_notify, -1);
 	rb_define_alias(rb_cPGconn, "notifies_wait", "wait_for_notify");
 	rb_define_method(rb_cPGconn, "quote_ident", pgconn_s_quote_ident, 1);
-	rb_define_method(rb_cPGconn, "async_exec", pgconn_async_exec, -1);
-	rb_define_alias(rb_cPGconn, "async_query", "async_exec");
-	rb_define_method(rb_cPGconn, "get_last_result", pgconn_get_last_result, 0);
+	rb_define_method(rb_cPGconn, "sync_get_last_result", pgconn_sync_get_last_result, 0);
+	rb_define_method(rb_cPGconn, "get_last_result", pgconn_async_get_last_result, 0);
+	rb_define_alias(rb_cPGconn, "async_get_last_result", "get_last_result");
+#ifdef HAVE_PQENCRYPTPASSWORDCONN
+	rb_define_method(rb_cPGconn, "sync_encrypt_password", pgconn_sync_encrypt_password, -1);
+#endif
 
 #ifdef HAVE_PQSSLATTRIBUTE
 	rb_define_method(rb_cPGconn, "ssl_in_use?", pgconn_ssl_in_use, 0);
@@ -4055,6 +4586,14 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "ssl_attribute_names", pgconn_ssl_attribute_names, 0);
 #endif
 
+#ifdef HAVE_PQENTERPIPELINEMODE
+	rb_define_method(rb_cPGconn, "pipeline_status", pgconn_pipeline_status, 0);
+	rb_define_method(rb_cPGconn, "enter_pipeline_mode", pgconn_enter_pipeline_mode, 0);
+	rb_define_method(rb_cPGconn, "exit_pipeline_mode", pgconn_exit_pipeline_mode, 0);
+	rb_define_method(rb_cPGconn, "pipeline_sync", pgconn_pipeline_sync, 0);
+	rb_define_method(rb_cPGconn, "send_flush_request", pgconn_send_flush_request, 0);
+#endif
+
 	/******     PG::Connection INSTANCE METHODS: Large Object Support     ******/
 	rb_define_method(rb_cPGconn, "lo_creat", pgconn_locreat, -1);
 	rb_define_alias(rb_cPGconn, "locreat", "lo_creat");
@@ -4083,12 +4622,10 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "lo_unlink", pgconn_lounlink, 1);
 	rb_define_alias(rb_cPGconn, "lounlink", "lo_unlink");
 
-#ifdef M17N_SUPPORTED
 	rb_define_method(rb_cPGconn, "internal_encoding", pgconn_internal_encoding, 0);
 	rb_define_method(rb_cPGconn, "internal_encoding=", pgconn_internal_encoding_set, 1);
 	rb_define_method(rb_cPGconn, "external_encoding", pgconn_external_encoding, 0);
 	rb_define_method(rb_cPGconn, "set_default_encoding", pgconn_set_default_encoding, 0);
-#endif /* M17N_SUPPORTED */
 
 	rb_define_method(rb_cPGconn, "type_map_for_queries=", pgconn_type_map_for_queries_set, 1);
 	rb_define_method(rb_cPGconn, "type_map_for_queries", pgconn_type_map_for_queries_get, 0);
@@ -4098,5 +4635,7 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "encoder_for_put_copy_data", pgconn_encoder_for_put_copy_data_get, 0);
 	rb_define_method(rb_cPGconn, "decoder_for_get_copy_data=", pgconn_decoder_for_get_copy_data_set, 1);
 	rb_define_method(rb_cPGconn, "decoder_for_get_copy_data", pgconn_decoder_for_get_copy_data_get, 0);
-}
 
+	rb_define_method(rb_cPGconn, "field_name_type=", pgconn_field_name_type_set, 1 );
+	rb_define_method(rb_cPGconn, "field_name_type", pgconn_field_name_type_get, 0 );
+}