activerecord-sqlserver-adapter 3.0.10 → 3.0.11

data/CHANGELOG

@@ -1,4 +1,11 @@
 
+* 3.0.11 *
+
+* Azure compatibility.
+
+* TinyTDS enhancements for lost connections. Default connection mode.
+
+
 * 3.0.10 *
 
 * Fix #rowtable_orders visitor helper to use first column if no pk column was found.

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

@@ -104,6 +104,7 @@ module ActiveRecord
         end
         
         def use_database(database=nil)
+          return if sqlserver_azure?
           database ||= @connection_options[:database]
           do_execute "USE #{quote_table_name(database)}" unless database.blank?
         end

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

@@ -106,7 +106,7 @@ module ActiveRecord
         end
         
         def remove_index!(table_name, index_name)
-          do_execute "DROP INDEX #{quote_table_name(table_name)}.#{quote_column_name(index_name)}"
+          do_execute "DROP INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}"
         end
 
         def type_to_sql(type, limit = nil, precision = nil, scale = nil)

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -18,12 +18,13 @@ module ActiveRecord
     
     def self.sqlserver_connection(config) #:nodoc:
       config = config.dup.symbolize_keys!
-      config.reverse_merge! :mode => :odbc, :host => 'localhost', :username => 'sa', :password => ''
+      config.reverse_merge! :mode => :dblib, :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'
+        warn("TinyTds v0.4.3 or higher required. Using #{TinyTds::VERSION}") unless TinyTds::Client.instance_methods.include?("active?")
       when :odbc
         raise ArgumentError, 'Missing :dsn configuration.' unless config.has_key?(:dsn)
         if RUBY_VERSION < '1.9'
@@ -164,9 +165,9 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.10'.freeze
+      VERSION                     = '3.0.11'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
-      SUPPORTED_VERSIONS          = [2005,2008,2011].freeze
+      SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze
       
       attr_reader :database_version, :database_year,
                   :connection_supports_native_types
@@ -181,8 +182,13 @@ module ActiveRecord
         super(@connection, logger)
         @database_version = info_schema_query { select_value('SELECT @@version') }
         @database_year = begin
-                           year = DATABASE_VERSION_REGEXP.match(@database_version)[1]
-                           year == "Denali" ? 2011 : year.to_i
+                           if @database_version =~ /Microsoft SQL Azure/i
+                             @sqlserver_azure = true
+                             @database_version.match(/\s(\d{4})\s/)[1].to_i
+                           else
+                             year = DATABASE_VERSION_REGEXP.match(@database_version)[1]
+                             year == "Denali" ? 2011 : year.to_i
+                           end
                          rescue
                            0
                          end
@@ -229,15 +235,10 @@ 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
+        case @connection_options[:mode]
+        when :dblib
+          return @connection.active?
+        end
         raw_connection_do("SELECT 1")
         true
       rescue *lost_connection_exceptions
@@ -294,6 +295,10 @@ module ActiveRecord
         @database_year == 2011
       end
       
+      def sqlserver_azure?
+        @sqlserver_azure && @database_year == 2010
+      end
+      
       def version
         self.class::VERSION
       end
@@ -315,11 +320,11 @@ module ActiveRecord
       end
       
       def native_time_database_type
-        sqlserver_2008? ? 'time' : 'datetime'
+        sqlserver_2005? ? 'datetime' : 'time'
       end
       
       def native_date_database_type
-        sqlserver_2008? ? 'date' : 'datetime'
+        sqlserver_2005? ? 'datetime' : 'date'
       end
       
       def native_binary_database_type
@@ -366,11 +371,22 @@ module ActiveRecord
                           :appname       => appname,
                           :login_timeout => login_timeout,
                           :timeout       => timeout,
-                          :encoding      => encoding
+                          :encoding      => encoding,
+                          :azure         => config[:azure]
                         }).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
+                          if config[:azure]
+                            client.execute("SET ANSI_NULLS ON").do
+                            client.execute("SET CURSOR_CLOSE_ON_COMMIT OFF").do
+                            client.execute("SET ANSI_NULL_DFLT_ON ON").do
+                            client.execute("SET IMPLICIT_TRANSACTIONS OFF").do
+                            client.execute("SET ANSI_PADDING ON").do
+                            client.execute("SET QUOTED_IDENTIFIER ON")
+                            client.execute("SET ANSI_WARNINGS ON").do
+                          else
+                            client.execute("SET ANSI_DEFAULTS ON").do
+                            client.execute("SET CURSOR_CLOSE_ON_COMMIT OFF").do
+                            client.execute("SET IMPLICIT_TRANSACTIONS OFF").do
+                          end
                         end
                       when :odbc
                         odbc = ['::ODBC','::ODBC_UTF8','::ODBC_NONE'].detect{ |odbc_ns| odbc_ns.constantize rescue nil }.constantize

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 3
   - 0
-  - 10
-  version: 3.0.10
+  - 11
+  version: 3.0.11
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -05:00
+date: 2011-04-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activerecord-sqlserver-adapter
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: SQL Server 2005 and 2008 Adapter For ActiveRecord.