From cb225eabb36a7c275a577d1505709da70e719fd0 Mon Sep 17 00:00:00 2001
From: blitzman <ryan.xgamer99@gmail.com>
Date: Sun, 20 Nov 2016 22:06:26 -0500
Subject: [PATCH] Get a working migration for command fits.

---
 eos/db/migrations/upgrade17.py | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/eos/db/migrations/upgrade17.py b/eos/db/migrations/upgrade17.py
index 60b9d24fa..c3d996899 100644
--- a/eos/db/migrations/upgrade17.py
+++ b/eos/db/migrations/upgrade17.py
@@ -6,7 +6,10 @@ Migration 17
 
 import sqlalchemy
 
+
 def upgrade(saveddata_engine):
+    from eos.db import saveddata_session
+    from eos.db.saveddata.fit import commandFits_table
 
     sql = """
           SELECT sm.memberID as boostedFit, s.leaderID AS squadBoost, w.leaderID AS wingBoost, g.leaderID AS gangBoost
@@ -15,18 +18,22 @@ def upgrade(saveddata_engine):
           JOIN wings w on w.ID = s.wingID
           JOIN gangs g on g.ID = w.gangID
           """
-    with saveddata_engine.connect() as connection:
-        results = saveddata_engine.execute(sql)
 
+    results = saveddata_session.execute(sql)
 
-        for row in results:
-            boosted = row["boostedFit"]
-            types = ("squad", "wing", "gang")
-            for x in types:
-                value = row["{}Boost".format(x)]
-                if value is None:
-                    continue
-                try:
-                        connection.execute('INSERT INTO commandFits ("boosterID", "boostedID", "active") VALUES (?, ?, 1)', (value, boosted))
-                except Exception, e:
-                    continue
+    inserts = []
+
+    for row in results:
+        boosted = row["boostedFit"]
+        types = ("squad", "wing", "gang")
+        for x in types:
+            value = row["{}Boost".format(x)]
+            if value is None:
+                continue
+
+            inserts.append({"boosterID": value, "boostedID": boosted, "active": 1})
+            try:
+                saveddata_session.execute(commandFits_table.insert(), {"boosterID": value, "boostedID": boosted, "active": 1})
+            except Exception, e:
+                pass
+    saveddata_session.commit()