Add matches(Session, query) to QueryAssert

Author: findepi

core/trino-main/src/test/java/io/trino/sql/query/QueryAssertions.java

@@ -326,7 +326,13 @@ public QueryAssert skipResultsCorrectnessCheckForPushdown()
         @CanIgnoreReturnValue
         public QueryAssert matches(@Language("SQL") String query)
         {
-            result().matches(query);
+            return matches(session, query);
+        }
+
+        @CanIgnoreReturnValue
+        public QueryAssert matches(Session session, @Language("SQL") String query)
+        {
+            result().matches(session, query);
             return this;
         }
 
@@ -570,8 +576,7 @@ public QueryAssert hasCorrectResultsRegardlessOfPushdown()
             Session withoutPushdown = Session.builder(session)
                     .setSystemProperty("allow_pushdown_into_connectors", "false")
                     .build();
-            result().matches(runner.execute(withoutPushdown, query()));
-            return this;
+            return matches(withoutPushdown, query());
         }
 
         private String query()
@@ -681,6 +686,12 @@ public AbstractIntegerAssert<?> rowCount()
 
         @CanIgnoreReturnValue
         public ResultAssert matches(@Language("SQL") String query)
+        {
+            return matches(session, query);
+        }
+
+        @CanIgnoreReturnValue
+        public ResultAssert matches(Session session, @Language("SQL") String query)
         {
             MaterializedResult expected = runner.execute(session, query);
             return matches(expected);