activerecord-sqlserver-adapter 3.0.2 → 3.0.3

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+* 3.0.3
+
+* Add TinyTDS/dblib connection mode. [Ken Collins]
+
+
 * 3.0.2
 
 * Fix DSN'less code. [Erik Bryn]

data/README.rdoc

@@ -150,14 +150,24 @@ If you’d like to contribute a feature or bugfix, thanks! To make sure your fix
 
 Many many people have contributed. If you do not see your name here and it should be let us know. Also, many thanks go out to those that have pledged financial contributions.
 
-* Ken Collins
-* Erik Bryn
-* Murray Steele
-* Shawn Balestracci
-* Joe Rafaniello
-* Tom Ward
-
-
+=== Contributers
+Up-to-date list of contributors: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter/contributors
+
+* metaskills (Ken Collins)
+* h-lame (Murray Steele)
+* vegantech
+* cjheath (Clifford Heath)
+* jrafanie (Joe Rafaniello)
+* nerdrew (Andrew Ryan)
+* snowblink (Jonathan Lim)
+* koppen (Jakob Skjerning)
+* ebryn (Erik Bryn)
+* adzap (Adam Meehan)
+* neomindryan (Ryan Findley)
+* jeremydurham (Jeremy Durham)
+
+=== Donators
+http://pledgie.com/campaigns/11630
 
 == License
 

data/lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -13,8 +13,8 @@ module ActiveRecord
         end
 
         def execute(sql, name = nil, skip_logging = false)
-          if table_name = query_requires_identity_insert?(sql)
-            with_identity_insert_enabled(table_name) { do_execute(sql,name) }
+          if id_insert_table_name = query_requires_identity_insert?(sql)
+            with_identity_insert_enabled(id_insert_table_name) { do_execute(sql,name) }
           else
             do_execute(sql,name)
           end
@@ -71,19 +71,27 @@ module ActiveRecord
         def execute_procedure(proc_name, *variables)
           vars = variables.map{ |v| quote(v) }.join(', ')
           sql = "EXEC #{proc_name} #{vars}".strip
+          name = 'Execute Procedure'
           results = []
-          log(sql,'Execute Procedure') do
-            raw_connection_run(sql) do |handle|
-              get_rows = lambda {
-                rows = handle_to_names_and_values handle, :fetch => :all
-                rows.each_with_index { |r,i| rows[i] = r.with_indifferent_access }
-                results << rows
-              }
-              get_rows.call
-              while handle_more_results?(handle)
+          case @connection_options[:mode]
+          when :dblib
+            results << select(sql, name).map { |r| r.with_indifferent_access }
+          when :odbc
+            log(sql, name) do
+              raw_connection_run(sql) do |handle|
+                get_rows = lambda {
+                  rows = handle_to_names_and_values handle, :fetch => :all
+                  rows.each_with_index { |r,i| rows[i] = r.with_indifferent_access }
+                  results << rows
+                }
                 get_rows.call
+                while handle_more_results?(handle)
+                  get_rows.call
+                end
               end
             end
+          when :adonet
+            results << select(sql, name).map { |r| r.with_indifferent_access }
           end
           results.many? ? results : results.first
         end
@@ -179,12 +187,24 @@ module ActiveRecord
         end
         
         def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
-          super || select_value("SELECT SCOPE_IDENTITY() AS Ident")
+          @insert_sql = true
+          case @connection_options[:mode]
+          when :dblib
+            execute(sql, name) || id_value
+          else
+            super || select_value("SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident")
+          end
         end
         
         def update_sql(sql, name = nil)
-          execute(sql, name)
-          select_value('SELECT @@ROWCOUNT AS AffectedRows')
+          @update_sql = true
+          case @connection_options[:mode]
+          when :dblib
+            execute(sql, name)
+          else
+            execute(sql, name)
+            select_value('SELECT @@ROWCOUNT AS AffectedRows')
+          end
         end
         
         # === SQLServer Specific ======================================== #
@@ -204,11 +224,16 @@ module ActiveRecord
         
         def raw_connection_do(sql)
           case @connection_options[:mode]
+          when :dblib
+            @insert_sql ? @connection.execute(sql).insert : @connection.execute(sql).do
           when :odbc
             @connection.do(sql)
           else :adonet
             @connection.create_command.tap{ |cmd| cmd.command_text = sql }.execute_non_query
           end
+        ensure
+          @insert_sql = false
+          @update_sql = false
         end
         
         # === SQLServer Specific (Selecting) ============================ #
@@ -227,6 +252,8 @@ module ActiveRecord
         def raw_connection_run(sql)
           with_auto_reconnect do
             case @connection_options[:mode]
+            when :dblib
+              @connection.execute(sql)
             when :odbc
               block_given? ? @connection.run_block(sql) { |handle| yield(handle) } : @connection.run(sql)
             else :adonet
@@ -237,6 +264,7 @@ module ActiveRecord
         
         def handle_more_results?(handle)
           case @connection_options[:mode]
+          when :dblib
           when :odbc
             handle.more_results
           when :adonet
@@ -246,13 +274,24 @@ module ActiveRecord
         
         def handle_to_names_and_values(handle, options={})
           case @connection_options[:mode]
+          when :dblib
+            handle_to_names_and_values_dblib(handle, options)
           when :odbc
             handle_to_names_and_values_odbc(handle, options)
           when :adonet
             handle_to_names_and_values_adonet(handle, options)
           end
         end
-
+        
+        def handle_to_names_and_values_dblib(handle, options={})
+          query_options = {}.tap do |qo|
+            qo[:timezone] = ActiveRecord::Base.default_timezone || :utc
+            qo[:first] = true if options[:fetch] == :one
+            qo[:as] = options[:fetch] == :rows ? :array : :hash
+          end
+          handle.each(query_options)
+        end
+        
         def handle_to_names_and_values_odbc(handle, options={})
           @connection.use_utc = ActiveRecord::Base.default_timezone == :utc if @connection_supports_native_types
           case options[:fetch]
@@ -351,6 +390,7 @@ module ActiveRecord
         
         def finish_statement_handle(handle)
           case @connection_options[:mode]
+          when :dblib  
           when :odbc
             handle.drop if handle && handle.respond_to?(:drop) && !handle.finished?
           when :adonet

data/lib/active_record/connection_adapters/sqlserver/errors.rb

@@ -8,11 +8,13 @@ module ActiveRecord
       module Errors
         
         LOST_CONNECTION_EXCEPTIONS  = {
+          :dblib  => ['TinyTds::Error'],
           :odbc   => ['ODBC::Error','ODBC_UTF8::Error','ODBC_NONE::Error'],
           :adonet => ['TypeError','System::Data::SqlClient::SqlException']
         }.freeze
         
         LOST_CONNECTION_MESSAGES    = {
+          :dblib  => [/closed connection/],
           :odbc   => [/link failure/, /server failed/, /connection was already closed/, /invalid handle/i],
           :adonet => [/current state is closed/, /network-related/]
         }.freeze

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -20,6 +20,9 @@ module ActiveRecord
       config.reverse_merge! :mode => :odbc, :host => 'localhost', :username => 'sa', :password => ''
       mode = config[:mode].to_s.downcase.underscore.to_sym
       case mode
+      when :dblib
+        raise ArgumentError, 'Missing :dataserver configuration.' unless config.has_key?(:dataserver)
+        require_library_or_gem 'tiny_tds'
       when :odbc
         raise ArgumentError, 'Missing :dsn configuration.' unless config.has_key?(:dsn)
         if RUBY_VERSION < '1.9'
@@ -181,7 +184,7 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.2'.freeze
+      VERSION                     = '3.0.3'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2005,2008].freeze
       
@@ -242,6 +245,15 @@ module ActiveRecord
       # === Abstract Adapter (Connection Management) ================== #
       
       def active?
+        connected = case @connection_options[:mode]
+                    when :dblib
+                      !@connection.closed?
+                    when :odbc
+                      true
+                    else :adonet
+                      true
+                    end
+        return false if !connected
         raw_connection_do("SELECT 1")
         true
       rescue *lost_connection_exceptions
@@ -256,6 +268,8 @@ module ActiveRecord
 
       def disconnect!
         case @connection_options[:mode]
+        when :dblib
+          @connection.close rescue nil
         when :odbc
           @connection.disconnect rescue nil
         else :adonet
@@ -351,6 +365,23 @@ module ActiveRecord
       def connect
         config = @connection_options
         @connection = case @connection_options[:mode]
+                      when :dblib
+                        appname = config[:appname] || Rails.application.class.name.split('::').first rescue nil
+                        encoding = config[:encoding].present? ? config[:encoding] : nil
+                        TinyTds::Client.new({ 
+                          :dataserver    => config[:dataserver],
+                          :username      => config[:username],
+                          :password      => config[:password],
+                          :database      => config[:database],
+                          :appname       => appname,
+                          :login_timeout => config[:dblib_login_timeout],
+                          :timeout       => config[:dblib_timeout],
+                          :encoding      => encoding
+                        }).tap do |client|
+                          client.execute("SET ANSI_DEFAULTS ON").do
+                          client.execute("SET IMPLICIT_TRANSACTIONS OFF").do
+                          client.execute("SET CURSOR_CLOSE_ON_COMMIT OFF").do
+                        end
                       when :odbc
                         odbc = ['::ODBC','::ODBC_UTF8','::ODBC_NONE'].detect{ |odbc_ns| odbc_ns.constantize rescue nil }.constantize
                         if config[:dsn].include?(';')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -04:00
+date: 2010-10-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency