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)
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,
orm.mapper(User, users,
properties={
'expenditures': orm.relation(Expenditure,
- backref='spender',
- lazy=False)
+ 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'),
'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==\
- users.c.id),
- lazy=False),
+ users.c.id)),
'creditor': orm.relation(User,
primaryjoin=(transfers.c.creditor_id==\
- users.c.id),
- lazy=False)
+ users.c.id))
})
__all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers',