Fixed remaining annotated id issue

Closes #254 References #185 References #215 References #243 Thanks @jivimberg for the pull request!
chennaione · Apr 7, 2015 · 1f49d7c · 1f49d7c
1 parent 0fdc4dd
commit 1f49d7c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
@@ -165,7 +165,7 @@ public static <T> List<T> findWithQuery(Class<T> type, String query, String... a
         try {
             while (c.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
-                SugarRecord.inflate(c, entity);
+                SugarRecord.inflate(c, entity, getSugarContext().getEntitiesMap());
                 toRet.add(entity);
             }
         } catch (Exception e) {
@@ -191,7 +191,7 @@ public static <T> List<T> find(Class<T> type, String whereClause, String[] where
         try {
             while (c.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
-                SugarRecord.inflate(c, entity);
+                SugarRecord.inflate(c, entity, getSugarContext().getEntitiesMap());
                 toRet.add(entity);
             }
         } catch (Exception e) {
@@ -287,8 +287,11 @@ public static boolean isSugarEntity(Class<?> objectClass) {
         return objectClass.isAnnotationPresent(Table.class) || SugarRecord.class.isAssignableFrom(objectClass);
     }
 
-    private static void inflate(Cursor cursor, Object object) {
+    private static void inflate(Cursor cursor, Object object, Map<Object, Long> entitiesMap) {
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
+        if (!entitiesMap.containsKey(object)) {
+            entitiesMap.put(object, cursor.getLong(cursor.getColumnIndex(("ID"))));
+        }
 
         for (Field field : columns) {
         	field.setAccessible(true);
@@ -355,7 +358,7 @@ public long save() {
 
     @SuppressWarnings("unchecked")
     void inflate(Cursor cursor) {
-        inflate(cursor, this);
+        inflate(cursor, this, getSugarContext().getEntitiesMap());
     }
 
     public Long getId() {
@@ -393,7 +396,7 @@ public E next() {
 
             try {
                 entity = type.getDeclaredConstructor().newInstance();
-                SugarRecord.inflate(cursor, entity);
+                SugarRecord.inflate(cursor, entity, getSugarContext().getEntitiesMap());
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {