dbd-pg 0.3.8 → 0.3.9

data/lib/dbd/Pg.rb

@@ -3,16 +3,16 @@
 #
 # Copyright (c) 2001, 2002, 2003 Jim Weirich, Michael Neumann <mneumann@ntecs.de>
 # Copyright (c) 2008 Erik Hollensbe, Christopher Maujean
-# 
+#
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
 # are met:
-# 1. Redistributions of source code must retain the above copyright 
+# 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. The name of the author may not be used to endorse or promote products
 #    derived from this software without specific prior written permission.
@@ -49,12 +49,12 @@ module DBI
         # Only things that extend DBI's results are documented.
         #
         module Pg
-            VERSION          = "0.3.8"
+            VERSION          = "0.3.9"
             DESCRIPTION      = "PostgreSQL DBI DBD"
 
             #
             # returns 'Pg'
-            # 
+            #
             # See DBI::TypeUtil#convert for more information.
             #
             def self.driver_name
@@ -110,7 +110,7 @@ module DBI
                 pos = ftype.index('(')
                 decimal = nil
                 size = nil
-                array_of_type = nil 
+                array_of_type = nil
 
                 if pos != nil
                     type = ftype[0..pos-1]

data/lib/dbd/pg/statement.rb

@@ -14,7 +14,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
         super(db)
         @db  = db
         @sql = sql
-        @stmt_name = PG_STMT_NAME_PREFIX + self.object_id.to_s
+        @stmt_name = PG_STMT_NAME_PREFIX + self.object_id.to_s + Time.now.to_f.to_s
         @result = nil
         @bindvars = []
         @prepared = false
@@ -33,17 +33,17 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
     # DBI::Binary objects are passed in.
     #
     def execute
-        # replace DBI::Binary object by oid returned by lo_import 
+        # replace DBI::Binary object by oid returned by lo_import
         @bindvars.collect! do |var|
             if var.is_a? DBI::Binary then
                 oid = @db.__blob_create(PGconn::INV_WRITE)
                 @db.__blob_write(oid, var.to_s)
-                oid 
+                oid
             else
                 var
             end
         end
-        
+
         internal_prepare
 
         if not @db['AutoCommit'] then
@@ -93,7 +93,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
 
     #
     # Attributes:
-    # 
+    #
     # If +pg_row_count+ is requested and the statement has already executed,
     # postgres will return what it believes is the row count.
     #
@@ -110,7 +110,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
         end
     end
 
-    private 
+    private
 
     #
     # A native binding helper.

data/test/dbd/postgresql/testdbipg.rb

@@ -1,5 +1,10 @@
 require 'dbd/Pg'
 
+module DBI
+  class ForcedError < ::DBI::Error
+  end
+end
+
 ######################################################################
 # Test the PostgreSql DBD driver.  This test exercises options
 # difficult to test through the standard DBI interface.
@@ -59,7 +64,7 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
             # 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)
@@ -163,14 +168,30 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
                     :type_name =>"integer",
                     :unique =>nil,
                     :array_of_type =>nil
-        
+
                 }
-            ], 
+            ],
             @dbh.columns('tbl')
         )
-                                
+
     end
 
+  def test_statement_name_uniqueness
+    5000.times do
+      begin
+        @dbh.prepare('SELECT 1').execute()
+        raise DBI::ForcedError
+        sth.finish # never reached
+      rescue DBI::ProgrammingError => e
+        # ERROR:  prepared statement "ruby-dbi:Pg:-604926268" already exists
+        # This should never happen
+        raise e
+      rescue DBI::ForcedError
+        # no-op
+      end
+    end
+  end
+
   def test_connect_errors
     dbd = nil
     ex = assert_raises(DBI::OperationalError) {
@@ -204,7 +225,7 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
     dbd = get_dbd
     res = dbd.do("INSERT INTO names (name, age) VALUES('Dan', 16)")
     assert_equal 1, res
-    
+
     @sth = get_dbi.prepare("SELECT name FROM names WHERE age=16")
     @sth.execute
     assert @sth.fetchable?
@@ -269,7 +290,7 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
       # per bug #1082, views do not show up in tables listing.
       assert get_dbi.tables.include?("view_names")
   end
-  
+
   def get_dbi
       config = DBDConfig.get_config
       DBI.connect("dbi:Pg:#{config['postgresql']['dbname']}", config['postgresql']['username'], config['postgresql']['password'])

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dbd-pg
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -10,29 +15,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-11 00:00:00 -04:00
+date: 2010-03-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dbi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: pg
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: PostgreSQL DBI DBD
 email: ruby-dbi-users@rubyforge.org
 executables: []
@@ -44,25 +55,25 @@ extra_rdoc_files:
 - LICENSE
 - ChangeLog
 files: 
-- test/dbd/general/test_statement.rb
 - test/dbd/general/test_database.rb
+- test/dbd/general/test_statement.rb
 - test/dbd/general/test_types.rb
-- test/dbd/postgresql/base.rb
 - test/dbd/postgresql/testdbipg.rb
-- test/dbd/postgresql/test_async.rb
-- test/dbd/postgresql/test_arrays.rb
-- test/dbd/postgresql/down.sql
+- test/dbd/postgresql/test_blob.rb
+- test/dbd/postgresql/test_timestamp.rb
 - test/dbd/postgresql/up.sql
+- test/dbd/postgresql/base.rb
+- test/dbd/postgresql/down.sql
 - test/dbd/postgresql/test_bytea.rb
-- test/dbd/postgresql/test_transactions.rb
+- test/dbd/postgresql/test_async.rb
 - test/dbd/postgresql/test_ping.rb
-- test/dbd/postgresql/test_timestamp.rb
-- test/dbd/postgresql/test_blob.rb
+- test/dbd/postgresql/test_transactions.rb
+- test/dbd/postgresql/test_arrays.rb
 - lib/dbd/Pg.rb
+- lib/dbd/pg/type.rb
+- lib/dbd/pg/statement.rb
 - lib/dbd/pg/tuples.rb
 - lib/dbd/pg/database.rb
-- lib/dbd/pg/statement.rb
-- lib/dbd/pg/type.rb
 - lib/dbd/pg/exec.rb
 - test/DBD_TESTS
 - README
@@ -70,6 +81,8 @@ files:
 - ChangeLog
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/ruby-dbi
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -79,20 +92,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 0
       version: 1.8.0
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-dbi
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: PostgreSQL DBI DBD
 test_files: 
 - test/ts_dbd.rb