pg 0.17.0-x86-mingw32 → 0.17.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 1c9b4b7519082416df6928f3807efec279d02f1e
-  data.tar.gz: f2840efc8e7dcec186201e3cc18fc685a4660da8
-SHA512: 
-  metadata.gz: 245b15b19aace0f837e90b376cbad7cac3ec6ab12edac39fee6da2b27f0d74fd0a2467d3358adaf70a92c719fe974d48bd6595e7b73d5f40e8388e43147b2043
-  data.tar.gz: 637a37f991a85bccfbd05320b80fd094eabf71b8ac45211d9b358eaa2b471e785e6c15364317ef0f34613614c8c6caff8db89ad1e279ae7a25f9b5451ee5628b
+---
+SHA1:
+  metadata.gz: 4c7c29f40f9a51dc5ee533c2941b10ef46b94c82
+  data.tar.gz: e8e9df256383c926e8ed75c8f723a97e646cff41
+SHA512:
+  metadata.gz: 0b583b54222a42592c2d5cc23160b513b127b896098d5a89f68205274416622821c3a47b3ac60c9a37e9da36fca94cd08398a5462328e48729c6f2edd5ea1d36
+  data.tar.gz: 3ba6db810aad50bede098a71433e23b1ff4a49fd673589718d52170b7eaec878466a2dedb43a6c0d3476b772311e9a1ecfe06e8b72c2f34bc55f04dd6744aa8e

data/ChangeLog

@@ -1,8 +1,46 @@
+2013-12-09  Lars Kanis  <kanis@comcard.de>
+
+	* ext/gvl_wrappers.c, ext/gvl_wrappers.h, ext/pg_connection.c,
+	spec/pg/connection_spec.rb:
+	Revert commit e0492d4 "Ensure a query is canceled, if a thread is
+	about to be killed."
+
+	This is due to this discussion: https://groups.google.com/d/topic
+	/ruby-pg/5_ylGmog1S4/discussion
+
+	We were using rb_thread_call_without_gvl() with an ubf which
+	canceled the query currently being processed. This turned out to be
+	incompatible with possibly registered signal handlers (by
+	Signal.trap). A ubf is unconditionally invoked if ANY signal fires
+	on a process (eg even: USR1 or PROF) and Ruby has handlers
+	registered. Cancelling queries in those conditions does no make
+	sense.
+
+	This commit re-enables Connection#async_exec based on the async API
+	for all ruby versions, because async_exec allowes cancelation of
+	queries by signals like Control+C.
+
+	Thanks to Sam Saffron for highlighting this issue.
+	[97c3ec224be9] [tip] <revert_query_cancel_on_ubf>
+
+2013-09-23  Michael Granger  <ged@FaerieMUD.org>
+
+	* ext/pg_connection.c, lib/pg/connection.rb:
+	Fix documentation for PG::Connection::conndefaults.
+	[9812218e0654]
+
+2013-09-20  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/gvl_wrappers.h, ext/pg_connection.c:
+	Wrap PQcancel to be called without GVL. It internally waits for
+	close of the connection to be canceled.
+	[0ed6451d10a5]
+
 2013-09-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.17.0 for changeset 30da9c169efc
-	[46f35f5b396e] [tip]
+	[46f35f5b396e]
 
 	* .hgsigs:
 	Added signature for changeset eed93df350a6
@@ -78,17 +116,6 @@
 	* merge tip
 	[90252df3c5c8]
 
-2013-08-15  Lars Kanis  <lars@greiz-reinsdorf.de>
-
-	* Rakefile.cross:
-	Use RbConfig::CONFIG['CC'] instead of ['host'] for determining cross
-	compilation platform.
-
-	This is 'i586-mingw32msvc-gcc' versus 'i586-pc-mingw32msvc'.
-	[fbee9586e8f7]
-
-2013-08-18  Lars Kanis  <lars@greiz-reinsdorf.de>
-
 	* lib/pg/connection.rb, spec/pg/connection_spec.rb:
 	Add PG::Connection#copy_data as a convenience method.
 	[5096385267ab]
@@ -98,6 +125,15 @@
 	stack method calls.
 	[8255d4f73334]
 
+2013-08-15  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* Rakefile.cross:
+	Use RbConfig::CONFIG['CC'] instead of ['host'] for determining cross
+	compilation platform.
+
+	This is 'i586-mingw32msvc-gcc' versus 'i586-pc-mingw32msvc'.
+	[fbee9586e8f7]
+
 2013-08-14  Lars Kanis  <lars@greiz-reinsdorf.de>
 
 	* Gemfile, Rakefile:
@@ -139,10 +175,6 @@
 	Travis: Allow failures on rbx.
 	[7be3b156c8fb]
 
-	* spec/pg/column_mapping_spec.rb:
-	Too less quoting. Should fix compat with PostgreSQL 8.4.
-	[45fc78971757]
-
 2013-07-18  Lars Kanis  <kanis@comcard.de>
 
 	* spec/pg/connection_spec.rb:
@@ -178,92 +210,6 @@
 	This test failed on Windows x64.
 	[6894f73d7039]
 
-	* Manifest.txt:
-	Add missing files to Manifest.txt.
-	[3b4bc9524bb3]
-
-	* Manifest.txt, ext/pg_column_mapping.c, ext/util.c, ext/util.h:
-	Add compat with Windows platform.
-	[3ac02d0ccf19]
-
-	* ext/pg_column_mapping.c, spec/pg/column_mapping_spec.rb:
-	Add compat with Ruby-1.8.7.
-	[7bcb3040fe34]
-
-	* spec/pg/column_mapping_spec.rb:
-	Use old BYTEA escaping for compat with PostgreSQL 8.4
-	[2fad9e274ad3]
-
-2013-07-04  Lars Kanis  <lars@greiz-reinsdorf.de>
-
-	* ext/pg_column_mapping.c, spec/pg/column_mapping_spec.rb:
-	Add BinaryBolean converter.
-
-	Refactor converter tests.
-	[06c99b04f572]
-
-	* ext/pg_column_mapping.c, spec/pg/column_mapping_spec.rb:
-	Add BinaryFloat converter.
-	[493b0354c678]
-
-2013-07-03  Lars Kanis  <lars@greiz-reinsdorf.de>
-
-	* ext/pg_column_mapping.c, lib/pg/result.rb,
-	spec/pg/column_mapping_spec.rb, spec/pg/result_spec.rb:
-	Change ColumnMapping#initialize to take one Array arg rather than a
-	parameter list.
-
-	Suggested by Aaron: https://groups.google.com/d/msg/ruby-
-	pg/PE5K6q9RzBs/M5prOno39DEJ
-	[c2ca10bf93c5]
-
-	* spec/pg/result_spec.rb:
-	Add test case for all value retrieving methods of PG::Result .
-	[e1055f877c58]
-
-	* spec/pg/column_mapping_spec.rb:
-	Add test case for default_mapping in Result#map_types!
-	[489220119795]
-
-	* lib/pg/result.rb, spec/pg/column_mapping_spec.rb:
-	Add convenience method PG::Result#map_types!
-	[de02df7fb198]
-
-	* spec/pg/column_mapping_spec.rb:
-	Add Boolean ColumnMapping spec and do Integer a bit more compact.
-	[4256841e088f]
-
-2013-07-01  Lars Kanis  <kanis@comcard.de>
-
-	* ext/pg_column_mapping.c, spec/pg/column_mapping_spec.rb:
-	Add converter BinaryInteger.
-	[6f0c8f72962f]
-
-	* ext/pg_column_mapping.c, spec/pg/column_mapping_spec.rb,
-	spec/pg/result_spec.rb:
-	Use instances of PG::ColumnMapping::CConverter as representation of
-	the buildin converters instead of plain symbols. Symbol arguments
-	are converted to these instances, for convenience.
-
-	This allows to store and retrieve additional informations to the
-	conversion and also which conversions are supported.
-	[e4f6c37b5449]
-
-	* ext/pg_column_mapping.c:
-	Don't depend on TYPE(obj)==T_DATA of a proc object for compat with
-	rubinius.
-	[c33c4ac01aaf]
-
-2013-06-29  Lars Kanis  <lars@greiz-reinsdorf.de>
-
-	* ext/pg.c, ext/pg.h, ext/pg_column_mapping.c, ext/pg_result.c,
-	spec/pg/result_spec.rb:
-	Add column based type mapping.
-
-	This allowes to speed up result retrieval by directly converting
-	integer and float values to proper ruby types.
-	[160c71c0b584]
-
 2013-07-06  Lars Kanis  <lars@greiz-reinsdorf.de>
 
 	* ext/pg_connection.c, spec/pg/connection_spec.rb:
@@ -549,14 +495,14 @@
 	avoid warnings about truncated identifier.
 
 	Thanks to Svoop for this report.
-	[9a6791fe9409]
+	[134e067259ee] <v0.15-stable>
 
 	* lib/pg/connection.rb, spec/pg/connection_spec.rb:
 	Send a shortened $0 as application_name to the server in order to
 	avoid warnings about truncated identifier.
 
 	Thanks to Svoop for this report.
-	[134e067259ee] <v0.15-stable>
+	[9a6791fe9409]
 
 2013-03-26  Michael Granger  <ged@FaerieMUD.org>
 
@@ -644,6 +590,17 @@
 	Merge with https://bitbucket.org/ged/ruby-pg
 	[3230e6c245e0]
 
+	* Rakefile, Rakefile.cross:
+	Add support for cross build for multiple platforms (i386-mingw32 and
+	x64-mingw32).
+
+	Update OpenSSL for cross build to 1.0.1e Update PostgreSQL for cross
+	build to 9.2.3
+
+	Remove -lws2_32 for PostgreSQL build. It fails to compile for
+	x64-mingw32 elsewise.
+	[6a2a1a53dedc]
+
 2013-03-12  Michael Granger  <ged@FaerieMUD.org>
 
 	* Rakefile.cross:
@@ -658,19 +615,6 @@
 	Bump versions of dev dependencies
 	[cba92fb4b89e]
 
