Changelog all of Joe's work.

metaskills · metaskills · commit bebde18719a3 · 2011-11-17T20:03:58.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,18 @@
 
 * master *
 
+* Add activity_stats method that mimics the SQL Server Activity Monitor. Fixes #146 [Joe Rafaniello]
+
+* Add methods for sqlserver's #product_version, #product_level, #edition and include them in inspect.
+  Fixes #145 [Joe Rafaniello]
+  
+* Handle statements that cannot be retried on a new database connection by not reconnecting. 
+  Fixes #147 [Joe Rafaniello]
+  
+* Added connection#spid for debugging. Fixes #144 [Joe Rafaniello]
+
+* Add ENV['TEST_FILES'] to Rakefile for easy single case tests. [Joe Rafaniello]
+
 * Pass ActiveRecord tests. Made windowed distinct pass all orders to groups.
   - test_limited_eager_with_multiple_order_columns
   - test_limited_eager_with_order
diff --git a/Rakefile b/Rakefile
@@ -12,7 +12,6 @@ end
 
 def test_files
   return Dir.glob(ENV['TEST_FILES']).sort if ENV['TEST_FILES']
-  
   files = Dir.glob("test/cases/**/*_test_sqlserver.rb").sort
   ar_path = Gem.loaded_specs['activerecord'].full_gem_path
   ar_cases = Dir.glob("#{ar_path}/test/cases/**/*_test.rb")
diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb
@@ -185,6 +185,51 @@ def newsequentialid_function
           select_value "SELECT NEWSEQUENTIALID()"
         end
         
+        def activity_stats
+          select_all %|
+            SELECT
+               [session_id]    = s.session_id,
+               [user_process]  = CONVERT(CHAR(1), s.is_user_process),
+               [login]         = s.login_name,
+               [database]      = ISNULL(db_name(r.database_id), N''),
+               [task_state]    = ISNULL(t.task_state, N''),
+               [command]       = ISNULL(r.command, N''),
+               [application]   = ISNULL(s.program_name, N''),
+               [wait_time_ms]  = ISNULL(w.wait_duration_ms, 0),
+               [wait_type]     = ISNULL(w.wait_type, N''),
+               [wait_resource] = ISNULL(w.resource_description, N''),
+               [blocked_by]    = ISNULL(CONVERT (varchar, w.blocking_session_id), ''),
+               [head_blocker]  =
+                    CASE
+                        -- session has an active request, is blocked, but is blocking others
+                        WHEN r2.session_id IS NOT NULL AND r.blocking_session_id = 0 THEN '1'
+                        -- session is idle but has an open tran and is blocking others
+                        WHEN r.session_id IS NULL THEN '1'
+                        ELSE ''
+                    END,
+               [total_cpu_ms]   = s.cpu_time,
+               [total_physical_io_mb]   = (s.reads + s.writes) * 8 / 1024,
+               [memory_use_kb]  = s.memory_usage * 8192 / 1024,
+               [open_transactions] = ISNULL(r.open_transaction_count,0),
+               [login_time]     = s.login_time,
+               [last_request_start_time] = s.last_request_start_time,
+               [host_name]      = ISNULL(s.host_name, N''),
+               [net_address]    = ISNULL(c.client_net_address, N''),
+               [execution_context_id] = ISNULL(t.exec_context_id, 0),
+               [request_id]     = ISNULL(r.request_id, 0),
+               [workload_group] = N''
+            FROM sys.dm_exec_sessions s LEFT OUTER JOIN sys.dm_exec_connections c ON (s.session_id = c.session_id)
+            LEFT OUTER JOIN sys.dm_exec_requests r ON (s.session_id = r.session_id)
+            LEFT OUTER JOIN sys.dm_os_tasks t ON (r.session_id = t.session_id AND r.request_id = t.request_id)
+            LEFT OUTER JOIN
+            (SELECT *, ROW_NUMBER() OVER (PARTITION BY waiting_task_address ORDER BY wait_duration_ms DESC) AS row_num
+                FROM sys.dm_os_waiting_tasks
+            ) w ON (t.task_address = w.waiting_task_address) AND w.row_num = 1
+            LEFT OUTER JOIN sys.dm_exec_requests r2 ON (r.session_id = r2.blocking_session_id)
+            WHERE db_name(r.database_id) = '#{current_database}'
+            ORDER BY s.session_id|
+        end
+        
         # === SQLServer Specific (Rake/Test Helpers) ==================== #
         
         def recreate_database
@@ -307,13 +352,15 @@ def raw_connection_do(sql)
         # === SQLServer Specific (Selecting) ============================ #
 
         def raw_select(sql, name=nil, binds=[], options={})
-          log(sql,name,binds) do
-            begin
-              handle = raw_connection_run(sql)
-              handle_to_names_and_values(handle, options)
-            ensure
-              finish_statement_handle(handle)
-            end
+          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
         end
         
diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -371,52 +371,6 @@ def cs_equality_operator
         @@cs_equality_operator || 'COLLATE Latin1_General_CS_AS_WS'
       end
       
-      def activity_stats
-        self.select(<<-EOSQL)
-          SELECT
-             [session_id]    = s.session_id,
-             [user_process]  = CONVERT(CHAR(1), s.is_user_process),
-             [login]         = s.login_name,
-             [database]      = ISNULL(db_name(r.database_id), N''),
-             [task_state]    = ISNULL(t.task_state, N''),
-             [command]       = ISNULL(r.command, N''),
-             [application]   = ISNULL(s.program_name, N''),
-             [wait_time_ms]  = ISNULL(w.wait_duration_ms, 0),
-             [wait_type]     = ISNULL(w.wait_type, N''),
-             [wait_resource] = ISNULL(w.resource_description, N''),
-             [blocked_by]    = ISNULL(CONVERT (varchar, w.blocking_session_id), ''),
-             [head_blocker]  =
-                  CASE
-                      -- session has an active request, is blocked, but is blocking others
-                      WHEN r2.session_id IS NOT NULL AND r.blocking_session_id = 0 THEN '1'
-                      -- session is idle but has an open tran and is blocking others
-                      WHEN r.session_id IS NULL THEN '1'
-                      ELSE ''
-                  END,
-             [total_cpu_ms]   = s.cpu_time,
-             [total_physical_io_mb]   = (s.reads + s.writes) * 8 / 1024,
-             [memory_use_kb]  = s.memory_usage * 8192 / 1024,
-             [open_transactions] = ISNULL(r.open_transaction_count,0),
-             [login_time]     = s.login_time,
-             [last_request_start_time] = s.last_request_start_time,
-             [host_name]      = ISNULL(s.host_name, N''),
-             [net_address]    = ISNULL(c.client_net_address, N''),
-             [execution_context_id] = ISNULL(t.exec_context_id, 0),
-             [request_id]     = ISNULL(r.request_id, 0),
-             [workload_group] = N''
-          FROM sys.dm_exec_sessions s LEFT OUTER JOIN sys.dm_exec_connections c ON (s.session_id = c.session_id)
-          LEFT OUTER JOIN sys.dm_exec_requests r ON (s.session_id = r.session_id)
-          LEFT OUTER JOIN sys.dm_os_tasks t ON (r.session_id = t.session_id AND r.request_id = t.request_id)
-          LEFT OUTER JOIN
-          (SELECT *, ROW_NUMBER() OVER (PARTITION BY waiting_task_address ORDER BY wait_duration_ms DESC) AS row_num
-              FROM sys.dm_os_waiting_tasks
-          ) w ON (t.task_address = w.waiting_task_address) AND w.row_num = 1
-          LEFT OUTER JOIN sys.dm_exec_requests r2 ON (r.session_id = r2.blocking_session_id)
-          WHERE db_name(r.database_id) = '#{current_database}'
-          ORDER BY s.session_id
-        EOSQL
-      end
-      
       protected
       
       # === Abstract Adapter (Misc Support) =========================== #
@@ -457,7 +411,6 @@ def connect
                           :encoding      => encoding,
                           :azure         => config[:azure]
                         }).tap do |client|
-                          @spid = client.execute("SELECT @@spid").first.values.first
                           if config[:azure]
                             client.execute("SET ANSI_NULLS ON").do
                             client.execute("SET CURSOR_CLOSE_ON_COMMIT OFF").do
@@ -490,6 +443,7 @@ def connect
                           end
                         end
                       end
+        @spid = _raw_select("SELECT @@SPID", :fetch => :rows).first.first
         configure_connection
       rescue
         raise unless @auto_connecting
diff --git a/test/cases/connection_test_sqlserver.rb b/test/cases/connection_test_sqlserver.rb
@@ -92,15 +92,13 @@ def setup
       assert @connection.active?
     end
     
-    if connection_mode_dblib?
-      should 'set spid on connect' do
-        assert @connection.spid.kind_of?(Fixnum)
-      end
-    
-      should 'reset spid on disconnect!' do
-        @connection.disconnect!
-        assert @connection.spid.nil?
-      end
+    should 'set spid on connect' do
+      assert_instance_of Fixnum, @connection.spid
+    end
+  
+    should 'reset spid on disconnect!' do
+      @connection.disconnect!
+      assert @connection.spid.nil?
     end
     
     should 'be able to disconnect and reconnect at will' do
@@ -126,6 +124,7 @@ def setup
     end
     
     context 'testing #disable_auto_reconnect' do
+      
       should 'when auto reconnect setting is on' do
         with_auto_connect(true) do
           @connection.send(:disable_auto_reconnect) do
@@ -143,6 +142,7 @@ def setup
           assert !@connection.class.auto_connect
         end
       end
+      
     end
     
     should 'not auto reconnect on commit transaction' do
@@ -167,13 +167,14 @@ def setup
   end
   
   context 'Diagnostics' do
+    
     should 'testing #activity_stats' do
       stats = @connection.activity_stats
-      assert stats.length > 0
-      
+      assert stats.length > 0      
       assert stats.all? { |s| s.has_key?("session_id") }
       assert stats.all? { |s| s["database"] == @connection.current_database }
     end
+    
   end
   
   
