Fix SA 2.0 ORM usage in model.tags

galaxyproject · Sep 28, 2023 · 85e6fe4 · 85e6fe4
1 parent fb01a41
commit 85e6fe4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/galaxy/model/tags.py b/lib/galaxy/model/tags.py
@@ -287,12 +287,12 @@ def get_tags_str(self, tags):
 
     def get_tag_by_id(self, tag_id):
         """Get a Tag object from a tag id."""
-        return self.sa_session.query(galaxy.model.Tag).filter_by(id=tag_id).first()
+        return self.sa_session.get(galaxy.model.Tag, tag_id)
 
     def get_tag_by_name(self, tag_name):
         """Get a Tag object from a tag name (string)."""
         if tag_name:
-            return self.sa_session.query(galaxy.model.Tag).filter_by(name=tag_name.lower()).first()
+            return self.sa_session.scalars(select(galaxy.model.Tag).filter_by(name=tag_name.lower()).limit(1)).first()
         return None
 
     def _create_tag(self, tag_str: str):
@@ -317,7 +317,7 @@ def _create_tag(self, tag_str: str):
         return tag
 
     def _get_tag(self, tag_name):
-        return self.sa_session.query(galaxy.model.Tag).filter_by(name=tag_name).first()
+        return self.sa_session.scalars(select(galaxy.model.Tag).filter_by(name=tag_name).limit(1)).first()
 
     def _create_tag_instance(self, tag_name):
         # For good performance caller should first check if there's already an appropriate tag