pg 0.7.9.2008.08.17 → 0.7.9.2008.10.05

data/ext/extconf.rb

@@ -8,6 +8,8 @@ rescue
 	exit 1
 end
 
+$libs = IO.popen("pg_config --libs").readline.chomp
+
 # OS X compatibility
 if(RUBY_PLATFORM =~ /darwin/) then
 	# test if postgresql is probably universal

data/ext/pg.c

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: jdavis $
-  $Date: 2008-08-17 13:43:21 -0700 (Sun, 17 Aug 2008) $
+  $Date: 2008-10-05 12:43:27 -0700 (Sun, 05 Oct 2008) $
 ************************************************/
 
 #include "pg.h"
@@ -137,27 +137,34 @@ pgresult_check(VALUE rb_pgconn, VALUE rb_pgresult)
 {
 	VALUE error;
 	PGconn *conn = get_pgconn(rb_pgconn);
-	PGresult *result = get_pgresult(rb_pgresult);
+	PGresult *result;
+	Data_Get_Struct(rb_pgresult, PGresult, result);
 
 	if(result == NULL)
+	{
 		error = rb_exc_new2(rb_ePGError, PQerrorMessage(conn));
-	switch (PQresultStatus(result)) {
-	case PGRES_TUPLES_OK:
-	case PGRES_COPY_OUT:
-	case PGRES_COPY_IN:
-	case PGRES_EMPTY_QUERY:
-	case PGRES_COMMAND_OK:      
-		return;
-	case PGRES_BAD_RESPONSE:
-	case PGRES_FATAL_ERROR:
-	case PGRES_NONFATAL_ERROR:
-		error = rb_exc_new2(rb_ePGError, PQresultErrorMessage(result));
-		break;
-	default:
-		error = rb_exc_new2(rb_ePGError, 
-			"internal error : unknown result status.");
 	}
-	
+	else
+	{
+		switch (PQresultStatus(result))
+		{
+		case PGRES_TUPLES_OK:
+		case PGRES_COPY_OUT:
+		case PGRES_COPY_IN:
+		case PGRES_EMPTY_QUERY:
+		case PGRES_COMMAND_OK:
+			return;
+		case PGRES_BAD_RESPONSE:
+		case PGRES_FATAL_ERROR:
+		case PGRES_NONFATAL_ERROR:
+			error = rb_exc_new2(rb_ePGError, PQresultErrorMessage(result));
+			break;
+		default:
+			error = rb_exc_new2(rb_ePGError,
+				"internal error : unknown result status.");
+		}
+	}
+
 	rb_iv_set(error, "@connection", rb_pgconn);
 	rb_iv_set(error, "@result", rb_pgresult);
 	rb_exc_raise(error);
@@ -269,7 +276,7 @@ parse_connect_args(int argc, VALUE *argv, VALUE self)
 	else if (RARRAY_LEN(args) == 7) {
 		build_key_value_string(conninfo_rstr, "host", rb_ary_entry(args,0));
 		build_key_value_string(conninfo_rstr, "port", rb_ary_entry(args,1));
-		build_key_value_string(conninfo_rstr, "opt", rb_ary_entry(args,2));
+		build_key_value_string(conninfo_rstr, "options", rb_ary_entry(args,2));
 		build_key_value_string(conninfo_rstr, "tty", rb_ary_entry(args,3));
 		build_key_value_string(conninfo_rstr, "dbname", rb_ary_entry(args,4));
 		build_key_value_string(conninfo_rstr, "user", rb_ary_entry(args,5));
@@ -1781,12 +1788,11 @@ pgconn_send_describe_portal(VALUE self, VALUE portal)
  *    conn.get_result() -> PGresult
  *
  * Blocks waiting for the next result from a call to
- * +PGconn#send_query+ (or another asynchronous command), 
- * and returns it. Returns +nil+ if no more results are 
- * available.
+ * +PGconn#send_query+ (or another asynchronous command), and returns
+ * it. Returns +nil+ if no more results are available.
  *
- * Note: call this function repeatedly until it returns +nil+,
- * or else you will not be able to issue further commands.
+ * Note: call this function repeatedly until it returns +nil+, or else
+ * you will not be able to issue further commands.
  */
 static VALUE
 pgconn_get_result(VALUE self)
@@ -1794,14 +1800,13 @@ pgconn_get_result(VALUE self)
 	PGconn *conn = get_pgconn(self);
 	PGresult *result;
 	VALUE rb_pgresult;
-	
+
 	result = PQgetResult(conn);
 	if(result == NULL)
 		return Qnil;
 	rb_pgresult = new_pgresult(result);
-	pgresult_check(self, rb_pgresult);
 	if (rb_block_given_p()) {
-		return rb_ensure(yield_pgresult, rb_pgresult, 
+		return rb_ensure(yield_pgresult, rb_pgresult,
 			pgresult_clear, rb_pgresult);
 	}
 	return rb_pgresult;
@@ -2461,8 +2466,9 @@ pgconn_get_last_result(VALUE self)
 	while((result = pgconn_get_result(self)) != Qnil) {
 		ret = result;
 	}
+	pgresult_check(self, ret);
 	return ret;
-} 
+}
 
 
 /*

data/spec/pgconn_spec.rb

@@ -75,6 +75,7 @@ describe PGconn do
 
 	it "should not leave stale server connections after finish" do
 		PGconn.connect(@conninfo).finish
+		sleep 0.5
 		res = @conn.exec(%[SELECT COUNT(*) AS n FROM pg_stat_activity
 							WHERE usename IS NOT NULL])
 		# there's still the global @conn, but should be no more
@@ -102,9 +103,8 @@ describe PGconn do
 		error = false
 		@conn.send_query("SELECT pg_sleep(1000)")
 		@conn.cancel
-		begin
-			tmpres = @conn.get_result
-		rescue PGError => e
+		tmpres = @conn.get_result
+		if(tmpres.result_status != PGresult::PGRES_TUPLES_OK)
 			error = true
 		end
 		error.should == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pg
 version: !ruby/object:Gem::Version 
-  version: 0.7.9.2008.08.17
+  version: 0.7.9.2008.10.05
 platform: ruby
 authors: 
 - Yukihiro Matsumoto
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-17 00:00:00 -07:00
+date: 2008-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - PostgreSQL libpq library and headers
 rubyforge_project: ruby-pg
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby extension library providing an API to PostgreSQL