pg 0.9.0 → 0.10.0

data/ext/compat.c

@@ -8,8 +8,8 @@
   Author: ematsu
   modified at: Wed Jan 20 16:41:51 1999
 
-  $Author: jdavis $
-  $Date: 2007-12-04 14:25:44 -0800 (Tue, 04 Dec 2007) $
+  $Author: ged $
+  $Date: 2010/10/31 23:29:59 $
 ************************************************/
 
 #include <ctype.h>

data/ext/extconf.rb

@@ -1,15 +1,10 @@
+require 'pp'
 require 'mkmf'
 
 if pgdir = with_config( 'pg' )
-	ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPERATOR + ENV['PATH']
+	ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPARATOR + ENV['PATH']
 end
 
-### Read the output of a command using the fork+pipe syntax so execution errors 
-### propagate to Ruby.
-def read_cmd_output( *cmd )
-	output = IO.read( '|-' ) or exec( *cmd )
-	return output.chomp
-end
 
 ### Turn a version string into a Comparable binary datastructure
 def vvec( version )
@@ -22,88 +17,116 @@ if vvec(RUBY_VERSION) < vvec('1.8')
 	exit 1
 end
 
-pgconfig = with_config( 'pg-config' ) || 'pg_config'
-if pgconfig = find_executable( pgconfig )
-	$CPPFLAGS << " -I%s" % [ read_cmd_output(pgconfig, '--includedir') ]
-	$LDFLAGS << " -L%s" % [ read_cmd_output(pgconfig, '--libdir') ]
-end
+if ENV['CROSS_COMPILING']
 
-# Sort out the universal vs. single-archicture build problems on MacOS X
-if RUBY_PLATFORM.include?( 'darwin' )
-	puts "MacOS X build: fixing architecture flags:"
-
-	# Only keep the '-arch <a>' flags present in both the cflags reported
-	# by pg_config and those that Ruby specifies.
-	commonflags = nil
-	if ENV['ARCHFLAGS']
-		puts "  using the value in ARCHFLAGS environment variable (%p)." % [ ENV['ARCHFLAGS'] ]
-		commonflags = ENV['ARCHFLAGS']
-	elsif pgconfig
-		puts "  finding flags common to both Ruby and PostgreSQL..."
-		archflags = []
-		pgcflags = read_cmd_output( pgconfig, '--cflags' )
-		pgcflags.scan( /-arch\s+(\S+)/ ).each do |arch|
-			puts "  testing for architecture: %p" % [ arch ]
-			archflags << "-arch #{arch}" if Config::CONFIG['CFLAGS'].index("-arch #{arch}")
+	$LDFLAGS << " -L#{CONFIG['libdir']}"
+
+	# Link against all required libraries for static build, if they are available
+	have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
+	have_library( 'secur32' )           && append_library( $libs, 'secur32' )
+	have_library( 'crypto', 'BIO_new' ) && append_library( $libs, 'crypto' )
+	have_library( 'ssl', 'SSL_new' )    && append_library( $libs, 'ssl' )
+
+else
+	pgconfig = with_config( 'pg-config' ) || 'pg_config'
+	if pgconfig = find_executable( pgconfig )
+		$CFLAGS << " " + `#{pgconfig} --cflags`.chomp
+		$CPPFLAGS << " -I%s" % [ `#{pgconfig} --includedir`.chomp ]
+		$LDFLAGS << " -L%s" % [ `#{pgconfig} --libdir`.chomp ]
+	end
+
+	# Sort out the universal vs. single-archicture build problems on MacOS X
+	if RUBY_PLATFORM.include?( 'darwin' )
+		puts "MacOS X build: fixing architecture flags:"
+		ruby_archs = Config::CONFIG['CFLAGS'].scan( /-arch (\S+)/ ).flatten
+		$stderr.puts "Ruby cflags: %p" % [ Config::CONFIG['CFLAGS'] ]
+
+		# Only keep the '-arch <a>' flags present in both the cflags reported
+		# by pg_config and those that Ruby specifies.
+		commonflags = nil
+		if ENV['ARCHFLAGS']
+			puts "  using the value in ARCHFLAGS environment variable (%p)." % [ ENV['ARCHFLAGS'] ]
+			common_archs = ENV['ARCHFLAGS'].scan( /-arch\s+(\S+)/ ).flatten
+
+			# Warn if the ARCHFLAGS doesn't have at least one architecture in 
+			# common with the running ruby.
+			if ( (common_archs & ruby_archs).empty? )
+				$stderr.puts '',
+					"*** Your ARCHFLAGS setting doesn't seem to contain an architecture in common",
+					"with the running ruby interpreter (%p vs. %p)" % [ common_archs, ruby_archs ],
+					"I'll continue anyway, but if it fails, try unsetting ARCHFLAGS."
+			end
+
+			commonflags = ENV['ARCHFLAGS']
 		end
 
-		commonflags = archflags.join(' ')
-		puts "  common arch flags: %s" % [ commonflags ]
-	else
-		$stderr.puts %{
-		===========   WARNING   ===========
+		if pgconfig
+			puts "  finding flags common to both Ruby and PostgreSQL..."
+			archflags = []
+			pgcflags = `#{pgconfig} --cflags`.chomp
+			pgarchs = pgcflags.scan( /-arch\s+(\S+)/ ).flatten
+			pgarchs.each do |arch|
+				puts "  testing for architecture: %p" % [ arch ]
+				archflags << "-arch #{arch}" if ruby_archs.include?( arch )
+			end
+
+			if archflags.empty?
+				$stderr.puts '',
+					"*** Your PostgreSQL installation doesn't seem to have an architecture " +
+					"in common with the running ruby interpreter (%p vs. %p)" %
+					[ pgarchs, ruby_archs ],
+					"I'll continue anyway, but if it fails, try setting ARCHFLAGS."
+			else
+				commonflags = archflags.join(' ')
+				puts "  common arch flags: %s" % [ commonflags ]
+			end
+		else
+			$stderr.puts %{
+			===========   WARNING   ===========
 		
-		You are building this extension on OS X without setting the 
-		ARCHFLAGS environment variable, and pg_config wasn't found in 
-		your PATH. If you are seeing this message, that means that the 
-		build will probably fail.
+			You are building this extension on OS X without setting the 
+			ARCHFLAGS environment variable, and pg_config wasn't found in 
+			your PATH. If you are seeing this message, that means that the 
+			build will probably fail.
 
-		If it does, you can correct this by either including the path 
-		to 'pg_config' in your PATH or setting the environment variable 
-		ARCHFLAGS to '-arch <arch>' before building.
+			If it does, you can correct this by either including the path 
+			to 'pg_config' in your PATH or setting the environment variable 
+			ARCHFLAGS to '-arch <arch>' before building.
 
-		For example:
-		(in bash) $ export PATH=/opt/local/lib/postgresql84/bin:$PATH                  
-		          $ export ARCHFLAGS='-arch x86_64'
-		(in tcsh) % set path = ( /opt/local/lib/postgresql84/bin $PATH )
-		          % setenv ARCHFLAGS '-arch x86_64'
+			For example:
+			(in bash) $ export PATH=/opt/local/lib/postgresql84/bin:$PATH                  
+			          $ export ARCHFLAGS='-arch x86_64'
+			(in tcsh) % set path = ( /opt/local/lib/postgresql84/bin $PATH )
+			          % setenv ARCHFLAGS '-arch x86_64'
 
-		Then try building again.
+			Then try building again.
 
-		===================================
-		}.gsub( /^\t+/, '  ' )
-	end
+			===================================
+			}.gsub( /^\t+/, '  ' )
+		end
 
-	if commonflags
-		$CFLAGS.gsub!( /-arch\s+\S+ /, '' )
-		$LDFLAGS.gsub!( /-arch\s+\S+ /, '' )
-		CONFIG['LDSHARED'].gsub!( /-arch\s+\S+ /, '' )
+		if commonflags
+			$CFLAGS.gsub!( /-arch\s+\S+ /, '' )
+			$LDFLAGS.gsub!( /-arch\s+\S+ /, '' )
+			CONFIG['LDSHARED'].gsub!( /-arch\s+\S+ /, '' )
 
-		$CFLAGS << ' ' << commonflags
-		$LDFLAGS << ' ' << commonflags
-		CONFIG['LDSHARED'] << ' ' << commonflags
+			$CFLAGS << ' ' << commonflags
+			$LDFLAGS << ' ' << commonflags
+			CONFIG['LDSHARED'] << ' ' << commonflags
+		end
 	end
 end
 
-
 dir_config 'pg'
 
-if enable_config("static-build")
-	# Link against all required libraries for static build, if they are available
-	have_library('gdi32', 'CreateDC') && append_library($libs, 'gdi32')
-	have_library('secur32') && append_library($libs, 'secur32')
-	have_library('crypto', 'BIO_new') && append_library($libs, 'crypto')
-	have_library('ssl', 'SSL_new') && append_library($libs, 'ssl')
-end
-
 
-abort "Can't find the 'libpq-fe.h header" unless have_header( 'libpq-fe.h' )
-abort "Can't find the 'libpq/libpq-fs.h header" unless have_header('libpq/libpq-fs.h')
+find_header( 'libpq-fe.h' ) or abort "Can't find the 'libpq-fe.h header"
+find_header( 'libpq/libpq-fs.h' ) or abort "Can't find the 'libpq/libpq-fs.h header"
 
 abort "Can't find the PostgreSQL client library (libpq)" unless
-	have_library( 'pq', 'PQconnectdb' ) ||
-	have_library( 'libpq', 'PQconnectdb' ) ||
-	have_library( 'ms/libpq', 'PQconnectdb' )
+	have_library( 'pq', 'PQconnectdb', ['libpq-fe.h'] ) ||
+	have_library( 'libpq', 'PQconnectdb', ['libpq-fe.h'] ) ||
+	have_library( 'ms/libpq', 'PQconnectdb', ['libpq-fe.h'] )
 
 # optional headers/functions
 have_func 'PQconnectionUsedPassword'
@@ -119,8 +142,6 @@ have_func 'PQsetClientEncoding'
 # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
 have_header 'unistd.h' unless enable_config("static-build")
 
-$CFLAGS << ' -Wall'
-
 create_header()
 create_makefile( "pg_ext" )
 

data/ext/pg.c

@@ -8,8 +8,8 @@
   Author: ematsu
   modified at: Wed Jan 20 16:41:51 1999
 
-  $Author$
-  $Date$
+  $Author: ged $
+  $Date: 2010/11/12 03:39:48 $
 ************************************************/
 
 #include "pg.h"
@@ -23,7 +23,7 @@ static VALUE rb_cPGconn;
 static VALUE rb_cPGresult;
 static VALUE rb_ePGError;
 
-static const char *VERSION = "0.9.0";
+static const char *VERSION = "0.10.0";
 
 
 /* The following functions are part of libpq, but not
@@ -50,21 +50,22 @@ static const char *VERSION = "0.9.0";
  * UTILITY FUNCTIONS
  **************************************************************************/
 
-static void free_pgconn(PGconn *);
-static void pgresult_check(VALUE, VALUE);
+static void free_pgconn( PGconn * );
+static void pgresult_check( VALUE, VALUE );
 
-static PGconn *get_pgconn(VALUE self);
-static VALUE pgconn_finish(VALUE self);
-static VALUE pgresult_clear(VALUE self);
-static VALUE pgresult_aref(VALUE self, VALUE index);
-static VALUE make_column_result_array( VALUE self, int col );
+static PGconn *get_pgconn( VALUE );
+static VALUE pgconn_finish( VALUE );
+static VALUE pgresult_clear( VALUE );
+static VALUE pgresult_aref( VALUE, VALUE );
+static VALUE make_column_result_array( VALUE, int );
 
 #ifdef M17N_SUPPORTED
-# define ASSOCIATE_INDEX(obj, index_holder) rb_enc_associate_index((obj), enc_get_index((index_holder)))
-static rb_encoding * pgconn_get_client_encoding_as_rb_encoding(PGconn* conn);
-static int enc_get_index(VALUE val);
+# define ASSOCIATE_INDEX( obj, index_holder ) rb_enc_associate_index((obj), enc_get_index((index_holder)))
+static rb_encoding * pgconn_get_client_encoding_as_rb_encoding( PGconn * );
+static const char *  pgconn_get_rb_encoding_as_pg_encname( rb_encoding * );
+static int enc_get_index( VALUE );
 #else
-# define ASSOCIATE_INDEX(obj, index_holder) /* nothing */
+# define ASSOCIATE_INDEX( obj, index_holder ) /* nothing */
 #endif
 
 static PQnoticeReceiver default_notice_receiver = NULL;
@@ -240,7 +241,7 @@ parse_connect_args(int argc, VALUE *argv, VALUE self)
 	VALUE args,arg;
 	VALUE conninfo_rstr = rb_str_new("",0);
 	char *host, *port, *opt, *tty, *dbname, *login, *pwd;
-	host=port=opt=tty=dbname=login=pwd=NULL;
+	host = port = opt = tty = dbname = login = pwd = NULL;
 
 	rb_scan_args(argc, argv, "0*", &args); 
 	if (RARRAY_LEN(args) == 1) { 
@@ -291,8 +292,9 @@ parse_connect_args(int argc, VALUE *argv, VALUE self)
 		build_key_value_string(conninfo_rstr, "password", rb_ary_entry(args,6));
 	}
 	else {
-		rb_raise(rb_eArgError, 
-			"Expected connection info string, hash, or 7 separate arguments.");
+		rb_raise( rb_eArgError, 
+				  "Expected connection info string, hash, or 7 separate arguments, got a %s.",
+				  RSTRING_PTR(rb_obj_classname( args )) );
 	}
 
 	return conninfo_rstr;
@@ -388,7 +390,10 @@ pgconn_alloc(VALUE klass)
  *   # As an Array
  *   PGconn.connect( nil, 5432, nil, nil, 'test', nil, nil )
  *  
- * On failure, it raises a PGError.
+ * If the Ruby default internal encoding is set (i.e., Encoding.default_internal != nil), the
+ * connection will have its +client_encoding+ set accordingly.
+ * 
+ * @raises [PGError] if the connection fails.
  */
 static VALUE
 pgconn_init(int argc, VALUE *argv, VALUE self)
@@ -396,6 +401,10 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 	PGconn *conn = NULL;
 	VALUE conninfo;
 	VALUE error;
+#ifdef M17N_SUPPORTED	
+	rb_encoding *enc;
+	const char *encname;
+#endif
 
 	conninfo = parse_connect_args(argc, argv, self);
 	conn = PQconnectdb(StringValuePtr(conninfo));
@@ -412,6 +421,17 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 		rb_exc_raise(error);
 	}
 
+#ifdef M17N_SUPPORTED
+	/* If Ruby has its Encoding.default_internal set, set PostgreSQL's client_encoding 
+	 * to match */
+	if (( enc = rb_default_internal_encoding() )) {
+		encname = pgconn_get_rb_encoding_as_pg_encname( enc );
+		if ( PQsetClientEncoding(conn, encname) != 0 )
+			rb_warn( "Failed to set the default_internal encoding to %s: '%s'",
+			         encname, PQerrorMessage(conn) );
+	}
+#endif
+
 	if (rb_block_given_p()) {
 		return rb_ensure(rb_yield, self, pgconn_finish, self);
 	}
@@ -427,6 +447,12 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
  * This is an asynchronous version of PGconn.connect().
  *
  * Use PGconn#connect_poll to poll the status of the connection.
+ *
+ * NOTE: this does *not* set the connection's +client_encoding+ for you if 
+ * Encoding.default_internal is set. To set it after the connection is established, 
+ * call PGconn#internal_encoding=. You can also set it automatically by setting 
+ * ENV['PGCLIENTENCODING'], or include the 'options' connection parameter.
+ * 
  */
 static VALUE
 pgconn_s_connect_start(int argc, VALUE *argv, VALUE self)
@@ -489,7 +515,7 @@ pgconn_s_conndefaults(VALUE self)
 	VALUE ary = rb_ary_new();
 	VALUE hash;
 	int i = 0;
-	
+
 	for(i = 0; options[i].keyword != NULL; i++) {
 		hash = rb_hash_new();
 		if(options[i].keyword)
@@ -535,7 +561,7 @@ pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
 {
 	char *encrypted = NULL;
 	VALUE rval = Qnil;
-	
+
 	Check_Type(password, T_STRING);
 	Check_Type(username, T_STRING);
 
@@ -1065,7 +1091,7 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 		else
 			paramFormats[i] = NUM2INT(param_format);
 	}
-	
+
 	result = PQexecParams(conn, StringValuePtr(command), nParams, paramTypes, 
 		(const char * const *)paramValues, paramLengths, paramFormats, resultFormat);
 
@@ -1252,7 +1278,7 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 		else
 			paramFormats[i] = NUM2INT(param_format);
 	}
-	
+
 	result = PQexecPrepared(conn, StringValuePtr(name), nParams, 
 		(const char * const *)paramValues, paramLengths, paramFormats, 
 		resultFormat);
@@ -1617,7 +1643,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 		else
 			paramFormats[i] = NUM2INT(param_format);
 	}
-	
+
 	result = PQsendQueryParams(conn, StringValuePtr(command), nParams, paramTypes, 
 		(const char * const *)paramValues, paramLengths, paramFormats, resultFormat);
 
@@ -1802,7 +1828,7 @@ pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 		else
 			paramFormats[i] = NUM2INT(param_format);
 	}
-	
+
 	result = PQsendQueryPrepared(conn, StringValuePtr(name), nParams, 
 		(const char * const *)paramValues, paramLengths, paramFormats, 
 		resultFormat);
@@ -2038,7 +2064,7 @@ pgconn_cancel(VALUE self)
 		rb_raise(rb_ePGError,"Invalid connection!");
 
 	ret = PQcancel(cancel, errbuf, 256);
-	if(ret == 1) 
+	if(ret == 1)
 		retval = Qnil;
 	else
 		retval = rb_str_new2(errbuf);
@@ -2052,14 +2078,14 @@ pgconn_cancel(VALUE self)
  * call-seq:
  *    conn.notifies()
  *
