--- a/pvl/verkko/db.py	Thu Oct 18 21:17:11 2012 +0300
+++ b/pvl/verkko/db.py	Thu Oct 18 23:06:23 2012 +0300
@@ -8,8 +8,7 @@
 
 # TODO: count, completely separate dhcp_events?
 dhcp_hosts = Table('dhcp_hosts', metadata,
-    # TODO: rename: id
-    Column('rowid',         Integer,    primary_key=True),
+    Column('id',         Integer,    primary_key=True),
 
     # unique
     Column('ip',            String,     nullable=False),
@@ -19,12 +18,14 @@
     # updated
     Column('first_seen',    DateTime,   nullable=False),
     Column('last_seen',     DateTime,   nullable=False),
-
-    # TODO: rename: state
-    Column('last_msg',      String,     nullable=False),
     
     # scalar; updated
     Column('name',          String,     nullable=True),
+    Column('state',         String,     nullable=True),
+    Column('error',         String,     nullable=True),
+    
+    # counters
+    Column('count',         Integer,    default=1),
 
     UniqueConstraint('ip', 'mac', 'gw'),
 )
@@ -50,12 +51,11 @@
         self.engine = create_engine(database, 
             echo    = (log.isEnabledFor(logging.DEBUG)),
         )
-        self.session = Session(bind=self.engine)
 
     # ORM
-    def query (self, cls) :
-        return self.session.query(cls)
-    
+    def session (self) :
+        return Session(bind=self.engine)
+   
     # SQL
     def select (self, query) :
         return self.engine.execute(query)