Use python rather than string for primaryjoin

This commit is contained in:
George Drummond
2019-06-05 10:53:06 -04:00
parent c90e574e83
commit 0fa43021f8
4 changed files with 23 additions and 12 deletions

View File

@@ -1,8 +1,8 @@
from sqlalchemy import String, ForeignKey, Column, Date, Boolean, Table, TIMESTAMP
from sqlalchemy import and_, String, ForeignKey, Column, Date, Boolean, Table, TIMESTAMP
from sqlalchemy.orm import relationship
from sqlalchemy.dialects.postgresql import UUID
from atst.models import Base, types, mixins
from atst.models import Base, ApplicationRole, types, mixins
from atst.models.permissions import Permissions
from atst.models.portfolio_invitation import PortfolioInvitation
from atst.models.application_invitation import ApplicationInvitation
@@ -30,7 +30,9 @@ class User(
application_roles = relationship(
"ApplicationRole",
backref="user",
primaryjoin="and_(ApplicationRole.user_id==User.id, ApplicationRole.deleted==False)",
primaryjoin=and_(
ApplicationRole.user_id == id, ApplicationRole.deleted == False
),
)
portfolio_invitations = relationship(