Merge branch 'hotfix/0.15.1'

Kruptein · May 15, 2019 · c3f5cec · c3f5cec
2 parents 64bae5c + 07183ac
commit c3f5cec
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## [0.15.1] - 2019-05-15
+
+### Fixed
+
+- Upgrade from save format 12 to 13 failing in some cases.
+
 ## [0.15.0] - 2019-04-14
 
 ### Added

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "planarally-client",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "A companion tool for when you travel into the planes.",
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/server/save.py b/server/save.py
@@ -4,7 +4,7 @@
 import shutil
 import sys
 
-from peewee import FloatField
+from peewee import FloatField, OperationalError
 from playhouse.migrate import *
 
 from config import SAVE_FILE
@@ -126,7 +126,11 @@ def upgrade(version):
         db.foreign_keys = False
         migrator = SqliteMigrator(db)
         with db.atomic():
-            migrate(migrator.add_column("label", "category", Label.category))
+            try:
+                migrate(migrator.add_column("label", "category", Label.category))
+            except OperationalError as e:
+                if e.args[0] != "duplicate column name: category":
+                    raise e
             db.create_tables([LabelSelection])
         with db.atomic():
             for label in Label: