Merge pull request #18 from novoda/avoid_keyword_errors

Avoid keyword errors

Author: Electryc

analyzer/src/main/java/com/novoda/sqlite/StringUtil.java

@@ -1,5 +1,6 @@
 package com.novoda.sqlite;
 
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -26,7 +27,7 @@ public static String camelify(String original) {
 
     private static String capitalize(String string) {
         if (string.length() > 1) {
-            return string.substring(0, 1).toUpperCase() + string.substring(1);
+            return string.substring(0, 1).toUpperCase(Locale.US) + string.substring(1).toLowerCase(Locale.US);
         }
         return "";
     }

analyzer/src/main/java/com/novoda/sqlite/model/Column.java

@@ -2,17 +2,19 @@
 
 import com.novoda.sqlite.StringUtil;
 
+import java.util.Locale;
+
 public final class Column {
     private final String name;
     private final String type;
-    private boolean nullable;
-    private DataAffinity affinity;
+    private final boolean nullable;
+    private final DataAffinity affinity;
 
     public Column(String name, String type, boolean nullable) {
         this.name = name;
         this.type = type;
         this.nullable = nullable;
-        this.affinity = computeAffinity(type);
+        this.affinity = DataAffinity.fromType(type);
     }
 
     public String getName() {
@@ -25,9 +27,10 @@ public String getCamelizedName() {
 
     public String getCamelizedSmallName() {
         String camel = StringUtil.camelify(name);
-        if (camel.length() <= 1)
-            return camel;
-        return camel.substring(0,1).toLowerCase()+camel.substring(1);
+        if (camel.length() <= 1) {
+            return "_" + camel;
+        }
+        return "_" + camel.substring(0, 1).toLowerCase(Locale.US) + camel.substring(1);
     }
 
     public String getType() {
@@ -43,32 +46,8 @@ public DataAffinity getAffinity() {
     }
 
     public boolean isBoolean() {
-        return  affinity == DataAffinity.NUMERIC && type.toLowerCase().contains("bool");
-    }
-
-    /*
- * See http://www.sqlite.org/datatype3.html
- * section 2.1 Determination of column affinity
- */
-    private DataAffinity computeAffinity(String type) {
-        String deftype = type.toLowerCase();
-        if (deftype.contains("int"))
-            return DataAffinity.INTEGER;
-        if (containsOneOf(deftype, "char", "clob", "text"))
-            return DataAffinity.TEXT;
-        if (containsOneOf(deftype, "real", "floa", "doub"))
-            return DataAffinity.REAL;
-        if (containsOneOf(deftype, "blob") || deftype.equals(""))
-            return DataAffinity.NONE;
-        return DataAffinity.NUMERIC;
+        return affinity == DataAffinity.NUMERIC && type.toLowerCase(Locale.US).contains("bool");
     }
 
-    private boolean containsOneOf(String toCheck, String... values) {
-        for (String value : values) {
-            if (toCheck.contains(value))
-                return true;
-        }
-        return false;
-    }
 
 }

analyzer/src/main/java/com/novoda/sqlite/model/DataAffinity.java

@@ -1,5 +1,42 @@
 package com.novoda.sqlite.model;
 
+import java.util.Locale;
+
 public enum DataAffinity {
     TEXT, NUMERIC, INTEGER, REAL, NONE;
+
+    public static DataAffinity fromType(String type) {
+        return computeAffinity(type);
+    }
+
+    /**
+     * See http://www.sqlite.org/datatype3.html
+     * section 2.1 Determination of column affinity
+     */
+    private static DataAffinity computeAffinity(String type) {
+        String deftype = type.toLowerCase(Locale.US);
+        if (deftype.contains("int")) {
+            return DataAffinity.INTEGER;
+        }
+        if (containsOneOf(deftype, "char", "clob", "text")) {
+            return DataAffinity.TEXT;
+        }
+        if (containsOneOf(deftype, "real", "floa", "doub")) {
+            return DataAffinity.REAL;
+        }
+        if (containsOneOf(deftype, "blob") || deftype.equals("")) {
+            return DataAffinity.NONE;
+        }
+        return DataAffinity.NUMERIC;
+    }
+
+    private static boolean containsOneOf(String toCheck, String... values) {
+        for (String value : values) {
+            if (toCheck.contains(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

demo-assethelper/src/main/java/com/example/MainActivity.java

@@ -23,7 +23,7 @@ public void onCreate(Bundle savedInstanceState) {
 		ListAdapter adapter = new SimpleCursorAdapter(this, 
 				android.R.layout.simple_list_item_2,
 				employees, 
-				new String[] {Employees.FirstName, Employees.LastName},
+				new String[] {Employees.Firstname, Employees.Lastname},
 				new int[] {android.R.id.text1, android.R.id.text2});
 
 		getListView().setAdapter(adapter);

demo-assethelper/src/main/java/com/example/MyDatabase.java

@@ -31,7 +31,7 @@ public Cursor getEmployees() {
 		SQLiteDatabase db = getReadableDatabase();
 		SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
 
-		String [] sqlSelect = {"0 _id", Employees.FirstName, Employees.LastName};
+		String [] sqlSelect = {"0 _id", Employees.Firstname, Employees.Lastname};
 		String sqlTables = DB.Tables.Employees;
 
 		qb.setTables(sqlTables);

demo-auto/src/main/java/com/example/MainActivity.java

@@ -23,7 +23,7 @@ public void onCreate(Bundle savedInstanceState) {
 		ListAdapter adapter = new SimpleCursorAdapter(this, 
 				android.R.layout.simple_list_item_2,
 				employees, 
-				new String[] {Employees.FirstName, Employees.LastName},
+				new String[] {Employees.Firstname, Employees.Lastname},
 				new int[] {android.R.id.text1, android.R.id.text2});
 
 		getListView().setAdapter(adapter);

demo-auto/src/main/java/com/example/MyDatabase.java

@@ -31,7 +31,7 @@ public Cursor getEmployees() {
 		SQLiteDatabase db = getReadableDatabase();
 		SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
 
-		String [] sqlSelect = {"0 _id", Employees.FirstName, Employees.LastName};
+		String [] sqlSelect = {"0 _id", Employees.Firstname, Employees.Lastname};
 		String sqlTables = DB.Tables.Employees;
 
 		qb.setTables(sqlTables);