diff --git a/spec/support/matchers/query_matcher.rb b/spec/support/matchers/query_matcher.rb
index e93dd8c345..ac4c941c82 100644
--- a/spec/support/matchers/query_matcher.rb
+++ b/spec/support/matchers/query_matcher.rb
@@ -21,11 +21,9 @@ def supports_value_expectations? = true
   def matches?(block)
     @queries = QueryLogger.log(&block)
 
-    if @block
-      @block.call(@queries)
-    end
-
-    @queries.size == @count
+    @queries.size == @count && (
+      @block.nil? || @block.call(@queries)
+    )
   end
 
   def failure_message
diff --git a/spec/support/matchers/sql_matcher.rb b/spec/support/matchers/sql_matcher.rb
index 471940a1ad..69b71498fa 100644
--- a/spec/support/matchers/sql_matcher.rb
+++ b/spec/support/matchers/sql_matcher.rb
@@ -14,8 +14,8 @@
   diffable
 
   match do |actual|
-    @expected = formatter.format(+expected)
-    @actual   = formatter.format(+actual)
+    @expected = formatter.format(+expected.to_s)
+    @actual   = formatter.format(+actual.to_s)
 
     @actual == @expected
   end