pg 0.18.0 → 1.1.4

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v a7befacdef4e 2014/12/12 20:57:14 lars $
+ * $Id$
  *
  */
 
@@ -18,19 +18,8 @@ static PQnoticeReceiver default_notice_receiver = NULL;
 static PQnoticeProcessor default_notice_processor = NULL;
 
 static VALUE pgconn_finish( VALUE );
-#ifdef M17N_SUPPORTED
 static VALUE pgconn_set_default_encoding( VALUE self );
 void pgconn_set_internal_encoding_index( VALUE );
-#endif
-
-#ifndef HAVE_RB_THREAD_FD_SELECT
-#define rb_fdset_t fd_set
-#define rb_fd_init(f)
-#define rb_fd_zero(f)  FD_ZERO(f)
-#define rb_fd_set(n, f)  FD_SET(n, f)
-#define rb_fd_term(f)
-#define rb_thread_fd_select rb_thread_select
-#endif
 
 /*
  * Global functions
@@ -52,7 +41,7 @@ pg_get_connection( VALUE self )
  * Fetch the PG::Connection object data pointer and check it's
  * PGconn data pointer for sanity.
  */
-t_pg_connection *
+static t_pg_connection *
 pg_get_connection_safe( VALUE self )
 {
 	t_pg_connection *this;
@@ -88,16 +77,15 @@ pg_get_pgconn( VALUE self )
 /*
  * Close the associated socket IO object if there is one.
  */
-void
+static void
 pgconn_close_socket_io( VALUE self )
 {
 	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) ){
+#if defined(_WIN32)
+		if( rb_w32_unwrap_io_handle(this->ruby_sd) ){
 			rb_raise(rb_eConnectionBad, "Could not unwrap win32 socket handle");
 		}
 #endif
@@ -141,6 +129,16 @@ pgconn_make_conninfo_array( const PQconninfoOption *options )
 	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);
+	}
+}
+
 
 /*
  * GC Mark function
@@ -166,6 +164,10 @@ pgconn_gc_mark( t_pg_connection *this )
 static void
 pgconn_gc_free( t_pg_connection *this )
 {
+#if defined(_WIN32)
+	if ( RTEST(this->socket_io) )
+		rb_w32_unwrap_io_handle( this->ruby_sd );
+#endif
 	if (this->pgconn != NULL)
 		PQfinish( this->pgconn );
 
@@ -199,6 +201,7 @@ pgconn_s_allocate( VALUE klass )
 	this->decoder_for_get_copy_data = Qnil;
 	this->trace_stream = Qnil;
 	this->external_encoding = Qnil;
+	this->guess_result_memsize = 1;
 
 	return self;
 }
@@ -281,9 +284,7 @@ pgconn_init(int argc, VALUE *argv, VALUE 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);
@@ -339,12 +340,11 @@ 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.
  *
@@ -357,6 +357,8 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
  *   could not establish connection
  * [+PQPING_NO_ATTEMPT+]
  *   connection not attempted (bad params)
+ *
+ * Available since PostgreSQL-9.1
  */
 static VALUE
 pgconn_s_ping( int argc, VALUE *argv, VALUE klass )
@@ -369,11 +371,10 @@ pgconn_s_ping( int argc, VALUE *argv, VALUE klass )
 
 	return INT2FIX((int)ping);
 }
-#endif
 
 
 /*
- * Document-method: conndefaults
+ * Document-method: PG::Connection.conndefaults
  *
  * call-seq:
  *    PG::Connection.conndefaults() -> Array
@@ -408,16 +409,65 @@ pgconn_s_conndefaults(VALUE self)
 }
 
 
+#ifdef HAVE_PQENCRYPTPASSWORDCONN
 /*
  * call-seq:
- *    PG::Connection.encrypt_password( password, username ) -> String
+ *    conn.encrypt_password( password, username, algorithm=nil ) -> 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 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
+ */
+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 );
+
+		OBJ_INFECT( rval, password );
+		OBJ_INFECT( rval, username );
+		OBJ_INFECT( rval, algorithm );
+	} else {
+		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
+	}
+
+	return rval;
+}
+#endif
+
+
+/*
+ * call-seq:
+ *    PG::Connection.encrypt_password( password, username ) -> String
+ *
+ * This is an older, deprecated version of #encrypt_password.
+ * The difference is that this function always uses +md5+ as the encryption algorithm.
+ *
  */
 static VALUE
 pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
@@ -447,7 +497,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+]
@@ -556,7 +606,7 @@ pgconn_reset_start(VALUE self)
 
 /*
  * 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
@@ -603,7 +653,7 @@ pgconn_user(VALUE self)
  * call-seq:
  *    conn.pass()
  *
- * Returns the authenticated user name.
+ * Returns the authenticated password.
  */
 static VALUE
 pgconn_pass(VALUE self)
@@ -627,22 +677,6 @@ pgconn_host(VALUE self)
 	return rb_tainted_str_new2(host);
 }
 
-#ifdef HAVE_PQHOSTADDR
-/*
- * call-seq:
- *    conn.hostaddr()
- *
- * Returns the server numeric IP address of the connection.
- */
-static VALUE
-pgconn_hostaddr(VALUE self)
-{
-	char *hostaddr = PQhostaddr(pg_get_pgconn(self));
-	if (!hostaddr) return Qnil;
-	return rb_tainted_str_new2(hostaddr);
-}
-#endif
-
 /*
  * call-seq:
  *    conn.port()
@@ -692,6 +726,7 @@ pgconn_options(VALUE self)
  *
  * Returns the connection options used by a live connection.
  *
+ * Available since PostgreSQL-9.3
  */
 static VALUE
 pgconn_conninfo( VALUE self )
