rdbi-driver-odbc 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,6 +1,23 @@
+RDBI-DRIVER-ODBC 0.1.1
+======================
+
+Features
+--------
+ - Add specs for all classes
+ - Update RDBI::Column information
+ - Automatically convert ::ODBC::Date, ::ODBC::Time and ::ODBC::TimeStamp
+   objects to ::Date, ::Time, ::TimeStamp
+
+Bugfixes
+--------
+ - Call #super at end of Statement#finish to cleanup
+ - Return nil when Cursor#next_row is called and no more rows to fetch
+ - Return +all+ remaning rows from Cursor#rest
+
+
 RDBI-DRIVER-ODBC 0.1.0
 ======================
 
 Features
 --------
-  - Initial release. Please experiment and report and bugs you find.
+ - Initial release. Please experiment and report and bugs you find.

data/lib/rdbi/driver/odbc.rb

@@ -2,6 +2,7 @@ require 'rdbi'
 require 'rubygems'
 gem 'ruby-odbc', '= 0.99992'
 require 'odbc'
+require 'time'
 
 class RDBI::Driver::ODBC < RDBI::Driver
   def initialize(*args)
@@ -10,6 +11,37 @@ class RDBI::Driver::ODBC < RDBI::Driver
 end
 
 class RDBI::Driver::ODBC < RDBI::Driver
+
+  SQL_TYPES = {
+      1 => {:type => "CHAR",           :ruby_type => :default},
+      2 => {:type => "NUMERIC",        :ruby_type => :decimal},
+      3 => {:type => "DECIMAL",        :ruby_type => :decimal},
+      4 => {:type => "INTEGER",        :ruby_type => :integer},
+      5 => {:type => "SMALLINT",       :ruby_type => :integer},
+      6 => {:type => "FLOAT",          :ruby_type => :decimal},
+      7 => {:type => "REAL",           :ruby_type => :decimal},
+      8 => {:type => "DOUBLE",         :ruby_type => :decimal},
+      9 => {:type => "DATE",           :ruby_type => :date},
+     10 => {:type => "TIME",           :ruby_type => :time},
+     11 => {:type => "TIMESTAMP",      :ruby_type => :timestamp},
+     12 => {:type => "VARCHAR",        :ruby_type => :default},
+     13 => {:type => "BOOLEAN",        :ruby_type => :boolean},
+     91 => {:type => "DATE",           :ruby_type => :date},
+     92 => {:type => "TIME",           :ruby_type => :time},
+     93 => {:type => "TIMESTAMP",      :ruby_type => :timestamp},
+    100 => {:type => nil,              :ruby_type => :default},
+     -1 => {:type => "LONG VARCHAR",   :ruby_type => :default},
+     -2 => {:type => "BINARY",         :ruby_type => :default},
+     -3 => {:type => "VARBINARY",      :ruby_type => :default},
+     -4 => {:type => "LONG VARBINARY", :ruby_type => :default},
+     -5 => {:type => "BIGINT",         :ruby_type => :integer},
+     -6 => {:type => "TINYINT",        :ruby_type => :integer},
+     -7 => {:type => "BIT",            :ruby_type => :default},
+     -8 => {:type => "CHAR",           :ruby_type => :default},
+    -10 => {:type => "BLOB",           :ruby_type => :default},
+    -11 => {:type => "CLOB",           :ruby_type => :default},
+  }
+
   class Database < RDBI::Database
 
     attr_accessor :handle
@@ -77,6 +109,7 @@ class RDBI::Driver::ODBC < RDBI::Driver
     end
 
     def next_row
+      return nil if last_row?
       val = @rs[@index]
       @index += 1
       val
@@ -99,7 +132,7 @@ class RDBI::Driver::ODBC < RDBI::Driver
     end
 
     def rest
-      @rs[@index+1..-1]
+      @rs[@index..-1]
     end
 
     def all
@@ -149,6 +182,21 @@ class RDBI::Driver::ODBC < RDBI::Driver
 
       @handle = @dbh.handle.prepare(query)
       @output_type_map = RDBI::Type.create_type_hash(RDBI::Type::Out)
+
+      @output_type_map[:date] = TypeLib::Filter.new(
+        proc{|obj| obj.is_a?(::ODBC::Date)},
+        proc{|obj| Date.parse(obj.to_s)}
+      )
+
+      @output_type_map[:time] = TypeLib::Filter.new(
+        proc{|obj| obj.is_a?(::ODBC::Time)},
+        proc{|obj| Time.parse(obj.to_s)}
+      )
+
+      @output_type_map[:timestamp] = TypeLib::Filter.new(
+        proc{|obj| obj.is_a?(::ODBC::TimeStamp)},
+        proc{|obj| DateTime.parse(obj.to_s)}
+      )
     end
 
     def new_execution(*binds)
@@ -156,7 +204,13 @@ class RDBI::Driver::ODBC < RDBI::Driver
 
       columns = @handle.columns(true).collect do |col|
         newcol = RDBI::Column.new
-        newcol.name = col.name.to_sym
+        newcol.name        = col.name.to_sym
+        newcol.type        = SQL_TYPES[col.type][:type]
+        newcol.ruby_type   = SQL_TYPES[col.type][:ruby_type]
+        newcol.precision   = col.precision
+        newcol.scale       = col.scale
+        newcol.nullable    = col.nullable
+        newcol.table       = col.table
         newcol
       end
 
@@ -165,6 +219,7 @@ class RDBI::Driver::ODBC < RDBI::Driver
 
     def finish
       @handle.drop
+      super
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Shane Emmons
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -05:00
+date: 2010-12-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,9 +46,23 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rdbi-dbrc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -58,11 +72,11 @@ dependencies:
         - 2
         version: "2.2"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -71,7 +85,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: This gem gives you the ability to query ODBC connections with RDBI.
 email: semmons99@gmail.com
 executables: []