pg 0.10.0 → 0.10.1pre209

data/ext/extconf.rb

@@ -1,125 +1,22 @@
 require 'pp'
 require 'mkmf'
 
+
 if pgdir = with_config( 'pg' )
 	ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPARATOR + ENV['PATH']
 end
 
+dir_config 'pg'
 
-### Turn a version string into a Comparable binary datastructure
-def vvec( version )
-	version.split( '.' ).collect {|i| Integer(i) }.pack( 'N*' )
-end
-
-
-if vvec(RUBY_VERSION) < vvec('1.8')
-	puts 'This library is for ruby-1.8 or higher.'
-	exit 1
-end
-
-if ENV['CROSS_COMPILING']
-
-	$LDFLAGS << " -L#{CONFIG['libdir']}"
-
-	# Link against all required libraries for static build, if they are available
-	have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
-	have_library( 'secur32' )           && append_library( $libs, 'secur32' )
-	have_library( 'crypto', 'BIO_new' ) && append_library( $libs, 'crypto' )
-	have_library( 'ssl', 'SSL_new' )    && append_library( $libs, 'ssl' )
-
+if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_executable('pg_config') )
+	$stderr.puts "Using config values from %s" % [ pgconfig ]
+	$CPPFLAGS << " -I%s" % [ `#{pgconfig} --includedir`.chomp ]
+	$LDFLAGS << " -L%s" % [ `#{pgconfig} --libdir`.chomp ]
 else
-	pgconfig = with_config( 'pg-config' ) || 'pg_config'
-	if pgconfig = find_executable( pgconfig )
-		$CFLAGS << " " + `#{pgconfig} --cflags`.chomp
-		$CPPFLAGS << " -I%s" % [ `#{pgconfig} --includedir`.chomp ]
-		$LDFLAGS << " -L%s" % [ `#{pgconfig} --libdir`.chomp ]
-	end
-
-	# Sort out the universal vs. single-archicture build problems on MacOS X
-	if RUBY_PLATFORM.include?( 'darwin' )
-		puts "MacOS X build: fixing architecture flags:"
-		ruby_archs = Config::CONFIG['CFLAGS'].scan( /-arch (\S+)/ ).flatten
-		$stderr.puts "Ruby cflags: %p" % [ Config::CONFIG['CFLAGS'] ]
-
-		# Only keep the '-arch <a>' flags present in both the cflags reported
-		# by pg_config and those that Ruby specifies.
-		commonflags = nil
-		if ENV['ARCHFLAGS']
-			puts "  using the value in ARCHFLAGS environment variable (%p)." % [ ENV['ARCHFLAGS'] ]
-			common_archs = ENV['ARCHFLAGS'].scan( /-arch\s+(\S+)/ ).flatten
-
-			# Warn if the ARCHFLAGS doesn't have at least one architecture in 
-			# common with the running ruby.
-			if ( (common_archs & ruby_archs).empty? )
-				$stderr.puts '',
-					"*** Your ARCHFLAGS setting doesn't seem to contain an architecture in common",
-					"with the running ruby interpreter (%p vs. %p)" % [ common_archs, ruby_archs ],
-					"I'll continue anyway, but if it fails, try unsetting ARCHFLAGS."
-			end
-
-			commonflags = ENV['ARCHFLAGS']
-		end
-
-		if pgconfig
-			puts "  finding flags common to both Ruby and PostgreSQL..."
-			archflags = []
-			pgcflags = `#{pgconfig} --cflags`.chomp
-			pgarchs = pgcflags.scan( /-arch\s+(\S+)/ ).flatten
-			pgarchs.each do |arch|
-				puts "  testing for architecture: %p" % [ arch ]
-				archflags << "-arch #{arch}" if ruby_archs.include?( arch )
-			end
-
-			if archflags.empty?
-				$stderr.puts '',
-					"*** Your PostgreSQL installation doesn't seem to have an architecture " +
-					"in common with the running ruby interpreter (%p vs. %p)" %
-					[ pgarchs, ruby_archs ],
-					"I'll continue anyway, but if it fails, try setting ARCHFLAGS."
-			else
-				commonflags = archflags.join(' ')
-				puts "  common arch flags: %s" % [ commonflags ]
-			end
-		else
-			$stderr.puts %{
-			===========   WARNING   ===========
-		
-			You are building this extension on OS X without setting the 
-			ARCHFLAGS environment variable, and pg_config wasn't found in 
-			your PATH. If you are seeing this message, that means that the 
-			build will probably fail.
-
-			If it does, you can correct this by either including the path 
-			to 'pg_config' in your PATH or setting the environment variable 
-			ARCHFLAGS to '-arch <arch>' before building.
-
-			For example:
-			(in bash) $ export PATH=/opt/local/lib/postgresql84/bin:$PATH                  
-			          $ export ARCHFLAGS='-arch x86_64'
-			(in tcsh) % set path = ( /opt/local/lib/postgresql84/bin $PATH )
-			          % setenv ARCHFLAGS '-arch x86_64'
-
-			Then try building again.
-
-			===================================
-			}.gsub( /^\t+/, '  ' )
-		end
-
-		if commonflags
-			$CFLAGS.gsub!( /-arch\s+\S+ /, '' )
-			$LDFLAGS.gsub!( /-arch\s+\S+ /, '' )
-			CONFIG['LDSHARED'].gsub!( /-arch\s+\S+ /, '' )
-
-			$CFLAGS << ' ' << commonflags
-			$LDFLAGS << ' ' << commonflags
-			CONFIG['LDSHARED'] << ' ' << commonflags
-		end
-	end
+	$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
+		" --with-pg-config=/path/to/pg_config"
 end
 
