X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=12e28d81a99d1fe023d361bb92b711f64bb69eb3;hb=30f5cb7f4149310ce5666bb3e49a7a723677c45e;hp=24e72d7eae3b93c4882609ce1608e74dc866c12e;hpb=b5ee99d4e12311d9b7b5aa9b207185a96fff4f95;p=bluechips.git diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py index 24e72d7..12e28d8 100644 --- 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 +from datetime 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, @@ -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 ###