pg 0.21.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d459edbf441a30095d92512f986194a7e183efe9
-  data.tar.gz: 90ba3a4e5b506aa68d9addab7e8af76f5efcee8e
+SHA256:
+  metadata.gz: 00baf07c6fd4d371d287ca8209c0db01b5de5477b62dd00e07c34b4000be3b20
+  data.tar.gz: 629daf0e7785a7cc67fdf41852462cb3e02946399b6bfb78dc63e889c28e2a72
 SHA512:
-  metadata.gz: 0212d8cb8cd8a29ab8f120d6d1c4a90087107fd273785b53fa6b59e1583c48eb350420a53132a51ab6e9c1d10ccb821fa2924b850b14fbf8a759fe915d73251b
-  data.tar.gz: b3bbd17f06fb3ab2a7864bbdeeead245c7f47348c618e39fb732f20b58f46591bac774844438fe410c96fbd460dbaa204c705e1617d62a4c74d3da18e425c001
+  metadata.gz: 608978950994657749109e344e33b83704a26c367bb551d8d2095b335e1a5102426e7d212a2213c19439d5fa3e6087d8fddd7401102e1e7f2ec3cf2fd32627ec
+  data.tar.gz: 863a7b7a83d245ab52a774769e295edb57a77e2811fb5bfda2c3fd067242696294d1b0d08216ef3dd9ad5e27ed539cad7ec2096d047c18dc949d4107a957b5e1

data/History.rdoc

@@ -1,3 +1,28 @@
+== v1.0.0 [2018-01-10] Michael Granger <ged@FaerieMUD.org>
+
+Deprecated:
+- Deprecate Ruby older than 2.2.
+- Deprecate Connection#socket in favor of #socket_io.
+
+Removed:
+- Remove compatibility code for Ruby < 2.0 and PostgreSQL < 9.2.
+- Remove partial compatibility with Rubinius.
+
+Enhancements:
+- Update error codes to PostgreSQL-10
+- Update Windows binary gems to Ruby-2.5, PostgreSQL 10.1 and
+  OpenSSL 1.1.0g.
+
+Bugfixes:
+- Fix URI detection for connection strings. #265 (thanks to jjoos)
+- MINGW: Workaround segfault due to GCC linker error in conjunction with MSVC.
+  This happens when linking to PostgreSQL-10.0-x64 from EnterpriseDB.
+
+Documentation fixes:
+- Add PostgreSQL version since when the given function is supported. #263
+- Better documentation to `encoder` and `decoder` arguments of COPY related methods.
+
+
 == v0.21.0 [2017-06-12] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:
@@ -10,6 +35,9 @@ Enhancements:
 Documentation fixes:
 - Update the docs for PG::Result#cmd_tuples
 
+New Samples:
+- Add an example of the nicer #copy_data way of doing `COPY`.
+
 
 == v0.20.0 [2017-03-10] Michael Granger <ged@FaerieMUD.org>
 

data/Manifest.txt

@@ -46,7 +46,6 @@ lib/pg/basic_type_mapping.rb
 lib/pg/coder.rb
 lib/pg/connection.rb
 lib/pg/constants.rb
-lib/pg/deprecated_constants.rb
 lib/pg/exceptions.rb
 lib/pg/result.rb
 lib/pg/text_decoder.rb

data/README.rdoc

