diff --git a/diner.py b/diner.py index 83d7f1be1bf40be5e185b7e1bf70b89f1ae7f964..fbd2f07081fa4dd8172badfba479d7cb6c444a2c 100644 --- a/diner.py +++ b/diner.py @@ -15,7 +15,6 @@ class Menu(Persisted): __tablename__ = 'menus' menu_id = Column(Integer, primary_key=True) # primary keys default to auto_increment name = Column(String(256), nullable=False) # nullable is the default - items = relationship('Item', uselist=True, back_populates='menu') class Item(Persisted): @@ -25,17 +24,12 @@ class Item(Persisted): menu_id = Column(Integer, ForeignKey('menus.menu_id', ondelete='CASCADE'), nullable=False) name = Column(String(256), nullable=False) price = Column(Integer, nullable=False) - menu = relationship('Menu', back_populates='items') - orders = relationship('Order', uselist=True, secondary='order_items') - order_items = relationship('OrderItem', uselist=True, back_populates='item') class Order(Persisted): __tablename__ = 'orders' order_id = Column(Integer, primary_key=True) timestamp = Column(DateTime) - items = relationship('Item', uselist=True, secondary='order_items') - order_items = relationship('OrderItem', uselist=True, back_populates='order') class OrderItem(Persisted): @@ -43,8 +37,6 @@ class OrderItem(Persisted): order_id = Column(Integer, ForeignKey('orders.order_id', ondelete='CASCADE'), primary_key=True) item_id = Column(Integer, ForeignKey('items.item_id', ondelete='CASCADE'), primary_key=True) amount = Column(Integer) - order = relationship('Order', back_populates='order_items') - item = relationship('Item', back_populates='order_items') class DinerDatabase(object): diff --git a/diner_installer.py b/diner_installer.py index 2ae3dd119800816762570376552aecaf4b1bcc67..3846cf0ede278df54e2871998baad6f561dda15b 100644 --- a/diner_installer.py +++ b/diner_installer.py @@ -29,7 +29,7 @@ def main(): diner_database.ensure_tables_exist() print('Tables created.') session = diner_database.create_session() - add_starter_data(session) + # add_starter_data(session) session.commit() print('Records created.') except SQLAlchemyError as exception: