pg 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6184440b94e368cfb9bb2e9d44cb60f5881522cf
-  data.tar.gz: b0fdba2debcc80d32430eb11ee646f5b0792e65a
+  metadata.gz: 82f24c3c723c5c426929fd7c14b784f8db43fccc
+  data.tar.gz: 3ce6e0d944af02a3283c2d51588e988df89da216
 SHA512:
-  metadata.gz: 0622fedaa3fcbaf17f8878ac5bd8b750be30fdc389bb541a29d036cf0692af57022dc66e71f68b617bb654f719153228de03e291549b90122d5beb9efb970b43
-  data.tar.gz: a7005743c4075d16a2143cd6c89a6b04f0a918cf50fe5b262924e71d3f75f6ae64b09dd3ec9e7a4d51e95a74f2fe9c856fe98b1ebb3c29f568826e65906a4e6d
+  metadata.gz: eb683af0ecf1711e19a5e497e63d7ca5fe08180db99b373fdbd9e0167d3930bfb55de6fe37f116a0e8d3c520741bef019ebcc15993da905eceb495c03ec23c31
+  data.tar.gz: e7255b4ce2802d0b97b4af8fe3a5715bfbffc2aee7d454b1c6bd6eec8b82aa711212467ca0b99a6614355b8ad1f101b9075f443b88d36e648aa0251848923b3f

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-�	��)��fLT"����O���c�(�58�u�w���RF�~�E���L�D��m++�;��
-q��K|V�Hmm�p��d�.{UC�\*�k5ܷ�c�3,�.��d�=,Z�
+�/p
+_ˈ�jN���O��d�u��������w���=�B7���Gơ�ӥ=L�P���)#)�M�����^9⽳:L1�ad�nզr�?�	&����ޜr�R\�<�s#*��Xlao@�ϝ{s�6�q��*].[�eКD�Q�{�޿B5�MY�H��Kx�7�{��T���$�Կ]�6�E4�{��ddΗ�V7;��I���h�

data.tar.gz.sig

@@ -1 +1,2 @@
-� H2=Ðu�|g��;8�A�/{�g��OhE(��	4���a݃��(Li���/������/��?nL6ŀ����E�0Q���{HO?)��u���K��B�7�f�7�����z�6��e>���1��C��t�p�<D��T=�Fx�S���F�˂��p�E���ť�z��������Y�~,}���>�A��V���#N��5��X�86�r��!�{:�.�0�^+�8����_}�#K���m�;�,��^
+2+��Ѣ���"����M�5��c&��X���A�I�9�\�7xhn�4G�1=(�0R�)#O���#z …S`|,�\$�\�\�K�ԓ�G
+|7^`�^6�ui��&�ه^(K���E�;R�ZO1V�>�g�L4=�ZL���Zřw�[�\7h�B���)l/��J;F�X�V�"�+Py\�Ė&�g��b&<Qj8.Ū��SY

data/ChangeLog

@@ -1,8 +1,126 @@
+2013-09-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc, lib/pg.rb:
+	Bump minor version
+	[7cdff0a462e5] [tip]
+
+2013-09-14  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* History.rdoc:
+	Add change of PG::Result#check to History.rdoc.
+	[2b4f876c54f6]
+
+	* spec/lib/helpers.rb:
+	verify_clean_exec_status itself should leave a clean status.
+	[933d0f788047]
+
+2013-09-13  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* lib/pg.rb, lib/pg/connection.rb, spec/lib/helpers.rb,
+	spec/pg/connection_spec.rb:
+	Improve Connection#copy_data:
+	- ensure and verify a clean exec status for each test case
+	- add error PG::NotAllCopyDataRetrieved and a spec for this case
+	- fix input/output naming in the specs
+	- use ArgumentError instead of PG::Error in case of non-COPY statement
+	[b0fd97e58a9a]
+
+	* History.rdoc, lib/pg.rb:
+	Bump VERSION to 0.16.1 and prepare History.rdoc for release.
+	[c2bbdcd4ef0f]
+
+	* lib/pg/connection.rb:
+	Fix examples of conn#copy_data and improve the documentation.
+	[53d027b0d064]
+
+2013-09-07  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/gvl_wrappers.h, ext/pg_connection.c:
+	Wrap PQisBusy to be called without GVL. It could trigger the notice
+	callback.
+	[d93b3ddc69ff]
+
+	* ext/gvl_wrappers.h, ext/pg_connection.c:
+	Wrap all PQsend* functions to be called without GVL.
+
+	These functions could trigger the notice callback when some notice
+	is yet in the buffer. The notice callback needs to be called without
+	GVL since it always reaquires the GLV. This fixes issue #171.
+	[1fd77c0a4cea]
+
+2013-08-19  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* spec/pg/connection_spec.rb:
+	Add #copy_data case for non copy statement
+	[eea6da92b30a]
+
+	* ext/pg_connection.c:
+	Remove copy examples in favour of #copy_data
+	[c549f9878adf]
+
+2013-08-18  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* merge tip
+	[90252df3c5c8]
+
+	* lib/pg/connection.rb, spec/pg/connection_spec.rb:
+	Add PG::Connection#copy_data as a convenience method.
+	[5096385267ab]
+
+	* ext/pg_result.c:
+	Return self from PG::Result#check instead of nil. This allowes to
+	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] [github/master]
+
+2013-08-14  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* Gemfile, Rakefile:
+	Add Gemfile for compat with rake-compiler-dev-box.
+
+	Increase version of rake-compiler to 0.9. That is needed for the
+	x64-mingw32 build.
+	[355cce5c8566]
+
+2013-08-13  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/pg_connection.c:
+	Add usage examples for put_copy_data and get_copy_data.
+	[9959003173b4]
+
+2013-08-11  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* Rakefile:
+	Add Lars Kanis to the list of developers in the gemspec.
+	[6d3d18452d99]
+
+2013-07-23  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.16.0 for changeset def8f41a7672
+	[315fa9728831]
+
+	* .hgsigs:
+	Added signature for changeset 4e0606f5f5aa
+	[def8f41a7672] [v0.16.0]
+
+	* History.rdoc, lib/pg.rb:
+	Bump the version, update history.
+	[4e0606f5f5aa]
+
 2013-07-19  Lars Kanis  <kanis@comcard.de>
 
 	* .travis.yml:
 	Travis: Allow failures on rbx.
-	[7be3b156c8fb] [tip]
+	[7be3b156c8fb]
 
 2013-07-18  Lars Kanis  <kanis@comcard.de>
 
@@ -45,7 +163,7 @@
 	Use ConnectionBad instead of PG::Error for connection related
 
 	Replace rb_bug() for PQsocket() failure with rb_raise().
-	[ddb55d4a44d3] [github/master]
+	[ddb55d4a44d3]
 
 2013-07-17  Michael Granger  <ged@FaerieMUD.org>
 
@@ -69,8 +187,8 @@
 	Add new error class 'ConnectionBad' that is raised if the connection
 
 	From 9d0acad61a693b9042842883fa8195ba973bf813 Mon Sep 17 00:00:00
-	2001 could not be established. Use 'UnableToSend' error in case
-	that sending fails with async methods.
+	2001 could not be established. Use 'UnableToSend' error in case that
+	sending fails with async methods.
 	[b09cf9da723e]
 
 	* ext/gvl_wrappers.h, ext/pg_connection.c, spec/pg/connection_spec.rb:
@@ -918,8 +1036,8 @@
 	From 10cdc23ac4e3cfc91488f3f8a7a44f3275c9fe0a Mon Sep 17 00:00:00
 	2001 This is used for the new single row mode introduced in
 	9.2beta3, and indicates a successful result when using that mode.
-	--- ext/extconf.rb | 1 + ext/pg_result.c | 3 +++ 2 files
-	changed, 4 insertions(+), 0 deletions(-)
+	--- ext/extconf.rb | 1 + ext/pg_result.c | 3 +++ 2 files changed, 4
+	insertions(+), 0 deletions(-)
 	[f92b6456c566]
 
 2012-08-10  Michael Granger  <ged@FaerieMUD.org>
@@ -1031,9 +1149,9 @@
 2012-06-12  Mahlon E. Smith  <mahlon@laika.com>
 
 	* sample/warehouse_partitions.rb:
-	Move indexes across tablespaces along with their parents. Remove
-	the 'parent table' option, as we can derive that automatically from
-	the pg_inherits table.
+	Move indexes across tablespaces along with their parents. Remove the
+	'parent table' option, as we can derive that automatically from the
+	pg_inherits table.
 	[be46f44349bf]
 
 2012-05-07  Michael Granger  <ged@FaerieMUD.org>
@@ -1070,31 +1188,28 @@
 
 	 - disk_usage_report
 
-	 Quick reporting on the heaviest disk consumers for a
-	database. Nice for cronned/email reporting.
+	 Quick reporting on the heaviest disk consumers for a database. Nice
+	for cronned/email reporting.
 
 	 - pg_statistics
 
-	 Continuous polled statistics for a database.
-	Suitable for graphing with gnuplot (example
-	included.)
+	 Continuous polled statistics for a database. Suitable for graphing
+	with gnuplot (example included.)
 
 	 - replication_monitor
 
-	 A command-line monitor for slave replication lag.
-	Works for both streaming replication and WAL
-	shipping. You should be able to use it as a base to
-	plug into your preferred monitoring system.
+	 A command-line monitor for slave replication lag. Works for both
+	streaming replication and WAL shipping. You should be able to use it
+	as a base to plug into your preferred monitoring system.
 
 	 - wal_shipper
 
-	 A smart WAL file transfer script, similar to
-	PITRTools.
+	 A smart WAL file transfer script, similar to PITRTools.
 
 	 - warehouse_partitions
 
-	 An automated tablespace migrator for older, date-
-	based partitioned tables.
+	 An automated tablespace migrator for older, date- based partitioned
+	tables.
 	[36ca5b412583]
 
 2012-04-02  Michael Granger  <ged@FaerieMUD.org>
@@ -2237,10 +2352,9 @@
 	* Removed the type OID constants from PGresult; I was including them
 	so they could be used for comparison with PGresult#ftype return
 	values. RhodiumToad on #postgresql@freenode showed me the
-	format_type() SQL function, so I added an example of how to get
-	the same information via that function instead, which is
-	guaranteed to be correct even if src/include/catalog/pg_type.h
-	changes.
+	format_type() SQL function, so I added an example of how to get the
+	same information via that function instead, which is guaranteed to
+	be correct even if src/include/catalog/pg_type.h changes.
 	[739cec560448]
 
 	* README.windows, Rakefile.local, ext/extconf.rb:
@@ -2448,8 +2562,8 @@
 	* ext/pg.c, spec/m17n_spec.rb, spec/pgconn_spec.rb,
 	spec/pgresult_spec.rb:
 	* Use pg_ctl -w instead of sleep for specs
-	 * Fix up the specs to use #external_encoding, #internal_encoding,
-	and #internal_encoding=
+	 * Fix up the specs to use #external_encoding, #internal_encoding, and
+	#internal_encoding=
 	 * Added a pending spec for Johab (I can't figure out how to return
 	JOHAB-encoded results from Postgres)
 	[d67c62945540] <i17n-19-patches>
@@ -2543,8 +2657,7 @@
 	[c33a73c14126]
 
 	* spec/pgconn_spec.rb:
-	Ripple port change through text. Always full path to open spec
-	file.
+	Ripple port change through text. Always full path to open spec file.
 	[241d3410b875]
 
 	* spec/pgconn_spec.rb:
@@ -2601,27 +2714,26 @@
 	........ r169 | jdavis | 2008-08-20 19:48:10 -0700 (Wed, 20 Aug
 	2008) | 6 lines
 
-	 Fixed option connection argument in the case of using 7
-	arguments.
+	 Fixed option connection argument in the case of using 7 arguments.
 
-	 Thanks Erik Hollensbe (erikh) for the bug report. ........ r170
-	| jdavis | 2008-10-05 11:01:40 -0700 (Sun, 05 Oct 2008) | 4 lines
+	 Thanks Erik Hollensbe (erikh) for the bug report. ........ r170 |
+	jdavis | 2008-10-05 11:01:40 -0700 (Sun, 05 Oct 2008) | 4 lines
 
-	 Throw correct exception when result is NULL. ........ r171 |
-	jdavis | 2008-10-05 11:47:01 -0700 (Sun, 05 Oct 2008) | 12 lines
+	 Throw correct exception when result is NULL. ........ r171 | jdavis
+	| 2008-10-05 11:47:01 -0700 (Sun, 05 Oct 2008) | 12 lines
 
 	 Fix PGconn#async_exec and PGconn#get_last_result to properly clear
 	all results when an exception is raised. Before, the connection
 	could be left in a state that is not ready for new commands.
 
-	 Also, change PGconn#get_result to not raise an exception
-	when the result is in an error state. You can still check the
-	result object for an error, but it's not appropriate to raise an
-	exception, because that could prevent the caller from properly
-	clearing all results.
+	 Also, change PGconn#get_result to not raise an exception when the
+	result is in an error state. You can still check the result object
+	for an error, but it's not appropriate to raise an exception,
+	because that could prevent the caller from properly clearing all
+	results.
 
-	 Thanks to Tarmo Tänav. ........ r172 | jdavis | 2008-10-05
-	12:04:45 -0700 (Sun, 05 Oct 2008) | 6 lines
+	 Thanks to Tarmo Tänav. ........ r172 | jdavis | 2008-10-05 12:04:45
+	-0700 (Sun, 05 Oct 2008) | 6 lines
 
 	 Include all libraries listed in "pg_config --libs" in the build.
 
@@ -2696,24 +2808,23 @@
 	........ r149 | jdavis | 2008-03-19 14:17:20 -0700 (Wed, 19 Mar
 	2008) | 5 lines
 
-	 This commmit just cleans up indenting and coding
-	conventions. It's a big patch, but does nothing meaningful. ........
-	r150 | jdavis | 2008-03-19 14:19:53 -0700 (Wed, 19 Mar 2008) | 5
-	lines
+	 This commmit just cleans up indenting and coding conventions. It's
+	a big patch, but does nothing meaningful. ........ r150 | jdavis |
+	2008-03-19 14:19:53 -0700 (Wed, 19 Mar 2008) | 5 lines
 
 
-	   * forgot to add the expected output to the repository, so one
-	test was failing. Corrected now. ........ r151 | jdavis |
-	2008-03-20 11:20:25 -0700 (Thu, 20 Mar 2008) | 12 lines
+	   * forgot to add the expected output to the repository, so one test was
+	failing. Corrected now. ........ r151 | jdavis | 2008-03-20 11:20:25
+	-0700 (Thu, 20 Mar 2008) | 12 lines
 
 
 	   * added PGconn.connect_start(...) -> PGconn
 	   * added test for PGconn.connect_start()
 	   * refactored to separate the complexity of parsing the connection
 	arguments
-	   * Removed some superfluous code for old versions of Ruby that
-	don't support rb_define_alloc_func(). Those versions of Ruby
-	most likely don't work anyway, and I'm not testing them.
+	   * Removed some superfluous code for old versions of Ruby that don't
+	support rb_define_alloc_func(). Those versions of Ruby most likely
+	don't work anyway, and I'm not testing them.
 
 	........ r152 | jdavis | 2008-03-20 12:16:06 -0700 (Thu, 20 Mar
 	2008) | 5 lines
@@ -2724,8 +2835,8 @@
 	10:13:39 -0700 (Mon, 21 Apr 2008) | 4 lines
 
 
-	   * added some tests for binary data ........ r154 | jdavis |
-	2008-04-21 10:24:05 -0700 (Mon, 21 Apr 2008) | 5 lines
+	   * added some tests for binary data ........ r154 | jdavis | 2008-04-21
+	10:24:05 -0700 (Mon, 21 Apr 2008) | 5 lines
 
 
 	   * applied patch from Louis Lavena to improve the build process
@@ -2733,20 +2844,19 @@
 	10:41:04 -0700 (Mon, 21 Apr 2008) | 6 lines
 
 
-	   * backtracked a small piece of the patch, to catch the condition
-	where pg_config is not in the PATH on posix platforms. ........
-	r156 | jdavis | 2008-07-07 23:21:07 -0700 (Mon, 07 Jul 2008) | 6
-	lines
+	   * backtracked a small piece of the patch, to catch the condition where
+	pg_config is not in the PATH on posix platforms. ........ r156 |
+	jdavis | 2008-07-07 23:21:07 -0700 (Mon, 07 Jul 2008) | 6 lines
 
-	 Fix oversight in connect arguments for options and
-	connect_timeout when passed in a hash. (Thanks Rob Holland for
-	the bug report). ........ r157 | jdavis | 2008-07-23 22:33:26
-	-0700 (Wed, 23 Jul 2008) | 10 lines
+	 Fix oversight in connect arguments for options and connect_timeout
+	when passed in a hash. (Thanks Rob Holland for the bug report).
+	........ r157 | jdavis | 2008-07-23 22:33:26 -0700 (Wed, 23 Jul
+	2008) | 10 lines
 
-	 Changed all temporary allocations to use ALLOC_N (heap
-	allocation) rather than ALLOCA_N (stack allocation). In
-	particular, this allows PGconn#escape_string to accept larger
-	input strings without fear of exceeding the stack size.
+	 Changed all temporary allocations to use ALLOC_N (heap allocation)
+	rather than ALLOCA_N (stack allocation). In particular, this allows
+	PGconn#escape_string to accept larger input strings without fear of
+	exceeding the stack size.
 
 	 Thanks to Brett Neumeier. ........ r158 | jdavis | 2008-07-23
 	22:46:34 -0700 (Wed, 23 Jul 2008) | 6 lines
@@ -2756,8 +2866,8 @@
 	 Thanks to Mohammad Ali (oldmoe) for the report. ........ r159 |
 	jdavis | 2008-08-17 11:19:09 -0700 (Sun, 17 Aug 2008) | 4 lines
 
-	 Applied build patch from Brett Neumeier. Thanks! ........ r160
-	| jdavis | 2008-08-17 12:26:33 -0700 (Sun, 17 Aug 2008) | 7 lines
+	 Applied build patch from Brett Neumeier. Thanks! ........ r160 |
+	jdavis | 2008-08-17 12:26:33 -0700 (Sun, 17 Aug 2008) | 7 lines
 
 	 Properly protect variables from garbage collection, preventing
 	possible memory corruption.
@@ -2841,20 +2951,20 @@
 	 * refactored to separate the complexity of parsing the connection
 	arguments
 	 * Removed some superfluous code for old versions of Ruby that don't
-	support rb_define_alloc_func(). Those versions of Ruby most
-	likely don't work anyway, and I'm not testing them.
+	support rb_define_alloc_func(). Those versions of Ruby most likely
+	don't work anyway, and I'm not testing them.
 	[778892302876]
 
 2008-03-19  Jeff Davis  <davis.jeffrey@gmail.com>
 
 	* spec/data/expected_trace.out:
-	* forgot to add the expected output to the repository, so one
-	test was failing. Corrected now.
+	* forgot to add the expected output to the repository, so one test
+	was failing. Corrected now.
 	[630cca5e74c1]
 
 	* ext/pg.c:
-	This commmit just cleans up indenting and coding conventions. It's
-	a big patch, but does nothing meaningful.
+	This commmit just cleans up indenting and coding conventions. It's a
+	big patch, but does nothing meaningful.
 	[661ed2fea9e2]
 
 2008-03-18  Jeff Davis  <davis.jeffrey@gmail.com>
@@ -2928,8 +3038,8 @@
 	[e94ce7f92a06]
 
 	* ext/pg.c:
-	* make PGconn#trace accept any object that provides a writable
-	file descriptor via the method "fileno".
+	* make PGconn#trace accept any object that provides a writable file
+	descriptor via the method "fileno".
 	[221e68f16f2d]
 
 	* ext/pg.c:
@@ -2939,9 +3049,8 @@
 2008-03-07  Jeff Davis  <davis.jeffrey@gmail.com>
 
 	* ext/extconf.rb, ext/mkrf_config.rb:
-	* Added check to find pg_config. If not found, throw an error.
-	This should make it more obvious when pg_config is not in your
-	path.
+	* Added check to find pg_config. If not found, throw an error. This
+	should make it more obvious when pg_config is not in your path.
 
 	 * Added proper check on MAC OS X so that it gives the correct
 	warning on ppc when ARCHFLAGS isn't set.
@@ -3152,13 +3261,12 @@
 2008-01-23  Jeff Davis  <davis.jeffrey@gmail.com>
 
 	* ext/compat.h, ext/pg.h:
-	* had to include that file conditionally in compat.h for
-	postgresql 7.3 compatibility
+	* had to include that file conditionally in compat.h for postgresql
+	7.3 compatibility
 	[12b2568a0ada]
 
 	* ext/pg.h:
-	* included an additional file so that it works with PostgreSQL
-	8.3
+	* included an additional file so that it works with PostgreSQL 8.3
 	[34dd04d21a78]
 
 	* ext/extconf.rb, ext/pg.c:
@@ -3259,12 +3367,11 @@
 	[40270de77f48]
 
 	* ext/pg.c:
-	Change conn.exec to use PQexec if no parameters are passed, and
-	use PQexecParams if optional parameters are passed.
+	Change conn.exec to use PQexec if no parameters are passed, and use
+	PQexecParams if optional parameters are passed.
 
 	Change conn.send_query to use PQsendQuery if no parameters are
-	passed, and use PQsendQueryParams if optional parameters are
-	passed.
+	passed, and use PQsendQueryParams if optional parameters are passed.
 	[d05d9f2042d7]
 
 	* compat-ruby-postgres/extconf.rb, compat-ruby-postgres/libpq-

data/History.rdoc

@@ -1,3 +1,18 @@
+== v0.17.0 [2013-09-15] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Fix crash by calling PQsend* and PQisBusy without GVL (#171).
+
+Enhancements:
+
+- Add method PG::Connection#copy_data.
+- Add a Gemfile to allow installation of dependencies with bundler.
+- Add compatibility with rake-compiler-dev-box.
+- Return self from PG::Result#check instead of nil. This allows
+  to stack method calls.
+
+
 == v0.16.0 [2013-07-22] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/Rakefile

@@ -38,6 +38,7 @@ CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
 Hoe.plugin :mercurial
 Hoe.plugin :signing
 Hoe.plugin :deveiate
+Hoe.plugin :bundler
 
 Hoe.plugins.delete :rubyforge
 Hoe.plugins.delete :compiler
@@ -54,9 +55,12 @@ $hoespec = Hoe.spec 'pg' do
 	self.extra_rdoc_files.include( 'ext/*.c' )
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
+	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
-	self.dependency 'rake-compiler', '~> 0.8', :developer
-	self.dependency	'hoe-deveiate', '~> 0.2', :developer
+	self.dependency 'rake-compiler', '~> 0.9', :developer
+	self.dependency 'hoe', '~> 3.5.1', :developer
+	self.dependency 'hoe-deveiate', '~> 0.2', :developer
+	self.dependency 'hoe-bundler', '~> 1.0', :developer
 
 	self.spec_extras[:licenses] = ['BSD', 'Ruby', 'GPL']
 	self.spec_extras[:extensions] = [ 'ext/extconf.rb' ]

data/Rakefile.cross

@@ -72,7 +72,7 @@ class CrossLibrary < OpenStruct
 		self.host_platform = begin
 			config_file = YAML.load_file(File.expand_path("~/.rake-compiler/config.yml"))
 			_, rbfile = config_file.find{|key, fname| key.start_with?("rbconfig-#{for_platform}-") }
-			IO.read(rbfile).match(/CONFIG\["host"\] = "(.*)"/)[1]
+			IO.read(rbfile).match(/CONFIG\["CC"\] = "(.*)"/)[1].sub(/\-gcc/, '')
 		rescue
 			nil
 		end

data/ext/gvl_wrappers.h

@@ -168,7 +168,41 @@ void ubf_cancel_running_command(void *c);
 
 #define FOR_EACH_PARAM_OF_PQnotifies(param)
 
-/* function( name, void_or_nonvoid, returntype, lastparamtype, lastparamname ) */
+#define FOR_EACH_PARAM_OF_PQsendQuery(param) \
+	param(PGconn *, conn)
+
+#define FOR_EACH_PARAM_OF_PQsendQueryParams(param) \
+	param(PGconn *, conn) \
+	param(const char *, command) \
+	param(int, nParams) \
+	param(const Oid *, paramTypes) \
+	param(const char *const *, paramValues) \
+	param(const int *, paramLengths) \
+	param(const int *, paramFormats)
+
+#define FOR_EACH_PARAM_OF_PQsendPrepare(param) \
+	param(PGconn *, conn) \
+	param(const char *, stmtName) \
+	param(const char *, query) \
+	param(int, nParams)
+
+#define FOR_EACH_PARAM_OF_PQsendQueryPrepared(param) \
+	param(PGconn *, conn) \
+	param(const char *, stmtName) \
+	param(int, nParams) \
+	param(const char *const *, paramValues) \
+	param(const int *, paramLengths) \
+	param(const int *, paramFormats)
+
+#define FOR_EACH_PARAM_OF_PQsendDescribePrepared(param) \
+	param(PGconn *, conn)
+
+#define FOR_EACH_PARAM_OF_PQsendDescribePortal(param) \
+	param(PGconn *, conn)
+
+#define FOR_EACH_PARAM_OF_PQisBusy(param)
+
+/* function( name, cancel, 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) \
@@ -186,7 +220,15 @@ void ubf_cancel_running_command(void *c);
 	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(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);
+
 
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL );
 
@@ -201,7 +243,7 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL );
 #define FOR_EACH_PARAM_OF_notice_receiver_proxy(param) \
 	param(void *, arg)
 
-/* function( name, void_or_nonvoid, returntype, lastparamtype, lastparamname ) */
+/* function( name, cancel, 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) \

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v 854b22230eba 2013/07/18 13:33:09 kanis $
+ * $Id: pg_connection.c,v d93b3ddc69ff 2013/09/07 21:12:59 lars $
  *
  */
 
@@ -1610,7 +1610,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 
 	/* If called with no parameters, use PQsendQuery */
 	if(NIL_P(params)) {
-		if(PQsendQuery(conn,StringValuePtr(command)) == 0) {
+		if(gvl_PQsendQuery(conn,StringValuePtr(command)) == 0) {
 			error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
 			rb_iv_set(error, "@connection", self);
 			rb_exc_raise(error);
@@ -1683,7 +1683,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 			paramFormats[i] = NUM2INT(param_format);
 	}
 
-	result = PQsendQueryParams(conn, StringValuePtr(command), nParams, paramTypes,
+	result = gvl_PQsendQueryParams(conn, StringValuePtr(command), nParams, paramTypes,
 		(const char * const *)paramValues, paramLengths, paramFormats, resultFormat);
 
 	rb_gc_unregister_address(&gc_array);
@@ -1750,7 +1750,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
 				paramTypes[i] = NUM2INT(param);
 		}
 	}
-	result = PQsendPrepare(conn, StringValuePtr(name), StringValuePtr(command),
+	result = gvl_PQsendPrepare(conn, StringValuePtr(name), StringValuePtr(command),
 			nParams, paramTypes);
 
 	xfree(paramTypes);
@@ -1868,7 +1868,7 @@ pgconn_send_query_prepared(int argc, VALUE *argv, VALUE self)
 			paramFormats[i] = NUM2INT(param_format);
 	}
 
-	result = PQsendQueryPrepared(conn, StringValuePtr(name), nParams,
+	result = gvl_PQsendQueryPrepared(conn, StringValuePtr(name), nParams,
 		(const char * const *)paramValues, paramLengths, paramFormats,
 		resultFormat);
 
@@ -1899,7 +1899,7 @@ pgconn_send_describe_prepared(VALUE self, VALUE stmt_name)
 	VALUE error;
 	PGconn *conn = pg_get_pgconn(self);
 	/* returns 0 on failure */
-	if(PQsendDescribePrepared(conn,StringValuePtr(stmt_name)) == 0) {
+	if(gvl_PQsendDescribePrepared(conn,StringValuePtr(stmt_name)) == 0) {
 		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
@@ -1921,7 +1921,7 @@ pgconn_send_describe_portal(VALUE self, VALUE portal)
 	VALUE error;
 	PGconn *conn = pg_get_pgconn(self);
 	/* returns 0 on failure */
-	if(PQsendDescribePortal(conn,StringValuePtr(portal)) == 0) {
+	if(gvl_PQsendDescribePortal(conn,StringValuePtr(portal)) == 0) {
 		error = rb_exc_new2(rb_eUnableToSend, PQerrorMessage(conn));
 		rb_iv_set(error, "@connection", self);
 		rb_exc_raise(error);
@@ -1998,7 +1998,7 @@ static VALUE
 pgconn_is_busy(self)
 	VALUE self;
 {
-	return PQisBusy(pg_get_pgconn(self)) ? Qtrue : Qfalse;
+	return gvl_PQisBusy(pg_get_pgconn(self)) ? Qtrue : Qfalse;
 }
 
 /*
@@ -2449,6 +2449,9 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
  * is in nonblocking mode, and this command would block).
  *
  * Raises an exception if an error occurs.
+ *
+ * See also #copy_data.
+ *
  */
 static VALUE
 pgconn_put_copy_data(self, buffer)
@@ -2513,6 +2516,8 @@ pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
  * if the copy is done, or +false+ if the call would
  * block (only possible if _async_ is true).
  *
+ * See also #copy_data.
+ *
  */
 static VALUE
 pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
@@ -2916,7 +2921,7 @@ pgconn_s_quote_ident(VALUE self, VALUE in_str)
 static void *
 get_result_readable(PGconn *conn)
 {
-	return PQisBusy(conn) ? NULL : (void*)1;
+	return gvl_PQisBusy(conn) ? NULL : (void*)1;
 }
 
 

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id: pg_result.c,v de6bee6a208c 2013/07/18 13:47:31 kanis $
+ * $Id: pg_result.c,v 8255d4f73334 2013/08/18 20:40:08 lars $
  *
  */
 
@@ -74,7 +74,7 @@ pg_result_check( VALUE self )
 #endif
 		case PGRES_EMPTY_QUERY:
 		case PGRES_COMMAND_OK:
-			return Qnil;
+			return self;
 		case PGRES_BAD_RESPONSE:
 		case PGRES_FATAL_ERROR:
 		case PGRES_NONFATAL_ERROR:
@@ -97,7 +97,7 @@ pg_result_check( VALUE self )
 	rb_exc_raise( exception );
 
 	/* Not reached */
-	return Qnil;
+	return self;
 }
 
 

data/lib/pg.rb

@@ -19,11 +19,13 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.16.0'
+	VERSION = '0.17.0'
 
 	# VCS revision
-	REVISION = %q$Revision: 4e0606f5f5aa $
+	REVISION = %q$Revision: 7cdff0a462e5 $
 
+	class NotAllCopyDataRetrieved < PG::Error
+	end
 
 	### Get the PG library version. If +include_buildnum+ is +true+, include the build ID.
 	def self::version_string( include_buildnum=false )

data/lib/pg/connection.rb

@@ -74,6 +74,91 @@ class PG::Connection
 		return connopts.join(' ')
 	end
 
+	#  call-seq:
+	#     conn.copy_data( sql ) {|sql_result| ... } -> PG::Result
+	#
+	# Execute a copy process for transfering data to or from the server.
+	#
+	# This issues the SQL COPY command via #exec. The response to this
+	# (if there is no error in the command) is a PG::Result object that
+	# is passed to the block, bearing a status code of PGRES_COPY_OUT or
+	# PGRES_COPY_IN (depending on the specified copy direction).
+	# The application should then use #put_copy_data or #get_copy_data
+	# to receive or transmit data rows and should return from the block
+	# when finished.
+	#
+	# #copy_data returns another PG::Result object when the data transfer
+	# is complete. An exception is raised if some problem was encountered,
+	# so it isn't required to make use of any of them.
+	# At this point further SQL commands can be issued via #exec.
+	# (It is not possible to execute other SQL commands using the same
+	# connection while the COPY operation is in progress.)
+	#
+	# This method ensures, that the copy process is properly terminated
+	# in case of client side or server side failures. Therefore, in case
+	# of blocking mode of operation, #copy_data is preferred to raw calls
+	# of #put_copy_data, #get_copy_data and #put_copy_end.
+	#
+	# Example with CSV input format:
+	#   conn.exec "create table my_table (a text,b text,c text,d text,e text)"
+	#   conn.copy_data "COPY my_table FROM STDOUT CSV" do
+	#     conn.put_copy_data "some,csv,data,to,copy\n"
+	#     conn.put_copy_data "more,csv,data,to,copy\n"
+	#   end
+	# This creates +my_table+ and inserts two rows.
+	#
+	# Example with CSV output format:
+	#   conn.copy_data "COPY my_table TO STDOUT CSV" do
+	#     while row=conn.get_copy_data
+	#       p row
+	#     end
+	#   end
+	# This prints all rows of +my_table+ to stdout:
+	#   "some,csv,data,to,copy\n"
+	#   "more,csv,data,to,copy\n"
+	def copy_data( sql )
+		res = exec( sql )
+
+		case res.result_status
+		when PGRES_COPY_IN
+			begin
+				yield res
+			rescue Exception => err
+				errmsg = "%s while copy data: %s" % [ err.class.name, err.message ]
+				put_copy_end( errmsg )
+				get_result
+				raise
+			else
+				put_copy_end
+				get_last_result
+			end
+
+		when PGRES_COPY_OUT
+			begin
+				yield res
+			rescue Exception => err
+				cancel
+				while get_copy_data
+				end
+				while get_result
+				end
+				raise
+			else
+				res = get_last_result
+				if res.result_status != PGRES_COMMAND_OK
+					while get_copy_data
+					end
+					while get_result
+					end
+					raise PG::NotAllCopyDataRetrieved, "Not all COPY data retrieved"
+				end
+				res
+			end
+
+		else
+			raise ArgumentError, "SQL command is no COPY statement: #{sql}"
+		end
+	end
 
 	# Backward-compatibility aliases for stuff that's moved into PG.
 	class << self

data/spec/lib/helpers.rb

@@ -254,6 +254,12 @@ module PG::TestingHelpers
 		conn_name.should include(app_name[-10..-1])
 		conn_name.length.should <= 64
 	end
+
+	# Ensure the connection is in a clean execution status.
+	def verify_clean_exec_status
+		@conn.send_query( "VALUES (1)" )
+		@conn.get_last_result.values.should == [["1"]]
+	end
 end
 
 

data/spec/pg/connection_spec.rb

@@ -457,6 +457,101 @@ describe PG::Connection do
 		rval.should include( '5678', '1234' )
 	end
 
+	it "can process #copy_data output queries" do
+		rows = []
+		res2 = @conn.copy_data( "COPY (SELECT 1 UNION ALL SELECT 2) TO STDOUT" ) do |res|
+			res.result_status.should == PG::PGRES_COPY_OUT
+			res.nfields.should == 1
+			while row=@conn.get_copy_data
+				rows << row
+			end
+		end
+		rows.should == ["1\n", "2\n"]
+		res2.result_status.should == PG::PGRES_COMMAND_OK
+		verify_clean_exec_status
+	end
+
+	it "can handle incomplete #copy_data output queries" do
+		expect {
+			@conn.copy_data( "COPY (SELECT 1 UNION ALL SELECT 2) TO STDOUT" ) do |res|
+				@conn.get_copy_data
+			end
+		}.to raise_error(PG::NotAllCopyDataRetrieved, /Not all/)
+		verify_clean_exec_status
+	end
+
+	it "can handle client errors in #copy_data for output" do
+		expect {
+			@conn.copy_data( "COPY (SELECT 1 UNION ALL SELECT 2) TO STDOUT" ) do
+				raise "boom"
+			end
+		}.to raise_error(RuntimeError, "boom")
+		verify_clean_exec_status
+	end
+
+	it "can handle server errors in #copy_data for output" do
+		@conn.exec "ROLLBACK"
+		@conn.transaction do
+			@conn.exec( "CREATE FUNCTION errfunc() RETURNS int AS $$ BEGIN RAISE 'test-error'; END; $$ LANGUAGE plpgsql;" )
+			expect {
+				@conn.copy_data( "COPY (SELECT errfunc()) TO STDOUT" ) do |res|
+					while @conn.get_copy_data
+					end
+				end
+			}.to raise_error(PG::Error, /test-error/)
+		end
+		verify_clean_exec_status
+	end
+
+	it "can process #copy_data input queries" do
+		@conn.exec( "CREATE TEMP TABLE copytable (col1 TEXT)" )
+		res2 = @conn.copy_data( "COPY copytable FROM STDOUT" ) do |res|
+			res.result_status.should == PG::PGRES_COPY_IN
+			res.nfields.should == 1
+			@conn.put_copy_data "1\n"
+			@conn.put_copy_data "2\n"
+		end
+		res2.result_status.should == PG::PGRES_COMMAND_OK
+
+		verify_clean_exec_status
+
+		res = @conn.exec( "SELECT * FROM copytable ORDER BY col1" )
+		res.values.should == [["1"], ["2"]]
+	end
+
+	it "can handle client errors in #copy_data for input" do
+		@conn.exec "ROLLBACK"
+		@conn.transaction do
+			@conn.exec( "CREATE TEMP TABLE copytable (col1 TEXT)" )
+			expect {
+				@conn.copy_data( "COPY copytable FROM STDOUT" ) do |res|
+					raise "boom"
+				end
+			}.to raise_error(RuntimeError, "boom")
+		end
+		verify_clean_exec_status
+	end
+
+	it "can handle server errors in #copy_data for input" do
+		@conn.exec "ROLLBACK"
+		@conn.transaction do
+			@conn.exec( "CREATE TEMP TABLE copytable (col1 INT)" )
+			expect {
+				@conn.copy_data( "COPY copytable FROM STDOUT" ) do |res|
+					@conn.put_copy_data "xyz\n"
+				end
+			}.to raise_error(PG::Error, /invalid input syntax for integer/)
+		end
+		verify_clean_exec_status
+	end
+
+	it "should raise an error for non copy statements in #copy_data" do
+		expect {
+			@conn.copy_data( "SELECT 1" ){}
+		}.to raise_error(ArgumentError, /no COPY/)
+
+		verify_clean_exec_status
+	end
 
 	it "correctly finishes COPY queries passed to #async_exec" do
 		@conn.async_exec( "COPY (SELECT 1 UNION ALL SELECT 2) TO STDOUT" )

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Michael Granger
+- Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain:
@@ -30,7 +31,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -80,14 +81,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
@@ -103,19 +118,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.0'
 description: |-
   Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
@@ -138,6 +153,7 @@ description: |-
     end
 email:
 - ged@FaerieMUD.org
+- lars@greiz-reinsdorf.de
 executables: []
 extensions:
 - ext/extconf.rb