X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/639e513039ac1ae4389271f4f7a099233c0e064d..fd25c8fad5568c8f91b1e4455b616908ad0e42f1:/pokedex/db/tables.py

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 4f5b80d..fd08902 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -217,6 +217,7 @@ class ItemFlingEffect(TableBase):
 class ItemPocket(TableBase):
     __tablename__ = 'item_pockets'
     id = Column(Integer, primary_key=True, nullable=False)
+    identifier = Column(Unicode(16), nullable=False)
     name = Column(Unicode(16), nullable=False)
 
 class Language(TableBase):
@@ -614,9 +615,13 @@ Generation.main_region = relation(Region)
 
 Item.berry = relation(Berry, uselist=False, backref='item')
 Item.fling_effect = relation(ItemFlingEffect, backref='items')
-Item.category = relation(ItemCategory, backref='items')
+Item.category = relation(ItemCategory)
+Item.pocket = association_proxy('category', 'pocket')
 
-ItemCategory.pocket = relation(ItemPocket, backref='categories')
+ItemCategory.items = relation(Item, order_by=Item.name)
+ItemCategory.pocket = relation(ItemPocket)
+
+ItemPocket.categories = relation(ItemCategory, order_by=ItemCategory.name)
 
 Location.region = relation(Region, backref='locations')