Upgrade database in coverage report jobs

Author: tamasvajk

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

@@ -134,6 +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.upgrade_codeql_database(db, query_prefix)
     utils.run_codeql_query(config.ql_path, db, ql_output)
     shutil.rmtree(db)
 

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

@@ -41,13 +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.upgrade_codeql_database(db, search_path)
         utils.run_codeql_query(query, db, ql_output)
 
         return pack.PackageCollection(ql_output)
@@ -142,7 +143,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,6 +27,11 @@ def create_empty_database(lang, extension, database):
                    database, "--no-pre-finalize"])
 
 
+def upgrade_codeql_database(database, search_path):
+    subprocess_run(["codeql", "database", "upgrade", database,
+                   "--search-path", search_path])
+
+
 def run_codeql_query(query, database, output):
     """Runs a codeql query on the given database."""
     subprocess_run(["codeql", "query", "run", query,