pg 0.15.1 → 1.2.3

data/ext/pg_connection.c

@@ -1,91 +1,160 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v 4514df7221a8 2013/04/08 18:09:43 ged $
+ * $Id$
  *
  */
 
 #include "pg.h"
 
+/* Number of bytes that are reserved on the stack for query params. */
+#define QUERYDATA_BUFFER_SIZE 4000
+
 
 VALUE rb_cPGconn;
+static ID s_id_encode;
+static VALUE sym_type, sym_format, sym_value;
+static VALUE sym_symbol, sym_string, sym_static_symbol;
 
 static PQnoticeReceiver default_notice_receiver = NULL;
 static PQnoticeProcessor default_notice_processor = NULL;
 
-static PGconn *pgconn_check( VALUE );
 static VALUE pgconn_finish( VALUE );
-#ifdef M17N_SUPPORTED
 static VALUE pgconn_set_default_encoding( VALUE self );
-#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 void pgconn_set_internal_encoding_index( VALUE );
 
 /*
  * Global functions
  */
 
 /*
- * Fetch the data pointer and check it for sanity.
+ * Fetch the PG::Connection object data pointer.
+ */
+t_pg_connection *
+pg_get_connection( VALUE self )
+{
+	t_pg_connection *this;
+	Data_Get_Struct( self, t_pg_connection, this);
+
+	return this;
+}
+
+/*
+ * Fetch the PG::Connection object data pointer and check it's
+ * PGconn data pointer for sanity.
+ */
+static t_pg_connection *
+pg_get_connection_safe( VALUE self )
+{
+	t_pg_connection *this;
+	Data_Get_Struct( self, t_pg_connection, this);
+
+	if ( !this->pgconn )
+		rb_raise( rb_eConnectionBad, "connection is closed" );
+
+	return this;
+}
+
+/*
+ * Fetch the PGconn data pointer and check it for sanity.
+ *
+ * Note: This function is used externally by the sequel_pg gem,
+ * so do changes carefully.
+ *
  */
 PGconn *
 pg_get_pgconn( VALUE self )
 {
-	PGconn *conn = pgconn_check( self );
+	t_pg_connection *this;
+	Data_Get_Struct( self, t_pg_connection, this);
 
-	if ( !conn )
-		rb_raise( rb_ePGerror, "connection is closed" );
+	if ( !this->pgconn )
+		rb_raise( rb_eConnectionBad, "connection is closed" );
 
-	return conn;
+	return this->pgconn;
 }
 
 
+
 /*
  * Close the associated socket IO object if there is one.
  */
-void
+static void
 pgconn_close_socket_io( VALUE self )
 {
-	VALUE socket_io = rb_iv_get( self, "@socket_io" );
+	t_pg_connection *this = pg_get_connection( 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_ePGerror, "Could not unwrap win32 socket handle");
+#if defined(_WIN32)
+		if( rb_w32_unwrap_io_handle(this->ruby_sd) ){
+			rb_raise(rb_eConnectionBad, "Could not unwrap win32 socket handle");
 		}
 #endif
 		rb_funcall( socket_io, rb_intern("close"), 0 );
 	}
 
-	rb_iv_set( self, "@socket_io", Qnil );
+	this->socket_io = Qnil;
 }
 
 
 /*
- * Allocation/
+ * Create a Ruby Array of Hashes out of a PGconninfoOptions array.
  */
+static VALUE
+pgconn_make_conninfo_array( const PQconninfoOption *options )
+{
+	VALUE ary = rb_ary_new();
+	VALUE hash;
+	int i = 0;
 
-/*
- * Object validity checker. Returns the data pointer.
- */
-static PGconn *
-pgconn_check( VALUE self ) {
+	if (!options) return Qnil;
+
+	for(i = 0; options[i].keyword != NULL; i++) {
+		hash = rb_hash_new();
+		if(options[i].keyword)
+			rb_hash_aset(hash, ID2SYM(rb_intern("keyword")), rb_str_new2(options[i].keyword));
+		if(options[i].envvar)
+			rb_hash_aset(hash, ID2SYM(rb_intern("envvar")), rb_str_new2(options[i].envvar));
+		if(options[i].compiled)
+			rb_hash_aset(hash, ID2SYM(rb_intern("compiled")), rb_str_new2(options[i].compiled));
+		if(options[i].val)
+			rb_hash_aset(hash, ID2SYM(rb_intern("val")), rb_str_new2(options[i].val));
+		if(options[i].label)
+			rb_hash_aset(hash, ID2SYM(rb_intern("label")), rb_str_new2(options[i].label));
+		if(options[i].dispchar)
+			rb_hash_aset(hash, ID2SYM(rb_intern("dispchar")), rb_str_new2(options[i].dispchar));
+		rb_hash_aset(hash, ID2SYM(rb_intern("dispsize")), INT2NUM(options[i].dispsize));
+		rb_ary_push(ary, hash);
+	}
 
-	Check_Type( self, T_DATA );
+	return ary;
+}
+
+static const char *pg_cstr_enc(VALUE str, int enc_idx){
+	const char *ptr = StringValueCStr(str);
+	if( ENCODING_GET(str) == enc_idx ){
+		return ptr;
+	} else {
+		str = rb_str_export_to_enc(str, rb_enc_from_index(enc_idx));
+		return StringValueCStr(str);
+	}
+}
 
-    if ( !rb_obj_is_kind_of(self, rb_cPGconn) ) {
-		rb_raise( rb_eTypeError, "wrong argument type %s (expected PG::Connection)",
-				  rb_obj_classname( self ) );
-    }
 
-	return DATA_PTR( self );
+/*
+ * GC Mark function
+ */
+static void
+pgconn_gc_mark( t_pg_connection *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->encoder_for_put_copy_data );
+	rb_gc_mark( this->decoder_for_get_copy_data );
 }
 
 
@@ -93,10 +162,16 @@ pgconn_check( VALUE self ) {
  * GC Free function
  */
 static void
-pgconn_gc_free( PGconn *conn )
+pgconn_gc_free( t_pg_connection *this )
 {
-	if (conn != NULL)
-		PQfinish( conn );
+#if defined(_WIN32)
+	if ( RTEST(this->socket_io) )
+		rb_w32_unwrap_io_handle( this->ruby_sd );
+#endif
+	if (this->pgconn != NULL)
+		PQfinish( this->pgconn );
+
+	xfree(this);
 }
 
 
@@ -113,7 +188,20 @@ pgconn_gc_free( PGconn *conn )
 static VALUE
 pgconn_s_allocate( VALUE klass )
 {
-	return Data_Wrap_Struct( klass, NULL, pgconn_gc_free, NULL );
+	t_pg_connection *this;
+	VALUE self = Data_Make_Struct( klass, t_pg_connection, pgconn_gc_mark, pgconn_gc_free, 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;
+
+	return self;
 }
 
 
@@ -128,32 +216,27 @@ pgconn_s_allocate( VALUE klass )
  *
  * Create a connection to the specified server.
  *
+ * +connection_hash+ must be a ruby Hash with connection parameters.
+ * See the {list of valid parameters}[https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS] in the PostgreSQL documentation.
+ *
+ * There are two accepted formats for +connection_string+: plain <code>keyword = value</code> strings and URIs.
+ * See the documentation of {connection strings}[https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING].
+ *
+ * The positional parameter form has the same functionality except that the missing parameters will always take on default values. The parameters are:
  * [+host+]
  *   server hostname
- * [+hostaddr+]
- *   server address (avoids hostname lookup, overrides +host+)
  * [+port+]
  *   server port number
+ * [+options+]
+ *   backend options
+ * [+tty+]
+ *   (ignored in newer versions of PostgreSQL)
  * [+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:
  *
@@ -169,7 +252,7 @@ pgconn_s_allocate( VALUE klass )
  *   # 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
+ * If the Ruby default internal encoding is set (i.e., <code>Encoding.default_internal != nil</code>), the
  * connection will have its +client_encoding+ set accordingly.
  *
  * Raises a PG::Error if the connection fails.
@@ -177,28 +260,24 @@ pgconn_s_allocate( VALUE klass )
 static VALUE
 pgconn_init(int argc, VALUE *argv, VALUE self)
 {
-	PGconn *conn = NULL;
+	t_pg_connection *this;
 	VALUE conninfo;
 	VALUE error;
 
+	this = pg_get_connection( self );
 	conninfo = rb_funcall2( rb_cPGconn, rb_intern("parse_connect_args"), argc, argv );
-	conn = PQconnectdb(StringValuePtr(conninfo));
+	this->pgconn = gvl_PQconnectdb(StringValueCStr(conninfo));
 
-	if(conn == NULL)
-		rb_raise(rb_ePGerror, "PQconnectStart() unable to allocate structure");
-
-	Check_Type(self, T_DATA);
-	DATA_PTR(self) = conn;
+	if(this->pgconn == NULL)
+		rb_raise(rb_ePGerror, "PQconnectdb() unable to allocate structure");
 
-	if (PQstatus(conn) == CONNECTION_BAD) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+	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);
 	}
 
-#ifdef M17N_SUPPORTED
 	pgconn_set_default_encoding( self );
-#endif
 
 	if (rb_block_given_p()) {
 		return rb_ensure(rb_yield, self, pgconn_finish, self);
@@ -212,40 +291,40 @@ 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
 pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 {
-	PGconn *conn = NULL;
 	VALUE rb_conn;
 	VALUE conninfo;
 	VALUE error;
+	t_pg_connection *this;
 
 	/*
 	 * PG::Connection.connect_start must act as both alloc() and initialize()
 	 * because it is not invoked by calling new().
 	 */
 	rb_conn  = pgconn_s_allocate( klass );
+	this = pg_get_connection( rb_conn );
 	conninfo = rb_funcall2( klass, rb_intern("parse_connect_args"), argc, argv );
-	conn     = PQconnectStart( StringValuePtr(conninfo) );
+	this->pgconn = gvl_PQconnectStart( StringValueCStr(conninfo) );
 
-	if( conn == NULL )
+	if( this->pgconn == NULL )
 		rb_raise(rb_ePGerror, "PQconnectStart() unable to allocate structure");
 
-	Check_Type(rb_conn, T_DATA);
-	DATA_PTR(rb_conn) = conn;
-
-	if ( PQstatus(conn) == CONNECTION_BAD ) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+	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);
 	}
@@ -256,15 +335,16 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 	return rb_conn;
 }
 
-#ifdef HAVE_PQPING
 /*
  * call-seq:
- *    PG::Connection.ping(connection_hash)       -> Fixnum
- *    PG::Connection.ping(connection_string)     -> Fixnum
- *    PG::Connection.ping(host, port, options, tty, dbname, login, password) ->  Fixnum
+ *    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.
  *
+ * See PG::Connection.new for a description of the parameters.
+ *
  * Returns one of:
  * [+PQPING_OK+]
  *   server is accepting connections
@@ -282,13 +362,15 @@ pgconn_s_ping( int argc, VALUE *argv, VALUE klass )
 	VALUE conninfo;
 
 	conninfo = rb_funcall2( klass, rb_intern("parse_connect_args"), argc, argv );
-	ping     = PQping( StringValuePtr(conninfo) );
+	ping     = PQping( StringValueCStr(conninfo) );
 
 	return INT2FIX((int)ping);
 }
-#endif
+
 
 /*
+ * Document-method: PG::Connection.conndefaults
+ *
  * call-seq:
  *    PG::Connection.conndefaults() -> Array
  *
@@ -312,44 +394,72 @@ static VALUE
 pgconn_s_conndefaults(VALUE self)
 {
 	PQconninfoOption *options = PQconndefaults();
-	VALUE ary = rb_ary_new();
-	VALUE hash;
-	int i = 0;
+	VALUE array = pgconn_make_conninfo_array( options );
+
+	PQconninfoFree(options);
 
 	UNUSED( self );
 
-	for(i = 0; options[i].keyword != NULL; i++) {
-		hash = rb_hash_new();
-		if(options[i].keyword)
-			rb_hash_aset(hash, ID2SYM(rb_intern("keyword")), rb_str_new2(options[i].keyword));
-		if(options[i].envvar)
-			rb_hash_aset(hash, ID2SYM(rb_intern("envvar")), rb_str_new2(options[i].envvar));
-		if(options[i].compiled)
-			rb_hash_aset(hash, ID2SYM(rb_intern("compiled")), rb_str_new2(options[i].compiled));
-		if(options[i].val)
-			rb_hash_aset(hash, ID2SYM(rb_intern("val")), rb_str_new2(options[i].val));
-		if(options[i].label)
-			rb_hash_aset(hash, ID2SYM(rb_intern("label")), rb_str_new2(options[i].label));
-		if(options[i].dispchar)
-			rb_hash_aset(hash, ID2SYM(rb_intern("dispchar")), rb_str_new2(options[i].dispchar));
-		rb_hash_aset(hash, ID2SYM(rb_intern("dispsize")), INT2NUM(options[i].dispsize));
-		rb_ary_push(ary, hash);
+	return array;
+}
+
+
+#ifdef HAVE_PQENCRYPTPASSWORDCONN
+/*
+ * call-seq:
+ *    conn.encrypt_password( password, username, algorithm=nil ) -> String
+ *
+ * This function is intended to be used by client applications that wish to send commands like <tt>ALTER USER joe PASSWORD 'pwd'</tt>.
+ * It is good practice not to send the original cleartext password in such a command, because it might be exposed in command logs, activity displays, and so on.
+ * Instead, use this function to convert the password to encrypted form before it is sent.
+ *
+ * The +password+ and +username+ arguments are the cleartext password, and the SQL name of the user it is for.
+ * +algorithm+ specifies the encryption algorithm to use to encrypt the password.
+ * Currently supported algorithms are +md5+ and +scram-sha-256+ (+on+ and +off+ are also accepted as aliases for +md5+, for compatibility with older server versions).
+ * Note that support for +scram-sha-256+ was introduced in PostgreSQL version 10, and will not work correctly with older server versions.
+ * If algorithm is omitted or +nil+, this function will query the server for the current value of the +password_encryption+ setting.
+ * That can block, and will fail if the current transaction is aborted, or if the connection is busy executing another query.
+ * If you wish to use the default algorithm for the server but want to avoid blocking, query +password_encryption+ yourself before calling #encrypt_password, and pass that value as the algorithm.
+ *
+ * Return value is the encrypted password.
+ * The caller can assume the string doesn't contain any special characters that would require escaping.
+ *
+ * Available since PostgreSQL-10.
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-misc.html#LIBPQ-PQENCRYPTPASSWORDCONN].
+ */
+static VALUE
+pgconn_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 {
+		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
 	}
-	PQconninfoFree(options);
-	return ary;
+
+	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)
@@ -362,13 +472,10 @@ pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
 	Check_Type(password, T_STRING);
 	Check_Type(username, T_STRING);
 
-	encrypted = PQencryptPassword(StringValuePtr(password), StringValuePtr(username));
+	encrypted = PQencryptPassword(StringValueCStr(password), StringValueCStr(username));
 	rval = rb_str_new2( encrypted );
 	PQfreemem( encrypted );
 
-	OBJ_INFECT( rval, password );
-	OBJ_INFECT( rval, username );
-
 	return rval;
 }
 
@@ -379,7 +486,7 @@ pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
 
 /*
  * call-seq:
- *    conn.connect_poll() -> Fixnum
+ *    conn.connect_poll() -> Integer
  *
  * Returns one of:
  * [+PGRES_POLLING_READING+]
@@ -415,7 +522,7 @@ static VALUE
 pgconn_connect_poll(VALUE self)
 {
 	PostgresPollingStatusType status;
-	status = PQconnectPoll(pg_get_pgconn(self));
+	status = gvl_PQconnectPoll(pg_get_pgconn(self));
 	return INT2FIX((int)status);
 }
 
@@ -428,9 +535,11 @@ pgconn_connect_poll(VALUE self)
 static VALUE
 pgconn_finish( VALUE self )
 {
+	t_pg_connection *this = pg_get_connection_safe( self );
+
 	pgconn_close_socket_io( self );
-	PQfinish( pg_get_pgconn(self) );
-	DATA_PTR( self ) = NULL;
+	PQfinish( this->pgconn );
+	this->pgconn = NULL;
 	return Qnil;
 }
 
@@ -444,7 +553,8 @@ pgconn_finish( VALUE self )
 static VALUE
 pgconn_finished_p( VALUE self )
 {
-	if ( DATA_PTR(self) ) return Qfalse;
+	t_pg_connection *this = pg_get_connection( self );
+	if ( this->pgconn ) return Qfalse;
 	return Qtrue;
 }
 
@@ -460,7 +570,7 @@ static VALUE
 pgconn_reset( VALUE self )
 {
 	pgconn_close_socket_io( self );
-	PQreset( pg_get_pgconn(self) );
+	gvl_PQreset( pg_get_pgconn(self) );
 	return self;
 }
 
@@ -478,14 +588,14 @@ static VALUE
 pgconn_reset_start(VALUE self)
 {
 	pgconn_close_socket_io( self );
-	if(PQresetStart(pg_get_pgconn(self)) == 0)
-		rb_raise(rb_ePGerror, "reset has failed");
+	if(gvl_PQresetStart(pg_get_pgconn(self)) == 0)
+		rb_raise(rb_eUnableToSend, "reset has failed");
 	return Qnil;
 }
 
 /*
  * call-seq:
- *    conn.reset_poll -> Fixnum
+ *    conn.reset_poll -> Integer
  *
  * Checks the status of a connection reset operation.
  * See #connect_start and #connect_poll for
@@ -495,10 +605,11 @@ static VALUE
 pgconn_reset_poll(VALUE self)
 {
 	PostgresPollingStatusType status;
-	status = PQresetPoll(pg_get_pgconn(self));
+	status = gvl_PQresetPoll(pg_get_pgconn(self));
 	return INT2FIX((int)status);
 }
 
+
 /*
  * call-seq:
  *    conn.db()
@@ -510,7 +621,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);
 }
 
 /*
@@ -524,21 +635,21 @@ 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);
 }
 
 /*
@@ -552,7 +663,7 @@ 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);
 }
 
 /*
@@ -579,7 +690,7 @@ 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(tty);
 }
 
 /*
@@ -593,8 +704,32 @@ 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 )
+{
+	PGconn *conn = pg_get_pgconn(self);
+	PQconninfoOption *options = PQconninfo( conn );
+	VALUE array = pgconn_make_conninfo_array( options );
+
+	PQconninfoFree(options);
+
+	return array;
 }
+#endif
+
 
 /*
  * call-seq:
@@ -646,11 +781,11 @@ pgconn_transaction_status(VALUE self)
 static VALUE
 pgconn_parameter_status(VALUE self, VALUE param_name)
 {
-	const char *ret = PQparameterStatus(pg_get_pgconn(self), StringValuePtr(param_name));
+	const char *ret = PQparameterStatus(pg_get_pgconn(self), StringValueCStr(param_name));
 	if(ret == NULL)
 		return Qnil;
 	else
-		return rb_tainted_str_new2(ret);
+		return rb_str_new2(ret);
 }
 
 /*
@@ -695,12 +830,14 @@ 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() -> Fixnum
+ *    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.
@@ -710,34 +847,31 @@ 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_ePGerror, "Can't get socket descriptor");
+		rb_raise(rb_eConnectionBad, "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.
+ * Fetch a memorized 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.
  *
  * 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.
- *
- * This method can also be used on Windows but requires Ruby-2.0+.
+ * goes out of scope. In contrast to #socket, it also works on Windows.
  */
 static VALUE
 pgconn_socket_io(VALUE self)
@@ -745,36 +879,34 @@ pgconn_socket_io(VALUE self)
 	int sd;
 	int ruby_sd;
 	ID id_autoclose = rb_intern("autoclose=");
-	VALUE socket_io = rb_iv_get( self, "@socket_io" );
+	t_pg_connection *this = pg_get_connection_safe( self );
+	VALUE socket_io = this->socket_io;
 
 	if ( !RTEST(socket_io) ) {
-		if( (sd = PQsocket(pg_get_pgconn(self))) < 0)
-			rb_raise(rb_ePGerror, "Can't get socket descriptor");
+		if( (sd = PQsocket(this->pgconn)) < 0)
+			rb_raise(rb_eConnectionBad, "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);
+			this->ruby_sd = ruby_sd;
 		#else
 			ruby_sd = sd;
 		#endif
 
 		socket_io = rb_funcall( rb_cIO, 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, id_autoclose, 1, Qfalse );
 
-		rb_iv_set( self, "@socket_io", socket_io );
+		this->socket_io = socket_io;
 	}
 
 	return socket_io;
 }
 
-#endif
-
 /*
  * call-seq:
- *    conn.backend_pid() -> Fixnum
+ *    conn.backend_pid() -> Integer
  *
  * Returns the process ID of the backend server
  * process for this connection.
@@ -820,33 +952,31 @@ static VALUE pgconn_exec_params( int, VALUE *, VALUE );
 
 /*
  * call-seq:
- *    conn.exec(sql) -> PG::Result
- *    conn.exec(sql) {|pg_result| block }
+ *    conn.sync_exec(sql) -> PG::Result
+ *    conn.sync_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.
+ * 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.
  *
- * 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.
+ * 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:
  *
- * 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.
+ * 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.
+ *    It can therefore schedule things like garbage collection, while queries are running like in this proposal: https://bugs.ruby-lang.org/issues/14723
  */
 static VALUE
 pgconn_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 ) {
-		Check_Type(argv[0], T_STRING);
+	/* 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, StringValuePtr(argv[0]));
+		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()) {
@@ -854,159 +984,304 @@ 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_exec_params( argc, argv, self );
 
 }
 
 
-/*
- * call-seq:
- *    conn.exec_params(sql, params[, result_format ] ) -> PG::Result
- *    conn.exec_params(sql, params[, result_format ] ) {|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   => Fixnum (oid of type of bind parameter)
- *      :format => Fixnum (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"
- *
- * The optional +result_format+ should be 0 for text results, 1
- * for binary.
- *
- * 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_exec_params( int argc, VALUE *argv, VALUE self )
-{
-	PGconn *conn = pg_get_pgconn(self);
-	PGresult *result = NULL;
-	VALUE rb_pgresult;
-	VALUE command, params, in_res_fmt;
-	VALUE param, param_type, param_value, param_format;
-	VALUE param_value_tmp;
-	VALUE sym_type, sym_value, sym_format;
-	VALUE gc_array;
-	int i=0;
-	int nParams;
-	Oid *paramTypes;
-	char ** paramValues;
-	int *paramLengths;
-	int *paramFormats;
-	int resultFormat;
+struct linked_typecast_data {
+	struct linked_typecast_data *next;
+	char data[0];
+};
 
-	rb_scan_args(argc, argv, "12", &command, &params, &in_res_fmt);
+/* This struct is allocated on the stack for all query execution functions. */
+struct query_params_data {
 
 	/*
-	 * Handle the edge-case where the caller is coming from #exec, but passed an explict +nil+
-	 * for the second parameter.
+	 * Filled by caller
 	 */
-	if ( NIL_P(params) ) {
-		return pgconn_exec( 1, argv, self );
-		}
 
-	Check_Type(params, T_ARRAY);
+	/* The character encoding index of the connection. Any strings
+	 * given as query parameters are converted to this encoding.
+	 */
+	int enc_idx;
+	/* Is the query function to execute one with types array? */
+	int with_types;
+	/* Array of query params from user space */
+	VALUE params;
+	/* The typemap given from user space */
+	VALUE typemap;
 
-	if ( NIL_P(in_res_fmt) ) {
-		resultFormat = 0;
-	}
-	else {
-		resultFormat = NUM2INT(in_res_fmt);
-	}
+	/*
+	 * Filled by alloc_query_params()
+	 */
 
-	gc_array = rb_ary_new();
-	rb_gc_register_address(&gc_array);
+	/* Wraps the pointer of allocated memory, if function parameters dont't
+	 * fit in the memory_pool below.
+	 */
+	VALUE heap_pool;
 
-	sym_type = ID2SYM(rb_intern("type"));
-	sym_value = ID2SYM(rb_intern("value"));
-	sym_format = ID2SYM(rb_intern("format"));
-	nParams = (int)RARRAY_LEN(params);
-	paramTypes = ALLOC_N(Oid, nParams);
-	paramValues = ALLOC_N(char *, nParams);
-	paramLengths = ALLOC_N(int, nParams);
-	paramFormats = ALLOC_N(int, nParams);
-
-	for ( i = 0; i < nParams; i++ ) {
-		param = rb_ary_entry(params, i);
-		if (TYPE(param) == T_HASH) {
-			param_type = rb_hash_aref(param, sym_type);
-			param_value_tmp = rb_hash_aref(param, sym_value);
-			if(param_value_tmp == Qnil)
-				param_value = param_value_tmp;
-			else
-				param_value = rb_obj_as_string(param_value_tmp);
-			param_format = rb_hash_aref(param, sym_format);
-		}
-		else {
-			param_type = Qnil;
-			if(param == Qnil)
-				param_value = param;
-			else
-				param_value = rb_obj_as_string(param);
-			param_format = Qnil;
-		}
+	/* Pointer to the value string pointers (either within memory_pool or heap_pool).
+	 * The value strings itself are either directly within RString memory or,
+	 * in case of type casted values, within memory_pool or typecast_heap_chain.
+	 */
+	char **values;
+	/* Pointer to the param lengths (either within memory_pool or heap_pool) */
+	int *lengths;
+	/* Pointer to the format codes (either within memory_pool or heap_pool) */
+	int *formats;
+	/* Pointer to the OID types (either within memory_pool or heap_pool) */
+	Oid *types;
+
+	/* This array takes the string values for the timeframe of the query,
+	 * if param value convertion is required
+	 */
+	VALUE gc_array;
 
-		if(param_type == Qnil)
-			paramTypes[i] = 0;
-		else
-			paramTypes[i] = NUM2INT(param_type);
+	/* Wraps a single linked list of allocated memory chunks for type casted params.
+	 * Used when the memory_pool is to small.
+	 */
+	VALUE typecast_heap_chain;
 
-		if(param_value == Qnil) {
-			paramValues[i] = NULL;
-			paramLengths[i] = 0;
-		}
-		else {
-			Check_Type(param_value, T_STRING);
-			/* make sure param_value doesn't get freed by the GC */
-			rb_ary_push(gc_array, param_value);
-			paramValues[i] = StringValuePtr(param_value);
-			paramLengths[i] = (int)RSTRING_LEN(param_value);
-		}
+	/* This memory pool is used to place above query function parameters on it. */
+	char memory_pool[QUERYDATA_BUFFER_SIZE];
+};
 
-		if(param_format == Qnil)
-			paramFormats[i] = 0;
-		else
-			paramFormats[i] = NUM2INT(param_format);
+static void
+free_typecast_heap_chain(struct linked_typecast_data *chain_entry)
+{
+	while(chain_entry){
+		struct linked_typecast_data *next = chain_entry->next;
+		xfree(chain_entry);
+		chain_entry = next;
 	}
+}
 
-	result = gvl_PQexecParams(conn, StringValuePtr(command), nParams, paramTypes,
-		(const char * const *)paramValues, paramLengths, paramFormats, resultFormat);
-
-	rb_gc_unregister_address(&gc_array);
+static char *
+alloc_typecast_buf( VALUE *typecast_heap_chain, int len )
+{
+	/* Allocate a new memory chunk from heap */
+	struct linked_typecast_data *allocated =
+		(struct linked_typecast_data *)xmalloc(sizeof(struct linked_typecast_data) + 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 );
+		allocated->next = NULL;
+	} else {
+		/* Append to the chain */
+		allocated->next = DATA_PTR( *typecast_heap_chain );
+		DATA_PTR( *typecast_heap_chain ) = allocated;
+	}
 
-	xfree(paramTypes);
-	xfree(paramValues);
-	xfree(paramLengths);
-	xfree(paramFormats);
+	return &allocated->data[0];
+}
 
-	rb_pgresult = pg_new_result(result, self);
-	pg_result_check(rb_pgresult);
 
-	if (rb_block_given_p()) {
+static int
+alloc_query_params(struct query_params_data *paramsData)
+{
+	VALUE param_value;
+	t_typemap *p_typemap;
+	int nParams;
+	int i=0;
+	t_pg_coder *conv;
+	unsigned int required_pool_size;
+	char *memory_pool;
+
+	Check_Type(paramsData->params, T_ARRAY);
+
+	p_typemap = DATA_PTR( paramsData->typemap );
+	p_typemap->funcs.fit_to_query( paramsData->typemap, paramsData->params );
+
+	paramsData->heap_pool = Qnil;
+	paramsData->typecast_heap_chain = Qnil;
+	paramsData->gc_array = Qnil;
+
+	nParams = (int)RARRAY_LEN(paramsData->params);
+
+	required_pool_size = nParams * (
+			sizeof(char *) +
+			sizeof(int) +
+			sizeof(int) +
+			(paramsData->with_types ? sizeof(Oid) : 0));
+
+	if( sizeof(paramsData->memory_pool) < required_pool_size ){
+		/* 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 );
+		required_pool_size = 0;
+	}else{
+		/* Use stack memory for function parameters */
+		memory_pool = paramsData->memory_pool;
+	}
+
+	paramsData->values = (char **)memory_pool;
+	paramsData->lengths = (int *)((char*)paramsData->values + sizeof(char *) * nParams);
+	paramsData->formats = (int *)((char*)paramsData->lengths + sizeof(int) * nParams);
+	paramsData->types = (Oid *)((char*)paramsData->formats + sizeof(int) * nParams);
+
+	{
+		char *typecast_buf = paramsData->memory_pool + required_pool_size;
+
+		for ( i = 0; i < nParams; i++ ) {
+			param_value = rb_ary_entry(paramsData->params, i);
+
+			paramsData->formats[i] = 0;
+			if( paramsData->with_types )
+				paramsData->types[i] = 0;
+
+			/* Let the given typemap select a coder for this param */
+			conv = p_typemap->funcs.typecast_query_param(p_typemap, param_value, i);
+
+			/* Using a coder object for the param_value? Then set it's format code and oid. */
+			if( conv ){
+				paramsData->formats[i] = conv->format;
+				if( paramsData->with_types )
+					paramsData->types[i] = conv->oid;
+			} else {
+					/* No coder, but got we a hash form for the query param?
+					 * Then take format code and oid from there. */
+				if (TYPE(param_value) == T_HASH) {
+					VALUE format_value = rb_hash_aref(param_value, sym_format);
+					if( !NIL_P(format_value) )
+						paramsData->formats[i] = NUM2INT(format_value);
+					if( paramsData->with_types ){
+						VALUE type_value = rb_hash_aref(param_value, sym_type);
+						if( !NIL_P(type_value) )
+							paramsData->types[i] = NUM2UINT(type_value);
+					}
+					param_value = rb_hash_aref(param_value, sym_value);
+				}
+			}
+
+			if( NIL_P(param_value) ){
+				paramsData->values[i] = NULL;
+				paramsData->lengths[i] = 0;
+			} else {
+				t_pg_coder_enc_func enc_func = pg_coder_enc_func( conv );
+				VALUE intermediate;
+
+				/* 1st pass for retiving the required memory space */
+				int len = enc_func(conv, param_value, NULL, &intermediate, paramsData->enc_idx);
+
+				if( len == -1 ){
+					/* The intermediate value is a String that can be used directly. */
+
+					/* Ensure that the String object is zero terminated as expected by libpq. */
+					if( paramsData->formats[i] == 0 )
+						StringValueCStr(intermediate);
+					/* In case a new string object was generated, make sure it doesn't get freed by the GC */
+					if( intermediate != param_value ){
+						if( NIL_P(paramsData->gc_array) )
+							paramsData->gc_array = rb_ary_new();
+						rb_ary_push(paramsData->gc_array, intermediate);
+					}
+					paramsData->values[i] = RSTRING_PTR(intermediate);
+					paramsData->lengths[i] = RSTRING_LENINT(intermediate);
+
+				} else {
+					/* Is the stack memory pool too small to take the type casted value? */
+					if( sizeof(paramsData->memory_pool) < required_pool_size + len + 1){
+						typecast_buf = alloc_typecast_buf( &paramsData->typecast_heap_chain, len + 1 );
+					}
+
+					/* 2nd pass for writing the data to prepared buffer */
+					len = enc_func(conv, param_value, typecast_buf, &intermediate, paramsData->enc_idx);
+					paramsData->values[i] = typecast_buf;
+					if( paramsData->formats[i] == 0 ){
+						/* text format strings must be zero terminated and lengths are ignored */
+						typecast_buf[len] = 0;
+						typecast_buf += len + 1;
+						required_pool_size += len + 1;
+					} else {
+						paramsData->lengths[i] = len;
+						typecast_buf += len;
+						required_pool_size += len;
+					}
+				}
+
+				RB_GC_GUARD(intermediate);
+			}
+		}
+	}
+
+	return nParams;
+}
+
+static void
+free_query_params(struct query_params_data *paramsData)
+{
+	/* currently nothing to free */
+}
+
+void
+pgconn_query_assign_typemap( VALUE self, struct query_params_data *paramsData )
+{
+	if(NIL_P(paramsData->typemap)){
+		/* Use default typemap for queries. It's type is checked when assigned. */
+		paramsData->typemap = pg_get_connection(self)->type_map_for_queries;
+	}else{
+		/* 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 );
+	}
+}
+
+/*
+ * call-seq:
+ *    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 }
+ *
+ * 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 )
+{
+	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 = { 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;
+
+	/*
+	 * For backward compatibility no or +nil+ for the second parameter
+	 * is passed to #exec
+	 */
+	if ( NIL_P(paramsData.params) ) {
+		pg_deprecated(1, ("forwarding exec_params to exec is deprecated"));
+		return pgconn_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(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 );
+
+	rb_pgresult = pg_new_result(result, self);
+	pg_result_check(rb_pgresult);
+
+	if (rb_block_given_p()) {
 		return rb_ensure(rb_yield, rb_pgresult, pg_result_clear, rb_pgresult);
 	}
 
@@ -1015,28 +1290,16 @@ pgconn_exec_params( int argc, VALUE *argv, VALUE self )
 
 /*
  * call-seq:
- *    conn.prepare(stmt_name, sql [, param_types ] ) -> PG::Result
+ *    conn.sync_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, $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 *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;
@@ -1044,10 +1307,13 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 	int i = 0;
 	int nParams = 0;
 	Oid *paramTypes = NULL;
+	const char *name_cstr;
+	const char *command_cstr;
+	int enc_idx = this->enc_idx;
 
 	rb_scan_args(argc, argv, "21", &name, &command, &in_paramtypes);
-	Check_Type(name, T_STRING);
-	Check_Type(command, T_STRING);
+	name_cstr = pg_cstr_enc(name, enc_idx);
+	command_cstr = pg_cstr_enc(command, enc_idx);
 
 	if(! NIL_P(in_paramtypes)) {
 		Check_Type(in_paramtypes, T_ARRAY);
@@ -1055,15 +1321,13 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 		paramTypes = ALLOC_N(Oid, nParams);
 		for(i = 0; i < nParams; i++) {
 			param = rb_ary_entry(in_paramtypes, i);
-			Check_Type(param, T_FIXNUM);
 			if(param == Qnil)
 				paramTypes[i] = 0;
 			else
-				paramTypes[i] = NUM2INT(param);
+				paramTypes[i] = NUM2UINT(param);
 		}
 	}
-	result = gvl_PQprepare(conn, StringValuePtr(name), StringValuePtr(command),
-			nParams, paramTypes);
+	result = gvl_PQprepare(this->pgconn, name_cstr, command_cstr, nParams, paramTypes);
 
 	xfree(paramTypes);
 
@@ -1074,122 +1338,40 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.exec_prepared(statement_name [, params, result_format ] ) -> PG::Result
- *    conn.exec_prepared(statement_name [, params, result_format ] ) {|pg_result| block }
+ *    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 }
  *
- * 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 => Fixnum (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.
- *
- * 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 *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 	PGresult *result = NULL;
 	VALUE rb_pgresult;
-	VALUE name, params, in_res_fmt;
-	VALUE param, param_value, param_format;
-	VALUE param_value_tmp;
-	VALUE sym_value, sym_format;
-	VALUE gc_array;
-	int i = 0;
+	VALUE name, in_res_fmt;
 	int nParams;
-	char ** paramValues;
-	int *paramLengths;
-	int *paramFormats;
 	int resultFormat;
+	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;
 
-	rb_scan_args(argc, argv, "12", &name, &params, &in_res_fmt);
-	Check_Type(name, T_STRING);
-
-	if(NIL_P(params)) {
-		params = rb_ary_new2(0);
-		resultFormat = 0;
-	}
-	else {
-		Check_Type(params, T_ARRAY);
-	}
-
-	if(NIL_P(in_res_fmt)) {
-		resultFormat = 0;
+	if(NIL_P(paramsData.params)) {
+		paramsData.params = rb_ary_new2(0);
 	}
-	else {
-		resultFormat = NUM2INT(in_res_fmt);
-	}
-
-	gc_array = rb_ary_new();
-	rb_gc_register_address(&gc_array);
-	sym_value = ID2SYM(rb_intern("value"));
-	sym_format = ID2SYM(rb_intern("format"));
-	nParams = (int)RARRAY_LEN(params);
-	paramValues = ALLOC_N(char *, nParams);
-	paramLengths = ALLOC_N(int, nParams);
-	paramFormats = ALLOC_N(int, nParams);
-	for(i = 0; i < nParams; i++) {
-		param = rb_ary_entry(params, i);
-		if (TYPE(param) == T_HASH) {
-			param_value_tmp = rb_hash_aref(param, sym_value);
-			if(param_value_tmp == Qnil)
-				param_value = param_value_tmp;
-			else
-				param_value = rb_obj_as_string(param_value_tmp);
-			param_format = rb_hash_aref(param, sym_format);
-		}
-		else {
-			if(param == Qnil)
-				param_value = param;
-			else
-				param_value = rb_obj_as_string(param);
-			param_format = INT2NUM(0);
-		}
-		if(param_value == Qnil) {
-			paramValues[i] = NULL;
-			paramLengths[i] = 0;
-		}
-		else {
-			Check_Type(param_value, T_STRING);
-			/* make sure param_value doesn't get freed by the GC */
-			rb_ary_push(gc_array, param_value);
-			paramValues[i] = StringValuePtr(param_value);
-			paramLengths[i] = (int)RSTRING_LEN(param_value);
-		}
+	pgconn_query_assign_typemap( self, &paramsData );
 
-		if(param_format == Qnil)
-			paramFormats[i] = 0;
-		else
-			paramFormats[i] = NUM2INT(param_format);
-	}
+	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
+	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQexecPrepared(conn, StringValuePtr(name), nParams,
-		(const char * const *)paramValues, paramLengths, paramFormats,
+	result = gvl_PQexecPrepared(this->pgconn, pg_cstr_enc(name, paramsData.enc_idx), nParams,
+		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats,
 		resultFormat);
 
-	rb_gc_unregister_address(&gc_array);
-
-	xfree(paramValues);
-	xfree(paramLengths);
-	xfree(paramFormats);
+	free_query_params( &paramsData );
 
 	rb_pgresult = pg_new_result(result, self);
 	pg_result_check(rb_pgresult);
@@ -1202,26 +1384,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)
 {
 	PGresult *result;
 	VALUE rb_pgresult;
-	PGconn *conn = pg_get_pgconn(self);
-	char *stmt;
-	if(stmt_name == Qnil) {
+	t_pg_connection *this = pg_get_connection_safe( self );
+	const char *stmt;
+	if(NIL_P(stmt_name)) {
 		stmt = NULL;
 	}
 	else {
-		Check_Type(stmt_name, T_STRING);
-		stmt = StringValuePtr(stmt_name);
+		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;
@@ -1230,9 +1412,11 @@ 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)
@@ -1240,16 +1424,15 @@ pgconn_describe_portal(self, stmt_name)
 {
 	PGresult *result;
 	VALUE rb_pgresult;
-	PGconn *conn = pg_get_pgconn(self);
-	char *stmt;
-	if(stmt_name == Qnil) {
+	t_pg_connection *this = pg_get_connection_safe( self );
+	const char *stmt;
+	if(NIL_P(stmt_name)) {
 		stmt = NULL;
 	}
 	else {
-		Check_Type(stmt_name, T_STRING);
-		stmt = StringValuePtr(stmt_name);
+		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;
@@ -1289,10 +1472,6 @@ pgconn_make_empty_pgresult(VALUE self, VALUE status)
  * call-seq:
  *    conn.escape_string( str ) -> String
  *
- * Connection instance method for versions of 8.1 and higher of libpq
- * uses PQescapeStringConn, which is safer. Avoid calling as a class method,
- * the class method uses the deprecated PQescapeString() API function.
- *
  * Returns a SQL-safe version of the String _str_.
  * This is the preferred way to make strings safe for inclusion in
  * SQL queries.
@@ -1300,44 +1479,43 @@ 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)
 {
-	char *escaped;
 	size_t size;
 	int error;
 	VALUE result;
-#ifdef M17N_SUPPORTED
-	rb_encoding* enc;
-#endif
+	int enc_idx;
+	int singleton = !rb_obj_is_kind_of(self, rb_cPGconn);
 
-	Check_Type(string, T_STRING);
+	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));
+	}
 
-	escaped = ALLOC_N(char, RSTRING_LEN(string) * 2 + 1);
-	if(rb_obj_class(self) == rb_cPGconn) {
-		size = PQescapeStringConn(pg_get_pgconn(self), escaped,
+	result = rb_str_new(NULL, RSTRING_LEN(string) * 2 + 1);
+	PG_ENCODING_SET_NOCHECK(result, enc_idx);
+	if( !singleton ) {
+		size = PQescapeStringConn(pg_get_pgconn(self), RSTRING_PTR(result),
 			RSTRING_PTR(string), RSTRING_LEN(string), &error);
 		if(error) {
-			xfree(escaped);
 			rb_raise(rb_ePGerror, "%s", PQerrorMessage(pg_get_pgconn(self)));
 		}
 	} else {
-		size = PQescapeString(escaped, RSTRING_PTR(string), (int)RSTRING_LEN(string));
-	}
-	result = rb_str_new(escaped, size);
-	xfree(escaped);
-	OBJ_INFECT(result, string);
-
-#ifdef M17N_SUPPORTED
-	if ( rb_obj_class(self) == rb_cPGconn ) {
-		enc = pg_conn_enc_get( pg_get_pgconn(self) );
-	} else {
-		enc = rb_enc_get(string);
+		size = PQescapeString(RSTRING_PTR(result), RSTRING_PTR(string), RSTRING_LEN(string));
 	}
-	rb_enc_associate(result, enc);
-#endif
+	rb_str_set_len(result, size);
 
 	return result;
 }
@@ -1346,13 +1524,6 @@ pgconn_s_escape(VALUE self, VALUE string)
  * call-seq:
  *   conn.escape_bytea( string ) -> String
  *
- * Connection instance method for versions of 8.1 and higher of libpq
- * uses PQescapeByteaConn, which is safer. Avoid calling as a class method,
- * the class method uses the deprecated PQescapeBytea() API function.
- *
- * Use the instance method version of this function, it is safer than the
- * class method.
- *
  * Escapes binary data for use within an SQL command with the type +bytea+.
  *
  * Certain byte values must be escaped (but all byte values may be escaped)
@@ -1365,6 +1536,12 @@ pgconn_s_escape(VALUE self, VALUE string)
  *
  * Consider using exec_params, which avoids the need for passing values inside of
  * SQL commands.
+ *
+ * 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.
  */
 static VALUE
 pgconn_s_escape_bytea(VALUE self, VALUE str)
@@ -1377,14 +1554,13 @@ pgconn_s_escape_bytea(VALUE self, VALUE str)
 	from      = (unsigned char*)RSTRING_PTR(str);
 	from_len  = RSTRING_LEN(str);
 
-	if(rb_obj_class(self) == rb_cPGconn) {
+	if ( rb_obj_is_kind_of(self, rb_cPGconn) ) {
 		to = PQescapeByteaConn(pg_get_pgconn(self), from, from_len, &to_len);
 	} else {
 		to = PQescapeBytea( from, from_len, &to_len);
 	}
 
 	ret = rb_str_new((char*)to, to_len - 1);
-	OBJ_INFECT(ret, str);
 	PQfreemem(to);
 	return ret;
 }
@@ -1409,83 +1585,91 @@ pgconn_s_unescape_bytea(VALUE self, VALUE str)
 	UNUSED( self );
 
 	Check_Type(str, T_STRING);
-	from = (unsigned char*)StringValuePtr(str);
+	from = (unsigned char*)StringValueCStr(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 = 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));
+		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 		return Qnil;
 	}
 	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
  *
  * Escape an arbitrary String +str+ as an identifier.
+ *
+ * This method does the same as #quote_ident with a String argument,
+ * but it doesn't support an Array argument and it makes use of libpq
+ * to process the 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 = 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));
+		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 		return Qnil;
 	}
 	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
@@ -1496,7 +1680,7 @@ pgconn_escape_identifier(VALUE self, VALUE string)
  * Then call Connection#get_result repeatedly, until it returns nil.
  *
  * Each (but the last) received Result has exactly one row and a
- * Result#result_status of PGRES_SINGLE_TUPLE. The last row has
+ * Result#result_status of PGRES_SINGLE_TUPLE. The last Result has
  * zero rows and is used to indicate a successful execution of the query.
  * All of these Result objects will contain the same row description data
  * (column names, types, etc) that an ordinary Result object for the query
@@ -1521,7 +1705,6 @@ pgconn_escape_identifier(VALUE self, VALUE string)
  *       # do something with the received row
  *     end
  *   end
- *
  */
 static VALUE
 pgconn_set_single_row_mode(VALUE self)
@@ -1538,22 +1721,60 @@ pgconn_set_single_row_mode(VALUE self)
 
 	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 );
