dbd-mysql 0.4.2 → 0.4.3

data/lib/dbd/Mysql.rb

@@ -49,7 +49,7 @@ module DBI
         # Only things that extend DBI's results are documented.
         #
         module Mysql
-            VERSION          = "0.4.2"
+            VERSION          = "0.4.3"
             DESCRIPTION      = "MySQL DBI DBD, Leverages 'mysql' low-level driver"
 
             MyError = ::MysqlError
@@ -109,28 +109,6 @@ module DBI::DBD::Mysql::Util
 end # module Util
 
 module DBI::DBD::Mysql::Type
-    #
-    # Custom handling for TIMESTAMP and DATETIME types in MySQL. See DBI::Type
-    # for more information.
-    #
-    class Timestamp < DBI::Type::Null
-        def self.parse(obj)
-            obj = super
-            return obj unless obj
-
-            case obj.class
-            when ::DateTime
-                return obj
-            when ::String
-                return ::DateTime.strptime(obj, "%Y-%m-%d %H:%M:%S")
-            else
-                return ::DateTime.parse(obj.to_s)   if obj.respond_to? :to_s
-                return ::DateTime.parse(obj.to_str) if obj.respond_to? :to_str
-                return obj
-            end
-        end
-    end
-
     #
     # Custom handling for DATE types in MySQL. See DBI::Type for more
     # information.

data/lib/dbd/mysql/database.rb

@@ -93,7 +93,7 @@ module DBI::DBD::Mysql
                 coercion_method = DBI::Type::Timestamp
             when 'TYPE_DATETIME', 'TYPE_TIMESTAMP'
                 mysql_type_name = 'DATETIME'
-                coercion_method = DBI::DBD::Mysql::Type::Timestamp
+                coercion_method = DBI::Type::Timestamp
             when 'TYPE_CHAR'
                 mysql_type_name = 'TINYINT'    # questionable?
             when 'TYPE_TINY_BLOB'
@@ -149,6 +149,14 @@ module DBI::DBD::Mysql
             error(err)
         end
 
+        def database_name
+            sth = Statement.new(self, @handle, "select DATABASE()", @mutex)
+            sth.execute
+            res = sth.fetch
+            sth.finish
+            return res[0]
+        end
+
         def ping
             begin
                 @handle.ping
@@ -209,7 +217,7 @@ module DBI::DBD::Mysql
 
                     case col['type_name']
                     when 'timestamp'
-                        col['dbi_type'] = DBI::DBD::Mysql::Type::Timestamp
+                        col['dbi_type'] = DBI::Type::Timestamp
                     end
 
                     col

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
@@ -30,7 +54,7 @@
             end
 
             assert_equal(
-                DBI::Type::Varchar.object_id, 
+                DBI::Type::Varchar.object_id,
                 DBI::TypeUtil.type_name_to_module(cols[0]["type_name"]).object_id
             )
 
@@ -40,8 +64,9 @@
             assert(cols[1]["nullable"])
             assert_equal(1, cols[2]["scale"])
             assert_equal(2, cols[2]["precision"])
+
             assert_equal(
-                DBI::Type::Integer.object_id, 
+                DBI::Type::Integer.object_id,
                 DBI::TypeUtil.type_name_to_module(cols[1]["type_name"]).object_id
             )
 
@@ -52,7 +77,7 @@
             assert_equal(1, cols[2]["scale"])
             assert_equal(2, cols[2]["precision"])
             assert_equal(
-                DBI::Type::Decimal.object_id, 
+                DBI::Type::Decimal.object_id,
                 DBI::TypeUtil.type_name_to_module(cols[2]["type_name"]).object_id
             )
 
@@ -63,7 +88,7 @@
             assert_equal(6, cols[3]["scale"])
             assert_equal(30, cols[3]["precision"])
             assert_equal(
-                DBI::Type::Decimal.object_id, 
+                DBI::Type::Decimal.object_id,
                 DBI::TypeUtil.type_name_to_module(cols[3]["type_name"]).object_id
             )
 
@@ -145,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
@@ -164,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

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/mysql/test_new_methods.rb

@@ -0,0 +1,7 @@
+class TestNewMethods < DBDConfig.testbase(:mysql)
+    def test_database_name
+        assert_nothing_raised do
+            assert_equal DBDConfig.get_config[dbtype]['dbname'], @dbh.database_name
+        end
+    end
+end

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,43 +1,58 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: dbd-mysql
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
-date: 2008-11-09 00:00:00 -08:00
-summary: MySQL DBI DBD, Leverages 'mysql' low-level driver
-require_paths: 
-- lib
-email: ruby-dbi-users@rubyforge.org
-homepage: http://www.rubyforge.org/projects/ruby-dbi
-rubyforge_project: ruby-dbi
-description: MySQL DBI DBD, Leverages 'mysql' low-level driver
-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.4.3
 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: 
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: MySQL DBI DBD, Leverages 'mysql' low-level driver
+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/mysql/base.rb
-- test/dbd/mysql/down.sql
-- test/dbd/mysql/test_blob.rb
 - test/dbd/mysql/test_patches.rb
+- test/dbd/mysql/down.sql
 - test/dbd/mysql/up.sql
+- test/dbd/mysql/test_new_methods.rb
+- test/dbd/mysql/test_blob.rb
 - lib/dbd/Mysql.rb
 - lib/dbd/mysql/database.rb
 - lib/dbd/mysql/driver.rb
@@ -46,36 +61,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: 
-- !ruby/object:Gem::Dependency 
-  name: mysql
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+rubyforge_project: ruby-dbi
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: MySQL DBI DBD, Leverages 'mysql' low-level driver
+test_files: 
+- test/ts_dbd.rb