pg 0.15.0-x86-mingw32 → 0.15.1-x86-mingw32

data/ChangeLog

@@ -1,8 +1,53 @@
+2013-04-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc:
+	Fix date in History
+	[de1cdb0f7ba6] [tip]
+
+	* .hgtags:
+	Added tag v0.15.1 for changeset 4692c20bcbde
+	[765d242ccf70]
+
+	* .hgsigs:
+	Added signature for changeset 0bfb6ff650be
+	[4692c20bcbde] [v0.15.1]
+
+	* lib/pg.rb:
+	Bump the patch version
+	[0bfb6ff650be]
+
+	* Merge with v0.15-stable
+	[650a853efd0d]
+
+	* ext/pg_connection.c, lib/pg/connection.rb:
+	Update PG::Connection documentation
+	[4514df7221a8]
+
+2013-04-05  Lars Kanis  <kanis@comcard.de>
+
+	* History.rdoc:
+	Update History.rdoc.
+	[1d0173b7a077] <v0.15-stable>
+
+	* lib/pg/connection.rb, spec/pg/connection_spec.rb:
+	Send a shortened $0 as application_name to the server in order to
+	avoid warnings about truncated identifier.
+
+	Thanks to Svoop for this report.
+	[9a6791fe9409]
+
+	* lib/pg/connection.rb, spec/pg/connection_spec.rb:
+	Send a shortened $0 as application_name to the server in order to
+	avoid warnings about truncated identifier.
+
+	Thanks to Svoop for this report.
+	[134e067259ee] <v0.15-stable>
+
 2013-03-26  Michael Granger  <ged@FaerieMUD.org>
 
 	* README.rdoc:
 	Update README, add Lars as maintainer
-	[5060601d2e64] [tip]
+	[5060601d2e64]
 
 	* ext/pg_result.c, lib/pg/exceptions.rb, sample/async_api.rb,
 	sample/async_mixed.rb, sample/cursor.rb,

data/History.rdoc

@@ -1,3 +1,10 @@
+== v0.15.1 [2013-04-08] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Shorten application_name to avoid warnings about truncated identifier.
+
+
 == v0.15.0 [2013-03-03] 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.3 and later}[http://bit.ly/6AfPhm].
+It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
 
 A small example usage:
 
@@ -34,10 +34,11 @@ A small example usage:
 
 == Requirements
 
-* Ruby 1.8.7-p371, 1.9.3-p392, or 2.0.0-p0.
-* PostgreSQL 8.3.x (with headers, -dev packages, etc).
+* Ruby 1.9.3-p392, or 2.0.0-p0.
+* PostgreSQL 8.4.x or later (with headers, -dev packages, etc).
 
-It may work with earlier versions of Ruby as well, but those are not regularly tested.
+It may work with earlier versions of Ruby/PostgreSQL as well, but those are
+not regularly tested.
 
 
 == How To Install
@@ -76,16 +77,18 @@ After checking out the source, run:
 This task will install any missing dependencies, run the tests/specs, and
 generate the API documentation.
 
-The current maintainer is Michael Granger <ged@FaerieMUD.org>.
+The current maintainers are Michael Granger <ged@FaerieMUD.org> and
+Lars Kanis <lars@greiz-reinsdorf.de>.
 
 
 == Copying
 
-Copyright (c) 1997-2012 by the authors.
+Copyright (c) 1997-2013 by the authors.
 
 * Jeff Davis <ruby-pg@j-davis.com>
 * Guy Decoux (ts) <decoux@moulon.inra.fr>
 * Michael Granger <ged@FaerieMUD.org>
+* Lars Kanis <lars@greiz-reinsdorf.de>
 * Dave Lee
 * Eiji Matsumoto <usagi@ruby.club.or.jp>
 * Yukihiro Matsumoto <matz@ruby-lang.org>

data/ext/pg_connection.c

@@ -7,23 +7,6 @@
 #include "pg.h"
 
 
-/********************************************************************
- *
- * Document-class: PG::Connection
- *
- * The class to access PostgreSQL RDBMS, based on the libpq interface,
- * provides convenient OO methods to interact with PostgreSQL.
- *
- * For example, to send query to the database on the localhost:
- *    require 'pg'
- *    conn = PG::Connection.open(:dbname => 'test')
- *    res = conn.exec('SELECT $1 AS a, $2 AS b, $3 AS c',[1, 2, nil])
- *    # Equivalent to:
- *    #  res  = conn.exec('SELECT 1 AS a, 2 AS b, NULL AS c')
- *
- * See the PG::Result class for information on working with the results of a query.
- *
- */
 VALUE rb_cPGconn;
 
 static PQnoticeReceiver default_notice_receiver = NULL;

data/ext/pg_result.c

@@ -147,10 +147,10 @@ pgresult_get(VALUE self)
 
 
 /********************************************************************
- * 
+ *
  * Document-class: PG::Result
  *
- * The class to represent the query result tuples (rows). 
+ * The class to represent the query result tuples (rows).
  * An instance of this class is created as the result of every query.
  * You may need to invoke the #clear method of the instance when finished with
  * the result for better memory performance.
@@ -162,7 +162,7 @@ pgresult_get(VALUE self)
  *    res.getvalue(0,0) # '1'
  *    res[0]['b']       # '2'
  *    res[0]['c']       # nil
- *  
+ *
  */
 
 /**************************************************************************
@@ -209,7 +209,7 @@ pgresult_res_status(VALUE self, VALUE status)
  * call-seq:
  *    res.error_message() -> String
  *
- * Returns the error message of the command as a string. 
+ * Returns the error message of the command as a string.
  */
 static VALUE
 pgresult_error_message(VALUE self)
@@ -240,7 +240,7 @@ pgresult_error_message(VALUE self)
  * * +PG_DIAG_SOURCE_FUNCTION+
  *
  * An example:
- * 
+ *
  *   begin
  *       conn.exec( "SELECT * FROM nonexistant_table" )
  *   rescue PG::Error => err
@@ -259,10 +259,10 @@ pgresult_error_message(VALUE self)
  *           result.error_field( PG::Result::PG_DIAG_SOURCE_FUNCTION ),
  *       ]
  *   end
