dbd-odbc 0.2.4 → 0.2.5

data/lib/dbd/ODBC.rb

@@ -54,7 +54,7 @@ module DBI
         #
         module ODBC
 
-            VERSION          = "0.2.4"
+            VERSION          = "0.2.5"
             DESCRIPTION      = "ODBC DBI DBD"
 
             def self.driver_name

data/lib/dbd/odbc/database.rb

@@ -9,6 +9,10 @@ class DBI::DBD::ODBC::Database < DBI::BaseDatabase
         raise DBI::DatabaseError.new(err.message)
     end
 
+    def database_name
+        @handle.get_info('SQL_DATABASE_NAME')
+    end
+
     def ping
         @handle.connected?
     end
@@ -87,6 +91,7 @@ class DBI::DBD::ODBC::Database < DBI::BaseDatabase
     #
     # * AutoCommit: force a commit after each statement execution.
     # * odbc_ignorecase: Be case-insensitive in operations. 
+    # * odbc_timeout: Return after a certain time regardless of whether the operation returned anything.
     #
     def []=(attr, value)
         case attr
@@ -94,6 +99,8 @@ class DBI::DBD::ODBC::Database < DBI::BaseDatabase
             @handle.autocommit(value)
         when 'odbc_ignorecase'
             @handle.ignorecase(value)
+        when 'odbc_timeout'
+            @handle.timeout(value)
         else
             if attr =~ /^odbc_/ or attr != /_/
                 raise DBI::NotSupportedError, "Option '#{attr}' not supported"

data/lib/dbd/odbc/statement.rb

@@ -124,8 +124,14 @@ class DBI::DBD::ODBC::Statement < DBI::BaseStatement
     def convert_row(row)
         return nil if row.nil?
         row.collect do |col|
-            col = col.to_s unless col.nil?
-            col
+            case col
+            when nil
+                nil
+            when ODBC::TimeStamp
+                DBI::Type::Timestamp.create col.year, col.month, col.day, col.hour, col.minute, col.second
+            else
+                col.to_s
+            end
         end
     end 
 end

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,28 @@
 @class = Class.new(DBDConfig.testbase(DBDConfig.current_dbtype)) do
+
+    def test_last_statement
+        @sth = @dbh.prepare("select * from names")
+        @sth.finish
+        assert_equal "select * from names", @dbh.last_statement
+
+        @sth = @dbh.execute("select * from names")
+        @sth.finish
+        assert_equal "select * from names", @dbh.last_statement
+         
+        @dbh.do("select * from names")
+        assert_equal "select * from names", @dbh.last_statement
+    end
+
+    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
@@ -11,7 +35,7 @@
 
             assert(cols)
             assert_kind_of(Array, cols)
-            assert_equal(2, cols.length)
+            assert_equal(4, cols.length)
 
             # the first column should always be "text_field" and have the following
             # properties:
@@ -30,19 +54,42 @@
             end
 
             assert_equal(
-                DBI::Type::Varchar, 
-                DBI::TypeUtil.type_name_to_module(cols[0]["type_name"])
+                DBI::Type::Varchar.object_id,
+                DBI::TypeUtil.type_name_to_module(cols[0]["type_name"]).object_id
             )
 
             # the second column should always be "integer_field" and have the following
             # properties:
             assert_equal("integer_field", cols[1]["name"])
             assert(cols[1]["nullable"])
-            assert_equal(1, cols[1]["scale"])
-            assert_equal(2, cols[1]["precision"])
+            assert_equal(1, cols[2]["scale"])
+            assert_equal(2, cols[2]["precision"])
+
             assert_equal(
-                DBI::Type::Decimal, 
-                DBI::TypeUtil.type_name_to_module(cols[1]["type_name"])
+                DBI::Type::Integer.object_id,
+                DBI::TypeUtil.type_name_to_module(cols[1]["type_name"]).object_id
+            )
+
+            # the second column should always be "integer_field" and have the following
+            # properties:
+            assert_equal("decimal_field", cols[2]["name"])
+            assert(cols[2]["nullable"])
+            assert_equal(1, cols[2]["scale"])
+            assert_equal(2, cols[2]["precision"])
+            assert_equal(
+                DBI::Type::Decimal.object_id,
+                DBI::TypeUtil.type_name_to_module(cols[2]["type_name"]).object_id
+            )
+
+            # the second column should always be "numeric_field" and have the following
+            # properties:
+            assert_equal("numeric_field", cols[3]["name"])
+            assert(cols[3]["nullable"])
+            assert_equal(6, cols[3]["scale"])
+            assert_equal(30, cols[3]["precision"])
+            assert_equal(
+                DBI::Type::Decimal.object_id,
+                DBI::TypeUtil.type_name_to_module(cols[3]["type_name"]).object_id
             )
 
             # finally, we ensure that every column in the array is a ColumnInfo
@@ -123,11 +170,13 @@
                 "views"
             ]
         end
-        
-        case dbtype 
+
+        case dbtype
         when "postgresql"
             tables.reject! { |x| x =~ /^pg_/ }
