pg 0.12.1 → 0.12.2

data/ChangeLog

@@ -1,7 +1,48 @@
+2012-01-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc:
+	Updating history for Lars's patch
+	[5daf0ca646d2] [tip]
+
+	* 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  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-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* Merged with 6fc514ea2547
+	[5ec3792d1cac]
+
+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>
 
+	* History.rdoc:
+	Updating history file with the st.h change
+	[935f29411410]
+
 	* Merged with f8d66e32b9a8
-	[f72b14d349bf] [tip]
+	[f72b14d349bf] [github/master]
 
 2011-12-14  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,8 +1,17 @@
+== 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>

data/ext/extconf.rb

@@ -61,7 +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 abort "pg currently requires the ruby/st.h header"
+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

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: ged $
-  $Date: 2011/12/14 20:20:25 $
+  $Date: 2012/01/03 23:14:35 $
 ************************************************/
 
 #include "pg.h"
@@ -28,7 +28,7 @@ static VALUE rb_cPGconn;
 static VALUE rb_cPGresult;
 static VALUE rb_ePGError;
 
-static const char *VERSION = "0.12.1";
+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,7 +14,11 @@
 #endif /* HAVE_UNISTD_H */
 
 #include "ruby.h"
-#include "ruby/st.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -49,11 +49,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70247769972340 !ruby/object:Gem::Requirement
+  requirement: &70233760093620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70247769972340
+  version_requirements: *70233760093620
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70247769971300 !ruby/object:Gem::Requirement
+  requirement: &70233760093100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70247769971300
+  version_requirements: *70233760093100
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70247769970780 !ruby/object:Gem::Requirement
+  requirement: &70233760092580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70247769970780
+  version_requirements: *70233760092580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70247769970320 !ruby/object:Gem::Requirement
+  requirement: &70233760092140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +94,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70247769970320
+  version_requirements: *70233760092140
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70247769969900 !ruby/object:Gem::Requirement
+  requirement: &70233760091700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70247769969900
+  version_requirements: *70233760091700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70247770191220 !ruby/object:Gem::Requirement
+  requirement: &70233760164380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -116,7 +116,7 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70247770191220
+  version_requirements: *70233760164380
 description: ! "Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].\n\nIt
   works with PostgreSQL 8.2 and later.\n\nThis will be the last minor version to support
   8.2 -- 0.13 will support 8.3 \nand later, following the \n{PostgreSQL Release Support