X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=4b016eab8223392a79cc32f5a02f669bec2c9b07;hb=b388680b952ba47bc0fa7d4502e7d2831a392eda;hp=0be372cc5e5914124d1d0fb1d0a0c06fb295b63a;hpb=c52f0941005efb878198eaf6263b77b4ee326266;p=bluechips.git

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 0be372c..4b016ea 100644
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -2,11 +2,11 @@
 import sqlalchemy as sa
 from sqlalchemy import orm
 
-from user import *
-from expenditure import *
-from split import *
-from subitem import *
-from transfer import *
+from bluechips.model.user import User
+from bluechips.model.expenditure import Expenditure
+from bluechips.model.split import Split
+from bluechips.model.subitem import Subitem
+from bluechips.model.transfer import Transfer
 
 from bluechips.model import meta
 from bluechips.model import types
@@ -74,35 +74,38 @@ transfers = sa.Table('transfers', meta.metadata,
 
 ### DB/Class Mapping ###
 
-orm.mapper(User, users)
+orm.mapper(User, users,
+           properties={
+        'expenditures': orm.relation(Expenditure,
+                                     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={
-        'spender': orm.relation(User,
-                                backref='expenditures',
-                                lazy=False)
+        'splits': orm.relation(Split, backref='expenditure',
+                               cascade='all, delete'),
+        'subitems': orm.relation(Subitem, backref='expenditure',
+                                 cascade='all, delete')
 })
 
 orm.mapper(Split, splits, properties={
-        'expenditure': orm.relation(Expenditure, backref='splits'),
         'user': orm.relation(User)
 })
 
 orm.mapper(Subitem, subitems, properties={
-        'expenditure': orm.relation(Expenditure, backref='subitems'),
         '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',