-2013-03-13  Lars Kanis  <kanis@comcard.de>
-
-	* Rakefile, Rakefile.cross:
-	Add support for cross build for multiple platforms (i386-mingw32 and
-	x64-mingw32).
-
-	Update OpenSSL for cross build to 1.0.1e Update PostgreSQL for cross
-	build to 9.2.3
-
-	Remove -lws2_32 for PostgreSQL build. It fails to compile for
-	x64-mingw32 elsewise.
-	[6a2a1a53dedc]
-
 2013-03-06  Michael Granger  <ged@FaerieMUD.org>
 
 	* README.rdoc:
@@ -922,6 +866,61 @@
 	Make source settings override TM2 defaults
 	[c5706b3f73af]
 
+2012-12-26  Lars Kanis  <kanis@comcard.de>
+
+	* ext/extconf.rb, ext/pg_connection.c, spec/pg/connection_spec.rb:
+	merge in default branch
+	[ca39e311d1eb] <use_gvl_for_blocking_functions>
+
+	* ext/gvl_wrappers.h:
+	Add some documentation to gvl_wrappers
+	[ffeb6a0afd1f] <use_gvl_for_blocking_functions>
+
+	* spec/pg/connection_spec.rb:
+	Add test case for threading with Connection#exec in ruby 1.9
+	[73b9aa38e8c0] <use_gvl_for_blocking_functions>
+
+	* ext/extconf.rb, ext/gvl_wrappers.c, ext/gvl_wrappers.h, ext/pg.h,
+	ext/pg_connection.c:
+	Add wrappers to blocking functions and callbacks in order to release
+	the GVL of ruby 1.9 as long as not in ruby code
+	[2f2c681424ed] <use_gvl_for_blocking_functions>
+
+2012-07-02  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_connection.c, spec/pg/connection_spec.rb:
+	Fix encoding of values delivered to the row processor and add specs
+	for binary and text data.
+	[bb9c6625fbc9] <row_processor>
+
+	* ext/pg_connection.c:
+	Polish the documentation a little bit
+	[b7633be3c941] <row_processor>
+
+2012-07-01  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_connection.c:
+	Get rid of gcc warning about (non-)const PGresult to
+	pg_new_result_for_callback()
+	[1a25786ed8f3] <row_processor>
+
+	* ext/pg_connection.c, spec/pg/connection_spec.rb:
+	Fix wrong encoding for Result object passed to a notice-receiver
+	block. Add proper specs for #set_notice_receiver.
+	[4280826bb9b9] <row_processor>
+
+	* ext/extconf.rb, ext/pg.h, ext/pg_connection.c, ext/pg_result.c,
+	spec/lib/helpers.rb, spec/pg/connection_spec.rb:
+	Implement PostgreSQL-9.2 functions PG::Connection#set_row_processor,
+	get_row_processor, skip_result
+	[b7ce4843f4d1] <row_processor>
+
+2012-06-28  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_result.c:
+	Add PGRES_COPY_BOTH to documentation of PG::Result#result_status
+	[63998b47da6e] <copy_both_docu>
+
 2013-01-29  Aaron Patterson  <aaron.patterson@gmail.com>
 
 	* ext/pg_result.c, lib/pg/result.rb, spec/pg/result_spec.rb:
@@ -950,22 +949,8 @@
 	Fix encoding of messages delivered by notice callbacks
 	[048d07d14867]
 
-2012-12-29  Lars Kanis  <kanis@comcard.de>
-
-	* ext/gvl_wrappers.h:
-	Simplify function declaration for gvl_wrappers a bit more
-	[39ba7e52207e] <use_gvl_for_blocking_functions>
-
 2012-12-26  Lars Kanis  <kanis@comcard.de>
 
-	* ext/extconf.rb, ext/pg_connection.c, spec/pg/connection_spec.rb:
-	merge in default branch
-	[ca39e311d1eb] <use_gvl_for_blocking_functions>
-
-	* ext/gvl_wrappers.h:
-	Add some documentation to gvl_wrappers
-	[ffeb6a0afd1f] <use_gvl_for_blocking_functions>
-
 	* ext/pg.c:
 	Use proper const check instead of implicit relation
 	[d0c5d5f7f1e8]
@@ -985,23 +970,12 @@
 	single row mode of PostgreSQL 9.2)
 	[49e3fe1dafdf]
 
-2012-12-26  Lars Kanis  <kanis@comcard.de>
-
-	* spec/pg/connection_spec.rb:
-	Add test case for threading with Connection#exec in ruby 1.9
-	[73b9aa38e8c0] <use_gvl_for_blocking_functions>
-
-	* ext/extconf.rb, ext/gvl_wrappers.c, ext/gvl_wrappers.h, ext/pg.h,
-	ext/pg_connection.c:
-	Add wrappers to blocking functions and callbacks in order to release
-	the GVL of ruby 1.9 as long as not in ruby code
-	[2f2c681424ed] <use_gvl_for_blocking_functions>
+2012-12-19  Lars Kanis  <kanis@comcard.de>
 
-	* ext/extconf.rb, ext/gvl_wrappers.c, ext/gvl_wrappers.h, ext/pg.h,
-	ext/pg_connection.c:
-	Add wrappers to blocking functions and callbacks in order to release
-	the GVL of ruby 1.9 as long as not in ruby code
-	[6ad8aa8e10a5] <use_gvl_for_blocking_functions>
+	* ext/extconf.rb, ext/pg.c, ext/pg_connection.c,
+	spec/pg/connection_spec.rb:
+	Add single row mode of PostgreSQL 9.2
+	[5cf348b75c1c] <single_row_mode>
 
 2012-12-19  Michael Granger  <ged@FaerieMUD.org>
 
@@ -1025,14 +999,6 @@
 	fix spacing on README.rdoc:21 to improve display on Github
 	[807f040166da]
 
-2012-12-26  Lars Kanis  <kanis@comcard.de>
-
-	* ext/extconf.rb, ext/gvl_wrappers.c, ext/gvl_wrappers.h, ext/pg.h,
-	ext/pg_connection.c:
-	Add wrappers to blocking functions and callbacks in order to release
-	the GVL of ruby 1.9 while not in ruby code
-	[c31ea26b15e9] <use_gvl_for_blocking_functions>
-
 2012-12-19  Lars Kanis  <kanis@comcard.de>
 
 	* spec/pg/connection_spec.rb:
@@ -1049,11 +1015,6 @@
 	Add spec for PG::Result#field_values
 	[3618eb238aba]
 
-	* ext/extconf.rb, ext/pg.c, ext/pg_connection.c,
-	spec/pg/connection_spec.rb:
-	Add single row mode of PostgreSQL 9.2
-	[5cf348b75c1c] <single_row_mode>
-
 	* lib/pg/connection.rb, spec/lib/helpers.rb:
 	Restore compatibility with PostgreSQL down to 8.3
 	[e4900f62e56d]
@@ -1175,15 +1136,6 @@
 	Add PGRES_COPY_BOTH to documentation of PG::Result#result_status
 	[5e0e06440b1a]
 
-	* ext/pg_connection.c, spec/pg/connection_spec.rb:
-	Fix encoding of values delivered to the row processor and add specs
-	for binary and text data.
-	[bb9c6625fbc9] <row_processor>
-
-	* ext/pg_connection.c:
-	Polish the documentation a little bit
-	[b7633be3c941] <row_processor>
-
 2012-06-23  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
@@ -1194,33 +1146,6 @@
 	Added signature for changeset a45710f8db30
 	[634e0a42a101] [v0.14.0]
 
-2012-07-01  Lars Kanis  <kanis@comcard.de>
-
-	* merge copy_both_docu
-	[6e8ef5d4d216]
-
-	* ext/pg_connection.c:
-	Get rid of gcc warning about (non-)const PGresult to
-	pg_new_result_for_callback()
-	[1a25786ed8f3] <row_processor>
-
-	* ext/pg_connection.c, spec/pg/connection_spec.rb:
-	Fix wrong encoding for Result object passed to a notice-receiver
-	block. Add proper specs for #set_notice_receiver.
-	[4280826bb9b9] <row_processor>
-
-	* ext/extconf.rb, ext/pg.h, ext/pg_connection.c, ext/pg_result.c,
-	spec/lib/helpers.rb, spec/pg/connection_spec.rb:
-	Implement PostgreSQL-9.2 functions PG::Connection#set_row_processor,
-	get_row_processor, skip_result
-	[b7ce4843f4d1] <row_processor>
-
-2012-06-28  Lars Kanis  <kanis@comcard.de>
-
-	* ext/pg_result.c:
-	Add PGRES_COPY_BOTH to documentation of PG::Result#result_status
-	[63998b47da6e] <copy_both_docu>
-
 2012-06-17  Lars Kanis  <kanis@comcard.de>
 
 	* Rakefile.cross, ext/extconf.rb,

data/History.rdoc

@@ -1,3 +1,19 @@
+== v0.17.1 [2013-12-18] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Fix compatibility with signal handlers defined in Ruby. This reverts
+  cancelation of queries running on top of the blocking libpq API (like
+  Connection#exec) in case of signals. As an alternative the #async_exec
+  can be used, which is reverted to use the non-blocking API, again.
+- Wrap PQcancel to be called without GVL. It internally waits for
+  the canceling connection.
+
+Documentation fixes:
+
+- Fix documentation for PG::Connection::conndefaults.
+
+
 == v0.17.0 [2013-09-15] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/Rakefile.cross

@@ -210,6 +210,7 @@ class CrossLibrary < OpenStruct
 				cmd << "LDFLAGS=-L#{static_openssl_builddir}"
 				cmd << "LDFLAGS_SL=-L#{static_openssl_builddir}"
 				cmd << "LIBS=-lwsock32 -lgdi32"
+                                cmd << "DLLWRAP_FLAGS=-lcrypt32"
 				cmd << "CPPFLAGS=-I#{static_openssl_builddir}/include"
 
 				run( *cmd )

data/ext/gvl_wrappers.c

@@ -11,9 +11,3 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB );
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVL_WRAPPER_STRUCT );
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVLCB_SKELETON );
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVLCB_STUB );
-
-void ubf_cancel_running_command(void *c)
-{
-	PGconn *conn = (PGconn*) c;
-	PQrequestCancel(conn);
-}

data/ext/gvl_wrappers.h

@@ -24,8 +24,6 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 				 rb_unblock_function_t *ubf, void *data2);
 #endif
 
-void ubf_cancel_running_command(void *c);
-
 #define DEFINE_PARAM_LIST1(type, name) \
 	name,
 
@@ -38,7 +36,7 @@ void ubf_cancel_running_command(void *c);
 #define DEFINE_PARAM_DECL(type, name) \
 	type name;
 
-#define DEFINE_GVL_WRAPPER_STRUCT(name, cancel_params, when_non_void, rettype, lastparamtype, lastparamname) \
+#define DEFINE_GVL_WRAPPER_STRUCT(name, when_non_void, rettype, lastparamtype, lastparamname) \
 	struct gvl_wrapper_##name##_params { \
 		struct { \
 			FOR_EACH_PARAM_OF_##name(DEFINE_PARAM_DECL) \
@@ -47,7 +45,7 @@ void ubf_cancel_running_command(void *c);
 		when_non_void( rettype retval; ) \
 	};
 
-#define DEFINE_GVL_SKELETON(name, cancel_params, when_non_void, rettype, lastparamtype, lastparamname) \
+#define DEFINE_GVL_SKELETON(name, when_non_void, rettype, lastparamtype, lastparamname) \
 	static void * gvl_##name##_skeleton( void *data ){ \
 		struct gvl_wrapper_##name##_params *p = (struct gvl_wrapper_##name##_params*)data; \
 		when_non_void( p->retval = ) \
@@ -56,25 +54,25 @@ void ubf_cancel_running_command(void *c);
 	}
 
 #if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-	#define DEFINE_GVL_STUB(name, cancel_params, when_non_void, rettype, lastparamtype, lastparamname) \
+	#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, cancel_params); \
+			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, cancel_params, when_non_void, rettype, lastparamtype, lastparamname) \
+	#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_DECL(name, cancel_params, when_non_void, rettype, lastparamtype, lastparamname) \
+#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);
 
-#define DEFINE_GVLCB_SKELETON(name, cancel_params, when_non_void, rettype, lastparamtype, lastparamname) \
+#define DEFINE_GVLCB_SKELETON(name, when_non_void, rettype, lastparamtype, lastparamname) \
 	static void * gvl_##name##_skeleton( void *data ){ \
 		struct gvl_wrapper_##name##_params *p = (struct gvl_wrapper_##name##_params*)data; \
 		when_non_void( p->retval = ) \
@@ -83,7 +81,7 @@ void ubf_cancel_running_command(void *c);
 	}
 
 #if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
-	#define DEFINE_GVLCB_STUB(name, cancel_params, when_non_void, rettype, lastparamtype, lastparamname) \
+	#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) \
@@ -92,7 +90,7 @@ void ubf_cancel_running_command(void *c);
 			when_non_void( return params.retval; ) \
 		}
 #else
-	#define DEFINE_GVLCB_STUB(name, cancel_params, when_non_void, rettype, lastparamtype, lastparamname) \
+	#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 ); \
 		}
@@ -101,9 +99,6 @@ void ubf_cancel_running_command(void *c);
 #define GVL_TYPE_VOID(string)
 #define GVL_TYPE_NONVOID(string) string
 
-#define GVL_CANCELABLE ubf_cancel_running_command, conn
-#define GVL_NONCANCELABLE RUBY_UBF_IO, 0
-
 
 /*
  * Definitions of blocking functions and their parameters
@@ -202,32 +197,37 @@ void ubf_cancel_running_command(void *c);
 
 #define FOR_EACH_PARAM_OF_PQisBusy(param)
 
-/* function( name, cancel, void_or_nonvoid, returntype, lastparamtype, lastparamname ) */
+#define FOR_EACH_PARAM_OF_PQcancel(param) \
+	param(PGcancel *, cancel) \
+	param(char *, errbuf)
+
+/* function( name, void_or_nonvoid, returntype, lastparamtype, lastparamname ) */
 #define FOR_EACH_BLOCKING_FUNCTION(function) \