@@ -811,7 +846,9 @@ pgconn_error_message(VALUE self)
 
 /*
  * 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.
@@ -821,7 +858,7 @@ 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
@@ -833,22 +870,17 @@ pgconn_socket(VALUE self)
 	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)
@@ -865,16 +897,15 @@ pgconn_socket_io(VALUE self)
 
 		#ifdef _WIN32
 			ruby_sd = rb_w32_wrap_io_handle((HANDLE)(intptr_t)sd, O_RDWR|O_BINARY|O_NOINHERIT);
+			this->ruby_sd = ruby_sd;
 		#else
 			ruby_sd = sd;
 		#endif
 
 		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 );
 
 		this->socket_io = socket_io;
 	}
@@ -882,11 +913,9 @@ pgconn_socket_io(VALUE self)
 	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.
@@ -936,7 +965,7 @@ static VALUE pgconn_exec_params( int, VALUE *, VALUE );
  *    conn.exec(sql) {|pg_result| block }
  *
  * Sends SQL query request specified by _sql_ to PostgreSQL.
- * Returns a PG::Result instance on success.
+ * On success, it returns a PG::Result instance with all result rows and columns.
  * On failure, it raises a PG::Error.
  *
  * For backward compatibility, if you pass more than one parameter to this method,
@@ -947,9 +976,9 @@ static VALUE pgconn_exec_params( int, VALUE *, VALUE );
  * and the PG::Result object will  automatically be cleared when the block terminates.
  * In this instance, <code>conn.exec</code> returns the value of the block.
  *
- * #exec is implemented on the synchronous command processing API of libpq, whereas
+ * #sync_exec is implemented on the synchronous command processing API of libpq, whereas
  * #async_exec is implemented on the asynchronous API.
- * #exec is somewhat faster that #async_exec, but blocks any signals to be processed until
+ * #sync_exec is somewhat faster that #async_exec, but blocks any signals to be processed until
  * the query is finished. This is most notably visible by a delayed reaction to Control+C.
  * Both methods ensure that other threads can process while waiting for the server to
  * complete the request.
@@ -961,11 +990,11 @@ pgconn_exec(int argc, VALUE *argv, VALUE 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, StringValueCStr(argv[0]));
+		result = gvl_PQexec(conn, pg_cstr_enc(query_str, ENCODING_GET(self)));
 		rb_pgresult = pg_new_result(result, self);
 		pg_result_check(rb_pgresult);
 		if (rb_block_given_p()) {
@@ -973,11 +1002,10 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 		}
 		return rb_pgresult;
 	}
+	pg_deprecated(0, ("forwarding exec to exec_params is deprecated"));
 
 	/* Otherwise, just call #exec_params instead for backward-compatibility */
-	else {
-		return pgconn_exec_params( argc, argv, self );
-	}
+	return pgconn_exec_params( argc, argv, self );
 
 }
 
@@ -994,6 +1022,10 @@ struct query_params_data {
 	 * Filled by caller
 	 */
 
+	/* 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 */
@@ -1154,7 +1186,7 @@ alloc_query_params(struct query_params_data *paramsData)
 				VALUE intermediate;
 
 				/* 1st pass for retiving the required memory space */
-				int len = enc_func(conv, param_value, NULL, &intermediate);
+				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. */
@@ -1178,7 +1210,7 @@ alloc_query_params(struct query_params_data *paramsData)
 					}
 
 					/* 2nd pass for writing the data to prepared buffer */
-					len = enc_func(conv, param_value, typecast_buf, &intermediate);
+					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 */
@@ -1236,8 +1268,8 @@ pgconn_query_assign_typemap( VALUE self, struct query_params_data *paramsData )
  * 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 }
@@ -1256,7 +1288,7 @@ pgconn_query_assign_typemap( VALUE self, struct query_params_data *paramsData )
  * for binary.
  *
  * type_map can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
- * This will type cast the params form various Ruby types before transmission
+ * 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.
@@ -1274,16 +1306,18 @@ pgconn_exec_params( int argc, VALUE *argv, VALUE self )
 	VALUE command, in_res_fmt;
 	int nParams;
 	int resultFormat;
-	struct query_params_data paramsData;
+	struct query_params_data paramsData = { ENCODING_GET(self) };
 
+	/* For compatibility we accept 1 to 4 parameters */
 	rb_scan_args(argc, argv, "13", &command, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 1;
 
 	/*
-	 * Handle the edge-case where the caller is coming from #exec, but passed an explict +nil+
-	 * for the second parameter.
+	 * For backward compatibility no or +nil+ for the second parameter
+	 * is passed to #exec
 	 */
 	if ( NIL_P(paramsData.params) ) {
+		pg_deprecated(1, ("forwarding exec_params to exec is deprecated"));
 		return pgconn_exec( 1, argv, self );
 	}
 	pgconn_query_assign_typemap( self, &paramsData );
@@ -1291,7 +1325,7 @@ pgconn_exec_params( int argc, VALUE *argv, VALUE self )
 	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
 	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQexecParams(conn, StringValueCStr(command), nParams, paramsData.types,
+	result = gvl_PQexecParams(conn, pg_cstr_enc(command, paramsData.enc_idx), nParams, paramsData.types,
 		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats, resultFormat);
 
 	free_query_params( &paramsData );
@@ -1337,10 +1371,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 = ENCODING_GET(self);
 
 	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);
@@ -1354,8 +1391,7 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 				paramTypes[i] = NUM2UINT(param);
 		}
 	}
-	result = gvl_PQprepare(conn, StringValueCStr(name), StringValueCStr(command),
-			nParams, paramTypes);
+	result = gvl_PQprepare(conn, name_cstr, command_cstr, nParams, paramTypes);
 
 	xfree(paramTypes);
 
@@ -1377,7 +1413,7 @@ pgconn_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 }
@@ -1390,7 +1426,7 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
  * for binary.
  *
  * type_map can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
- * This will type cast the params form various Ruby types before transmission
+ * 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.
@@ -1408,11 +1444,10 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 	VALUE name, in_res_fmt;
 	int nParams;
 	int resultFormat;
-	struct query_params_data paramsData;
+	struct query_params_data paramsData = { ENCODING_GET(self) };
 
 	rb_scan_args(argc, argv, "13", &name, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 0;
-	Check_Type(name, T_STRING);
 
 	if(NIL_P(paramsData.params)) {
 		paramsData.params = rb_ary_new2(0);
@@ -1422,7 +1457,7 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
 	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQexecPrepared(conn, StringValueCStr(name), nParams,
+	result = gvl_PQexecPrepared(conn, pg_cstr_enc(name, paramsData.enc_idx), nParams,
 		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats,
 		resultFormat);
 
@@ -1450,13 +1485,12 @@ 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) {
+	const char *stmt;
+	if(NIL_P(stmt_name)) {
 		stmt = NULL;
 	}
 	else {
-		Check_Type(stmt_name, T_STRING);
-		stmt = StringValueCStr(stmt_name);
+		stmt = pg_cstr_enc(stmt_name, ENCODING_GET(self));
 	}
 	result = gvl_PQdescribePrepared(conn, stmt);
 	rb_pgresult = pg_new_result(result, self);
@@ -1478,13 +1512,12 @@ pgconn_describe_portal(self, stmt_name)
 	PGresult *result;
 	VALUE rb_pgresult;
 	PGconn *conn = pg_get_pgconn(self);
-	char *stmt;
-	if(stmt_name == Qnil) {
+	const char *stmt;
+	if(NIL_P(stmt_name)) {
 		stmt = NULL;
 	}
 	else {
-		Check_Type(stmt_name, T_STRING);
-		stmt = StringValueCStr(stmt_name);
+		stmt = pg_cstr_enc(stmt_name, ENCODING_GET(self));
 	}
 	result = gvl_PQdescribePortal(conn, stmt);
 	rb_pgresult = pg_new_result(result, self);
@@ -1526,10 +1559,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.
@@ -1538,32 +1567,41 @@ pgconn_make_empty_pgresult(VALUE self, VALUE status)
  * inside of SQL commands.
  *
  * 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.
  */
 static VALUE
 pgconn_s_escape(VALUE self, VALUE string)
 {
-	char *escaped;
 	size_t size;
 	int error;
 	VALUE result;
+	int enc_idx;
+	int singleton = !rb_obj_is_kind_of(self, rb_cPGconn);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
+	enc_idx = ENCODING_GET( singleton ? string : self );
+	if( ENCODING_GET(string) != enc_idx ){
+		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
+	}
 
-	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), RSTRING_LENINT(string));
+		size = PQescapeString(RSTRING_PTR(result), RSTRING_PTR(string), RSTRING_LEN(string));
 	}
-	result = rb_str_new(escaped, size);
-	xfree(escaped);
+	rb_str_set_len(result, size);
 	OBJ_INFECT(result, string);
-	PG_ENCODING_SET_NOCHECK(result, ENCODING_GET( rb_obj_class(self) == rb_cPGconn ? self : string ));
 
 	return result;
 }
@@ -1572,13 +1610,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)
@@ -1591,6 +1622,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)
@@ -1603,7 +1640,7 @@ 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);
@@ -1645,12 +1682,13 @@ pgconn_s_unescape_bytea(VALUE self, VALUE str)
 	return ret;
 }
 
-#ifdef HAVE_PQESCAPELITERAL
 /*
  * call-seq:
  *    conn.escape_literal( str ) -> String
  *
  * Escape an arbitrary String +str+ as a literal.
+ *
+ * Available since PostgreSQL-9.0
  */
 static VALUE
 pgconn_escape_literal(VALUE self, VALUE string)
@@ -1659,8 +1697,12 @@ pgconn_escape_literal(VALUE self, VALUE string)
 	char *escaped = NULL;
 	VALUE error;
 	VALUE result = Qnil;
+	int enc_idx = ENCODING_GET(self);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
+	if( ENCODING_GET(string) != enc_idx ){
+		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
+	}
 
 	escaped = PQescapeLiteral(conn, RSTRING_PTR(string), RSTRING_LEN(string));
 	if (escaped == NULL)
@@ -1673,21 +1715,22 @@ pgconn_escape_literal(VALUE self, VALUE string)
 	result = rb_str_new2(escaped);
 	PQfreemem(escaped);
 	OBJ_INFECT(result, string);
