Skip to content

Commit

Permalink
Use eager loading of owners and subscribers
Browse files Browse the repository at this point in the history
Always join the `user` attribute when loading owners and subscribers to
avoid the situation described in commit #52c370b
  • Loading branch information
mjumbewu committed Apr 27, 2015
1 parent 52c370b commit 8811121
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions public_records_portal/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class Owner(db.Model):
__tablename__ = 'owner'
id = db.Column(db.Integer, primary_key =True)
user_id = Column(Integer, ForeignKey('user.id'))
user = relationship("User", uselist = False)
user = relationship("User", uselist = False, lazy='joined')
request_id = db.Column(db.Integer, db.ForeignKey('request.id'))
request = relationship("Request", foreign_keys = [request_id])
active = db.Column(db.Boolean, default = True) # Indicate whether they're still involved in the request or not.
Expand Down Expand Up @@ -284,7 +284,7 @@ class Subscriber(db.Model):
id = db.Column(db.Integer, primary_key = True)
should_notify = db.Column(db.Boolean, default = True) # Allows a subscriber to unsubscribe
user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
user = relationship("User", uselist = False)
user = relationship("User", uselist = False, lazy='joined')
request_id = db.Column(db.Integer, db.ForeignKey('request.id'))
date_created = db.Column(db.DateTime)
owner_id = db.Column(db.Integer, db.ForeignKey('owner.id')) # Not null if responsible for fulfilling a part of the request. UPDATE 6-11-2014: This isn't used. we should get rid of it.
Expand Down

0 comments on commit 8811121

Please # to comment.