X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=3c71c6ed15d54a75ae4056a1c81a8c101be98826;hb=74d234f880ee6b3c510227ea94459b81a79755db;hp=a5ab0a0e74a9a2daa6364e25a29618e6faf8afc9;hpb=3b864c81e804769f2be45b38c319895d1735aef9;p=bluechips.git

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index a5ab0a0..3c71c6e 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
@@ -38,7 +38,7 @@ expenditures = sa.Table('expenditures', meta.metadata,
                         sa.Column('description', sa.types.Text),
                         sa.Column('date', sa.types.Date, default=datetime.now),
                         sa.Column('entered_time', sa.types.DateTime, 
-                                  default=datetime.now)
+                                  default=datetime.utcnow)
                         )
 
 splits = sa.Table('splits', meta.metadata,
@@ -69,27 +69,31 @@ transfers = sa.Table('transfers', meta.metadata,
                      sa.Column('description', sa.Text, default=None),
                      sa.Column('date', sa.types.Date, default=datetime.now),
                      sa.Column('entered_time', sa.types.DateTime,
-                               default=datetime.now)
+                               default=datetime.utcnow)
                      )
 
 ### DB/Class Mapping ###
 
-orm.mapper(User, users)
+orm.mapper(User, users,
+           properties={
+        'expenditures': orm.relation(Expenditure,
+                                     backref='spender',
+                                     lazy=False)
+})
 
 orm.mapper(Expenditure, expenditures, order_by=expenditures.c.date.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)
 })