pg 0.12.2 → 0.13.0.pre298

data/.hoerc

@@ -0,0 +1,2 @@
+---
+exclude: !ruby/regexp /\.(hg|DS_Store|rvm.*|irbrc|pryrc)|(coverage|manual|tmp\w*)\/|\.(bundle|so)$/

data/.tm_properties

@@ -0,0 +1,12 @@
+# Settings
+projectDirectory     = "$CWD"
+windowTitle          = "${CWD/^.*\///} «$TM_DISPLAYNAME»"
+excludeInFileChooser = "{$exclude,.hg}"
+
+TM_MAKE      = 'rake'
+TM_MAKE_FILE = '${projectDirectory}/Rakefile'
+
+[ source ]
+softTabs         = false
+tabSize          = 4
+

data/ChangeLog

@@ -1,8 +1,86 @@
+2012-01-24  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems:
+	Removed rspec 2.8.1 -- not yet released, and 2.8.0 is now pulled in
+	via hoe-deveiate
+	[a4494f18a0d3] [tip]
+
+	* lib/pg/constants.rb:
+	Whitespace cleanup
+	[e1b146cd9c2f]
+
+	* sample/async_api.rb, sample/notify_wait.rb, sample/psql.rb,
+	sample/psqlHelp.rb, sample/test1.rb, sample/test2.rb,
+	sample/test4.rb, sample/test_binary_values.rb:
+	Cleaned up the sample/ directory
+	[287c71f3c89e]
+
+	* .rvm.gems:
+	Bump hoe-deveiate version in the rvm gemset
+	[59d4530b4e43]
+
+	* .rvm.gems, BSD, Contributors.rdoc, GPL, LICENSE, Manifest.txt,
+	README.OS_X.rdoc, README.ja.rdoc, README.rdoc, README.windows.rdoc,
+	Rakefile, postgres, readme-os_x.rdoc, readme-windows.rdoc:
+	Updated/simplified authors/license sections of the README, API doc
+	cleanup, updated license files (fixes #72).
+	[29a15971cd3a]
+
+	* ext/pg.c, ext/pg_connection.c, ext/pg_result.c, spec/lib/helpers.rb,
+	spec/pg/connection_spec.rb:
+	Fix for exception message encoding (#96)
+	[1cdad2ce8993]
+
+	* .pryrc, .tm_properties, Manifest.txt, README.rdoc, ext/compat.c,
+	ext/compat.h, ext/extconf.rb, ext/pg.c, ext/pg.h,
+	ext/pg_connection.c, ext/pg_result.c, lib/pg.rb,
+	lib/pg/connection.rb, lib/pg/constants.rb, lib/pg/exceptions.rb,
+	lib/pg/result.rb, misc/openssl-pg-segfault.rb, sample/async_api.rb,
+	sample/async_copyto.rb, sample/async_mixed.rb, sample/copyfrom.rb,
+	sample/copyto.rb, sample/cursor.rb, sample/losample.rb,
+	sample/notify_wait.rb, sample/psql.rb, sample/test1.rb,
+	sample/test2.rb, sample/test4.rb, sample/test_binary_values.rb,
+	spec/lib/helpers.rb, spec/m17n_spec.rb, spec/pg/connection_spec.rb,
+	spec/pg/result_spec.rb, spec/pg_spec.rb, spec/pgconn_spec.rb,
+	spec/pgresult_spec.rb:
+	Rearranging classes under the PG namespace to be a better Ruby
+	citizen
+	[f346861fbb8b]
+
+2012-01-19  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hoerc, .rvm.gems, .rvmrc:
+	Adding rvmrc and gemset
+	[dca3d7464a00]
+
+2012-01-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt, sample/async_mixed.rb:
+	Adding an example of mixed synchronous/async API.
+	[3ba256ccee89]
+
 2012-01-03  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.12.2 for changeset 88bd78632f86
+	[622bef3960c3]
+
+	* .hgsigs:
+	Added signature for changeset f3dfdb6929b7
+	[88bd78632f86] [v0.12.2]
+
+	* History.rdoc, ext/pg.c:
+	Bump patch version for release.
+	[f3dfdb6929b7]
+
+	* ext/pg.c, spec/m17n_spec.rb:
+	Encode the messages of PGErrors with the encoding of the connection.
+	(fixes #96)
+	[b62c49d91eb2]
+
 	* History.rdoc:
 	Updating history for Lars's patch
-	[5daf0ca646d2] [tip]
+	[5daf0ca646d2]
 
 	* spec/m17n_spec.rb, spec/pgconn_spec.rb, spec/pgresult_spec.rb:
 	Moved all the spec hooks to the top of the file
@@ -25,6 +103,12 @@
 	* Merged with 6fc514ea2547
 	[5ec3792d1cac]
 
+2011-12-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc:
+	Updating history file with the st.h change
+	[935f29411410]
+
 2012-01-02  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
@@ -37,12 +121,8 @@
 
 2011-12-27  Michael Granger  <ged@FaerieMUD.org>
 
-	* History.rdoc:
-	Updating history file with the st.h change
-	[935f29411410]
-
 	* Merged with f8d66e32b9a8
-	[f72b14d349bf] [github/master]
+	[f72b14d349bf]
 
 2011-12-14  Michael Granger  <ged@FaerieMUD.org>
 

data/Contributors.rdoc

@@ -36,4 +36,11 @@ list.
 * Mahlon E. Smith <mahlon@martini.nu>
 * Lars Kanis <kanis@comcard.de>
 * Jason Yanowitz <me-bitbucket@jasonyanowitz.com>
+* Charlie Savage <cfis@rubyforge.org>
+* Rafał Bigaj <rafal@Bonifacy.intranet>
+* Jason Yanowitz <me-bitbucket@jasonyanowitz.com>
+* Greg Hazel <ghazel@gmail.com>
+* Chris White <cwprogram@live.com>
+* Aaron Patterson <aaron.patterson@gmail.com>
+* Tim Felgentreff <timfelgentreff@gmail.com>
 

data/History.rdoc

@@ -1,3 +1,32 @@
+== v0.13.0 [] Michael Granger <ged@FaerieMUD.org>
+
+Reorganization of modules/classes to be better Ruby citizens (with backward-compatible aliases):
+- Created toplevel namespace 'PG' to correspond with the gem name.
+- Renamed PGconn to PG::Connection (with ::PGconn alias)
+- Renamed PGresult to PG::Result (with ::PGresult alias)
+- Renamed PGError to PG::Error (with ::PGError alias)
+- Declare all constants inside PG::Constants, then include them in
+  PG::Connection and PG::Result for backward-compatibility, and
+  in PG for convenience.
+- Split the extension source up by class/module.
+- Removed old compatibility code for PostgreSQL versions < 8.3
+
+Documentation:
+- Clarified licensing, updated to Ruby 1.9's license.
+- Merged authors list, added some missing people to the Contributor's
+  list.
+- Cleaned up the sample/ directory
+- Making contact info a bit clearer, link to the Google+ page and
+  the mailing list
+
+Enhancements:
+- Added a convenience method: PG.connect -> PG::Connection.new
+
+Bugfixes:
+- Fixed LATIN5-LATIN10 Postgres<->Ruby encoding conversions
+
+
+
 == v0.12.2 [2012-01-03] Michael Granger <ged@FaerieMUD.org>
 
 - Fix for the 1.8.7 breakage introduced by the st.h fix for alternative Ruby

data/LICENSE

@@ -1,6 +1,6 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING.txt file), or the conditions below:
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the
@@ -17,33 +17,32 @@ You can redistribute it and/or modify it under either the terms of the GPL
        b) use the modified software only within your corporation or
           organization.
 
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
 
        d) make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
 
-       a) distribute the executables and library files of the software,
+       a) distribute the binaries and library files of the software,
 	  together with instructions (in the manual page or equivalent)
 	  on where to get the original distribution.
 
        b) accompany the distribution with the machine-readable source of
 	  the software.
 
-       c) give non-standard executables non-standard names, with
+       c) give non-standard binaries non-standard names, with
           instructions on where to get the original software distribution.
 
        d) make other distribution arrangements with the author.
 
   4. You may modify and include the part of the software into any other
      software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
+     are not written by the author, so that they are not under these terms.
 
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
 
   5. The scripts and library files supplied as input to or produced as 
      output from the software do not automatically fall under the
@@ -55,4 +54,3 @@ You can redistribute it and/or modify it under either the terms of the GPL
      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
      PURPOSE.
-

data/Manifest.txt

@@ -1,43 +1,44 @@
 .gemtest
-BSD
+.hoerc
+.tm_properties
 ChangeLog
 Contributors.rdoc
-GPL
 History.rdoc
 LICENSE
 Manifest.txt
-README.OS_X.rdoc
+POSTGRES
+README-OS_X.rdoc
+README-Windows.rdoc
 README.ja.rdoc
 README.rdoc
-README.windows.rdoc
 Rakefile
 Rakefile.cross
-ext/compat.c
-ext/compat.h
 ext/extconf.rb
 ext/pg.c
 ext/pg.h
+ext/pg_connection.c
+ext/pg_result.c
 ext/vc/pg.sln
 ext/vc/pg_18/pg.vcproj
 ext/vc/pg_19/pg_19.vcproj
 lib/pg.rb
+lib/pg/connection.rb
+lib/pg/constants.rb
+lib/pg/exceptions.rb
+lib/pg/result.rb
 misc/openssl-pg-segfault.rb
 sample/async_api.rb
 sample/async_copyto.rb
+sample/async_mixed.rb
 sample/copyfrom.rb
 sample/copyto.rb
 sample/cursor.rb
 sample/losample.rb
 sample/notify_wait.rb
-sample/psql.rb
-sample/psqlHelp.rb
-sample/test1.rb
-sample/test2.rb
-sample/test4.rb
 sample/test_binary_values.rb
 spec/data/expected_trace.out
 spec/data/random_binary_data
 spec/lib/helpers.rb
-spec/m17n_spec.rb
-spec/pgconn_spec.rb
-spec/pgresult_spec.rb
+spec/pg/connection_spec.rb
+spec/pg/result_spec.rb
+spec/pg_spec.rb

data/README.ja.rdoc

@@ -2,6 +2,6 @@
 
 * https://bitbucket.org/ged/ruby-pg
 
-This file needs translation. Anyone who is willing to volunteer, please 
+This file needs translation. Anyone who is willing to volunteer, please
 mail <ged@FaerieMUD.org>.
 

data/README.rdoc

@@ -6,20 +6,31 @@
 
 Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-It works with PostgreSQL 8.2 and later.
