reorganizing named/classified fetching code so it is more efficient

fhcrc · May 31, 2024 · 8752eed · 8752eed
1 parent acd8746
commit 8752eed
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/taxtastic/taxonomy.py b/taxtastic/taxonomy.py
@@ -833,11 +833,11 @@ def species_below(self, tax_id):
             return newc
 
     def named(self, no_rank=True):
-        nodes = self.nodes
         names = self.names
-        s = select(nodes.c.tax_id)
-        s = s.join(nodes, nodes.c.tax_id == names.c.tax_id)
+        s = select(names.c.tax_id)
         s = s.where(names.c.is_classified)
         if not no_rank:
+            nodes = self.nodes
+            s = s.join(nodes, nodes.c.tax_id == names.c.tax_id)
             s = s.where(nodes.c.rank != 'no_rank')
         return [f[0] for f in self.fetchall(s)]