pg 0.21.0 → 1.0.0

data/ext/pg.h

@@ -18,89 +18,21 @@
 
 /* Ruby headers */
 #include "ruby.h"
-#ifdef HAVE_RUBY_ST_H
-#	include "ruby/st.h"
-#elif HAVE_ST_H
-#	include "st.h"
-#endif
+#include "ruby/st.h"
+#include "ruby/encoding.h"
 
-#if defined(HAVE_RUBY_ENCODING_H) && HAVE_RUBY_ENCODING_H
-#	include "ruby/encoding.h"
-#	define M17N_SUPPORTED
-#	ifdef HAVE_RB_ENCDB_ALIAS
-		extern int rb_encdb_alias(const char *, const char *);
-#		define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig))
-#	elif HAVE_RB_ENC_ALIAS
-		extern int rb_enc_alias(const char *, const char *);
-#		define ENC_ALIAS(name, orig) rb_enc_alias((name), (orig))
-#	else
-		extern int rb_enc_alias(const char *alias, const char *orig); /* declaration missing in Ruby 1.9.1 */
-#		define ENC_ALIAS(name, orig) rb_enc_alias((name), (orig))
-#	endif
-
-
-# if !defined(ENCODING_SET_INLINED)
-/* Rubinius doesn't define ENCODING_SET_INLINED, so we fall back to the more
- * portable version.
- */
-#  define PG_ENCODING_SET_NOCHECK(obj,i) \
-	do { \
-		rb_enc_set_index((obj), (i)); \
-	} while(0)
-# else
-#  define PG_ENCODING_SET_NOCHECK(obj,i) \
+/* exported by ruby-1.9.3+ but not declared */
+extern int rb_encdb_alias(const char *, const char *);
+
+#define PG_ENCODING_SET_NOCHECK(obj,i) \
 	do { \
 		if ((i) < ENCODING_INLINE_MAX) \
 			ENCODING_SET_INLINED((obj), (i)); \
 		else \
 			rb_enc_set_index((obj), (i)); \
 	} while(0)
-# endif
-
-#else
-#	define PG_ENCODING_SET_NOCHECK(obj,i) /* nothing */
-#endif
-
-#if RUBY_VM != 1
-#	define RUBY_18_COMPAT
-#endif
-
-#ifndef RARRAY_LEN
-#	define RARRAY_LEN(x) RARRAY((x))->len
-#endif /* RARRAY_LEN */
 
-#ifndef RSTRING_LEN
-#	define RSTRING_LEN(x) RSTRING((x))->len
-#endif /* RSTRING_LEN */
-
-#ifndef RSTRING_PTR
-#	define RSTRING_PTR(x) RSTRING((x))->ptr
-#endif /* RSTRING_PTR */
-
-#ifndef StringValuePtr
-#	define StringValuePtr(x) STR2CSTR(x)
-#endif /* StringValuePtr */
-
-#ifdef RUBY_18_COMPAT
-#	define rb_io_stdio_file GetWriteFile
-#	include "rubyio.h"
-#else
-#	include "ruby/io.h"
-#endif
-
-#ifdef RUBINIUS
-	/* Workaround for wrong FIXNUM_MAX definition */
-	typedef intptr_t native_int;
-#endif
-
-#ifndef RETURN_SIZED_ENUMERATOR
-	#define RETURN_SIZED_ENUMERATOR(obj, argc, argv, size_fn) RETURN_ENUMERATOR((obj), (argc), (argv))
-#endif
-
-#ifndef HAVE_RB_HASH_DUP
-	/* Rubinius doesn't define rb_hash_dup() */
-	#define rb_hash_dup(tuple) rb_funcall((tuple), rb_intern("dup"), 0)
-#endif
+#include "ruby/io.h"
 
 #ifndef timeradd
 #define timeradd(a, b, result) \
@@ -382,12 +314,10 @@ pgresult_get_this( VALUE self )
 }
 
 