-	PG_ENCODING_SET_NOCHECK(result, ENCODING_GET(self));
+	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, but uses libpq to
- * process the string.
+ * 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.
+ *
+ * Available since PostgreSQL-9.0
  */
 static VALUE
 pgconn_escape_identifier(VALUE self, VALUE string)
@@ -1696,8 +1739,12 @@ pgconn_escape_identifier(VALUE self, VALUE string)
 	char *escaped = NULL;
 	VALUE error;
 	VALUE result = Qnil;
+	int enc_idx = ENCODING_GET(self);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
+	if( ENCODING_GET(string) != enc_idx ){
+		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
+	}
 
 	escaped = PQescapeIdentifier(conn, RSTRING_PTR(string), RSTRING_LEN(string));
 	if (escaped == NULL)
@@ -1710,13 +1757,11 @@ pgconn_escape_identifier(VALUE self, VALUE string)
 	result = rb_str_new2(escaped);
 	PQfreemem(escaped);
 	OBJ_INFECT(result, string);
-	PG_ENCODING_SET_NOCHECK(result, ENCODING_GET(self));
+	PG_ENCODING_SET_NOCHECK(result, enc_idx);
 
 	return result;
 }
-#endif
 
-#ifdef HAVE_PQSETSINGLEROWMODE
 /*
  * call-seq:
  *    conn.set_single_row_mode -> self
@@ -1753,6 +1798,7 @@ pgconn_escape_identifier(VALUE self, VALUE string)
  *     end
  *   end
  *
+ * Available since PostgreSQL-9.2
  */
 static VALUE
 pgconn_set_single_row_mode(VALUE self)
@@ -1769,22 +1815,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)
+{
+	PGconn *conn = pg_get_pgconn(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(conn, pg_cstr_enc(argv[0], ENCODING_GET(self))) == 0) {
+			error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
+			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[, type_map ]] ) -> nil
+ *    conn.send_query_params(sql, params [, result_format [, type_map ]] ) -> nil
  *
  * Sends SQL query request specified by _sql_ to PostgreSQL for
  * asynchronous processing, and immediately returns.
  * On failure, it raises a PG::Error.
  *
- * +params+ is an optional array of the bind parameters for the SQL query.
+ * +params+ is an array of the bind parameters for the SQL query.
  * Each element of the +params+ array may be either:
  *   a hash of the form:
  *     {:value  => String (value of bind parameter)
- *      :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 }
@@ -1803,14 +1887,14 @@ pgconn_set_single_row_mode(VALUE self)
  * for binary.
  *
  * type_map can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
- * This will type cast the params form various Ruby types before transmission
+ * 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);
 	int result;
@@ -1818,31 +1902,16 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 	VALUE error;
 	int nParams;
 	int resultFormat;
-	struct query_params_data paramsData;
+	struct query_params_data paramsData = { ENCODING_GET(self) };
 
-	rb_scan_args(argc, argv, "13", &command, &paramsData.params, &in_res_fmt, &paramsData.typemap);
+	rb_scan_args(argc, argv, "22", &command, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 1;
-	Check_Type(command, T_STRING);
-
-	/* If called with no parameters, use PQsendQuery */
-	if(NIL_P(paramsData.params)) {
-		if(gvl_PQsendQuery(conn,StringValueCStr(command)) == 0) {
-			error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
-			rb_iv_set(error, "@connection", self);
-			rb_exc_raise(error);
-		}
-		return Qnil;
-	}
-
-	/* If called with parameters, and optionally result_format,
-	 * use PQsendQueryParams
-	 */
 
 	pgconn_query_assign_typemap( self, &paramsData );
 	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
 	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQsendQueryParams(conn, StringValueCStr(command), nParams, paramsData.types,
+	result = gvl_PQsendQueryParams(conn, pg_cstr_enc(command, paramsData.enc_idx), nParams, paramsData.types,
 		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats, resultFormat);
 
 	free_query_params( &paramsData );
@@ -1886,10 +1955,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 = ENCODING_GET(self);
 
 	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);
@@ -1903,8 +1975,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 				paramTypes[i] = NUM2UINT(param);
 		}
 	}
-	result = gvl_PQsendPrepare(conn, StringValueCStr(name), StringValueCStr(command),
-			nParams, paramTypes);
+	result = gvl_PQsendPrepare(conn, name_cstr, command_cstr, nParams, paramTypes);
 
 	xfree(paramTypes);
 
@@ -1929,7 +2000,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 }
@@ -1942,7 +2013,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
  * for binary.
  *
  * type_map can be a PG::TypeMap derivation (such as PG::BasicTypeMapForQueries).
- * This will type cast the params form various Ruby types before transmission
+ * 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.
@@ -1957,11 +2028,10 @@ pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 	VALUE error;
 	int nParams;
 	int resultFormat;
-	struct query_params_data paramsData;
+	struct query_params_data paramsData = { ENCODING_GET(self) };
 
 	rb_scan_args(argc, argv, "13", &name, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 0;
-	Check_Type(name, T_STRING);
 
 	if(NIL_P(paramsData.params)) {
 		paramsData.params = rb_ary_new2(0);
@@ -1972,7 +2042,7 @@ pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 	resultFormat = NIL_P(in_res_fmt) ? 0 : NUM2INT(in_res_fmt);
 	nParams = alloc_query_params( &paramsData );
 
-	result = gvl_PQsendQueryPrepared(conn, StringValueCStr(name), nParams,
+	result = gvl_PQsendQueryPrepared(conn, pg_cstr_enc(name, paramsData.enc_idx), nParams,
 		(const char * const *)paramsData.values, paramsData.lengths, paramsData.formats,
 		resultFormat);
 
@@ -1999,7 +2069,7 @@ pgconn_send_describe_prepared(VALUE self, VALUE stmt_name)
 	VALUE error;
 	PGconn *conn = pg_get_pgconn(self);
 	/* returns 0 on failure */
-	if(gvl_PQsendDescribePrepared(conn,StringValueCStr(stmt_name)) == 0) {
+	if(gvl_PQsendDescribePrepared(conn, pg_cstr_enc(stmt_name, ENCODING_GET(self))) == 0) {
 		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
@@ -2021,7 +2091,7 @@ pgconn_send_describe_portal(VALUE self, VALUE portal)
 	VALUE error;
 	PGconn *conn = pg_get_pgconn(self);
 	/* returns 0 on failure */
-	if(gvl_PQsendDescribePortal(conn,StringValueCStr(portal)) == 0) {
+	if(gvl_PQsendDescribePortal(conn, pg_cstr_enc(portal, ENCODING_GET(self))) == 0) {
 		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
@@ -2193,7 +2263,6 @@ pgconn_flush(self)
 static VALUE
 pgconn_cancel(VALUE self)
 {
-#ifdef HAVE_PQGETCANCEL
 	char errbuf[256];
 	PGcancel *cancel;
 	VALUE retval;
@@ -2211,9 +2280,6 @@ pgconn_cancel(VALUE self)
 
 	PQfreeCancel(cancel);
 	return retval;
-#else
-	rb_notimplement();
-#endif
 }
 
 
@@ -2257,56 +2323,15 @@ pgconn_notifies(VALUE self)
 	return hash;
 }
 
-/* Win32 + Ruby 1.8 */
-#if !defined( HAVE_RUBY_VM_H ) && 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 )
+#if defined( _WIN32 )
 /*
  * On Windows, use platform-specific strategies to wait for the socket
- * instead of rb_thread_select().
+ * 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 *) )
 {
@@ -2383,7 +2408,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 *))
@@ -2391,11 +2416,7 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 	int sd = PQsocket( conn );
 	int ret;
 	void *retval;
-	rb_fdset_t sd_rset;
 	struct timeval aborttime={0,0}, currtime, waittime;
-#ifdef _WIN32
-	rb_fdset_t crt_sd_rset;
-#endif
 
 	if ( sd < 0 )
 		rb_raise(rb_eConnectionBad, "PQsocket() can't get socket descriptor");
@@ -2404,25 +2425,12 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 	if ( PQconsumeInput(conn) == 0 )
 		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
-
 		if ( ptimeout ) {
 			gettimeofday(&currtime, NULL);
 			timersub(&aborttime, &currtime, &waittime);
@@ -2431,35 +2439,26 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 		/* Is the given timeout valid? */
 		if( !ptimeout || (waittime.tv_sec >= 0 && waittime.tv_usec >= 0) ){
 			/* Wait for the socket to become readable before checking again */
-			ret = rb_thread_fd_select( sd+1, &sd_rset, NULL, NULL, ptimeout ? &waittime : NULL );
+			ret = rb_wait_for_single_fd( sd, RB_WAITFD_IN, ptimeout ? &waittime : NULL );
 		} else {
 			ret = 0;
 		}
 
-
-#ifdef _WIN32
-		cleanup_crt_fd(&sd_rset, &crt_sd_rset);
-#endif
-
 		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_eConnectionBad, "PQconsumeInput() %s", PQerrorMessage(conn) );
 		}
 	}
 
-	rb_fd_term( &sd_rset );
 	return retval;
 }
 
@@ -2474,22 +2473,15 @@ notify_readable(PGconn *conn)
 
 /*
  * call-seq:
- *    conn.wait_for_notify( [ timeout ] ) -> String
- *    conn.wait_for_notify( [ timeout ] ) { |event, pid| block }
- *    conn.wait_for_notify( [ timeout ] ) { |event, pid, payload| block } # PostgreSQL 9.0
+ *    conn.wait_for_notify( [ timeout ] ) { |event, pid, payload| block } -> String
  *
  * Blocks while waiting for notification(s), or until the optional
  * _timeout_ is reached, whichever comes first.  _timeout_ is
  * measured in seconds and can be fractional.
  *
- * Returns +nil+ if _timeout_ is reached, the name of the NOTIFY
- * event otherwise.  If used in block form, passes the name of the
- * NOTIFY +event+ and the generating +pid+ into the block.
- *
- * Under PostgreSQL 9.0 and later, if the notification is sent with
- * the optional +payload+ string, it will be given to the block as the
- * third argument.
- *
+ * Returns +nil+ if _timeout_ is reached, the name of the NOTIFY event otherwise.
+ * If used in block form, passes the name of the NOTIFY +event+, the generating
+ * +pid+ and the optional +payload+ string into the block.
  */
 static VALUE
 pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
@@ -2518,12 +2510,10 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 	relname = rb_tainted_str_new2( pnotification->relname );
 	PG_ENCODING_SET_NOCHECK( relname, ENCODING_GET(self) );
 	be_pid = INT2NUM( pnotification->be_pid );
-#ifdef HAVE_ST_NOTIFY_EXTRA
 	if ( *pnotification->extra ) {
 		extra = rb_tainted_str_new2( pnotification->extra );
 		PG_ENCODING_SET_NOCHECK( extra, ENCODING_GET(self) );
 	}
-#endif
 	PQfreemem( pnotification );
 
 	if ( rb_block_given_p() )
@@ -2542,9 +2532,10 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
  * not sent (false is only possible if the connection
  * is in nonblocking mode, and this command would block).
  *
- * encoder can be a PG::Coder derivation (typically PG::TextEncoder::CopyRow).
- * This encodes the received data fields from an Array of Strings. Optionally
- * the encoder can type cast the fields form various Ruby types in one step,
+ * _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.
@@ -2581,16 +2572,17 @@ pgconn_put_copy_data(int argc, VALUE *argv, VALUE self)
 
 	if( p_coder ){
 		t_pg_coder_enc_func enc_func;
+		int enc_idx = ENCODING_GET(self);
 
 		enc_func = pg_coder_enc_func( p_coder );
-		len = enc_func( p_coder, value, NULL, &intermediate );
+		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);
+			len = enc_func( p_coder, value, RSTRING_PTR(buffer), &intermediate, enc_idx);
 			rb_str_set_len( buffer, len );
 		}
 	}
@@ -2629,13 +2621,13 @@ pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
 	VALUE str;
 	VALUE error;
 	int ret;
-	char *error_message = NULL;
+	const char *error_message = NULL;
 	PGconn *conn = pg_get_pgconn(self);
 
 	if (rb_scan_args(argc, argv, "01", &str) == 0)
 		error_message = NULL;
 	else
-		error_message = StringValueCStr(str);
+		error_message = pg_cstr_enc(str, ENCODING_GET(self));
 
 	ret = gvl_PQputCopyEnd(conn, error_message);
 	if(ret == -1) {
@@ -2648,15 +2640,18 @@ pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.get_copy_data( [ async = false [, decoder = nil ]] ) -> 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).
  *
- * decoder can be a PG::Coder derivation (typically PG::TextDecoder::CopyRow).
- * This decodes the received data fields as Array of Strings. Optionally
- * the decoder can type cast the fields to various Ruby types in one step,
+ * If _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.
@@ -2713,7 +2708,7 @@ pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
 
 /*
  * 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:
@@ -2956,12 +2951,10 @@ pgconn_set_client_encoding(VALUE self, VALUE str)
 
 	Check_Type(str, T_STRING);
 
-	if ( (PQsetClientEncoding(conn, StringValueCStr(str))) == -1 ) {
-		rb_raise(rb_ePGerror, "invalid encoding name: %s",StringValueCStr(str));
+	if ( (gvl_PQsetClientEncoding(conn, StringValueCStr(str))) == -1 ) {
+		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
 	}
-#ifdef M17N_SUPPORTED
 	pgconn_set_internal_encoding_index( self );
-#endif
 
 	return Qnil;
 }
@@ -3012,8 +3005,10 @@ pgconn_transaction(VALUE self)
 
 /*
  * 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
@@ -3023,40 +3018,41 @@ 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;
-	unsigned int str_len = RSTRING_LENINT(in_str);
-
-	if(str_len >= NAMEDATALEN) {
-		rb_raise(rb_eArgError,
-			"Input string is longer than NAMEDATALEN-1 (%d)",
-			NAMEDATALEN-1);
-	}
-	buffer[j++] = '"';
-	for(i = 0; i < str_len && str[i]; i++) {
-		if(str[i] == '"')
-			buffer[j++] = '"';
-		buffer[j++] = str[i];
-	}
-	buffer[j++] = '"';
-	ret = rb_str_new(buffer,j);
-	OBJ_INFECT(ret, in_str);
-	PG_ENCODING_SET_NOCHECK(ret, ENCODING_GET( rb_obj_class(self) == rb_cPGconn ? self : in_str ));
+	int enc_idx;
+
+	if( rb_obj_is_kind_of(self, rb_cPGconn) ){
+		enc_idx = ENCODING_GET( self );
+	}else{
+		enc_idx = RB_TYPE_P(str_or_array, T_STRING) ? ENCODING_GET( str_or_array ) : rb_ascii8bit_encindex();
+	}
+	pg_text_enc_identifier(NULL, str_or_array, NULL, &ret, enc_idx);
+
+	OBJ_INFECT(ret, str_or_array);
 
 	return ret;
 }
@@ -3086,10 +3082,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;
@@ -3156,24 +3148,186 @@ pgconn_get_last_result(VALUE self)
 
 /*
  * call-seq:
- *    conn.async_exec(sql [, params, result_format ] ) -> PG::Result
- *    conn.async_exec(sql [, params, result_format ] ) {|pg_result| block }
+ *    conn.discard_results()
+ *
+ * Silently discard any prior query result that application didn't eat.
+ * This is 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) -> PG::Result
+ *    conn.async_exec(sql) {|pg_result| block }
  *
- * This function has the same behavior as #exec,
+ * This function has the same behavior as #sync_exec,
  * but is implemented using the asynchronous command
  * processing API of libpq.
+ *
+ * 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:
+ *
+ * 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 thing like garbage collection, while queries are running like in this proposal: https://bugs.ruby-lang.org/issues/14723
  */
 static VALUE
 pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 {
 	VALUE rb_pgresult = Qnil;
 
-	/* remove any remaining results from the queue */
+	pgconn_discard_results( self );
+	pgconn_send_query( argc, argv, self );
 	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
-	pgconn_get_last_result( self );
+	rb_pgresult = pgconn_get_last_result( self );
 
-	pgconn_send_query( argc, argv, self );
-	pgconn_block( 0, NULL, self );
+	if ( rb_block_given_p() ) {
+		return rb_ensure( rb_yield, rb_pgresult, pg_result_clear, rb_pgresult );
+	}
+	return rb_pgresult;
+}
+
+
+/*
+ * call-seq:
+ *    conn.async_exec_params(sql, params [, result_format [, type_map ]] ) -> nil
+ *    conn.async_exec_params(sql, params [, result_format [, type_map ]] ) {|pg_result| block }
+ *
+ * This function has the same behavior as #sync_exec_params, but is implemented using the asynchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ */
+static VALUE
+pgconn_async_exec_params(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pgresult = Qnil;
+
+	pgconn_discard_results( self );
+	/* If called with no or nil parameters, use PQsendQuery for compatibility */
+	if ( argc == 1 || (argc >= 2 && argc <= 4 && NIL_P(argv[1]) )) {
+		pg_deprecated(3, ("forwarding async_exec_params to async_exec is deprecated"));
+		pgconn_send_query( argc, argv, self );
+	} else {
+		pgconn_send_query_params( argc, argv, self );
+	}
+	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.async_prepare(stmt_name, sql [, param_types ] ) -> PG::Result
+ *
+ * This function has the same behavior as #sync_prepare, but is implemented using the asynchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ */
+static VALUE
+pgconn_async_prepare(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pgresult = Qnil;
+
+	pgconn_discard_results( self );
+	pgconn_send_prepare( argc, argv, self );
+	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.async_exec_prepared(statement_name [, params, result_format[, type_map]] ) -> PG::Result
+ *    conn.async_exec_prepared(statement_name [, params, result_format[, type_map]] ) {|pg_result| block }
+ *
+ * This function has the same behavior as #sync_exec_prepared, but is implemented using the asynchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ */
+static VALUE
+pgconn_async_exec_prepared(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_pgresult = Qnil;
+
+	pgconn_discard_results( self );
+	pgconn_send_query_prepared( argc, argv, self );
+	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.async_describe_portal( portal_name ) -> PG::Result
+ *
+ * This function has the same behavior as #sync_describe_portal, but is implemented using the asynchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ */
+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.async_describe_prepared( statement_name ) -> PG::Result
+ *
+ * This function has the same behavior as #sync_describe_prepared, but is implemented using the asynchronous command processing API of libpq.
+ * See #async_exec for the differences between the two API variants.
+ */
+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() ) {
@@ -3182,13 +3336,93 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 	return rb_pgresult;
 }
 
+
+#ifdef HAVE_PQSSLATTRIBUTE
+/*
+ * call-seq:
+ *    conn.ssl_in_use? -> Boolean
+ *
+ * Returns +true+ if the connection uses SSL, +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 http://www.postgresql.org/docs/current/interactive/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] ) -> Fixnum
+ *    conn.lo_creat( [mode] ) -> Integer
  *
  * Creates a large object with mode _mode_. Returns a large object Oid.
  * On failure, it raises PG::Error.
@@ -3215,7 +3449,7 @@ pgconn_locreat(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.lo_create( oid ) -> Fixnum
+ *    conn.lo_create( oid ) -> Integer
  *
  * Creates a large object with oid _oid_. Returns the large object Oid.
  * On failure, it raises PG::Error.
@@ -3236,7 +3470,7 @@ pgconn_locreate(VALUE self, VALUE in_lo_oid)
 
 /*
  * call-seq:
- *    conn.lo_import(file) -> Fixnum
+ *    conn.lo_import(file) -> Integer
  *
  * Import a file to a large object. Returns a large object Oid.
  *
@@ -3281,7 +3515,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
@@ -3312,7 +3546,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.
@@ -3379,7 +3613,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+.
@@ -3401,7 +3635,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_.
  */
@@ -3474,8 +3708,6 @@ pgconn_lounlink(VALUE self, VALUE in_oid)
 }
 
 
-#ifdef M17N_SUPPORTED
-
 void
 pgconn_set_internal_encoding_index( VALUE self )
 {
@@ -3537,7 +3769,7 @@ 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 );
@@ -3579,6 +3811,34 @@ pgconn_external_encoding(VALUE self)
 }
 
 
