activerecord-sqlserver-adapter 3.2.18 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 518484bb28fd5a4a70ac12e7d994071c645ff0ea
-  data.tar.gz: 1eac15ea4105d11cc1f80e4e1416e173808ae9e3
+  metadata.gz: e47a3b956b52f24e1dc9f743d5f91590e1fb4337
+  data.tar.gz: f4a3544a7539acb775ff6cfa75925f1cf615e4c3
 SHA512:
-  metadata.gz: 1f570f10c5ec18d26353568f985bbc06b9d621f6afecc0c71e8f7ad2ee2eca80754d7c7c06cd413e7813394960abaf69d3c9832772095bba5ac5bb4638ae774a
-  data.tar.gz: e4f8c5d50c6fb2ce27460af6ea53592438964c5c93105ee5c66ce88c7a44e050e9c4faa5a7eec13197365dc531e5be25a4e08ec0b5f696934aec88348f7bd0cd
+  metadata.gz: 24465af624f8c38d423bd545842e007eaf86371ea802f8259ed54e6eb5b18ddafaf884b95e93637fc608f2033533415d6ca69663f6489afcaf4d04f8518e0250
+  data.tar.gz: 0029cf9f6b4f6de57f61848473ef243234cd32bce09f594e09a87bca8208c88626f06bed6bd186310d4f8b4749e6b03a32e0c88eeb7e6858767d8843518a9708

data/CHANGELOG

@@ -1,31 +1,7 @@
-* 3.2.18 *
-
-* Added 2017 to supported list. Fixes #601. Thanks @catks.
-
-* 3.2.17 *
-
-* Add `WITH NO_INFOMSGS` to `user_options` method. Fixes #580
-
-
-* 3.2.16 *
-
-* All user optons to be array/hash. Fixes #540
-
-
-* 3.2.15 *
-
-* Added vNext support.
-
-
-* 3.2.14 *
-
-* Added 2016 to supported list.
-
-
-* 3.2.13 *
-
-* Allow 2014 to be used.
-
+* 4.0.0 *
+* Dropped support for ruby 1.8.7
+* Removed deadlock victim retry in favor of Isolation Level
+* Removed auto_explain_threshold_in_seconds (not used in rails 4)
 
 * 3.2.12 *
 

data/VERSION

@@ -1 +1 @@
-3.2.18
+4.0.0

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

@@ -3,9 +3,8 @@ module ActiveRecord
     module Sqlserver
       module CoreExt
         module ActiveRecord
-          
           extend ActiveSupport::Concern
-          
+
           included do
             class_attribute :coerced_sqlserver_date_columns, :coerced_sqlserver_time_columns
             self.coerced_sqlserver_date_columns = Set.new
@@ -13,10 +12,9 @@ module ActiveRecord
           end
 
           module ClassMethods
-            
             def execute_procedure(proc_name, *variables)
               if connection.respond_to?(:execute_procedure)
-                connection.execute_procedure(proc_name,*variables)
+                connection.execute_procedure(proc_name, *variables)
               else
                 []
               end
@@ -29,14 +27,11 @@ module ActiveRecord
             def coerce_sqlserver_time(*attributes)
               self.coerced_sqlserver_time_columns += attributes.map(&:to_s)
             end
-
           end
-
         end
       end
     end
   end
 end
 
-
 ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ActiveRecord

data/lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

@@ -3,19 +3,18 @@ module ActiveRecord
     module Sqlserver
       module CoreExt
         module Explain
-          
-          SQLSERVER_STATEMENT_PREFIX = "EXEC sp_executesql "
+          SQLSERVER_STATEMENT_PREFIX = 'EXEC sp_executesql '
           SQLSERVER_PARAM_MATCHER = /@\d+ =/
-          
+
           def exec_explain(queries)
             unprepared_queries = queries.map { |sql, bind| [unprepare_sqlserver_statement(sql), bind] }
             super(unprepared_queries)
           end
-          
+
           private
-          
-          # This is somewhat hacky, but it should reliably reformat our prepared sql statment 
-          # which uses sp_executesql to just the first argument, then unquote it. Likewise our 
+
+          # This is somewhat hacky, but it should reliably reformat our prepared sql statment
+          # which uses sp_executesql to just the first argument, then unquote it. Likewise our
           # do_exec_query method should substitude the @n args withe the quoted values.
           def unprepare_sqlserver_statement(sql)
             if sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