+	VALUE error;
+
+	/* 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) {
+			error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(this->pgconn));
+			rb_iv_set(error, "@connection", self);
+			rb_exc_raise(error);
+		}
+		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 ] ) -> 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)
- *      :type   => Fixnum (oid of type of bind parameter)
- *      :format => Fixnum (0 for text, 1 for binary)
+ *      :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 }
@@ -1570,116 +1791,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 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, params, in_res_fmt;
-	VALUE param, param_type, param_value, param_format;
-	VALUE param_value_tmp;
-	VALUE sym_type, sym_value, sym_format;
-	VALUE gc_array;
+	VALUE command, in_res_fmt;
 	VALUE error;
-	int i=0;
 	int nParams;
-	Oid *paramTypes;
-	char ** paramValues;
-	int *paramLengths;
-	int *paramFormats;
 	int resultFormat;
+	struct query_params_data paramsData = { this->enc_idx };
 
-	rb_scan_args(argc, argv, "12", &command, &params, &in_res_fmt);
-	Check_Type(command, T_STRING);
-
-	/* If called with no parameters, use PQsendQuery */
-	if(NIL_P(params)) {
-		if(PQsendQuery(conn,StringValuePtr(command)) == 0) {
-			error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
-			rb_iv_set(error, "@connection", self);
-			rb_exc_raise(error);
-		}
-		return Qnil;
-	}
-
-	/* If called with parameters, and optionally result_format,
-	 * use PQsendQueryParams
-	 */
-	Check_Type(params, T_ARRAY);
-
-	if(NIL_P(in_res_fmt)) {
-		resultFormat = 0;
-	}
-	else {
-		resultFormat = NUM2INT(in_res_fmt);
-	}
-
-	gc_array = rb_ary_new();
-	rb_gc_register_address(&gc_array);
-	sym_type = ID2SYM(rb_intern("type"));
-	sym_value = ID2SYM(rb_intern("value"));
-	sym_format = ID2SYM(rb_intern("format"));
-	nParams = (int)RARRAY_LEN(params);
-	paramTypes = ALLOC_N(Oid, nParams);
-	paramValues = ALLOC_N(char *, nParams);
-	paramLengths = ALLOC_N(int, nParams);
-	paramFormats = ALLOC_N(int, nParams);
-	for(i = 0; i < nParams; i++) {
-		param = rb_ary_entry(params, i);
-		if (TYPE(param) == T_HASH) {
-			param_type = rb_hash_aref(param, sym_type);
-			param_value_tmp = rb_hash_aref(param, sym_value);
-			if(param_value_tmp == Qnil)
-				param_value = param_value_tmp;
-			else
-				param_value = rb_obj_as_string(param_value_tmp);
-			param_format = rb_hash_aref(param, sym_format);
-		}
-		else {
-			param_type = INT2NUM(0);
-			if(param == Qnil)
-				param_value = param;
-			else
-				param_value = rb_obj_as_string(param);
-			param_format = INT2NUM(0);
-		}
-
-		if(param_type == Qnil)
-			paramTypes[i] = 0;
-		else
-			paramTypes[i] = NUM2INT(param_type);
-
-		if(param_value == Qnil) {
-			paramValues[i] = NULL;
-			paramLengths[i] = 0;
-		}
-		else {
-			Check_Type(param_value, T_STRING);
-			/* make sure param_value doesn't get freed by the GC */
-			rb_ary_push(gc_array, param_value);
-			paramValues[i] = StringValuePtr(param_value);
-			paramLengths[i] = (int)RSTRING_LEN(param_value);
-		}
-
-		if(param_format == Qnil)
-			paramFormats[i] = 0;
-		else
-			paramFormats[i] = NUM2INT(param_format);
-	}
+	rb_scan_args(argc, argv, "22", &command, &paramsData.params, &in_res_fmt, &paramsData.typemap);
+	paramsData.with_types = 1;
 
-	result = PQsendQueryParams(conn, StringValuePtr(command), nParams, paramTypes,
-		(const char * const *)paramValues, paramLengths, paramFormats, resultFormat);
+	pgconn_query_assign_typemap( self, &paramsData );
+	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
+	nParams = alloc_query_params( &paramsData );
 
-	rb_gc_unregister_address(&gc_array);
+	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);
 
-	xfree(paramTypes);
-	xfree(paramValues);
-	xfree(paramLengths);
-	xfree(paramFormats);
+	free_query_params( &paramsData );
 
 	if(result == 0) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
@@ -1709,7 +1853,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 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;
@@ -1717,10 +1861,13 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 	int i = 0;
 	int nParams = 0;
 	Oid *paramTypes = NULL;
+	const char *name_cstr;
+	const char *command_cstr;
+	int enc_idx = this->enc_idx;
 
 	rb_scan_args(argc, argv, "21", &name, &command, &in_paramtypes);
-	Check_Type(name, T_STRING);
-	Check_Type(command, T_STRING);
+	name_cstr = pg_cstr_enc(name, enc_idx);
+	command_cstr = pg_cstr_enc(command, enc_idx);
 
 	if(! NIL_P(in_paramtypes)) {
 		Check_Type(in_paramtypes, T_ARRAY);
@@ -1728,20 +1875,18 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 		paramTypes = ALLOC_N(Oid, nParams);
 		for(i = 0; i < nParams; i++) {
 			param = rb_ary_entry(in_paramtypes, i);
-			Check_Type(param, T_FIXNUM);
 			if(param == Qnil)
 				paramTypes[i] = 0;
 			else
-				paramTypes[i] = NUM2INT(param);
+				paramTypes[i] = NUM2UINT(param);
 		}
 	}
-	result = PQsendPrepare(conn, StringValuePtr(name), StringValuePtr(command),
-			nParams, paramTypes);
+	result = gvl_PQsendPrepare(this->pgconn, name_cstr, command_cstr, nParams, paramTypes);
 
 	xfree(paramTypes);
 
 	if(result == 0) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
@@ -1750,7 +1895,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.send_query_prepared( statement_name [, params, result_format ] )
+ *    conn.send_query_prepared( statement_name [, params, result_format[, type_map ]] )
  *      -> nil
  *
  * Execute prepared named statement specified by _statement_name_
