pg 0.12.0-x86-mingw32 → 0.12.2-x86-mingw32

data/ChangeLog

@@ -1,8 +1,106 @@
+2012-01-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.12.2 for changeset 88bd78632f86
+	[622bef3960c3] [tip]
+
+	* .hgsigs:
+	Added signature for changeset f3dfdb6929b7
+	[88bd78632f86] [v0.12.2]
+
+	* History.rdoc, ext/pg.c:
+	Bump patch version for release.
+	[f3dfdb6929b7]
+
+	* ext/pg.c, spec/m17n_spec.rb:
+	Encode the messages of PGErrors with the encoding of the connection.
+	(fixes #96)
+	[b62c49d91eb2]
+
+	* History.rdoc:
+	Updating history for Lars's patch
+	[5daf0ca646d2]
+
+	* spec/m17n_spec.rb, spec/pgconn_spec.rb, spec/pgresult_spec.rb:
+	Moved all the spec hooks to the top of the file
+	[42671e5d4d67]
+
+2012-01-03  Michael Granger  <ged@faeriemud.org>
+
+	* Merged in larskanis/ruby-pg (pull request #4)
+	[8d88c47ccc9b]
+
+2012-01-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* Merged with 6fc514ea2547
+	[5ec3792d1cac]
+
+2011-12-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc:
+	Updating history file with the st.h change
+	[935f29411410]
+
+2012-01-03  Lars Kanis  <kanis@comcard.de>
+
+	* ext/extconf.rb, ext/pg.h:
+	Alternatively include 'st.h' instead of 'ruby/st.h'. This fixes
+	compilation on Ruby 1.8.
+	[0cf272cb383f]
+
+2012-01-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.12.1 for changeset 21f84883e5c2
+	[6fc514ea2547]
+
+	* .hgsigs:
+	Added signature for changeset f72b14d349bf
+	[21f84883e5c2] [v0.12.1]
+
+2011-12-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* Merged with f8d66e32b9a8
+	[f72b14d349bf]
+
+2011-12-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc, ext/pg.c:
+	Bumped patch version, updated History.
+	[f8d66e32b9a8]
+
+2011-12-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .tm_properties:
+	Adding my TextMate2 project settings
+	[daa6f202c54a]
+
+	* ext/extconf.rb, ext/pg.h:
+	Explicitly include the st.h file for interpreters that need it
+	(fixes #95)
+	[448cccfe5bbb]
+
+	* Rakefile.cross:
+	Allow native compiles without Mingw tools present
+	[f15ac13b396b]
+
+	* Rakefile, Rakefile.cross:
+	Whitespace consistency fixes
+	[784c6c5cbea9]
+
+2011-12-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile:
+	Made rake-compiler a dev dependency. Thanks to eolamey@bitbucket and
+	Jeremy Evans for pointing out that it isn't needed for gem
+	installation. (Fixes #93)
+	[af645318f239]
+
 2011-12-07  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.12.0 for changeset b767401684d8
-	[1060487e7621] [tip]
+	[1060487e7621]
 
 	* .hgsigs:
 	Added signature for changeset 19b551f972e2

data/History.rdoc

@@ -1,3 +1,19 @@
+== v0.12.2 [2012-01-03] Michael Granger <ged@FaerieMUD.org>
+
+- Fix for the 1.8.7 breakage introduced by the st.h fix for alternative Ruby
+  implementations (#97 and #98). Thanks to Lars Kanis for the patch.
+- Encode error messages with the connection's encoding under 1.9 (#96)
+
+
+== v0.12.1 [2011-12-14] Michael Granger <ged@FaerieMUD.org>
+
+- Made rake-compiler a dev dependency, as Rubygems doesn't use the Rakefile
+  for compiling the extension. Thanks to eolamey@bitbucket and Jeremy Evans
+  for pointing this out.
+- Added an explicit include for ruby/st.h for implementations that need it
+  (fixes #95).
+
+
 == v0.12.0 [2011-12-07] Michael Granger <ged@FaerieMUD.org>
 
 - PGconn#wait_for_notify

data/Rakefile

@@ -55,7 +55,7 @@ $hoespec = Hoe.spec 'pg' do
 	self.developer 'Jeff Davis', 'ruby-pg@j-davis.com'
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'rake-compiler', '~> 0.7'
+	self.dependency 'rake-compiler', '~> 0.7', :developer
 	self.dependency	'rspec', '~> 2.6', :developer
 
 	self.spec_extras[:licenses] = ['BSD', 'Ruby', 'GPL']
@@ -109,14 +109,14 @@ Rake::ExtensionTask.new do |ext|
 	ext.cross_compile  = true
 	ext.cross_platform = %w[i386-mingw32]
 
-  # configure options only for cross compile
-  ext.cross_config_options += [
-    "--with-pg-include=#{STATIC_POSTGRESQL_LIBDIR}",
-    "--with-opt-include=#{STATIC_POSTGRESQL_INCDIR}",
-    "--with-pg-lib=#{STATIC_POSTGRESQL_LIBDIR}",
-    "--with-opt-lib=#{STATIC_OPENSSL_BUILDDIR}",
-    "--enable-static-build",
-  ]
+	# configure options only for cross compile
+	ext.cross_config_options += [
+		"--with-pg-include=#{STATIC_POSTGRESQL_LIBDIR}",
+		"--with-opt-include=#{STATIC_POSTGRESQL_INCDIR}",
+		"--with-pg-lib=#{STATIC_POSTGRESQL_LIBDIR}",
+		"--with-opt-lib=#{STATIC_OPENSSL_BUILDDIR}",
+		"--enable-static-build",
+	]
 end
 
 
@@ -127,7 +127,7 @@ end
 file 'ChangeLog' => '.hg/branch' do |task|
 	$stderr.puts "Updating the changelog..."
 	begin
-               include Hoe::MercurialHelpers
+    include Hoe::MercurialHelpers
 		content = make_changelog()
 	rescue NameError
 		abort "Packaging tasks require the hoe-mercurial plugin (gem install hoe-mercurial)"

data/Rakefile.cross

@@ -10,11 +10,11 @@ require 'rake/extensioncompiler'
 MISCDIR = BASEDIR + 'misc'
 
 NUM_CPUS = if File.exist?('/proc/cpuinfo')
-  File.read('/proc/cpuinfo').scan('processor').length
+	File.read('/proc/cpuinfo').scan('processor').length
 elsif RUBY_PLATFORM.include?( 'darwin' )
-  `system_profiler SPHardwareDataType | grep 'Cores' | awk '{print $5}'`.chomp
+	`system_profiler SPHardwareDataType | grep 'Cores' | awk '{print $5}'`.chomp
 else
-  1
+	1
 end
 
 # Cross-compilation constants
@@ -29,7 +29,7 @@ STATIC_BUILDDIR            = COMPILE_HOME + 'builds'
 STATIC_OPENSSL_BUILDDIR    = STATIC_BUILDDIR + "openssl-#{OPENSSL_VERSION}"
 
 OPENSSL_SOURCE_URI         =
-  URI( "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz" )
+	URI( "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz" )
 OPENSSL_TARBALL            = STATIC_SOURCESDIR + File.basename( OPENSSL_SOURCE_URI.path )
 OPENSSL_MAKEFILE           = STATIC_OPENSSL_BUILDDIR + 'Makefile'
 
@@ -41,9 +41,9 @@ OPENSSL_PATCHES            = Rake::FileList[ MISCDIR + "openssl-#{OPENSSL_VERSIO
 # Static PostgreSQL build vars
 STATIC_POSTGRESQL_BUILDDIR = STATIC_BUILDDIR + "postgresql-#{POSTGRESQL_VERSION}"
 POSTGRESQL_SOURCE_URI      = begin
-  uristring = "http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/" +
-    "v%s/postgresql-%s.tar.bz2" % [ POSTGRESQL_VERSION, POSTGRESQL_VERSION ]
-  URI( uristring )
+	uristring = "http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/" +
+		"v%s/postgresql-%s.tar.bz2" % [ POSTGRESQL_VERSION, POSTGRESQL_VERSION ]
+	URI( uristring )
 end
 POSTGRESQL_TARBALL         = STATIC_SOURCESDIR + File.basename( POSTGRESQL_SOURCE_URI.path )
 
@@ -56,7 +56,12 @@ POSTGRESQL_SHLIB_MAKEFILE  = STATIC_POSTGRESQL_SRCDIR + 'Makefile.shlib'
 POSTGRESQL_SHLIB_MF_ORIG   = STATIC_POSTGRESQL_SRCDIR + 'Makefile.shlib.orig'
 POSTGRESQL_LIB             = STATIC_POSTGRESQL_LIBDIR + 'libpq.a'
 
-CROSS_PREFIX = Rake::ExtensionCompiler.mingw_host
+CROSS_PREFIX = begin
+	Rake::ExtensionCompiler.mingw_host
+rescue => err
+	$stderr.puts "Cross-compilation disabled -- %s" % [ err.message ]
+	'unknown'
+end
 
 
 # clean intermediate files and folders
@@ -66,13 +71,13 @@ CLEAN.include( STATIC_BUILDDIR.to_s )
 ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3'
 
 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}"
-  FileUtils.mv part, save_to
+	part = save_to+".part"
+	sh "wget #{url.to_s.inspect} -O #{part.inspect} || curl #{url.to_s.inspect} -o #{part.inspect}"
+	FileUtils.mv part, save_to
 end
 
 def run(*args)
-  sh *args
+	sh *args
 end
 
 #####################################################################
@@ -89,62 +94,62 @@ directory STATIC_OPENSSL_BUILDDIR.to_s
 
 # openssl source file should be stored there
 file OPENSSL_TARBALL => STATIC_SOURCESDIR do |t|
-  download( OPENSSL_SOURCE_URI, t.name )
+	download( OPENSSL_SOURCE_URI, t.name )
 end
 
 # Extract the openssl builds
 file STATIC_OPENSSL_BUILDDIR => OPENSSL_TARBALL do |t|
-  puts "extracting %s to %s" % [ OPENSSL_TARBALL, STATIC_OPENSSL_BUILDDIR.parent ]
-  STATIC_OPENSSL_BUILDDIR.mkpath
-  run 'tar', '-xzf', OPENSSL_TARBALL.to_s, '-C', STATIC_OPENSSL_BUILDDIR.parent.to_s
-  OPENSSL_MAKEFILE.unlink if OPENSSL_MAKEFILE.exist?
+	puts "extracting %s to %s" % [ OPENSSL_TARBALL, STATIC_OPENSSL_BUILDDIR.parent ]
+	STATIC_OPENSSL_BUILDDIR.mkpath
+	run 'tar', '-xzf', OPENSSL_TARBALL.to_s, '-C', STATIC_OPENSSL_BUILDDIR.parent.to_s
+	OPENSSL_MAKEFILE.unlink if OPENSSL_MAKEFILE.exist?
 
-  OPENSSL_PATCHES.each do |patchfile|
-    puts "  applying patch #{patchfile}..."
-    run 'patch', '-Np1', '-d', STATIC_OPENSSL_BUILDDIR.to_s,
-      '-i', File.expand_path( patchfile, BASEDIR )
-  end
+	OPENSSL_PATCHES.each do |patchfile|
+		puts "  applying patch #{patchfile}..."
+		run 'patch', '-Np1', '-d', STATIC_OPENSSL_BUILDDIR.to_s,
+		'-i', File.expand_path( patchfile, BASEDIR )
+	end
 end
 
 CMD_PRELUDE = [
-  'env',
-  "CC=#{CROSS_PREFIX}-gcc",
-  "CFLAGS=-DDSO_WIN32",
-  "AR=#{CROSS_PREFIX}-ar",
-  "RANLIB=#{CROSS_PREFIX}-ranlib"
+	'env',
+	"CC=#{CROSS_PREFIX}-gcc",
+	"CFLAGS=-DDSO_WIN32",
+	"AR=#{CROSS_PREFIX}-ar",
+	"RANLIB=#{CROSS_PREFIX}-ranlib"
 ]
 
 
 # generate the makefile in a clean build location
 file OPENSSL_MAKEFILE => STATIC_OPENSSL_BUILDDIR do |t|
-  Dir.chdir( STATIC_OPENSSL_BUILDDIR ) do
-    cmd = CMD_PRELUDE.dup
-    cmd << "./Configure" << 'mingw'
+	Dir.chdir( STATIC_OPENSSL_BUILDDIR ) do
+		cmd = CMD_PRELUDE.dup
+		cmd << "./Configure" << 'mingw'
 
-    run( *cmd )
-  end
+		run( *cmd )
+	end
 end
 
 desc "compile static openssl libraries"
 task :openssl_libs => [ LIBSSLEAY32, LIBEAY32 ]
 
 task :compile_static_openssl => OPENSSL_MAKEFILE do |t|
-  Dir.chdir( STATIC_OPENSSL_BUILDDIR ) do
-    cmd = CMD_PRELUDE.dup
-    cmd << 'make' << "-j#{NUM_CPUS}" << 'build_libs'
+	Dir.chdir( STATIC_OPENSSL_BUILDDIR ) do
+		cmd = CMD_PRELUDE.dup
+		cmd << 'make' << "-j#{NUM_CPUS}" << 'build_libs'
 
-    run( *cmd )
-  end
+		run( *cmd )
+	end
 end
 
 desc "compile static #{LIBEAY32}"
 file LIBEAY32 => :compile_static_openssl do |t|
-  FileUtils.cp( STATIC_OPENSSL_BUILDDIR + 'libcrypto.a', LIBEAY32.to_s )
+	FileUtils.cp( STATIC_OPENSSL_BUILDDIR + 'libcrypto.a', LIBEAY32.to_s )
 end
 
 desc "compile static #{LIBSSLEAY32}"
 file LIBSSLEAY32 => :compile_static_openssl do |t|
-  FileUtils.cp( STATIC_OPENSSL_BUILDDIR + 'libssl.a', LIBSSLEAY32.to_s )
+	FileUtils.cp( STATIC_OPENSSL_BUILDDIR + 'libssl.a', LIBSSLEAY32.to_s )
 end
 
 
@@ -157,61 +162,61 @@ directory STATIC_POSTGRESQL_BUILDDIR.to_s
 
 # postgresql source file should be stored there
 file POSTGRESQL_TARBALL => STATIC_SOURCESDIR do |t|
-  download( POSTGRESQL_SOURCE_URI, t.name )
+	download( POSTGRESQL_SOURCE_URI, t.name )
 end
 
 # Extract the postgresql sources
 file STATIC_POSTGRESQL_BUILDDIR => POSTGRESQL_TARBALL do |t|
-  puts "extracting %s to %s" % [ POSTGRESQL_TARBALL, STATIC_POSTGRESQL_BUILDDIR.parent ]
-  STATIC_POSTGRESQL_BUILDDIR.mkpath
-  run 'tar', '-xjf', POSTGRESQL_TARBALL.to_s, '-C', STATIC_POSTGRESQL_BUILDDIR.parent.to_s
-  mv POSTGRESQL_SHLIB_MAKEFILE, POSTGRESQL_SHLIB_MF_ORIG
+	puts "extracting %s to %s" % [ POSTGRESQL_TARBALL, STATIC_POSTGRESQL_BUILDDIR.parent ]
+	STATIC_POSTGRESQL_BUILDDIR.mkpath
+	run 'tar', '-xjf', POSTGRESQL_TARBALL.to_s, '-C', STATIC_POSTGRESQL_BUILDDIR.parent.to_s
+	mv POSTGRESQL_SHLIB_MAKEFILE, POSTGRESQL_SHLIB_MF_ORIG
 end
 
 # generate the makefile in a clean build location
 file POSTGRESQL_GLOBAL_MAKEFILE => [ STATIC_POSTGRESQL_BUILDDIR, :openssl_libs ] do |t|
-  options = [
-    '--target=i386-mingw32',
-    "--host=#{Rake::ExtensionCompiler.mingw_host}",
-    '--with-openssl',
-    '--without-zlib',
-    '--disable-shared',
-  ]
+	options = [
+		'--target=i386-mingw32',
+		"--host=#{Rake::ExtensionCompiler.mingw_host}",
+		'--with-openssl',
+		'--without-zlib',
+		'--disable-shared',
+	]
 
-  Dir.chdir( STATIC_POSTGRESQL_BUILDDIR ) do
-    configure_path = STATIC_POSTGRESQL_BUILDDIR + 'configure'
-    cmd = [ configure_path.to_s, *options ]
-    cmd << "CFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
-    cmd << "LDFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
-    cmd << "LDFLAGS_SL=-L#{STATIC_OPENSSL_BUILDDIR}"
-    cmd << "LIBS=-lwsock32 -lws2_32 -lgdi32"
-    cmd << "CPPFLAGS=-I#{STATIC_OPENSSL_BUILDDIR}/include"
+	Dir.chdir( STATIC_POSTGRESQL_BUILDDIR ) do
+		configure_path = STATIC_POSTGRESQL_BUILDDIR + 'configure'
+		cmd = [ configure_path.to_s, *options ]
+		cmd << "CFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
+		cmd << "LDFLAGS=-L#{STATIC_OPENSSL_BUILDDIR}"
+		cmd << "LDFLAGS_SL=-L#{STATIC_OPENSSL_BUILDDIR}"
+		cmd << "LIBS=-lwsock32 -lws2_32 -lgdi32"
+		cmd << "CPPFLAGS=-I#{STATIC_OPENSSL_BUILDDIR}/include"
 
-    run( *cmd )
-  end
+		run( *cmd )
+	end
 end
 
 
 # patch the Makefile.shlib -- depend on the build dir so it's only
 # rewritten if the tarball is re-extracted.
 file POSTGRESQL_SHLIB_MAKEFILE => POSTGRESQL_SHLIB_MF_ORIG do |t|
-  tf = Tempfile.new( POSTGRESQL_SHLIB_MAKEFILE.basename )
-  POSTGRESQL_SHLIB_MF_ORIG.open( File::RDONLY ) do |ifh|
-    ifh.each_line do |line|
-      tf.print( line.sub(/^(\s*haslibarule\s*=\s*yes)/, "# \\1 ") )
-    end
-  end
-  tf.close
+	tf = Tempfile.new( POSTGRESQL_SHLIB_MAKEFILE.basename )
+	POSTGRESQL_SHLIB_MF_ORIG.open( File::RDONLY ) do |ifh|
+		ifh.each_line do |line|
+			tf.print( line.sub(/^(\s*haslibarule\s*=\s*yes)/, "# \\1 ") )
+		end
+	end
+	tf.close
 
-  FileUtils.mv( tf.path, t.name, :verbose => $puts )
+	FileUtils.mv( tf.path, t.name, :verbose => $puts )
 end
 
 
 # make libpq.a
 task POSTGRESQL_LIB => [ POSTGRESQL_GLOBAL_MAKEFILE, POSTGRESQL_SHLIB_MAKEFILE ] do |t|
-  Dir.chdir( POSTGRESQL_LIB.dirname ) do
-    sh 'make', "-j#{NUM_CPUS}", POSTGRESQL_LIB.basename.to_s, 'PORTNAME=win32'
-  end
+	Dir.chdir( POSTGRESQL_LIB.dirname ) do
+		sh 'make', "-j#{NUM_CPUS}", POSTGRESQL_LIB.basename.to_s, 'PORTNAME=win32'
+	end
 end
 
 
@@ -220,15 +225,15 @@ task :static_libpq => POSTGRESQL_LIB
 
 desc 'cross compile pg for win32'
 task :cross do
-  ENV['CROSS_COMPILING'] = 'yes'
+	ENV['CROSS_COMPILING'] = 'yes'
 end
 task :cross => [ :mingw32, :static_libpq ]
 
 task :mingw32 do
-  # Use Rake::ExtensionCompiler helpers to find the proper host
-  unless Rake::ExtensionCompiler.mingw_host then
-    warn "You need to install mingw32 cross compile functionality to be able to continue."
-    warn "Please refer to your distribution/package manager documentation about installation."
-    fail
-  end
+	# Use Rake::ExtensionCompiler helpers to find the proper host
+	unless Rake::ExtensionCompiler.mingw_host then
+		warn "You need to install mingw32 cross compile functionality to be able to continue."
+		warn "Please refer to your distribution/package manager documentation about installation."
+		fail
+	end
 end

data/ext/extconf.rb

@@ -61,6 +61,7 @@ $defs.push( "-DHAVE_ST_NOTIFY_EXTRA" ) if
 
 # 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")
+have_header 'ruby/st.h' or have_header 'st.h' or abort "pg currently requires the ruby/st.h header"
 
 create_header()
 create_makefile( "pg_ext" )

data/ext/pg.c

@@ -28,7 +28,7 @@ static VALUE rb_cPGconn;
 static VALUE rb_cPGresult;
 static VALUE rb_ePGError;
 
-static const char *VERSION = "0.12.0";
+static const char *VERSION = "0.12.2";
 
 
 /* The following functions are part of libpq, but not
@@ -134,14 +134,17 @@ new_pgresult(PGresult *result)
 static void
 pgresult_check(VALUE rb_pgconn, VALUE rb_pgresult)
 {
-	VALUE error;
+	VALUE error, exception;
 	PGconn *conn = get_pgconn(rb_pgconn);
 	PGresult *result;
 	Data_Get_Struct(rb_pgresult, PGresult, result);
+#ifdef M17N_SUPPORTED
+	rb_encoding *enc = pgconn_get_client_encoding_as_rb_encoding(conn);
+#endif
 
 	if(result == NULL)
 	{
-		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
+		error = rb_str_new2( PQerrorMessage(conn) );
 	}
 	else
 	{
@@ -156,17 +159,21 @@ pgresult_check(VALUE rb_pgconn, VALUE rb_pgresult)
 		case PGRES_BAD_RESPONSE:
 		case PGRES_FATAL_ERROR:
 		case PGRES_NONFATAL_ERROR:
-			error = rb_exc_new2(rb_ePGError, PQresultErrorMessage(result));
+			error = rb_str_new2( PQresultErrorMessage(result) );
 			break;
 		default:
-			error = rb_exc_new2(rb_ePGError,
-				"internal error : unknown result status.");
+			error = rb_str_new2( "internal error : unknown result status." );
 		}
 	}
 
-	rb_iv_set(error, "@connection", rb_pgconn);
-	rb_iv_set(error, "@result", rb_pgresult);
-	rb_exc_raise(error);
+#ifdef M17N_SUPPORTED
+	rb_enc_set_index( error, rb_enc_to_index(enc) );
+#endif
+	exception = rb_exc_new3( rb_ePGError, error );
+	rb_iv_set( exception, "@connection", rb_pgconn );
+	rb_iv_set( exception, "@result", rb_pgresult );
+	rb_exc_raise( exception );
+
 	return;
 }
 

data/ext/pg.h

@@ -14,6 +14,11 @@
 #endif /* HAVE_UNISTD_H */
 
 #include "ruby.h"
+#ifdef HAVE_RUBY_ST_H
+  #include "ruby/st.h"
+#elif HAVE_ST_H
+  #include "st.h"
+#endif
 #include "libpq-fe.h"
 #include "libpq/libpq-fs.h"              /* large-object interface */
 #include "compat.h"

data/spec/m17n_spec.rb

@@ -26,6 +26,18 @@ describe "multinationalization support", :ruby_19 => true do
 		@conn.exec( 'BEGIN' )
 	end
 
+	after( :each ) do
+		@conn.exec( 'ROLLBACK' ) if @conn
+	end
+
+	after( :all ) do
+		teardown_testing_db( @conn ) if @conn
+	end
+
+
+	#
+	# Examples
+	#
 
 	it "should return the same bytes in text format that are sent as inline text" do
 		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
@@ -115,6 +127,7 @@ describe "multinationalization support", :ruby_19 => true do
 		end
 	end
 
+
 	describe "Ruby 1.9.x default_internal encoding" do
 
 		it "honors the Encoding.default_internal if it's set and the synchronous interface is used" do
@@ -141,11 +154,17 @@ describe "multinationalization support", :ruby_19 => true do
 	end
 
 
-	after( :each ) do
-		@conn.exec( 'ROLLBACK' ) if @conn
-	end
+	it "encodes exception messages with the connection's encoding (#96)" do
+		@conn.set_client_encoding( 'utf-8' )
+		@conn.exec "CREATE TABLE foo (bar TEXT)"
 
-	after( :all ) do
-		teardown_testing_db( @conn ) if @conn
+		begin
+			@conn.exec "INSERT INTO foo VALUES ('Côte d'Ivoire')"
+		rescue => err
+			err.message.encoding.should == Encoding::UTF_8
+		else
+			fail "No exception raised?!"
+		end
 	end
+
 end

data/spec/pgconn_spec.rb

@@ -22,6 +22,7 @@ require 'timeout'
 describe PGconn do
 	include PgTestingHelpers
 
+
 	before( :all ) do
 		@conn = setup_testing_db( "PGconn" )
 	end
@@ -30,6 +31,19 @@ describe PGconn do
 		@conn.exec( 'BEGIN' )
 	end
 
+	after( :each ) do
+		@conn.exec( 'ROLLBACK' )
+	end
+
+	after( :all ) do
+		teardown_testing_db( @conn )
+	end
+
+
+	#
+	# Examples
+	#
+
 	it "can create a connection option string from a Hash of options" do
 		optstring = PGconn.parse_connect_args( 
 			:host => 'pgsql.example.com',
@@ -633,11 +647,4 @@ describe PGconn do
 		result.should == { 'one' => '47' }
 	end
 
-	after( :each ) do
-		@conn.exec( 'ROLLBACK' )
-	end
-
-	after( :all ) do
-		teardown_testing_db( @conn )
-	end
 end

data/spec/pgresult_spec.rb

@@ -29,6 +29,18 @@ describe PGresult do
 		@conn.exec( 'BEGIN' )
 	end
 
+	after( :each ) do
+		@conn.exec( 'ROLLBACK' )
+	end
+
+	after( :all ) do
+		teardown_testing_db( @conn )
+	end
+
+
+	#
+	# Examples
+	#
 
 	it "should act as an array of hashes" do
 		res = @conn.exec("SELECT 1 AS a, 2 AS b")
@@ -240,11 +252,4 @@ describe PGresult do
 		res.ftablecol(1).should == 0 # and it shouldn't raise an exception, either
 	end
 
-	after( :each ) do
-		@conn.exec( 'ROLLBACK' )
-	end
-
-	after( :all ) do
-		teardown_testing_db( @conn )
-	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pg
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 2
+  version: 0.12.2
 platform: x86-mingw32
 authors: 
 - Jeff Davis
@@ -16,37 +16,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 Z
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: hoe-mercurial
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 25
         segments: 
-        - 0
-        - 7
-        version: "0.7"
-  type: :runtime
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe-mercurial
+  name: rake-compiler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 5
         segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
+        - 0
+        - 7
+        version: "0.7"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency