From 332eb048a1eaaa8f2b1a5f0063c7f5aa136ee615 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Tue, 20 Aug 2019 18:14:24 +0300
Subject: [PATCH] Update json to SQL script to adapt it to latest changes to
 Phobos

---
 scripts/jsonToSql.py | 47 ++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 34 deletions(-)

diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py
index 5dcd3a3fc..d8733c6c4 100755
--- a/scripts/jsonToSql.py
+++ b/scripts/jsonToSql.py
@@ -68,46 +68,18 @@ def main(db, json_path):
         'evetypes': eos.gamedata.Item,
         'phbtraits': eos.gamedata.Traits,
         'phbmetadata': eos.gamedata.MetaData,
-        'mapbulk_marketGroups': eos.gamedata.MarketGroup,
-    }
+        'marketGroups': eos.gamedata.MarketGroup}
 
     fieldMapping = {
-        'dgmattribs': {
-            'displayName': 'displayName'
-        },
-        'dgmeffects': {
-            'displayName': 'displayName',
-            'description': 'description'
-        },
-        'dgmunits': {
-            'displayName': 'displayName'
-        },
-        #icons???
-        'evecategories': {
-            'categoryName': 'categoryName'
-        },
-        'evegroups': {
-            'groupName': 'groupName'
-        },
-        'invmetagroups': {
-            'metaGroupName': 'metaGroupName'
-        },
-        'evetypes': {
-            'typeName': 'typeName',
-            'description': 'description'
-        },
         'mapbulk_marketGroups': {
-            'marketGroupName': 'marketGroupName',
-            'description': 'description'
-        }
-
-    }
+            'id': 'marketGroupID',
+            'name': 'marketGroupName'}}
 
     rowsInValues = (
         'evetypes',
         'evegroups',
-        'evecategories'
-    )
+        'evecategories',
+        'marketGroups')
 
     def convertIcons(data):
         new = []
@@ -303,7 +275,14 @@ def main(db, json_path):
         with open(os.path.join(jsonPath, '{}.json'.format(jsonName)), encoding='utf-8') as f:
             tableData = json.load(f)
         if jsonName in rowsInValues:
-            tableData = list(tableData.values())
+            newTableData = []
+            for k, v in tableData.items():
+                row = {}
+                row.update(v)
+                if 'id' not in row:
+                    row['id'] = int(k)
+                newTableData.append(row)
+            tableData = newTableData
         if jsonName == 'icons':
             tableData = convertIcons(tableData)
         if jsonName == 'phbtraits':