From 729b39e351d86a92f6b2e2eacc3a317f8b9cca90 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 27 Mar 2021 19:37:11 +0300 Subject: [PATCH] Define backref for boosters manually --- eos/db/saveddata/booster.py | 4 +++- eos/db/saveddata/fit.py | 1 - eos/saveddata/mode.py | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eos/db/saveddata/booster.py b/eos/db/saveddata/booster.py index 4c1a3d81a..d2a353a99 100644 --- a/eos/db/saveddata/booster.py +++ b/eos/db/saveddata/booster.py @@ -24,11 +24,12 @@ import datetime from eos.db import saveddata_meta from eos.saveddata.booster import Booster from eos.saveddata.boosterSideEffect import BoosterSideEffect +from eos.saveddata.fit import Fit boosters_table = Table("boosters", saveddata_meta, Column("ID", Integer, primary_key=True), Column("itemID", Integer), - Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False), + Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True), Column("active", Boolean), Column("created", DateTime, nullable=True, default=datetime.datetime.now), Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now), @@ -44,6 +45,7 @@ booster_side_effect_table = Table("boosterSideEffects", saveddata_meta, mapper(Booster, boosters_table, properties={ + "owner": relation(Fit), "_Booster__sideEffects": relation( BoosterSideEffect, backref="booster", diff --git a/eos/db/saveddata/fit.py b/eos/db/saveddata/fit.py index a304ea006..0d8d7de1d 100644 --- a/eos/db/saveddata/fit.py +++ b/eos/db/saveddata/fit.py @@ -191,7 +191,6 @@ mapper(es_Fit, fits_table, Booster, collection_class=HandledBoosterList, cascade='all, delete, delete-orphan', - backref='owner', single_parent=True), "_Fit__drones": relation( Drone, diff --git a/eos/saveddata/mode.py b/eos/saveddata/mode.py index 0de41140d..efe4008e7 100644 --- a/eos/saveddata/mode.py +++ b/eos/saveddata/mode.py @@ -23,7 +23,6 @@ from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut class Mode(ItemAttrShortcut, HandledItem): - def __init__(self, item, owner=None): if item.group.name != "Ship Modifiers": raise ValueError( @@ -34,7 +33,6 @@ class Mode(ItemAttrShortcut, HandledItem): self.__itemModifiedAttributes.original = self.item.attributes self.__itemModifiedAttributes.overrides = self.item.overrides - @property def item(self): return self.__item