PostgreSQL: active? compatibility with the pure-Ruby driver. Still need to move connect into the adapter since postgres-pr doesn't support #reset. References #428.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3195 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 5 insertions, 3 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index ea60758a3f..578590d27c 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,6 +1,6 @@
 *SVN*
 
-* MySQL: active? compatibility with the pure-Ruby driver.  #428 [Jeremy Kemper]
+* MySQL and PostgreSQL: active? compatibility with the pure-Ruby driver.  #428 [Jeremy Kemper]
 
 * Oracle: active? check pings the database rather than testing the last command status.  #428 [Michael Schoen]
 
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 3f826edfe2..8619da8c5b 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -57,12 +57,14 @@ module ActiveRecord
 
       # Is this connection alive and ready for queries?
       def active?
-        # TODO: postgres-pr doesn't have PGconn#status.
         if @connection.respond_to?(:status)
-          @connection.status != PGconn::CONNECTION_BAD
+          @connection.status == PGconn::CONNECTION_OK
         else
+          @connection.query 'SELECT 1'
           true
         end
+      rescue PGError
+        false
       end
 
       # Close then reopen the connection.