@@ -11,7 +11,7 @@ docs :: http://deveiate.org/code/pg
 
 Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-It works with {PostgreSQL 9.1 and later}[http://www.postgresql.org/support/versioning/].
+It works with {PostgreSQL 9.2 and later}[http://www.postgresql.org/support/versioning/].
 
 A small example usage:
 
@@ -37,8 +37,8 @@ A small example usage:
 
 == Requirements
 
-* Ruby 2.2
-* PostgreSQL 9.1.x or later (with headers, -dev packages, etc).
+* Ruby 2.2 or newer
+* PostgreSQL 9.2.x or later (with headers, -dev packages, etc).
 
 It usually work with earlier versions of Ruby/PostgreSQL as well, but those are
 not regularly tested.
@@ -165,4 +165,3 @@ to this library over the years.
 
 We are thankful to the people at the ruby-list and ruby-dev mailing lists.
 And to the people who developed PostgreSQL.
-

data/Rakefile

@@ -61,7 +61,7 @@ $hoespec = Hoe.spec 'pg' do
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
 	self.dependency 'rake-compiler', '~> 1.0', :developer
-	self.dependency 'rake-compiler-dock', '~> 0.6', :developer
+	self.dependency 'rake-compiler-dock', ['~> 0.6', '>= 0.6.2'], :developer
 	self.dependency 'hoe-deveiate', '~> 0.9', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
 	self.dependency 'rspec', '~> 3.5', :developer
@@ -105,8 +105,6 @@ task :maint do
 	ENV['MAINTAINER_MODE'] = 'yes'
 end
 
-ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.2:2.0.0'
-
 # Rake-compiler task
 Rake::ExtensionTask.new do |ext|
 	ext.name           = 'pg_ext'
@@ -155,6 +153,7 @@ end
 file '.hg/branch' do
 	warn "WARNING: You need the Mercurial repo to update the ChangeLog"
 end
+Rake::Task["ChangeLog"].clear
 file 'ChangeLog' do |task|
 	if File.exist?('.hg/branch')
 		$stderr.puts "Updating the changelog..."
@@ -185,7 +184,7 @@ end
 
 desc "Update list of server error codes"
 task :update_error_codes do
-	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL9_6_1"
+	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL_10_1"
 
 	ERRORCODES_TXT = "ext/errorcodes.txt"
 	sh "wget #{URL_ERRORCODES_TXT.inspect} -O #{ERRORCODES_TXT.inspect} || curl #{URL_ERRORCODES_TXT.inspect} -o #{ERRORCODES_TXT.inspect}"

data/Rakefile.cross

@@ -29,8 +29,8 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.2j'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.6.2'
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.0g'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '10.1'
 
 		# Check if symlinks work in the current working directory.
 		# This fails, if rake-compiler-dock is running on a Windows box.
@@ -54,8 +54,8 @@ class CrossLibrary < OpenStruct
 		self.openssl_tarball            = static_sourcesdir + File.basename( openssl_source_uri.path )
 		self.openssl_makefile           = static_openssl_builddir + 'Makefile'
 
-		self.libssleay32                = static_openssl_builddir + 'libssleay32.a'
-		self.libeay32                   = static_openssl_builddir + 'libeay32.a'
+		self.libssl                     = static_openssl_builddir + 'libssl.a'
+		self.libcrypto                  = static_openssl_builddir + 'libcrypto.a'
 
 		self.openssl_patches            = Rake::FileList[ (MISCDIR + "openssl-#{openssl_version}.*.patch").to_s ]
 
@@ -82,8 +82,6 @@ class CrossLibrary < OpenStruct
 		CLEAN.include( static_builddir.to_s )
 
 
-		ENV['RUBY_CC_VERSION'] ||= '1.9.3:2.0.0'
-
 		def download(url, save_to)
 			part = save_to+".part"
 			sh "wget #{url.to_s.inspect} -O #{part.inspect} || curl #{url.to_s.inspect} -o #{part.inspect}"
@@ -126,11 +124,9 @@ class CrossLibrary < OpenStruct
 		end
 
 		self.cmd_prelude = [
-			'env',
-			"CC=#{host_platform}-gcc",
+			"env",
+			"CROSS_COMPILE=#{host_platform}-",
 			"CFLAGS=-DDSO_WIN32",
-			"AR=#{host_platform}-ar",
-			"RANLIB=#{host_platform}-ranlib"
 		]
 
 
@@ -145,7 +141,7 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static openssl libraries"
-		task :openssl_libs => [ libssleay32, libeay32 ]
+		task :openssl_libs => [ libssl, libcrypto ]
 
 		task :compile_static_openssl => openssl_makefile do |t|
 			chdir( static_openssl_builddir ) do
@@ -156,14 +152,14 @@ class CrossLibrary < OpenStruct
 			end
 		end
 
-		desc "compile static #{libeay32}"
-		file libeay32 => :compile_static_openssl do |t|
-			FileUtils.cp( static_openssl_builddir + 'libcrypto.a', libeay32.to_s )
+		desc "compile static #{libssl}"
+		file libssl => :compile_static_openssl do |t|
+			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
-		desc "compile static #{libssleay32}"
-		file libssleay32 => :compile_static_openssl do |t|
-			FileUtils.cp( static_openssl_builddir + 'libssl.a', libssleay32.to_s )
+		desc "compile static #{libcrypto}"
+		file libcrypto => :compile_static_openssl do |t|
+			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
 
@@ -207,7 +203,7 @@ class CrossLibrary < OpenStruct
 				cmd << "CFLAGS=-L#{static_openssl_builddir}"
 				cmd << "LDFLAGS=-L#{static_openssl_builddir}"
 				cmd << "LDFLAGS_SL=-L#{static_openssl_builddir}"
-				cmd << "LIBS=-lwsock32 -lgdi32"
+				cmd << "LIBS=-lwsock32 -lgdi32 -lws2_32"
 				cmd << "CPPFLAGS=-I#{static_openssl_builddir}/include"
 
 				run( *cmd )
@@ -226,7 +222,7 @@ class CrossLibrary < OpenStruct
 				sh 'make',
 					"-j#{NUM_CPUS}",
 					postgresql_lib.basename.to_s,
-					'SHLIB_LINK=-lssleay32 -leay32 -lcrypt32 -lgdi32 -lsecur32 -lwsock32 -lws2_32'
+					'SHLIB_LINK=-lssl -lcrypto -lcrypt32 -lgdi32 -lsecur32 -lwsock32 -lws2_32'
 			end
 		end
 
@@ -297,6 +293,6 @@ task 'gem:windows' => ['ChangeLog'] do
     mkdir ~/.gem &&
     (cp build/gem/gem-*.pem ~/.gem/ || true) &&
     bundle install --local &&
-    rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.6:2.0.0
+    rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0
   EOT
 end

data/ext/errorcodes.def

@@ -230,6 +230,10 @@
   VALUE klass = define_error_class( "NumericValueOutOfRange", "22" );
   register_error_class( "22003", klass );
 }
+{
+  VALUE klass = define_error_class( "SequenceGeneratorLimitExceeded", "22" );
+  register_error_class( "2200H", klass );
+}
 {
   VALUE klass = define_error_class( "StringDataLengthMismatch", "22" );
   register_error_class( "22026", klass );
@@ -587,6 +591,10 @@
   VALUE klass = define_error_class( "WrongObjectType", "42" );
   register_error_class( "42809", klass );
 }
+{
+  VALUE klass = define_error_class( "GeneratedAlways", "42" );
+  register_error_class( "428C9", klass );
+}
 {
   VALUE klass = define_error_class( "UndefinedColumn", "42" );
   register_error_class( "42703", klass );

data/ext/errorcodes.txt

@@ -2,7 +2,7 @@
 # errcodes.txt
 #      PostgreSQL error codes
 #
-# Copyright (c) 2003-2016, PostgreSQL Global Development Group
+# Copyright (c) 2003-2017, PostgreSQL Global Development Group
 #
 # This list serves as the basis for generating source files containing error
 # codes. It is kept in a common format to make sure all these source files have
@@ -188,6 +188,7 @@ Section: Class 22 - Data Exception
 22004    E    ERRCODE_NULL_VALUE_NOT_ALLOWED                                 null_value_not_allowed
 22002    E    ERRCODE_NULL_VALUE_NO_INDICATOR_PARAMETER                      null_value_no_indicator_parameter
 22003    E    ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE                             numeric_value_out_of_range
+2200H    E    ERRCODE_SEQUENCE_GENERATOR_LIMIT_EXCEEDED                      sequence_generator_limit_exceeded
 22026    E    ERRCODE_STRING_DATA_LENGTH_MISMATCH                            string_data_length_mismatch
 22001    E    ERRCODE_STRING_DATA_RIGHT_TRUNCATION                           string_data_right_truncation
 22011    E    ERRCODE_SUBSTRING_ERROR                                        substring_error
@@ -326,6 +327,7 @@ Section: Class 42 - Syntax Error or Access Rule Violation
 42P21    E    ERRCODE_COLLATION_MISMATCH                                     collation_mismatch
 42P22    E    ERRCODE_INDETERMINATE_COLLATION                                indeterminate_collation
 42809    E    ERRCODE_WRONG_OBJECT_TYPE                                      wrong_object_type
+428C9    E    ERRCODE_GENERATED_ALWAYS                                       generated_always
 
 # Note: for ERRCODE purposes, we divide namable objects into these categories:
 # databases, schemas, prepared statements, cursors, tables, columns,

data/ext/extconf.rb

@@ -60,48 +60,28 @@ abort "Can't find the PostgreSQL client library (libpq)" unless
 	have_library( 'libpq', 'PQconnectdb', ['libpq-fe.h'] ) ||
 	have_library( 'ms/libpq', 'PQconnectdb', ['libpq-fe.h'] )
 
+if /mingw/ =~ RUBY_PLATFORM && RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
+	# Work around: https://sourceware.org/bugzilla/show_bug.cgi?id=22504
+	checking_for "workaround gcc version with link issue" do
+		`#{RbConfig::MAKEFILE_CONFIG['CC']} --version`.chomp =~ /\s(\d+)\.\d+\.\d+(\s|$)/ &&
+			$1.to_i >= 6 &&
+			have_library(':libpq.lib') # Prefer linking to libpq.lib over libpq.dll if available
+	end
+end
+
 # optional headers/functions
-have_func 'PQconnectionUsedPassword' or
+have_func 'PQsetSingleRowMode' or
 	abort "Your PostgreSQL is too old. Either install an older version " +
-	      "of this gem or upgrade your database."
-have_func 'PQisthreadsafe'
-have_func 'PQprepare'
-have_func 'PQexecParams'
-have_func 'PQescapeString'
-have_func 'PQescapeStringConn'
-have_func 'PQescapeLiteral'
-have_func 'PQescapeIdentifier'
-have_func 'PQgetCancel'
-have_func 'lo_create'
-have_func 'pg_encoding_to_char'
-have_func 'pg_char_to_encoding'
-have_func 'PQsetClientEncoding'
-have_func 'PQlibVersion'
-have_func 'PQping'
-have_func 'PQsetSingleRowMode'
+	      "of this gem or upgrade your database to at least PostgreSQL-9.2."
 have_func 'PQconninfo'
 have_func 'PQsslAttribute'
+have_func 'PQencryptPasswordConn'
 
-have_func 'rb_encdb_alias'
-have_func 'rb_enc_alias'
-have_func 'rb_thread_call_without_gvl'
-have_func 'rb_thread_call_with_gvl'
-have_func 'rb_thread_fd_select'
-have_func 'rb_w32_wrap_io_handle'
-have_func 'rb_str_modify_expand'
-have_func 'rb_hash_dup'
-
-have_const 'PGRES_COPY_BOTH', 'libpq-fe.h'
-have_const 'PGRES_SINGLE_TUPLE', 'libpq-fe.h'
 have_const 'PG_DIAG_TABLE_NAME', 'libpq-fe.h'
 
-$defs.push( "-DHAVE_ST_NOTIFY_EXTRA" ) if
-	have_struct_member 'struct pgNotify', 'extra', 'libpq-fe.h'
-
 # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
 have_header 'unistd.h'
 have_header 'inttypes.h'
-have_header 'ruby/st.h' or have_header 'st.h' or abort "pg currently requires the ruby/st.h header"
 
 checking_for "C99 variable length arrays" do
 	$defs.push( "-DHAVE_VARIABLE_LENGTH_ARRAYS" ) if try_compile('void test_vla(int l){ int vla[l]; }')

data/ext/gvl_wrappers.c

@@ -5,6 +5,10 @@
 
 #include "pg.h"
 
+#ifndef HAVE_PQENCRYPTPASSWORDCONN
+char *PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user, const char *algorithm){return NULL;}
+#endif
+
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_WRAPPER_STRUCT );
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_SKELETON );
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB );

data/ext/gvl_wrappers.h

@@ -15,14 +15,7 @@
 #ifndef __gvl_wrappers_h
 #define __gvl_wrappers_h
 
-#if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
-extern void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
-#endif
-
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
-				 rb_unblock_function_t *ubf, void *data2);
-#endif
+#include <ruby/thread.h>
 
 #define DEFINE_PARAM_LIST1(type, name) \
 	name,
@@ -53,21 +46,14 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 		return NULL; \
 	}
 
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-	#define DEFINE_GVL_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
-		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
-			struct gvl_wrapper_##name##_params params = { \
-				{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
-			}; \
-			rb_thread_call_without_gvl(gvl_##name##_skeleton, &params, RUBY_UBF_IO, 0); \
-			when_non_void( return params.retval; ) \
-		}
-#else
-	#define DEFINE_GVL_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
-		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
-			return name( FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname ); \
-		}
-#endif
+#define DEFINE_GVL_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
+	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
+		struct gvl_wrapper_##name##_params params = { \
+			{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
+		}; \
+		rb_thread_call_without_gvl(gvl_##name##_skeleton, &params, RUBY_UBF_IO, 0); \
+		when_non_void( return params.retval; ) \
+	}
 
 #define DEFINE_GVL_STUB_DECL(name, when_non_void, rettype, lastparamtype, lastparamname) \
 	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname);
@@ -80,21 +66,14 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 		return NULL; \
 	}
 
-#if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
-	#define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
-		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
-			struct gvl_wrapper_##name##_params params = { \
-				{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
-			}; \
-			rb_thread_call_with_gvl(gvl_##name##_skeleton, &params); \
-			when_non_void( return params.retval; ) \
-		}
-#else
-	#define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
-		rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
-			return name( FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname ); \
-		}
-#endif
+#define DEFINE_GVLCB_STUB(name, when_non_void, rettype, lastparamtype, lastparamname) \
+	rettype gvl_##name(FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST3) lastparamtype lastparamname){ \
+		struct gvl_wrapper_##name##_params params = { \
+			{FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_LIST1) lastparamname}, when_non_void((rettype)0) \
+		}; \
+		rb_thread_call_with_gvl(gvl_##name##_skeleton, &params); \
+		when_non_void( return params.retval; ) \
+	}
 
 #define GVL_TYPE_VOID(string)
 #define GVL_TYPE_NONVOID(string) string
@@ -200,6 +179,11 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 
 #define FOR_EACH_PARAM_OF_PQisBusy(param)
 
+#define FOR_EACH_PARAM_OF_PQencryptPasswordConn(param) \
+	param(PGconn *, conn) \
+	param(const char *, passwd) \
+	param(const char *, user)
+
 #define FOR_EACH_PARAM_OF_PQcancel(param) \
 	param(PGcancel *, cancel) \
 	param(char *, errbuf)
@@ -231,9 +215,9 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 	function(PQsendDescribePortal, GVL_TYPE_NONVOID, int, const char *, portal) \
 	function(PQsetClientEncoding, GVL_TYPE_NONVOID, int, const char *, encoding) \
 	function(PQisBusy, GVL_TYPE_NONVOID, int, PGconn *, conn) \
+	function(PQencryptPasswordConn, GVL_TYPE_NONVOID, char *, const char *, algorithm) \
 	function(PQcancel, GVL_TYPE_NONVOID, int, int, errbufsize);
 
-
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL );
 
 

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id: pg.c,v c77d0997b4e4 2016/08/20 17:30:03 ged $
+ * $Id: pg.c,v 1f0926bfa9a5 2018/01/04 18:14:32 lars $
  *
  * Author/s:
  *
@@ -69,7 +69,6 @@ VALUE rb_mPGconstants;
  * M17n functions
  */
 
-#ifdef M17N_SUPPORTED
 /**
  * The mapping from canonical encoding names in PostgreSQL to ones in Ruby.
  */
@@ -144,7 +143,7 @@ pg_find_or_create_johab(void)
 
 	enc_index = rb_define_dummy_encoding(aliases[0]);
 	for (i = 1; i < sizeof(aliases)/sizeof(aliases[0]); ++i) {
-		ENC_ALIAS(aliases[i], aliases[0]);
+		rb_encdb_alias(aliases[i], aliases[0]);
 	}
 	return rb_enc_from_index(enc_index);
 }
@@ -229,8 +228,6 @@ pg_get_rb_encoding_as_pg_encoding( rb_encoding *enc )
 	return encname;
 }
 
-#endif /* M17N_SUPPORTED */
-
 
 /*
  * Ensures that the given string has enough capacity to take expand_len
@@ -260,45 +257,26 @@ pg_get_rb_encoding_as_pg_encoding( rb_encoding *enc )
  *   rb_str_set_len( string, current_out - RSTRING_PTR(string) );
  *
  */