+static VALUE
+pgconn_set_client_encoding_async1( VALUE args )
+{
+	VALUE self = ((VALUE*)args)[0];
+	VALUE encname = ((VALUE*)args)[1];
+	VALUE query_format = rb_str_new_cstr("set client_encoding to '%s'");
+	VALUE query = rb_funcall(query_format, rb_intern("%"), 1, encname);
+
+	pgconn_async_exec(1, &query, self);
+	return 0;
+}
+
+
+static VALUE
+pgconn_set_client_encoding_async2( VALUE arg )
+{
+	UNUSED(arg);
+	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:
@@ -3597,8 +3857,8 @@ 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 );
@@ -3609,8 +3869,6 @@ pgconn_set_default_encoding( VALUE self )
 }
 
 
-#endif /* M17N_SUPPORTED */
-
 /*
  * call-seq:
  *    res.type_map_for_queries = typemap
@@ -3729,7 +3987,7 @@ pgconn_encoder_for_put_copy_data_set(VALUE self, VALUE typemap)
  *
  * Returns either:
  * * a kind of PG::Coder
- * * +nil+ - type encoding is disabled, returned data will be a String.
+ * * +nil+ - type encoding is disabled, data must be a String.
  *
  */
 static VALUE
@@ -3789,7 +4047,24 @@ pgconn_decoder_for_get_copy_data_get(VALUE self)
 	return this->decoder_for_get_copy_data;
 }
 
+/*
+ * call-seq:
+ *    res.guess_result_memsize = enabled
+ *
+ * This method is for testing only and will probably be removed in the future.
+ */
+static VALUE
+pgconn_guess_result_memsize_set(VALUE self, VALUE enable)
+{
+	t_pg_connection *this = pg_get_connection( self );
+	this->guess_result_memsize = RTEST(enable);
+	return enable;
+}
 
+
+/*
+ * Document-class: PG::Connection
+ */
 void
 init_pg_connection()
 {
@@ -3816,9 +4091,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);
@@ -3835,9 +4108,6 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "user", pgconn_user, 0);
 	rb_define_method(rb_cPGconn, "pass", pgconn_pass, 0);
 	rb_define_method(rb_cPGconn, "host", pgconn_host, 0);
-#ifdef HAVE_PQHOSTADDR
-	rb_define_method(rb_cPGconn, "hostaddr", pgconn_hostaddr, 0);
-#endif
 	rb_define_method(rb_cPGconn, "port", pgconn_port, 0);
 	rb_define_method(rb_cPGconn, "tty", pgconn_tty, 0);
 #ifdef HAVE_PQCONNINFO
@@ -3851,43 +4121,42 @@ 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, "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, "async_exec", pgconn_async_exec, -1);
+	rb_define_method(rb_cPGconn, "async_exec_params", pgconn_async_exec_params, -1);
+	rb_define_alias(rb_cPGconn, "async_query", "async_exec");
 	rb_define_method(rb_cPGconn, "send_prepare", pgconn_send_prepare, -1);
+	rb_define_method(rb_cPGconn, "async_prepare", pgconn_async_prepare, -1);
 	rb_define_method(rb_cPGconn, "send_query_prepared", pgconn_send_query_prepared, -1);
+	rb_define_method(rb_cPGconn, "async_exec_prepared", pgconn_async_exec_prepared, -1);
 	rb_define_method(rb_cPGconn, "send_describe_prepared", pgconn_send_describe_prepared, 1);
+	rb_define_method(rb_cPGconn, "async_describe_prepared", pgconn_async_describe_prepared, 1);
 	rb_define_method(rb_cPGconn, "send_describe_portal", pgconn_send_describe_portal, 1);
+	rb_define_method(rb_cPGconn, "async_describe_portal", pgconn_async_describe_portal, 1);
 	rb_define_method(rb_cPGconn, "get_result", pgconn_get_result, 0);
 	rb_define_method(rb_cPGconn, "consume_input", pgconn_consume_input, 0);
 	rb_define_method(rb_cPGconn, "is_busy", pgconn_is_busy, 0);
@@ -3895,6 +4164,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);
@@ -3911,6 +4181,7 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "set_error_verbosity", pgconn_set_error_verbosity, 1);
 	rb_define_method(rb_cPGconn, "trace", pgconn_trace, 1);
 	rb_define_method(rb_cPGconn, "untrace", pgconn_untrace, 0);
+	rb_define_method(rb_cPGconn, "guess_result_memsize=", pgconn_guess_result_memsize_set, 1);
 
 	/******     PG::Connection INSTANCE METHODS: Notice Processing     ******/
 	rb_define_method(rb_cPGconn, "set_notice_receiver", pgconn_set_notice_receiver, 0);
@@ -3925,9 +4196,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);
-	rb_define_method(rb_cPGconn, "async_exec", pgconn_async_exec, -1);
-	rb_define_alias(rb_cPGconn, "async_query", "async_exec");
 	rb_define_method(rb_cPGconn, "get_last_result", pgconn_get_last_result, 0);
+#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);
@@ -3957,12 +4235,10 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "lo_unlink", pgconn_lounlink, 1);
 	rb_define_alias(rb_cPGconn, "lounlink", "lo_unlink");
 
-#ifdef M17N_SUPPORTED
 	rb_define_method(rb_cPGconn, "internal_encoding", pgconn_internal_encoding, 0);
 	rb_define_method(rb_cPGconn, "internal_encoding=", pgconn_internal_encoding_set, 1);
 	rb_define_method(rb_cPGconn, "external_encoding", pgconn_external_encoding, 0);
 	rb_define_method(rb_cPGconn, "set_default_encoding", pgconn_set_default_encoding, 0);
-#endif /* M17N_SUPPORTED */
 
 	rb_define_method(rb_cPGconn, "type_map_for_queries=", pgconn_type_map_for_queries_set, 1);
 	rb_define_method(rb_cPGconn, "type_map_for_queries", pgconn_type_map_for_queries_get, 0);