--- a/script/lib/iri_tweet/models.py	Wed Jul 27 00:04:55 2011 +0200
+++ b/script/lib/iri_tweet/models.py	Mon Aug 08 09:01:40 2011 +0200
@@ -92,15 +92,12 @@
     text = Column(String)
     truncated = Column(Boolean)
     user_id = Column(Integer, ForeignKey('tweet_user.id'))
-    user = relationship("TweetUser", backref="tweets")
-#    original_json = Column(String)
+    user = relationship("User", backref="tweets")
     tweet_source_id = Column(Integer, ForeignKey('tweet_tweet_source.id'))
     tweet_source = relationship("TweetSource", backref="tweet")
     entity_list = relationship(Entity, backref='tweet')
     received_at = Column(DateTime, default=datetime.datetime.now())
-    
-    #user = relationship(User, primaryjoin=user_id == User.id)
-    
+        
     def __init__(self, **kwargs):
         for key, value in kwargs.items():
             if hasattr(self,key):
@@ -111,7 +108,7 @@
 
     id = Column(Integer, primary_key = True)
     user_id = Column(Integer, ForeignKey('tweet_user.id'))
-    user = relationship("TweetUser", backref="messages")
+    user = relationship("User", backref="messages")
     created_at = Column(DateTime, default=datetime.datetime.now())
     message_id = Column(Integer, ForeignKey('tweet_message.id'))
 
@@ -161,8 +158,8 @@
     url= Column(String)
     utc_offset = Column(Integer)
     verified= Column(Boolean)
-    tweets = relationship(Tweet, backref='user')
-    messages  = relationship(UserMessage, backref='user')
+    #tweets = relationship(Tweet, backref='user')
+    #messages  = relationship(UserMessage, backref='user')
 
     def __init__(self, **kwargs):
         for key, value in kwargs.items():