pg 0.12.0pre258 → 0.12.0.pre263

data/Manifest.txt

@@ -1,5 +1,6 @@
 .gemtest
 BSD
+ChangeLog
 Contributors.rdoc
 GPL
 History.rdoc
@@ -21,8 +22,10 @@ ext/vc/pg_19/pg_19.vcproj
 lib/pg.rb
 misc/openssl-pg-segfault.rb
 sample/async_api.rb
+sample/async_copyto.rb
 sample/copyfrom.rb
 sample/copyto.rb
+sample/cursor.rb
 sample/losample.rb
 sample/notify_wait.rb
 sample/psql.rb

data/Rakefile

@@ -29,9 +29,9 @@ TMPDIR  = BASEDIR + 'tmp'
 DLEXT   = Config::CONFIG['DLEXT']
 EXT     = LIBDIR + "pg_ext.#{DLEXT}"
 
-TESTING_TMPDIRS = Rake::FileList[ "#{Dir.tmpdir}/tmp_test_*" ]
+TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
 
-CLOBBER.include( *TESTING_TMPDIRS )
+CLOBBER.include( TEST_DIRECTORY )
 CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
 
 # Set up Hoe plugins

data/ext/extconf.rb

@@ -53,6 +53,9 @@ have_func 'lo_create'
 have_func 'pg_encoding_to_char'
 have_func 'PQsetClientEncoding'
 
+have_func 'rb_encdb_alias'
+have_func 'rb_enc_alias'
+
 $defs.push( "-DHAVE_ST_NOTIFY_EXTRA" ) if
 	have_struct_member 'struct pgNotify', 'extra', 'libpq-fe.h'
 

data/ext/pg.c

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: ged $
-  $Date: 2011/10/07 20:24:14 $
+  $Date: 2011/12/05 16:59:23 $
 ************************************************/
 
 #include "pg.h"
@@ -3172,12 +3172,12 @@ pgresult_res_status(VALUE self, VALUE status)
 
 /*
  * call-seq:
- *    res.result_error_message() -> String
+ *    res.error_message() -> String
  *
  * Returns the error message of the command as a string. 
  */
 static VALUE
-pgresult_result_error_message(VALUE self)
+pgresult_error_message(VALUE self)
 {
 	VALUE ret = rb_tainted_str_new2(PQresultErrorMessage(get_pgresult(self)));
 	ASSOCIATE_INDEX(ret, self);
@@ -3186,7 +3186,7 @@ pgresult_result_error_message(VALUE self)
 
 /*
  * call-seq:
- *    res.result_error_field(fieldcode) -> String
+ *    res.error_field(fieldcode) -> String
  *
  * Returns the individual field of an error.
  *
@@ -3203,14 +3203,46 @@ pgresult_result_error_message(VALUE self)
  * * +PG_DIAG_SOURCE_FILE+
  * * +PG_DIAG_SOURCE_LINE+
  * * +PG_DIAG_SOURCE_FUNCTION+
+ *
+ * An example:
+ * 
+ *   begin
+ *       conn.exec( "SELECT * FROM nonexistant_table" )
+ *   rescue PGError => err
+ *       p [
+ *           result.error_field( PGresult::PG_DIAG_SEVERITY ),
+ *           result.error_field( PGresult::PG_DIAG_SQLSTATE ),
+ *           result.error_field( PGresult::PG_DIAG_MESSAGE_PRIMARY ),
+ *           result.error_field( PGresult::PG_DIAG_MESSAGE_DETAIL ),
+ *           result.error_field( PGresult::PG_DIAG_MESSAGE_HINT ),
+ *           result.error_field( PGresult::PG_DIAG_STATEMENT_POSITION ),
+ *           result.error_field( PGresult::PG_DIAG_INTERNAL_POSITION ),
+ *           result.error_field( PGresult::PG_DIAG_INTERNAL_QUERY ),
+ *           result.error_field( PGresult::PG_DIAG_CONTEXT ),
+ *           result.error_field( PGresult::PG_DIAG_SOURCE_FILE ),
+ *           result.error_field( PGresult::PG_DIAG_SOURCE_LINE ),
+ *           result.error_field( PGresult::PG_DIAG_SOURCE_FUNCTION ),
+ *       ]
+ *   end
+ * 
+ * Outputs:
+ * 
+ *   ["ERROR", "42P01", "relation \"nonexistant_table\" does not exist", nil, nil, 
+ *    "15", nil, nil, nil, "path/to/parse_relation.c", "857", "parserOpenTable"]
  */
 static VALUE
-pgresult_result_error_field(VALUE self, VALUE field)
+pgresult_error_field(VALUE self, VALUE field)
 {
 	PGresult *result = get_pgresult( self );
 	int fieldcode = NUM2INT( field );
- 	VALUE ret = rb_tainted_str_new2( PQresultErrorField(result, fieldcode) );
-	ASSOCIATE_INDEX( ret, self );
+	char * fieldstr = PQresultErrorField( result, fieldcode );
+	VALUE ret = Qnil;
+
+	if ( fieldstr ) {
+		ret = rb_tainted_str_new2( fieldstr );
+		ASSOCIATE_INDEX( ret, self );
+	}
+
 	return ret;
 }
 
@@ -3883,7 +3915,15 @@ static int enc_get_index(VALUE val)
 	return i;
 }
 
