Map RepositoryRoleAssoc; fix SAWarning (back_populates)

galaxyproject · Oct 9, 2021 · 4fdc1da · 4fdc1da
1 parent 14eb3bb
commit 4fdc1da
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/lib/tool_shed/webapp/model/__init__.py b/lib/tool_shed/webapp/model/__init__.py
@@ -263,7 +263,17 @@ def __init__(self, group, role):
         self.role = role
 
 
-class RepositoryRoleAssociation(_HasTable):
+class RepositoryRoleAssociation(Base, _HasTable):
+    __tablename__ = 'repository_role_association'
+
+    id = Column(Integer, primary_key=True)
+    repository_id = Column(Integer, ForeignKey("repository.id"), index=True)
+    role_id = Column(Integer, ForeignKey("role.id"), index=True)
+    create_time = Column(DateTime, default=now)
+    update_time = Column(DateTime, default=now, onupdate=now)
+    repository = relationship('Repository', back_populates='roles')
+    role = relationship('Role', back_populates='repositories')
+
     def __init__(self, repository, role):
         self.repository = repository
         self.role = role

diff --git a/lib/tool_shed/webapp/model/mapping.py b/lib/tool_shed/webapp/model/mapping.py
@@ -32,13 +32,6 @@
                                   Column("create_time", DateTime, default=now),
                                   Column("update_time", DateTime, default=now, onupdate=now))
 
-RepositoryRoleAssociation.table = Table("repository_role_association", metadata,
-                                        Column("id", Integer, primary_key=True),
-                                        Column("repository_id", Integer, ForeignKey("repository.id"), index=True),
-                                        Column("role_id", Integer, ForeignKey("role.id"), index=True),
-                                        Column("create_time", DateTime, default=now),
-                                        Column("update_time", DateTime, default=now, onupdate=now))
-
 Repository.table = Table("repository", metadata,
                          Column("id", Integer, primary_key=True),
                          Column("create_time", DateTime, default=now),
@@ -85,11 +78,6 @@
                                Column("rating", Integer, index=True),
                                Column("deleted", Boolean, index=True, default=False))
 
-mapper_registry.map_imperatively(RepositoryRoleAssociation, RepositoryRoleAssociation.table,
-       properties=dict(
-           repository=relation(Repository),
-           role=relation(Role, back_populates='repositories')))
-
 mapper_registry.map_imperatively(UserRoleAssociation, UserRoleAssociation.table,
        properties=dict(
            user=relation(User, backref="roles"),
@@ -108,7 +96,7 @@
                                            order_by=desc(RepositoryMetadata.table.c.update_time)),
            metadata_revisions=relation(RepositoryMetadata,
                                        order_by=desc(RepositoryMetadata.table.c.update_time)),
-           roles=relation(RepositoryRoleAssociation),
+           roles=relation(RepositoryRoleAssociation, back_populates='repository'),
            reviews=relation(RepositoryReview,
                             primaryjoin=(Repository.table.c.id == RepositoryReview.table.c.repository_id)),
            reviewers=relation(User,

diff --git a/test/unit/shed_unit/model/test_mapping.py b/test/unit/shed_unit/model/test_mapping.py
@@ -583,7 +583,7 @@ def test_relationships(self, session, cls_, repository, user, repository_metadat
 class TestRepositoryRoleAssociation(BaseTest):
 
     def test_table(self, cls_):
-        assert cls_.table.name == 'repository_role_association'
+        assert cls_.__tablename__ == 'repository_role_association'
 
     def test_columns(self, session, cls_, repository, role):
         create_time = datetime.now()