dbd-mysql 0.4.0 → 0.4.1

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.0"
+            VERSION          = "0.4.1"
             DESCRIPTION      = "MySQL DBI DBD, Leverages 'mysql' low-level driver"
 
             MyError = ::MysqlError
@@ -68,13 +68,15 @@ module DBI
                          when ::DBI::Binary
                              obj = obj.to_s.gsub(/\\/) { "\\\\" }
                              obj = obj.to_s.gsub(/'/) { "''" }
-                            "'#{obj}'"
+                             "'#{obj}'"
+                         when ::DateTime
+                             "'#{obj.strftime("%Y-%m-%d %H:%M:%S")}'"
                          when ::Time
-                            "'#{obj.strftime("%H:%M:%S")}'"
+                             "'#{obj.strftime("%H:%M:%S")}'"
                          when ::Date
-                            "'#{obj.strftime("%m/%d/%Y")}'"
+                             "'#{obj.strftime("%Y-%m-%d")}'"
                          when ::NilClass
-                            "NULL"
+                             "NULL"
                          else
                              obj
                          end
@@ -106,6 +108,52 @@ 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.
+    #
+    class Date < DBI::Type::Null
+        def self.parse(obj)
+            obj = super
+            return obj unless obj
+
+            case obj.class
+            when ::Date
+                return obj
+            when ::String
+                return ::Date.strptime(obj, "%Y-%m-%d")
+            else
+                return ::Date.parse(obj.to_s)   if obj.respond_to? :to_s
+                return ::Date.parse(obj.to_str) if obj.respond_to? :to_str
+                return obj
+            end
+        end
+    end
+end
+
 require 'dbd/mysql/driver'
 require 'dbd/mysql/database'
 require 'dbd/mysql/statement'

data/lib/dbd/mysql/database.rb

@@ -87,13 +87,13 @@ module DBI::DBD::Mysql
                 coercion_method = DBI::Type::Varchar
             when 'TYPE_DATE'
                 mysql_type_name = 'DATE'
-                coercion_method = DBI::Type::Timestamp
+                coercion_method = DBI::DBD::Mysql::Type::Date
             when 'TYPE_TIME'
                 mysql_type_name = 'TIME'
                 coercion_method = DBI::Type::Timestamp
             when 'TYPE_DATETIME', 'TYPE_TIMESTAMP'
                 mysql_type_name = 'DATETIME'
-                coercion_method = DBI::Type::Timestamp
+                coercion_method = DBI::DBD::Mysql::Type::Timestamp
             when 'TYPE_CHAR'
                 mysql_type_name = 'TINYINT'    # questionable?
             when 'TYPE_TINY_BLOB'
@@ -206,6 +206,12 @@ module DBI::DBD::Mysql
                     col['precision']      = size
                     col['scale']          = decimal
                     col['default']        = row[4]
+
+                    case col['type_name']
+                    when 'timestamp'
+                        col['dbi_type'] = DBI::DBD::Mysql::Type::Timestamp
+                    end
+
                     col
                 end # collect
             end # execute

data/test/dbd/general/test_database.rb

@@ -127,9 +127,9 @@
         case dbtype 
         when "postgresql"
             tables.reject! { |x| x =~ /^pg_/ }
-            assert_equal %w(array_test bit_test blob_test boolean_test bytea_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 field_types_test names precision_test time_test timestamp_test view_names), tables
         else
-            assert_equal %w(bit_test blob_test boolean_test field_types_test names precision_test time_test timestamp_test view_names), tables
+            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
     end
 

data/test/dbd/mysql/down.sql

@@ -14,4 +14,6 @@ drop table bit_test;
 ---
 drop table field_types_test;
 ---
+drop table db_specific_types_test;
+---
 drop table precision_test;

data/test/dbd/mysql/test_patches.rb

@@ -14,6 +14,46 @@ class TestMysqlPatches < DBDConfig.testbase(:mysql)
         end
     end
 
+    def test_timestamps
+        timestamp = "04-06-1978 06:00:00"
+        datestamp = "04-06-1978"
+        date  = Date.strptime(datestamp, "%m-%d-%Y")
+        stamp = DateTime.strptime(timestamp, "%m-%d-%Y %H:%M:%S")
+        assert_nothing_raised do
+            @sth = @dbh.prepare("insert into db_specific_types_test (ts) values (?)")
+            @sth.execute(stamp)
+            @sth.finish
+        end
+
+        assert_nothing_raised do
+            @sth = @dbh.prepare("select ts from db_specific_types_test where ts is not null")
+            @sth.execute
+
+            newstamp = @sth.fetch[0]
+
+            assert_equal(newstamp, stamp)
+            assert_equal(newstamp.strftime("%m-%d-%Y %H:%M:%S"), timestamp)
+            @sth.finish
+        end
+
+        assert_nothing_raised do
+            @sth = @dbh.prepare("insert into db_specific_types_test (dt) values (?)")
+            @sth.execute(date)
+            @sth.finish
+        end
+
+        assert_nothing_raised do
+            @sth = @dbh.prepare("select dt from db_specific_types_test where dt is not null")
+            @sth.execute
+            
+            newdate = @sth.fetch[0]
+
+            assert_equal(newdate, date)
+            assert_equal(newdate.strftime("%m-%d-%Y"), datestamp)
+            @sth.finish
+        end
+    end
+
     # FIXME when the spec is more solid, this should be in the general tests
     def test_columns
         assert_nothing_raised do

data/test/dbd/mysql/up.sql

@@ -24,3 +24,5 @@ create table timestamp_test (mytimestamp timestamp) Engine=InnoDB;
 create table bit_test (mybit bit) Engine=InnoDB;
 ---
 create table field_types_test (foo integer not null primary key default 1);
+---
+create table db_specific_types_test (ts timestamp, dt date);

metadata

@@ -1,90 +1,81 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
 name: dbd-mysql
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
+date: 2008-09-27 00:00:00 -07: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: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - Erik Hollensbe
 - Christopher Maujean
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-09-02 00:00:00 -07: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_types.rb
 - test/dbd/general/test_database.rb
 - test/dbd/general/test_statement.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/up.sql
-- test/dbd/mysql/base.rb
-- test/dbd/mysql/test_blob.rb
 - lib/dbd/Mysql.rb
-- lib/dbd/mysql/driver.rb
 - lib/dbd/mysql/database.rb
+- lib/dbd/mysql/driver.rb
 - lib/dbd/mysql/statement.rb
 - test/DBD_TESTS
 - README
 - LICENSE
 - ChangeLog
-has_rdoc: true
-homepage: http://www.rubyforge.org/projects/ruby-dbi
-post_install_message: 
+test_files: 
+- test/ts_dbd.rb
 rdoc_options: []
 
-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: 
+extra_rdoc_files: 
+- README
+- LICENSE
+- ChangeLog
+executables: []
+
+extensions: []
+
 requirements: []
 
-rubyforge_project: ruby-dbi
-rubygems_version: 1.2.0
-signing_key: 
-specification_version: 2
-summary: MySQL DBI DBD, Leverages 'mysql' low-level driver
-test_files: 
-- test/ts_dbd.rb
+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: