dbd-pg 0.3.3 → 0.3.4

data/lib/dbd/Pg.rb

@@ -49,7 +49,7 @@ module DBI
         # Only things that extend DBI's results are documented.
         #
         module Pg
-            VERSION          = "0.3.3"
+            VERSION          = "0.3.4"
             DESCRIPTION      = "PostgreSQL DBI DBD"
 
             #

data/lib/dbd/pg/statement.rb

@@ -71,8 +71,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
     end
 
     def finish
-        @stmt.clear if @stmt
-        @result.finish if @result
+        internal_finish
         @result = nil
         @db = nil
     end
@@ -123,6 +122,15 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
         end
     end
 
+    # finish the statement at a lower level
+    def internal_finish
+        @result.finish if @result
+        statement_exists = @db._exec("select * from pg_prepared_statements where name='#{@stmt_name}'")
+        if statement_exists.num_tuples > 0
+            @db._exec("DEALLOCATE \"#{@stmt_name}\"")
+        end
+    end
+
     # prepare the statement at a lower level.
     def internal_prepare
         if @db["pg_native_binding"]
@@ -130,7 +138,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
                 @stmt = @db._prepare(@stmt_name, translate_param_markers(@sql))
             end
         else
-            @stmt.clear if @stmt
+            internal_finish
             @stmt = @db._prepare(@stmt_name, DBI::SQL::PreparedStatement.new(DBI::DBD::Pg, @sql).bind(@bindvars))
         end
         @prepared = true

data/test/dbd/general/test_statement.rb

@@ -1,4 +1,13 @@
 @class = Class.new(DBDConfig.testbase(DBDConfig.current_dbtype)) do
+
+    def test_execute
+        assert_nothing_raised do
+            @dbh.execute("select * from names order by age") do |sth|
+                assert_equal([["Joe", 19], ["Bob", 21], ["Jim", 30]], sth.fetch_all)
+            end
+        end
+    end
+
     def test_quoting # FIXME breaks sqlite-ruby to a segfault - research
         @sth = nil
 
@@ -114,7 +123,7 @@
         @sth.finish
     end
 
-    def test_execute
+    def test_prepare_execute
         assert_nothing_raised do 
             @sth = @dbh.prepare("select * from names")
             @sth.execute
@@ -134,7 +143,7 @@
         end
     end
 
-    def test_execute_with_transactions
+    def test_prepare_execute_with_transactions
         @dbh["AutoCommit"] = false 
         config = DBDConfig.get_config['sqlite3']
 

data/test/dbd/postgresql/testdbipg.rb

@@ -18,6 +18,35 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
 #      dbd.disconnect if dbd
 #   end
 
+    # this monkeypatch is used for the following test... NEVER integrate this into DBI proper.
+    class DBI::StatementHandle < DBI::Handle
+        def stmt_name
+            @handle.instance_variable_get(:@stmt_name)
+        end
+    end
+
+    def test_statement_finish_deallocates_sth
+        assert_nothing_raised do
+            @sth = @dbh.prepare("select * from names")
+            @sth.execute
+            sth_internal_name = @sth.stmt_name
+            assert(sth_internal_name)
+            assert(!sth_internal_name.empty?)
+            @sth.finish
+
+            # at this point, the statement name should no longer exist
+            #
+            # XXX this is a potentially horrible way of doing it since it'll
+            # create another prepared statement, but *at this time*, I don't
+            # see any drawbacks and the alternative is considerably uglier.
+            
+            @sth = @dbh.prepare("select count(*) from pg_prepared_statements where name = ?")
+            @sth.execute(sth_internal_name)
+            assert_equal([0], @sth.fetch)
+            @sth.finish
+        end
+    end
+
     def test_binding
         assert(@dbh["pg_native_binding"])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbd-pg
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-23 00:00:00 -07:00
+date: 2008-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency