Change from using sa.func.now to datetime.now

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

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 296c2a53006dfbb9fad3d1616214404407a39634..e251d5099db3bcde35868462202ffc34fcac7096 100644 (file)
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -5,6 +5,8 @@ from sqlalchemy import orm
 from bluechips.model import meta
 from bluechips.model import types
 
+import datetime
+
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
 
@@ -28,9 +30,9 @@ expenditures = sa.Table('expenditures', meta.metadata,
                                   sa.ForeignKey('users.id'), nullable=False),
                         sa.Column('amount', types.Currency, nullable=False),
                         sa.Column('description', sa.types.Text),
-                        sa.Column('date', sa.types.Date, default=sa.func.now),
+                        sa.Column('date', sa.types.Date, default=datetime.now),
                         sa.Column('entered_time', sa.types.DateTime, 
-                                  default=sa.func.now)
+                                  default=datetime.now)
                         )
 
 splits = sa.Table('splits', meta.metadata,
@@ -39,7 +41,7 @@ splits = sa.Table('splits', meta.metadata,
                             sa.ForeignKey('expenditures.id'), nullable=False),
                   sa.Column('user_id', sa.types.Integer,
                             sa.ForeignKey('users.id'), nullable=False),
-                  sa.Column('share', sa.types.Integer, nullable=False)
+                  sa.Column('share', types.Currency, nullable=False)
                   )
 
 subitems = sa.Table('subitems', meta.metadata,
@@ -59,9 +61,9 @@ transfers = sa.Table('transfers', meta.metadata,
                                sa.ForeignKey('users.id'), nullable=False),
                      sa.Column('amount', types.Currency, nullable=False),
                      sa.Column('description', sa.Text, default=None),
-                     sa.Column('date', sa.types.Date, default=sa.func.now),
+                     sa.Column('date', sa.types.Date, default=datetime.now),
                      sa.Column('entered_time', sa.types.DateTime,
-                               default=sa.func.now)
+                               default=datetime.now)
                      )
 
 ### ORM Classes ###
@@ -73,13 +75,13 @@ class User(object):
 class Expenditure(object):
     def __repr__(self):
         return '<Expenditure: spender: %s spent: %s>' % (self.spender,
-                                               self.amount)
+                                                         self.amount)
 
 class Split(object):
     def __repr__(self):
-        return '<Split: expense: %s user: %s share: %s%%>' % (self.expenditure,
-                                                              self.user,
-                                                              self.share)
+        return '<Split: expense: %s user: %s share: %s>' % (self.expenditure,
+                                                            self.user,
+                                                            self.share)
 
 class Subitem(object):
     def __repr__(self):
@@ -120,6 +122,6 @@ orm.mapper(Transfer, transfers, properties={
                                                   users.c.id))
 })
 
-__all__ = [users, expenditures, splits, subitems, transfers,
-           User, Expenditure, Split, Subitem, Transfer,
-           meta]
+__all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers',
+           'User', 'Expenditure', 'Split', 'Subitem', 'Transfer',
+           'meta']