Merge remote branch 'storborg/master'

[bluechips.git] / bluechips / model / __init__.py

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 49d6046f56a3d3b26359112c073ca0bcf18d8364..8efaec6ae9abcdcfaeea8cfcab585797c0cfbaac 100644 (file)
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -16,7 +16,7 @@ from datetime import datetime
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
 
-    sm = orm.sessionmaker(autoflush=True, transactional=True, bind=engine)
+    sm = orm.sessionmaker(autoflush=True, bind=engine)
 
     meta.engine = engine
     meta.Session = orm.scoped_session(sm)
@@ -27,7 +27,8 @@ users = sa.Table('users', meta.metadata,
                  sa.Column('id', sa.types.Integer, primary_key=True),
                  sa.Column('username', sa.types.Unicode(32), nullable=False),
                  sa.Column('name', sa.types.Unicode(64)),
-                 sa.Column('resident', sa.types.Boolean, default=True)
+                 sa.Column('resident', sa.types.Boolean, default=True),
+                 sa.Column('email', sa.types.Unicode(64))
                  )
 
 expenditures = sa.Table('expenditures', meta.metadata,
@@ -80,7 +81,8 @@ orm.mapper(User, users,
                                      backref='spender')
 })
 
-orm.mapper(Expenditure, expenditures, order_by=expenditures.c.date.desc(),
+orm.mapper(Expenditure, expenditures,
+           order_by=[expenditures.c.date.desc(), expenditures.c.entered_time.desc()],
            properties={
         'splits': orm.relation(Split, backref='expenditure',
                                cascade='all, delete'),
@@ -96,7 +98,8 @@ orm.mapper(Subitem, subitems, properties={
         'user': orm.relation(User)
 })
 
-orm.mapper(Transfer, transfers, order_by=transfers.c.date.desc(),
+orm.mapper(Transfer, transfers,
+           order_by=[transfers.c.date.desc(), transfers.c.entered_time.desc()],
            properties={
         'debtor': orm.relation(User,
                                primaryjoin=(transfers.c.debtor_id==\