Fix the creation of a table containing a PRIMARY KEY AUTOINCREMENT field

Fixes foxykeep#11

Author: foxykeep

generator/example/format.json

@@ -34,8 +34,9 @@
                     "is_id":true, // Optional. Whether the field is the identifier field of the
                             class. The column named will be changed to BaseColumns._ID in the
                             database. Only one field should have this value set to true by table.
-                            Default is false.
-                    "is_autoincrement":false // Optional. Can only be set on the field flagged with
+                            Default is false. Can only be set on a field flagged with
+                            "is_primary_key".
+                    "is_autoincrement":false // Optional. Can only be set on a field flagged with
                             "is_id". Whether or not the field should be autoincremented.
                     "is_index":true, // Optional. Whether the field needs to have an index added to
                             it in the database. Should be set to true for text field which will

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

@@ -112,7 +112,7 @@ private static void generateContentClass(final String fileName, final String cla
             final StringBuilder sbBulkParams = new StringBuilder();
             final StringBuilder sbBulkValues = new StringBuilder();
 
-            boolean hasPreviousPrimaryKey, hasPreviousInsertFields;
+            boolean hasPreviousPrimaryKey, hasAutoIncrementPrimaryKey, hasPreviousInsertFields;
             boolean hasPreviousInsertDefaultValues, hasTextField;
             boolean hasPreviousUpgradeElements;
             int maxUpgradeVersion, minUpgradeWithoutChanges;
@@ -129,6 +129,7 @@ private static void generateContentClass(final String fileName, final String cla
                 sbBulkParams.setLength(0);
                 sbBulkValues.setLength(0);
                 hasPreviousPrimaryKey = false;
+                hasAutoIncrementPrimaryKey = false;
                 hasTextField = false;
 
                 for (int i = 0, n = tableData.fieldList.size(); i < n; i++) {
@@ -158,16 +159,28 @@ private static void generateContentClass(final String fileName, final String cla
                             .append(fieldData.dbConstantName).append(".getName() + \" \" + ")
                             .append("Columns.")
                             .append(fieldData.dbConstantName).append(".getType()");
-                    if (fieldData.dbIsAutoincrement) {
-                        sbCreateTable.append("+ \" AUTOINCREMENT\"");
-                    }
                     if (fieldData.dbIsPrimaryKey) {
-                        if (hasPreviousPrimaryKey) {
-                            sbCreateTablePrimaryKey.append(" + \", \" + ");
+                        if (fieldData.dbIsAutoincrement) {
+                            if (hasPreviousPrimaryKey) {
+                                throw new IllegalArgumentException("Not possible to have multiple" +
+                                        " primary key fields if one of them is an autoincrement " +
+                                        "field");
+                            } else {
+                                hasAutoIncrementPrimaryKey = true;
+                                sbCreateTable.append("+ \" PRIMARY KEY AUTOINCREMENT\"");
+                            }
+                        } else if (hasAutoIncrementPrimaryKey) {
+                            throw new IllegalArgumentException("Not possible to have multiple" +
+                                    " primary key fields if one of them is an autoincrement " +
+                                    "field");
+                        } else {
+                            if (hasPreviousPrimaryKey) {
+                                sbCreateTablePrimaryKey.append(" + \", \" + ");
+                            }
+                            hasPreviousPrimaryKey = true;
+                            sbCreateTablePrimaryKey.append("Columns.")
+                                    .append(fieldData.dbConstantName).append(".getName()");
                         }
-                        hasPreviousPrimaryKey = true;
-                        sbCreateTablePrimaryKey.append("Columns.")
-                                .append(fieldData.dbConstantName).append(".getName()");
                     }
 
                     if (fieldData.dbHasIndex) {

generator/src/com/foxykeep/cpcodegenerator/model/FieldData.java

@@ -30,14 +30,22 @@ public FieldData(final JSONObject json) throws JSONException {
         dbConstantName = NameUtils.createConstantName(name);
         dbIsPrimaryKey = json.optBoolean("is_primary_key", false);
         dbIsId = json.optBoolean("is_id", false);
+        dbIsAutoincrement = json.optBoolean("is_autoincrement", false);
         if (dbIsId) {
+            if (!dbIsPrimaryKey) {
+                throw new IllegalArgumentException("Field \"" + name + "\" | is_id can only be "
+                        + "used on a field flagged with is_primary_key");
+            }
             dbName = "_id";
-            dbIsAutoincrement = json.optBoolean("is_autoincrement", false);
             if (dbIsAutoincrement && !type.equals("integer")) {
-                throw new IllegalArgumentException("is_autoincrement can only be used on an " +
-                        "integer type field");
+                throw new IllegalArgumentException("Field \"" + name + "\" | is_autoincrement can "
+                        + "only be used on an integer type field");
             }
         } else {
+            if (dbIsAutoincrement) {
+                throw new IllegalArgumentException("Field \"" + name + "\" | id_autoincrement can "
+                        + "only be used on a field flagged with is_id");
+            }
             dbName = name;
         }
         dbHasIndex = !dbIsPrimaryKey && json.optBoolean("is_index", false);