-dir_config 'pg'
-
-
 find_header( 'libpq-fe.h' ) or abort "Can't find the 'libpq-fe.h header"
 find_header( 'libpq/libpq-fs.h' ) or abort "Can't find the 'libpq/libpq-fs.h header"
 
@@ -135,10 +32,14 @@ have_func 'PQprepare'
 have_func 'PQexecParams'
 have_func 'PQescapeString'
 have_func 'PQescapeStringConn'
+have_func 'PQgetCancel'
 have_func 'lo_create'
 have_func 'pg_encoding_to_char'
 have_func 'PQsetClientEncoding'
 
+$defs.push( "-DHAVE_ST_NOTIFY_EXTRA" ) if
+	have_struct_member 'struct pgNotify', 'extra', 'libpq-fe.h'
+
 # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
 have_header 'unistd.h' unless enable_config("static-build")
 

data/ext/pg.c

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: ged $
-  $Date: 2010/11/12 03:39:48 $
+  $Date: 2010/12/06 16:45:23 $
 ************************************************/
 
 #include "pg.h"
@@ -23,7 +23,7 @@ static VALUE rb_cPGconn;
 static VALUE rb_cPGresult;
 static VALUE rb_ePGError;
 
-static const char *VERSION = "0.10.0";
+static const char *VERSION = "0.10.1";
 
 
 /* The following functions are part of libpq, but not
@@ -2046,7 +2046,7 @@ pgconn_flush(self)
  *    conn.cancel() -> String
  *
  * Requests cancellation of the command currently being
- * processed.
+ * processed. (Only implemented in PostgreSQL >= 8.0)
  *
  * Returns +nil+ on success, or a string containing the
  * error message if a failure occurs.
@@ -2054,6 +2054,7 @@ pgconn_flush(self)
 static VALUE
 pgconn_cancel(VALUE self)
 {
+#ifdef HAVE_PQGETCANCEL
 	char errbuf[256];
 	PGcancel *cancel;
 	VALUE retval;
@@ -2071,6 +2072,9 @@ pgconn_cancel(VALUE self)
 
 	PQfreeCancel(cancel);
 	return retval;
+#else
+	rb_notimplement();
+#endif
 }
 
 
@@ -2136,7 +2140,7 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 	int ret;
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
-	VALUE timeout_in, relname = Qnil, be_pid = Qnil;
+	VALUE timeout_in, relname = Qnil, be_pid = Qnil, extra = Qnil;
 	double timeout_sec;
 	fd_set sd_rset;
 
@@ -2169,10 +2173,13 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 
 	relname = rb_tainted_str_new2( notification->relname );
 	be_pid = INT2NUM( notification->be_pid );
+#ifdef HAVE_ST_NOTIFY_EXTRA
+	extra = rb_str_new2( notification->extra );
+#endif
 	PQfreemem( notification );
 
 	if ( rb_block_given_p() )
-		rb_yield_splat( rb_ary_new3(2, relname, be_pid) );
+		rb_yield_values( 3, relname, be_pid, extra );
 
 	return relname;
 }

data/lib/pg.rb

@@ -1,13 +1,17 @@
 #!/usr/bin/env ruby
 
-require 'pathname'
 require 'rbconfig'
 
 # Load the correct version if it's a Windows binary gem
 if RUBY_PLATFORM =~/(mswin|mingw)/i
 	major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
 		raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
-	require "#{major_minor}/pg_ext"
+
+	begin
+		require "#{major_minor}/pg_ext"
+	rescue LoadError
+		require 'pg_ext'
+	end
 else
 	require 'pg_ext'
 end

data/rake/hg.rb

@@ -83,6 +83,15 @@ unless defined?( HG_DOTDIR )
 			return paths
 		end
 
+		### Return the list of files which are not of status 'clean'
+		def get_uncommitted_files
+			list = read_command_output( 'hg', 'status', '-n', '--color', 'never' )
+			list = list.split( /\n/ )
+
+			trace "Changed files: %p" % [ list ]
+			return list
+		end
+
 		### Return the list of files which are of status 'unknown'
 		def get_unknown_files
 			list = read_command_output( 'hg', 'status', '-un', '--color', 'never' )
@@ -149,11 +158,21 @@ unless defined?( HG_DOTDIR )
 
 		desc "Prepare for a new release"
 		task :prep_release do
+			uncommitted_files = get_uncommitted_files()
+			unless uncommitted_files.empty?
+				log "Uncommitted files:\n",
+				    *uncommitted_files.map {|fn| "  #{fn}\n" }
+				ask_for_confirmation( "\nRelease anyway?", true ) do
+					log "Okay, releasing with uncommitted versions."
+				end
+			end
+
 			tags = get_tags()
 			rev = get_current_rev()
+			pkg_version_tag = "v#{PKG_VERSION}"
 
 			# Look for a tag for the current release version, and if it exists abort
-			if tags.include?( PKG_VERSION )
+			if tags.include?( pkg_version_tag )
 				error "Version #{PKG_VERSION} already has a tag. Did you mean " +
 					"to increment the version in #{VERSION_FILE}?"
 				fail
@@ -164,8 +183,8 @@ unless defined?( HG_DOTDIR )
 			run 'hg', 'sign'
 
 			# Tag the current rev
-			log "Tagging rev #{rev} as #{PKG_VERSION}"
-			run 'hg', 'tag', PKG_VERSION
+			log "Tagging rev #{rev} as #{pkg_version_tag}"
+			run 'hg', 'tag', pkg_version_tag
 
 			# Offer to push
 			Rake::Task['hg:push'].invoke
@@ -229,6 +248,18 @@ unless defined?( HG_DOTDIR )
 		end
 
 
+		desc "Update to tip"
+		task :update do
+			run 'hg', 'update'
+		end
+
+
+		desc "Clobber all changes (hg up -C)"
+		task :update_and_clobber do
+			run 'hg', 'update', '-C'
+		end
+
+
 		desc "Check the current code in if tests pass"
 		task :checkin => ['hg:pull', 'hg:newfiles', 'test', COMMIT_MSG_FILE] do
 			targets = get_target_args()

data/rake/testing.rb

@@ -47,6 +47,7 @@ begin
 	### Task: spec
 	desc "Run specs"
 	task :spec => 'spec:doc'
+	task :specs => :spec
 
 	namespace :spec do
 		desc "Run rspec every time there's a change to one of the files"

data/spec/lib/helpers.rb

@@ -161,15 +161,18 @@ module PgTestingHelpers
 			datadir = testdir + 'data'
 			pidfile = datadir + 'postmaster.pid'
 			if pidfile.exist? && pid = pidfile.read.chomp.to_i
+				$stderr.puts "pidfile (%p) exists: %d" % [ pidfile, pid ]
 				begin
 					Process.kill( 0, pid )
 				rescue Errno::ESRCH
-					trace "No postmaster running for %s" % [ datadir ]
+					$stderr.puts "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" % [ pid ]
+					$stderr.puts "Stopping lingering database at PID %d" % [ pid ]
 					run 'pg_ctl', '-D', datadir.to_s, '-m', 'fast', 'stop'
 				end
+			else
+				$stderr.puts "No pidfile (%p)" % [ pidfile ]
 			end
 		end
 	end
@@ -196,20 +199,19 @@ module PgTestingHelpers
 		begin
 			unless (@test_pgdata+"postgresql.conf").exist?
 				FileUtils.rm_rf( @test_pgdata, :verbose => $DEBUG )
-				trace "Running initdb"
+				$stderr.puts "Running initdb"
 				log_and_run @logfile, 'initdb', '--no-locale', '-D', @test_pgdata.to_s
 			end
 
 			trace "Starting postgres"
 			log_and_run @logfile, 'pg_ctl', '-w', '-o', "-k #{@test_directory.to_s.inspect}",
 				'-D', @test_pgdata.to_s, 'start'
+			sleep 2
+
+			$stderr.puts "Creating the test DB"
+			log_and_run @logfile, 'psql', '-e', '-c', 'DROP DATABASE IF EXISTS test', 'postgres'
+			log_and_run @logfile, 'createdb', '-e', 'test'
 
-			if `psql -l` =~ /^\s*test\s/
-				trace "Dropping the test DB"
-				log_and_run @logfile, 'dropdb', 'test'
-			end
-			trace "Creating the test DB"
-			log_and_run @logfile, 'createdb', 'test'
 		rescue => err
 			$stderr.puts "%p during test setup: %s" % [ err.class, err.message ]
 			$stderr.puts "See #{@logfile} for details."

data/spec/pgconn_spec.rb

@@ -289,6 +289,116 @@ describe PGconn do
 		@conn.exec( 'UNLISTEN woo' )
 	end
 
+	context "under PostgreSQL 9" do
+
+		before( :each ) do
+			pending "only works under PostgreSQL 9" if @conn.server_version < 9_00_00
+		end
+
+		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+		    "any number of arguments" do
+
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN knees' )
+
+			pid = fork do
+				conn = PGconn.connect( @conninfo )
+				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+				conn.finish
+				exit!
+			end
+
+			Process.wait( pid )
+
+			event, pid, msg = nil
+			@conn.wait_for_notify( 10 ) do |*args|
+				event, pid, msg = *args
+			end
+			@conn.exec( 'UNLISTEN woo' )
+
+			event.should == 'knees'
+			pid.should be_a_kind_of( Integer )
+			msg.should == 'skirt and boots'
+		end
+
+		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+		   "two arguments" do
+
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN knees' )
+
+			pid = fork do
+				conn = PGconn.connect( @conninfo )
+				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+				conn.finish
+				exit!
+			end
+
+			Process.wait( pid )
+
+			event, pid, msg = nil
+			@conn.wait_for_notify( 10 ) do |arg1, arg2|
+				event, pid, msg = arg1, arg2
+			end
+			@conn.exec( 'UNLISTEN woo' )
+
+			event.should == 'knees'
+			pid.should be_a_kind_of( Integer )
+			msg.should be_nil()
+		end
+
+		it "calls the block supplied to wait_for_notify with the notify payload if it " +
+		   "doesn't accept arguments" do
+
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN knees' )
+
+			pid = fork do
+				conn = PGconn.connect( @conninfo )
+				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+				conn.finish
+				exit!
+			end
+
+			Process.wait( pid )
+
+			notification_received = false
+			@conn.wait_for_notify( 10 ) do
+				notification_received = true
+			end
+			@conn.exec( 'UNLISTEN woo' )
+
+			notification_received.should be_true()
+		end
+
+		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
+		   "three arguments" do
+
+			@conn.exec( 'ROLLBACK' )
+			@conn.exec( 'LISTEN knees' )
+
+			pid = fork do
+				conn = PGconn.connect( @conninfo )
+				conn.exec( %Q{NOTIFY knees, 'skirt and boots'} )
+				conn.finish
+				exit!
+			end
+
+			Process.wait( pid )
+
+			event, pid, msg = nil
+			@conn.wait_for_notify( 10 ) do |arg1, arg2, arg3|
+				event, pid, msg = arg1, arg2, arg3
+			end
+			@conn.exec( 'UNLISTEN woo' )
+
+			event.should == 'knees'
+			pid.should be_a_kind_of( Integer )
+			msg.should == 'skirt and boots'
+		end
+
+	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 = []
@@ -343,7 +453,7 @@ describe PGconn do
 		@conn.block( 0.1 )
 		finish = Time.now
 
-		(finish - start).should be_close( 0.1, 0.05 )
+		(finish - start).should be_within( 0.05 ).of( 0.1 )
 	end