-#ifdef M17N_SUPPORTED
 rb_encoding * pg_get_pg_encoding_as_rb_encoding        _(( int ));
 rb_encoding * pg_get_pg_encname_as_rb_encoding         _(( const char * ));
 const char * pg_get_rb_encoding_as_pg_encoding         _(( rb_encoding * ));
 rb_encoding *pg_conn_enc_get                           _(( PGconn * ));
-#endif /* M17N_SUPPORTED */
 
 void notice_receiver_proxy(void *arg, const PGresult *result);
 void notice_processor_proxy(void *arg, const char *message);

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v 2e17f315848e 2017/01/14 20:05:06 lars $
+ * $Id: pg_connection.c,v 1f0926bfa9a5 2018/01/04 18:14:32 lars $
  *
  */
 
@@ -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
@@ -95,7 +84,7 @@ pgconn_close_socket_io( VALUE self )
 	VALUE socket_io = this->socket_io;
 
 	if ( RTEST(socket_io) ) {
-#if defined(_WIN32) && defined(HAVE_RB_W32_WRAP_IO_HANDLE)
+#if defined(_WIN32)
 		int ruby_sd = NUM2INT(rb_funcall( socket_io, rb_intern("fileno"), 0 ));
 		if( rb_w32_unwrap_io_handle(ruby_sd) ){
 			rb_raise(rb_eConnectionBad, "Could not unwrap win32 socket handle");
@@ -291,9 +280,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);
@@ -349,7 +336,6 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 	return rb_conn;
 }
 
-#ifdef HAVE_PQPING
 /*
  * call-seq:
  *    PG::Connection.ping(connection_hash)       -> Integer
@@ -367,6 +353,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 )
@@ -379,7 +367,6 @@ pgconn_s_ping( int argc, VALUE *argv, VALUE klass )
 
 	return INT2FIX((int)ping);
 }
-#endif
 
 
 /*
@@ -418,16 +405,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 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.
  *
- * 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.
+ * 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)
@@ -613,7 +649,7 @@ pgconn_user(VALUE self)
  * call-seq:
  *    conn.pass()
  *
- * Returns the authenticated user name.
+ * Returns the authenticated password.
  */
 static VALUE
 pgconn_pass(VALUE self)
@@ -686,6 +722,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 )
@@ -807,6 +844,8 @@ pgconn_error_message(VALUE self)
  * call-seq:
  *    conn.socket() -> Integer
  *
+ * This method is deprecated. Please use the more portable method #socket_io .
+ *
  * Returns the socket's file descriptor for this connection.
  * <tt>IO.for_fd()</tt> can be used to build a proper IO object to the socket.
  * If you do so, you will likely also want to set <tt>autoclose=false</tt>
@@ -815,7 +854,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
@@ -827,22 +866,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)
@@ -876,8 +910,6 @@ pgconn_socket_io(VALUE self)
 	return socket_io;
 }
 
-#endif
-
 /*
  * call-seq:
  *    conn.backend_pid() -> Integer
@@ -1254,7 +1286,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.
@@ -1390,7 +1422,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.
@@ -1646,12 +1678,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)
@@ -1682,9 +1715,7 @@ pgconn_escape_literal(VALUE self, VALUE string)
 
 	return result;
 }
-#endif
 
-#ifdef HAVE_PQESCAPEIDENTIFIER
 /*
  * call-seq:
  *    conn.escape_identifier( str ) -> String
@@ -1694,6 +1725,8 @@ pgconn_escape_literal(VALUE self, VALUE 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)
@@ -1724,9 +1757,7 @@ pgconn_escape_identifier(VALUE self, VALUE string)
 
 	return result;
 }
-#endif
 
-#ifdef HAVE_PQSETSINGLEROWMODE
 /*
  * call-seq:
  *    conn.set_single_row_mode -> self
@@ -1763,6 +1794,7 @@ pgconn_escape_identifier(VALUE self, VALUE string)
  *     end
  *   end
  *
+ * Available since PostgreSQL-9.2
  */
 static VALUE
 pgconn_set_single_row_mode(VALUE self)
@@ -1779,7 +1811,6 @@ pgconn_set_single_row_mode(VALUE self)
 
 	return self;
 }
-#endif
 
 /*
  * call-seq:
@@ -1813,7 +1844,7 @@ 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.
@@ -1953,7 +1984,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.
@@ -2203,7 +2234,6 @@ pgconn_flush(self)
 static VALUE
 pgconn_cancel(VALUE self)
 {
-#ifdef HAVE_PQGETCANCEL
 	char errbuf[256];
 	PGcancel *cancel;
 	VALUE retval;
@@ -2221,9 +2251,6 @@ pgconn_cancel(VALUE self)
 
 	PQfreeCancel(cancel);
 	return retval;
-#else
-	rb_notimplement();
-#endif
 }
 
 
@@ -2267,45 +2294,8 @@ 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().
@@ -2393,7 +2383,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 *))
@@ -2403,9 +2393,6 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 	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");
@@ -2425,14 +2412,6 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 		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);
@@ -2446,11 +2425,6 @@ wait_socket_readable( PGconn *conn, struct timeval *ptimeout, void *(*is_readabl
 			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()" );
@@ -2528,12 +2502,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() )
@@ -2552,9 +2524,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.
@@ -2665,8 +2638,9 @@ pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
  * 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
+ * _decoder_ can be a PG::Coder derivation (typically PG::TextDecoder::CopyRow).
+ * This decodes the received data fields from PostgreSQL's COPY text format to an
+ * Array of Strings. Optionally
  * the decoder can type cast the fields to various Ruby types in one step,
  * if PG::TextDecoder::CopyRow#type_map is set accordingly.
  *
@@ -2968,11 +2942,9 @@ pgconn_set_client_encoding(VALUE self, VALUE str)
 	Check_Type(str, T_STRING);
 
 	if ( (gvl_PQsetClientEncoding(conn, StringValueCStr(str))) == -1 ) {
-		rb_raise(rb_ePGerror, "invalid encoding name: %s",StringValueCStr(str));
+		rb_raise(rb_ePGerror, "%s", PQerrorMessage(conn));
 	}
-#ifdef M17N_SUPPORTED
 	pgconn_set_internal_encoding_index( self );
-#endif
 
 	return Qnil;
 }
@@ -3198,14 +3170,13 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 
 
 #ifdef HAVE_PQSSLATTRIBUTE
-/* Since PostgreSQL-9.5: */
-
 /*
  * 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)
@@ -3238,6 +3209,8 @@ pgconn_ssl_in_use(VALUE self)
  *
  *
  * 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)
@@ -3256,6 +3229,7 @@ pgconn_ssl_attribute(VALUE self, VALUE attribute_name)
  *
  * See also #ssl_attribute
  *
+ * Available since PostgreSQL-9.5
  */
 static VALUE
 pgconn_ssl_attribute_names(VALUE self)
@@ -3566,8 +3540,6 @@ pgconn_lounlink(VALUE self, VALUE in_oid)
 }
 
 
-#ifdef M17N_SUPPORTED
-
 void
 pgconn_set_internal_encoding_index( VALUE self )
 {
@@ -3729,8 +3701,6 @@ pgconn_set_default_encoding( VALUE self )
 }
 
 
-#endif /* M17N_SUPPORTED */
-
 /*
  * call-seq:
  *    res.type_map_for_queries = typemap
@@ -3939,9 +3909,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);
@@ -3971,9 +3939,7 @@ 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);
@@ -3990,17 +3956,11 @@ init_pg_connection()
 	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);
@@ -4048,6 +4008,9 @@ init_pg_connection()
 	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);
@@ -4083,12 +4046,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);