-	function(PQconnectdb, GVL_NONCANCELABLE, GVL_TYPE_NONVOID, PGconn *, const char *, conninfo) \
-	function(PQconnectStart, GVL_NONCANCELABLE, GVL_TYPE_NONVOID, PGconn *, const char *, conninfo) \
-	function(PQconnectPoll, GVL_CANCELABLE, GVL_TYPE_NONVOID, PostgresPollingStatusType, PGconn *, conn) \
-	function(PQreset, GVL_CANCELABLE, GVL_TYPE_VOID, void, PGconn *, conn) \
-	function(PQresetStart, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, PGconn *, conn) \
-	function(PQresetPoll, GVL_CANCELABLE, GVL_TYPE_NONVOID, PostgresPollingStatusType, PGconn *, conn) \
-	function(PQexec, GVL_CANCELABLE, GVL_TYPE_NONVOID, PGresult *, const char *, command) \
-	function(PQexecParams, GVL_CANCELABLE, GVL_TYPE_NONVOID, PGresult *, int, resultFormat) \
-	function(PQexecPrepared, GVL_CANCELABLE, GVL_TYPE_NONVOID, PGresult *, int, resultFormat) \
-	function(PQprepare, GVL_CANCELABLE, GVL_TYPE_NONVOID, PGresult *, const Oid *, paramTypes) \
-	function(PQdescribePrepared, GVL_CANCELABLE, GVL_TYPE_NONVOID, PGresult *, const char *, stmtName) \
-	function(PQdescribePortal, GVL_CANCELABLE, GVL_TYPE_NONVOID, PGresult *, const char *, portalName) \
-	function(PQgetResult, GVL_CANCELABLE, GVL_TYPE_NONVOID, PGresult *, PGconn *, conn) \
-	function(PQputCopyData, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, int, nbytes) \
-	function(PQputCopyEnd, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, const char *, errormsg) \
-	function(PQgetCopyData, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, int, async) \
-	function(PQnotifies, GVL_CANCELABLE, GVL_TYPE_NONVOID, PGnotify *, PGconn *, conn) \
-	function(PQsendQuery, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, const char *, query) \
-	function(PQsendQueryParams, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, int, resultFormat) \
-	function(PQsendPrepare, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, const Oid *, paramTypes) \
-	function(PQsendQueryPrepared, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, int, resultFormat) \
-	function(PQsendDescribePrepared, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, const char *, stmt) \
-	function(PQsendDescribePortal, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, const char *, portal) \
-	function(PQisBusy, GVL_CANCELABLE, GVL_TYPE_NONVOID, int, PGconn *, conn);
+	function(PQconnectdb, GVL_TYPE_NONVOID, PGconn *, const char *, conninfo) \
+	function(PQconnectStart, GVL_TYPE_NONVOID, PGconn *, const char *, conninfo) \
+	function(PQconnectPoll, GVL_TYPE_NONVOID, PostgresPollingStatusType, PGconn *, conn) \
+	function(PQreset, GVL_TYPE_VOID, void, PGconn *, conn) \
+	function(PQresetStart, GVL_TYPE_NONVOID, int, PGconn *, conn) \
+	function(PQresetPoll, GVL_TYPE_NONVOID, PostgresPollingStatusType, PGconn *, conn) \
+	function(PQexec, GVL_TYPE_NONVOID, PGresult *, const char *, command) \
+	function(PQexecParams, GVL_TYPE_NONVOID, PGresult *, int, resultFormat) \
+	function(PQexecPrepared, GVL_TYPE_NONVOID, PGresult *, int, resultFormat) \
+	function(PQprepare, GVL_TYPE_NONVOID, PGresult *, const Oid *, paramTypes) \
+	function(PQdescribePrepared, GVL_TYPE_NONVOID, PGresult *, const char *, stmtName) \
+	function(PQdescribePortal, GVL_TYPE_NONVOID, PGresult *, const char *, portalName) \
+	function(PQgetResult, GVL_TYPE_NONVOID, PGresult *, PGconn *, conn) \
+	function(PQputCopyData, GVL_TYPE_NONVOID, int, int, nbytes) \
+	function(PQputCopyEnd, GVL_TYPE_NONVOID, int, const char *, errormsg) \
+	function(PQgetCopyData, GVL_TYPE_NONVOID, int, int, async) \
+	function(PQnotifies, GVL_TYPE_NONVOID, PGnotify *, PGconn *, conn) \
+	function(PQsendQuery, GVL_TYPE_NONVOID, int, const char *, query) \
+	function(PQsendQueryParams, GVL_TYPE_NONVOID, int, int, resultFormat) \
+	function(PQsendPrepare, GVL_TYPE_NONVOID, int, const Oid *, paramTypes) \
+	function(PQsendQueryPrepared, GVL_TYPE_NONVOID, int, int, resultFormat) \
+	function(PQsendDescribePrepared, GVL_TYPE_NONVOID, int, const char *, stmt) \
+	function(PQsendDescribePortal, GVL_TYPE_NONVOID, int, const char *, portal) \
+	function(PQisBusy, GVL_TYPE_NONVOID, int, PGconn *, conn) \
+	function(PQcancel, GVL_TYPE_NONVOID, int, int, errbufsize);
 
 
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL );
@@ -243,10 +243,10 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL );
 #define FOR_EACH_PARAM_OF_notice_receiver_proxy(param) \
 	param(void *, arg)
 
-/* function( name, cancel, void_or_nonvoid, returntype, lastparamtype, lastparamname ) */
+/* function( name, void_or_nonvoid, returntype, lastparamtype, lastparamname ) */
 #define FOR_EACH_CALLBACK_FUNCTION(function) \
-	function(notice_processor_proxy,, GVL_TYPE_VOID, void, const char *, message) \
-	function(notice_receiver_proxy,, GVL_TYPE_VOID, void, const PGresult *, result) \
+	function(notice_processor_proxy, GVL_TYPE_VOID, void, const char *, message) \
+	function(notice_receiver_proxy, GVL_TYPE_VOID, void, const PGresult *, result) \
 
 FOR_EACH_CALLBACK_FUNCTION( DEFINE_GVL_STUB_DECL );
 

data/ext/pg_connection.c

@@ -292,7 +292,10 @@ pgconn_s_ping( int argc, VALUE *argv, VALUE klass )
 }
 #endif
 
