Merge pull request github#6180 from tamasvajk/fix/coverage-report-search-path

Upgrade database in coverage report jobs

Author: yo-h

misc/scripts/library-coverage/generate-report.py

@@ -134,7 +134,7 @@ def add_package_stats_to_row(row, sorted_cwes, collect):
     db = "empty-" + lang
     ql_output = output_ql_csv.format(language=lang)
     utils.create_empty_database(lang, config.ext, db)
-    utils.run_codeql_query(config.ql_path, db, ql_output)
+    utils.run_codeql_query(config.ql_path, db, ql_output, query_prefix)
     shutil.rmtree(db)
 
     packages = pack.PackageCollection(ql_output)

misc/scripts/library-coverage/generate-timeseries.py

@@ -41,14 +41,14 @@ def get_previous_sha(sha, date):
         return (parent_sha, parent_date)
 
 
-def get_packages(lang, query):
+def get_packages(lang, query, search_path):
     try:
         db = "empty_" + lang
         ql_output = "output-" + lang + ".csv"
         if os.path.isdir(db):
             shutil.rmtree(db)
         utils.create_empty_database(lang, ".java", db)
-        utils.run_codeql_query(query, db, ql_output)
+        utils.run_codeql_query(query, db, ql_output, search_path)
 
         return pack.PackageCollection(ql_output)
     except:
@@ -142,7 +142,7 @@ def get_packages(lang, query):
                 csvwriter_total = language_utils[lang]["csvwriter_total"]
                 csvwriter_packages = language_utils[lang]["csvwriter_packages"]
 
-                packages = get_packages(lang, config.ql_path)
+                packages = get_packages(lang, config.ql_path, ".")
 
                 csvwriter_total.writerow([
                     current_sha,

misc/scripts/library-coverage/utils.py

@@ -27,10 +27,11 @@ def create_empty_database(lang, extension, database):
                    database, "--no-pre-finalize"])
 
 
-def run_codeql_query(query, database, output):
+def run_codeql_query(query, database, output, search_path):
     """Runs a codeql query on the given database."""
-    subprocess_run(["codeql", "query", "run", query,
-                   "--database", database, "--output", output + ".bqrs"])
+    # --search-path is required when the CLI needs to upgrade the database scheme.
+    subprocess_run(["codeql", "query", "run", query, "--database", database,
+                   "--output", output + ".bqrs", "--search-path", search_path])
     subprocess_run(["codeql", "bqrs", "decode", output + ".bqrs",
                    "--format=csv", "--no-titles", "--output", output])
     os.remove(output + ".bqrs")