-#ifdef HAVE_RB_STR_MODIFY_EXPAND
-	/* Use somewhat faster version with access to string capacity on MRI */
-	char *
-	pg_rb_str_ensure_capa( VALUE str, long expand_len, char *curr_ptr, char **end_ptr )
-	{
-		long curr_len = curr_ptr - RSTRING_PTR(str);
-		long curr_capa = rb_str_capacity( str );
-		if( curr_capa < curr_len + expand_len ){
-			rb_str_set_len( str, curr_len );
-			rb_str_modify_expand( str, (curr_len + expand_len) * 2 - curr_capa );
-			curr_ptr = RSTRING_PTR(str) + curr_len;
-		}
-		if( end_ptr )
-			*end_ptr = RSTRING_PTR(str) + rb_str_capacity( str );
-		return curr_ptr;
-	}
-#else
-	/* Use the more portable version */
-	char *
-	pg_rb_str_ensure_capa( VALUE str, long expand_len, char *curr_ptr, char **end_ptr )
-	{
-		long curr_len = curr_ptr - RSTRING_PTR(str);
-		long curr_capa = RSTRING_LEN( str );
-		if( curr_capa < curr_len + expand_len ){
-			rb_str_resize( str, (curr_len + expand_len) * 2 - curr_capa );
-			curr_ptr = RSTRING_PTR(str) + curr_len;
-		}
-		if( end_ptr )
-			*end_ptr = RSTRING_PTR(str) + RSTRING_LEN(str);
-		return curr_ptr;
+char *
+pg_rb_str_ensure_capa( VALUE str, long expand_len, char *curr_ptr, char **end_ptr )
+{
+	long curr_len = curr_ptr - RSTRING_PTR(str);
+	long curr_capa = rb_str_capacity( str );
+	if( curr_capa < curr_len + expand_len ){
+		rb_str_set_len( str, curr_len );
+		rb_str_modify_expand( str, (curr_len + expand_len) * 2 - curr_capa );
+		curr_ptr = RSTRING_PTR(str) + curr_len;
 	}
-#endif
+	if( end_ptr )
+		*end_ptr = RSTRING_PTR(str) + rb_str_capacity( str );
+	return curr_ptr;
+}
 
 
 /**************************************************************************
  * Module Methods
  **************************************************************************/
 
-#ifdef HAVE_PQLIBVERSION
 /*
  * call-seq:
  *   PG.library_version -> Integer
@@ -316,7 +294,6 @@ pg_s_library_version(VALUE self)
 	UNUSED( self );
 	return INT2NUM(PQlibVersion());
 }
-#endif
 
 
 /*
@@ -410,9 +387,7 @@ Init_pg_ext()
 	/*************************
 	 *  PG module methods
 	 *************************/
-#ifdef HAVE_PQLIBVERSION
 	rb_define_singleton_method( rb_mPG, "library_version", pg_s_library_version, 0 );
-#endif
 	rb_define_singleton_method( rb_mPG, "isthreadsafe", pg_s_threadsafe_p, 0 );
 	SINGLETON_ALIAS( rb_mPG, "is_threadsafe?", "isthreadsafe" );
 	SINGLETON_ALIAS( rb_mPG, "threadsafe?", "isthreadsafe" );
@@ -478,7 +453,6 @@ Init_pg_ext()
 	/* Verbose error verbosity level (#set_error_verbosity) */
 	rb_define_const(rb_mPGconstants, "PQERRORS_VERBOSE", INT2FIX(PQERRORS_VERBOSE));
 
-#ifdef HAVE_PQPING
 	/******     PG::Connection CLASS CONSTANTS: Check Server Status ******/
 
 	/* Server is accepting connections. */
@@ -489,7 +463,6 @@ Init_pg_ext()
 	rb_define_const(rb_mPGconstants, "PQPING_NO_RESPONSE", INT2FIX(PQPING_NO_RESPONSE));
 	/* Connection not attempted (bad params). */
 	rb_define_const(rb_mPGconstants, "PQPING_NO_ATTEMPT", INT2FIX(PQPING_NO_ATTEMPT));
-#endif
 
 	/******     PG::Connection CLASS CONSTANTS: Large Objects     ******/
 
@@ -524,13 +497,9 @@ Init_pg_ext()
 	/* #result_status constant: A fatal error occurred. */
 	rb_define_const(rb_mPGconstants, "PGRES_FATAL_ERROR", INT2FIX(PGRES_FATAL_ERROR));
 	/* #result_status constant: Copy In/Out data transfer in progress. */
-#ifdef HAVE_CONST_PGRES_COPY_BOTH
 	rb_define_const(rb_mPGconstants, "PGRES_COPY_BOTH", INT2FIX(PGRES_COPY_BOTH));
-#endif
 	/* #result_status constant: Single tuple from larger resultset. */
-#ifdef HAVE_CONST_PGRES_SINGLE_TUPLE
 	rb_define_const(rb_mPGconstants, "PGRES_SINGLE_TUPLE", INT2FIX(PGRES_SINGLE_TUPLE));
-#endif
 
 	/******     Result CONSTANTS: result error field codes      ******/
 
@@ -642,9 +611,7 @@ Init_pg_ext()
 	/* Add the constants to the toplevel namespace */
 	rb_include_module( rb_mPG, rb_mPGconstants );
 
-#ifdef M17N_SUPPORTED
 	enc_pg2ruby = st_init_numtable();
-#endif
 
 	/* Initialize the main extension classes */
 	init_pg_connection();