Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion load-stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions tweetsql/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<Hashtag {}>'.format(self.hashtag)
Expand Down