pg 0.18.4 → 0.21.0

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v eb4d3c003bd6 2015/05/25 20:04:04 ged $
+ * $Id: pg_connection.c,v 2e17f315848e 2017/01/14 20:05:06 lars $
  *
  */
 
@@ -52,7 +52,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,7 +88,7 @@ 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 );
@@ -141,6 +141,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
@@ -342,9 +352,9 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 #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.
  *
@@ -373,7 +383,7 @@ pgconn_s_ping( int argc, VALUE *argv, VALUE klass )
 
 
 /*
- * Document-method: conndefaults
+ * Document-method: PG::Connection.conndefaults
  *
  * call-seq:
  *    PG::Connection.conndefaults() -> Array
@@ -447,7 +457,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 +566,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
@@ -795,7 +805,7 @@ pgconn_error_message(VALUE self)
 
 /*
  * call-seq:
- *    conn.socket() -> Fixnum
+ *    conn.socket() -> Integer
  *
  * 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.
@@ -870,7 +880,7 @@ pgconn_socket_io(VALUE self)
 
 /*
  * call-seq:
- *    conn.backend_pid() -> Fixnum
+ *    conn.backend_pid() -> Integer
  *
  * Returns the process ID of the backend server
  * process for this connection.
@@ -947,9 +957,9 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 
 	/* If called with no parameters, use PQexec */
 	if ( argc == 1 ) {
-		Check_Type(argv[0], T_STRING);
+		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()) {
@@ -978,6 +988,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 */
@@ -1138,7 +1152,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. */
@@ -1162,7 +1176,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 */
@@ -1220,8 +1234,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 }
@@ -1258,7 +1272,7 @@ 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) };
 
 	rb_scan_args(argc, argv, "13", &command, &paramsData.params, &in_res_fmt, &paramsData.typemap);
 	paramsData.with_types = 1;
@@ -1275,7 +1289,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 );
@@ -1321,10 +1335,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);
@@ -1338,8 +1355,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);
 
@@ -1361,7 +1377,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 }
@@ -1392,11 +1408,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);
@@ -1406,7 +1421,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);
 
@@ -1434,13 +1449,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);
@@ -1462,13 +1476,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);
@@ -1510,10 +1523,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.
@@ -1522,32 +1531,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);
+	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_is_kind_of(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_is_kind_of(self, rb_cPGconn) ? self : string ));
 
 	return result;
 }
@@ -1556,13 +1574,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)
@@ -1575,6 +1586,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)
@@ -1643,8 +1660,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);
+	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)
@@ -1657,7 +1678,7 @@ 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;
 }
@@ -1670,8 +1691,9 @@ pgconn_escape_literal(VALUE self, VALUE 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.
  */
 static VALUE
 pgconn_escape_identifier(VALUE self, VALUE string)
@@ -1680,8 +1702,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);
+	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)
@@ -1694,7 +1720,7 @@ 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;
 }
@@ -1767,8 +1793,8 @@ pgconn_set_single_row_mode(VALUE self)
  * 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 }
@@ -1802,15 +1828,14 @@ 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);
 	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) {
+		if(gvl_PQsendQuery(conn, pg_cstr_enc(command, paramsData.enc_idx)) == 0) {
 			error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
 			rb_iv_set(error, "@connection", self);
 			rb_exc_raise(error);
@@ -1826,7 +1851,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 	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 );
@@ -1870,10 +1895,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);
@@ -1887,8 +1915,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);
 
@@ -1913,7 +1940,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 }
@@ -1941,11 +1968,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);
@@ -1956,7 +1982,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);
 
@@ -1983,7 +2009,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);
@@ -2005,7 +2031,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);
@@ -2565,16 +2591,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 );
 		}
 	}
@@ -2613,13 +2640,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) {
@@ -2697,7 +2724,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:
@@ -2940,7 +2967,7 @@ pgconn_set_client_encoding(VALUE self, VALUE str)
 
 	Check_Type(str, T_STRING);
 
-	if ( (PQsetClientEncoding(conn, StringValueCStr(str))) == -1 ) {
+	if ( (gvl_PQsetClientEncoding(conn, StringValueCStr(str))) == -1 ) {
 		rb_raise(rb_ePGerror, "invalid encoding name: %s",StringValueCStr(str));
 	}
 #ifdef M17N_SUPPORTED
@@ -2996,10 +3023,10 @@ pgconn_transaction(VALUE self)
 
 /*
  * call-seq:
- *    PG::Connection.quote_ident( str ) -> String
- *    PG::Connection.quote_ident( array ) -> 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
@@ -3009,7 +3036,7 @@ 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.
  *
@@ -3023,15 +3050,27 @@ pgconn_transaction(VALUE self)
  *
  * 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;
-	pg_text_enc_identifier(NULL, in_str, NULL, &ret);
+	int enc_idx;
 
-	OBJ_INFECT(ret, in_str);
-	PG_ENCODING_SET_NOCHECK(ret, ENCODING_GET( rb_obj_is_kind_of(self, rb_cPGconn) ? self : in_str ));
+	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;
 }
@@ -3157,13 +3196,91 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 	return rb_pgresult;
 }
 
+
+#ifdef HAVE_PQSSLATTRIBUTE
+/* Since PostgreSQL-9.5: */
+
+/*
+ * call-seq:
+ *    conn.ssl_in_use? -> Boolean
+ *
+ * Returns +true+ if the connection uses SSL, +false+ if not.
+ *
+ */
+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
+ */
+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
+ *
+ */
+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.
@@ -3190,7 +3307,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.
@@ -3211,7 +3328,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.
  *
@@ -3256,7 +3373,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
@@ -3287,7 +3404,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.
@@ -3354,7 +3471,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+.
@@ -3376,7 +3493,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_.
  */
@@ -3512,7 +3629,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 );
@@ -3554,6 +3671,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:
@@ -3572,7 +3717,7 @@ 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 )
+		if ( pgconn_set_client_encoding_async(self, encname) != 0 )
 			rb_warn( "Failed to set the default_internal encoding to %s: '%s'",
 			         encname, PQerrorMessage(conn) );
 		pgconn_set_internal_encoding_index( self );
@@ -3704,7 +3849,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
@@ -3765,6 +3910,9 @@ pgconn_decoder_for_get_copy_data_get(VALUE self)
 }
 
 
+/*
+ * Document-class: PG::Connection
+ */
 void
 init_pg_connection()
 {
@@ -3901,6 +4049,12 @@ init_pg_connection()
 	rb_define_alias(rb_cPGconn, "async_query", "async_exec");
 	rb_define_method(rb_cPGconn, "get_last_result", pgconn_get_last_result, 0);
 
+#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);
 	rb_define_alias(rb_cPGconn, "locreat", "lo_creat");