X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=ee991b75abbc127abf67ed194f24ff89a301f1a8;hb=fed6d11d2cbd6d617d18bc01a78196865da4155b;hp=90c8b4d559f28e931a5b67056142e2daea321d22;hpb=f03d48ccc07789e1c56b07cec50820f3ad26f8ba;p=bluechips.git

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 90c8b4d..ee991b7 100644
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -7,6 +7,7 @@ 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.tag import Tag
 
 from bluechips.model import meta
 from bluechips.model import types
@@ -53,6 +54,18 @@ splits = sa.Table('splits', meta.metadata,
                   sa.Column('share', types.DBCurrency, nullable=False)
                   )
 
+tags = sa.Table('tags', meta.metadata,
+                sa.Column('id', sa.types.Integer, primary_key=True),
+                sa.Column('name', sa.Text))
+
+tag_to_expense_map = sa.Table('tag_to_expense_map', meta.metadata,
+                              sa.Column('tag_id', sa.types.Integer,
+                                        sa.ForeignKey('tags.id'),
+                                        primary_key=True),
+                              sa.Column('expenditure_id', sa.types.Integer,
+                                        sa.ForeignKey('expenditures.id'),
+                                        primary_key=True))
+
 subitems = sa.Table('subitems', meta.metadata,
                     sa.Column('id', sa.types.Integer, primary_key=True),
                     sa.Column('expenditure_id', sa.types.Integer,
@@ -88,6 +101,8 @@ orm.mapper(Expenditure, expenditures,
            properties={
         'splits': orm.relation(Split, backref='expenditure',
                                cascade='all, delete'),
+        '_tags': orm.relation(Tag, secondary=tag_to_expense_map,
+                             collection_class=set, cascade='all, delete'),
         'subitems': orm.relation(Subitem, backref='expenditure',
                                  cascade='all, delete')
 })
@@ -96,6 +111,9 @@ orm.mapper(Split, splits, properties={
         'user': orm.relation(User)
 })
 
+orm.mapper(Tag, tags, properties={
+        'expenditures': orm.relation(Expenditure, secondary=tag_to_expense_map)})
+
 orm.mapper(Subitem, subitems, properties={
         'user': orm.relation(User)
 })
@@ -111,6 +129,6 @@ orm.mapper(Transfer, transfers,
                                                   users.c.id))
 })
 
-__all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers',
-           'User', 'Expenditure', 'Split', 'Subitem', 'Transfer',
+__all__ = ['users', 'expenditures', 'splits', 'tags', 'subitems', 'transfers',
+           'User', 'Expenditure', 'Split', 'Tag', 'Subitem', 'Transfer',
            'meta']