ss

[rainbowstream.git] / rainbowstream / db.py

diff --git a/rainbowstream/db.py b/rainbowstream/db.py
index e0c7e84b2d2ffe7f160ef8f45c54795e1cace8d8..cac9a73d6a62dd0f05ab45cea3afa1520891561e 100644 (file)
--- a/rainbowstream/db.py
+++ b/rainbowstream/db.py
@@ -4,9 +4,10 @@ from sqlalchemy.orm import sessionmaker
 from table_def import Map
 from .table_def import *
 
+
 class RainbowDB():
 
-    engine=None
+    engine = None
 
     def __init__(self):
         if not os.path.isfile('rainbow.db'):
@@ -29,7 +30,7 @@ class RainbowDB():
         """
         Session = sessionmaker(bind=self.engine)
         session = Session()
-        res = session.query(Map).filter("rainbow_id =:rid").params(rid=rid).all()
+        res = session.query(Map).filter_by(rainbow_id=rid).all()
         return res
 
     def tweet_query(self, tid):
@@ -38,14 +39,5 @@ class RainbowDB():
         """
         Session = sessionmaker(bind=self.engine)
         session = Session()
-        res = session.query(Map).filter("tweet_id =:tid").params(tid=tid).all()
-        return res
-
-    def truncate(self):
-        """
-        Truncate table
-        """
-        Session = sessionmaker(bind=self.engine)
-        session = Session()
-        session.query(Map).delete()
-        session.commit()
+        res = session.query(Map).filter_by(tweet_id=tid).all()
+        return res
\ No newline at end of file