From 11032b1d71eebf065b6f00aa1e9b08587cdddc1e Mon Sep 17 00:00:00 2001 From: aankit Date: Sat, 22 Nov 2014 15:12:39 -0500 Subject: [PATCH 1/3] fixing hashtag associotion secondary ref --- tweetsql/model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tweetsql/model.py b/tweetsql/model.py index 0cf397b..77cfa3d 100644 --- a/tweetsql/model.py +++ b/tweetsql/model.py @@ -19,8 +19,8 @@ class Hashtag(Base): __tablename__ = 'hashtag' id = Column(Integer, primary_key=True) hashtag = Column(String(200), nullable=False) - users = relationship('User', backref='hashtags', secondary='hashtag_user') - tweets = relationship('Tweet', backref='hashtags', secondary='hashtag_tweet') + users = relationship('User', backref='hashtags', secondary=hashtag_user) + tweets = relationship('Tweet', backref='hashtags', secondary=hashtag_tweet) def __repr(self): return ''.format(self.hashtag) From bf38c218d9d6b748a460d7df9932bbbf1b8b6250 Mon Sep 17 00:00:00 2001 From: aankit Date: Sun, 23 Nov 2014 02:01:21 -0500 Subject: [PATCH 2/3] fixing tweet word insert --- load-stream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/load-stream.py b/load-stream.py index 2c1cb64..7082d82 100644 --- a/load-stream.py +++ b/load-stream.py @@ -44,7 +44,7 @@ w_obj = Word(word=w) db_session.add(w_obj) db_session.commit() - tw.words.append(w_obj) + tw.words.append(w_obj) db_session.add(tw) db_session.commit() except OperationalError: From d7e28db3ad073b06726a4062da8d42c696a9742f Mon Sep 17 00:00:00 2001 From: aankit Date: Sun, 23 Nov 2014 15:10:10 -0500 Subject: [PATCH 3/3] adding word-tweet association, if doesn't already exist --- load-stream.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/load-stream.py b/load-stream.py index 7082d82..99f37cc 100644 --- a/load-stream.py +++ b/load-stream.py @@ -44,7 +44,8 @@ w_obj = Word(word=w) db_session.add(w_obj) db_session.commit() - tw.words.append(w_obj) + if w_obj not in tw.words: + tw.words.append(w_obj) db_session.add(tw) db_session.commit() except OperationalError: