Merge pull request #3 from Tractive/fix-geotrace-upgrade-location

FIX location of geotrace update

Author: StephanHener

generator/res/content_subclass.txt

@@ -73,11 +73,6 @@
                 return;
             }
 
-            if (oldVersion < 13 && "geotrace".equals(TABLE_NAME)) {
-                //hacky workaround as the foxykeep code "generation" are just nested String.formats
-                TractiveDbUpgradeHelper.upgradeLocationsJsonToLocationsPath(db);
-            }
-
 %18$s
 
             if (oldVersion != newVersion) {

generator/res/content_subclass_upgrade.txt

@@ -5,5 +5,6 @@
 
                 db.execSQL("DROP TABLE " + TABLE_NAME + ";");
                 db.execSQL("ALTER TABLE " + TABLE_NAME + "_tmp RENAME TO " + TABLE_NAME + ";");
+                %7$s
                 oldVersion = %1$d;
             }

generator/src/com/foxykeep/cpcodegenerator/generator/DatabaseGenerator.java

@@ -360,6 +360,11 @@ private static void generateContentClass(final String fileName, final String cla
                                     .getDefaultValue(fieldData.type));
                         }
                     }
+
+                    String upgradeGeotrace = "";
+                    if (tableData.dbTableName.equals("geotrace") && curVers == 13) {
+                        upgradeGeotrace = "TractiveDbUpgradeHelper.upgradeLocationsJsonToLocationsPath(db);";
+                    }
                     sbUpgradeTable.append(String.format(
                             contentSubClassUpgrade, curVers,
                             sbUpgradeTableCreateTmpTable.toString(),
@@ -368,7 +373,9 @@ private static void generateContentClass(final String fileName, final String cla
                             hasPreviousUnique ? String.format(UNIQUE_FORMAT,
                                     sbUpgradeTableCreateTmpTableUnique.toString()) : "",
                             sbUpgradeTableInsertFields.toString(),
-                            sbUpgradeTableInsertDefaultValues.toString()));
+                            sbUpgradeTableInsertDefaultValues.toString(), upgradeGeotrace));
+
+
 
                     hasPreviousUpgradeElements = false;
                     for (FieldData fieldData : upgradeFieldDataList) {
@@ -379,9 +386,11 @@ private static void generateContentClass(final String fileName, final String cla
 
                         sbUpgradeTableCommentNewFields.append(fieldData.dbConstantName);
                     }
+
                     sbUpgradeTableComment.append(String.format(UPGRADE_VERSION_COMMENT_FIELD,
                             curVers, sbUpgradeTableCommentNewFields.toString(),
                             upgradeFieldDataList.size() > 1 ? "s" : ""));
+
                 }
 
                 // No more changes for the last versions so add the code to jump to the latest
@@ -584,7 +593,6 @@ private static void generateProviderClass(final String fileName, final String cl
                         sbUpgradeDatabaseComment.toString(),
                         hasProviderSubclasses ? "" : "final ",
                         sbCaseWithoutIdWithoutRaw));
-
     }
 
     private static void appendUpgradeDatabaseComment(final StringBuilder sb,