pg 0.9.0 → 0.10.0

data/spec/lib/helpers.rb

@@ -1,9 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'pathname'
+require 'rspec'
+
+
+RSpec.configure do |config|
+	ruby_version_vec = RUBY_VERSION.split('.').map {|c| c.to_i }.pack( "N*" )
+
+	config.mock_with :rspec
+	config.filter_run_excluding :ruby_19 => true if ruby_version_vec <= [1,9,1].pack( "N*" )
+end
 
 module PgTestingHelpers
 
+
 	# Set some ANSI escape code constants (Shamelessly stolen from Perl's
 	# Term::ANSIColor by Russ Allbery <rra@stanford.edu> and Zenin <zenin@best.com>
 	ANSI_ATTRIBUTES = {
@@ -104,6 +114,8 @@ module PgTestingHelpers
 	end
 
 
+	NOFORK_PLATFORMS = %w{java}
+
 	### Run the specified command +cmd+ after redirecting stdout and stderr to the specified 
 	### +logpath+, failing if the execution fails.
 	def log_and_run( logpath, *cmd )
@@ -115,16 +127,24 @@ module PgTestingHelpers
 			trace( cmd )
 		end
 
-		logfh = File.open( logpath, File::WRONLY|File::CREAT|File::APPEND )
-		if pid = fork
-			logfh.close
-			Process.wait
+		# Eliminate the noise of creating/tearing down the database by
+		# redirecting STDERR/STDOUT to a logfile if the Ruby interpreter
+		# supports fork()
+		if NOFORK_PLATFORMS.include?( RUBY_PLATFORM )
+			system( *cmd )
 		else
-			$stdout.reopen( logfh )
-			$stderr.reopen( $stdout )
-			exec( *cmd )
-			$stderr.puts "After the exec()?!??!"
-			exit!
+			logfh = File.open( logpath, File::WRONLY|File::CREAT|File::APPEND )
+			if pid = fork
+				logfh.close
+			else
+				$stdout.reopen( logfh )
+				$stderr.reopen( $stdout )
+				exec( *cmd )
+				$stderr.puts "After the exec()?!??!"
+				exit!
+			end
+
+			Process.wait( pid )
 		end
 
 		raise "Command failed: [%s]" % [cmd.join(' ')] unless $?.success?
@@ -147,7 +167,7 @@ module PgTestingHelpers
 					trace "No postmaster running for %s" % [ datadir ]
 					# Process isn't alive, so don't try to stop it
 				else
-					trace "Stopping lingering database at PID %d"
+					trace "Stopping lingering database at PID %d" % [ pid ]
 					run 'pg_ctl', '-D', datadir.to_s, '-m', 'fast', 'stop'
 				end
 			end

data/spec/m17n_spec.rb

@@ -9,33 +9,21 @@ BEGIN {
 	libdir = basedir + 'lib'
 	archlib = libdir + Config::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 )
 	$LOAD_PATH.unshift( archlib.to_s ) unless $LOAD_PATH.include?( archlib.to_s )
 }
 
-require 'pg'
-
-require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'spec/lib/helpers'
+require 'pg'
 
-describe "multinationalization support" do
+describe "multinationalization support", :ruby_19 => true do
 	include PgTestingHelpers
 
-	RUBY_VERSION_VEC = RUBY_VERSION.split('.').map {|c| c.to_i }.pack("N*")
-	MIN_RUBY_VERSION_VEC = [1,9,1].pack('N*')
-
-
 	before( :all ) do
-		@conn = nil
-		if RUBY_VERSION_VEC >= MIN_RUBY_VERSION_VEC
-			@conn = setup_testing_db( "m17n" )
-			@conn.exec( 'BEGIN' )
-		end
-	end
-
-	before( :each ) do
-		pending "depends on m17n support in Ruby >= 1.9.1" if @conn.nil?
+		@conn = setup_testing_db( "m17n" )
+		@conn.exec( 'BEGIN' )
 	end
 
 
@@ -49,7 +37,7 @@ describe "multinationalization support" do
 			res = conn.exec("VALUES ('#{PGconn.escape_bytea(in_bytes)}'::bytea)", [], 0)
 			out_bytes = PGconn.unescape_bytea(res[0]['column1'])
 		end
-		out_bytes.should== in_bytes
+		out_bytes.should == in_bytes
 	end
 
 	describe "rubyforge #22925: m17n support" do
@@ -114,17 +102,41 @@ describe "multinationalization support" do
 					res = conn.exec( stmt, [], 0 )
 					out_string = res[0]['column1']
 				end
-				out_string.should == 'foo'.encode(Encoding::ASCII_8BIT)
+				out_string.should == 'foo'.encode( Encoding::ASCII_8BIT )
 				out_string.encoding.should == Encoding::ASCII_8BIT
 			end
 		end
 
-		it "should use client encoding for escaped string" do
-			original = "string to escape".force_encoding("euc-jp")
-			@conn.set_client_encoding("euc_jp")
-			escaped  = @conn.escape(original)
+		it "uses the client encoding for escaped string" do
+			original = "string to escape".force_encoding( "euc-jp" )
+			@conn.set_client_encoding( "euc_jp" )
+			escaped  = @conn.escape( original )
 			escaped.encoding.should == Encoding::EUC_JP
 		end
+	end
+
+	describe "Ruby 1.9.x default_internal encoding" do
+
+		it "honors the Encoding.default_internal if it's set and the synchronous interface is used" do
+			@conn.transaction do |txn_conn|
+				txn_conn.internal_encoding = Encoding::ISO8859_1
+				txn_conn.exec( "CREATE TABLE defaultinternaltest ( foo text )" )
+				txn_conn.exec( "INSERT INTO defaultinternaltest VALUES ('Grün und Weiß')" )
+			end
+
+			begin
+				prev_encoding = Encoding.default_internal
+				Encoding.default_internal = Encoding::UTF_8
+
+				conn = PGconn.connect( @conninfo )
+				conn.internal_encoding.should == Encoding::UTF_8
+				res = conn.exec( "SELECT foo FROM defaultinternaltest" )
+				res[0]['foo'].encoding.should == Encoding::UTF_8
+			ensure
+				conn.finish if conn
+				Encoding.default_internal = prev_encoding
+			end
+		end
 
 	end
 

data/spec/pgconn_spec.rb

@@ -9,15 +9,14 @@ BEGIN {
 	libdir = basedir + 'lib'
 	archlib = libdir + Config::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 )
 	$LOAD_PATH.unshift( archlib.to_s ) unless $LOAD_PATH.include?( archlib.to_s )
 }
 
-require 'pg'
-
-require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'spec/lib/helpers'
+require 'pg'
 require 'timeout'
 
 describe PGconn do
@@ -82,27 +81,69 @@ describe PGconn do
 		res[0]['n'].should == '1'
 	end
 
+
+	EXPECTED_TRACE_OUTPUT = %{
+		To backend> Msg Q
+		To backend> "SELECT 1 AS one"
+		To backend> Msg complete, length 21
+		From backend> T
+		From backend (#4)> 28
+		From backend (#2)> 1
+		From backend> "one"
+		From backend (#4)> 0
+		From backend (#2)> 0
+		From backend (#4)> 23
+		From backend (#2)> 4
+		From backend (#4)> -1
+		From backend (#2)> 0
+		From backend> D
+		From backend (#4)> 11
+		From backend (#2)> 1
+		From backend (#4)> 1
+		From backend (1)> 1
+		From backend> C
+		From backend (#4)> 13
+		From backend> "SELECT 1"
+		From backend> Z
+		From backend (#4)> 5
+		From backend> Z
+		From backend (#4)> 5
+		From backend> T
+		}.gsub( /^\t{2}/, '' ).lstrip
+
 	unless RUBY_PLATFORM =~ /mswin|mingw/
 		it "should trace and untrace client-server communication" 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.
-			expected_trace_file = File.join(Dir.getwd, "spec/data", "expected_trace.out")
-			expected_trace_data = open(expected_trace_file, 'rb').read
-			trace_file = open(File.join(@test_directory, "test_trace.out"), 'wb')
-			@conn.trace(trace_file)
-			trace_file.close
+			trace_file = @test_directory + "test_trace.out"
+			trace_io = trace_file.open( 'w', 0600 )
+			@conn.trace( trace_io )
+			trace_io.close
+
 			res = @conn.exec("SELECT 1 AS one")
 			@conn.untrace
+
 			res = @conn.exec("SELECT 2 AS two")
-			trace_file = open(File.join(@test_directory, "test_trace.out"), 'rb')
+
 			trace_data = trace_file.read
-			trace_file.close
-			trace_data.should == expected_trace_data
+
+			expected_trace_output = EXPECTED_TRACE_OUTPUT.dup
+			# For PostgreSQL < 9.0, the output will be different:
+			# -From backend (#4)> 13
+			# -From backend> "SELECT 1"
+			# +From backend (#4)> 11
+			# +From backend> "SELECT"
+			if @conn.server_version < 90000
+				expected_trace_output.sub!( /From backend \(#4\)> 13/, 'From backend (#4)> 11' )
+				expected_trace_output.sub!( /From backend> "SELECT 1"/, 'From backend> "SELECT"' )
+			end
+
+			trace_data.should == expected_trace_output
 		end
 	end
 
-	it "should cancel a query" do
+	it "allows a query to be cancelled" do
 		error = false
 		@conn.send_query("SELECT pg_sleep(1000)")
 		@conn.cancel
@@ -113,6 +154,25 @@ describe PGconn do
 		error.should == true
 	end
 
+	it "automatically rolls back a transaction started with PGconn#transaction if an exception " +
+	   "is raised" do
+		# abort the per-example transaction so we can test our own
+		@conn.exec( 'ROLLBACK' )
+
+		res = nil
+		@conn.exec( "CREATE TABLE pie ( flavor TEXT )" )
+
+		expect {
+			res = @conn.transaction do
+				@conn.exec( "INSERT INTO pie VALUES ('rhubarb'), ('cherry'), ('schizophrenia')" )
+				raise "Oh noes! All pie is gone!"
+			end
+		}.to raise_exception( RuntimeError, /all pie is gone/i )
+
+		res = @conn.exec( "SELECT * FROM pie" )
+		res.ntuples.should == 0
+	end
+
 	it "should not read past the end of a large object" do
 		@conn.transaction do
 			oid = @conn.lo_create( 0 )
@@ -125,16 +185,19 @@ describe PGconn do
 	end
 
 
-	it "should wait for NOTIFY events via select()" do
+	it "can wait for NOTIFY events" do
 		@conn.exec( 'ROLLBACK' )
 		@conn.exec( 'LISTEN woo' )
 
 		pid = fork do
-			conn = PGconn.connect( @conninfo )
-			sleep 1
-			conn.exec( 'NOTIFY woo' )
-			conn.finish
-			exit!
+			begin
+				conn = PGconn.connect( @conninfo )
+				sleep 1
+				conn.exec( 'NOTIFY woo' )
+			ensure
+				conn.finish
+				exit!
+			end
 		end
 
 		@conn.wait_for_notify( 10 ).should == 'woo'
@@ -143,6 +206,89 @@ describe PGconn do
 		Process.wait( pid )
 	end
 
+	it "calls a block for NOTIFY events if one is given" do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN woo' )
+
+		pid = fork do
+			begin
+				conn = PGconn.connect( @conninfo )
+				sleep 1
+				conn.exec( 'NOTIFY woo' )
+			ensure
+				conn.finish
+				exit!
+			end
+		end
+
+		eventpid = event = nil
+		@conn.wait_for_notify( 10 ) {|*args| event, eventpid = args }
+		event.should == 'woo'
+		eventpid.should be_an( Integer )
+
+		@conn.exec( 'UNLISTEN woo' )
+
+		Process.wait( pid )
+	end
+
+	it "doesn't collapse sequential notifications" do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN woo' )
+		@conn.exec( 'LISTEN war' )
+		@conn.exec( 'LISTEN woz' )
+
+		pid = fork do
+			begin
+				conn = PGconn.connect( @conninfo )
+				conn.exec( 'NOTIFY woo' )
+				conn.exec( 'NOTIFY war' )
+				conn.exec( 'NOTIFY woz' )
+			ensure
+				conn.finish
+				exit!
+			end
+		end
+
+		Process.wait( pid )
+
+		channels = []
+		3.times do
+			channels << @conn.wait_for_notify( 2 )
+		end
+
+		channels.should have( 3 ).members
+		channels.should include( 'woo', 'war', 'woz' )
+
+		@conn.exec( 'UNLISTEN woz' )
+		@conn.exec( 'UNLISTEN war' )
+		@conn.exec( 'UNLISTEN woo' )
+	end
+
+	it "returns notifications which are already in the queue before wait_for_notify is called " +
+	   "without waiting for the socket to become readable" do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN woo' )
+
+		pid = fork do
+			begin
+				conn = PGconn.connect( @conninfo )
+				conn.exec( 'NOTIFY woo' )
+			ensure
+				conn.finish
+				exit!
+			end
+		end
+
+		# Wait for the forked child to send the notification
+		Process.wait( pid )
+
+		# Cause the notification to buffer, but not be read yet
+		@conn.exec( 'SELECT 1' )
+
+		@conn.wait_for_notify( 10 ).should == 'woo'
+		@conn.exec( 'UNLISTEN woo' )
+	end
+
 	it "yields the result if block is given to exec" do
 		rval = @conn.exec( "select 1234::int as a union select 5678::int as a" ) do |result|
 			values = []

data/spec/pgresult_spec.rb

@@ -9,15 +9,14 @@ BEGIN {
 	libdir = basedir + 'lib'
 	archlib = libdir + Config::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 )
 	$LOAD_PATH.unshift( archlib.to_s ) unless $LOAD_PATH.include?( archlib.to_s )
 }
 
-require 'pg'
-
-require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'spec/lib/helpers'
+require 'pg'
 
 describe PGresult do
 	include PgTestingHelpers
@@ -206,8 +205,6 @@ describe PGresult do
 		res.ftablecol(1).should == 0 # and it shouldn't raise an exception, either
 	end
 
-
-
 	after( :each ) do
 		@conn.exec( 'ROLLBACK' )
 	end

metadata

@@ -1,15 +1,42 @@
 --- !ruby/object:Gem::Specification 
 name: pg
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  hash: 55
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
+- Jeff Davis
 - Michael Granger
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANnZWQx
+  FzAVBgoJkiaJk/IsZAEZFgdfYWVyaWVfMRMwEQYKCZImiZPyLGQBGRYDb3JnMB4X
+  DTEwMDkxNjE0NDg1MVoXDTExMDkxNjE0NDg1MVowPDEMMAoGA1UEAwwDZ2VkMRcw
+  FQYKCZImiZPyLGQBGRYHX2FlcmllXzETMBEGCgmSJomT8ixkARkWA29yZzCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy//BFxC1f/cPSnwtJBWoFiFrir
+  h7RicI+joq/ocVXQqI4TDWPyF/8tqkvt+rD99X9qs2YeR8CU/YiIpLWrQOYST70J
+  vDn7Uvhb2muFVqq6+vobeTkILBEO6pionWDG8jSbo3qKm1RjKJDwg9p4wNKhPuu8
+  KGue/BFb67KflqyApPmPeb3Vdd9clspzqeFqp7cUBMEpFS6LWxy4Gk+qvFFJBJLB
+  BUHE/LZVJMVzfpC5Uq+QmY7B+FH/QqNndn3tOHgsPadLTNimuB1sCuL1a4z3Pepd
+  TeLBEFmEao5Dk3K/Q8o8vlbIB/jBDTUx6Djbgxw77909x6gI9doU4LD5XMcCAwEA
+  AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJeoGkOr9l4B
+  +saMkW/ZXT4UeSvVMA0GCSqGSIb3DQEBBQUAA4IBAQBG2KObvYI2eHyyBUJSJ3jN
+  vEnU3d60znAXbrSd2qb3r1lY1EPDD3bcy0MggCfGdg3Xu54z21oqyIdk8uGtWBPL
+  HIa9EgfFGSUEgvcIvaYqiN4jTUtidfEFw+Ltjs8AP9gWgSIYS6Gr38V0WGFFNzIH
+  aOD2wmu9oo/RffW4hS/8GuvfMzcw7CQ355wFR4KB/nyze+EsZ1Y5DerCAagMVuDQ
+  U0BLmWDFzPGGWlPeQCrYHCr+AcJz+NRnaHCKLZdSKj/RHuTOt+gblRex8FAh8NeA
+  cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
+  -----END CERTIFICATE-----
 
-date: 2010-02-28 00:00:00 -08:00
+date: 2010-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -17,6 +44,7 @@ description: |-
   This is the extension library to access a PostgreSQL database from Ruby.
   This library works with PostgreSQL 7.4 and later.
 email: 
+- ruby-pg@j-davis.com
 - ged@FaerieMUD.org
 executables: []
 
@@ -25,11 +53,17 @@ extensions:
 extra_rdoc_files: 
 - ChangeLog
 - README
+- README.ja
+- README.OS_X
+- README.windows
 - LICENSE
 files: 
 - Rakefile
 - ChangeLog
 - README
+- README.ja
+- README.OS_X
+- README.windows
 - LICENSE
 - spec/m17n_spec.rb
 - spec/pgconn_spec.rb
@@ -43,12 +77,12 @@ files:
 - ext/extconf.rb
 - rake/191_compat.rb
 - rake/dependencies.rb
+- rake/documentation.rb
 - rake/helpers.rb
 - rake/hg.rb
 - rake/manual.rb
 - rake/packaging.rb
 - rake/publishing.rb
-- rake/rdoc.rb
 - rake/style.rb
 - rake/svn.rb
 - rake/testing.rb
@@ -60,42 +94,49 @@ files:
 - ./BSD
 - ./Contributors
 - Rakefile.local
+- spec/data/expected_trace.out
+- spec/data/random_binary_data
 has_rdoc: true
 homepage: http://bitbucket.org/ged/ruby-pg/
-licenses: []
-
+licenses: 
+- Ruby
+- GPL
+- BSD
 post_install_message: 
 rdoc_options: 
-- -w
-- "4"
-- -HN
-- -i
+- --tab-width=4
+- --show-hash
+- --include
 - .
-- -m
-- README
-- -t
-- pg
-- -W
-- http://bitbucket.org/ged/ruby-pg/browser/
+- --main=README
+- --title=pg
 require_paths: 
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - PostgreSQL >=7.4
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby interface to the PostgreSQL RDBMS