QL: find dbscheme files that are contained within a subfolder

erik-krogh · erik-krogh · commit 865e4f04412b · 2021-10-15T21:37:23.000+02:00
diff --git a/ql/src/codeql_ql/ast/Ast.qll b/ql/src/codeql_ql/ast/Ast.qll
@@ -2415,8 +2415,8 @@ module YAML {
 
     /** Gets the database scheme of this qlpack */
     File getDBScheme() {
-      result.getBaseName() = this.getProperty("dbscheme") and
-      result = file.getParentContainer().getFile(any(string s | s.matches("%.dbscheme")))
+      result.getAbsolutePath() =
+        file.getParentContainer().getAbsolutePath() + "/" + this.getProperty("dbscheme")
     }
 
     pragma[noinline]

Original file line number	Diff line number	Diff line change
`@@ -2415,8 +2415,8 @@ module YAML {`
`2415`	`2415`
`2416`	`2416`	`/** Gets the database scheme of this qlpack */`
`2417`	`2417`	`File getDBScheme() {`
`2418`		`- result.getBaseName() = this.getProperty("dbscheme") and`
`2419`		`- result = file.getParentContainer().getFile(any(string s \| s.matches("%.dbscheme")))`
	`2418`	`+ result.getAbsolutePath() =`
	`2419`	`+ file.getParentContainer().getAbsolutePath() + "/" + this.getProperty("dbscheme")`
`2420`	`2420`	`}`
`2421`	`2421`
`2422`	`2422`	`pragma[noinline]`