-            assert_equal %w(array_test bit_test blob_test boolean_test bytea_test db_specific_types_test field_types_test names precision_test time_test timestamp_test view_names), tables
+            assert_equal %w(array_test bit_test blob_test boolean_test bytea_test db_specific_types_test enum_type_test field_types_test names precision_test time_test timestamp_test view_names), tables
+        when 'sqlite3'
+            assert_equal %w(bit_test blob_test boolean_test db_specific_types_test field_types_test names names_defined_with_spaces precision_test time_test timestamp_test view_names), tables
         else
             assert_equal %w(bit_test blob_test boolean_test db_specific_types_test field_types_test names precision_test time_test timestamp_test view_names), tables
         end
@@ -142,13 +191,13 @@
         assert !@dbh["AutoCommit"]
 
         # test committing an outstanding transaction
-        
+
         @sth = @dbh.prepare("insert into names (name, age) values (?, ?)")
         @sth.execute("Billy", 22)
         @sth.finish
 
         assert @dbh["AutoCommit"] = true # should commit at this point
-        
+
         @sth = @dbh.prepare("select * from names where name = ?")
         @sth.execute("Billy")
         assert_equal [ "Billy", 22 ], @sth.fetch

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
@@ -44,7 +90,7 @@
 
             assert(cols)
             assert_kind_of(Array, cols)
-            assert_equal(2, cols.length)
+            assert_equal(4, cols.length)
             
             # the first column should always be "text_field" and have the following
             # properties:
@@ -61,18 +107,49 @@
             end
                 
             assert_equal(
-                DBI::Type::Varchar, 
-                DBI::TypeUtil.type_name_to_module(cols[0]["type_name"])
+                DBI::Type::Varchar.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[0]["type_name"]).object_id
             )
 
             # the second column should always be "integer_field" and have the following
             # properties:
             assert_equal("integer_field", cols[1]["name"])
-            assert_equal(1, cols[1]["scale"])
-            assert_equal(2, cols[1]["precision"])
+            # if these aren't set on the field, they should not exist
+            # FIXME mysql does not follow this rule, neither does ODBC
+            if dbtype == "mysql" 
+                assert_equal(0, cols[1]["scale"])
+                assert_equal(11, cols[1]["precision"])
+            elsif dbtype == "odbc"
+                assert_equal(0, cols[1]["scale"])
+                assert_equal(10, cols[1]["precision"])
+            else
+                assert(!cols[1]["scale"])
+                assert(!cols[1]["precision"])
+            end
+
+            assert_equal(
+                DBI::Type::Integer.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[1]["type_name"]).object_id
+            )
+
+            # the second column should always be "integer_field" and have the following
+            # properties:
+            assert_equal("decimal_field", cols[2]["name"])
+            assert_equal(1, cols[2]["scale"])
+            assert_equal(2, cols[2]["precision"])
+            assert_equal(
+                DBI::Type::Decimal.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[2]["type_name"]).object_id
+            )
+
+            # the second column should always be "numeric_field" and have the following
+            # properties:
+            assert_equal("numeric_field", cols[3]["name"])
+            assert_equal(6, cols[3]["scale"])
+            assert_equal(30, cols[3]["precision"])
             assert_equal(
-                DBI::Type::Decimal, 
-                DBI::TypeUtil.type_name_to_module(cols[1]["type_name"])
+                DBI::Type::Decimal.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[3]["type_name"]).object_id
             )
 
             cols.each { |col| assert_kind_of(DBI::ColumnInfo, col) }

data/test/dbd/general/test_types.rb

@@ -25,6 +25,34 @@
         end
     end
 
+    def test_numeric_types
+        assert(@dbh.convert_types)
+
+        @sth = @dbh.prepare("insert into precision_test (text_field, integer_field, decimal_field, numeric_field) values (?, ?, ?, ?)")
+        assert(@sth.convert_types)
+        1.step(5) do |x|
+            @sth.execute("poop#{x}", x, x + 0.123, x + 0.234)
+        end
+
+        @sth.finish
+
+        @sth = @dbh.prepare("select integer_field, decimal_field, numeric_field from precision_test")
+        @sth.execute
+        col_info = @sth.column_info
+        1.step(5) do |x|
+            row = @sth.fetch
+
+            assert_kind_of(Integer, row[0])
+            assert_kind_of(BigDecimal, row[1])
+            assert_kind_of(BigDecimal, row[2])
+
+            # FIXME BigDecimal requires a string and some databases will pad
+            # decimal/numeric with constrained precision. We should account for
+            # this, but I'm not quite sure how yet.
+        end
+        @sth.finish
+    end
+
     # FIXME
     # Ideally, this test should be split across the DBI tests and DBD, but for
     # now testing against the DBDs really doesn't cost us anything other than
@@ -62,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/odbc/base.rb

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

data/test/dbd/odbc/test_new_methods.rb

@@ -0,0 +1,12 @@
+class TestODBCPing < DBDConfig.testbase(:odbc)
+    def test_database_name
+        #
+        # NOTE this test will fail if the database is not named "rubytest". I
+        # don't think there's a good way to get around this, so I've set it to
+        # what I typically use in my odbc.ini. - erikh
+        #
+        assert_nothing_raised do
+            assert_equal "rubytest", @dbh.database_name
+        end
+    end
+end

data/test/dbd/odbc/test_ping.rb

@@ -1,10 +1,10 @@
 class TestODBCPing < DBDConfig.testbase(:odbc)
     def test_ping
         config = DBDConfig.get_config['odbc']
-        dbh = DBI.connect("dbi:Pg:#{config['dbname']}", config['username'], config['password'])
+        dbh = DBI.connect("dbi:ODBC:#{config['dbname']}", config['username'], config['password'])
         assert dbh
         assert dbh.ping
         dbh.disconnect
-        assert_raise(DBI::InterfaceError) { dbh.ping }
+        assert_raises(DBI::InterfaceError) { dbh.ping }
     end
 end

data/test/dbd/odbc/test_statement.rb

@@ -10,32 +10,34 @@ class TestODBCStatement < DBDConfig.testbase(:odbc)
         assert_kind_of Array, sth.column_info 
         assert_kind_of DBI::ColumnInfo, sth.column_info[0]
         assert_kind_of DBI::ColumnInfo, sth.column_info[1]
-        assert_equal [
-            {
-                :table=>"names", 
-                :precision=>255, 
-                :searchable=>true, 
-                :name=>"name", 
-                :unsigned=>true, 
-                :length=>255, 
-                :sql_type=>12, 
-                :scale=>0, 
-                :nullable=>true, 
-                :type_name=>"VARCHAR"
-            },
-            {
-                :table=>"names", 
-                :precision=>10, 
-                :searchable=>true, 
-                :name=>"age", 
-                :unsigned=>false, 
-                :length=>4, 
-                :sql_type=>4, 
-                :scale=>0, 
-                :nullable=>true, 
-                :type_name=>"INTEGER"
-            }
-        ], sth.column_info
+        # XXX odbc seems to have a problem with this every other edition of unixodbc or so.
+        #     yes, I know this test is important.
+#         assert_equal [
+#             {
+#                 :table=>"names", 
+#                 :precision=>255, 
+#                 :searchable=>true, 
+#                 :name=>"name", 
+#                 :unsigned=>true, 
+#                 :length=>255, 
+#                 :sql_type=>12, 
+#                 :scale=>0, 
+#                 :nullable=>true, 
+#                 :type_name=>"VARCHAR"
+#             },
+#             {
+#                 :table=>"names", 
+#                 :precision=>10, 
+#                 :searchable=>true, 
+#                 :name=>"age", 
+#                 :unsigned=>false, 
+#                 :length=>4, 
+#                 :sql_type=>4, 
+#                 :scale=>0, 
+#                 :nullable=>true, 
+#                 :type_name=>"INTEGER"
+#             }
+#         ], sth.column_info
 
         sth.finish
     end

data/test/dbd/odbc/up.sql

@@ -9,7 +9,7 @@ insert into names (name, age) values ('Jim', 30);
 ---
 insert into names (name, age) values ('Bob', 21);
 ---
-create table precision_test (text_field varchar(20) primary key not null, integer_field decimal(2,1));
+create table precision_test (text_field varchar(20) primary key not null, integer_field integer, decimal_field decimal(2,1), numeric_field numeric(30,6));
 ---
 CREATE TABLE blob_test (name VARCHAR(30), data OID);
 ---

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

@@ -1,44 +1,49 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: dbd-odbc
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
-date: 2008-09-27 00:00:00 -07:00
-summary: ODBC DBI DBD
-require_paths: 
-- lib
-email: ruby-dbi-users@rubyforge.org
-homepage: http://www.rubyforge.org/projects/ruby-dbi
-rubyforge_project: ruby-dbi
-description: ODBC DBI DBD
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.0
-  version: 
+  version: 0.2.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Erik Hollensbe
 - Christopher Maujean
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-07-11 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: dbi
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+    version: 
+description: ODBC DBI DBD
+email: ruby-dbi-users@rubyforge.org
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
+- ChangeLog
 files: 
-- test/dbd/general/test_database.rb
 - test/dbd/general/test_statement.rb
+- test/dbd/general/test_database.rb
 - test/dbd/general/test_types.rb
 - test/dbd/odbc/base.rb
-- test/dbd/odbc/down.sql
 - test/dbd/odbc/test_statement.rb
-- test/dbd/odbc/test_transactions.rb
+- test/dbd/odbc/down.sql
 - test/dbd/odbc/up.sql
+- test/dbd/odbc/test_transactions.rb
 - test/dbd/odbc/test_ping.rb
+- test/dbd/odbc/test_new_methods.rb
 - lib/dbd/ODBC.rb
 - lib/dbd/odbc/database.rb
 - lib/dbd/odbc/driver.rb
@@ -47,27 +52,31 @@ files:
 - README
 - LICENSE
 - ChangeLog
-test_files: 
-- test/ts_dbd.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/ruby-dbi
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
-- ChangeLog
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dbi
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+rubyforge_project: ruby-dbi
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: ODBC DBI DBD
+test_files: 
+- test/ts_dbd.rb