Fix using postgres adapter with postgres-pr after last commit

jeremyevans · Dec 2, 2008 · f29cfff · f29cfff
1 parent 2a58c45
commit f29cfff
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/sequel_core/adapters/postgres.rb b/lib/sequel_core/adapters/postgres.rb
@@ -62,6 +62,9 @@ def self.unescape_bytea(obj)
         def block(timeout=nil)
         end
       end
+      unless defined?(CONNECTION_OK)
+        CONNECTION_OK = -1
+      end
     end
     class PGresult 
       alias_method :nfields, :num_fields unless method_defined?(:nfields) 
@@ -138,9 +141,10 @@ def execute(sql, args=nil)
           rescue PGError
             raise(Sequel::DatabaseDisconnectError)
           end
-          (s == Adapter::CONNECTION_OK) ? raise : raise(Sequel::DatabaseDisconnectError)
+          status_ok = (s == Adapter::CONNECTION_OK)
+          status_ok ? raise : raise(Sequel::DatabaseDisconnectError)
         ensure
-          block if s == Adapter::CONNECTION_OK
+          block if status_ok
         end
         begin
           block_given? ? yield(q) : q.cmd_tuples