--- a/script/lib/iri_tweet/models.py	Thu Mar 31 12:45:50 2011 +0200
+++ b/script/lib/iri_tweet/models.py	Wed Apr 06 16:39:42 2011 +0200
@@ -1,10 +1,10 @@
-from sqlalchemy import Boolean, Table, Column, BigInteger, Integer, String, \
-    MetaData, ForeignKey, DateTime, create_engine
+from sqlalchemy import (Boolean, Column, BigInteger, Integer, String, ForeignKey,
+    DateTime, create_engine)
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import relationship, backref
+from sqlalchemy.orm import relationship
+import anyjson
 import datetime
 import email.utils
-import anyjson
 
 
 Base = declarative_base()
@@ -12,11 +12,13 @@
 APPLICATION_NAME = "IRI_TWITTER" 
 CONSUMER_KEY = "54ThDZhpEjokcMgHJOMnQA"
 CONSUMER_SECRET = "wUoL9UL2T87tfc97R0Dff2EaqRzpJ5XGdmaN2XK3udA"
+ACCESS_TOKEN_KEY = None
+ACCESS_TOKEN_SECRET = None
 #ACCESS_TOKEN_KEY= "47312923-LiNTtz0I18YXMVIrFeTuhmH7bOvYsK6p3Ln2Dc"
 #ACCESS_TOKEN_SECRET = "r3LoXVcjImNAElUpWqTu2SG2xCdWFHkva7xeQoncA"
 
 def adapt_date(date_str):
-    ts = email.utils.parsedate_tz(date_str)
+    ts = email.utils.parsedate_tz(date_str) #@UndefinedVariable
     return datetime.datetime(*ts[0:7])
 
 def adapt_json(obj):
@@ -72,7 +74,24 @@
         for key, value in kwargs.items():
             if hasattr(self,key):
                 setattr(self,key,value)
+
+class UserMessage(Base):
+    __tablename__ = "tweet_user_message"
+
+    id = Column(Integer, primary_key = True)
+    user_id = Column(Integer, ForeignKey('tweet_user.id'))
+    created_at = Column(DateTime, default=datetime.datetime.now())
+    message_id = Column(Integer, ForeignKey('tweet_message.id'))
+
+class Message(Base):
     
+    __tablename__ = "tweet_message"
+    
+    id = Column(Integer, primary_key = True)
+    created_at = Column(DateTime, default=datetime.datetime.now())
+    text = Column(String)
+    users = relationship(UserMessage, backref='message')
+        
 
 class User(Base):
     __tablename__ = "tweet_user"
@@ -112,12 +131,12 @@
     utc_offset = Column(Integer)
     verified= Column(Boolean)
     tweets = relationship(Tweet, backref='user')
+    messages  = relationship(UserMessage, backref='user')
 
     def __init__(self, **kwargs):
         for key, value in kwargs.items():
             if hasattr(self,key):
-                setattr(self,key,value)
-
+                setattr(self,key,value)    
     
 
 class Hashtag(Base):