[Ruby-DBI-devel-CVS] CVS: src/lib/dbd_pg Pg.rb,1.30,1.31

[Michael N. <mne...@us...>]

Update of /cvsroot/ruby-dbi/src/lib/dbd_pg
In directory sc8-pr-cvs1:/tmp/cvs-serv8557

Modified Files:
	Pg.rb 
Log Message:
added NonBlocking execution mode


Index: Pg.rb
===================================================================
RCS file: /cvsroot/ruby-dbi/src/lib/dbd_pg/Pg.rb,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Pg.rb	25 Oct 2002 12:48:37 -0000	1.30
+++ Pg.rb	11 May 2003 15:29:08 -0000	1.31
@@ -1,7 +1,7 @@
 #
 # DBD::Pg
 #
-# Copyright (c) 2001, 2002 Jim Weirich, Michael Neumann <ne...@s-...>
+# Copyright (c) 2001, 2002, 2003 Jim Weirich, Michael Neumann <mne...@nt...>
 # 
 # All rights reserved.
 #
@@ -36,7 +36,7 @@
   module DBD
     module Pg
       
-      VERSION          = "0.3.2"
+      VERSION          = "0.3.3"
       USED_DBD_VERSION = "0.2"
       
       class Driver < DBI::BaseDriver
@@ -82,8 +82,6 @@
           nil                         => [SQL_OTHER, nil, nil]
         }
         
-        attr_reader :connection
-
         def initialize(dbname, user, auth, attr)
           hash = Utils.parse_params(dbname)
 
@@ -98,7 +96,10 @@
           @connection = PGconn.new(hash['host'], hash['port'], hash['options'], hash['tty'], 
             hash['dbname'] || hash['database'], user, auth)
 
+          @exec_method = :exec
+
           @attr = attr
+          @attr['NonBlocking'] ||= false
           @attr.each { |k,v| self[k] = v} 
 
           load_type_map
@@ -114,13 +115,13 @@
 
         def disconnect
           if not @attr['AutoCommit'] and @in_transaction
-            @connection.exec("ROLLBACK")   # rollback outstanding transactions
+            _exec("ROLLBACK")   # rollback outstanding transactions
           end
           @connection.close
         end
         
         def ping
-          answer = @connection.exec("SELECT 1")
+          answer = _exec("SELECT 1")
           if answer
             return answer.num_tuples == 1
           else
@@ -256,7 +257,7 @@
               if value    # turn AutoCommit ON
                 if @in_transaction
                   # TODO: commit outstanding transactions?
-                  @connection.exec("COMMIT")
+                  _exec("COMMIT")
                   @in_transaction = false
                 end
               else        # turn AutoCommit OFF
@@ -264,6 +265,8 @@
               end
             end
             # value is assigned below
+          when 'NonBlocking'
+            @exec_method = if value then :async_exec else :exec end
           when 'pg_client_encoding'
             @connection.set_client_encoding(value)
           else
@@ -278,7 +281,7 @@
 
         def commit
           if @in_transaction
-            @connection.exec("COMMIT")
+            _exec("COMMIT")
             @in_transaction = false
           else
             # TODO: Warn?
@@ -287,7 +290,7 @@
 
         def rollback
           if @in_transaction
-            @connection.exec("ROLLBACK")
+            _exec("ROLLBACK")
             @in_transaction = false
           else
             # TODO: Warn?
@@ -308,10 +311,14 @@
         end
 
         def start_transaction
-          @connection.exec("BEGIN")
+          _exec("BEGIN")
           @in_transaction = true
         end
 
+        def _exec(sql)
+          @connection.send(@exec_method, sql)
+        end
+
      if PGconn.respond_to?(:quote)
 
         def quote(value)
@@ -345,7 +352,7 @@
           @type_map = Hash.new
           @coerce = PgCoerce.new
 
-          res = @connection.exec("SELECT typname, typelem FROM pg_type")
+          res = _exec("SELECT typname, typelem FROM pg_type")
 
           res.result.each { |name, idstr|
             @type_map[idstr.to_i] = 
@@ -375,7 +382,7 @@
           start_transaction unless @in_transaction
           @connection.lo_import(file)
           #if @attr['AutoCommit']
-          #  @connection.exec("COMMIT")
+          #  _exec("COMMIT")
           #  @in_transaction = false
           #end
         rescue PGError => err
@@ -386,7 +393,7 @@
           start_transaction unless @in_transaction
           @connection.lo_export(oid.to_i, file)
           #if @attr['AutoCommit']
-          #  @connection.exec("COMMIT")
+          #  _exec("COMMIT")
           #  @in_transaction = false
           #end
         rescue PGError => err
@@ -397,7 +404,7 @@
           start_transaction unless @in_transaction
           @connection.lo_create(mode)
           #if @attr['AutoCommit']
-          #  @connection.exec("COMMIT")
+          #  _exec("COMMIT")
           #  @in_transaction = false
           #end
         rescue PGError => err
@@ -408,7 +415,7 @@
           start_transaction unless @in_transaction
           @connection.lo_open(oid.to_i, mode)
           #if @attr['AutoCommit']
-          #  @connection.exec("COMMIT")
+          #  _exec("COMMIT")
           #  @in_transaction = false
           #end
         rescue PGError => err
@@ -419,7 +426,7 @@
           start_transaction unless @in_transaction
           @connection.lo_unlink(oid.to_i)
           #if @attr['AutoCommit']
-          #  @connection.exec("COMMIT")
+          #  _exec("COMMIT")
           #  @in_transaction = false
           #end
         rescue PGError => err
@@ -504,7 +511,7 @@
           if not SQL.query?(boundsql) and not @db['AutoCommit'] then
             @db.start_transaction unless @db.in_transaction?
           end
-          pg_result = @db.connection.exec(boundsql)
+          pg_result = @db._exec(boundsql)
           @result = Tuples.new(@db, pg_result)
 
         rescue PGError, RuntimeError => err