Fix review findings

Author: tamasvajk

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

@@ -134,8 +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)
+    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

@@ -48,8 +48,7 @@ def get_packages(lang, query, search_path):
         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)
+        utils.run_codeql_query(query, db, ql_output, search_path)
 
         return pack.PackageCollection(ql_output)
     except:

misc/scripts/library-coverage/utils.py

@@ -27,15 +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):
+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")