@@ -1761,7 +1906,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
  * SQL query. Each element of the +params+ array may be either:
  *   a hash of the form:
  *     {:value  => String (value of bind parameter)
- *      :format => Fixnum (0 for text, 1 for binary)
+ *      :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 }
@@ -1772,99 +1917,45 @@ pgconn_send_prepare(int argc, VALUE *argv, 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 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_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, params, in_res_fmt;
-	VALUE param, param_value, param_format;
-	VALUE param_value_tmp;
-	VALUE sym_value, sym_format;
-	VALUE gc_array;
+	VALUE name, in_res_fmt;
 	VALUE error;
-	int i = 0;
 	int nParams;
-	char ** paramValues;
-	int *paramLengths;
-	int *paramFormats;
 	int resultFormat;
+	struct query_params_data paramsData = { this->enc_idx };
 
-	rb_scan_args(argc, argv, "12", &name, &params, &in_res_fmt);
-	Check_Type(name, T_STRING);
-
-	if(NIL_P(params)) {
-		params = rb_ary_new2(0);
-		resultFormat = 0;
-	}
-	else {
-		Check_Type(params, T_ARRAY);
-	}
+	rb_scan_args(argc, argv, "13", &name, &paramsData.params, &in_res_fmt, &paramsData.typemap);
+	paramsData.with_types = 0;
 
-	if(NIL_P(in_res_fmt)) {
+	if(NIL_P(paramsData.params)) {
+		paramsData.params = rb_ary_new2(0);
 		resultFormat = 0;
 	}
-	else {
-		resultFormat = NUM2INT(in_res_fmt);
-	}
-
-	gc_array = rb_ary_new();
-	rb_gc_register_address(&gc_array);
-	sym_value = ID2SYM(rb_intern("value"));
-	sym_format = ID2SYM(rb_intern("format"));
-	nParams = (int)RARRAY_LEN(params);
-	paramValues = ALLOC_N(char *, nParams);
-	paramLengths = ALLOC_N(int, nParams);
-	paramFormats = ALLOC_N(int, nParams);
-	for(i = 0; i < nParams; i++) {
-		param = rb_ary_entry(params, i);
-		if (TYPE(param) == T_HASH) {
-			param_value_tmp = rb_hash_aref(param, sym_value);
-			if(param_value_tmp == Qnil)
-				param_value = param_value_tmp;
-			else
-				param_value = rb_obj_as_string(param_value_tmp);
-			param_format = rb_hash_aref(param, sym_format);
-		}
-		else {
-			if(param == Qnil)
-				param_value = param;
-			else
-				param_value = rb_obj_as_string(param);
-			param_format = INT2NUM(0);
-		}
-
-		if(param_value == Qnil) {
-			paramValues[i] = NULL;
-			paramLengths[i] = 0;
-		}
-		else {
-			Check_Type(param_value, T_STRING);
-			/* make sure param_value doesn't get freed by the GC */
-			rb_ary_push(gc_array, param_value);
-			paramValues[i] = StringValuePtr(param_value);
-			paramLengths[i] = (int)RSTRING_LEN(param_value);
-		}
+	pgconn_query_assign_typemap( self, &paramsData );
 
-		if(param_format == Qnil)
-			paramFormats[i] = 0;
-		else
-			paramFormats[i] = NUM2INT(param_format);
-	}
+	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
+	nParams = alloc_query_params( &paramsData );
 
-	result = PQsendQueryPrepared(conn, StringValuePtr(name), nParams,
-		(const char * const *)paramValues, paramLengths, paramFormats,
+	result = gvl_PQsendQueryPrepared(this->pgconn, pg_cstr_enc(name, paramsData.enc_idx), nParams,
+		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats,
 		resultFormat);
 
-	rb_gc_unregister_address(&gc_array);
-
-	xfree(paramValues);
-	xfree(paramLengths);
-	xfree(paramFormats);
+	free_query_params( &paramsData );
 
 	if(result == 0) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
@@ -1882,10 +1973,10 @@ 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(PQsendDescribePrepared(conn,StringValuePtr(stmt_name)) == 0) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+	if(gvl_PQsendDescribePrepared(this->pgconn, pg_cstr_enc(stmt_name, this->enc_idx)) == 0) {
+		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
@@ -1904,10 +1995,10 @@ 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(PQsendDescribePortal(conn,StringValuePtr(portal)) == 0) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+	if(gvl_PQsendDescribePortal(this->pgconn, pg_cstr_enc(portal, this->enc_idx)) == 0) {
+		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
@@ -1965,7 +2056,7 @@ pgconn_consume_input(self)
 	PGconn *conn = pg_get_pgconn(self);
 	/* returns 0 on error */
 	if(PQconsumeInput(conn) == 0) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		error = rb_exc_new2(rb_eConnectionBad, PQerrorMessage(conn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
@@ -1983,7 +2074,7 @@ static VALUE
 pgconn_is_busy(self)
 	VALUE self;
 {
-	return PQisBusy(pg_get_pgconn(self)) ? Qtrue : Qfalse;
+	return gvl_PQisBusy(pg_get_pgconn(self)) ? Qtrue : Qfalse;
 }
 
 /*
@@ -2078,7 +2169,6 @@ pgconn_flush(self)
 static VALUE
 pgconn_cancel(VALUE self)
 {
-#ifdef HAVE_PQGETCANCEL
 	char errbuf[256];
 	PGcancel *cancel;
 	VALUE retval;
@@ -2088,7 +2178,7 @@ pgconn_cancel(VALUE self)
 	if(cancel == NULL)
 		rb_raise(rb_ePGerror,"Invalid connection!");
 
-	ret = PQcancel(cancel, errbuf, 256);
+	ret = gvl_PQcancel(cancel, errbuf, 256);
 	if(ret == 1)
 		retval = Qnil;
 	else
@@ -2096,9 +2186,6 @@ pgconn_cancel(VALUE self)
 
 	PQfreeCancel(cancel);
 	return retval;
-#else
-	rb_notimplement();
-#endif
 }
 
 
@@ -2112,7 +2199,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;
@@ -2122,19 +2209,17 @@ pgconn_notifies(VALUE self)
 	sym_be_pid = ID2SYM(rb_intern("be_pid"));
 	sym_extra = ID2SYM(rb_intern("extra"));
 
-	notification = 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);
-#ifdef M17N_SUPPORTED
-	ENCODING_SET( relname, rb_enc_to_index(pg_conn_enc_get( conn )) );
-	ENCODING_SET( extra, rb_enc_to_index(pg_conn_enc_get( conn )) );
-#endif
+	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);
@@ -2144,87 +2229,60 @@ pgconn_notifies(VALUE self)
 	return hash;
 }
 
-/* Win32 + Ruby 1.8 */
-#if !defined( HAVE_RUBY_VM_H ) && defined( _WIN32 )
-
+/* Win32 + Ruby 1.9+ */
+#if defined( _WIN32 )
 /*
- * Duplicate the sockets from libpq and create temporary CRT FDs
- */
-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]);
-	}
-}
-#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().
+ * On Windows, use platform-specific strategies to wait for the socket
+ * instead of rb_wait_for_single_fd().
  */
 
 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 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;
 
 	if ( sd < 0 )
-		rb_bug( "PQsocket(conn): couldn't fetch the connection's socket!" );
+		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
 
 	hEvent = WSACreateEvent();
 
-	if ( ptimeout ) {
-		timeout_milisec = (DWORD)( ptimeout->tv_sec * 1e3 + ptimeout->tv_usec / 1e3 );
-	}
-
 	/* Check for connection errors (PQisBusy is true on connection errors) */
 	if( PQconsumeInput(conn) == 0 ) {
 		WSACloseEvent( hEvent );
-		rb_raise( rb_ePGerror, "%s", PQerrorMessage(conn) );
+		rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
+	}
+
+	if ( ptimeout ) {
+		gettimeofday(&currtime, NULL);
+		timeradd(&currtime, ptimeout, &aborttime);
 	}
 
 	while ( !(retval=is_readable(conn)) ) {
 		if ( WSAEventSelect(sd, hEvent, FD_READ|FD_CLOSE) == SOCKET_ERROR ) {
 			WSACloseEvent( hEvent );
-			rb_raise( rb_ePGerror, "WSAEventSelect socket error: %d", WSAGetLastError() );
+			rb_raise( rb_eConnectionBad, "WSAEventSelect socket error: %d", WSAGetLastError() );
 		}
 
-		wait_ret = rb_w32_wait_events( &hEvent, 1, timeout_milisec );
+		if ( ptimeout ) {
+			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) ){
+			/* Wait for the socket to become readable before checking again */
+			wait_ret = rb_w32_wait_events( &hEvent, 1, timeout_milisec );
+		} else {
+			wait_ret = WAIT_TIMEOUT;
+		}
 
 		if ( wait_ret == WAIT_TIMEOUT ) {
 			WSACloseEvent( hEvent );
@@ -2237,16 +2295,16 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 			rb_thread_check_ints();
 		} else if ( wait_ret == WAIT_FAILED ) {
 			WSACloseEvent( hEvent );
-			rb_raise( rb_ePGerror, "Wait on socket error (WaitForMultipleObjects): %lu", GetLastError() );
+			rb_raise( rb_eConnectionBad, "Wait on socket error (WaitForMultipleObjects): %lu", GetLastError() );
 		} else {
 			WSACloseEvent( hEvent );
-			rb_raise( rb_ePGerror, "Wait on socket abandoned (WaitForMultipleObjects)" );
+			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_ePGerror, "%s", PQerrorMessage(conn) );
+			rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
 		}
 	}
 
@@ -2256,7 +2314,7 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 
 #else
 
-/* non Win32 or Win32+Ruby-1.8 */
+/* non Win32 */
 
 static void *
 wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readable)(PGconn *))
@@ -2264,58 +2322,49 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 	int sd = PQsocket( conn );
 	int ret;
 	void *retval;
-	rb_fdset_t sd_rset;
-#ifdef _WIN32
-	rb_fdset_t crt_sd_rset;
-#endif
+	struct timeval aborttime={0,0}, currtime, waittime;
 
 	if ( sd < 0 )
-		rb_bug( "PQsocket(conn): couldn't fetch the connection's socket!" );
+		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_ePGerror, "%s", PQerrorMessage(conn) );
+		rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
 
-  rb_fd_init( &sd_rset );
+	if ( ptimeout ) {
+		gettimeofday(&currtime, NULL);
+		timeradd(&currtime, ptimeout, &aborttime);
+	}
 
 	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
-
-		/* Wait for the socket to become readable before checking again */
-		ret = rb_thread_fd_select( sd+1, &sd_rset, NULL, NULL, ptimeout );
+		if ( ptimeout ) {
+			gettimeofday(&currtime, NULL);
+			timersub(&aborttime, &currtime, &waittime);
+		}
 
-#ifdef _WIN32
-		cleanup_crt_fd(&sd_rset, &crt_sd_rset);
-#endif
+		/* Is the given timeout valid? */
+		if( !ptimeout || (waittime.tv_sec >= 0 && waittime.tv_usec >= 0) ){
+			/* Wait for the socket to become readable before checking again */
+			ret = rb_wait_for_single_fd( sd, RB_WAITFD_IN, ptimeout ? &waittime : NULL );
+		} else {
+			ret = 0;
+		}
 
 		if ( ret < 0 ){
-			rb_fd_term( &sd_rset );
-			rb_sys_fail( "rb_thread_select()" );
+			rb_sys_fail( "rb_wait_for_single_fd()" );
 		}
 
 		/* Return false if the select() timed out */
 		if ( ret == 0 ){
-			rb_fd_term( &sd_rset );
 			return NULL;
 		}
 
 		/* Check for connection errors (PQisBusy is true on connection errors) */
 		if ( PQconsumeInput(conn) == 0 ){
-			rb_fd_term( &sd_rset );
-			rb_raise( rb_ePGerror, "%s", PQerrorMessage(conn) );
+			rb_raise( rb_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
 		}
 	}
 
-	rb_fd_term( &sd_rset );
 	return retval;
 }
 
@@ -2325,32 +2374,25 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 static void *
 notify_readable(PGconn *conn)
 {
-	return (void*)PQnotifies(conn);
+	return (void*)gvl_PQnotifies(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;
@@ -2366,24 +2408,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( this->pgconn, ptimeout, notify_readable);
 
 	/* Return nil if the select timed out */
 	if ( !pnotification ) return Qnil;
 
-	relname = rb_tainted_str_new2( pnotification->relname );
-#ifdef M17N_SUPPORTED
-	ENCODING_SET( relname, rb_enc_to_index(pg_conn_enc_get( conn )) );
-#endif
+	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 );
-#ifdef M17N_SUPPORTED
-		ENCODING_SET( extra, rb_enc_to_index(pg_conn_enc_get( conn )) );
-#endif
+		extra = rb_str_new2( pnotification->extra );
+		PG_ENCODING_SET_NOCHECK( extra, this->enc_idx );
 	}
-#endif
 	PQfreemem( pnotification );
 
 	if ( rb_block_given_p() )
@@ -2395,30 +2431,79 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.put_copy_data( buffer ) -> Boolean
+ *    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 data fields given as _buffer_ from an Array of Strings to
+ * PostgreSQL's COPY text format inclusive proper escaping. Optionally
+ * the encoder can type cast the fields from 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(self, buffer)
-	VALUE self, buffer;
+pgconn_put_copy_data(int argc, VALUE *argv, VALUE self)
 {
 	int ret;
-	VALUE error;
-	PGconn *conn = pg_get_pgconn(self);
+	int len;
+	t_pg_connection *this = pg_get_connection_safe( self );
+	VALUE value;
+	VALUE buffer = Qnil;
+	VALUE encoder;
+	VALUE intermediate;
+	t_pg_coder *p_coder = NULL;
+
+	rb_scan_args( argc, argv, "11", &value, &encoder );
+
+	if( NIL_P(encoder) ){
+		if( NIL_P(this->encoder_for_put_copy_data) ){
+			buffer = value;
+		} else {
+			p_coder = DATA_PTR( 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 ) );
+	}
+
+	if( p_coder ){
+		t_pg_coder_enc_func enc_func;
+		int enc_idx = this->enc_idx;
+
+		enc_func = pg_coder_enc_func( p_coder );
+		len = enc_func( p_coder, value, NULL, &intermediate, enc_idx);
+
+		if( len == -1 ){
+			/* The intermediate value is a String that can be used directly. */
+			buffer = intermediate;
+		} else {
+			buffer = rb_str_new(NULL, len);
+			len = enc_func( p_coder, value, RSTRING_PTR(buffer), &intermediate, enc_idx);
+			rb_str_set_len( buffer, len );
+		}
+	}
+
 	Check_Type(buffer, T_STRING);
 
-	ret = gvl_PQputCopyData(conn, RSTRING_PTR(buffer), (int)RSTRING_LEN(buffer));
+	ret = gvl_PQputCopyData(this->pgconn, RSTRING_PTR(buffer), RSTRING_LENINT(buffer));
 	if(ret == -1) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		VALUE error = rb_exc_new2(rb_ePGerror, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
+	RB_GC_GUARD(intermediate);
+	RB_GC_GUARD(buffer);
+
 	return (ret) ? Qtrue : Qfalse;
 }
 
@@ -2442,17 +2527,17 @@ pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
 	VALUE str;
 	VALUE error;
 	int ret;
-	char *error_message = NULL;
-	PGconn *conn = pg_get_pgconn(self);
+	const char *error_message = NULL;
+	t_pg_connection *this = pg_get_connection_safe( self );
 
 	if (rb_scan_args(argc, argv, "01", &str) == 0)
 		error_message = NULL;
 	else
-		error_message = StringValuePtr(str);
+		error_message = pg_cstr_enc(str, this->enc_idx);
 
-	ret = gvl_PQputCopyEnd(conn, error_message);
+	ret = gvl_PQputCopyEnd(this->pgconn, error_message);
 	if(ret == -1) {
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
@@ -2461,32 +2546,51 @@ pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.get_copy_data( [ async = false ] ) -> String
+ *    conn.get_copy_data( [ async = false [, decoder = nil ]] ) -> Object
  *
- * Return a string containing one row of data, +nil+
+ * Return one row of data, +nil+
  * if the copy is done, or +false+ if the call would
  * block (only possible if _async_ is true).
  *
+ * If _decoder_ is not set or +nil+, data is returned as binary string.
+ *
+ * If _decoder_ is set to a PG::Coder derivation, the return type depends on this decoder.
+ * PG::TextDecoder::CopyRow decodes the received data fields from one row of PostgreSQL's
+ * COPY text format to an Array of Strings.
+ * Optionally the decoder can type cast the single 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 )
 {
 	VALUE async_in;
 	VALUE error;
-	VALUE result_str;
+	VALUE result;
 	int ret;
-	int async;
 	char *buffer;
-	PGconn *conn = pg_get_pgconn(self);
+	VALUE decoder;
+	t_pg_coder *p_coder = NULL;
+	t_pg_connection *this = pg_get_connection_safe( self );
 
-	if (rb_scan_args(argc, argv, "01", &async_in) == 0)
-		async = 0;
-	else
-		async = (async_in == Qfalse || async_in == Qnil) ? 0 : 1;
+	rb_scan_args(argc, argv, "02", &async_in, &decoder);
+
+	if( NIL_P(decoder) ){
+		if( !NIL_P(this->decoder_for_get_copy_data) ){
+			p_coder = DATA_PTR( 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 ) );
+	}
 
-	ret = gvl_PQgetCopyData(conn, &buffer, async);
+	ret = gvl_PQgetCopyData(this->pgconn, &buffer, RTEST(async_in));
 	if(ret == -2) { /* error */
-		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(this->pgconn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
 	}
@@ -2496,20 +2600,34 @@ pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
 	if(ret == 0) { /* would block */
 		return Qfalse;
 	}
-	result_str = rb_tainted_str_new(buffer, ret);
+
+	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, this->enc_idx );
+	} else {
+		result = rb_str_new(buffer, ret);
+	}
+
 	PQfreemem(buffer);
-	return result_str;
+	return result;
 }
 
 /*
  * call-seq:
- *    conn.set_error_verbosity( verbosity ) -> Fixnum
+ *    conn.set_error_verbosity( verbosity ) -> Integer
  *
  * 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)
@@ -2519,6 +2637,37 @@ pgconn_set_error_verbosity(VALUE self, VALUE in_verbosity)
 	return INT2FIX(PQsetErrorVerbosity(conn, verbosity));
 }
 
+#ifdef HAVE_PQRESULTVERBOSEERRORMESSAGE
+/*
+ * call-seq:
+ *    conn.set_error_context_visibility( context_visibility ) -> Integer
+ *
+ * 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_set_error_context_visibility(VALUE self, VALUE in_context_visibility)
+{
+	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
@@ -2535,8 +2684,9 @@ pgconn_trace(VALUE self, VALUE stream)
 	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)
+	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);
@@ -2557,9 +2707,9 @@ 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));
-	rb_iv_set(self, "@trace_stream", new_file);
+	this->trace_stream = new_file;
 
-	PQtrace(pg_get_pgconn(self), new_fp);
+	PQtrace(this->pgconn, new_fp);
 	return Qnil;
 }
 
@@ -2572,11 +2722,11 @@ pgconn_trace(VALUE self, VALUE stream)
 static VALUE
 pgconn_untrace(VALUE self)
 {
-	VALUE trace_stream;
-	PQuntrace(pg_get_pgconn(self));
-	trace_stream = rb_iv_get(self, "@trace_stream");
-	rb_funcall(trace_stream, rb_intern("close"), 0);
-	rb_iv_set(self, "@trace_stream", Qnil);
+	t_pg_connection *this = pg_get_connection_safe( self );
+
+	PQuntrace(this->pgconn);
+	rb_funcall(this->trace_stream, rb_intern("close"), 0);
+	this->trace_stream = Qnil;
 	return Qnil;
 }
 
@@ -2586,19 +2736,16 @@ pgconn_untrace(VALUE self)
  * currently-registered Ruby notice_receiver object.
  */
 void
-notice_receiver_proxy(void *arg, const PGresult *result)
+notice_receiver_proxy(void *arg, const PGresult *pgresult)
 {
-	VALUE proc;
 	VALUE self = (VALUE)arg;
+	t_pg_connection *this = pg_get_connection( self );
 
-	if ((proc = rb_iv_get(self, "@notice_receiver")) != Qnil) {
-		VALUE val = Data_Wrap_Struct(rb_cPGresult, NULL, NULL, (PGresult*)result);
-#ifdef M17N_SUPPORTED
-		PGconn *conn = pg_get_pgconn( self );
-		rb_encoding *enc = pg_conn_enc_get( conn );
-		ENCODING_SET( val, rb_enc_to_index(enc) );
-#endif
-		rb_funcall(proc, rb_intern("call"), 1, val);
+	if (this->notice_receiver != Qnil) {
+		VALUE result = pg_new_result_autoclear( (PGresult *)pgresult, self );
+
+		rb_funcall(this->notice_receiver, rb_intern("call"), 1, result);
+		pg_result_clear( result );
 	}
 	return;
 }
@@ -2636,7 +2783,7 @@ static VALUE
 pgconn_set_notice_receiver(VALUE self)
 {
 	VALUE proc, old_proc;
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 
 	/* If default_notice_receiver is unset, assume that the current
 	 * notice receiver is the default, and save it to a global variable.
@@ -2644,19 +2791,19 @@ pgconn_set_notice_receiver(VALUE self)
 	 * always the same, so won't vary among connections.
 	 */
 	if(default_notice_receiver == NULL)
-		default_notice_receiver = PQsetNoticeReceiver(conn, NULL, NULL);
+		default_notice_receiver = PQsetNoticeReceiver(this->pgconn, NULL, NULL);
 
-	old_proc = rb_iv_get(self, "@notice_receiver");
+	old_proc = this->notice_receiver;
 	if( rb_block_given_p() ) {
 		proc = rb_block_proc();
-		PQsetNoticeReceiver(conn, gvl_notice_receiver_proxy, (void *)self);
+		PQsetNoticeReceiver(this->pgconn, gvl_notice_receiver_proxy, (void *)self);
 	} else {
 		/* if no block is given, set back to default */
 		proc = Qnil;
-		PQsetNoticeReceiver(conn, default_notice_receiver, NULL);
+		PQsetNoticeReceiver(this->pgconn, default_notice_receiver, NULL);
 	}
 
-	rb_iv_set(self, "@notice_receiver", proc);
+	this->notice_receiver = proc;
 	return old_proc;
 }
 
@@ -2668,17 +2815,13 @@ pgconn_set_notice_receiver(VALUE self)
 void
 notice_processor_proxy(void *arg, const char *message)
 {
-	VALUE proc;
 	VALUE self = (VALUE)arg;
+	t_pg_connection *this = pg_get_connection( self );
 
-	if ((proc = rb_iv_get(self, "@notice_processor")) != Qnil) {
-		VALUE message_str = rb_tainted_str_new2(message);
-#ifdef M17N_SUPPORTED
-		PGconn *conn = pg_get_pgconn( self );
-		rb_encoding *enc = pg_conn_enc_get( conn );
-		ENCODING_SET( message_str, rb_enc_to_index(enc) );
-#endif
-		rb_funcall(proc, rb_intern("call"), 1, message_str);
+	if (this->notice_receiver != Qnil) {
+		VALUE message_str = rb_str_new2(message);
+		PG_ENCODING_SET_NOCHECK( message_str, this->enc_idx );
+		rb_funcall(this->notice_receiver, rb_intern("call"), 1, message_str);
 	}
 	return;
 }
@@ -2700,7 +2843,7 @@ static VALUE
 pgconn_set_notice_processor(VALUE self)
 {
 	VALUE proc, old_proc;
-	PGconn *conn = pg_get_pgconn(self);
+	t_pg_connection *this = pg_get_connection_safe( self );
 
 	/* If default_notice_processor is unset, assume that the current
 	 * notice processor is the default, and save it to a global variable.
@@ -2708,19 +2851,19 @@ pgconn_set_notice_processor(VALUE self)
 	 * always the same, so won't vary among connections.
 	 */
 	if(default_notice_processor == NULL)
-		default_notice_processor = PQsetNoticeProcessor(conn, NULL, NULL);
+		default_notice_processor = PQsetNoticeProcessor(this->pgconn, NULL, NULL);
 
-	old_proc = rb_iv_get(self, "@notice_processor");
+	old_proc = this->notice_receiver;
 	if( rb_block_given_p() ) {
 		proc = rb_block_proc();
-		PQsetNoticeProcessor(conn, gvl_notice_processor_proxy, (void *)self);
+		PQsetNoticeProcessor(this->pgconn, gvl_notice_processor_proxy, (void *)self);
 	} else {
 		/* if no block is given, set back to default */
 		proc = Qnil;
-		PQsetNoticeProcessor(conn, default_notice_processor, NULL);
+		PQsetNoticeProcessor(this->pgconn, default_notice_processor, NULL);
 	}
 
-	rb_iv_set(self, "@notice_processor", proc);
+	this->notice_receiver = proc;
 	return old_proc;
 }
 
@@ -2735,7 +2878,7 @@ 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);
 }
 
 
@@ -2752,16 +2895,17 @@ pgconn_set_client_encoding(VALUE self, VALUE str)
 
 	Check_Type(str, T_STRING);
 
-	if ( (PQsetClientEncoding(conn, StringValuePtr(str))) == -1 ) {
-		rb_raise(rb_ePGerror, "invalid encoding name: %s",StringValuePtr(str));
+	if ( (gvl_PQsetClientEncoding(conn, StringValueCStr(str))) == -1 ) {
+		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
 	}
+	pgconn_set_internal_encoding_index( self );
 
 	return Qnil;
 }
 
 /*
  * call-seq:
- *    conn.transaction { |conn| ... } -> nil
+ *    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
@@ -2773,13 +2917,14 @@ 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);
-		rb_protect(rb_yield, self, &status);
+		block_result = rb_protect(rb_yield, self, &status);
 		if(status == 0) {
 			result = gvl_PQexec(conn, "COMMIT");
 			rb_pgresult = pg_new_result(result, self);
@@ -2798,14 +2943,16 @@ pgconn_transaction(VALUE self)
 		/* no block supplied? */
 		rb_raise(rb_eArgError, "Must supply block for PG::Connection#transaction");
 	}
-	return Qnil;
+	return block_result;
 }
 
 
 /*
  * call-seq:
- *    PG::Connection.quote_ident( str ) -> String
  *    conn.quote_ident( str ) -> String
+ *    conn.quote_ident( array ) -> String
+ *    PG::Connection.quote_ident( str ) -> String
+ *    PG::Connection.quote_ident( array ) -> String
  *
  * Returns a string that is safe for inclusion in a SQL query as an
  * identifier. Note: this is not a quote function for values, but for
@@ -2815,40 +2962,40 @@ pgconn_transaction(VALUE self)
  * The identifier <tt>FOO</tt> is folded to lower case, so it actually
  * means <tt>foo</tt>. If you really want to access the case-sensitive
  * field name <tt>FOO</tt>, use this function like
- * <tt>PG::Connection.quote_ident('FOO')</tt>, which will return <tt>"FOO"</tt>
+ * <tt>conn.quote_ident('FOO')</tt>, which will return <tt>"FOO"</tt>
  * (with double-quotes). PostgreSQL will see the double-quotes, and
  * it will not fold to lower case.
  *
  * Similarly, this function also protects against special characters,
  * and other things that might allow SQL injection if the identifier
  * comes from an untrusted source.
+ *
+ * If the parameter is an Array, then all it's values are separately quoted
+ * and then joined by a "." character. This can be used for identifiers in
+ * the form "schema"."table"."column" .
+ *
+ * This method is functional identical to the encoder PG::TextEncoder::Identifier .
+ *
+ * If the instance method form is used and the input string character encoding
+ * is different to the connection encoding, then the string is converted to this
+ * encoding, so that the returned string is always encoded as PG::Connection#internal_encoding .
+ *
+ * In the singleton form (PG::Connection.quote_ident) the character encoding
+ * of the result string is set to the character encoding of the input string.
  */
 static VALUE
-pgconn_s_quote_ident(VALUE self, VALUE in_str)
+pgconn_s_quote_ident(VALUE self, VALUE str_or_array)
 {
 	VALUE ret;
-	char *str = StringValuePtr(in_str);
-	/* result size at most NAMEDATALEN*2 plus surrounding
-	 * double-quotes. */
-	char buffer[NAMEDATALEN*2+2];
-	unsigned int i=0,j=0;
-
-	UNUSED( self );
+	int enc_idx;
 
-	if(strlen(str) >= NAMEDATALEN) {
-		rb_raise(rb_eArgError,
-			"Input string is longer than NAMEDATALEN-1 (%d)",
-			NAMEDATALEN-1);
-	}
-	buffer[j++] = '"';
-	for(i = 0; i < strlen(str) && str[i]; i++) {
-		if(str[i] == '"')
-			buffer[j++] = '"';
-		buffer[j++] = str[i];
+	if( rb_obj_is_kind_of(self, rb_cPGconn) ){
+		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();
 	}
-	buffer[j++] = '"';
-	ret = rb_str_new(buffer,j);
-	OBJ_INFECT(ret, in_str);
+	pg_text_enc_identifier(NULL, str_or_array, NULL, &ret, enc_idx);
+
 	return ret;
 }
 
@@ -2856,7 +3003,7 @@ pgconn_s_quote_ident(VALUE self, VALUE in_str)
 static void *
 get_result_readable(PGconn *conn)
 {
-	return PQisBusy(conn) ? NULL : (void*)1;
+	return gvl_PQisBusy(conn) ? NULL : (void*)1;
 }
 
 
@@ -2877,10 +3024,6 @@ static 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;
@@ -2945,34 +3088,71 @@ pgconn_get_last_result(VALUE self)
 	return rb_pgresult;
 }
 
-#if !defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+/*
+ * call-seq:
+ *    conn.discard_results()
+ *
+ * Silently discard any prior query result that application didn't eat.
+ * This is done prior of Connection#exec and sibling methods and can
+ * be called explicitly when using the async API.
+ */
+static VALUE
+pgconn_discard_results(VALUE self)
+{
+	PGconn *conn = pg_get_pgconn(self);
+
+	PGresult *cur;
+	while ((cur = gvl_PQgetResult(conn)) != NULL) {
+		int status = PQresultStatus(cur);
+		PQclear(cur);
+		if (status == PGRES_COPY_IN){
+			gvl_PQputCopyEnd(conn, "COPY terminated by new PQexec");
+		}
+		if (status == PGRES_COPY_OUT){
+			char *buffer = NULL;
+			while( gvl_PQgetCopyData(conn, &buffer, 0) > 0)
+				PQfreemem(buffer);
+		}
+	}
+
+	return Qnil;
+}
 
 /*
  * call-seq:
- *    conn.async_exec(sql [, params, result_format ] ) -> PG::Result
- *    conn.async_exec(sql [, params, result_format ] ) {|pg_result| block }
+ *    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.
  *
- * This function has the same behavior as #exec,
- * but ensures that other threads can process while
- * waiting for the server to complete the request.
+ * 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.
  *
- * On Ruby platforms with native threads (MRI-1.9+ and all others)
- * this method is an alias to #exec.
+ * #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.
+ * 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.
  *
- * On MRI-1.8 it's implemented using asynchronous command
- * processing and ruby's +rb_thread_select+ .
+ * 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 );
+	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
 	rb_pgresult = pgconn_get_last_result( self );
 
 	if ( rb_block_given_p() ) {
@@ -2981,103 +3161,394 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 	return rb_pgresult;
 }
 
-#endif
-
-/**************************************************************************
- * LARGE OBJECT SUPPORT
- **************************************************************************/
 
 /*
  * call-seq:
- *    conn.lo_creat( [mode] ) -> Fixnum
+ *    conn.exec_params(sql, params [, result_format [, type_map ]] ) -> nil
+ *    conn.exec_params(sql, params [, result_format [, type_map ]] ) {|pg_result| block }
  *
- * Creates a large object with mode _mode_. Returns a large object Oid.
- * On failure, it raises PG::Error.
- */
-static VALUE
-pgconn_locreat(int argc, VALUE *argv, VALUE self)
-{
-	Oid lo_oid;
-	int mode;
-	VALUE nmode;
-	PGconn *conn = pg_get_pgconn(self);
-
-	if (rb_scan_args(argc, argv, "01", &nmode) == 0)
-		mode = INV_READ;
-	else
-		mode = NUM2INT(nmode);
-
-	lo_oid = lo_creat(conn, mode);
-	if (lo_oid == 0)
-		rb_raise(rb_ePGerror, "lo_creat failed");
-
-	return INT2FIX(lo_oid);
-}
-
-/*
- * call-seq:
- *    conn.lo_create( oid ) -> Fixnum
+ * Sends SQL query request specified by +sql+ to PostgreSQL using placeholders
+ * for parameters.
  *
- * Creates a large object with oid _oid_. Returns the large object Oid.
- * On failure, it raises PG::Error.
+ * 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"
+ *
+ * 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_locreate(VALUE self, VALUE in_lo_oid)
+pgconn_async_exec_params(int argc, VALUE *argv, VALUE self)
 {
-	Oid ret, lo_oid;
-	PGconn *conn = pg_get_pgconn(self);
-	lo_oid = NUM2INT(in_lo_oid);
+	VALUE rb_pgresult = Qnil;
 
-	ret = lo_create(conn, lo_oid);
-	if (ret == InvalidOid)
-		rb_raise(rb_ePGerror, "lo_create failed");
+	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 );
+	}
+	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
+	rb_pgresult = pgconn_get_last_result( self );
 
-	return INT2FIX(ret);
+	if ( rb_block_given_p() ) {
+		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
+	}
+	return rb_pgresult;
 }
 
+
 /*
  * call-seq:
- *    conn.lo_import(file) -> Fixnum
- *
- * Import a file to a large object. Returns a large object Oid.
+ *    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, $1, $2, etc.,
+ * inside the SQL query.
+ *
+ * See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-exec.html#LIBPQ-PQPREPARE].
  */
 static VALUE
-pgconn_loimport(VALUE self, VALUE filename)
+pgconn_async_prepare(int argc, VALUE *argv, VALUE self)
 {
-	Oid lo_oid;
-
-	PGconn *conn = pg_get_pgconn(self);
+	VALUE rb_pgresult = Qnil;
 
-	Check_Type(filename, T_STRING);
+	pgconn_discard_results( self );
+	pgconn_send_prepare( argc, argv, self );
+	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
+	rb_pgresult = pgconn_get_last_result( self );
 
-	lo_oid = lo_import(conn, StringValuePtr(filename));
-	if (lo_oid == 0) {
-		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
+	if ( rb_block_given_p() ) {
+		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
 	}
-	return INT2FIX(lo_oid);
+	return rb_pgresult;
 }
 
+
 /*
  * call-seq:
- *    conn.lo_export( oid, file ) -> nil
+ *    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 }
  *
- * Saves a large object of _oid_ to a _file_.
- */
+ * 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 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_loexport(VALUE self, VALUE lo_oid, VALUE filename)
+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 );
+	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
+	rb_pgresult = pgconn_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 );
+	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
+	rb_pgresult = pgconn_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 );
+	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
+	rb_pgresult = pgconn_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/TLS, +false+ if not.
+ *
+ * Available since PostgreSQL-9.5
+ */
+static VALUE
+pgconn_ssl_in_use(VALUE self)
+{
+	return PQsslInUse(pg_get_pgconn(self)) ? Qtrue : Qfalse;
+}
+
+
+/*
+ * call-seq:
+ *    conn.ssl_attribute(attribute_name) -> String
+ *
+ * Returns SSL-related information about the connection.
+ *
+ * The list of available attributes varies depending on the SSL library being used,
+ * and the type of connection. If an attribute is not available, returns nil.
+ *
+ * The following attributes are commonly available:
+ *
+ * [+library+]
+ *   Name of the SSL implementation in use. (Currently, only "OpenSSL" is implemented)
+ * [+protocol+]
+ *   SSL/TLS version in use. Common values are "SSLv2", "SSLv3", "TLSv1", "TLSv1.1" and "TLSv1.2", but an implementation may return other strings if some other protocol is used.
+ * [+key_bits+]
+ *   Number of key bits used by the encryption algorithm.
+ * [+cipher+]
+ *   A short name of the ciphersuite used, e.g. "DHE-RSA-DES-CBC3-SHA". The names are specific to each SSL implementation.
+ * [+compression+]
+ *   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 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)
+{
+	const char *p_attr;
+
+	p_attr = PQsslAttribute(pg_get_pgconn(self), StringValueCStr(attribute_name));
+	return p_attr ? rb_str_new_cstr(p_attr) : Qnil;
+}
+
+/*
+ * call-seq:
+ *    conn.ssl_attribute_names -> Array<String>
+ *
+ * Return an array of SSL attribute names available.
+ *
+ * See also #ssl_attribute
+ *
+ * Available since PostgreSQL-9.5
+ */
+static VALUE
+pgconn_ssl_attribute_names(VALUE self)
+{
+	int i;
+	const char * const * p_list = PQsslAttributeNames(pg_get_pgconn(self));
+	VALUE ary = rb_ary_new();
+
+	for ( i = 0; p_list[i]; i++ ) {
+		rb_ary_push( ary, rb_str_new_cstr( p_list[i] ));
+	}
+	return ary;
+}
+
+
+#endif
+
+
+/**************************************************************************
+ * LARGE OBJECT SUPPORT
+ **************************************************************************/
+
+/*
+ * call-seq:
+ *    conn.lo_creat( [mode] ) -> Integer
+ *
+ * Creates a large object with mode _mode_. Returns a large object Oid.
+ * On failure, it raises PG::Error.
+ */
+static VALUE
+pgconn_locreat(int argc, VALUE *argv, VALUE self)
+{
+	Oid lo_oid;
+	int mode;
+	VALUE nmode;
+	PGconn *conn = pg_get_pgconn(self);
+
+	if (rb_scan_args(argc, argv, "01", &nmode) == 0)
+		mode = INV_READ;
+	else
+		mode = NUM2INT(nmode);
+
+	lo_oid = lo_creat(conn, mode);
+	if (lo_oid == 0)
+		rb_raise(rb_ePGerror, "lo_creat failed");
+
+	return UINT2NUM(lo_oid);
+}
+
+/*
+ * call-seq:
+ *    conn.lo_create( oid ) -> Integer
+ *
+ * Creates a large object with oid _oid_. Returns the large object Oid.
+ * On failure, it raises PG::Error.
+ */
+static VALUE
+pgconn_locreate(VALUE self, VALUE in_lo_oid)
 {
+	Oid ret, lo_oid;
 	PGconn *conn = pg_get_pgconn(self);
-	int oid;
+	lo_oid = NUM2UINT(in_lo_oid);
+
+	ret = lo_create(conn, lo_oid);
+	if (ret == InvalidOid)
+		rb_raise(rb_ePGerror, "lo_create failed");
+
+	return UINT2NUM(ret);
+}
+
+/*
+ * call-seq:
+ *    conn.lo_import(file) -> Integer
+ *
+ * Import a file to a large object. Returns a large object Oid.
+ *
+ * On failure, it raises a PG::Error.
+ */
+static VALUE
+pgconn_loimport(VALUE self, VALUE filename)
+{
+	Oid lo_oid;
+
+	PGconn *conn = pg_get_pgconn(self);
+
 	Check_Type(filename, T_STRING);
 
-	oid = NUM2INT(lo_oid);
-	if (oid < 0) {
-		rb_raise(rb_ePGerror, "invalid large object oid %d",oid);
+	lo_oid = lo_import(conn, StringValueCStr(filename));
+	if (lo_oid == 0) {
+		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
 	}
+	return UINT2NUM(lo_oid);
+}
 
-	if (lo_export(conn, oid, StringValuePtr(filename)) < 0) {
+/*
+ * call-seq:
+ *    conn.lo_export( oid, file ) -> nil
+ *
+ * Saves a large object of _oid_ to a _file_.
+ */
+static VALUE
+pgconn_loexport(VALUE self, VALUE lo_oid, VALUE filename)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	Oid oid;
+	Check_Type(filename, T_STRING);
+
+	oid = NUM2UINT(lo_oid);
+
+	if (lo_export(conn, oid, StringValueCStr(filename)) < 0) {
 		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
 	}
 	return Qnil;
@@ -3085,7 +3556,7 @@ pgconn_loexport(VALUE self, VALUE lo_oid, VALUE filename)
 
 /*
  * call-seq:
- *    conn.lo_open( oid, [mode] ) -> Fixnum
+ *    conn.lo_open( oid, [mode] ) -> Integer
  *
  * Open a large object of _oid_. Returns a large object descriptor
  * instance on success. The _mode_ argument specifies the mode for
@@ -3102,7 +3573,7 @@ pgconn_loopen(int argc, VALUE *argv, VALUE self)
 	PGconn *conn = pg_get_pgconn(self);
 
 	rb_scan_args(argc, argv, "11", &selfid, &nmode);
-	lo_oid = NUM2INT(selfid);
+	lo_oid = NUM2UINT(selfid);
 	if(NIL_P(nmode))
 		mode = INV_READ;
 	else
@@ -3116,7 +3587,7 @@ pgconn_loopen(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.lo_write( lo_desc, buffer ) -> Fixnum
+ *    conn.lo_write( lo_desc, buffer ) -> Integer
  *
  * Writes the string _buffer_ to the large object _lo_desc_.
  * Returns the number of bytes written.
@@ -3174,7 +3645,7 @@ pgconn_loread(VALUE self, VALUE in_lo_desc, VALUE in_len)
 		return Qnil;
 	}
 
-	str = rb_tainted_str_new(buffer, ret);
+	str = rb_str_new(buffer, ret);
 	xfree(buffer);
 
 	return str;
@@ -3183,7 +3654,7 @@ pgconn_loread(VALUE self, VALUE in_lo_desc, VALUE in_len)
 
 /*
  * call-seq:
- *    conn.lo_lseek( lo_desc, offset, whence ) -> Fixnum
+ *    conn.lo_lseek( lo_desc, offset, whence ) -> Integer
  *
  * Move the large object pointer _lo_desc_ to offset _offset_.
  * Valid values for _whence_ are +SEEK_SET+, +SEEK_CUR+, and +SEEK_END+.
@@ -3205,7 +3676,7 @@ pgconn_lolseek(VALUE self, VALUE in_lo_desc, VALUE offset, VALUE whence)
 
 /*
  * call-seq:
- *    conn.lo_tell( lo_desc ) -> Fixnum
+ *    conn.lo_tell( lo_desc ) -> Integer
  *
  * Returns the current position of the large object _lo_desc_.
  */
@@ -3269,10 +3740,7 @@ static VALUE
 pgconn_lounlink(VALUE self, VALUE in_oid)
 {
 	PGconn *conn = pg_get_pgconn(self);
-	int oid = NUM2INT(in_oid);
-
-	if (oid < 0)
-		rb_raise(rb_ePGerror, "invalid oid %d",oid);
+	Oid oid = NUM2UINT(in_oid);
 
 	if(lo_unlink(conn,oid) < 0)
 		rb_raise(rb_ePGerror,"lo_unlink failed");
@@ -3281,7 +3749,16 @@ pgconn_lounlink(VALUE self, VALUE in_oid)
 }
 
 
-#ifdef M17N_SUPPORTED
+static void
+pgconn_set_internal_encoding_index( VALUE self )
+{
+	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;
+}
 
 /*
  * call-seq:
@@ -3327,7 +3804,7 @@ pgconn_internal_encoding_set(VALUE self, VALUE enc)
 		pgconn_set_client_encoding( self, rb_usascii_str_new_cstr("SQL_ASCII") );
 		return enc;
 	}
-	else if ( TYPE(enc) == T_STRING && strcasecmp("JOHAB", RSTRING_PTR(enc)) == 0 ) {
+	else if ( TYPE(enc) == T_STRING && strcasecmp("JOHAB", StringValueCStr(enc)) == 0 ) {
 		pgconn_set_client_encoding(self, rb_usascii_str_new_cstr("JOHAB"));
 		return enc;
 	}
@@ -3335,17 +3812,14 @@ pgconn_internal_encoding_set(VALUE self, VALUE enc)
 		rb_encoding *rbenc = rb_to_encoding( enc );
 		const char *name = pg_get_rb_encoding_as_pg_encoding( rbenc );
 
-		if ( PQsetClientEncoding(pg_get_pgconn( self ), name) == -1 ) {
+		if ( gvl_PQsetClientEncoding(pg_get_pgconn( self ), name) == -1 ) {
 			VALUE server_encoding = pgconn_external_encoding( self );
 			rb_raise( rb_eEncCompatError, "incompatible character encodings: %s and %s",
 					  rb_enc_name(rb_to_encoding(server_encoding)), name );
 		}
+		pgconn_set_internal_encoding_index( self );
 		return enc;
 	}
-
-	rb_raise( rb_ePGerror, "unknown encoding: %s", RSTRING_PTR(rb_inspect(enc)) );
-
-	return Qnil;
 }
 
 
@@ -3360,24 +3834,45 @@ pgconn_internal_encoding_set(VALUE self, VALUE enc)
 static VALUE
 pgconn_external_encoding(VALUE self)
 {
-	PGconn *conn = pg_get_pgconn( self );
-	VALUE encoding = rb_iv_get( self, "@external_encoding" );
+	t_pg_connection *this = pg_get_connection_safe( self );
 	rb_encoding *enc = NULL;
 	const char *pg_encname = NULL;
 
-	/* Use cached value if found */
-	if ( RTEST(encoding) ) return encoding;
-
-	pg_encname = PQparameterStatus( conn, "server_encoding" );
+	pg_encname = PQparameterStatus( this->pgconn, "server_encoding" );
 	enc = pg_get_pg_encname_as_rb_encoding( pg_encname );
-	encoding = rb_enc_from_encoding( enc );
+	return rb_enc_from_encoding( enc );
+}
+
 
-	rb_iv_set( self, "@external_encoding", encoding );
+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);
 
-	return encoding;
+	pgconn_async_exec(1, &query, self);
+	return 0;
 }
 
 
+static VALUE
+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 )
+{
+	VALUE args[] = { self, rb_str_new_cstr(encname) };
+	return rb_rescue(pgconn_set_client_encoding_async1, (VALUE)&args, pgconn_set_client_encoding_async2, Qnil);
+}
+
 
 /*
  * call-seq:
@@ -3396,24 +3891,266 @@ pgconn_set_default_encoding( VALUE self )
 
 	if (( enc = rb_default_internal_encoding() )) {
 		encname = pg_get_rb_encoding_as_pg_encoding( enc );
-		if ( PQsetClientEncoding(conn, encname) != 0 )
-			rb_warn( "Failed to set the default_internal encoding to %s: '%s'",
+		if ( pgconn_set_client_encoding_async(self, 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 );
 		return Qnil;
 	}
 }
 
 
-#endif /* M17N_SUPPORTED */
+/*
+ * call-seq:
+ *    res.type_map_for_queries = typemap
+ *
+ * Set the default TypeMap that is used for type casts of query bind parameters.
+ *
+ * +typemap+ must be a kind of PG::TypeMap .
+ *
+ */
+static VALUE
+pgconn_type_map_for_queries_set(VALUE self, VALUE typemap)
+{
+	t_pg_connection *this = pg_get_connection( self );
+
+	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;
+
+	return typemap;
+}
+
+/*
+ * call-seq:
+ *    res.type_map_for_queries -> TypeMap
+ *
+ * Returns the default TypeMap that is currently set for type casts of query
+ * bind parameters.
+ *
+ */
+static VALUE
+pgconn_type_map_for_queries_get(VALUE self)
+{
+	t_pg_connection *this = pg_get_connection( self );
+
+	return this->type_map_for_queries;
+}
+
+/*
+ * call-seq:
+ *    res.type_map_for_results = typemap
+ *
+ * Set the default TypeMap that is used for type casts of result values.
+ *
+ * +typemap+ must be a kind of PG::TypeMap .
+ *
+ */
+static VALUE
+pgconn_type_map_for_results_set(VALUE self, VALUE typemap)
+{
+	t_pg_connection *this = pg_get_connection( self );
+
+	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;
+
+	return typemap;
+}
+
+/*
+ * call-seq:
+ *    res.type_map_for_results -> TypeMap
+ *
+ * Returns the default TypeMap that is currently set for type casts of result values.
+ *
+ */
+static VALUE
+pgconn_type_map_for_results_get(VALUE self)
+{
+	t_pg_connection *this = pg_get_connection( self );
+
+	return this->type_map_for_results;
+}
 
 
+/*
+ * call-seq:
+ *    res.encoder_for_put_copy_data = encoder
+ *
+ * Set the default coder that is used for type casting of parameters
+ * to #put_copy_data .
+ *
+ * +encoder+ can be:
+ * * a kind of PG::Coder
+ * * +nil+ - disable type encoding, data must be a String.
+ *
+ */
+static VALUE
+pgconn_encoder_for_put_copy_data_set(VALUE self, VALUE typemap)
+{
+	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);
+	}
+	this->encoder_for_put_copy_data = typemap;
+
+	return typemap;
+}
+
+/*
+ * call-seq:
+ *    res.encoder_for_put_copy_data -> PG::Coder
+ *
+ * Returns the default coder object that is currently set for type casting of parameters
+ * to #put_copy_data .
+ *
+ * Returns either:
+ * * a kind of PG::Coder
+ * * +nil+ - type encoding is disabled, data must be a String.
+ *
+ */
+static VALUE
+pgconn_encoder_for_put_copy_data_get(VALUE self)
+{
+	t_pg_connection *this = pg_get_connection( self );
+
+	return this->encoder_for_put_copy_data;
+}
+
+/*
+ * call-seq:
+ *    res.decoder_for_get_copy_data = decoder
+ *
+ * Set the default coder that is used for type casting of received data
+ * by #get_copy_data .
+ *
+ * +decoder+ can be:
+ * * a kind of PG::Coder
+ * * +nil+ - disable type decoding, returned data will be a String.
+ *
+ */
+static VALUE
+pgconn_decoder_for_get_copy_data_set(VALUE self, VALUE typemap)
+{
+	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);
+	}
+	this->decoder_for_get_copy_data = typemap;
+
+	return typemap;
+}
+
+/*
+ * call-seq:
+ *    res.decoder_for_get_copy_data -> PG::Coder
+ *
+ * Returns the default coder object that is currently set for type casting of received
+ * data by #get_copy_data .
+ *
+ * Returns either:
+ * * a kind of PG::Coder
+ * * +nil+ - type encoding is disabled, returned data will be a String.
+ *
+ */
+static VALUE
+pgconn_decoder_for_get_copy_data_get(VALUE self)
+{
+	t_pg_connection *this = pg_get_connection( 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 );
+
+	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()
 {
+	s_id_encode = rb_intern("encode");
+	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     ******/
@@ -3431,9 +4168,7 @@ 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
 
 	/******     PG::Connection INSTANCE METHODS: Connection Control     ******/
 	rb_define_method(rb_cPGconn, "initialize", pgconn_init, -1);
@@ -3443,7 +4178,6 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "reset", pgconn_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_method(rb_cPGconn, "conndefaults", pgconn_s_conndefaults, 0);
 	rb_define_alias(rb_cPGconn, "close", "finish");
 
 	/******     PG::Connection INSTANCE METHODS: Connection Status     ******/
@@ -3453,6 +4187,9 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "host", pgconn_host, 0);
 	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);
@@ -3461,39 +4198,47 @@ 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, "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_exec, -1);
+	rb_define_method(rb_cPGconn, "sync_exec_params", pgconn_exec_params, -1);
+	rb_define_method(rb_cPGconn, "sync_prepare", pgconn_prepare, -1);
+	rb_define_method(rb_cPGconn, "sync_exec_prepared", pgconn_exec_prepared, -1);
+	rb_define_method(rb_cPGconn, "sync_describe_prepared", pgconn_describe_prepared, 1);
+	rb_define_method(rb_cPGconn, "sync_describe_portal", pgconn_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);
@@ -3505,6 +4250,7 @@ init_pg_connection()
 	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, "discard_results", pgconn_discard_results, 0);
 
 	/******     PG::Connection INSTANCE METHODS: Cancelling Queries in Progress     ******/
 	rb_define_method(rb_cPGconn, "cancel", pgconn_cancel, 0);
@@ -3513,12 +4259,15 @@ init_pg_connection()
 	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_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);
 
 	/******     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);
 
@@ -3535,13 +4284,16 @@ init_pg_connection()
 	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);
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-	rb_define_alias(rb_cPGconn, "async_exec", "exec");
-#else
-	rb_define_method(rb_cPGconn, "async_exec", pgconn_async_exec, -1);
-#endif
-	rb_define_alias(rb_cPGconn, "async_query", "async_exec");
 	rb_define_method(rb_cPGconn, "get_last_result", pgconn_get_last_result, 0);
+#ifdef HAVE_PQENCRYPTPASSWORDCONN
+	rb_define_method(rb_cPGconn, "encrypt_password", pgconn_encrypt_password, -1);
+#endif
+
+#ifdef HAVE_PQSSLATTRIBUTE
+	rb_define_method(rb_cPGconn, "ssl_in_use?", pgconn_ssl_in_use, 0);
+	rb_define_method(rb_cPGconn, "ssl_attribute", pgconn_ssl_attribute, 1);
+	rb_define_method(rb_cPGconn, "ssl_attribute_names", pgconn_ssl_attribute_names, 0);
+#endif
 
 	/******     PG::Connection INSTANCE METHODS: Large Object Support     ******/
 	rb_define_method(rb_cPGconn, "lo_creat", pgconn_locreat, -1);
@@ -3571,12 +4323,20 @@ 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);
+	rb_define_method(rb_cPGconn, "type_map_for_results=", pgconn_type_map_for_results_set, 1);
+	rb_define_method(rb_cPGconn, "type_map_for_results", pgconn_type_map_for_results_get, 0);
+	rb_define_method(rb_cPGconn, "encoder_for_put_copy_data=", pgconn_encoder_for_put_copy_data_set, 1);
+	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 );
 }
-