activerecord-sqlserver-adapter 3.2.16 → 3.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 726e72febb5f0fd2fecfb88581b92e6af50daac9
-  data.tar.gz: d2feeaa8cf3353c3551f4785fcb1f1e4006ef851
+  metadata.gz: 635da017102e0833bf95d12a189ec49b0f33b750
+  data.tar.gz: b2c4a918c2f8f2636416ae78c514599fd34987f9
 SHA512:
-  metadata.gz: 1091df35f40b10a76aeda89647cea24196822a14a2f730f6741c73a499bb77aac4dd1eea94b1cdeca20e25f0948d54efe94ca4e7ac044ba649081309b321d4cc
-  data.tar.gz: 1e7e1738c77ad41a15f0bbd298c99c3dbc1d69c037973e04a9b5e63ab48f3c9becc1336c701553cf9ad8a511c0b21c3e3ccd4d79d2cde91d30bdac07f20bca93
+  metadata.gz: 1d911a8d3d9fc475a9e323b1955f80f16d436456c60dff4f72c9c46e4ddf32819f07ff875e32c59ac3e6a0ebb7f7a8b5945d2aa5294e4e6a0eee6d667466b091
+  data.tar.gz: f1813fe974324a2879d827e3db53565849a73104e2266541b9a281acbc4eef9da16fe574eb58d29029a83a5492eea1154b587c8f6167a24f0bf19c35dcce4ae1

data/CHANGELOG

@@ -1,7 +1,13 @@
+* 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.

data/VERSION

@@ -1 +1 @@
-3.2.16
+3.2.17

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

@@ -2,9 +2,9 @@ module ActiveRecord
   module ConnectionAdapters
     module Sqlserver
       module DatabaseStatements
-        
+
         include CoreExt::DatabaseStatements
-        
+
         def select_rows(sql, name = nil)
           raw_select sql, name, [], :fetch => :rows
         end
@@ -16,7 +16,7 @@ module ActiveRecord
             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) }
@@ -24,11 +24,11 @@ module ActiveRecord
             do_exec_query(sql, name, binds)
           end
         end
-        
+
         def exec_insert(sql, name, binds)
           exec_query sql, name, binds, :insert => true
         end
-        
+
         def exec_delete(sql, name, binds)
           sql << "; SELECT @@ROWCOUNT AS AffectedRows"
           super.rows.first.first
@@ -42,7 +42,7 @@ module ActiveRecord
         def outside_transaction?
           uncached { select_value('SELECT @@TRANCOUNT', 'SCHEMA') == 0 }
         end
-        
+
         def supports_statement_cache?
           true
         end
@@ -89,9 +89,9 @@ module ActiveRecord
         def case_sensitive_modifier(node)
           node.acts_like?(:string) ? Arel::Nodes::Bin.new(node) : node
         end
-        
+
         # === SQLServer Specific ======================================== #
-        
+
         def execute_procedure(proc_name, *variables)
           vars = if variables.any? && variables.first.is_a?(Hash)
                    variables.first.map { |k,v| "@#{k} = #{quote(v)}" }
@@ -126,17 +126,17 @@ module ActiveRecord
             end
           end
         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
-        
+
         def user_options
           return {} if sqlserver_azure?
           # fixes #535
-          rows = select_rows('dbcc useroptions', 'SCHEMA')
+          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|
             if row.instance_of? Hash
@@ -150,7 +150,7 @@ module ActiveRecord
             values
           end
         end
-        
+
         def user_options_dateformat
           if sqlserver_azure?
             select_value 'SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID', 'SCHEMA'
@@ -158,24 +158,24 @@ module ActiveRecord
             user_options['dateformat']
           end
         end
-        
+
         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' 
-                    WHEN 3 THEN 'REPEATABLE READ' 
-                    WHEN 4 THEN 'SERIALIZABLE' 
-                    WHEN 5 THEN 'SNAPSHOT' END AS [isolation_level] 
-                    FROM [sys].[dm_exec_sessions] 
+                    WHEN 1 THEN 'READ UNCOMITTED'
+                    WHEN 2 THEN 'READ COMITTED'
+                    WHEN 3 THEN 'REPEATABLE READ'
+                    WHEN 4 THEN 'SERIALIZABLE'
+                    WHEN 5 THEN 'SNAPSHOT' END AS [isolation_level]
+                    FROM [sys].[dm_exec_sessions]
                     WHERE [session_id] = @@SPID|.squish
             select_value sql, 'SCHEMA'
           else
             user_options['isolation_level']
           end
         end
-        
+
         def user_options_language
           if sqlserver_azure?
             select_value 'SELECT @@LANGUAGE AS [language]', 'SCHEMA'
@@ -189,20 +189,20 @@ module ActiveRecord
           initial_isolation_level = user_options_isolation_level || "READ COMMITTED"
           do_execute "SET TRANSACTION ISOLATION LEVEL #{isolation_level}"
           begin
-            yield 
+            yield
           ensure
             do_execute "SET TRANSACTION ISOLATION LEVEL #{initial_isolation_level}"
           end if block_given?
         end
-        
+
         def newid_function
           select_value "SELECT NEWID()"
         end
-        
+
         def newsequentialid_function
           select_value "SELECT NEWSEQUENTIALID()"
         end
-        
+
         def activity_stats
           select_all %|
             SELECT
@@ -247,9 +247,9 @@ module ActiveRecord
             WHERE db_name(r.database_id) = '#{current_database}'
             ORDER BY s.session_id|
         end
-        
+
         # === SQLServer Specific (Rake/Test Helpers) ==================== #
-        
+
         def recreate_database
           remove_database_connections_and_rollback do
             do_execute "EXEC sp_MSforeachtable 'DROP TABLE ?'"
@@ -293,18 +293,18 @@ module ActiveRecord
         def current_database
           select_value 'SELECT DB_NAME()'
         end
-        
+
         def charset
           select_value "SELECT SERVERPROPERTY('SqlCharSetName')"
         end
-        
-        
+
+
         protected
-        
+
         def select(sql, name = nil, binds = [])
           exec_query(sql, name, binds).to_a
         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?
           super
@@ -313,13 +313,13 @@ module ActiveRecord
         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"]
         end
-        
+
         # === SQLServer Specific (Executing) ============================ #
 
         def do_execute(sql, name = 'SQL')
@@ -327,7 +327,7 @@ module ActiveRecord
             with_sqlserver_error_handling { raw_connection_do(sql) }
           end
         end
-        
+
         def do_exec_query(sql, name, binds)
           explaining = name == 'EXPLAIN'
           names_and_types = []
@@ -361,7 +361,7 @@ module ActiveRecord
           end
           raw_select sql, name, binds, :ar_result => true
         end
-        
+
         def raw_connection_do(sql)
           case @connection_options[:mode]
           when :dblib
@@ -372,13 +372,13 @@ module ActiveRecord
         ensure
           @update_sql = false
         end
-        
+
         # === SQLServer Specific (Selecting) ============================ #
 
         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)
@@ -387,7 +387,7 @@ module ActiveRecord
             finish_statement_handle(handle)
           end
         end
-        
+
         def raw_connection_run(sql)
           with_sqlserver_error_handling do
             case @connection_options[:mode]
@@ -398,7 +398,7 @@ module ActiveRecord
             end
           end
         end
-        
+
         def handle_more_results?(handle)
           case @connection_options[:mode]
           when :dblib
@@ -406,7 +406,7 @@ module ActiveRecord
             handle.more_results
           end
         end
-        
+
         def handle_to_names_and_values(handle, options={})
           case @connection_options[:mode]
           when :dblib
@@ -415,7 +415,7 @@ module ActiveRecord
             handle_to_names_and_values_odbc(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
@@ -425,7 +425,7 @@ module ActiveRecord
           columns = lowercase_schema_reflection ? handle.fields.map { |c| c.downcase } : handle.fields
           options[:ar_result] ? ActiveRecord::Result.new(columns, results) : results
         end
-        
+
         def handle_to_names_and_values_odbc(handle, options={})
           @connection.use_utc = ActiveRecord::Base.default_timezone == :utc
           if options[:ar_result]
@@ -441,7 +441,7 @@ module ActiveRecord
             end
           end
         end
-        
+
         def finish_statement_handle(handle)
           case @connection_options[:mode]
           when :dblib
@@ -451,7 +451,7 @@ module ActiveRecord
           end
           handle
         end
-        
+
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 3.2.16
+  version: 3.2.17
 platform: ruby
 authors:
 - Ken Collins
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activerecord-sqlserver-adapter
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.