dbi 0.4.3 → 0.4.4

data/build/Rakefile.dbi.rb

@@ -45,7 +45,7 @@ namespace :dbi do
     spec.files       = gem_files(code_files)
     spec.summary     = 'A vendor independent interface for accessing databases, similar to Perl\'s DBI'
     spec.description = 'A vendor independent interface for accessing databases, similar to Perl\'s DBI'
-    spec.add_dependency 'deprecated', '>= 2.0.0'
+    spec.add_dependency 'deprecated', '= 2.0.1'
 
     build_package_tasks(spec, code_files)
 end

data/lib/dbi.rb

@@ -37,7 +37,7 @@ module DBI; end
 
 begin
     require "rubygems"
-    gem "deprecated"
+    gem "deprecated", "= 2.0.1"
 rescue LoadError
 end
 
@@ -90,7 +90,7 @@ Deprecate.set_action(
 
 #++
 module DBI
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
 
     module DBD # :nodoc:
         API_VERSION = "0.3"

data/lib/dbi/columninfo.rb

@@ -2,7 +2,7 @@ require 'delegate'
 
 begin
     require 'rubygems'
-    gem 'deprecated'
+    gem 'deprecated', "= 2.0.1"
 rescue LoadError => e
 end
 

data/lib/dbi/types.rb

@@ -1,5 +1,6 @@
 require 'time'
 require 'bigdecimal'
+require 'rational'
 
 module DBI
     #
@@ -108,30 +109,24 @@ module DBI
                 # store this before we modify it
                 civil = year, month, day
                 time  = hour, min, sec, usec
-                if month <= 2
-                    month += 12
-                    year  -= 1
-                end
-                y   = year + 4800
-                m   = month - 3
-                jd  = day + (153 * m + 2) / 5 + 365 * y + y / 4 - y / 100 + y / 400 - 32045
-                #fr  = hour / 24.0 + min / 1440.0 + sec / 86400.0
-                # ridiculously, this line does the same thing but twice as fast... :/
-                fr  = ::Time.gm(1970, 1, 1, hour, min, sec, usec).to_f / 86400
-                date = ::DateTime.new!(jd + fr - 0.5, of, ::DateTime::ITALY)
-                prefill_cache date, civil, time
+                
+                date = ::DateTime.civil(year, month, day, hour, min, sec, of)
+                date += usec
+                #prefill_cache date, civil, time
                 date
             end
 
+            # FIXME these methods are broken, I don't know why, and I don't really care right now.
+            #       we shouldn't be playing in datetime's garden anyways.
             if RUBY_VERSION =~ /^1\.8\./
                 def self.prefill_cache date, civil, time
-                		time[3] /= 86400000000.0
+                    time[3] /= 86400000000.0
                     date.instance_variable_set :"@__#{:civil.to_i}__", [civil]
                     date.instance_variable_set :"@__#{:time.to_i}__",  [time]
                 end
             else
                 def self.prefill_cache date, civil, time
-                		time[3] /= 1000000.0
+                    time[3] /= 1000000.0
                     date.instance_variable_get(:@__ca__)[:civil.object_id] = civil
                     date.instance_variable_get(:@__ca__)[:time.object_id] = time
                 end
@@ -143,8 +138,14 @@ module DBI
                 case str
                 when /^(\d{4})-(\d{2})-(\d{2})(?: (\d{2}):(\d{2}):(\d{2})(\.\d+)?)?(?: ([+-]?\d{2}):?(\d{2}))?$/
                     parts = $~[1..-4].map { |s| s.to_i }
-                    parts << $7.to_f * 1000000.0
-                    parts << ($8 ? ($8.to_f * 60 + $9.to_i) / 1440 : 0)
+                    # i feel unclean. if we have fractional seconds, pad the number and then stuff it into a rational.
+                    if $7
+                        frac = $7.to_f * 10000000
+                        parts << Rational(frac.to_i, 864000000000)
+                    else
+                        parts << 0
+                    end
+                    parts << Rational(($8 || 0).to_i * 60 + ($9 || 0).to_i, 1440)
                 else
                     parts = ::Date._parse(str).values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset)
                     # some defaults
@@ -154,8 +155,9 @@ module DBI
                         today ||= ::Time.now.to_a.values_at(5, 4, 3) + [0, 0, 0, 0, 0]
                         parts[i] = today[i]
                     end
-                    parts[6] *= 1000000.0
-                    parts[7] /= 86400.0
+                    parts[6] = parts[6].kind_of?(Rational) ? parts[6] : Rational(parts[6], 1)
+                    parts[6] *= Rational(1, 86400)
+                    parts[7] = Rational(parts[7], 86400)
                 end
                 parts
             end
@@ -167,7 +169,7 @@ module DBI
                 when ::Date
                     return create(obj.year, obj.month, obj.day, 0, 0, 0)
                 when ::Time
-                    return create(obj.year, obj.month, obj.day, obj.hour, obj.min, obj.sec, obj.usec, obj.utc_offset / 86400.0)
+                    return create(obj.year, obj.month, obj.day, obj.hour, obj.min, obj.sec, Rational(obj.usec, 86400000000), Rational(obj.utc_offset, 86400))
                 else
                     obj = super
                     return obj unless obj

data/lib/dbi/typeutil.rb

@@ -94,7 +94,8 @@ DBI::TypeUtil.register_conversion("default") do |obj|
         "'0'"
     when ::Time, ::Date, ::DateTime
         "'#{::DateTime.parse(obj.to_s).strftime("%Y-%m-%dT%H:%M:%S")}'"
