Removed DBI dependency

Author: ebryn

activerecord-sqlserver-adapter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "activerecord-sqlserver-adapter"
-  s.version  = "2.3.1"
+  s.version  = "2.3.2.mmi"
   s.date     = "2009-09-10"
   s.summary  = "SQL Server 2000, 2005 and 2008 Adapter For Rails."
   s.email    = "ken@metaskills.net"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     "lib/activerecord-sqlserver-adapter.rb",
     "lib/active_record/connection_adapters/sqlserver_adapter.rb",
     "lib/active_record/connection_adapters/sqlserver_adapter/core_ext/active_record.rb",
-    "lib/active_record/connection_adapters/sqlserver_adapter/core_ext/dbi.rb" ]
+    "lib/active_record/connection_adapters/sqlserver_adapter/core_ext/odbc.rb" ]
   s.test_files = [
     "test/cases/aaaa_create_tables_test_sqlserver.rb",
     "test/cases/adapter_test_sqlserver.rb",

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -1,6 +1,6 @@
 require 'active_record/connection_adapters/abstract_adapter'
-require_library_or_gem 'dbi' unless defined?(DBI)
-require 'active_record/connection_adapters/sqlserver_adapter/core_ext/dbi'
+require_library_or_gem 'odbc' unless defined?(ODBC)
+require File.dirname(__FILE__)+'/sqlserver_adapter/core_ext/odbc'
 require 'active_record/connection_adapters/sqlserver_adapter/core_ext/active_record'
 require 'base64'
 
@@ -10,20 +10,11 @@ class Base
 
     def self.sqlserver_connection(config) #:nodoc:
       config.symbolize_keys!
-      mode        = config[:mode] ? config[:mode].to_s.upcase : 'ADO'
       username    = config[:username] ? config[:username].to_s : 'sa'
       password    = config[:password] ? config[:password].to_s : ''
-      if mode == "ODBC"
-        raise ArgumentError, "Missing DSN. Argument ':dsn' must be set in order for this adapter to work." unless config.has_key?(:dsn)
-        dsn       = config[:dsn]
-        driver_url = "DBI:ODBC:#{dsn}"
-      else
-        raise ArgumentError, "Missing Database. Argument ':database' must be set in order for this adapter to work." unless config.has_key?(:database)
-        database  = config[:database]
-        host      = config[:host] ? config[:host].to_s : 'localhost'
-        driver_url = "DBI:ADO:Provider=SQLOLEDB;Data Source=#{host};Initial Catalog=#{database};User ID=#{username};Password=#{password};"
-      end
-      ConnectionAdapters::SQLServerAdapter.new(logger, [driver_url, username, password])
+      raise ArgumentError, "Missing DSN. Argument ':dsn' must be set in order for this adapter to work." unless config.has_key?(:dsn)
+      dsn       = config[:dsn]
+      ConnectionAdapters::SQLServerAdapter.new(logger, [dsn, username, password])
     end
 
     protected
@@ -147,53 +138,28 @@ def simplified_datetime
 
     end #SQLServerColumn
 
-    # In ADO mode, this adapter will ONLY work on Windows systems, since it relies on 
-    # Win32OLE, which, to my knowledge, is only available on Windows.
-    #
-    # This mode also relies on the ADO support in the DBI module. If you are using the
-    # one-click installer of Ruby, then you already have DBI installed, but the ADO module 
-    # is *NOT* installed. You will need to get the latest source distribution of Ruby-DBI 
-    # from http://ruby-dbi.sourceforge.net/ unzip it, and copy the file from 
-    # <tt>src/lib/dbd_ado/ADO.rb</tt> to <tt>X:/Ruby/lib/ruby/site_ruby/1.8/DBD/ADO/ADO.rb</tt>
-    # 
-    # You will more than likely need to create the ADO directory. Once you've installed 
-    # that file, you are ready to go.
-    # 
     # In ODBC mode, the adapter requires the ODBC support in the DBI module which requires
     # the Ruby ODBC module. Ruby ODBC 0.996 was used in development and testing,
     # and it is available at http://www.ch-werner.de/rubyodbc/
     #
     # Options:
     #
-    # * <tt>:mode</tt>          -- ADO or ODBC. Defaults to ADO.
     # * <tt>:username</tt>      -- Defaults to sa.
     # * <tt>:password</tt>      -- Defaults to empty string.
-    # * <tt>:windows_auth</tt>  -- Defaults to "User ID=#{username};Password=#{password}"
-    #
-    # ADO specific options:
-    #
-    # * <tt>:host</tt>          -- Defaults to localhost.
-    # * <tt>:database</tt>      -- The name of the database. No default, must be provided.
-    # * <tt>:windows_auth</tt>  -- Use windows authentication instead of username/password.
-    #
-    # ODBC specific options:
-    #
     # * <tt>:dsn</tt>           -- Defaults to nothing.
     # 
     class SQLServerAdapter < AbstractAdapter
 
       ADAPTER_NAME            = 'SQLServer'.freeze
-      VERSION                 = '2.3'.freeze
+      VERSION                 = '2.4-mmi'.freeze
       DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS      = [2000,2005,2008].freeze
       LIMITABLE_TYPES         = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
 
-      LOST_CONNECTION_EXCEPTIONS = [DBI::DatabaseError, DBI::InterfaceError]
+      LOST_CONNECTION_EXCEPTIONS = [ODBC::Error] #[DBI::DatabaseError, DBI::InterfaceError]
       LOST_CONNECTION_MESSAGES = [
-        'Communication link failure',
-        'Read from the server failed',
-        'Write to the server failed',
-        'Database connection was already closed']
+        'Invalid handle'
+      ]
 
       cattr_accessor :native_text_database_type, :native_binary_database_type, :native_string_database_type,
                      :log_info_schema_queries, :enable_default_unicode_types, :auto_connect
@@ -349,7 +315,7 @@ def disable_referential_integrity(&block)
       # CONNECTION MANAGEMENT ====================================#
 
       def active?
-        raw_connection.execute("SELECT 1").finish
+        raw_connection.run("SELECT 1").drop
         true
       rescue *LOST_CONNECTION_EXCEPTIONS
         false
@@ -366,7 +332,7 @@ def disconnect!
       end
 
       def finish_statement_handle(handle)
-        handle.finish if handle && handle.respond_to?(:finish) && !handle.finished?
+        handle.drop if handle && handle.respond_to?(:drop) && !handle.finished?
         handle
       end
 
@@ -771,15 +737,15 @@ def remove_database_connections_and_rollback(name)
       # CONNECTION MANAGEMENT ====================================#
 
       def connect
-        driver_url, username, password = @connection_options
-        @connection = DBI.connect(driver_url, username, password)
+        dsn, username, password = @connection_options
+        @connection = ODBC.connect(dsn, username, password)
         configure_connection
       rescue
         raise unless @auto_connecting
       end
 
       def configure_connection
-        raw_connection['AutoCommit'] = true
+        # raw_connection['AutoCommit'] = true
       end
 
       def with_auto_reconnect
@@ -839,9 +805,9 @@ def info_schema_query
       def raw_execute(sql, name = nil, &block)
         log(sql, name) do
           if block_given?
-            with_auto_reconnect { raw_connection.execute(sql) { |handle| yield(handle) } }
+            with_auto_reconnect { raw_connection.run_block(sql) { |handle| yield(handle) } }
           else
-            with_auto_reconnect { raw_connection.execute(sql) }
+            with_auto_reconnect { raw_connection.run(sql) }
           end
         end
       end
@@ -861,12 +827,12 @@ def do_execute(sql,name=nil)
 
       def raw_select(sql, name = nil)
         handle = raw_execute(sql,name)
-        fields = handle.column_names
+        fields = handle.columns(true).map{|c|c.name}
         results = handle_as_array(handle)
         rows = results.inject([]) do |rows,row|
           row.each_with_index do |value, i|
             # DEPRECATED in DBI 0.4.0 and above. Remove when 0.2.2 and lower is no longer supported.
-            if value.is_a? DBI::Timestamp
+            if value.is_a? ODBC::TimeStamp
               row[i] = value.to_sqlserver_string
             end
           end

lib/active_record/connection_adapters/sqlserver_adapter/core_ext/dbi.rb

@@ -0,0 +1,44 @@
+
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServerCoreExtensions
+      module ODBC
+        module TimeStamp
+          def to_sqlserver_string
+            date, time, nanoseconds = to_s.split(' ')
+            "#{date} #{time}.#{sprintf("%03d",nanoseconds.to_i/1000000)}"
+          end
+        end
+        
+        module Statement
+          def finished?
+            begin
+              connected?
+              false
+            rescue ::ODBC::Error => e
+              true
+            end
+          end
+          
+        end
+
+        module Database
+          def run_block(*args)
+            yield sth = run(*args)
+            sth.drop
+          end
+        end
+      end
+    end
+  end
+end
+
+if defined?(ODBC::TimeStamp)
+  ODBC::TimeStamp.send :include, ActiveRecord::ConnectionAdapters::SQLServerCoreExtensions::ODBC::TimeStamp
+end
+if defined?(ODBC::Statement)
+  ODBC::Statement.send :include, ActiveRecord::ConnectionAdapters::SQLServerCoreExtensions::ODBC::Statement
+end
+if defined?(ODBC::Database)
+  ODBC::Database.send :include, ActiveRecord::ConnectionAdapters::SQLServerCoreExtensions::ODBC::Database
+end

lib/active_record/connection_adapters/sqlserver_adapter/core_ext/odbc.rb

@@ -12,21 +12,21 @@ def setup
   end
 
 
-  should 'return finished DBI statment handle from #execute without block' do
+  should 'return finished ODBC statment handle from #execute without block' do
     handle = @connection.execute('SELECT * FROM [topics]')
-    assert_instance_of DBI::StatementHandle, handle
+    assert_instance_of ODBC::Statement, handle
     assert handle.finished?
   end
 
-  should 'finish DBI statment handle from #execute with block' do
+  should 'finish ODBC statment handle from #execute with block' do
     assert_all_statements_used_are_closed do
       @connection.execute('SELECT * FROM [topics]') { }
     end
   end
 
-  should 'return an unfinished DBI statement handler from #raw_execute' do
+  should 'return an unfinished ODBC statement handler from #raw_execute' do
     handle = @connection.send(:raw_execute,'SELECT * FROM [topics]')
-    assert_instance_of DBI::StatementHandle, handle
+    assert_instance_of ODBC::Statement, handle
     assert !handle.finished?
   end
 
@@ -37,7 +37,7 @@ def setup
   end
 
   should 'affect rows' do
-    assert Topic.connection.instance_variable_get("@connection")["AutoCommit"]
+    # assert Topic.connection.instance_variable_get("@connection")["AutoCommit"]
     topic_data = { 1 => { "content" => "1 updated" }, 2 => { "content" => "2 updated" } }
     updated = Topic.update(topic_data.keys, topic_data.values)
     assert_equal 2, updated.size
@@ -114,15 +114,15 @@ def setup
 
   def assert_all_statements_used_are_closed(&block)
     existing_handles = []
-    ObjectSpace.each_object(DBI::StatementHandle) {|handle| existing_handles << handle}
+    ObjectSpace.each_object(ODBC::Statement) {|handle| existing_handles << handle}
     GC.disable
     yield
     used_handles = []
-    ObjectSpace.each_object(DBI::StatementHandle) {|handle| used_handles << handle unless existing_handles.include? handle}
+    ObjectSpace.each_object(ODBC::Statement) {|handle| used_handles << handle unless existing_handles.include? handle}
     assert_block "No statements were used within given block" do
       used_handles.size > 0
     end
-    ObjectSpace.each_object(DBI::StatementHandle) do |handle|
+    ObjectSpace.each_object(ODBC::Statement) do |handle|
       assert_block "Statement should have been closed within given block" do
         handle.finished?
       end