pg 0.16.0-x64-mingw32 → 0.17.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: ed7bab2dd53a3ae63b96d2e43b0b94438c1517fb
-  metadata.gz: dacd22ae85fe3a798d05c1b5b6c2e8544786c7e5
+  metadata.gz: 21f53fb93db689d13bbec315cbf5190e22581120
+  data.tar.gz: 59fe2cf2c7bedfe9d1295779e434e52812a0cb26
 SHA512: 
-  data.tar.gz: 50b8196d92f9a8ae7dcaaec73e68fca6d849350b8a3db3826ae7e950e1c1bb4820e1b12d73b65875a6224184c7c0c42890076a2220a4b4159a7c778b43014b86
-  metadata.gz: a156df14e7ab2ae58d3ed2bc5c0326ffb07ebe968cd843c8e55d48449609c2a8e93f064fbbdd2ee62661ed2e91dab077bff0e03ebc08658bdd0144c03530fb7b
+  metadata.gz: 79f561112dee71eec9cfeb84f94a253f1ac2c9cdfc1e5227a7c96ea1e07a37940a6c35be804d425ebe282cd7a3cf8e2ddfd9fff20ccf67aa5ec099fd2afd1634
+  data.tar.gz: 26ec759a2af8b649ea4a11b3521a99536f2af838da7e94ea77b7c2a4916bcbd209876b58fc50fa3990e7f15fd9e060a8706e7bdcddd4191d6e5168df6765cf32

data/ChangeLog

@@ -1,8 +1,129 @@
+2013-09-16  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.17.0 for changeset 30da9c169efc
+	[46f35f5b396e] [tip]
+
+	* .hgsigs:
+	Added signature for changeset eed93df350a6
+	[30da9c169efc] [v0.17.0]
+
+	* .hoerc:
+	Add the Gemfile to the list of files that don't have to be on the
+	Manifest.
+	[eed93df350a6]
+
+2013-09-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc, lib/pg.rb:
+	Bump minor version
+	[7cdff0a462e5]
+
+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]
+
+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]
+
+	* ext/pg_result.c:
+	Return self from PG::Result#check instead of nil. This allowes to
+	stack method calls.
+	[8255d4f73334]
+
+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] [tip]
+	[315fa9728831]
 
 	* .hgsigs:
 	Added signature for changeset 4e0606f5f5aa

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

@@ -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

@@ -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$
 
+	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: x64-mingw32
 authors: 
 - Michael Granger
+- Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain: 
@@ -30,7 +31,7 @@ cert_chain:
   mMFp4kPUHbWOqCp2mz9gCA==
   -----END CERTIFICATE-----
 
-date: 2013-07-23 00:00:00 Z
+date: 2013-09-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe-mercurial
@@ -69,29 +70,39 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: "0.9"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hoe-deveiate
+  name: hoe
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: 3.5.1
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: hoe-deveiate
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.6"
+        version: "0.2"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: hoe-bundler
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :development
+  version_requirements: *id007
 description: |-
   Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
   
@@ -114,6 +125,7 @@ description: |-
     end
 email: 
 - ged@FaerieMUD.org
+- lars@greiz-reinsdorf.de
 executables: []
 
 extensions: []