-    when ::String
+    when ::String, ::Symbol
+        obj = obj.to_s
         obj = obj.gsub(/\\/) { "\\\\" }
         obj = obj.gsub(/'/) { "''" }
         "'#{obj}'"

data/test/dbi/tc_dbi.rb

@@ -138,7 +138,7 @@ class TC_DBI < Test::Unit::TestCase
    def test_connect
        assert_respond_to(DBI, :connect)
    end
-   
+
    def test_available_drivers
        assert_respond_to(DBI, :available_drivers)
        assert_equal(
@@ -167,7 +167,7 @@ class TC_DBI < Test::Unit::TestCase
 
       # XXX we're looking for a specific exception message here
       assert_nothing_raised do
-          begin 
+          begin
               DBI.send(:parse_url, 'dbi:blah')
           rescue DBI::InterfaceError => e
               assert true

data/test/dbi/tc_types.rb

@@ -135,6 +135,47 @@ class TC_DBI_Type < Test::Unit::TestCase
             "#{md}-2008 10:01:02",
             klass.parse(DateTime.parse("10/11/2008 10:01:02")).strftime("%m-%d-%Y %H:%M:%S")
         )
+
+        # precision tests, related to ticket #27182
+      
+        # iso8601 (bypasses regex)
+        [
+            '2009-09-27T19:41:00-05:00',
+            '2009-09-27T19:41:00.123-05:00'
+        ].each do |string|
+            assert_equal(DateTime.parse(string), klass.parse(string))
+        end
+
+        # offset comparison check
+        assert_equal(
+            DateTime.parse('2009-09-27T19:41:00.123-05:00'),
+            klass.parse('2009-09-28T00:41:00.123+00:00')
+        )
+
+        assert_equal(
+            DateTime.parse('2009-09-28T00:41:00.123+00:00'),
+            klass.parse('2009-09-27T19:41:00.123-05:00')
+        )
+
+        # unix convention (uses regex)
+        
+        [
+            '2009-09-27 19:41:00 -05:00',
+            '2009-09-27 19:41:00.123 -05:00'
+        ].each do |string|
+            assert_equal(DateTime.parse(string), klass.parse(string))
+        end
+
+        # offset comparison check
+        assert_equal(
+            DateTime.parse('2009-09-27 19:41:00.123 -05:00'),
+            klass.parse('2009-09-28 00:41:00.123 +00:00')
+        )
+
+        assert_equal(
+            DateTime.parse('2009-09-28 00:41:00.123 +00:00'),
+            klass.parse('2009-09-27 19:41:00.123 -05:00')
+        )
     end
 end
 
@@ -218,6 +259,7 @@ class TC_DBI_TypeUtil_Custom < Test::Unit::TestCase
     end
 
     def test_custom_fallthrough
+        assert_equal("'foo'", cast(:foo))
         assert_equal("'foo'", cast("foo"))
         assert_equal("'foo''bar'", cast("foo'bar"))
         assert_equal("1", cast(1))

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dbi
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -10,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-13 00:00:00 -04:00
+date: 2010-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: deprecated
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  type: :runtime
+  version_requirements: *id001
 description: A vendor independent interface for accessing databases, similar to Perl's DBI
 email: ruby-dbi-users@rubyforge.org
 executables: 
@@ -35,51 +44,53 @@ extra_rdoc_files:
 - LICENSE
 - ChangeLog
 files: 
-- examples/xmltest.rb
 - examples/test1.pl
 - examples/test1.rb
+- examples/xmltest.rb
 - bin/dbi
 - build/Rakefile.dbi.rb
 - lib/dbi.rb
-- lib/dbi/typeutil.rb
-- lib/dbi/handles.rb
-- lib/dbi/sql_type_constants.rb
-- lib/dbi/exceptions.rb
+- lib/dbi/base_classes/database.rb
+- lib/dbi/base_classes/driver.rb
+- lib/dbi/base_classes/statement.rb
+- lib/dbi/base_classes.rb
+- lib/dbi/binary.rb
 - lib/dbi/columninfo.rb
+- lib/dbi/exceptions.rb
+- lib/dbi/handles/database.rb
+- lib/dbi/handles/driver.rb
+- lib/dbi/handles/statement.rb
+- lib/dbi/handles.rb
+- lib/dbi/row.rb
+- lib/dbi/sql/preparedstatement.rb
 - lib/dbi/sql.rb
-- lib/dbi/utils.rb
+- lib/dbi/sql_type_constants.rb
+- lib/dbi/trace.rb
+- lib/dbi/types.rb
+- lib/dbi/typeutil.rb
+- lib/dbi/utils/date.rb
 - lib/dbi/utils/tableformatter.rb
+- lib/dbi/utils/time.rb
 - lib/dbi/utils/timestamp.rb
-- lib/dbi/utils/date.rb
 - lib/dbi/utils/xmlformatter.rb
-- lib/dbi/utils/time.rb
-- lib/dbi/base_classes.rb
-- lib/dbi/sql/preparedstatement.rb
-- lib/dbi/trace.rb
-- lib/dbi/handles/driver.rb
-- lib/dbi/handles/database.rb
-- lib/dbi/handles/statement.rb
-- lib/dbi/base_classes/driver.rb
-- lib/dbi/base_classes/database.rb
-- lib/dbi/base_classes/statement.rb
-- lib/dbi/binary.rb
-- lib/dbi/types.rb
-- lib/dbi/row.rb
+- lib/dbi/utils.rb
 - test/ts_dbi.rb
-- test/dbi/tc_sqlbind.rb
+- test/dbi/tc_columninfo.rb
+- test/dbi/tc_date.rb
 - test/dbi/tc_dbi.rb
-- test/dbi/tc_statementhandle.rb
 - test/dbi/tc_row.rb
+- test/dbi/tc_sqlbind.rb
+- test/dbi/tc_statementhandle.rb
+- test/dbi/tc_time.rb
 - test/dbi/tc_timestamp.rb
-- test/dbi/tc_columninfo.rb
 - test/dbi/tc_types.rb
-- test/dbi/tc_time.rb
-- test/dbi/tc_date.rb
 - README
 - LICENSE
 - ChangeLog
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/ruby-dbi
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -89,20 +100,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: A vendor independent interface for accessing databases, similar to Perl's DBI
 test_files: 
 - test/ts_dbi.rb