pg 0.13.2 → 0.14.0.pre.351

data/ChangeLog

@@ -1,8 +1,184 @@
+2012-06-12  Mahlon E. Smith  <mahlon@laika.com>
+
+	* sample/warehouse_partitions.rb:
+	Move indexes across tablespaces along with their parents. Remove
+	the 'parent table' option, as we can derive that automatically from
+	the pg_inherits table.
+	[be46f44349bf] [tip]
+
+2012-05-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile, ext/pg.c, ext/pg_connection.c, ext/pg_result.c:
+	Documentation fixes.
+	[a965926418dd]
+
+2012-04-23  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt:
+	Adding Mahlon's samples to the manifest.
+	[997c3a247f44]
+
+	* .rvm.gems, Rakefile:
+	Updated dev dependencies
+	[cc07b81eaf18]
+
+2012-04-17  Mahlon E. Smith  <mahlon@laika.com>
+
+	* sample/disk_usage_report.rb, sample/minimal-testcase.rb,
+	sample/pg_statistics.rb, sample/replication_monitor.rb,
+	sample/wal_shipper.rb, sample/warehouse_partitions.rb:
+	Add a pile of additional sample scripts that perform various
+	administrative tasks.
+
+	These have all been fairly well battle-tested and are in production
+	use at $DAYJOB, though they were cleaned up for addition to the
+	Ruby-PG repo.
+
+	See the top comments in each script for additional information, or
+	the
+	--help flag on any of them for usage.
+
+	 - disk_usage_report
+
+	 Quick reporting on the heaviest disk consumers for a
+	database. Nice for cronned/email reporting.
+
+	 - pg_statistics
+
+	 Continuous polled statistics for a database.
+	Suitable for graphing with gnuplot (example
+	included.)
+
+	 - replication_monitor
+
+	 A command-line monitor for slave replication lag.
+	Works for both streaming replication and WAL
+	shipping. You should be able to use it as a base to
+	plug into your preferred monitoring system.
+
+	 - wal_shipper
+
+	 A smart WAL file transfer script, similar to
+	PITRTools.
+
+	 - warehouse_partitions
+
+	 An automated tablespace migrator for older, date-
+	based partitioned tables.
+	[36ca5b412583]
+
+2012-04-02  Michael Granger  <ged@FaerieMUD.org>
+
+	* sample/issue-119.rb:
+	Add a sample from <<issue 119>>
+	[35d75de3f5a5]
+
+2012-03-26  Michael Granger  <ged@FaerieMUD.org>
+
+	* sample/minimal-testcase.rb:
+	Adding a minimal-testcase sample
+	[87a8dadf1fdd]
+
+2012-03-10  Michael Granger  <ged@faeriemud.org>
+
+	* ext/pg_result.c:
+	Merged in larskanis/ruby-pg (pull request #7)
+	[4050c3412bd7]
+
+2012-03-10  Lars Kanis  <kanis@comcard.de>
+
+	* spec/pg/result_spec.rb:
+	Add checks with binary data for other PG::Result methods
+	[ef981c14a854]
+
+	* ext/pg_result.c:
+	Don't associate encoding with non-text-type fields in
+	PGresult#getvalue. This fixes #104 .
+	[9c90c50ca41a]
+
+2012-03-09  Michael Granger  <ged@FaerieMUD.org>
+
+	* ext/pg_result.c:
+	Avoid use of uninitialized Arrays (fixes #47).
+
+	Instead of declaring an Array at the beginning of fetching results
+	and pushing values onto it to return at the end (which could result
+	in a segfault if the GC runs during a NEWOBJ.
+	[6cea3cea3b2b]
+
+2012-03-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* ext/pg.c, ext/pg_result.c:
+	Fix the guard for PGRES_COPY_BOTH.
+	[4053dfd600e8]
+
+	* ext/pg.c, ext/pg_connection.c, lib/pg/connection.rb,
+	spec/lib/helpers.rb, spec/pg/connection_spec.rb, spec/pg_spec.rb:
+	Factor some library-introspection methods up into the toplevel
+	namespace.
+
+	- PG::Connection.library_version -> PG.library_version
+	- PG::Connection.isthreadsafe -> PG.is_threadsafe? (with backward-
+	compat aliases)
+	- Split up examples by PG version metadata
+	[e24ff9f37b12]
+
+	* Rakefile:
+	Depend on RSpec 2.8 for example metadata
+	[c0b00fdff58a]
+
+	* ext/extconf.rb, ext/pg_result.c:
+	ifdef'ed PGRES_COPY_BOTH
+	[ad4f62c38edf]
+
+2012-03-06  Michael Granger  <ged@faeriemud.org>
+
+	* Merged in krasul/ruby-pg/issue-68 (pull request #6)
+	[dedcce66d5e8]
+
+2012-03-05  Kashif Rasul  <kashif@nomad-labs.com>
+
+	* ext/pg_connection.c, ext/pg_result.c, sample/async_api.rb:
+	Added logic for missing cases.
+	[ae9e73972844] <issue-68>
+
+2012-03-04  Kashif Rasul  <kashif@nomad-labs.com>
+
+	* ext/extconf.rb, ext/pg.c, ext/pg_connection.c,
+	spec/pg/connection_spec.rb:
+	Added server ping() API.
+	[fec045ed060d] <issue-68>
+
+2012-03-02  Kashif Rasul  <kashif@nomad-labs.com>
+
+	* ext/extconf.rb, ext/pg_connection.c:
+	Added library_version() as a singleton method. Removed non-
+	singletons.
+	[f82d969cc755] <issue-68>
+
+	* ext/pg_connection.c:
+	Added missing #def to rb_define_method() calls.
+	[fd22651ae6c5] <issue-68>
+
+	* ext/pg_connection.c, spec/pg/connection_spec.rb,
+	spec/pg/result_spec.rb:
+	Added spec for escape_literal().
+	[1ce12f2fe97c] <issue-68>
+
+	* ext/pg_connection.c:
+	Removed unused variable.
+	[3b52e0e0d421] <issue-68>
+
+	* ext/extconf.rb, ext/pg_connection.c, spec/pg/connection_spec.rb:
+	Added PGconn#escape_literal and PGconn#escape_identifier API and a
+	spec to test for keepalive connection parameters.
+	[3bdbb90eb13b] <issue-68>
+
 2012-02-22  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.13.2 for changeset c79cd308363d
-	[d8e73919acb6] [tip]
+	[d8e73919acb6]
 
 	* .hgsigs:
 	Added signature for changeset 41e071bdd6ed
@@ -130,7 +306,7 @@
 
 	* History.rdoc, Manifest.txt, README.rdoc, Rakefile, lib/pg.rb:
 	Updated the History file, Manifest, README, added missing require.
-	[b2cd37832d02] [github/master]
+	[b2cd37832d02]
 
 	* .rvm.gems:
 	Removed rspec 2.8.1 -- not yet released, and 2.8.0 is now pulled in

data/History.rdoc

@@ -1,3 +1,31 @@
+== v0.14.0 [2012-06-17] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+  #47, #104
+
+
+New Methods for PostgreSQL 9 and async API support:
+PG
+- ::library_version
+
+PG::Connection
+- ::ping
+- #escape_literal
+- #escape_identifier
+- #set_default_encoding
+
+PG::Result
+- #check
+
+
+New Samples:
+
+This release also comes with a collection of contributed sample scripts for
+doing resource-utilization reports, graphing database statistics,
+monitoring for replication lag, shipping WAL files for replication,
+automated tablespace partitioning, etc. See the samples/ directory.
+
+
 == v0.13.2 [2012-02-22] Michael Granger <ged@FaerieMUD.org>
 
 - Make builds against PostgreSQL earlier than 8.3 fail with a descriptive

data/Manifest.txt

@@ -28,12 +28,20 @@ lib/pg/result.rb
 sample/async_api.rb
 sample/async_copyto.rb
 sample/async_mixed.rb
+sample/check_conn.rb
 sample/copyfrom.rb
 sample/copyto.rb
 sample/cursor.rb
+sample/disk_usage_report.rb
+sample/issue-119.rb
 sample/losample.rb
+sample/minimal-testcase.rb
 sample/notify_wait.rb
+sample/pg_statistics.rb
+sample/replication_monitor.rb
 sample/test_binary_values.rb
+sample/wal_shipper.rb
+sample/warehouse_partitions.rb
 spec/data/expected_trace.out
 spec/data/random_binary_data
 spec/lib/helpers.rb

data/Rakefile

@@ -37,6 +37,7 @@ CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
 # Set up Hoe plugins
 Hoe.plugin :mercurial
 Hoe.plugin :signing
+Hoe.plugin :deveiate
 
 Hoe.plugins.delete :rubyforge
 Hoe.plugins.delete :compiler
@@ -55,7 +56,7 @@ $hoespec = Hoe.spec 'pg' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'rake-compiler', '~> 0.7', :developer
-	self.dependency	'rspec', '~> 2.6', :developer
+	self.dependency	'hoe-deveiate', '~> 0.1', :developer
 
 	self.spec_extras[:licenses] = ['BSD', 'Ruby', 'GPL']
 	self.spec_extras[:extensions] = [ 'ext/extconf.rb' ]
@@ -64,6 +65,11 @@ $hoespec = Hoe.spec 'pg' do
 
 	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= )
+	self.spec_extras[:rdoc_options] = [
+		'-f', 'fivefish',
+		'-t', 'pg: The Ruby Interface to PostgreSQL',
+		'-m', 'README.rdoc',
+	]
 
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end

data/ext/extconf.rb

@@ -55,15 +55,21 @@ have_func 'PQprepare'
 have_func 'PQexecParams'
 have_func 'PQescapeString'
 have_func 'PQescapeStringConn'
+have_func 'PQescapeLiteral'
+have_func 'PQescapeIdentifier'
 have_func 'PQgetCancel'
 have_func 'lo_create'
 have_func 'pg_encoding_to_char'
 have_func 'pg_char_to_encoding'
 have_func 'PQsetClientEncoding'
+have_func 'PQlibVersion'
+have_func 'PQping'
 
 have_func 'rb_encdb_alias'
 have_func 'rb_enc_alias'
 
+have_const 'PGRES_COPY_BOTH', 'libpq-fe.h'
+
 $defs.push( "-DHAVE_ST_NOTIFY_EXTRA" ) if
 	have_struct_member 'struct pgNotify', 'extra', 'libpq-fe.h'
 

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id: pg.c,v 1cdad2ce8993 2012/01/25 01:21:30 ged $
+ * $Id: pg.c,v a965926418dd 2012/05/07 15:01:03 ged $
  *
  * Author/s:
  *
@@ -53,7 +53,7 @@ VALUE rb_mPGconstants;
 
 
 /*
- * Document-class: PGError
+ * Document-class: PG::Error
  *
  * This is the exception class raised when an error is returned from
  * a libpq API call.
@@ -250,6 +250,52 @@ pg_get_rb_encoding_as_pg_encoding( rb_encoding *enc )
 #endif /* M17N_SUPPORTED */
 
 
+/**************************************************************************
+ * Module Methods
+ **************************************************************************/
+
+#ifdef HAVE_PQLIBVERSION
+/*
+ * call-seq:
+ *   PG.library_version -> Integer
+ *
+ * Get the version of the libpq library in use. The number is formed by
+ * converting the major, minor, and revision numbers into two-decimal-
+ * digit numbers and appending them together.
+ * For example, version 7.4.2 will be returned as 70402, and version
+ * 8.1 will be returned as 80100 (leading zeroes are not shown). Zero
+ * is returned if the connection is bad.
+ */
+static VALUE
+pg_s_library_version(VALUE self)
+{
+	UNUSED( self );
+	return INT2NUM(PQlibVersion());
+}
+#endif
+
+
+/*
+ * call-seq:
+ *    PG.isthreadsafe            -> Boolean
+ *    PG.is_threadsafe?          -> Boolean
+ *    PG.threadsafe?             -> Boolean
+ *
+ * Returns +true+ if libpq is thread-safe, +false+ otherwise.
+ */
+static VALUE
+pg_s_threadsafe_p(VALUE self)
+{
+	UNUSED( self );
+	return PQisthreadsafe() ? Qtrue : Qfalse;
+}
+
+
+
+/**************************************************************************
+ * Initializer
+ **************************************************************************/
+
 void
 Init_pg_ext()
 {
@@ -257,6 +303,16 @@ Init_pg_ext()
 	rb_ePGerror = rb_define_class_under( rb_mPG, "Error", rb_eStandardError );
 	rb_mPGconstants = rb_define_module_under( rb_mPG, "Constants" );
 
+	/*************************
+	 *  PG module methods
+	 *************************/
+#ifdef HAVE_PQLIBVERSION
+	rb_define_singleton_method( rb_mPG, "library_version", pg_s_library_version, 0 );
+#endif
+	rb_define_singleton_method( rb_mPG, "isthreadsafe", pg_s_threadsafe_p, 0 );
+	SINGLETON_ALIAS( rb_mPG, "is_threadsafe?", "isthreadsafe" );
+	SINGLETON_ALIAS( rb_mPG, "threadsafe?", "isthreadsafe" );
+
 	/*************************
 	 *  PG::Error
 	 *************************/
@@ -285,6 +341,8 @@ Init_pg_ext()
 	rb_define_const(rb_mPGconstants, "CONNECTION_SSL_STARTUP", INT2FIX(CONNECTION_SSL_STARTUP));
 	/* Negotiating environment-driven parameter settings. */
 	rb_define_const(rb_mPGconstants, "CONNECTION_SETENV", INT2FIX(CONNECTION_SETENV));
+	/* Internal state: connect() needed. */
+	rb_define_const(rb_mPGconstants, "CONNECTION_NEEDED", INT2FIX(CONNECTION_NEEDED));
 
 	/******     PG::Connection CLASS CONSTANTS: Nonblocking connection polling status     ******/
 
@@ -319,6 +377,19 @@ Init_pg_ext()
 	/* Verbose error verbosity level (#set_error_verbosity) */
 	rb_define_const(rb_mPGconstants, "PQERRORS_VERBOSE", INT2FIX(PQERRORS_VERBOSE));
 
+#ifdef HAVE_PQPING
+	/******     PG::Connection CLASS CONSTANTS: Check Server Status ******/
+
+	/* Server is accepting connections. */
+	rb_define_const(rb_mPGconstants, "PQPING_OK", INT2FIX(PQPING_OK));
+	/* Server is alive but rejecting connections. */
+	rb_define_const(rb_mPGconstants, "PQPING_REJECT", INT2FIX(PQPING_REJECT));
+	/* Could not establish connection. */
+	rb_define_const(rb_mPGconstants, "PQPING_NO_RESPONSE", INT2FIX(PQPING_NO_RESPONSE));
+	/* Connection not attempted (bad params). */
+	rb_define_const(rb_mPGconstants, "PQPING_NO_ATTEMPT", INT2FIX(PQPING_NO_ATTEMPT));
+#endif
+
 	/******     PG::Connection CLASS CONSTANTS: Large Objects     ******/
 
 	/* Flag for #lo_creat, #lo_open -- open for writing */
@@ -332,7 +403,6 @@ Init_pg_ext()
 	/* Flag for #lo_lseek -- seek from object end */
 	rb_define_const(rb_mPGconstants, "SEEK_END", INT2FIX(SEEK_END));
 
-
 	/******     PG::Result CONSTANTS: result status      ******/
 
 	/* #result_status constant: The string sent to the server was empty. */
@@ -352,6 +422,10 @@ Init_pg_ext()
 	rb_define_const(rb_mPGconstants, "PGRES_NONFATAL_ERROR",INT2FIX(PGRES_NONFATAL_ERROR));
 	/* #result_status constant: A fatal error occurred. */
 	rb_define_const(rb_mPGconstants, "PGRES_FATAL_ERROR", INT2FIX(PGRES_FATAL_ERROR));
+	/* #result_status constant: Copy In/Out data transfer in progress. */
+#ifdef HAVE_CONST_PGRES_COPY_BOTH
+	rb_define_const(rb_mPGconstants, "PGRES_COPY_BOTH", INT2FIX(PGRES_COPY_BOTH));
+#endif
 
 	/******     Result CONSTANTS: result error field codes      ******/
 

data/ext/pg.h

@@ -107,8 +107,8 @@ void init_pg_result                                    _(( void ));
 
 PGconn *pg_get_pgconn	                               _(( VALUE ));
 
-VALUE pg_new_result                                    _(( PGresult *, PGconn * ));
-void pg_check_result                                   _(( VALUE, VALUE ));
+VALUE pg_new_result                                    _(( PGresult *, VALUE ));
+VALUE pg_result_check                                  _(( VALUE ));
 VALUE pg_result_clear                                  _(( VALUE ));
 
 #ifdef M17N_SUPPORTED

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v 679b1db2b430 2012/02/12 20:50:47 ged $
+ * $Id: pg_connection.c,v a3a3177b921c 2012/06/17 17:40:49 ged $
  *
  */
 
@@ -21,7 +21,7 @@
  *    # Equivalent to:
  *    #  res  = conn.exec('SELECT 1 AS a, 2 AS b, NULL AS c')
  *
- * See the PGresult class for information on working with the results of a query.
+ * See the PG::Result class for information on working with the results of a query.
  *
  */
 VALUE rb_cPGconn;
@@ -31,7 +31,9 @@ static PQnoticeProcessor default_notice_processor = NULL;
 
 static PGconn *pgconn_check( VALUE );
 static VALUE pgconn_finish( VALUE );
-
+#ifdef M17N_SUPPORTED
+static VALUE pgconn_set_default_encoding( VALUE self );
+#endif
 
 /*
  * Global functions
@@ -164,10 +166,6 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 	PGconn *conn = NULL;
 	VALUE conninfo;
 	VALUE error;
-#ifdef M17N_SUPPORTED	
-	rb_encoding *enc;
-	const char *encname;
-#endif
 
 	conninfo = rb_funcall2( rb_cPGconn, rb_intern("parse_connect_args"), argc, argv );
 	conn = PQconnectdb(StringValuePtr(conninfo));
@@ -185,14 +183,7 @@ pgconn_init(int argc, VALUE *argv, VALUE self)
 	}
 
 #ifdef M17N_SUPPORTED
-	/* If Ruby has its Encoding.default_internal set, set PostgreSQL's client_encoding 
-	 * to match */
-	if (( enc = rb_default_internal_encoding() )) {
-		encname = pg_get_rb_encoding_as_pg_encoding( enc );
-		if ( PQsetClientEncoding(conn, encname) != 0 )
-			rb_warn( "Failed to set the default_internal encoding to %s: '%s'",
-			         encname, PQerrorMessage(conn) );
-	}
+	pgconn_set_default_encoding( self );
 #endif
 
 	if (rb_block_given_p()) {
@@ -251,6 +242,39 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 	return rb_conn;
 }
 
+#ifdef HAVE_PQPING
+/*
+ * call-seq:
+ *    PG::Connection.ping(connection_hash)       -> Fixnum
+ *    PG::Connection.ping(connection_string)     -> Fixnum
+ *    PG::Connection.ping(host, port, options, tty, dbname, login, password) ->  Fixnum
+ *
+ * Check server status.
+ *
+ * Returns one of:
+ * [+PQPING_OK+]
+ *   server is accepting connections
+ * [+PQPING_REJECT+]
+ *   server is alive but rejecting connections
+ * [+PQPING_NO_RESPONSE+]
+ *   could not establish connection
+ * [+PQPING_NO_ATTEMPT+]
+ *   connection not attempted (bad params)
+ */
+static VALUE
+pgconn_s_ping( int argc, VALUE *argv, VALUE klass )
+{
+	PGPing ping;
+	VALUE conninfo;
+	VALUE error;
+
+	conninfo = rb_funcall2( klass, rb_intern("parse_connect_args"), argc, argv );
+	ping     = PQping( StringValuePtr(conninfo) );
+
+	return INT2FIX((int)ping);
+}
+#endif
+
 /*
  * call-seq:
  *    PG::Connection.conndefaults() -> Array
@@ -336,19 +360,6 @@ pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
 }
 
 
-/*
- * call-seq:
- *    PG::Connection.isthreadsafe() -> Boolean
- *
- * Returns +true+ if libpq is thread safe, +false+ otherwise.
- */
-static VALUE
-pgconn_s_isthreadsafe(VALUE self)
-{
-	UNUSED( self );
-	return PQisthreadsafe() ? Qtrue : Qfalse;
-}
-
 /**************************************************************************
  * PG::Connection INSTANCE METHODS
  **************************************************************************/
@@ -733,12 +744,12 @@ pgconn_connection_used_password(VALUE self)
 
 /*
  * call-seq:
- *    conn.exec(sql [, params, result_format ] ) -> PGresult
+ *    conn.exec(sql [, params, result_format ] ) -> PG::Result
  *    conn.exec(sql [, params, result_format ] ) {|pg_result| block }
  *
  * Sends SQL query request specified by _sql_ to PostgreSQL.
- * Returns a PGresult instance on success.
- * On failure, it raises a PGError exception.
+ * Returns a PG::Result instance on success.
+ * On failure, it raises a PG::Error.
  *
  * +params+ is an optional array of the bind parameters for the SQL query.
  * Each element of the +params+ array may be either:
@@ -764,7 +775,7 @@ pgconn_connection_used_password(VALUE self)
  * for binary.
  *
  * If the optional code block is given, it will be passed <i>result</i> as an argument, 
- * and the PGresult object will  automatically be cleared when the block terminates. 
+ * and the PG::Result object will  automatically be cleared when the block terminates. 
  * In this instance, <code>conn.exec</code> returns the value of the block.
  */
 static VALUE
@@ -793,8 +804,8 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 	/* If called with no parameters, use PQexec */
 	if(NIL_P(params)) {
 		result = PQexec(conn, StringValuePtr(command));
-		rb_pgresult = pg_new_result(result, conn);
-		pg_check_result(self, rb_pgresult);
+		rb_pgresult = pg_new_result(result, self);
+		pg_result_check(rb_pgresult);
 		if (rb_block_given_p()) {
 			return rb_ensure(rb_yield, rb_pgresult, pg_result_clear, rb_pgresult);
 		}
@@ -876,8 +887,8 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 	xfree(paramLengths);
 	xfree(paramFormats);
 
-	rb_pgresult = pg_new_result(result, conn);
-	pg_check_result(self, rb_pgresult);
+	rb_pgresult = pg_new_result(result, self);
+	pg_result_check(rb_pgresult);
 	if (rb_block_given_p()) {
 		return rb_ensure(rb_yield, rb_pgresult, 
 			pg_result_clear, rb_pgresult);
@@ -887,11 +898,11 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.prepare(stmt_name, sql [, param_types ] ) -> PGresult
+ *    conn.prepare(stmt_name, sql [, param_types ] ) -> PG::Result
  *
  * Prepares statement _sql_ with name _name_ to be executed later.
- * Returns a PGresult instance on success.
- * On failure, it raises a PGError exception.
+ * Returns a PG::Result instance on success.
+ * On failure, it raises a PG::Error.
  *
  * +param_types+ is an optional parameter to specify the Oids of the 
  * types of the parameters.
@@ -939,19 +950,19 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
 
 	xfree(paramTypes);
 
-	rb_pgresult = pg_new_result(result, conn);
-	pg_check_result(self, rb_pgresult);
+	rb_pgresult = pg_new_result(result, self);
+	pg_result_check(rb_pgresult);
 	return rb_pgresult;
 }
 
 /*
  * call-seq:
- *    conn.exec_prepared(statement_name [, params, result_format ] ) -> PGresult
+ *    conn.exec_prepared(statement_name [, params, result_format ] ) -> PG::Result
  *    conn.exec_prepared(statement_name [, params, result_format ] ) {|pg_result| block }
  *
  * Execute prepared named statement specified by _statement_name_.
- * Returns a PGresult instance on success.
- * On failure, it raises a PGError exception.
+ * Returns a PG::Result instance on success.
+ * On failure, it raises a PG::Error.
  *
  * +params+ is an array of the optional bind parameters for the 
  * SQL query. Each element of the +params+ array may be either:
@@ -970,7 +981,7 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
  * for binary.
  *
  * If the optional code block is given, it will be passed <i>result</i> as an argument, 
- * and the PGresult object will  automatically be cleared when the block terminates. 
+ * and the PG::Result object will  automatically be cleared when the block terminates. 
  * In this instance, <code>conn.exec_prepared</code> returns the value of the block.
  */
 static VALUE
@@ -1063,8 +1074,8 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 	xfree(paramLengths);
 	xfree(paramFormats);
 
-	rb_pgresult = pg_new_result(result, conn);
-	pg_check_result(self, rb_pgresult);
+	rb_pgresult = pg_new_result(result, self);
+	pg_result_check(rb_pgresult);
 	if (rb_block_given_p()) {
 		return rb_ensure(rb_yield, rb_pgresult, 
 			pg_result_clear, rb_pgresult);
@@ -1074,7 +1085,7 @@ pgconn_exec_prepared(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.describe_prepared( statement_name ) -> PGresult
+ *    conn.describe_prepared( statement_name ) -> PG::Result
  *
  * Retrieve information about the prepared statement
  * _statement_name_.
@@ -1094,15 +1105,15 @@ pgconn_describe_prepared(VALUE self, VALUE stmt_name)
 		stmt = StringValuePtr(stmt_name);
 	}
 	result = PQdescribePrepared(conn, stmt);
-	rb_pgresult = pg_new_result(result, conn);
-	pg_check_result(self, rb_pgresult);
+	rb_pgresult = pg_new_result(result, self);
+	pg_result_check(rb_pgresult);
 	return rb_pgresult;
 }
 
 
 /*
  * call-seq:
- *    conn.describe_portal( portal_name ) -> PGresult
+ *    conn.describe_portal( portal_name ) -> PG::Result
  *
  * Retrieve information about the portal _portal_name_.
  */
@@ -1122,17 +1133,17 @@ pgconn_describe_portal(self, stmt_name)
 		stmt = StringValuePtr(stmt_name);
 	}
 	result = PQdescribePortal(conn, stmt);
-	rb_pgresult = pg_new_result(result, conn);
-	pg_check_result(self, rb_pgresult);
+	rb_pgresult = pg_new_result(result, self);
+	pg_result_check(rb_pgresult);
 	return rb_pgresult;
 }
 
 
 /*
  * call-seq:
- *    conn.make_empty_pgresult( status ) -> PGresult
+ *    conn.make_empty_pgresult( status ) -> PG::Result
  *
- * Constructs and empty PGresult with status _status_.
+ * Constructs and empty PG::Result with status _status_.
  * _status_ may be one of:
  * * +PGRES_EMPTY_QUERY+
  * * +PGRES_COMMAND_OK+
@@ -1142,6 +1153,7 @@ pgconn_describe_portal(self, stmt_name)
  * * +PGRES_BAD_RESPONSE+
  * * +PGRES_NONFATAL_ERROR+
  * * +PGRES_FATAL_ERROR+
+ * * +PGRES_COPY_BOTH+
  */
 static VALUE
 pgconn_make_empty_pgresult(VALUE self, VALUE status)
@@ -1150,8 +1162,8 @@ pgconn_make_empty_pgresult(VALUE self, VALUE status)
 	VALUE rb_pgresult;
 	PGconn *conn = pg_get_pgconn(self);
 	result = PQmakeEmptyPGresult(conn, NUM2INT(status));
-	rb_pgresult = pg_new_result(result, conn);
-	pg_check_result(self, rb_pgresult);
+	rb_pgresult = pg_new_result(result, self);
+	pg_result_check(rb_pgresult);
 	return rb_pgresult;
 }
 
@@ -1290,13 +1302,79 @@ pgconn_s_unescape_bytea(VALUE self, VALUE str)
 	return ret;
 }
 
+#ifdef HAVE_PQESCAPELITERAL
+/*
+ * call-seq:
+ *    conn.escape_literal( str ) -> String
+ *
+ * Escape an arbitrary String +str+ as a literal.
+ */
+static VALUE
+pgconn_escape_literal(VALUE self, VALUE string)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	char *escaped = NULL;
+	VALUE error;
+	VALUE result = Qnil;
+
+	Check_Type(string, T_STRING);
+
+	escaped = PQescapeLiteral(conn, RSTRING_PTR(string), RSTRING_LEN(string));
+	if (escaped == NULL)
+	{
+		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		rb_iv_set(error, "@connection", self);
+		rb_exc_raise(error);
+		return Qnil;
+	}
+	result = rb_str_new2(escaped);
+	PQfreemem(escaped);
+	OBJ_INFECT(result, string);
+
+	return result;
+}
+#endif
+
+#ifdef HAVE_PQESCAPEIDENTIFIER
+/*
+ * call-seq:
+ *    conn.escape_identifier( str ) -> String
+ *
+ * Escape an arbitrary String +str+ as an identifier.
+ */
+static VALUE
+pgconn_escape_identifier(VALUE self, VALUE string)
+{
+	PGconn *conn = pg_get_pgconn(self);
+	char *escaped = NULL;
+	VALUE error;
+	VALUE result = Qnil;
+
+	Check_Type(string, T_STRING);
+
+	escaped = PQescapeIdentifier(conn, RSTRING_PTR(string), RSTRING_LEN(string));
+	if (escaped == NULL)
+	{
+		error = rb_exc_new2(rb_ePGerror, PQerrorMessage(conn));
+		rb_iv_set(error, "@connection", self);
+		rb_exc_raise(error);
+		return Qnil;
+	}
+	result = rb_str_new2(escaped);
+	PQfreemem(escaped);
+	OBJ_INFECT(result, string);
+
+	return result;
+}
+#endif
+
 /*
  * call-seq:
  *    conn.send_query(sql [, params, result_format ] ) -> nil
  *
  * Sends SQL query request specified by _sql_ to PostgreSQL for
  * asynchronous processing, and immediately returns.
- * On failure, it raises a PGError exception.
+ * On failure, it raises a PG::Error.
  *
  * +params+ is an optional array of the bind parameters for the SQL query.
  * Each element of the +params+ array may be either:
@@ -1442,7 +1520,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
  *
  * Prepares statement _sql_ with name _name_ to be executed later.
  * Sends prepare command asynchronously, and returns immediately.
- * On failure, it raises a PGError exception.
+ * On failure, it raises a PG::Error.
  *
  * +param_types+ is an optional parameter to specify the Oids of the 
  * types of the parameters.
@@ -1505,7 +1583,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
  *
  * Execute prepared named statement specified by _statement_name_
  * asynchronously, and returns immediately.
- * On failure, it raises a PGError exception.
+ * On failure, it raises a PG::Error.
  *
  * +params+ is an array of the optional bind parameters for the 
  * SQL query. Each element of the +params+ array may be either:
@@ -1667,7 +1745,7 @@ pgconn_send_describe_portal(VALUE self, VALUE portal)
 
 /*
  * call-seq:
- *    conn.get_result() -> PGresult
+ *    conn.get_result() -> PG::Result
  *    conn.get_result() {|pg_result| block }
  *
  * Blocks waiting for the next result from a call to
@@ -1678,7 +1756,7 @@ pgconn_send_describe_portal(VALUE self, VALUE portal)
  * you will not be able to issue further commands.
  *
  * If the optional code block is given, it will be passed <i>result</i> as an argument, 
- * and the PGresult object will  automatically be cleared when the block terminates. 
+ * and the PG::Result object will  automatically be cleared when the block terminates. 
  * In this instance, <code>conn.exec</code> returns the value of the block.
  */
 static VALUE
@@ -1691,7 +1769,7 @@ pgconn_get_result(VALUE self)
 	result = PQgetResult(conn);
 	if(result == NULL)
 		return Qnil;
-	rb_pgresult = pg_new_result(result, conn);
+	rb_pgresult = pg_new_result(result, self);
 	if (rb_block_given_p()) {
 		return rb_ensure(rb_yield, rb_pgresult,
 			pg_result_clear, rb_pgresult);
@@ -1797,7 +1875,7 @@ pgconn_isnonblocking(self)
  * Returns +true+ if data is successfully flushed, +false+
  * if not (can only return +false+ if connection is
  * nonblocking.
- * Raises PGError exception if some other failure occurred.
+ * Raises PG::Error if some other failure occurred.
  */
 static VALUE
 pgconn_flush(self)
@@ -2243,7 +2321,7 @@ notice_receiver_proxy(void *arg, const PGresult *result)
  * the work in the notice receiver.
  *
  * This function takes a new block to act as the handler, which should
- * accept a single parameter that will be a PGresult object, and returns 
+ * accept a single parameter that will be a PG::Result object, and returns 
  * the Proc object previously set, or +nil+ if it was previously the default.
  *
  * If you pass no arguments, it will reset the handler to the default.
@@ -2387,19 +2465,19 @@ pgconn_transaction(VALUE self)
 
 	if (rb_block_given_p()) {
 		result = PQexec(conn, "BEGIN");
-		rb_pgresult = pg_new_result(result, conn);
-		pg_check_result(self, rb_pgresult);
+		rb_pgresult = pg_new_result(result, self);
+		pg_result_check(rb_pgresult);
 		rb_protect(rb_yield, self, &status);
 		if(status == 0) {
 			result = PQexec(conn, "COMMIT");
-			rb_pgresult = pg_new_result(result, conn);
-			pg_check_result(self, rb_pgresult);
+			rb_pgresult = pg_new_result(result, self);
+			pg_result_check(rb_pgresult);
 		}
 		else {
 			/* exception occurred, ROLLBACK and re-raise */
 			result = PQexec(conn, "ROLLBACK");
-			rb_pgresult = pg_new_result(result, conn);
-			pg_check_result(self, rb_pgresult);
+			rb_pgresult = pg_new_result(result, self);
+			pg_result_check(rb_pgresult);
 			rb_jump_tag(status);
 		}
 
@@ -2664,7 +2742,7 @@ pgconn_block( int argc, VALUE *argv, VALUE self ) {
 
 /*
  * call-seq:
- *    conn.get_last_result( ) -> PGresult
+ *    conn.get_last_result( ) -> PG::Result
  *
  * This function retrieves all available results
  * on the current connection (from previously issued
@@ -2697,8 +2775,8 @@ pgconn_get_last_result(VALUE self)
 	}
 
 	if (prev) {
-		rb_pgresult = pg_new_result(prev, conn);
-		pg_check_result(self, rb_pgresult);
+		rb_pgresult = pg_new_result( prev, self );
+		pg_result_check(rb_pgresult);
 	}
 
 	return rb_pgresult;
@@ -2707,7 +2785,7 @@ pgconn_get_last_result(VALUE self)
 
 /*
  * call-seq:
- *    conn.async_exec(sql [, params, result_format ] ) -> PGresult
+ *    conn.async_exec(sql [, params, result_format ] ) -> PG::Result
  *    conn.async_exec(sql [, params, result_format ] ) {|pg_result| block }
  *
  * This function has the same behavior as #exec,
@@ -2745,7 +2823,7 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
  *    conn.lo_creat( [mode] ) -> Fixnum
  *
  * Creates a large object with mode _mode_. Returns a large object Oid.
- * On failure, it raises PGError exception.
+ * On failure, it raises PG::Error.
  */
 static VALUE
 pgconn_locreat(int argc, VALUE *argv, VALUE self)
@@ -2772,7 +2850,7 @@ pgconn_locreat(int argc, VALUE *argv, VALUE self)
  *    conn.lo_create( oid ) -> Fixnum
  *
  * Creates a large object with oid _oid_. Returns the large object Oid.
- * On failure, it raises PGError exception.
+ * On failure, it raises PG::Error.
  */
 static VALUE
 pgconn_locreate(VALUE self, VALUE in_lo_oid)
@@ -2794,7 +2872,7 @@ pgconn_locreate(VALUE self, VALUE in_lo_oid)
  *
  * Import a file to a large object. Returns a large object Oid.
  *
- * On failure, it raises a PGError exception.
+ * On failure, it raises a PG::Error.
  */
 static VALUE
 pgconn_loimport(VALUE self, VALUE filename)
@@ -3107,9 +3185,8 @@ pgconn_internal_encoding_set(VALUE self, VALUE enc)
  * call-seq:
  *   conn.external_encoding() -> Encoding
  *
- * defined in Ruby 1.9 or later.
- * - Returns the server_encoding of the connected database as a Ruby Encoding object.
- * - Maps 'SQL_ASCII' to ASCII-8BIT.
+ * Return the +server_encoding+ of the connected database as a Ruby Encoding object.
+ * The <tt>SQL_ASCII</tt> encoding is mapped to to <tt>ASCII_8BIT</tt>.
  */
 static VALUE
 pgconn_external_encoding(VALUE self)
@@ -3131,6 +3208,35 @@ pgconn_external_encoding(VALUE self)
 	return encoding;
 }
 
+
+
+/*
+ * call-seq:
+ *   conn.set_default_encoding() -> Encoding
+ *
+ * If Ruby has its Encoding.default_internal set, set PostgreSQL's client_encoding
+ * to match. Returns the new Encoding, or +nil+ if the default internal encoding
+ * wasn't set.
+ */
+static VALUE
+pgconn_set_default_encoding( VALUE self )
+{
+	PGconn *conn = pg_get_pgconn( self );
+	rb_encoding *enc;
+	const char *encname;
+
+	if (( enc = rb_default_internal_encoding() )) {
+		encname = pg_get_rb_encoding_as_pg_encoding( enc );
+		if ( PQsetClientEncoding(conn, encname) != 0 )
+			rb_warn( "Failed to set the default_internal encoding to %s: '%s'",
+			         encname, PQerrorMessage(conn) );
+		return rb_enc_from_encoding( enc );
+	} else {
+		return Qnil;
+	}
+}
+
+
 #endif /* M17N_SUPPORTED */
 
 
@@ -3152,11 +3258,13 @@ init_pg_connection()
 	SINGLETON_ALIAS(rb_cPGconn, "escape", "escape_string");
 	rb_define_singleton_method(rb_cPGconn, "escape_bytea", pgconn_s_escape_bytea, 1);
 	rb_define_singleton_method(rb_cPGconn, "unescape_bytea", pgconn_s_unescape_bytea, 1);
-	rb_define_singleton_method(rb_cPGconn, "isthreadsafe", pgconn_s_isthreadsafe, 0);
 	rb_define_singleton_method(rb_cPGconn, "encrypt_password", pgconn_s_encrypt_password, 2);
 	rb_define_singleton_method(rb_cPGconn, "quote_ident", pgconn_s_quote_ident, 1);
 	rb_define_singleton_method(rb_cPGconn, "connect_start", pgconn_s_connect_start, -1);
 	rb_define_singleton_method(rb_cPGconn, "conndefaults", pgconn_s_conndefaults, 0);
+#ifdef HAVE_PQPING
+	rb_define_singleton_method(rb_cPGconn, "ping", pgconn_s_ping, -1);
+#endif
 
 	/******     PG::Connection INSTANCE METHODS: Connection Control     ******/
 	rb_define_method(rb_cPGconn, "initialize", pgconn_init, -1);
@@ -3199,6 +3307,12 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "make_empty_pgresult", pgconn_make_empty_pgresult, 1);
 	rb_define_method(rb_cPGconn, "escape_string", pgconn_s_escape, 1);
 	rb_define_alias(rb_cPGconn, "escape", "escape_string");
+#ifdef HAVE_PQESCAPELITERAL
+	rb_define_method(rb_cPGconn, "escape_literal", pgconn_escape_literal, 1);
+#endif
+#ifdef HAVE_PQESCAPEIDENTIFIER
+	rb_define_method(rb_cPGconn, "escape_identifier", pgconn_escape_identifier, 1);
+#endif
 	rb_define_method(rb_cPGconn, "escape_bytea", pgconn_s_escape_bytea, 1);
 	rb_define_method(rb_cPGconn, "unescape_bytea", pgconn_s_unescape_bytea, 1);
 
@@ -3281,6 +3395,7 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "internal_encoding", pgconn_internal_encoding, 0);
 	rb_define_method(rb_cPGconn, "internal_encoding=", pgconn_internal_encoding_set, 1);
 	rb_define_method(rb_cPGconn, "external_encoding", pgconn_external_encoding, 0);
+	rb_define_method(rb_cPGconn, "set_default_encoding", pgconn_set_default_encoding, 0);
 #endif /* M17N_SUPPORTED */
 
 }