+
 /*
+ * Document-method: conndefaults
+ *
  * call-seq:
  *    PG::Connection.conndefaults() -> Array
  *
@@ -503,6 +506,7 @@ pgconn_reset_poll(VALUE self)
 	return INT2FIX((int)status);
 }
 
+
 /*
  * call-seq:
  *    conn.db()
@@ -838,6 +842,13 @@ static VALUE pgconn_exec_params( int, VALUE *, VALUE );
  * If the optional code block is given, it will be passed <i>result</i> as an argument,
  * and the PG::Result object will  automatically be cleared when the block terminates.
  * In this instance, <code>conn.exec</code> returns the value of the block.
+ *
+ * #exec is implemented on the synchronous command processing API of libpq, whereas
+ * #async_exec is implemented on the asynchronous API.
+ * #exec is somewhat faster that #async_exec, but blocks any signals to be processed until
+ * the query is finished. This is most notably visible by a delayed reaction to Control+C.
+ * Both methods ensure that other threads can process while waiting for the server to
+ * complete the request.
  */
 static VALUE
 pgconn_exec(int argc, VALUE *argv, VALUE self)
@@ -2103,7 +2114,7 @@ pgconn_cancel(VALUE self)
 	if(cancel == NULL)
 		rb_raise(rb_ePGerror,"Invalid connection!");
 
-	ret = PQcancel(cancel, errbuf, 256);
+	ret = gvl_PQcancel(cancel, errbuf, 256);
 	if(ret == 1)
 		retval = Qnil;
 	else
@@ -3010,22 +3021,14 @@ pgconn_get_last_result(VALUE self)
 	return rb_pgresult;
 }
 
-#if !defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-
 /*
  * call-seq:
  *    conn.async_exec(sql [, params, result_format ] ) -> PG::Result
  *    conn.async_exec(sql [, params, result_format ] ) {|pg_result| block }
  *
  * This function has the same behavior as #exec,
- * but ensures that other threads can process while
- * waiting for the server to complete the request.
- *
- * On Ruby platforms with native threads (MRI-1.9+ and all others)
- * this method is an alias to #exec.
- *
- * On MRI-1.8 it's implemented using asynchronous command
- * processing and ruby's +rb_thread_select+ .
+ * but is implemented using the asynchronous command
+ * processing API of libpq.
  */
 static VALUE
 pgconn_async_exec(int argc, VALUE *argv, VALUE self)
@@ -3046,8 +3049,6 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 	return rb_pgresult;
 }
 
-#endif
-
 /**************************************************************************
  * LARGE OBJECT SUPPORT
  **************************************************************************/
@@ -3508,7 +3509,6 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "reset", pgconn_reset, 0);
 	rb_define_method(rb_cPGconn, "reset_start", pgconn_reset_start, 0);
 	rb_define_method(rb_cPGconn, "reset_poll", pgconn_reset_poll, 0);
-	rb_define_method(rb_cPGconn, "conndefaults", pgconn_s_conndefaults, 0);
 	rb_define_alias(rb_cPGconn, "close", "finish");
 
 	/******     PG::Connection INSTANCE METHODS: Connection Status     ******/
@@ -3600,11 +3600,7 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "wait_for_notify", pgconn_wait_for_notify, -1);
 	rb_define_alias(rb_cPGconn, "notifies_wait", "wait_for_notify");
 	rb_define_method(rb_cPGconn, "quote_ident", pgconn_s_quote_ident, 1);
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-	rb_define_alias(rb_cPGconn, "async_exec", "exec");
-#else
 	rb_define_method(rb_cPGconn, "async_exec", pgconn_async_exec, -1);
-#endif
 	rb_define_alias(rb_cPGconn, "async_query", "async_exec");
 	rb_define_method(rb_cPGconn, "get_last_result", pgconn_get_last_result, 0);
 

data/lib/pg.rb

@@ -19,7 +19,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.17.0'
+	VERSION = '0.17.1'
 
 	# VCS revision
 	REVISION = %q$Revision$

data/lib/pg/connection.rb

@@ -164,6 +164,14 @@ class PG::Connection
 	class << self
 		define_method( :isthreadsafe, &PG.method(:isthreadsafe) )
 	end
+
+
+	### Returns an array of Hashes with connection defaults. See ::conndefaults
+	### for details.
+	def conndefaults
+		return self.class.conndefaults
+	end
+
 end # class PG::Connection
 
 # Backward-compatible alias

data/spec/pg/connection_spec.rb

@@ -262,7 +262,7 @@ describe PG::Connection do
 		error.should == true
 	end
 
-	it "can stop a thread that runs a blocking query" do
+	it "can stop a thread that runs a blocking query with async_exec" do
 		start = Time.now
 		t = Thread.new do
 			@conn.async_exec( 'select pg_sleep(10)' )
@@ -274,6 +274,29 @@ describe PG::Connection do
 		(Time.now - start).should < 10
 	end
 
+	it "should work together with signal handlers" do
+		signal_received = false
+		trap 'USR1' do
+			signal_received = true
+		end
+
+		Thread.new do
+			sleep 0.1
+			Process.kill("USR1", Process.pid)
+		end
+		@conn.exec("select pg_sleep(0.3)")
+		signal_received.should be_true
+
+		signal_received = false
+		Thread.new do
+			sleep 0.1
+			Process.kill("USR1", Process.pid)
+		end
+		@conn.async_exec("select pg_sleep(0.3)")
+		signal_received.should be_true
+	end
+
+
 	it "automatically rolls back a transaction started with Connection#transaction if an exception " +
 	   "is raised" do
 		# abort the per-example transaction so we can test our own

metadata

@@ -1,119 +1,119 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pg
-version: !ruby/object:Gem::Version 
-  version: 0.17.0
+version: !ruby/object:Gem::Version
+  version: 0.17.1
 platform: x86-mingw32
-authors: 
+authors:
 - Michael Granger
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBADANBgkqhkiG9w0BAQUFADBEMQ0wCwYDVQQDDARsYXJz
-  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
-  GRYCZGUwHhcNMTMwMzExMjAyMjIyWhcNMTQwMzExMjAyMjIyWjBEMQ0wCwYDVQQD
-  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
-  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
-  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
-  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
-  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
-  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
-  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
-  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAsGA1UdDwQEAwIEsDAJBgNVHRMEAjAAMB0G
-  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQUFAAOCAQEA
-  Iswhcol3ytXthaUH3k5LopZ09viZrZHzAw0QleI3Opl/9QEGJ2BPV9+93iC0OrNL
-  hmnxig6vKK1EeJ5PHXJ8hOI3nTZBrOmQcEXNBqyToP1FHMWZqwZ8wiBPXtiCqDBR
-  ePQ25J9xFNzQ1ItgzNSpx5cs67QNKrx5woocoBHD6kStFbshZPJx4axl3GbUFQd5
-  H//3YdPQOH3jaVeUXhS+pz/gfbx8fhFAtsQ+855A3HO7g2ZRIg/atAp/0MFyn5s5
-  0rq+VHOIPyvxF5khT0mYAcNmZTC8z1yPsqdgwfYNDjsSWwiIRSPUSmJRvfjM8hsW
-  mMFp4kPUHbWOqCp2mz9gCA==
+  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVrYW5p
+  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
+  Fw0xMzAyMjYwODQ1NTlaFw0xNDAyMjYwODQ1NTlaMD0xDjAMBgNVBAMMBWthbmlz
+  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
+  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
+  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
+  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
+  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
+  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
+  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
+  x17ugO3IOsjEJwW7KP4wGwYDVR0RBBQwEoEQa2FuaXNAY29tY2FyZC5kZTAbBgNV
+  HRIEFDASgRBrYW5pc0Bjb21jYXJkLmRlMA0GCSqGSIb3DQEBBQUAA4IBAQCa3ThZ
+  9qjyuFXe0kN4IwgHTTSqob3zPOyXAxAq1k65w1/hI/6e4HxCSH7Ds+dKj/xhScEu
+  K5gaya1D69Fo+JTnzLvuSt2X8+mEHclduC9j++oSGc+szd7LKdeEQ7J4RefJjhD+
+  vWI6lqglL4PijN0nOWtm0ygzXEELDcGYpb2WJ++KKNVLIU6pkiWpZUmGcFB7NclV
+  I64m9iNdgWnDwedgUlqSMfVCUUB9S1Y5jI+doxYloPvIB6+6VsI4cmN2LcK0rQO6
+  N3pmmsS0N5772vAmRMyNl8PV1OzCLIMhgPgdeLpfU7LUSYWj67q5VuyjAaH5h68g
+  MlGgwc//cCsBG8sa
   -----END CERTIFICATE-----
-
-date: 2013-09-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe-mercurial
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+date: 2013-12-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.4.0
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe-highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
   name: hoe
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.5.1
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hoe-deveiate
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.2"
+      - !ruby/object:Gem::Version
+        version: 3.5.1
+- !ruby/object:Gem::Dependency
+  name: hoe-deveiate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe-bundler
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: hoe-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: |-
   Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
-  
+
   It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
-  
+
   A small example usage:
-  
+
     #!/usr/bin/env ruby
-  
+
     require 'pg'
-  
+
     # Output a table of current connections to the DB
     conn = PG.connect( dbname: 'sales' )
     conn.exec( "SELECT * FROM pg_stat_activity" ) do |result|
@@ -123,14 +123,12 @@ description: |-
           row.values_at('procpid', 'usename', 'current_query')
       end
     end
-email: 
+email:
 - ged@FaerieMUD.org
 - lars@greiz-reinsdorf.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Contributors.rdoc
 - History.rdoc
 - Manifest.txt
@@ -146,7 +144,7 @@ extra_rdoc_files:
 - ext/pg_connection.c
 - ext/pg_errors.c
 - ext/pg_result.c
-files: 
+files:
 - .gemtest
 - BSDL
 - ChangeLog
@@ -208,38 +206,35 @@ files:
 - lib/1.9/pg_ext.so
 - lib/2.0/pg_ext.so
 homepage: https://bitbucket.org/ged/ruby-pg
-licenses: 
+licenses:
 - BSD
 - Ruby
 - GPL
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -f
 - fivefish
 - -t
-- "pg: The Ruby Interface to PostgreSQL"
+- 'pg: The Ruby Interface to PostgreSQL'
 - -m
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: pg
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/]
 test_files: []
-