- * 
+ *
  * Outputs:
- * 
- *   ["ERROR", "42P01", "relation \"nonexistant_table\" does not exist", nil, nil, 
+ *
+ *   ["ERROR", "42P01", "relation \"nonexistant_table\" does not exist", nil, nil,
  *    "15", nil, nil, nil, "path/to/parse_relation.c", "857", "parserOpenTable"]
  */
 static VALUE
@@ -381,7 +381,7 @@ pgresult_ftable(VALUE self, VALUE column_number)
 	int col_number = NUM2INT(column_number);
 	PGresult *pgresult = pgresult_get(self);
 
-	if( col_number < 0 || col_number >= PQnfields(pgresult)) 
+	if( col_number < 0 || col_number >= PQnfields(pgresult))
 		rb_raise(rb_eArgError,"Invalid column index: %d", col_number);
 
 	n = PQftable(pgresult, col_number);
@@ -392,7 +392,7 @@ pgresult_ftable(VALUE self, VALUE column_number)
  * call-seq:
  *    res.ftablecol( column_number ) -> Fixnum
  *
- * Returns the column number (within its table) of the table from 
+ * Returns the column number (within its table) of the table from
  * which the column _column_number_ is made up.
  *
  * Raises ArgumentError if _column_number_ is out of range or if
@@ -406,7 +406,7 @@ pgresult_ftablecol(VALUE self, VALUE column_number)
 
 	int n;
 
-	if( col_number < 0 || col_number >= PQnfields(pgresult)) 
+	if( col_number < 0 || col_number >= PQnfields(pgresult))
 		rb_raise(rb_eArgError,"Invalid column index: %d", col_number);
 
 	n = PQftablecol(pgresult, col_number);
@@ -419,7 +419,7 @@ pgresult_ftablecol(VALUE self, VALUE column_number)
  *
  * Returns the format (0 for text, 1 for binary) of column
  * _column_number_.
- * 
+ *
  * Raises ArgumentError if _column_number_ is out of range.
  */
 static VALUE
@@ -428,7 +428,7 @@ pgresult_fformat(VALUE self, VALUE column_number)
 	PGresult *result = pgresult_get(self);
 	int fnumber = NUM2INT(column_number);
 	if (fnumber < 0 || fnumber >= PQnfields(result)) {
-		rb_raise(rb_eArgError, "Column number is out of range: %d", 
+		rb_raise(rb_eArgError, "Column number is out of range: %d",
 			fnumber);
 	}
 	return INT2FIX(PQfformat(result, fnumber));
@@ -442,14 +442,14 @@ pgresult_fformat(VALUE self, VALUE column_number)
  *
  * The integer returned is the internal +OID+ number (in PostgreSQL)
  * of the type. To get a human-readable value for the type, use the
- * returned OID and the field's #fmod value with the format_type() SQL 
+ * returned OID and the field's #fmod value with the format_type() SQL
  * function:
- * 
+ *
  *   # Get the type of the second column of the result 'res'
  *   typename = conn.
  *     exec( "SELECT format_type($1,$2)", [res.ftype(1), res.fmod(1)] ).
  *     getvalue( 0, 0 )
- * 
+ *
  * Raises an ArgumentError if _column_number_ is out of range.
  */
 static VALUE
@@ -467,9 +467,9 @@ pgresult_ftype(VALUE self, VALUE index)
  * call-seq:
  *    res.fmod( column_number )
  *
- * Returns the type modifier associated with column _column_number_. See 
+ * Returns the type modifier associated with column _column_number_. See
  * the #ftype method for an example of how to use this.
- * 
+ *
  * Raises an ArgumentError if _column_number_ is out of range.
  */
 static VALUE
@@ -479,7 +479,7 @@ pgresult_fmod(VALUE self, VALUE column_number)
 	int fnumber = NUM2INT(column_number);
 	int modifier;
 	if (fnumber < 0 || fnumber >= PQnfields(result)) {
-		rb_raise(rb_eArgError, "Column number is out of range: %d", 
+		rb_raise(rb_eArgError, "Column number is out of range: %d",
 			fnumber);
 	}
 	modifier = PQfmod(result,fnumber);
@@ -688,7 +688,7 @@ pgresult_oid_value(VALUE self)
  * call-seq:
  *    res[ n ] -> Hash
  *
- * Returns tuple _n_ as a hash. 
+ * Returns tuple _n_ as a hash.
  */
 static VALUE
 pgresult_aref(VALUE self, VALUE index)
@@ -752,7 +752,7 @@ pgresult_each_row(VALUE self)
 				rb_ary_store( new_row, field, Qnil );
 			}
 			else {
-				VALUE val = rb_tainted_str_new( PQgetvalue(result, row, field), 
+				VALUE val = rb_tainted_str_new( PQgetvalue(result, row, field),
 				                                PQgetlength(result, row, field) );
 
 #ifdef M17N_SUPPORTED
@@ -795,7 +795,7 @@ make_column_result_array( VALUE self, int col )
 
 #ifdef M17N_SUPPORTED
 		/* associate client encoding for text format only */
-		if ( 0 == PQfformat(result, col) ) { 
+		if ( 0 == PQfformat(result, col) ) {
 			ASSOCIATE_INDEX( val, self );
 		} else {
 			rb_enc_associate( val, rb_ascii8bit_encoding() );
@@ -813,7 +813,7 @@ make_column_result_array( VALUE self, int col )
  *  call-seq:
  *     res.column_values( n )   -> array
  *
- *  Returns an Array of the values from the nth column of each 
+ *  Returns an Array of the values from the nth column of each
  *  tuple in the result.
  *
  */

data/lib/pg.rb

@@ -19,7 +19,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.15.0'
+	VERSION = '0.15.1'
 
 	# VCS revision
 	REVISION = %q$Revision$

data/lib/pg/connection.rb

@@ -2,7 +2,21 @@
 
 require 'pg' unless defined?( PG )
 
-# The PG connection class.
+# The PostgreSQL connection class. The interface for this class is based on
+# {libpq}[http://www.postgresql.org/docs/9.2/interactive/libpq.html], the C
+# application programmer's interface to PostgreSQL. Some familiarity with libpq
+# is recommended, but not necessary.
+#
+# For example, to send query to the database on the localhost:
+#
+#    require 'pg'
+#    conn = PG::Connection.open(:dbname => 'test')
+#    res = conn.exec_params('SELECT $1 AS a, $2 AS b, $3 AS c', [1, 2, nil])
+#    # Equivalent to:
+#    #  res  = conn.exec('SELECT 1 AS a, 2 AS b, NULL AS c')
+#
+# See the PG::Result class for information on working with the results of a query.
+#
 class PG::Connection
 
 	# The order the options are passed to the ::connect method.
@@ -27,7 +41,8 @@ class PG::Connection
 		# Parameter 'fallback_application_name' was introduced in PostgreSQL 9.0
 		# together with PQescapeLiteral().
 		if PG::Connection.instance_methods.find{|m| m.to_sym == :escape_literal }
-			appname = PG::Connection.quote_connstr( $0 )
+			appname = $0.sub(/^(.{30}).{4,}(.{30})$/){ $1+"..."+$2 }
+			appname = PG::Connection.quote_connstr( appname )
 			connopts = ["fallback_application_name=#{appname}"]
 		else
 			connopts = []

data/lib/pg/exceptions.rb

@@ -4,8 +4,8 @@ require 'pg' unless defined?( PG )
 
 
 module PG
-	
+
 	class Error < StandardError; end
-	
+
 end # module PG
 

data/sample/async_api.rb

@@ -11,7 +11,7 @@ TIMEOUT = 5.0 # seconds to wait for an async operation to complete
 
 # Print 'x' continuously to demonstrate that other threads aren't
 # blocked while waiting for the connection, for the query to be sent,
-# for results, etc. You might want to sleep inside the loop or 
+# for results, etc. You might want to sleep inside the loop or
 # comment this out entirely for cleaner output.
 progress_thread = Thread.new { loop { print 'x' } }
 
@@ -82,7 +82,7 @@ conn.send_query( "SELECT * FROM pg_stat_activity" )
 loop do
 	output_progress "  waiting for a response"
 
-	# Buffer any incoming data on the socket until a full result is ready. 
+	# Buffer any incoming data on the socket until a full result is ready.
 	conn.consume_input
 	while conn.is_busy
 		select( [socket], nil, nil, TIMEOUT ) or

data/sample/async_mixed.rb

@@ -5,7 +5,7 @@ require 'pg'
 $stdout.sync = true
 
 # This is a example of how to mix and match synchronous and async APIs. In this case,
-# the connection to the server is made syncrhonously, and then queries are 
+# the connection to the server is made syncrhonously, and then queries are
 # asynchronous.
 
 TIMEOUT = 5.0 # seconds to wait for an async operation to complete
@@ -36,7 +36,7 @@ conn.send_query( "SELECT * FROM pg_stat_activity" )
 loop do
 	output_progress "  waiting for a response"
 
-	# Buffer any incoming data on the socket until a full result is ready. 
+	# Buffer any incoming data on the socket until a full result is ready.
 	conn.consume_input
 	while conn.is_busy
 		output_progress "  waiting for data to be available on %p..." % [ socket ]

data/sample/cursor.rb

@@ -8,7 +8,7 @@ require 'pg'
 $stderr.puts "Opening database connection ..."
 conn = PG.connect( :dbname => 'test' )
 
-# 
+#
 conn.transaction do
     conn.exec( "DECLARE myportal CURSOR FOR select * from pg_database" )
     res = conn.exec( "FETCH ALL IN myportal" )

data/sample/disk_usage_report.rb

@@ -42,7 +42,7 @@ def report( opts )
 	# -----------------------------------------
 
 	db_info = db.exec %Q{
-		SELECT 
+		SELECT
 			count(oid) AS num_relations,
 			pg_size_pretty(pg_database_size('#{opts.database}')) AS dbsize
 		FROM

data/sample/wal_shipper.rb

@@ -416,7 +416,7 @@ rsync: /usr/bin/rsync
 ssh: /usr/bin/ssh
 ssh_timeout: 10
 
-destinations: 
+destinations:
 
 - label: rsync-example
   port: 2222

data/sample/warehouse_partitions.rb

@@ -150,7 +150,7 @@ class PGWarehouse
 		#
 		self.db.exec( query ) do |res|
 			res.each do |row|
-				relations[ row['oid'] ] = { 
+				relations[ row['oid'] ] = {
 					:name       => row['name'],
 					:tablespace => row['tspace'],
 					:indexes    => [],

data/spec/lib/helpers.rb

@@ -42,8 +42,7 @@ module PG::TestingHelpers
 	def ansi_code( *attributes )
 		attributes.flatten!
 		attributes.collect! {|at| at.to_s }
-		# $stderr.puts "Returning ansicode for TERM = %p: %p" %
-		# 	[ ENV['TERM'], attributes ]
+
 		return '' unless /(?:vt10[03]|xterm(?:-color)?|linux|screen)/i =~ ENV['TERM']
 		attributes = ANSI_ATTRIBUTES.values_at( *attributes ).compact.join(';')
 

data/spec/pg/connection_spec.rb

@@ -574,6 +574,16 @@ describe PG::Connection do
 			PG::Connection.parse_connect_args( 'dbname=test' ).should include( $0 )
 		end
 
+		it "sets a shortened fallback_application_name on new connections" do
+			old_0 = $0
+			begin
+				$0 = "/this/is/a/very/long/path/with/many/directories/to/our/beloved/ruby"
+				PG::Connection.parse_connect_args( 'dbname=test' ).should match(/\/this\/is\/a.*\.\.\..*\/beloved\/ruby/)
+			ensure
+				$0 = old_0
+			end
+		end
+
 		it "calls the block supplied to wait_for_notify with the notify payload if it accepts " +
 		    "any number of arguments" do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pg
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 15
-  - 0
-  version: 0.15.0
+  - 1
+  version: 0.15.1
 platform: x86-mingw32
 authors: 
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   mMFp4kPUHbWOqCp2mz9gCA==
   -----END CERTIFICATE-----
 
-date: 2013-03-26 00:00:00 Z
+date: 2013-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe-mercurial
@@ -133,7 +133,7 @@ dependencies:
 description: |-
   Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
   
-  It works with {PostgreSQL 8.3 and later}[http://bit.ly/6AfPhm].
+  It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
   
   A small example usage: