Remove our log_info_schema_queries config since we are not hooking properly into AR's 'SCHEMA' names.

Author: metaskills

CHANGELOG

@@ -1,6 +1,8 @@
 
 * 3.2.0 *
 
+* Remove our log_info_schema_queries config since we are not hooking properly into AR's 'SCHEMA' names.
+
 * Properly use 'SCHEMA' name arguement in DB statements to comply with ActiveRecord::ExplainSubscriber::IGNORED_PAYLOADS.
 
 * Make use of the new ConnectionAdapters::SchemaCache for our needs.

README.md

@@ -139,15 +139,6 @@ ActiveRecord::Base.table_name_prefix = 'dbo.'
 ```
 
 
-#### Schema Information Logging
-
-By default all queries to the INFORMATION_SCHEMA table is silenced. If you think logging these queries are useful, you can enable it by adding this like to a initializer file.
-
-```ruby
-ActiveRecord::ConnectionAdapters::SQLServerAdapter.log_info_schema_queries = true
-```
-
-
 #### Auto Connecting
 
 By default the adapter will auto connect to lost DB connections. For every query it will retry at intervals of 2, 4, 8, 16 and 32 seconds. During each retry it will callback out to ActiveRecord::Base.did_retry_sqlserver_connection(connection,count). When all retries fail, it will callback to ActiveRecord::Base.did_lose_sqlserver_connection(connection). Both implementations of these methods are to write to the rails logger, however, they make great override points for notifications like Hoptoad. If you want to disable automatic reconnections use the following in an initializer.

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -40,7 +40,7 @@ def exec_update(sql, name, binds)
         end
 
         def outside_transaction?
-          info_schema_query { select_value('SELECT @@TRANCOUNT', 'SCHEMA') == 0 }
+          select_value('SELECT @@TRANCOUNT', 'SCHEMA') == 0
         end
 
         def supports_statement_cache?
@@ -131,46 +131,42 @@ def use_database(database=nil)
 
         def user_options
           return {} if sqlserver_azure?
-          info_schema_query do
-            select_rows("dbcc useroptions").inject(HashWithIndifferentAccess.new) do |values,row| 
-              set_option = row[0].gsub(/\s+/,'_')
-              user_value = row[1]
-              values[set_option] = user_value
-              values
-            end
+          select_rows("dbcc useroptions",'SCHEMA').inject(HashWithIndifferentAccess.new) do |values,row| 
+            set_option = row[0].gsub(/\s+/,'_')
+            user_value = row[1]
+            values[set_option] = user_value
+            values
           end
         end
 
         def user_options_dateformat
           if sqlserver_azure?
-            info_schema_query { select_value 'SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID', 'SCHEMA' }
+            select_value 'SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID', 'SCHEMA'
           else
             user_options['dateformat']
           end
         end
 
         def user_options_isolation_level
           if sqlserver_azure?
-            info_schema_query do
-              sql = %|SELECT CASE [transaction_isolation_level] 
-                      WHEN 0 THEN NULL
-                      WHEN 1 THEN 'READ UNCOMITTED' 
-                      WHEN 2 THEN 'READ COMITTED' 
-                      WHEN 3 THEN 'REPEATABLE' 
-                      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)
-            end
+            sql = %|SELECT CASE [transaction_isolation_level] 
+                    WHEN 0 THEN NULL
+                    WHEN 1 THEN 'READ UNCOMITTED' 
+                    WHEN 2 THEN 'READ COMITTED' 
+                    WHEN 3 THEN 'REPEATABLE' 
+                    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?
-            info_schema_query { select_value 'SELECT @@LANGUAGE AS [language]', 'SCHEMA' }
+            select_value 'SELECT @@LANGUAGE AS [language]', 'SCHEMA'
           else
             user_options['language']
           end

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -8,9 +8,7 @@ def native_database_types
         end
 
         def tables(table_type = 'BASE TABLE')
-          info_schema_query do
-            select_values "SELECT #{lowercase_schema_reflection_sql('TABLE_NAME')} FROM INFORMATION_SCHEMA.TABLES #{"WHERE TABLE_TYPE = '#{table_type}'" if table_type} ORDER BY TABLE_NAME"
-          end
+          select_values "SELECT #{lowercase_schema_reflection_sql('TABLE_NAME')} FROM INFORMATION_SCHEMA.TABLES #{"WHERE TABLE_TYPE = '#{table_type}'" if table_type} ORDER BY TABLE_NAME", 'SCHEMA'
         end
 
         def table_exists?(table_name)
@@ -196,7 +194,7 @@ def column_definitions(table_name)
           }.gsub(/[ \t\r\n]+/,' ')
           binds = [['table_name', table_name]]
           binds << ['table_schema',table_schema] unless table_schema.blank?
-          results = info_schema_query { do_exec_query(sql, 'SCHEMA', binds) }
+          results = do_exec_query(sql, 'SCHEMA', binds)
           results.collect do |ci|
             ci = ci.symbolize_keys
             ci[:type] = case ci[:type]
@@ -215,7 +213,7 @@ def column_definitions(table_name)
               real_table_name = table_name_or_views_table_name(table_name)
               real_column_name = views_real_column_name(table_name,ci[:name])
               col_default_sql = "SELECT c.COLUMN_DEFAULT FROM #{db_name_with_period}INFORMATION_SCHEMA.COLUMNS c WHERE c.TABLE_NAME = '#{real_table_name}' AND c.COLUMN_NAME = '#{real_column_name}'"
-              ci[:default_value] = info_schema_query { select_value col_default_sql, 'SCHEMA' }
+              ci[:default_value] = select_value col_default_sql, 'SCHEMA'
             end
             ci[:default_value] = case ci[:default_value]
                                  when nil, '(null)', '(NULL)'
@@ -235,7 +233,7 @@ def column_definitions(table_name)
         end
 
         def remove_check_constraints(table_name, column_name)
-          constraints = info_schema_query { select_values "SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE where TABLE_NAME = '#{quote_string(table_name)}' and COLUMN_NAME = '#{quote_string(column_name)}'", 'SCHEMA' }
+          constraints = select_values "SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE where TABLE_NAME = '#{quote_string(table_name)}' and COLUMN_NAME = '#{quote_string(column_name)}'", 'SCHEMA'
           constraints.each do |constraint|
             do_execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{quote_column_name(constraint)}"
           end
@@ -258,10 +256,6 @@ def remove_indexes(table_name, column_name)
 
         # === SQLServer Specific (Misc Helpers) ========================= #
 
-        def info_schema_query
-          log_info_schema_queries ? yield : ActiveRecord::Base.silence{ yield }
-        end
-        
         def get_table_name(sql)
           if sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)\s+INTO\s+([^\(\s]+)\s*|^\s*update\s+([^\(\s]+)\s*/i
             $2 || $3
@@ -296,17 +290,15 @@ def view_table_name(table_name)
 
         def view_information(table_name)
           table_name = Utils.unqualify_table_name(table_name)
-          view_info = info_schema_query { select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'", 'SCHEMA' }
+          view_info = select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'", 'SCHEMA'
           if view_info
             view_info = view_info.with_indifferent_access
             if view_info[:VIEW_DEFINITION].blank? || view_info[:VIEW_DEFINITION].length == 4000
-              view_info[:VIEW_DEFINITION] = info_schema_query do
-                                              begin
-                                                select_values("EXEC sp_helptext #{quote_table_name(table_name)}", 'SCHEMA').join
-                                              rescue
-                                                warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
-                                                nil
-                                              end
+              view_info[:VIEW_DEFINITION] = begin
+                                              select_values("EXEC sp_helptext #{quote_table_name(table_name)}", 'SCHEMA').join
+                                            rescue
+                                              warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
+                                              nil
                                             end
             end
           end

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -181,7 +181,7 @@ class SQLServerAdapter < AbstractAdapter
       attr_reader :database_version, :database_year, :spid, :product_level, :product_version, :edition
 
       cattr_accessor :native_text_database_type, :native_binary_database_type, :native_string_database_type,
-                     :log_info_schema_queries, :enable_default_unicode_types, :auto_connect, :retry_deadlock_victim,
+                     :enable_default_unicode_types, :auto_connect, :retry_deadlock_victim,
                      :cs_equality_operator, :lowercase_schema_reflection, :auto_connect_duration
 
       self.enable_default_unicode_types = true
@@ -195,7 +195,7 @@ def initialize(connection, logger, pool, config)
         # Our Responsibility
         @connection_options = config
         connect
-        @database_version = info_schema_query { select_value 'SELECT @@version', 'SCHEMA' }
+        @database_version = select_value 'SELECT @@version', 'SCHEMA'
         @database_year = begin
                            if @database_version =~ /Microsoft SQL Azure/i
                              @sqlserver_azure = true
@@ -207,9 +207,9 @@ def initialize(connection, logger, pool, config)
                          rescue
                            0
                          end
-        @product_level    = info_schema_query { select_value "SELECT CAST(SERVERPROPERTY('productlevel') AS VARCHAR(128))", 'SCHEMA' }
-        @product_version  = info_schema_query { select_value "SELECT CAST(SERVERPROPERTY('productversion') AS VARCHAR(128))", 'SCHEMA' }
-        @edition          = info_schema_query { select_value "SELECT CAST(SERVERPROPERTY('edition') AS VARCHAR(128))", 'SCHEMA' }
+        @product_level    = select_value "SELECT CAST(SERVERPROPERTY('productlevel') AS VARCHAR(128))", 'SCHEMA'
+        @product_version  = select_value "SELECT CAST(SERVERPROPERTY('productversion') AS VARCHAR(128))", 'SCHEMA'
+        @edition          = select_value "SELECT CAST(SERVERPROPERTY('edition') AS VARCHAR(128))", 'SCHEMA'
         initialize_dateformatter
         use_database
         unless SUPPORTED_VERSIONS.include?(@database_year)

test/cases/adapter_test_sqlserver.rb

@@ -400,12 +400,12 @@ def setup
     context "finding out what user_options are available" do
 
       should "run the database consistency checker useroptions command" do
-        @connection.expects(:select_rows).with(regexp_matches(/^dbcc\s+useroptions$/i)).returns []
+        @connection.expects(:select_rows).with(regexp_matches(/^dbcc\s+useroptions$/i), 'SCHEMA').returns []
         @connection.user_options
       end
 
       should "return a underscored key hash with indifferent access of the results" do
-        @connection.expects(:select_rows).with(regexp_matches(/^dbcc\s+useroptions$/i)).returns [['some', 'thing'], ['isolation level', 'read uncommitted']]
+        @connection.expects(:select_rows).with(regexp_matches(/^dbcc\s+useroptions$/i), 'SCHEMA').returns [['some', 'thing'], ['isolation level', 'read uncommitted']]
         uo = @connection.user_options
         assert_equal 2, uo.keys.size
         assert_equal 'thing', uo['some']

test/cases/sqlserver_helper.rb

@@ -26,7 +26,6 @@
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(File.expand_path(File.join(SQLSERVER_TEST_ROOT,'debug.log')))
 ActiveRecord::Base.logger.level = 0
-ActiveRecord::ConnectionAdapters::SQLServerAdapter.log_info_schema_queries = false
 
 # Defining our classes in one place as well as soem core tests that need coercing date/time types.