Removed SQLiteTypes enum for the sake of performance and Added SQLiteJavaTypes class

Author: emiraslan

app/src/main/java/com/demoapp/MainActivity.java

@@ -85,6 +85,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         //Creating model
         CarModel carModel = new CarModel();
+        carModel.id = 2;
         carModel.releaseDate = "12-12-12";
         carModel.model = "some model";
         carModel.name = "some name";
@@ -106,6 +107,9 @@ protected void onCreate(Bundle savedInstanceState) {
         //Inserting to the table
         carModel.insert();
 
+        carModel.name = "Amiraslan";
+        long sdd = carModel.update();
+
         CityModel cityModel = new CityModel();
         cityModel.id = 1;
         cityModel.num_of_roads = 2;

app/src/main/java/com/demoapp/Models/UserModel.java

@@ -6,7 +6,6 @@
 import com.sqlitemanager.Annotations.PrimaryKey;
 import com.sqlitemanager.Annotations.TableName;
 import com.sqlitemanager.SQLiteManager;
-import com.sqlitemanager.SQLiteTypes;
 import com.sqlitemanager.Tableable;
 
 /**

app/src/main/res/layout/activity_main.xml

@@ -4,6 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView
+        android:id="@+id/myTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/my_name"

sqlitemanager/src/main/java/com/sqlitemanager/AbstractTableModel.java

@@ -7,11 +7,11 @@
 public class AbstractTableModel implements Tableable {
 
     public long insert() {
-        return SQLiteManager.getInstance().insert(this);
+        return SQLiteManager.insert(this);
     }
 
     public long update() {
-        return -1;
+        return SQLiteManager.update(this);
     }
 
     public long delete() {

sqlitemanager/src/main/java/com/sqlitemanager/Annotations/Default.java

@@ -1,7 +1,5 @@
 package com.sqlitemanager.Annotations;
 
-import com.sqlitemanager.SQLiteTypes;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

sqlitemanager/src/main/java/com/sqlitemanager/DbPackModels/DefaultModel.java

@@ -1,7 +1,5 @@
 package com.sqlitemanager.DbPackModels;
 
-import com.sqlitemanager.SQLiteTypes;
-
 /**
  * Created by aslan on 7/19/2017.
  */
@@ -15,7 +13,7 @@ public class DefaultModel extends ConstraintModel {
     public String getConstraintKeyword() {
         String keywordMark = "";
 
-        if (dataType.equals(SQLiteTypes.STRING.getJavaType()) || dataType.equals(SQLiteTypes.CHAR.getJavaType())) {
+        if (dataType.equals("String") || dataType.equals("char")) {
             keywordMark = "'";
         }
         return "DEFAULT " + keywordMark + defaultValue + keywordMark + "";

sqlitemanager/src/main/java/com/sqlitemanager/SQLiteJavaTypes.java

@@ -0,0 +1,37 @@
+package com.sqlitemanager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by aslan on 8/13/2017.
+ */
+
+public class SQLiteJavaTypes {
+    private Map<String, String> mapOfTypes;
+
+    public SQLiteJavaTypes() {
+        mapOfTypes = new HashMap<String, String>();
+        mapOfTypes.put("int", "INTEGER");
+        mapOfTypes.put("Integer", "INTEGER");
+        mapOfTypes.put("String", "TEXT");
+        mapOfTypes.put("double", "DECIMAL(10, 5)");
+        mapOfTypes.put("Double", "DECIMAL(10, 5)");
+        mapOfTypes.put("float", "DECIMAL(10, 5)");
+        mapOfTypes.put("Float", "DECIMAL(10, 5)");
+        mapOfTypes.put("short", "INTEGER");
+        mapOfTypes.put("Short", "INTEGER");
+        mapOfTypes.put("long", "INTEGER");
+        mapOfTypes.put("Long", "INTEGER");
+        mapOfTypes.put("char", "TEXT");
+        mapOfTypes.put("byte", "BLOB");
+        mapOfTypes.put("Byte", "BLOB");
+        mapOfTypes.put("boolean", "INTEGER");
+        mapOfTypes.put("Boolean", "INTEGER");
+    }
+
+    public String getSQLiteType(String javaType) {
+        return mapOfTypes.get(javaType);
+    }
+
+}

sqlitemanager/src/main/java/com/sqlitemanager/SQLiteManager.java

@@ -34,6 +34,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 
 /**
@@ -116,7 +117,7 @@ private void prepareCreateTablesQueryStr() {
             int index = 0;
             for (ColumnModel tableColumnModel : databaseTable.columnModels) {
                 index++;
-                query += tableColumnModel.name + " " + SQLiteTypes.findType(tableColumnModel.datatype);
+                query += tableColumnModel.name + " " + new SQLiteJavaTypes().getSQLiteType(tableColumnModel.datatype);
                 if (tableColumnModel.hasInlineConstraint) {
                     for (ConstraintModel constraint : tableColumnModel.constraintModels) {
                         query += " " + constraint.getConstraintKeyword();
@@ -195,7 +196,7 @@ public int compare(Field field, Field t1) {
                 if (!((Column) columnName).value().equals(columnDefaultValue)) {
                     columnAnnotationModel.columnName = ((Column) columnName).value();
                 }
-                String simpleNameOfDataType = (foreignKey != null) ? SQLiteTypes.INTEGER_NULLABLE.getJavaType() : column.getType().getSimpleName();
+                String simpleNameOfDataType = (foreignKey != null) ? "Integer" : column.getType().getSimpleName();
                 currentColumnModel = new ColumnModel(columnAnnotationModel.columnName, simpleNameOfDataType);
                 currentColumnModel.hasInlineConstraint = false;
 
@@ -259,7 +260,7 @@ public int compare(Field field, Field t1) {
         prepareCreateTablesQueryStr();
     }
 
-    public <T extends Tableable> long insert(T tableModel) {
+    static <T extends Tableable> long insert(T tableModel) {
         String name = Utils.getTableName(tableModel.getClass());
 
         ContentValues contentValues = new ContentValues();
@@ -280,7 +281,7 @@ public int compare(Field field, Field t1) {
             boolean isForeignKey = field.isAnnotationPresent(ForeignKey.class);
 
             String simpleNameOfDataType = (isForeignKey)
-                    ? SQLiteTypes.INTEGER_NULLABLE.getJavaType() : field.getType().getSimpleName();
+                    ? "Integer" : field.getType().getSimpleName();
 
             try {
                 //Todo: Look up for default functionality in integers. It does not work
@@ -703,7 +704,7 @@ public Builder setWillBeUpdated(boolean willBeUpdated) {
     }
 
 
-    private static <T extends Tableable> int update(T tableModel) {
+    static <T extends Tableable> int update(T tableModel) {
         SQLiteDatabase writable = sqLiteManager.getWritableDatabase();
         String whereClause = null;
         String[] whereArgs = null;
@@ -719,7 +720,9 @@ private static <T extends Tableable> int update(T tableModel) {
             try {
                 if (field.isAnnotationPresent(PrimaryKey.class)) {
                     whereClause = Utils.getMemberColumnName(field) + "=?";
-                    whereArgs = new String[]{field.get(tableModel).toString()};
+                    int idValue = (int) field.get(tableModel);
+                    if (idValue == 0) return -1;
+                    whereArgs = new String[]{String.format(Locale.getDefault(), "%d", idValue)};
                 }
 
                 contentValues.put(colName, field.get(tableModel).toString());

sqlitemanager/src/main/java/com/sqlitemanager/SQLiteTypes.java

@@ -15,4 +15,5 @@ public interface Tableable {
     public long delete();
 
     public void fill(Integer id);
+
 }