diff --git a/frontend/frontend/migrations/0005_auto_20180131_1949.py b/frontend/frontend/migrations/0005_auto_20180131_1949.py new file mode 100644 index 0000000..63b5e97 --- /dev/null +++ b/frontend/frontend/migrations/0005_auto_20180131_1949.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('frontend', '0004_feed_edited'), + ] + + operations = [ + migrations.RemoveField( + model_name='postfield', + name='field', + ), + migrations.RemoveField( + model_name='postfield', + name='post', + ), + migrations.DeleteModel( + name='PostField', + ), + ] diff --git a/frontend/frontend/models.py b/frontend/frontend/models.py index 6c57ddc..9fdc53e 100644 --- a/frontend/frontend/models.py +++ b/frontend/frontend/models.py @@ -22,8 +22,3 @@ class Post(models.Model): class Meta: index_together = ['feed', 'md5sum'] - -class PostField(models.Model): - post = models.ForeignKey(Post, on_delete=models.CASCADE) - field = models.ForeignKey(Field, on_delete=models.CASCADE) - text = models.TextField(max_length=64*1024-1) \ No newline at end of file diff --git a/pol/feed.py b/pol/feed.py index 39688a7..5b7475b 100755 --- a/pol/feed.py +++ b/pol/feed.py @@ -34,12 +34,7 @@ class Feed(object): with conn as cur: cur.execute("""insert into frontend_post (md5sum, created, feed_id) values (%s, %s, %s)""", (post_fields['md5'], created, feed_id)) - post_id = conn.insert_id() - for key in ['title', 'description', 'title_link']: - if key in post_fields: - cur.execute("""insert into frontend_postfield (field_id, post_id, `text`) - values (%s, %s, %s)""", (self.FIELD_IDS[key], post_id, post_fields[key].encode('utf-8'))) log.info('Post saved id:{id!r}', id=post_id) def fill_time(self, feed_id, items):