+It works with {PostgreSQL 8.3 and later}[http://bit.ly/6AfPhm].
 
-This will be the last minor version to support 8.2 -- 0.13 will support 8.3 
-and later, following the 
-{PostgreSQL Release Support Policy}[http://bit.ly/6AfPhm].
+A small example usage:
 
+  #!/usr/bin/env ruby
+  
+  require 'pg'
+  
+  # Output a table of current connections to the DB
+  conn = PG.connect( dbname: 'sales' )
+  conn.exec( "SELECT * FROM pg_stat_activity" ) do |result|
+    puts "     PID | User             | Query"
+	result.each do |row|
+      puts " %7d | %-16s | %s " %
+        row.values_at('procpid', 'usename', 'current_query')
+    end
+  end
 
 
 == Requirements
 
-* Ruby 1.8.7-p249 or later.
-* PostgreSQL 8.2.x or later installed.
+* Ruby 1.8.7-p249 or 1.9.3-p0.
+* PostgreSQL 8.3.x (with headers, -dev packages, etc).
 
-It may work with earlier versions as well, but those are not regularly tested.
+It may work with earlier versions of Ruby as well, but those are not regularly tested.
 
 
 == How To Install
@@ -33,8 +44,12 @@ Postgres:
 
     gem install pg -- --with-pg-config=<path to pg_config>
 
-See README.OS_X.rdoc for more information about installing under MacOS X, and
-README.windows.rdoc for Windows build/installation instructions.
+See README-OS_X.rdoc for more information about installing under MacOS X, and
+README-Windows.rdoc for Windows build/installation instructions.
+
+There's also {a Google+ group}[http://goo.gl/TFy1U] and a
+{mailing list}[http://groups.google.com/group/ruby-pg] if you get stuck, or just
+want to chat about something.
 
 
 == Contributing
@@ -50,39 +65,36 @@ 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>.
 
-== Copying
 
-This library is copyrighted by the authors.
+== Copying
 
-Authors:
+Copyright (c) 1997-2012 by the authors.
 
-* Yukihiro Matsumoto <matz@ruby-lang.org> - Author of Ruby.
-* Eiji Matsumoto <usagi@ruby.club.or.jp> - One of users who loves Ruby.
 * Jeff Davis <ruby-pg@j-davis.com>
-
-Thanks to:
-
-* Noboru Saitou <noborus@netlab.jp> - Past maintainer.
-* Dave Lee - Past maintainer.
-* Guy Decoux (ts) <decoux@moulon.inra.fr> 
-  
-Maintainers:
-
+* Guy Decoux (ts) <decoux@moulon.inra.fr>
 * Michael Granger <ged@FaerieMUD.org>
+* Dave Lee
+* Eiji Matsumoto <usagi@ruby.club.or.jp>
+* Yukihiro Matsumoto <matz@ruby-lang.org>
+* Noboru Saitou <noborus@netlab.jp>
 
-You may redistribute this software under the terms of the Ruby license,
-included in the file "LICENSE". The Ruby license also allows distribution
-under the terms of the GPL, included in the file "GPL".
+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
+for details.
 
 Portions of the code are from the PostgreSQL project, and are distributed
-under the terms of the BSD license, included in the file "BSD".
+under the terms of the PostgreSQL license, included in the file POSTGRES.
 
 Portions copyright LAIKA, Inc.
 
 
 == Acknowledgments
 
+See Contributors.rdoc for the many additional fine people that have contributed
+to this library over the years.
+
 We are thankful to the people at the ruby-list and ruby-dev mailing lists.
 And to the people who developed PostgreSQL.
 

data/Rakefile

@@ -49,10 +49,9 @@ $hoespec = Hoe.spec 'pg' do
 	self.readme_file = 'README.rdoc'
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
-	self.extra_rdoc_files.include( 'BSD', 'GPL', 'LICENSE' )
+	self.extra_rdoc_files.include( 'POSTGRES', 'LICENSE' )
 	self.extra_rdoc_files.include( 'ext/*.c' )
 
-	self.developer 'Jeff Davis', 'ruby-pg@j-davis.com'
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'rake-compiler', '~> 0.7', :developer

data/ext/extconf.rb

@@ -4,7 +4,11 @@ require 'mkmf'
 
 if ENV['MAINTAINER_MODE']
 	$stderr.puts "Maintainer mode enabled."
-	$CFLAGS << ' -Wall' << ' -ggdb' << ' -DDEBUG'
+	$CFLAGS << 
+		' -Wall' <<
+		' -ggdb' <<
+		' -DDEBUG' <<
+		' -pedantic'
 end
 
 if pgdir = with_config( 'pg' )
@@ -28,6 +32,7 @@ if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_exe
 	$stderr.puts "Using config values from %s" % [ pgconfig ]
 	$CPPFLAGS << " -I%s" % [ `"#{pgconfig}" --includedir`.chomp ]
 	$LDFLAGS << " -L%s" % [ `"#{pgconfig}" --libdir`.chomp ]
+	$LIBS << " " << `"#{pgconfig}" --libs`.chomp
 else
 	$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
 		" --with-pg-config=/path/to/pg_config"
@@ -35,6 +40,7 @@ end
 
 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"
+find_header( 'pg_config_manual.h' ) or abort "Can't find the 'pg_config_manual.h' header"
 
 abort "Can't find the PostgreSQL client library (libpq)" unless
 	have_library( 'pq', 'PQconnectdb', ['libpq-fe.h'] ) ||
@@ -51,6 +57,7 @@ have_func 'PQescapeStringConn'
 have_func 'PQgetCancel'
 have_func 'lo_create'
 have_func 'pg_encoding_to_char'
+have_func 'pg_char_to_encoding'
 have_func 'PQsetClientEncoding'
 
 have_func 'rb_encdb_alias'
@@ -60,7 +67,7 @@ $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")
+have_header 'unistd.h'
 have_header 'ruby/st.h' or have_header 'st.h' or abort "pg currently requires the ruby/st.h header"
 
 create_header()