fix ORM query for retrieving matrix classes

this restores passing plot tests
widdowquinn · Feb 21, 2024 · 6300339 · 6300339
1 parent 7f380fe
commit 6300339
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pyani/pyani_orm.py b/pyani/pyani_orm.py
@@ -402,7 +402,7 @@ def get_matrix_classes_for_run(session: Any, run_id: int) -> Dict[str, List]:
     """
     results = (
         session.query(Genome.genome_id, Label.class_label)
-        .join(rungenome, Run)
+        .join(rungenome, Genome.genome_id == rungenome.c.genome_id)
         .join(
             Label, and_(Genome.genome_id == Label.genome_id, Run.run_id == Label.run_id)
         )

diff --git a/pyani/scripts/subcommands/subcmd_plot.py b/pyani/scripts/subcommands/subcmd_plot.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # (c) The James Hutton Institute 2017-2019
-# (c) University of Strathclyde 2019-2022
+# (c) University of Strathclyde 2019-2024
 # Author: Leighton Pritchard
 #
 # Contact:
@@ -18,7 +18,7 @@
 # The MIT License
 #
 # Copyright (c) 2017-2019 The James Hutton Institute
-# Copyright (c) 2019-2022 University of Strathclyde
+# Copyright (c) 2019-2024 University of Strathclyde
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal