0
@@ -22,11 +22,22 @@ module ActiveRecord
0
       end
0
     end
0
 
0
+    def assert_sql(*patterns_to_match)
0
+      $queries_executed = []
0
+      yield
0
+    ensure
0
+      failed_patterns = []
0
+      patterns_to_match.each do |pattern|
0
+        failed_patterns << pattern unless $queries_executed.any?{ |sql| pattern === sql }
0
+      end
0
+      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map(&:inspect).join(', ')} not found."
0
+    end
0
+
0
     def assert_queries(num = 1)
0
-      $query_count = 0
0
+      $queries_executed = []
0
       yield
0
     ensure
0
-      assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
0
+      assert_equal num, $queries_executed.size, "#{$queries_executed.size} instead of #{num} queries were executed."
0
     end
0
 
0
     def assert_no_queries(&block)

0
@@ -32,13 +32,13 @@ end
0
 ActiveRecord::Base.connection.class.class_eval do
0
   IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
0
 
0
-  def execute_with_counting(sql, name = nil, &block)
0
-    $query_count ||= 0
0
-    $query_count  += 1 unless IGNORED_SQL.any? { |r| sql =~ r }
0
-    execute_without_counting(sql, name, &block)
0
+  def execute_with_query_record(sql, name = nil, &block)
0
+    $queries_executed ||= []
0
+    $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
0
+    execute_without_query_record(sql, name, &block)
0
   end
0
 
0
-  alias_method_chain :execute, :counting
0
+  alias_method_chain :execute, :query_record
0
 end
0
 
0
 # Make with_scope public for tests