Shared: Simplify PrettyPrintModels.ql

hvitved · hvitved · commit 97863be34017 · 2024-10-28T19:22:58.000+01:00
diff --git a/csharp/ql/test/TestUtilities/PrettyPrintModels.ql b/csharp/ql/test/TestUtilities/PrettyPrintModels.ql
@@ -5,7 +5,3 @@
 import semmle.code.csharp.dataflow.internal.ExternalFlow
 import codeql.dataflow.test.ProvenancePathGraph
 import codeql.dataflow.test.ProvenancePathGraph::TestPostProcessing::TranslateProvenanceResults<interpretModelForTest/2>
-
-from string relation, int row, int column, string data
-where results(relation, row, column, data)
-select relation, row, column, data
diff --git a/go/ql/test/TestUtilities/PrettyPrintModels.ql b/go/ql/test/TestUtilities/PrettyPrintModels.ql
@@ -4,7 +4,3 @@
 
 import semmle.go.dataflow.ExternalFlow
 import codeql.dataflow.test.ProvenancePathGraph::TestPostProcessing::TranslateProvenanceResults<interpretModelForTest/2>
-
-from string relation, int row, int column, string data
-where results(relation, row, column, data)
-select relation, row, column, data
diff --git a/java/ql/test/TestUtilities/PrettyPrintModels.ql b/java/ql/test/TestUtilities/PrettyPrintModels.ql
@@ -4,7 +4,3 @@
 
 import semmle.code.java.dataflow.ExternalFlow
 import codeql.dataflow.test.ProvenancePathGraph::TestPostProcessing::TranslateProvenanceResults<interpretModelForTest/2>
-
-from string relation, int row, int column, string data
-where results(relation, row, column, data)
-select relation, row, column, data
diff --git a/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll b/shared/dataflow/codeql/dataflow/test/ProvenancePathGraph.qll
@@ -113,7 +113,7 @@ module TestPostProcessing {
         )
     }
 
-    predicate results(string relation, int row, int column, string data) {
+    query predicate results(string relation, int row, int column, string data) {
       queryResults(relation, row, column, data) and
       (relation != "edges" or column != provenanceColumn())
       or

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ module TestPostProcessing {`
`113`	`113`	`)`
`114`	`114`	`}`
`115`	`115`
`116`		`- predicate results(string relation, int row, int column, string data) {`
	`116`	`+ query predicate results(string relation, int row, int column, string data) {`
`117`	`117`	`queryResults(relation, row, column, data) and`
`118`	`118`	`(relation != "edges" or column != provenanceColumn())`
`119`	`119`	`or`