pg 0.17.2.pre.546 → 0.18.0.pre20140820094244

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637de7550ad54596f1d2296e620abf62627bfd15
-  data.tar.gz: 7ddb6d5c72f909b0378360011aa13c020f0d88cf
+  metadata.gz: 767ac4aadc69aaf46db948f63ce84af28379d6cd
+  data.tar.gz: b91de92eda56d82dd3c0c5a7870a137955fa4591
 SHA512:
-  metadata.gz: ce2fa474c1921e469990bdb6c99a2bd73a0568197946639850f6d1da126acb8d7e36137b78f156417fbc46f63f42e6d0cae61301127ce05954818a58be4e5d23
-  data.tar.gz: 9525dd2c6a8805c0aaca253c3cf497533a7077e466bdf2ea0c25ecf1c0d47e4053639766d73cbfad548d5b8568453e82b83e73280f0f9dc552eee379a850c37b
+  metadata.gz: 1fb27aca7115cf8b3f3b7d34acd040725e8824cc3f9d7581568b89afafe2d87e76415d68709f54bae7acefe09b9e92e0556a47ce7bf98e7b015e18d40e900807
+  data.tar.gz: 791ea89b3739a63eccab2e5e8502cbc60ac394b464cf55180022ab4e4ffaca8b7e1d89b759e8d9994cc1353bc402819b03f794a44556e9fdd7e961c7a7c778db

data/History.rdoc

@@ -1,3 +1,17 @@
+== v0.18.0 [2014-08-20] Michael Granger <ged@FaerieMUD.org>
+
+New:
+
+- Add PG::Connection#conninfo
+- Convert specs to expect syntax for RSpec 3
+- Check connection status with a matcher in specs
+
+Bugfixes:
+
+- Fix some type mismatches for Oid return values. Thanks to Mina Naguib for the fix.
+- Fix typo in documentation.
+
+
 == v0.17.1 [2013-12-18] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/README.rdoc

@@ -9,7 +9,7 @@ docs :: http://deveiate.org/code/pg
 
 Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
+It works with {PostgreSQL 9.0 and later}[http://www.postgresql.org/support/versioning/].
 
 A small example usage:
 
@@ -34,8 +34,8 @@ A small example usage:
 
 == Requirements
 
-* Ruby 1.9.3-p392, or 2.0.0-p0.
-* PostgreSQL 8.4.x or later (with headers, -dev packages, etc).
+* Ruby 1.9.3 or later.
+* PostgreSQL 9.0.x or later (with headers, -dev packages, etc).
 
 It may work with earlier versions of Ruby/PostgreSQL as well, but those are
 not regularly tested.
@@ -83,7 +83,7 @@ Lars Kanis <lars@greiz-reinsdorf.de>.
 
 == Copying
 
-Copyright (c) 1997-2013 by the authors.
+Copyright (c) 1997-2014 by the authors.
 
 * Jeff Davis <ruby-pg@j-davis.com>
 * Guy Decoux (ts) <decoux@moulon.inra.fr>

data/Rakefile

@@ -31,6 +31,8 @@ EXT     = LIBDIR + "pg_ext.#{DLEXT}"
 
 TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
 
+GEMSPEC = 'pg.gemspec'
+
 CLOBBER.include( TEST_DIRECTORY.to_s )
 CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
 
@@ -67,7 +69,7 @@ $hoespec = Hoe.spec 'pg' do
 	self.spec_extras[:licenses] = ['BSD', 'Ruby', 'GPL']
 	self.spec_extras[:extensions] = [ 'ext/extconf.rb' ]
 
-	self.require_ruby_version( '>= 1.8.7' )
+	self.require_ruby_version( '>= 1.9.3' )
 
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
@@ -180,3 +182,19 @@ file 'ext/pg_errors.c' => ['ext/errorcodes.def'] do
 	# trigger compilation of changed errorcodes.def
 	touch 'ext/pg_errors.c'
 end
+
+
+task :gemspec => GEMSPEC
+file GEMSPEC => __FILE__
+task GEMSPEC do |task|
+	spec = $hoespec.spec
+	spec.files.delete( '.gemtest' )
+	spec.version = "#{spec.version}.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	File.open( task.name, 'w' ) do |fh|
+		fh.write( spec.to_ruby )
+	end
+end
+
+CLOBBER.include( GEMSPEC.to_s )
+task :default => :gemspec
+

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id: pg.c,v 74aa9514a381 2013/05/18 17:29:19 lars $
+ * $Id: pg.c,v 8e95248e80f6 2014/08/20 16:42:14 ged $
  *
  * Author/s:
  *
@@ -15,7 +15,7 @@
  * See Contributors.rdoc for the many additional fine people that have contributed
  * to this library over the years.
  *
- * Copyright (c) 1997-2012 by the authors.
+ * Copyright (c) 1997-2014 by the authors.
  *
  * You may redistribute this software under the same terms as Ruby itself; see
  * http://www.ruby-lang.org/en/LICENSE.txt or the LICENSE file in the source

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v 6c2444dc63e1 2013/12/30 16:49:29 lars $
+ * $Id: pg_connection.c,v affbd590e74e 2014/08/20 16:14:47 ged $
  *
  */
 
@@ -46,6 +46,8 @@ pg_get_pgconn( VALUE self )
 }
 
 
+
+
 /*
  * Close the associated socket IO object if there is one.
  */
@@ -68,6 +70,40 @@ pgconn_close_socket_io( VALUE self )
 }
 
 
+/*
+ * Create a Ruby Array of Hashes out of a PGconninfoOptions array.
+ */
+static VALUE
+pgconn_make_conninfo_array( const PQconninfoOption *options )
+{
+	VALUE ary = rb_ary_new();
+	VALUE hash;
+	int i = 0;
+
+	if (!options) return Qnil;
+
+	for(i = 0; options[i].keyword != NULL; i++) {
+		hash = rb_hash_new();
+		if(options[i].keyword)
+			rb_hash_aset(hash, ID2SYM(rb_intern("keyword")), rb_str_new2(options[i].keyword));
+		if(options[i].envvar)
+			rb_hash_aset(hash, ID2SYM(rb_intern("envvar")), rb_str_new2(options[i].envvar));
+		if(options[i].compiled)
+			rb_hash_aset(hash, ID2SYM(rb_intern("compiled")), rb_str_new2(options[i].compiled));
+		if(options[i].val)
+			rb_hash_aset(hash, ID2SYM(rb_intern("val")), rb_str_new2(options[i].val));
+		if(options[i].label)
+			rb_hash_aset(hash, ID2SYM(rb_intern("label")), rb_str_new2(options[i].label));
+		if(options[i].dispchar)
+			rb_hash_aset(hash, ID2SYM(rb_intern("dispchar")), rb_str_new2(options[i].dispchar));
+		rb_hash_aset(hash, ID2SYM(rb_intern("dispsize")), INT2NUM(options[i].dispsize));
+		rb_ary_push(ary, hash);
+	}
+
+	return ary;
+}
+
+
 /*
  * Allocation/
  */
@@ -319,31 +355,13 @@ static VALUE
 pgconn_s_conndefaults(VALUE self)
 {
 	PQconninfoOption *options = PQconndefaults();
-	VALUE ary = rb_ary_new();
-	VALUE hash;
-	int i = 0;
+	VALUE array = pgconn_make_conninfo_array( options );
+
+	PQconninfoFree(options);
 
 	UNUSED( self );
 
-	for(i = 0; options[i].keyword != NULL; i++) {
-		hash = rb_hash_new();
-		if(options[i].keyword)
-			rb_hash_aset(hash, ID2SYM(rb_intern("keyword")), rb_str_new2(options[i].keyword));
-		if(options[i].envvar)
-			rb_hash_aset(hash, ID2SYM(rb_intern("envvar")), rb_str_new2(options[i].envvar));
-		if(options[i].compiled)
-			rb_hash_aset(hash, ID2SYM(rb_intern("compiled")), rb_str_new2(options[i].compiled));
-		if(options[i].val)
-			rb_hash_aset(hash, ID2SYM(rb_intern("val")), rb_str_new2(options[i].val));
-		if(options[i].label)
-			rb_hash_aset(hash, ID2SYM(rb_intern("label")), rb_str_new2(options[i].label));
-		if(options[i].dispchar)
-			rb_hash_aset(hash, ID2SYM(rb_intern("dispchar")), rb_str_new2(options[i].dispchar));
-		rb_hash_aset(hash, ID2SYM(rb_intern("dispsize")), INT2NUM(options[i].dispsize));
-		rb_ary_push(ary, hash);
-	}
-	PQconninfoFree(options);
-	return ary;
+	return array;
 }
 
 
@@ -604,6 +622,28 @@ pgconn_options(VALUE self)
 	return rb_tainted_str_new2(options);
 }
 
+
+/*
+ * call-seq:
+ *    conn.conninfo   -> hash
+ *
+ * Returns the connection options used by a live connection.
+ *
+ */
+static VALUE
+pgconn_conninfo( VALUE self )
+{
+	PGconn *conn = pg_get_pgconn(self);
+	PQconninfoOption *options = PQconninfo( conn );
+	VALUE array = pgconn_make_conninfo_array( options );
+
+	PQconninfoFree(options);
+
+	return array;
+}
+
+
+
 /*
  * call-seq:
  *    conn.status()
@@ -3518,6 +3558,7 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "host", pgconn_host, 0);
 	rb_define_method(rb_cPGconn, "port", pgconn_port, 0);
 	rb_define_method(rb_cPGconn, "tty", pgconn_tty, 0);
+	rb_define_method(rb_cPGconn, "conninfo", pgconn_conninfo, 0);
 	rb_define_method(rb_cPGconn, "options", pgconn_options, 0);
 	rb_define_method(rb_cPGconn, "status", pgconn_status, 0);
 	rb_define_method(rb_cPGconn, "transaction_status", pgconn_transaction_status, 0);

data/lib/pg.rb

@@ -19,10 +19,10 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.17.2.pre.546'
+	VERSION = '0.18.0'
 
 	# VCS revision
-	REVISION = %q$Revision: 22d57e3a2b37 $
+	REVISION = %q$Revision: 8e95248e80f6 $
 
 	class NotAllCopyDataRetrieved < PG::Error
 	end

data/lib/pg/connection.rb

@@ -172,6 +172,15 @@ class PG::Connection
 		return self.class.conndefaults
 	end
 
+
+	### Return the Postgres connection info structure as a Hash keyed by option
+	### keyword (as a Symbol).
+	def conninfo_hash
+		return self.conninfo.each_with_object({}) do |info, hash|
+			hash[ info[:keyword].to_sym ] = info[:val]
+		end
+	end
+
 end # class PG::Connection
 
 # Backward-compatible alias

data/spec/helpers.rb

@@ -261,6 +261,55 @@ module PG::TestingHelpers
 		end
 	end
 
+
+	# A matcher for checking the status of a PG::Connection to ensure it's still
+	# usable.
+	class ConnStillUsableMatcher
+
+		def initialize
+			@conn = nil
+			@problem = nil
+		end
+
+		def matches?( conn )
+			@conn = conn
+			@problem = self.check_for_problems
+			return @problem.nil?
+		end
+
+		def check_for_problems
+			return "is finished" if @conn.finished?
+			return "has bad status" unless @conn.status == PG::CONNECTION_OK
+			return "has bad transaction status (%d)" % [ @conn.transaction_status ] unless
+				@conn.transaction_status.between?( PG::PQTRANS_IDLE, PG::PQTRANS_INTRANS )
+			return "is not usable." unless self.can_exec_query?
+			return nil
+		end
+
+		def can_exec_query?
+			@conn.send_query( "VALUES (1)" )
+			@conn.get_last_result.values == [["1"]]
+		end
+
+		def failure_message
+			return "expected %p to be usable, but it %s" % [ @conn, @problem ]
+		end
+
+		def failure_message_when_negated
+			"expected %p not to be usable, but it still is" % [ @conn ]
+		end
+
+	end
+
+
+	### Return a ConnStillUsableMatcher to be used like:
+	###
+	###    expect( pg_conn ).to still_be_usable
+	###
+	def still_be_usable
+		return ConnStillUsableMatcher.new
+	end
+
 end
 
 

data/spec/pg/connection_spec.rb

@@ -457,8 +457,7 @@ describe PG::Connection do
 		end
 		expect( rows ).to eq( ["1\n", "2\n"] )
 		expect( res2.result_status ).to eq( PG::PGRES_COMMAND_OK )
-		@conn.send_query( "VALUES (1)" )
-		expect( @conn.get_last_result.values ).to eq( [["1"]] )
+		expect( @conn ).to still_be_usable
 	end
 
 	it "can handle incomplete #copy_data output queries" do
@@ -467,8 +466,7 @@ describe PG::Connection do
 				@conn.get_copy_data
 			end
 		}.to raise_error(PG::NotAllCopyDataRetrieved, /Not all/)
-		@conn.send_query( "VALUES (1)" )
-		expect( @conn.get_last_result.values ).to eq( [["1"]] )
+		expect( @conn ).to still_be_usable
 	end
 
 	it "can handle client errors in #copy_data for output" do
@@ -477,8 +475,7 @@ describe PG::Connection do
 				raise "boom"
 			end
 		}.to raise_error(RuntimeError, "boom")
-		@conn.send_query( "VALUES (1)" )
-		expect( @conn.get_last_result.values ).to eq( [["1"]] )
+		expect( @conn ).to still_be_usable
 	end
 
 	it "can handle server errors in #copy_data for output" do
@@ -492,8 +489,7 @@ describe PG::Connection do
 				end
 			}.to raise_error(PG::Error, /test-error/)
 		end
-		@conn.send_query( "VALUES (1)" )
-		expect( @conn.get_last_result.values ).to eq( [["1"]] )
+		expect( @conn ).to still_be_usable
 	end
 
 	it "can process #copy_data input queries" do
@@ -506,8 +502,7 @@ describe PG::Connection do
 		end
 		expect( res2.result_status ).to eq( PG::PGRES_COMMAND_OK )
 
-		@conn.send_query( "VALUES (1)" )
-		expect( @conn.get_last_result.values ).to eq( [["1"]] )
+		expect( @conn ).to still_be_usable
 
 		res = @conn.exec( "SELECT * FROM copytable ORDER BY col1" )
 		expect( res.values ).to eq( [["1"], ["2"]] )
@@ -523,8 +518,8 @@ describe PG::Connection do
 				end
 			}.to raise_error(RuntimeError, "boom")
 		end
-		@conn.send_query( "VALUES (1)" )
-		expect( @conn.get_last_result.values ).to eq( [["1"]] )
+
+		expect( @conn ).to still_be_usable
 	end
 
 	it "can handle server errors in #copy_data for input" do
@@ -537,8 +532,7 @@ describe PG::Connection do
 				end
 			}.to raise_error(PG::Error, /invalid input syntax for integer/)
 		end
-		@conn.send_query( "VALUES (1)" )
-		expect( @conn.get_last_result.values ).to eq( [["1"]] )
+		expect( @conn ).to still_be_usable
 	end
 
 	it "should raise an error for non copy statements in #copy_data" do
@@ -546,8 +540,7 @@ describe PG::Connection do
 			@conn.copy_data( "SELECT 1" ){}
 		}.to raise_error(ArgumentError, /no COPY/)
 
-		@conn.send_query( "VALUES (1)" )
-		expect( @conn.get_last_result.values ).to eq( [["1"]] )
+		expect( @conn ).to still_be_usable
 	end
 
 	it "correctly finishes COPY queries passed to #async_exec" do
@@ -598,6 +591,30 @@ describe PG::Connection do
 	end
 
 
+	it "can return the connection's connection options" do
+		expect( @conn.conninfo ).to be_a( Array )
+		expect( @conn.conninfo ).to all( be_a(Hash) )
+		expect( @conn.conninfo[0] ).to include( :keyword, :label, :dispchar, :dispsize )
+	end
+
+
+	it "can return the connection's connection options as a Hash" do
+		expect( @conn.conninfo_hash ).to be_a( Hash )
+		expect( @conn.conninfo_hash ).to include( :user, :password, :connect_timeout, :dbname, :host )
+		expect( @conn.conninfo_hash[:dbname] ).to eq( 'test' )
+	end
+
+
+	it "honors the connect_timeout connection parameter" do
+		conn = PG.connect( port: @port, dbname: 'test', connect_timeout: 11 )
+		begin
+			expect( conn.conninfo_hash[:connect_timeout] ).to eq( "11" )
+		ensure
+			conn.finish
+		end
+	end
+
+
 	it "raises an appropriate error if either of the required arguments for encrypt_password " +
 	   "is not valid" do
 		expect {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.17.2.pre.546
+  version: 0.18.0.pre20140820094244
 platform: ruby
 authors:
 - Michael Granger
@@ -31,7 +31,7 @@ cert_chain:
   c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
   ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -148,7 +148,7 @@ dependencies:
 description: |-
   Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-  It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
+  It works with {PostgreSQL 9.0 and later}[http://www.postgresql.org/support/versioning/].
 
   A small example usage:
 
@@ -188,7 +188,6 @@ extra_rdoc_files:
 - ext/pg_errors.c
 - ext/pg_result.c
 files:
-- ".gemtest"
 - BSDL
 - ChangeLog
 - Contributors.rdoc
@@ -265,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"