From a6a00e971772a09d24d5556c5ca2df7756a31f6a Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@gmail.com>
Date: Sat, 20 Jun 2015 15:06:23 -0700
Subject: [PATCH] add indexes on Subscription.feed_id and user_id

---
 woodwind/models.py | 4 ++--
 woodwind/views.py  | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/woodwind/models.py b/woodwind/models.py
index 9858928..2f8fcd3 100644
--- a/woodwind/models.py
+++ b/woodwind/models.py
@@ -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))
diff --git a/woodwind/views.py b/woodwind/views.py
index 42b7989..ed0cc50 100644
--- a/woodwind/views.py
+++ b/woodwind/views.py
@@ -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.