From 3de6b6332516fcb44f5b2b0cb6776777e900cb69 Mon Sep 17 00:00:00 2001
From: blitzmann <holmes.ryan.90@gmail.com>
Date: Fri, 3 Jul 2015 14:18:11 -0400
Subject: [PATCH] Fix oversight when creating a new database

---
 eos/db/migration.py | 18 +++++++++++-------
 service/prefetch.py |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/eos/db/migration.py b/eos/db/migration.py
index 7d1e889d9..b04df38ae 100644
--- a/eos/db/migration.py
+++ b/eos/db/migration.py
@@ -4,13 +4,8 @@ import time
 import re
 import os
 
-def getVersion(db):
-    cursor = db.execute('PRAGMA user_version')
-    return cursor.fetchone()[0]
-
-def update(saveddata_engine):
-    dbVersion = getVersion(saveddata_engine)
-
+def getAppVersion():
+    # calculate app version based on upgrade files we have
     appVersion = 0
     for fname in os.listdir(os.path.join(os.path.dirname(__file__), "migrations")):
         m = re.match("^upgrade(?P<index>\d+)\.py$", fname)
@@ -18,6 +13,15 @@ def update(saveddata_engine):
             continue
         index = int(m.group("index"))
         appVersion = max(appVersion, index)
+    return appVersion
+
+def getVersion(db):
+    cursor = db.execute('PRAGMA user_version')
+    return cursor.fetchone()[0]
+
+def update(saveddata_engine):
+    dbVersion = getVersion(saveddata_engine)
+    appVersion = getAppVersion()
 
     if dbVersion == appVersion:
         return
diff --git a/service/prefetch.py b/service/prefetch.py
index 56c8b5684..664e5168c 100644
--- a/service/prefetch.py
+++ b/service/prefetch.py
@@ -55,4 +55,4 @@ else:
     # If database does not exist, do not worry about migration. Simply
     # create and set version
     eos.db.saveddata_meta.create_all()
-    eos.db.saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)
+    eos.db.saveddata_engine.execute('PRAGMA user_version = {}'.format(migration.getAppVersion()))