dbd-pg 0.3.5 → 0.3.6

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.5"
+            VERSION          = "0.3.6"
             DESCRIPTION      = "PostgreSQL DBI DBD"
 
             #
@@ -172,9 +172,11 @@ pg = DBI::DBD::Pg
 DBI::TypeUtil.register_conversion(pg.driver_name) do |obj|
     newobj = case obj
              when ::DateTime
-                 obj.strftime("%m/%d/%Y %H:%M:%S.%N")
-             when ::Time, ::Date
-                 ::DateTime.parse(obj.to_s).strftime("%m/%d/%Y %H:%M:%S.%N")
+                 obj.strftime("%Y-%m-%dT%H:%M:%S.%N")
+             when ::Time
+                 ::DateTime.parse(obj.to_s).strftime("%H:%M:%S.%N")
+             when ::Date
+                 obj.strftime("%Y-%m-%d")
              when ::Array
                  pg.generate_array(obj)
              when DBI::DBD::Pg::Type::ByteA

data/lib/dbd/pg/statement.rb

@@ -125,10 +125,7 @@ class DBI::DBD::Pg::Statement < DBI::BaseStatement
     # 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
+        @db._exec("DEALLOCATE \"#{@stmt_name}\"") if @prepared rescue nil
     end
 
     # prepare the statement at a lower level.

data/test/DBD_TESTS

@@ -2,6 +2,8 @@
 Using DBD tests
 ================================================================================
 
+Before you do anything, read the TESTING file.
+
 Create a YAML file named .ruby-dbi.test-config.yaml in your home directory.
 
 This file is a hash of keys that determine what you want to test and how you

data/test/dbd/general/test_database.rb

@@ -1,4 +1,15 @@
 @class = Class.new(DBDConfig.testbase(DBDConfig.current_dbtype)) do
+
+    def test_empty_query
+        ["", " ", "\t"].each do |str|
+            [:do, :prepare, :execute, :select_one, :select_all].each do |call|
+                assert_raises(DBI::InterfaceError) do
+                    @dbh.send(call, str)
+                end
+            end
+        end
+    end
+
     def test_ping
         assert @dbh.ping
         # XXX if it isn't obvious, this should be tested better. Not sure what
@@ -40,6 +51,7 @@
             assert(cols[1]["nullable"])
             assert_equal(1, cols[2]["scale"])
             assert_equal(2, cols[2]["precision"])
+            
             assert_equal(
                 DBI::Type::Integer.object_id, 
                 DBI::TypeUtil.type_name_to_module(cols[1]["type_name"]).object_id

data/test/dbd/general/test_statement.rb

@@ -1,4 +1,50 @@
 @class = Class.new(DBDConfig.testbase(DBDConfig.current_dbtype)) do
+   
+    def prep_status_statement
+        @sth.finish if (@sth and !@sth.finished?)
+        @sth = @dbh.prepare("select * from names order by age")
+        @sth.raise_error = true
+    end
+
+    def test_status
+        names_rc = 3
+
+        [:fetch, :fetch_hash, :each, :fetch_all].each do |call|
+            assert_raise(DBI::InterfaceError, DBI::NotSupportedError) do
+                prep_status_statement
+                @sth.send(call)
+            end
+        end
+        
+        # for these next three, it doesn't really matter what the args are, it should fail
+        assert_raises(DBI::InterfaceError, DBI::NotSupportedError) do
+            prep_status_statement
+            @sth.fetch_many(1) 
+        end
+
+        assert_raises(DBI::InterfaceError, DBI::NotSupportedError) do
+            prep_status_statement
+            @sth.fetch_scroll(0, 0)
+        end
+
+        assert_raises(DBI::InterfaceError, DBI::NotSupportedError) do
+            prep_status_statement
+            @sth.each { |x| }
+        end
+
+        assert_raises(DBI::InterfaceError) do
+            prep_status_statement
+            @sth.execute
+            2.times { @sth.fetch_all }
+        end
+
+        assert_raises(DBI::InterfaceError) do
+            prep_status_statement
+            @sth.execute
+            # XXX fetch_many won't know it can't fetch anything until the third time around.
+            3.times { @sth.fetch_many(names_rc) }
+        end
+    end
 
     def test_execute
         assert_nothing_raised do

data/test/dbd/general/test_types.rb

@@ -90,9 +90,9 @@
         @sth = @dbh.prepare("select name, age from names order by age")
 
         # can't bind_coltype before execute
-        assert_raise(DBI::InterfaceError) { @sth.bind_coltype(1, DBI::Type::Float) }
+        assert_raises(DBI::InterfaceError) { @sth.bind_coltype(1, DBI::Type::Float) }
         # can't index < 1
-        assert_raise(DBI::InterfaceError) { @sth.bind_coltype(0, DBI::Type::Float) }
+        assert_raises(DBI::InterfaceError) { @sth.bind_coltype(0, DBI::Type::Float) }
     end
 
     def test_noconv

data/test/dbd/postgresql/base.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require 'fileutils'
 
 DBDConfig.set_testbase(:postgresql, Class.new(Test::Unit::TestCase) do

data/test/dbd/postgresql/base.rb.new

@@ -0,0 +1,32 @@
+require 'test/unit'
+require 'fileutils'
+
+DBDConfig.set_testbase(:postgresql, Class.new(Test::Unit::TestCase) do
+        
+        def dbtype
+            "postgresql"
+        end
+
+        def test_base
+            assert_equal(@dbh.driver_name, "Pg")
+            assert_kind_of(DBI::DBD::Pg::Database, @dbh.instance_variable_get(:@handle))
+        end
+
+        def set_base_dbh
+            config = DBDConfig.get_config['postgresql']
+            @dbh = DBI.connect("dbi:Pg:#{config['dbname']}", config['username'], config['password'])
+        end
+
+        def setup
+            set_base_dbh
+            DBDConfig.inject_sql(@dbh, dbtype, "dbd/postgresql/up.sql")
+        end
+
+        def teardown
+            @sth.finish if @sth && !@sth.finished?
+            config = DBDConfig.get_config['postgresql']
+            DBDConfig.inject_sql(@dbh, dbtype, "dbd/postgresql/down.sql")
+            @dbh.disconnect
+        end
+    end
+)

data/test/dbd/postgresql/test_arrays.rb

@@ -138,11 +138,11 @@ class TestPostgresArray < DBDConfig.testbase(:postgresql)
             sth.execute('{1,2,3}')
         end
 
-        assert_raise(DBI::ProgrammingError) do
+        assert_raises(DBI::ProgrammingError) do
             sth.execute('{{1,2,3,4}, {1,2,3}}')
         end
 
-        assert_raise(DBI::ProgrammingError) do
+        assert_raises(DBI::ProgrammingError) do
             sth.execute('{{1,2,3}, {1,2,3,4}}')
         end
 

data/test/dbd/postgresql/test_blob.rb

@@ -25,7 +25,7 @@ class TestPostgresBlob < DBDConfig.testbase(:postgresql)
             index += 1
             assert_equal DATA, @dbh.func(:blob_read, data, DATA.length)
             @dbh.func(:blob_export, data, '/tmp/pg_dbi_read_test')
-            assert_equal DATA, File.readlines('/tmp/pg_dbi_read_test').to_s
+            assert_equal DATA, File.read('/tmp/pg_dbi_read_test')
         end
 
         assert_equal 3, index

data/test/dbd/postgresql/test_ping.rb

@@ -5,6 +5,6 @@ class TestPostgresPing < DBDConfig.testbase(:postgresql)
         assert dbh
         assert dbh.ping
         dbh.disconnect
-        assert_raise(DBI::InterfaceError) { dbh.ping }
+        assert_raises(DBI::InterfaceError) { dbh.ping }
     end
 end

data/test/dbd/postgresql/testdbipg.rb

@@ -50,7 +50,7 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
     def test_binding
         assert(@dbh["pg_native_binding"])
 
-        assert_raise(DBI::ProgrammingError) do
+        assert_raises(DBI::ProgrammingError) do
             @sth = @dbh.prepare("select * from names where age IS NOT ?")
             @sth.execute("NULL")
             @sth.finish
@@ -153,15 +153,15 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
 
   def test_connect_errors
     dbd = nil
-    ex = assert_raise(DBI::OperationalError) {
+    ex = assert_raises(DBI::OperationalError) {
       dbd = DBI::DBD::Pg::Database.new('rubytest:1234', 'jim', nil, {})
     }
-    ex = assert_raise(DBI::OperationalError) {
+    ex = assert_raises(DBI::OperationalError) {
       dbd = DBI::DBD::Pg::Database.new('bad_db_name', 'jim', nil, {})
     }
 
     # this corresponds to the test_parse_url_expected_errors test in tc_dbi.rb
-    assert_raise(DBI::InterfaceError) do
+    assert_raises(DBI::InterfaceError) do
         DBI.connect("dbi:Pg").disconnect
     end
 
@@ -197,7 +197,7 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
 
   def test_bad_command
     dbd = get_dbd
-    assert_raise(DBI::ProgrammingError) {
+    assert_raises(DBI::ProgrammingError) {
       dbd.do("INSERT INTO bad_table (name, age) VALUES('Dave', 12)")
     }
   ensure

data/test/ts_dbd.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+gem 'test-unit'
 # figure out what tests to run
 require 'yaml'
 require 'test/unit/testsuite'
@@ -17,6 +19,16 @@ module Test::Unit::Assertions
     end
 end
 
+class Class
+    def name=(klass_name)
+        @name = klass_name
+    end
+
+    def name
+        return @name || super
+    end
+end
+
 module DBDConfig
     @testbase = { }
     @current_dbtype = nil
@@ -68,6 +80,7 @@ module DBDConfig
 
     def self.set_testbase(klass_name, klass)
         @testbase[klass_name] = klass
+        klass.name = klass_name.to_s
     end
 
     def self.suite
@@ -110,7 +123,7 @@ if __FILE__ == $0
             Dir["dbd/#{dbtype}/test*.rb"].each { |file| require file }
             # run the general tests
             DBDConfig.current_dbtype = dbtype.to_sym
-            Dir["dbd/general/test*.rb"].each { |file| load file; DBDConfig.suite << @class }
+            Dir["dbd/general/test*.rb"].each { |file| load file; @class.name = file; DBDConfig.suite << @class }
         end
     elsif !config["dbtypes"]
         warn "Please see test/DBD_TESTS for information on configuring DBD tests."

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dbd-pg
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
-date: 2008-11-09 00:00:00 -08:00
+  version: 0.3.6
+date: 2008-11-28 00:00:00 -08:00
 summary: PostgreSQL DBI DBD
 require_paths: 
 - lib
@@ -41,6 +41,7 @@ files:
 - test/dbd/postgresql/test_async.rb
 - test/dbd/postgresql/test_blob.rb
 - test/dbd/postgresql/test_transactions.rb
+- test/dbd/postgresql/base.rb.new
 - test/dbd/postgresql/testdbipg.rb
 - test/dbd/postgresql/up.sql
 - test/dbd/postgresql/test_ping.rb