@@ -29,8 +28,6 @@ module ActiveRecord
               sql
             end
           end
-
-          
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb

@@ -1,26 +1,4 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Sqlserver
-      module CoreExt
-        class ExplainSubscriber
-          def call(*args)
-            if queries = Thread.current[:available_queries_for_explain]
-              payload = args.last
-              queries << payload.values_at(:sql, :binds) unless ignore_sqlserver_payload?(payload)
-            end
-          end
-
-          IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE)
-          SQLSERVER_EXPLAINED_SQLS = /(select|update|delete|insert)/i
-
-          # Need to modify the regex for the TSQL generated by this adapter so we can explain the proper sql statements
-          def ignore_sqlserver_payload?(payload)
-            payload[:exception] || IGNORED_PAYLOADS.include?(payload[:name]) || payload[:sql] !~ SQLSERVER_EXPLAINED_SQLS
-          end
-
-          ActiveSupport::Notifications.subscribe("sql.active_record", new)
-        end
-      end
-    end
-  end
+silence_warnings do
+  # Already defined in Rails
+  ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
 end

data/lib/active_record/connection_adapters/sqlserver/core_ext/odbc.rb

@@ -3,36 +3,26 @@ module ActiveRecord
     module Sqlserver
       module CoreExt
         module ODBC
-
           module Statement
-            
             def finished?
-              begin
-                connected?
-                false
-              rescue ::ODBC::Error
-                true
-              end
+              connected?
+              false
+            rescue ::ODBC::Error
+              true
             end
-            
           end
 
           module Database
-            
             def run_block(*args)
               yield sth = run(*args)
               sth.drop
             end
-            
           end
-
         end
       end
     end
   end
 end
 
-
 ODBC::Statement.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ODBC::Statement
 ODBC::Database.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ODBC::Database
-

data/lib/active_record/connection_adapters/sqlserver/core_ext/relation.rb

@@ -3,13 +3,11 @@ module ActiveRecord
     module Sqlserver
       module CoreExt
         module Relation
-          
           private
-          
+
           def tables_in_string(string)
             super - ['__rnt']
           end
-          
         end
       end
     end

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

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     module Sqlserver
       module DatabaseLimits
-        
         def table_alias_length
           128
         end
@@ -32,17 +31,16 @@ module ActiveRecord
         end
 
         def in_clause_length
-          65536
+          65_536
         end
 
         def sql_query_length
-          65536 * 4096
+          65_536 * 4_096
         end
 
         def joins_per_query
           256
         end
-        
       end
     end
   end

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

@@ -2,69 +2,58 @@ module ActiveRecord
   module ConnectionAdapters
     module Sqlserver
       module DatabaseStatements
-
-        include CoreExt::DatabaseStatements
-
-        def select_rows(sql, name = nil)
-          raw_select sql, name, [], :fetch => :rows
+        def select_rows(sql, name = nil, binds = [])
+          do_exec_query sql, name, binds, fetch: :rows
         end
 
         def execute(sql, name = nil)
           if id_insert_table_name = query_requires_identity_insert?(sql)
-            with_identity_insert_enabled(id_insert_table_name) { do_execute(sql,name) }
+            with_identity_insert_enabled(id_insert_table_name) { do_execute(sql, name) }
           else
-            do_execute(sql,name)
+            do_execute(sql, name)
           end
         end
 
         def exec_query(sql, name = 'SQL', binds = [], sqlserver_options = {})
           if id_insert_table_name = sqlserver_options[:insert] ? query_requires_identity_insert?(sql) : nil
             with_identity_insert_enabled(id_insert_table_name) { do_exec_query(sql, name, binds) }
+          elsif update_sql?(sql)
+             sql = strip_ident_from_update(sql)
+             do_exec_query(sql, name, binds)
           else
             do_exec_query(sql, name, binds)
           end
         end
 
-        def exec_insert(sql, name, binds)
-          exec_query sql, name, binds, :insert => true
+        # The abstract adapter ignores the last two parameters also
+        def exec_insert(sql, name, binds, _pk = nil, _sequence_name = nil)
+          exec_query sql, name, binds, insert: true
         end
 
         def exec_delete(sql, name, binds)
-          sql << "; SELECT @@ROWCOUNT AS AffectedRows"
+          sql << '; SELECT @@ROWCOUNT AS AffectedRows'
           super.rows.first.first
         end
 
         def exec_update(sql, name, binds)
-          sql << "; SELECT @@ROWCOUNT AS AffectedRows"
+          sql << '; SELECT @@ROWCOUNT AS AffectedRows'
           super.rows.first.first
         end
 
-        def outside_transaction?
-          uncached { select_value('SELECT @@TRANCOUNT', 'SCHEMA') == 0 }
-        end
-
         def supports_statement_cache?
           true
         end
 
-        def transaction(options = {})
-          if retry_deadlock_victim?
-            block_given? ? transaction_with_retry_deadlock_victim(options) { yield } : transaction_with_retry_deadlock_victim(options)
-          else
-            block_given? ? super(options) { yield } : super(options)
-          end
-        end
-
         def begin_db_transaction
-          do_execute "BEGIN TRANSACTION"
+          do_execute 'BEGIN TRANSACTION'
         end
 
         def commit_db_transaction
-          disable_auto_reconnect { do_execute "COMMIT TRANSACTION" }
+          disable_auto_reconnect { do_execute 'COMMIT TRANSACTION' }
         end
 
         def rollback_db_transaction
-          do_execute "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION"
+          do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
         end
 
         def create_savepoint
@@ -78,12 +67,12 @@ module ActiveRecord
           disable_auto_reconnect { do_execute "ROLLBACK TRANSACTION #{current_savepoint_name}" }
         end
 
-        def add_limit_offset!(sql, options)
+        def add_limit_offset!(_sql, _options)
           raise NotImplementedError, 'This has been moved to the SQLServerCompiler in Arel.'
         end
 
         def empty_insert_statement_value
-          "DEFAULT VALUES"
+          'DEFAULT VALUES'
         end
 
         def case_sensitive_modifier(node)
@@ -94,7 +83,7 @@ module ActiveRecord
 
         def execute_procedure(proc_name, *variables)
           vars = if variables.any? && variables.first.is_a?(Hash)
-                   variables.first.map { |k,v| "@#{k} = #{quote(v)}" }
+                   variables.first.map { |k, v| "@#{k} = #{quote(v)}" }
                  else
                    variables.map { |v| quote(v) }
                  end.join(', ')
@@ -104,41 +93,36 @@ module ActiveRecord
             case @connection_options[:mode]
             when :dblib
               result = @connection.execute(sql)
-              result.each(:as => :hash, :cache_rows => true) do |row|
+              result.each(as: :hash, cache_rows: true) do |row|
                 r = row.with_indifferent_access
                 yield(r) if block_given?
               end
-              result.each.map{ |row| row.is_a?(Hash) ? row.with_indifferent_access : row }
+              result.each.map { |row| row.is_a?(Hash) ? row.with_indifferent_access : row }
             when :odbc
               results = []
               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 }
+                get_rows = lambda do
+                  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
+                get_rows.call
+                get_rows.call while handle_more_results?(handle)
               end
               results.many? ? results : results.first
             end
           end
         end
 
-        def use_database(database=nil)
+        def use_database(database = nil)
           return if sqlserver_azure?
           database ||= @connection_options[:database]
-          do_execute "USE #{quote_table_name(database)}" unless database.blank?
+          do_execute "USE #{quote_database_name(database)}" unless database.blank?
         end
 
         def user_options
           return {} if sqlserver_azure?
-          # fixes #535
-          rows = select_rows('DBCC USEROPTIONS WITH NO_INFOMSGS', 'SCHEMA')
-          rows = rows.first if rows.size == 2 && rows.last.empty?
-          rows.reduce(HashWithIndifferentAccess.new) do |values, row|
+          select_rows('dbcc useroptions', 'SCHEMA').reduce(HashWithIndifferentAccess.new) do |values, row|
             if row.instance_of? Hash
               set_option = row.values[0].gsub(/\s+/, '_')
               user_value = row.values[1]
@@ -151,6 +135,7 @@ module ActiveRecord
           end
         end
 
+        # TODO: Rails 4 now supports isolation levels
         def user_options_dateformat
           if sqlserver_azure?
             select_value 'SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID', 'SCHEMA'
@@ -161,7 +146,7 @@ module ActiveRecord
 
         def user_options_isolation_level
           if sqlserver_azure?
-            sql = %|SELECT CASE [transaction_isolation_level]
+            sql = %(SELECT CASE [transaction_isolation_level]
                     WHEN 0 THEN NULL
                     WHEN 1 THEN 'READ UNCOMITTED'
                     WHEN 2 THEN 'READ COMITTED'
@@ -169,7 +154,7 @@ module ActiveRecord
                     WHEN 4 THEN 'SERIALIZABLE'
                     WHEN 5 THEN 'SNAPSHOT' END AS [isolation_level]
                     FROM [sys].[dm_exec_sessions]
-                    WHERE [session_id] = @@SPID|.squish
+                    WHERE [session_id] = @@SPID).squish
             select_value sql, 'SCHEMA'
           else
             user_options['isolation_level']
@@ -185,8 +170,10 @@ module ActiveRecord
         end
 
         def run_with_isolation_level(isolation_level)
-          raise ArgumentError, "Invalid isolation level, #{isolation_level}. Supported levels include #{valid_isolation_levels.to_sentence}." if !valid_isolation_levels.include?(isolation_level.upcase)
-          initial_isolation_level = user_options_isolation_level || "READ COMMITTED"
+          unless valid_isolation_levels.include?(isolation_level.upcase)
+            raise ArgumentError, "Invalid isolation level, #{isolation_level}. Supported levels include #{valid_isolation_levels.to_sentence}."
+          end
+          initial_isolation_level = user_options_isolation_level || 'READ COMMITTED'
           do_execute "SET TRANSACTION ISOLATION LEVEL #{isolation_level}"
           begin
             yield
@@ -196,11 +183,11 @@ module ActiveRecord
         end
 
         def newid_function
-          select_value "SELECT NEWID()"
+          select_value 'SELECT NEWID()'
         end
 
         def newsequentialid_function
-          select_value "SELECT NEWSEQUENTIALID()"
+          select_value 'SELECT NEWSEQUENTIALID()'
         end
 
         def activity_stats
@@ -256,7 +243,7 @@ module ActiveRecord
           end
         end
 
-        def recreate_database!(database=nil)
+        def recreate_database!(database = nil)
           current_db = current_database
           database ||= current_db
           this_db = database.to_s == current_db
@@ -271,7 +258,7 @@ module ActiveRecord
           retry_count = 0
           max_retries = 1
           begin
-            do_execute "DROP DATABASE #{quote_table_name(database)}"
+            do_execute "DROP DATABASE #{quote_database_name(database)}"
           rescue ActiveRecord::StatementInvalid => err
             if err.message =~ /because it is currently in use/i
               raise if retry_count >= max_retries
@@ -286,8 +273,12 @@ module ActiveRecord
           end
         end
 
-        def create_database(database)
-          do_execute "CREATE DATABASE #{quote_table_name(database)}"
+        def create_database(database, collation = @connection_options[:collation])
+          if collation
+            do_execute "CREATE DATABASE #{quote_database_name(database)} COLLATE #{collation}"
+          else
+            do_execute "CREATE DATABASE #{quote_database_name(database)}"
+          end
         end
 
         def current_database
@@ -298,26 +289,26 @@ module ActiveRecord
           select_value "SELECT SERVERPROPERTY('SqlCharSetName')"
         end
 
-
         protected
 
         def select(sql, name = nil, binds = [])
-          exec_query(sql, name, binds).to_a
+          exec_query(sql, name, binds)
         end
 
         def sql_for_insert(sql, pk, id_value, sequence_name, binds)
-          sql = "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"# unless binds.empty?
+          sql =
+            if pk
+              sql.insert(sql.index(/ (DEFAULT )?VALUES/), " OUTPUT inserted.#{pk}")
+            else
+              "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
+            end
           super
         end
 
-        def last_inserted_id(result)
-          super || select_value("SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident")
-        end
-
         # === SQLServer Specific ======================================== #
 
         def valid_isolation_levels
-          ["READ COMMITTED", "READ UNCOMMITTED", "REPEATABLE READ", "SERIALIZABLE", "SNAPSHOT"]
+          ['READ COMMITTED', 'READ UNCOMMITTED', 'REPEATABLE READ', 'SERIALIZABLE', 'SNAPSHOT']
         end
 
         # === SQLServer Specific (Executing) ============================ #
@@ -328,11 +319,17 @@ module ActiveRecord
           end
         end
 
-        def do_exec_query(sql, name, binds)
+        def do_exec_query(sql, name, binds, options = {})
+          # This allows non-AR code to utilize the binds
+          # handling code, e.g. select_rows()
+          if options[:fetch] != :rows
+            options[:ar_result] = true
+          end
+
           explaining = name == 'EXPLAIN'
           names_and_types = []
           params = []
-          binds.each_with_index do |(column,value),index|
+          binds.each_with_index do |(column, value), index|
             ar_column = column.is_a?(ActiveRecord::ConnectionAdapters::Column)
             next if ar_column && column.sql_type == 'timestamp'
             v = value
@@ -345,9 +342,9 @@ module ActiveRecord
                                  v = value.to_i
                                  "@#{index} int"
                                else
-                                 raise "Unknown bind columns. We can account for this."
+                                 raise 'Unknown bind columns. We can account for this.'
                                end
-            quoted_value = ar_column ? quote(v,column) : quote(v,nil)
+            quoted_value = ar_column ? quote(v, column) : quote(v, nil)
             params << (explaining ? quoted_value : "@#{index} = #{quoted_value}")
           end
           if explaining
@@ -359,7 +356,7 @@ module ActiveRecord
             sql = "EXEC sp_executesql #{quote(sql)}"
             sql << ", #{quote(names_and_types.join(', '))}, #{params.join(', ')}" unless binds.empty?
           end
-          raw_select sql, name, binds, :ar_result => true
+          raw_select sql, name, binds, options
         end
 
         def raw_connection_do(sql)
@@ -375,17 +372,15 @@ module ActiveRecord
 
         # === SQLServer Specific (Selecting) ============================ #
 
-        def raw_select(sql, name='SQL', binds=[], options={})
-          log(sql,name,binds) { _raw_select(sql, options) }
+        def raw_select(sql, name = 'SQL', binds = [], options = {})
+          log(sql, name, binds) { _raw_select(sql, options) }
         end
 
-        def _raw_select(sql, options={})
-          begin
-            handle = raw_connection_run(sql)
-            handle_to_names_and_values(handle, options)
-          ensure
-            finish_statement_handle(handle)
-          end
+        def _raw_select(sql, options = {})
+          handle = raw_connection_run(sql)
+          handle_to_names_and_values(handle, options)
+        ensure
+          finish_statement_handle(handle)
         end
 
         def raw_connection_run(sql)
@@ -407,7 +402,7 @@ module ActiveRecord
           end
         end
 
-        def handle_to_names_and_values(handle, options={})
+        def handle_to_names_and_values(handle, options = {})
           case @connection_options[:mode]
           when :dblib
             handle_to_names_and_values_dblib(handle, options)
@@ -416,7 +411,7 @@ module ActiveRecord
           end
         end
 
-        def handle_to_names_and_values_dblib(handle, options={})
+        def handle_to_names_and_values_dblib(handle, options = {})
           query_options = {}.tap do |qo|
             qo[:timezone] = ActiveRecord::Base.default_timezone || :utc
             qo[:as] = (options[:ar_result] || options[:fetch] == :rows) ? :array : :hash
@@ -426,7 +421,7 @@ module ActiveRecord
           options[:ar_result] ? ActiveRecord::Result.new(columns, results) : results
         end
 
-        def handle_to_names_and_values_odbc(handle, options={})
+        def handle_to_names_and_values_odbc(handle, options = {})
           @connection.use_utc = ActiveRecord::Base.default_timezone == :utc
           if options[:ar_result]
             columns = lowercase_schema_reflection ? handle.columns(true).map { |c| c.name.downcase } : handle.columns(true).map { |c| c.name }
@@ -451,7 +446,6 @@ module ActiveRecord
           end
           handle
         end
-
       end
     end
   end