+#ifdef HAVE_RB_ENCDB_ALIAS
+#	define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig))
+#elif HAVE_RB_ENC_ALIAS
+#	define ENC_ALIAS(name, orig) rb_enc_alias((name), (orig))
+#else
 extern int rb_enc_alias(const char *alias, const char *orig); /* declaration missing in Ruby 1.9.1 */
+#	define ENC_ALIAS(name, orig) rb_enc_alias((name), (orig))
+#endif
+
 static rb_encoding *
 find_or_create_johab(void)
 {
@@ -3897,7 +3937,7 @@ find_or_create_johab(void)
 
 	enc_index = rb_define_dummy_encoding(aliases[0]);
 	for (i = 1; i < sizeof(aliases)/sizeof(aliases[0]); ++i) {
-		rb_enc_alias(aliases[i], aliases[0]);
+		ENC_ALIAS(aliases[i], aliases[0]);
 	}
 	return rb_enc_from_index(enc_index);
 }
@@ -4424,8 +4464,10 @@ Init_pg_ext()
 	/******     PGresult INSTANCE METHODS: libpq     ******/
 	rb_define_method(rb_cPGresult, "result_status", pgresult_result_status, 0);
 	rb_define_method(rb_cPGresult, "res_status", pgresult_res_status, 1);
-	rb_define_method(rb_cPGresult, "result_error_message", pgresult_result_error_message, 0);
-	rb_define_method(rb_cPGresult, "result_error_field", pgresult_result_error_field, 1);
+	rb_define_method(rb_cPGresult, "error_message", pgresult_error_message, 0);
+	rb_define_alias( rb_cPGresult, "result_error_message", "error_message");
+	rb_define_method(rb_cPGresult, "error_field", pgresult_error_field, 1);
+	rb_define_alias( rb_cPGresult, "result_error_field", "error_field" );
 	rb_define_method(rb_cPGresult, "clear", pgresult_clear, 0);
 	rb_define_method(rb_cPGresult, "ntuples", pgresult_ntuples, 0);
 	rb_define_alias(rb_cPGresult, "num_tuples", "ntuples");

data/sample/async_copyto.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+require 'pg'
+require 'stringio'
+
+# Using COPY asynchronously
+
+$stderr.puts "Opening database connection ..."
+conn = PGconn.connect( :dbname => 'test' )
+conn.setnonblocking( true )
+
+socket = IO.for_fd( conn.socket )
+
+$stderr.puts "Running COPY command ..."
+buf = ''
+conn.transaction do
+	conn.send_query( "COPY logs TO STDOUT WITH csv" )
+	buf = nil
+
+	# #get_copy_data returns a row if there's a whole one to return, false
+	# if there isn't one but the COPY is still running, or nil when it's
+	# finished.
+	begin
+		$stderr.puts "COPY loop"
+		conn.consume_input
+		while conn.is_busy
+			$stderr.puts "  ready loop"
+			select( [socket], nil, nil, 5.0 ) or
+				raise "Timeout (5s) waiting for query response."
+			conn.consume_input
+		end
+
+		buf = conn.get_copy_data
+		$stdout.puts( buf ) if buf
+	end until buf.nil?
+end
+
+conn.finish
+

data/sample/copyto.rb

@@ -8,10 +8,6 @@ require 'stringio'
 $stderr.puts "Opening database connection ..."
 conn = PGconn.connect( :dbname => 'test' )
 
-### You can test the error case from the database side easily by
-### changing one of the numbers at the end of one of the above rows to
-### something non-numeric like "-".
-
 $stderr.puts "Running COPY command ..."
 buf = ''
 conn.transaction do

data/sample/cursor.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require 'pg'
+
+# An example of how to use SQL cursors. This is mostly a straight port of
+# the cursor portion of testlibpq.c from src/test/examples.
+
+$stderr.puts "Opening database connection ..."
+conn = PGconn.connect( :dbname => 'test' )
+
+# 
+conn.transaction do
+    conn.exec( "DECLARE myportal CURSOR FOR select * from pg_database" )
+    res = conn.exec( "FETCH ALL IN myportal" )
+
+    puts res.fields.collect {|fname| "%-15s" % [fname] }.join( '' )
+    res.values.collect do |row|
+        puts row.collect {|col| "%-15s" % [col] }.join( '' )
+    end
+end
+

data/spec/lib/helpers.rb

@@ -2,7 +2,9 @@
 
 require 'pathname'
 require 'rspec'
+require 'shellwords'
 
+TEST_DIRECTORY = Pathname.getwd + "tmp_test_specs"
 
 RSpec.configure do |config|
 	ruby_version_vec = RUBY_VERSION.split('.').map {|c| c.to_i }.pack( "N*" )
@@ -139,6 +141,7 @@ module PgTestingHelpers
 			else
 				$stdout.reopen( logfh )
 				$stderr.reopen( $stdout )
+				$stderr.puts( ">>> " + cmd.shelljoin )
 				exec( *cmd )
 				$stderr.puts "After the exec()?!??!"
 				exit!
@@ -184,8 +187,7 @@ module PgTestingHelpers
 		stop_existing_postmasters()
 
 		puts "Setting up test database for #{description} tests"
-		@test_directory = Pathname.getwd + "tmp_test_specs"
-		@test_pgdata = @test_directory + 'data'
+		@test_pgdata = TEST_DIRECTORY + 'data'
 		@test_pgdata.mkpath
 
 		@port = 54321
@@ -193,7 +195,7 @@ module PgTestingHelpers
 		ENV['PGHOST'] = 'localhost'
 		@conninfo = "host=localhost port=#{@port} dbname=test"
 
-		@logfile = @test_directory + 'setup.log'
+		@logfile = TEST_DIRECTORY + 'setup.log'
 		trace "Command output logged to #{@logfile}"
 
 		begin
@@ -204,7 +206,7 @@ module PgTestingHelpers
 			end
 
 			trace "Starting postgres"
-			log_and_run @logfile, 'pg_ctl', '-w', '-o', "-k #{@test_directory.to_s.inspect}",
+			log_and_run @logfile, 'pg_ctl', '-w', '-o', "-k #{TEST_DIRECTORY.to_s.dump}",
 				'-D', @test_pgdata.to_s, 'start'
 			sleep 2
 

data/spec/m17n_spec.rb

@@ -7,7 +7,7 @@ BEGIN {
 
 	basedir = Pathname( __FILE__ ).dirname.parent
 	libdir = basedir + 'lib'
-	archlib = libdir + Config::CONFIG['sitearch']
+	archlib = libdir + RbConfig::CONFIG['sitearch']
 
 	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )

data/spec/pgconn_spec.rb

@@ -167,7 +167,7 @@ describe PGconn do
 			# be careful to explicitly close files so that the
 			# directory can be removed and we don't have to wait for
 			# the GC to run.
-			trace_file = @test_directory + "test_trace.out"
+			trace_file = TEST_DIRECTORY + "test_trace.out"
 			trace_io = trace_file.open( 'w', 0600 )
 			@conn.trace( trace_io )
 			trace_io.close

data/spec/pgresult_spec.rb

@@ -38,7 +38,34 @@ describe PGresult do
 
 	it "should insert nil AS NULL and return NULL as nil" do
 		res = @conn.exec("SELECT $1::int AS n", [nil])
-		res[0]['n'].should == nil
+		res[0]['n'].should be_nil()
+	end
+
+	it "encapsulates errors in a PGError object" do
+		exception = nil
+		begin
+			@conn.exec( "SELECT * FROM nonexistant_table" )
+		rescue PGError => err
+			exception = err
+		end
+
+		result = exception.result
+
+		result.should be_a( PGresult )
+		result.error_field( PGresult::PG_DIAG_SEVERITY ).should == 'ERROR'
+		result.error_field( PGresult::PG_DIAG_SQLSTATE ).should == '42P01'
+		result.error_field( PGresult::PG_DIAG_MESSAGE_PRIMARY ).
+			should == 'relation "nonexistant_table" does not exist'
+		result.error_field( PGresult::PG_DIAG_MESSAGE_DETAIL ).should be_nil()
+		result.error_field( PGresult::PG_DIAG_MESSAGE_HINT ).should be_nil()
+		result.error_field( PGresult::PG_DIAG_STATEMENT_POSITION ).should == '15'
+		result.error_field( PGresult::PG_DIAG_INTERNAL_POSITION ).should be_nil()
+		result.error_field( PGresult::PG_DIAG_INTERNAL_QUERY ).should be_nil()
+		result.error_field( PGresult::PG_DIAG_CONTEXT ).should be_nil()
+		result.error_field( PGresult::PG_DIAG_SOURCE_FILE ).should =~ /parse_relation\.c$/
+		result.error_field( PGresult::PG_DIAG_SOURCE_LINE ).should == '857'
+		result.error_field( PGresult::PG_DIAG_SOURCE_FUNCTION ).should == 'parserOpenTable'
+
 	end
 
 	it "should detect division by zero as SQLSTATE 22012" do
@@ -46,8 +73,7 @@ describe PGresult do
 		begin
 			res = @conn.exec("SELECT 1/0")
 		rescue PGError => e
-			sqlstate = e.result.result_error_field(
-				PGresult::PG_DIAG_SQLSTATE).to_i
+			sqlstate = e.result.result_error_field( PGresult::PG_DIAG_SQLSTATE ).to_i
 		end
 		sqlstate.should == 22012
 	end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: pg
 version: !ruby/object:Gem::Version 
-  hash: 1923832429
+  hash: 1923832423
   prerelease: 
   segments: 
   - 0
   - 12
   - 0
   - pre
-  - 258
-  version: 0.12.0pre258
+  - 263
+  version: 0.12.0.pre263
 platform: ruby
 authors: 
 - Jeff Davis
@@ -38,7 +38,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-10-07 00:00:00 Z
+date: 2011-12-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -144,6 +144,7 @@ extra_rdoc_files:
 files: 
 - .gemtest
 - BSD
+- ChangeLog
 - Contributors.rdoc
 - GPL
 - History.rdoc
@@ -165,8 +166,10 @@ files:
 - lib/pg.rb
 - misc/openssl-pg-segfault.rb
 - sample/async_api.rb
+- sample/async_copyto.rb
 - sample/copyfrom.rb
 - sample/copyto.rb
+- sample/cursor.rb
 - sample/losample.rb
 - sample/notify_wait.rb
 - sample/psql.rb
@@ -215,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pg
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/]

metadata.gz.sig

@@ -0,0 +1,2 @@
+����5���%�Wtx��1v̒<�(w��R̠�����ҡ�I��.L�|��ϑ7z<Y�s�ۍK�6��y�����}uAV;4{w%�៝M��� �G���N/��l"�B�lEJ���x2�����$���1�%`���xP��c~$NW��ٓ��{�e
+͐]�^�{W��Ϙ�]�fcsAX�!���6��
[0�ʣ���|8�V�!��F���|d�OM�����.��7��g3����i�9F�7^gu�V�R