- * Returns a hash of the unprocessed notifiers.
+ * Returns a hash of the unprocessed notifications.
  * If there is no unprocessed notifier, it returns +nil+.
  */
 static VALUE
 pgconn_notifies(VALUE self)
 {
 	PGconn* conn = get_pgconn(self);
-	PGnotify *notify;
+	PGnotify *notification;
 	VALUE hash;
 	VALUE sym_relname, sym_be_pid, sym_extra;
 	VALUE relname, be_pid, extra;
@@ -2068,21 +2094,21 @@ pgconn_notifies(VALUE self)
 	sym_be_pid = ID2SYM(rb_intern("be_pid"));
 	sym_extra = ID2SYM(rb_intern("extra"));
 
-	notify = PQnotifies(conn);
-	if (notify == NULL) {
+	notification = PQnotifies(conn);
+	if (notification == NULL) {
 		return Qnil;
 	}
-	
+
 	hash = rb_hash_new();
-	relname = rb_tainted_str_new2(notify->relname);
-	be_pid = INT2NUM(notify->be_pid);
-	extra = rb_tainted_str_new2(PGNOTIFY_EXTRA(notify));
-	
+	relname = rb_tainted_str_new2(notification->relname);
+	be_pid = INT2NUM(notification->be_pid);
+	extra = rb_tainted_str_new2(PGNOTIFY_EXTRA(notification));
+
 	rb_hash_aset(hash, sym_relname, relname);
 	rb_hash_aset(hash, sym_be_pid, be_pid);
 	rb_hash_aset(hash, sym_extra, extra);
 
-	PQfreemem(notify);
+	PQfreemem(notification);
 	return hash;
 }
 
@@ -2104,48 +2130,51 @@ pgconn_notifies(VALUE self)
 static VALUE
 pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 {
-    PGconn *conn = get_pgconn(self);
-    PGnotify *notify;
-    int sd = PQsocket(conn);
-    int ret;
-    struct timeval timeout;
-    struct timeval *ptimeout = NULL;
-    VALUE timeout_in, relname = Qnil, be_pid = Qnil;
-    double timeout_sec;
-    fd_set sd_rset;
-
-	if (sd < 0)
+	PGconn *conn = get_pgconn( self );
+	PGnotify *notification;
+	int sd = PQsocket( conn );
+	int ret;
+	struct timeval timeout;
+	struct timeval *ptimeout = NULL;
+	VALUE timeout_in, relname = Qnil, be_pid = Qnil;
+	double timeout_sec;
+	fd_set sd_rset;
+
+	if ( sd < 0 )
 		rb_bug("PQsocket(conn): couldn't fetch the connection's socket!");
 
-    if (rb_scan_args(argc, argv, "01", &timeout_in) == 1) {
-    	timeout_sec = NUM2DBL(timeout_in);
-    	timeout.tv_sec = (long)timeout_sec;
-    	timeout.tv_usec = (long)((timeout_sec - (long)timeout_sec) * 1e6);
-    	ptimeout = &timeout;
-    }
-
-    FD_ZERO(&sd_rset);
-    FD_SET(sd, &sd_rset);
-    ret = rb_thread_select(sd+1, &sd_rset, NULL, NULL, ptimeout);
-    if (ret == 0) {
-		return Qnil;
-	} else if (ret < 0) {
-		rb_sys_fail(0);
+	if ( rb_scan_args(argc, argv, "01", &timeout_in) == 1 ) {
+		timeout_sec = NUM2DBL( timeout_in );
+		timeout.tv_sec = (long)timeout_sec;
+		timeout.tv_usec = (long)( (timeout_sec - (long)timeout_sec) * 1e6 );
+		ptimeout = &timeout;
 	}
-	
-    if ( (ret = PQconsumeInput(conn)) != 1 ) {
-		rb_raise(rb_ePGError, "PQconsumeInput == %d: %s", ret, PQerrorMessage(conn));
+
+	/* Check for notifications */
+	while ( (notification = PQnotifies(conn)) == NULL ) {
+		FD_ZERO( &sd_rset );
+		FD_SET( sd, &sd_rset );
+
+		/* Wait for the socket to become readable before checking again */
+		if ( (ret = rb_thread_select(sd+1, &sd_rset, NULL, NULL, ptimeout)) < 0 )
+			rb_sys_fail( 0 );
+
+		/* Return nil if the select timed out */
+		if ( ret == 0 ) return Qnil;
+
+		/* Read the socket */
+		if ( (ret = PQconsumeInput(conn)) != 1 )
+			rb_raise(rb_ePGError, "PQconsumeInput == %d: %s", ret, PQerrorMessage(conn));
 	}
-	
-    while ((notify = PQnotifies(conn)) != NULL) {
-        relname = rb_tainted_str_new2(notify->relname);
-        be_pid = INT2NUM(notify->be_pid);
-        PQfreemem(notify);
-    }
 
-    if (rb_block_given_p()) rb_yield( rb_ary_new3(2, relname, be_pid) );
+	relname = rb_tainted_str_new2( notification->relname );
+	be_pid = INT2NUM( notification->be_pid );
+	PQfreemem( notification );
 
-    return relname;
+	if ( rb_block_given_p() )
+		rb_yield_splat( rb_ary_new3(2, relname, be_pid) );
+
+	return relname;
 }
 
 
@@ -2472,7 +2501,7 @@ pgconn_transaction(VALUE self)
 	PGresult *result;
 	VALUE rb_pgresult;
 	int status;
-	
+
 	if (rb_block_given_p()) {
 		result = PQexec(conn, "BEGIN");
 		rb_pgresult = new_pgresult(result, conn);
@@ -2490,7 +2519,7 @@ pgconn_transaction(VALUE self)
 			pgresult_check(self, rb_pgresult);
 			rb_jump_tag(status);
 		}
-			
+
 	}
 	else {
 		/* no block supplied? */
@@ -2529,7 +2558,7 @@ pgconn_s_quote_ident(VALUE self, VALUE in_str)
 	 * double-quotes. */
 	char buffer[NAMEDATALEN*2+2];
 	unsigned int i=0,j=0;
-	
+
 	if(strlen(str) >= NAMEDATALEN) {
 		rb_raise(rb_eArgError, 
 			"Input string is longer than NAMEDATALEN-1 (%d)",
@@ -3206,7 +3235,7 @@ pgresult_ftablecol(VALUE self, VALUE column_number)
 
 	if( col_number < 0 || col_number >= PQnfields(pgresult)) 
 		rb_raise(rb_eArgError,"Invalid column index: %d", col_number);
-	
+
 	n = PQftablecol(pgresult, col_number);
 	return INT2FIX(n);
 }
@@ -3502,10 +3531,12 @@ pgresult_aref(VALUE self, VALUE index)
 				PQgetlength(result, tuple_num, field_num));
 
 			/* associate client encoding for text format only */
-			if(0 == PQfformat(result, field_num)) { 
+			if(0 == PQfformat(result, field_num)) {
+				fflush( stdout );
 				ASSOCIATE_INDEX(val, self);
 			} else {
 #ifdef M17N_SUPPORTED
+				fflush( stdout );
 				rb_enc_associate(val, rb_ascii8bit_encoding());
 #endif
 			}
@@ -3548,7 +3579,7 @@ pgresult_field_values( VALUE self, VALUE field )
 
 	if ( fnum < 0 )
 		rb_raise( rb_eIndexError, "no such field '%s' in result", fieldname );
-	
+
 	return make_column_result_array( self, fnum );
 }
 
@@ -3564,7 +3595,7 @@ make_column_result_array( VALUE self, int col )
 	int row = PQntuples( result );
 	VALUE ary = rb_ary_new2( row );
 	VALUE val = Qnil;
-	
+
 	if ( col >= PQnfields(result) )
 		rb_raise( rb_eIndexError, "no column %d in result", col );
 
@@ -3583,7 +3614,7 @@ make_column_result_array( VALUE self, int col )
 
 		rb_ary_store( ary, row, val );
 	}
-	
+
 	return ary;
 }
 
@@ -3635,34 +3666,36 @@ pgresult_fields(VALUE self)
  * The mapping from canonical encoding names in PostgreSQL to ones in Ruby.
  */
 static const char * const (enc_pg2ruby_mapping[][2]) = {
-	    {"BIG5",          "Big5"       },
-	    {"EUC_CN",        "GB2312"     },
-	    {"EUC_JP",        "EUC-JP"     },
-	    {"EUC_JIS_2004",  "EUC-JP"     },
-	    {"EUC_KR",        "EUC-KR"     },
-	    {"EUC_TW",        "EUC-TW"     },
-	    {"GB18030",       "GB18030"    },
-	    {"GBK",           "GBK"        },
-	    {"ISO_8859_5",    "ISO-8859-5" },
-	    {"ISO_8859_6",    "ISO-8859-6" },
-	    {"ISO_8859_7",    "ISO-8859-7" },
-	    {"ISO_8859_8",    "ISO-8859-8" },
-	    /* {"JOHAB",         "JOHAB"     }, dummy */
-	    {"KOI8",          "KOI8-U"     },
-	    {"LATIN1",        "ISO-8859-1" },
-	    {"LATIN2",        "ISO-8859-2" },
-	    {"LATIN3",        "ISO-8859-3" },
-	    {"LATIN4",        "ISO-8859-4" },
-	    {"LATIN5",        "ISO-8859-5" },
-	    {"LATIN6",        "ISO-8859-6" },
-	    {"LATIN7",        "ISO-8859-7" },
-	    {"LATIN8",        "ISO-8859-8" },
-	    {"LATIN9",        "ISO-8859-9" },
+	    {"BIG5",          "Big5"        },
+	    {"EUC_CN",        "GB2312"      },
+	    {"EUC_JP",        "EUC-JP"      },
+	    {"EUC_JIS_2004",  "EUC-JP"      },
+	    {"EUC_KR",        "EUC-KR"      },
+	    {"EUC_TW",        "EUC-TW"      },
+	    {"GB18030",       "GB18030"     },
+	    {"GBK",           "GBK"         },
+	    {"ISO_8859_5",    "ISO-8859-5"  },
+	    {"ISO_8859_6",    "ISO-8859-6"  },
+	    {"ISO_8859_7",    "ISO-8859-7"  },
+	    {"ISO_8859_8",    "ISO-8859-8"  },
+	    /* {"JOHAB",         "JOHAB"       }, dummy */
+	    {"KOI8",          "KOI8-R"      },
+	    {"KOI8R",         "KOI8-R"      },
+	    {"KOI8U",         "KOI8-U"      },
+	    {"LATIN1",        "ISO-8859-1"  },
+	    {"LATIN2",        "ISO-8859-2"  },
+	    {"LATIN3",        "ISO-8859-3"  },
+	    {"LATIN4",        "ISO-8859-4"  },
+	    {"LATIN5",        "ISO-8859-5"  },
+	    {"LATIN6",        "ISO-8859-6"  },
+	    {"LATIN7",        "ISO-8859-7"  },
+	    {"LATIN8",        "ISO-8859-8"  },
+	    {"LATIN9",        "ISO-8859-9"  },
 	    {"LATIN10",       "ISO-8859-10" },
-	    {"MULE_INTERNAL", "Emacs-Mule" },
+	    {"MULE_INTERNAL", "Emacs-Mule"  },
 	    {"SJIS",          "Windows-31J" },
 	    {"SHIFT_JIS_2004","Windows-31J" },
-	    /*{"SQL_ASCII",     NULL        },  special case*/
+	    /* {"SQL_ASCII",     NULL          },  special case*/
 	    {"UHC",           "CP949"       },
 	    {"UTF8",          "UTF-8"       },
 	    {"WIN866",        "IBM866"      },
@@ -3756,6 +3789,30 @@ cache:
 	return enc;
 }
 
+
+/* 
+ * Returns the given rb_encoding as the equivalent PostgreSQL encoding string.
+ * 
+ */
+static const char *
+pgconn_get_rb_encoding_as_pg_encname( rb_encoding *enc )
+{
+	const char *rb_encname = rb_enc_name( enc );
+	const char *encname = NULL;
+	int i;
+
+	for (i = 0; i < sizeof(enc_pg2ruby_mapping)/sizeof(enc_pg2ruby_mapping[0]); ++i) {
+		if (strcmp(rb_encname, enc_pg2ruby_mapping[i][1]) == 0) {
+			encname = enc_pg2ruby_mapping[i][0];
+		}
+	}
+
+	if ( !encname ) encname = "SQL_ASCII";
+
+	return encname;
+}
+
+
 /*
  * call-seq:
  *   conn.internal_encoding() -> Encoding
@@ -3933,7 +3990,7 @@ Init_pg_ext()
 	rb_define_singleton_method(rb_cPGconn, "conndefaults", pgconn_s_conndefaults, 0);
 
 	/******     PGconn CLASS CONSTANTS: Connection Status     ******/
-	
+
 	/* Connection succeeded */
 	rb_define_const(rb_cPGconn, "CONNECTION_OK", INT2FIX(CONNECTION_OK));
 	/* Connection failed */
@@ -3966,7 +4023,7 @@ Init_pg_ext()
 	rb_define_const(rb_cPGconn, "PGRES_POLLING_OK", INT2FIX(PGRES_POLLING_OK));
 
 	/******     PGconn CLASS CONSTANTS: Transaction Status     ******/
-	
+
 	/* Transaction is currently idle (#transaction_status) */
 	rb_define_const(rb_cPGconn, "PQTRANS_IDLE", INT2FIX(PQTRANS_IDLE));
 	/* Transaction is currently active; query has been sent to the server, but not yet completed. (#transaction_status) */