[Rails5] New SQL counter hacks and helper.

Author: metaskills

test/cases/coerced_tests.rb

@@ -129,7 +129,7 @@ def test_should_return_decimal_average_of_integer_field_coerced
 
   coerce_tests! :test_limit_is_kept
   def test_limit_is_kept_coerced
-    queries = assert_sql { Account.limit(1).count }
+    queries = capture_sql_ss { Account.limit(1).count }
     assert_equal 1, queries.length
     queries.first.must_match %r{ORDER BY \[accounts\]\.\[id\] ASC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.*@0 = 1}
   end

test/cases/helper_sqlserver.rb

@@ -17,6 +17,7 @@ class TestCase < ActiveSupport::TestCase
 
     include ARTest::SQLServer::CoerceableTest,
             ARTest::SQLServer::ConnectionReflection,
+            ARTest::SQLServer::SqlCounterSqlserver,
             ActiveSupport::Testing::Stream
 
     let(:logger) { ActiveRecord::Base.logger }

test/support/sql_counter_sqlserver.rb

@@ -1,32 +1,27 @@
 module ARTest
   module SQLServer
 
-    extend self
+    module SqlCounterSqlserver
 
-    attr_accessor :sql_counter_listenter
+      # Only return the log vs. log_all
+      def capture_sql_ss
+        ActiveRecord::SQLCounter.clear_log
+        yield
+        ActiveRecord::SQLCounter.log.dup
+      end
 
-    def ignored_sql
-      [ /SELECT SCOPE_IDENTITY/,
-        /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)/,
-        /SELECT @@version/,
-        /SELECT @@TRANCOUNT/,
-        /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
-        /SELECT CAST\(.* AS .*\) AS value/ ]
     end
 
-    def sql_counter_listenters
-      ActiveSupport::Notifications.notifier.listeners_for('sql.active_record').select do |listener|
-        listener.inspect =~ /ActiveRecord::SQLCounter/
-      end
-    end
+    ignored_sql = [
+      /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)/im,
+      /SELECT @@version/,
+      /SELECT @@TRANCOUNT/,
+      /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
+      /SELECT CAST\(.* AS .*\) AS value/
+    ]
 
-    def sql_counter_listenters_unsubscribe
-      sql_counter_listenters.each { |listener| ActiveSupport::Notifications.unsubscribe(listener) }
-    end
+    sqlcounter = ObjectSpace.each_object(ActiveRecord::SQLCounter).to_a.first
+    sqlcounter.instance_variable_set :@ignore, Regexp.union(ignored_sql.push(sqlcounter.ignore))
 
   end
 end
-
-ActiveRecord::SQLCounter.ignored_sql.concat ARTest::SQLServer.ignored_sql
-ARTest::SQLServer.sql_counter_listenters_unsubscribe
-ARTest::SQLServer.sql_counter_listenter = ActiveSupport::Notifications.subscribe 'sql.active_record', ActiveRecord::SQLCounter.new