diff --git a/load-stream.py b/load-stream.py index 2c1cb64..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: 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)