jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' of github.com:kylewm/woodwind

Browse source
This commit is contained in:
Kyle Mahan 2015-06-20 22:09:08 +00:00
commit 9897b5270d
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
woodwind/models.py
View file

@ -107,8 +107,8 @@ class Feed(db.Model):
class Subscription(db.Model):
id = db.Column(db.Integer, primary_key=True)
user_id = db.Column(db.Integer, db.ForeignKey(User.id))
feed_id = db.Column(db.Integer, db.ForeignKey(Feed.id))
user_id = db.Column(db.Integer, db.ForeignKey(User.id), index=True)
feed_id = db.Column(db.Integer, db.ForeignKey(Feed.id), index=True)
# user-editable name of this subscribed feed
name = db.Column(db.String(256))

4
woodwind/views.py
View file

@ -37,8 +37,7 @@ def index():
entry_query = db.session.query(Entry, Subscription)\
.options(
sqlalchemy.orm.subqueryload(Entry.feed),
sqlalchemy.orm.subqueryload(Entry.reply_context)
)\
sqlalchemy.orm.subqueryload(Entry.reply_context))\
.join(Entry.feed)\
.join(Feed.subscriptions)\
.join(Subscription.user)\
@ -71,7 +70,6 @@ def index():
entry_query = entry_query.order_by(Entry.retrieved.desc(),
Entry.published.desc())\
.offset(offset).limit(per_page)
print('found some entries:', len(entry_query.all()))
entry_tups = entry_query.all()
# stick the subscription into the entry.