From 7579f3c3e1eab0495b18c04617834f0b5f8e6592 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 20 Feb 2014 23:56:50 -0500 Subject: [PATCH] Fixed cases where fit.booster column might contain null instead of bool --- eos/db/migration.py | 3 ++- gui/shipBrowser.py | 1 - service/fit.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eos/db/migration.py b/eos/db/migration.py index e5ad2aaa2..1da35e129 100755 --- a/eos/db/migration.py +++ b/eos/db/migration.py @@ -56,4 +56,5 @@ def checkFitBooster(saveddata_engine): # This is ugly as hell, but we can't use proper migrate packages as it # will require us to rebuild skeletons, including mac except sqlalchemy.exc.DatabaseError: - saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN;") \ No newline at end of file + saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN;") + saveddata_engine.execute("UPDATE fits SET booster = 0;") diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index f202da5c0..9cdfb5aa1 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -807,7 +807,6 @@ class ShipBrowser(wx.Panel): self._stage3Data = shipID for ID, name, booster, timestamp in fitList: - print self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, name, booster, timestamp),shipID)) self.lpane.RefreshList() diff --git a/service/fit.py b/service/fit.py index bf0b50c42..9b316f42d 100644 --- a/service/fit.py +++ b/service/fit.py @@ -79,6 +79,7 @@ class Fit(object): def __init__(self): self.pattern = DamagePattern.getInstance().getDamagePattern("Uniform") self.character = Character.getInstance().all5() + self.booster = False self.dirtyFitIDs = set() serviceFittingDefaultOptions = {"useGlobalCharacter": False, "useGlobalDamagePattern": False, "defaultCharacter": self.character.ID, "useGlobalForceReload": False} @@ -126,6 +127,7 @@ class Fit(object): fit.name = name if name is not None else "New %s" % fit.ship.item.name fit.damagePattern = self.pattern fit.character = self.character + fit.booster = self.booster eos.db.save(fit) self.recalc(fit) return fit.ID