From 455ef346b3f4333fcd856ba2dfbea209d117e401 Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@gmail.com>
Date: Sun, 19 Apr 2015 07:47:13 -0700
Subject: [PATCH] add indices officially

---
 migrations/versions/5824a5f06dd_.py | 36 ++++++++++++++++++++++++++
 migrations/versions/6063621148_.py  | 40 -----------------------------
 woodwind/models.py                  |  6 ++---
 3 files changed, 39 insertions(+), 43 deletions(-)
 create mode 100644 migrations/versions/5824a5f06dd_.py
 delete mode 100644 migrations/versions/6063621148_.py

diff --git a/migrations/versions/5824a5f06dd_.py b/migrations/versions/5824a5f06dd_.py
new file mode 100644
index 0000000..5b40e28
--- /dev/null
+++ b/migrations/versions/5824a5f06dd_.py
@@ -0,0 +1,36 @@
+"""empty message
+
+Revision ID: 5824a5f06dd
+Revises: None
+Create Date: 2015-04-19 07:45:58.410077
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '5824a5f06dd'
+down_revision = None
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.create_index(op.f('ix_entry_feed_id'), 'entry', ['feed_id'], unique=False)
+    op.create_index(op.f('ix_entry_permalink'), 'entry', ['permalink'], unique=False)
+    op.create_index(op.f('ix_entry_retrieved'), 'entry', ['retrieved'], unique=False)
+    op.drop_index('entry_feed_id_idx', table_name='entry')
+    op.drop_index('entry_permalink_idx', table_name='entry')
+    op.drop_index('entry_retrieved_idx', table_name='entry')
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.create_index('entry_retrieved_idx', 'entry', ['retrieved'], unique=False)
+    op.create_index('entry_permalink_idx', 'entry', ['permalink'], unique=False)
+    op.create_index('entry_feed_id_idx', 'entry', ['feed_id'], unique=False)
+    op.drop_index(op.f('ix_entry_retrieved'), table_name='entry')
+    op.drop_index(op.f('ix_entry_permalink'), table_name='entry')
+    op.drop_index(op.f('ix_entry_feed_id'), table_name='entry')
+    ### end Alembic commands ###
diff --git a/migrations/versions/6063621148_.py b/migrations/versions/6063621148_.py
deleted file mode 100644
index 21695e5..0000000
--- a/migrations/versions/6063621148_.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""empty message
-
-Revision ID: 6063621148
-Revises: None
-Create Date: 2015-04-18 17:44:08.465907
-
-"""
-
-# revision identifiers, used by Alembic.
-revision = '6063621148'
-down_revision = None
-
-from alembic import op
-import sqlalchemy as sa
-
-
-def upgrade():
-    ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index('idx_entry_feed_id', table_name='entry')
-    op.drop_index('idx_entry_id', table_name='entry')
-    op.drop_index('idx_entry_permalink', table_name='entry')
-    op.drop_index('idx_entry_retrieved', table_name='entry')
-    op.drop_index('idx_feed_id', table_name='feed')
-    op.drop_constraint(None, 'feed', type_='foreignkey')
-    op.drop_column('feed', 'user_id')
-    op.drop_index('idx_user_id', table_name='user')
-    ### end Alembic commands ###
-
-
-def downgrade():
-    ### commands auto generated by Alembic - please adjust! ###
-    op.create_index('idx_user_id', 'user', ['id'], unique=False)
-    op.add_column('feed', sa.Column('user_id', sa.INTEGER(), nullable=True))
-    op.create_foreign_key(None, 'feed', 'user', ['user_id'], ['id'])
-    op.create_index('idx_feed_id', 'feed', ['id'], unique=False)
-    op.create_index('idx_entry_retrieved', 'entry', ['retrieved'], unique=False)
-    op.create_index('idx_entry_permalink', 'entry', ['permalink'], unique=False)
-    op.create_index('idx_entry_id', 'entry', ['id'], unique=False)
-    op.create_index('idx_entry_feed_id', 'entry', ['feed_id'], unique=False)
-    ### end Alembic commands ###
diff --git a/woodwind/models.py b/woodwind/models.py
index fd5d091..92b6c0e 100644
--- a/woodwind/models.py
+++ b/woodwind/models.py
@@ -122,13 +122,13 @@ class Feed(db.Model):
 
 class Entry(db.Model):
     id = db.Column(db.Integer, primary_key=True)
-    feed_id = db.Column(db.Integer, db.ForeignKey(Feed.id))
+    feed_id = db.Column(db.Integer, db.ForeignKey(Feed.id), index=True)
     feed = db.relationship(Feed, backref='entries')
     published = db.Column(db.DateTime)
     updated = db.Column(db.DateTime)
-    retrieved = db.Column(db.DateTime)
+    retrieved = db.Column(db.DateTime, index=True)
     uid = db.Column(db.String(512))
-    permalink = db.Column(db.String(512))
+    permalink = db.Column(db.String(512), index=True)
     author_name = db.Column(db.String(512))
     author_url = db.Column(db.String(512))
     author_photo = db.Column(db.String(512))