From 4c0ca0249d7a96c8593ef10269e886a387bc477b Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Wed, 25 Jun 2014 20:52:52 -0700
Subject: [PATCH 001/305] Add strict count overload to simplify interface

---
 library/src/com/orm/SugarRecord.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index da414a66..e3c11847 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -222,6 +222,10 @@ public static <T extends SugarRecord<?>> List<T> find(Class<T> type,
         }
         return toRet;
     }
+
+    public static <T extends SugarRecord<?>> long count(Class<?> type) {
+        return count(type, null, null, null, null, null);
+    }
     
     public static <T extends SugarRecord<?>> long count(Class<?> type,
             String whereClause, String[] whereArgs) {

From bd36185a1d35765df5f05400420fc468c1a414c8 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Wed, 25 Jun 2014 21:18:10 -0700
Subject: [PATCH 002/305] Return id by default on save

---
 library/src/com/orm/SugarRecord.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index da414a66..5eef6e5a 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -43,8 +43,8 @@ public static <T extends SugarRecord<?>> void deleteAll(Class<T> type, String wh
         sqLiteDatabase.delete(getTableName(type), whereClause, whereArgs);
     }
 
-    public void save() {
-        save(getSugarContext().getDatabase().getDB());
+    public long save() {
+        return save(getSugarContext().getDatabase().getDB());
     }
 
     @SuppressWarnings("deprecation")
@@ -72,7 +72,7 @@ public static <T extends SugarRecord<?>> void saveInTx(Collection<T> objects ) {
 
     }
 
-    void save(SQLiteDatabase db) {
+    long save(SQLiteDatabase db) {
 
         List<Field> columns = getTableFields();
         ContentValues values = new ContentValues(columns.size());
@@ -130,6 +130,7 @@ else if (Calendar.class.equals(columnType)) {
             db.update(getSqlName(), values, "ID = ?", new String[]{String.valueOf(id)});
 
         Log.i("Sugar", getClass().getSimpleName() + " saved : " + id);
+        return id;
     }
 
     public static <T extends SugarRecord<?>> List<T> listAll(Class<T> type) {

From 78f6ae86ae6a6f8df00d38d17e8395b9c84cd277 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Thu, 26 Jun 2014 10:27:40 -0700
Subject: [PATCH 003/305] Allow null values for Date and Calendar objects

---
 library/src/com/orm/QueryBuilder.java |  9 ++++++---
 library/src/com/orm/SugarRecord.java  | 12 ++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/library/src/com/orm/QueryBuilder.java b/library/src/com/orm/QueryBuilder.java
index 8ff00beb..6ca26fc9 100644
--- a/library/src/com/orm/QueryBuilder.java
+++ b/library/src/com/orm/QueryBuilder.java
@@ -5,9 +5,6 @@ public class QueryBuilder {
     public static String getColumnType(Class<?> type) {
         if ((type.equals(Boolean.class)) ||
                 (type.equals(Boolean.TYPE)) ||
-                (type.equals(java.util.Date.class)) ||
-                (type.equals(java.util.Calendar.class)) ||
-                (type.equals(java.sql.Date.class)) ||
                 (type.equals(Integer.class)) ||
                 (type.equals(Integer.TYPE)) ||
                 (type.equals(Long.class)) ||
@@ -17,6 +14,12 @@ public static String getColumnType(Class<?> type) {
             return "INTEGER";
         }
 
+        if ((type.equals(java.util.Date.class)) ||
+                (type.equals(java.sql.Date.class)) ||
+                (type.equals(java.util.Calendar.class))) {
+            return "INTEGER NULL";
+        }
+
         if (type.getName().equals("[B")) {
             return "BLOB";
         }
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index da414a66..0c31cfbc 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -108,10 +108,18 @@ else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
                             values.put(columnName, (Boolean) columnValue);
                         }
                         else if (Date.class.equals(columnType)) {
-                            values.put(columnName, ((Date) column.get(this)).getTime());
+                            try {
+                                values.put(columnName, ((Date) column.get(this)).getTime());
+                            } catch (NullPointerException e) {
+                                values.put(columnName, (Long) null);
+                            }
                         }
                         else if (Calendar.class.equals(columnType)) {
-                            values.put(columnName, ((Calendar) column.get(this)).getTimeInMillis());
+                            try {
+                                values.put(columnName, ((Calendar) column.get(this)).getTimeInMillis());
+                            } catch (NullPointerException e) {
+                                values.put(columnName, (Long) null);
+                            }
                         }else{
                             values.put(columnName, String.valueOf(columnValue));
                         }

From 3b0db0a6ed5b6a4427c9edad5cee3b093eec2ff7 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Mon, 30 Jun 2014 08:58:08 -0700
Subject: [PATCH 004/305] Overload findById to take an Integer

---
 library/src/com/orm/SugarRecord.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index da414a66..d00477fb 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -142,6 +142,10 @@ public static <T extends SugarRecord<?>> T findById(Class<T> type, Long id) {
         return list.get(0);
     }
 
+    public static <T extends SugarRecord<?>> T findById(Class<T> type, Integer id) {
+        return findById(type, Long.valueOf(id));
+    }
+
     public static <T extends SugarRecord<?>> Iterator<T> findAll(Class<T> type) {
         return findAsIterator(type, null, null, null, null, null);
     }

From 052f43144996aba28e1eef0d1bfdd9ee9d2c0248 Mon Sep 17 00:00:00 2001
From: Satya Narayan <satya@satyanarayan.in>
Date: Fri, 4 Jul 2014 11:25:01 -0700
Subject: [PATCH 005/305] removed artifacts from source control

---
 dist/sugar-1.0.jar      | Bin 12491 -> 0 bytes
 dist/sugar-1.1.jar      | Bin 12546 -> 0 bytes
 dist/sugar-1.2.jar      | Bin 18988 -> 0 bytes
 dist/sugar-1.3_beta.jar | Bin 23231 -> 0 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 dist/sugar-1.0.jar
 delete mode 100644 dist/sugar-1.1.jar
 delete mode 100644 dist/sugar-1.2.jar
 delete mode 100644 dist/sugar-1.3_beta.jar

diff --git a/dist/sugar-1.0.jar b/dist/sugar-1.0.jar
deleted file mode 100644
index 2bf1abd30830500ac87220047c0ab1aa51930083..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12491
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
Oe%N2vX%PL-fBy#)DinhN

diff --git a/dist/sugar-1.1.jar b/dist/sugar-1.1.jar
deleted file mode 100644
index 96a6b77e483ca1c1d17cb62f3d744cf0a4a789fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12546
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
LecD9#^WXmiwR9{=

diff --git a/dist/sugar-1.2.jar b/dist/sugar-1.2.jar
deleted file mode 100644
index 2e6f02901411a0a1ed6ec3af225aa2f05e5a6efc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18988
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
b-6-T<M1VIdu(ts^sYs0B12CJbxqx^8*(2|N

diff --git a/dist/sugar-1.3_beta.jar b/dist/sugar-1.3_beta.jar
deleted file mode 100644
index a9d0ed8c39d936797c9534ec90defa46c60efc22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23231
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


From d8687da0d91e1dafe4238f5b163ff7bc8f474db0 Mon Sep 17 00:00:00 2001
From: Satya Narayan <81.narayan@gmail.com>
Date: Mon, 7 Jul 2014 14:02:16 -0700
Subject: [PATCH 006/305] Update README.md

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index e6916fb1..a47a9ff9 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,15 @@ Sugar is now available as a library project also. Add it to your project and uti
 The project is available in the folder "library"
 http://developer.android.com/tools/projects/index.html#LibraryProjects
 
+# New in version 1.3
+
+Transaction Support
+Bulk Insert of records 
+Encrypted datastore (branch : sugar-cipher using sqlcipher)
+Removed Constructor with context parameter. Needs default constructor now.
+Enhancements to QueryBuilder
+Bug fixes and other improvements.
+
 # New in version 1.2
 
 1. package restriction for domain classes.

From 5c25fec55fe689a340ea01c1ffc8b42923aa22c0 Mon Sep 17 00:00:00 2001
From: Satya Narayan <81.narayan@gmail.com>
Date: Mon, 7 Jul 2014 14:02:59 -0700
Subject: [PATCH 007/305] Update README.md

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a47a9ff9..4f42fe65 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ http://developer.android.com/tools/projects/index.html#LibraryProjects
 
 # New in version 1.3
 
-Transaction Support
-Bulk Insert of records 
-Encrypted datastore (branch : sugar-cipher using sqlcipher)
-Removed Constructor with context parameter. Needs default constructor now.
-Enhancements to QueryBuilder
-Bug fixes and other improvements.
+1. Transaction Support
+2. Bulk Insert of records 
+3. Encrypted datastore (branch : sugar-cipher using sqlcipher)
+4. Removed Constructor with context parameter. Needs default constructor now.
+5. Enhancements to QueryBuilder
+6. Bug fixes and other improvements.
 
 # New in version 1.2
 

From 3c47b24d5419b68a7d64837f540dc0c451360cce Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Mon, 7 Jul 2014 20:10:28 -0700
Subject: [PATCH 008/305] Fallback class loader for Robolectric Closes #96

---
 library/src/com/orm/SugarDb.java | 35 ++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index 0f859afc..ca7a2b47 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -15,7 +15,12 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
-import java.util.*;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
 
 import static com.orm.SugarConfig.getDatabaseVersion;
 import static com.orm.SugarConfig.getDebugEnabled;
@@ -32,11 +37,7 @@ public SugarDb(Context context) {
     private <T extends SugarRecord<?>> List<T> getDomainClasses(Context context) {
         List<T> domainClasses = new ArrayList<T>();
         try {
-            Enumeration<?> allClasses = getAllClasses(context);
-
-            while (allClasses.hasMoreElements()) {
-                String className = (String) allClasses.nextElement();
-
+            for (String className : getAllClasses(context)) {
                 if (className.startsWith(SugarConfig.getDomainPackageName(context))) {
                     T domainClass = getDomainClass(className, context);
                     if (domainClass != null) domainClasses.add(domainClass);
@@ -84,10 +85,26 @@ private <T extends SugarRecord<?>> T getDomainClass(String className, Context co
 
     }
 
-    private Enumeration<?> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
+    private List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
         String path = getSourcePath(context);
-        DexFile dexfile = new DexFile(path);
-        return dexfile.entries();
+        List<String> classNames = new ArrayList<String>();
+        try {
+            DexFile dexfile = new DexFile(path);
+            Enumeration<String> dexEntries = dexfile.entries();
+            while (dexEntries.hasMoreElements()) {
+                classNames.add(dexEntries.nextElement());
+            }
+        } catch (NullPointerException e) {
+            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            Enumeration<URL> urls = classLoader.getResources("");
+            while (urls.hasMoreElements()) {
+                String urlPath = urls.nextElement().getFile();
+                if (urlPath.contains("bin") || urlPath.contains("classes")) {
+                    classNames.add(urlPath);
+                }
+            }
+        }
+        return classNames;
     }
 
     private String getSourcePath(Context context) throws PackageManager.NameNotFoundException {

From e2bb783d96f13dc224d848be8759120dc9b08968 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Mon, 7 Jul 2014 20:20:42 -0700
Subject: [PATCH 009/305] Add documentation on onTerminate to clarify usage
 scenarios Closes #106

---
 library/src/com/orm/SugarApp.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/src/com/orm/SugarApp.java b/library/src/com/orm/SugarApp.java
index d15c411f..ac7da99d 100644
--- a/library/src/com/orm/SugarApp.java
+++ b/library/src/com/orm/SugarApp.java
@@ -11,6 +11,12 @@ public void onCreate(){
         this.database = new Database(this);
     }
 
+    /*
+     * Per issue #106 on Github, this method won't be called in
+     * any real Android device. This method is used purely in
+     * emulated process environments such as an emulator or
+     * Robolectric Android mock.
+     */
     public void onTerminate(){
         if (this.database != null) {
             this.database.getDB().close();

From 3e3c718d83c89a455a6b859cb095cb250476a741 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Mon, 7 Jul 2014 21:26:23 -0700
Subject: [PATCH 010/305] Update README.md

---
 README.md | 78 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 63 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 4f42fe65..5189146d 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,62 @@
-Please follow the documentation at
-http://satyan.github.io/sugar
+# Sugar ORM
 
-The example application is provided in the "example" folder in the source.
+Insanely easy way to work with Android databases.
 
+Official documentation can be found [here](http://satyan.github.io/sugar). The example application is provided in the **example** folder in the source.
 
-# Getting Started:
+## Features
 
-Sugar is now available as a library project also. Add it to your project and utilize the latest changes.
-The project is available in the folder "library"
-http://developer.android.com/tools/projects/index.html#LibraryProjects
+Sugar ORM was built in contrast to other ORM's to have:
 
-# New in version 1.3
+1. A simple, concise, and clean integration process with minimal configuration.
+3. Automatic table and column naming through reflection.
+4. Support for migrations between different schema versions.
+
+## Installing
+
+There are four ways to install Sugar:
+
+#### As a Gradle dependency
+
+This is the preferred way. Simply add:
+
+```groovy
+compile 'com.github.satyan:sugar:1.3'
+```
+
+to your project dependencies and run `gradle build` or `gradle assemble`.
+
+#### As a Maven dependency
+
+Declare the dependency in Maven:
+
+```xml
+<dependency>
+    <groupId>com.github.satyan</groupId>
+    <artifactId>sugar</artifactId>
+    <version>1.3</version>
+</dependency>
+```
+
+#### As a library project
+
+Download the source code and import it as a library project in Eclipse. The project is available in the folder **library**. For more information on how to do this, read [here](http://developer.android.com/tools/projects/index.html#LibraryProjects).
+
+#### Use a jar
+
+Visit the [releases](https://github.com/satyan/sugar/releases) to download jars directly. You can drop them into your `libs` folder and configure the Java build path to include the library. See this [tutorial](http://www.vogella.com/tutorials/AndroidLibraryProjects/article.html) for an excellent guide on how to do this.
+
+===================
+
+After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html).
+
+## Contributing
+
+Please fork this repository and contribute back using [pull requests](https://github.com/satyan/sugar/pulls). Features can be requested using [issues](https://github.com/satyan/sugar/issues). All code, comments, and critiques are greatly appreciated.
+
+## Changelog
+
+#### 1.3 [[jar](https://github.com/satyan/sugar/releases/download/v1.3/sugar-1.3.jar)]
 
 1. Transaction Support
 2. Bulk Insert of records 
@@ -19,7 +65,7 @@ http://developer.android.com/tools/projects/index.html#LibraryProjects
 5. Enhancements to QueryBuilder
 6. Bug fixes and other improvements.
 
-# New in version 1.2
+#### 1.2 [[jar](https://github.com/satyan/sugar/releases/download/v1.2/sugar-1.2.jar)]
 
 1. package restriction for domain classes.
 2. metadata caching
@@ -28,16 +74,18 @@ http://developer.android.com/tools/projects/index.html#LibraryProjects
 5. Provision for Raw queries
 6. Better and more organized api guide and usage instructions.
 
-# What's new in 1.1:
+#### 1.1 [[jar](https://github.com/satyan/sugar/releases/download/v1.1/sugar-1.1.jar)]
 
 1. Static api doesn't take context anymore. Hence
 
-        Book.findById(context, Book.class, 1);
+```java
+Book.findById(context, Book.class, 1);
+```
 
-        becomes
-
-        Book.findById(Book.class, 1);
+becomes
 
+```java
+Book.findById(Book.class, 1);
+```
 
 2. Some cleanup in the code.
-

From 5ccf5e1f84048f94065f6ab9891f89c5ed4477cf Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Mon, 7 Jul 2014 21:26:51 -0700
Subject: [PATCH 011/305] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5189146d..179c824d 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Please fork this repository and contribute back using [pull requests](https://gi
 
 ## Changelog
 
-#### 1.3 [[jar](https://github.com/satyan/sugar/releases/download/v1.3/sugar-1.3.jar)]
+#### v1.3 [[jar](https://github.com/satyan/sugar/releases/download/v1.3/sugar-1.3.jar)]
 
 1. Transaction Support
 2. Bulk Insert of records 
@@ -65,7 +65,7 @@ Please fork this repository and contribute back using [pull requests](https://gi
 5. Enhancements to QueryBuilder
 6. Bug fixes and other improvements.
 
-#### 1.2 [[jar](https://github.com/satyan/sugar/releases/download/v1.2/sugar-1.2.jar)]
+#### v1.2 [[jar](https://github.com/satyan/sugar/releases/download/v1.2/sugar-1.2.jar)]
 
 1. package restriction for domain classes.
 2. metadata caching
@@ -74,7 +74,7 @@ Please fork this repository and contribute back using [pull requests](https://gi
 5. Provision for Raw queries
 6. Better and more organized api guide and usage instructions.
 
-#### 1.1 [[jar](https://github.com/satyan/sugar/releases/download/v1.1/sugar-1.1.jar)]
+#### v1.1 [[jar](https://github.com/satyan/sugar/releases/download/v1.1/sugar-1.1.jar)]
 
 1. Static api doesn't take context anymore. Hence
 

From a7eb1989c07c944894db48d5655962b167813bad Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 8 Jul 2014 09:07:21 -0700
Subject: [PATCH 012/305] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 179c824d..225f1682 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Download the source code and import it as a library project in Eclipse. The proj
 
 #### Use a jar
 
-Visit the [releases](https://github.com/satyan/sugar/releases) to download jars directly. You can drop them into your `libs` folder and configure the Java build path to include the library. See this [tutorial](http://www.vogella.com/tutorials/AndroidLibraryProjects/article.html) for an excellent guide on how to do this.
+Visit the [releases](https://github.com/satyan/sugar/releases) page to download jars directly. You can drop them into your `libs` folder and configure the Java build path to include the library. See this [tutorial](http://www.vogella.com/tutorials/AndroidLibraryProjects/article.html) for an excellent guide on how to do this.
 
 ===================
 

From 71be7aebeaa11201714674a152f991ac71b6937e Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Wed, 9 Jul 2014 10:55:30 -0700
Subject: [PATCH 013/305] Fix Robolectric class finder

---
 library/src/com/orm/SugarDb.java | 52 ++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index ca7a2b47..227e55cf 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -1,14 +1,10 @@
 package com.orm;
 
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-import dalvik.system.DexFile;
+import static com.orm.SugarConfig.getDatabaseVersion;
+import static com.orm.SugarConfig.getDebugEnabled;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -22,8 +18,13 @@
 import java.util.Enumeration;
 import java.util.List;
 
-import static com.orm.SugarConfig.getDatabaseVersion;
-import static com.orm.SugarConfig.getDebugEnabled;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+import dalvik.system.DexFile;
 
 public class SugarDb extends SQLiteOpenHelper {
     private Context context;
@@ -97,15 +98,42 @@ private List<String> getAllClasses(Context context) throws PackageManager.NameNo
         } catch (NullPointerException e) {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             Enumeration<URL> urls = classLoader.getResources("");
+            List<String> fileNames = new ArrayList<String>();
             while (urls.hasMoreElements()) {
-                String urlPath = urls.nextElement().getFile();
-                if (urlPath.contains("bin") || urlPath.contains("classes")) {
-                    classNames.add(urlPath);
+                String classDirectoryName = urls.nextElement().getFile();
+                if (classDirectoryName.contains("bin") || classDirectoryName.contains("classes")) {
+                    File classDirectory = new File(classDirectoryName);
+                    for (File filePath : classDirectory.listFiles()) {
+                        populateFiles(filePath, fileNames, "");
+                    }
+                    classNames.addAll(fileNames);
                 }
             }
         }
         return classNames;
     }
+    
+    private void populateFiles(File path, List<String> fileNames, String parent) {
+        if (path.isDirectory()) {
+            for (File newPath : path.listFiles()) {
+                if ("".equals(parent)) {
+                    populateFiles(newPath, fileNames, path.getName());
+                } else {
+                    populateFiles(newPath, fileNames, parent + "." + path.getName());
+                }
+            }
+        } else {
+            String pathName = path.getName();
+            String classSuffix = ".class";
+            pathName = pathName.endsWith(classSuffix) ?
+                    pathName.substring(0, pathName.length() - classSuffix.length()) : pathName;
+            if ("".equals(parent)) {
+                fileNames.add(pathName);
+            } else {
+                fileNames.add(parent + "." + pathName);
+            }
+        }
+    }
 
     private String getSourcePath(Context context) throws PackageManager.NameNotFoundException {
         return context.getPackageManager().getApplicationInfo(context.getPackageName(), 0).sourceDir;

From 1fa556ae488ea5d63394010699fa4c5ad67356fc Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Fri, 28 Mar 2014 14:00:51 +0000
Subject: [PATCH 014/305] Style improvements to SugarRecord

---
 library/src/com/orm/SugarRecord.java | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index 4bedcd1c..55bfd758 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -91,39 +91,31 @@ long save(SQLiteDatabase db) {
                     if (!"id".equalsIgnoreCase(column.getName())) {
                         if (columnType.equals(Short.class) || columnType.equals(short.class)) {
                             values.put(columnName, (Short) columnValue);
-                        }
-                        else if (columnType.equals(Integer.class) || columnType.equals(int.class)) {
+                        } else if (columnType.equals(Integer.class) || columnType.equals(int.class)) {
                             values.put(columnName, (Integer) columnValue);
-                        }
-                        else if (columnType.equals(Long.class) || columnType.equals(long.class)) {
+                        } else if (columnType.equals(Long.class) || columnType.equals(long.class)) {
                             values.put(columnName, (Long) columnValue);
-                        }
-                        else if (columnType.equals(Float.class) || columnType.equals(float.class)) {
+                        } else if (columnType.equals(Float.class) || columnType.equals(float.class)) {
                             values.put(columnName, (Float) columnValue);
-                        }
-                        else if (columnType.equals(Double.class) || columnType.equals(double.class)) {
+                        } else if (columnType.equals(Double.class) || columnType.equals(double.class)) {
                             values.put(columnName, (Double) columnValue);
-                        }
-                        else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
+                        } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
                             values.put(columnName, (Boolean) columnValue);
-                        }
-                        else if (Date.class.equals(columnType)) {
+                        } else if (Date.class.equals(columnType)) {
                             try {
                                 values.put(columnName, ((Date) column.get(this)).getTime());
                             } catch (NullPointerException e) {
                                 values.put(columnName, (Long) null);
                             }
-                        }
-                        else if (Calendar.class.equals(columnType)) {
+                        } else if (Calendar.class.equals(columnType)) {
                             try {
                                 values.put(columnName, ((Calendar) column.get(this)).getTimeInMillis());
                             } catch (NullPointerException e) {
                                 values.put(columnName, (Long) null);
                             }
-                        }else{
+                        } else {
                             values.put(columnName, String.valueOf(columnValue));
                         }
-
                     }
                 }
 

From 1dcd185943a2bb0ba1a4faf153cceca9164dd8d8 Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Fri, 28 Mar 2014 14:43:42 +0000
Subject: [PATCH 015/305] Adding build folder to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b2d2fc5b..88c78310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 library/bin
+library/build
 library/gen
 library/.project
 library/.classpath

From 9c1e19be49ab73772e86dda232f5349d4f5dcc24 Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@itsnotworking.co.uk>
Date: Mon, 31 Mar 2014 11:54:13 +0100
Subject: [PATCH 016/305] Updating ignore file Closes #78

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 88c78310..2adde673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,6 @@ library/build
 library/gen
 library/.project
 library/.classpath
+library/library.iml
 *.class
 .DS_Store

From 02e1d4974d55733c3857736c832f3f948b26fa2c Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Wed, 9 Jul 2014 21:07:38 -0700
Subject: [PATCH 017/305] Allow id to be modified directly by model

Thanks to Cristian Palos Rejano (@cpalosrejano) for the suggestion.
Closes #77
---
 library/AndroidManifest.xml          |  2 +-
 library/src/com/orm/SugarRecord.java | 57 +++++++++++++---------------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
index 65bb4873..a48c294b 100644
--- a/library/AndroidManifest.xml
+++ b/library/AndroidManifest.xml
@@ -3,6 +3,6 @@
           package="com.orm.dsl"
           android:versionCode="1"
           android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="4" />
+    <uses-sdk android:minSdkVersion="8" />
 
 </manifest>
\ No newline at end of file
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index 55bfd758..764b655e 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -88,34 +88,32 @@ long save(SQLiteDatabase db) {
                                     ? String.valueOf(((SugarRecord) columnValue).id)
                                     : "0");
                 } else {
-                    if (!"id".equalsIgnoreCase(column.getName())) {
-                        if (columnType.equals(Short.class) || columnType.equals(short.class)) {
-                            values.put(columnName, (Short) columnValue);
-                        } else if (columnType.equals(Integer.class) || columnType.equals(int.class)) {
-                            values.put(columnName, (Integer) columnValue);
-                        } else if (columnType.equals(Long.class) || columnType.equals(long.class)) {
-                            values.put(columnName, (Long) columnValue);
-                        } else if (columnType.equals(Float.class) || columnType.equals(float.class)) {
-                            values.put(columnName, (Float) columnValue);
-                        } else if (columnType.equals(Double.class) || columnType.equals(double.class)) {
-                            values.put(columnName, (Double) columnValue);
-                        } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
-                            values.put(columnName, (Boolean) columnValue);
-                        } else if (Date.class.equals(columnType)) {
-                            try {
-                                values.put(columnName, ((Date) column.get(this)).getTime());
-                            } catch (NullPointerException e) {
-                                values.put(columnName, (Long) null);
-                            }
-                        } else if (Calendar.class.equals(columnType)) {
-                            try {
-                                values.put(columnName, ((Calendar) column.get(this)).getTimeInMillis());
-                            } catch (NullPointerException e) {
-                                values.put(columnName, (Long) null);
-                            }
-                        } else {
-                            values.put(columnName, String.valueOf(columnValue));
+                    if (columnType.equals(Short.class) || columnType.equals(short.class)) {
+                        values.put(columnName, (Short) columnValue);
+                    } else if (columnType.equals(Integer.class) || columnType.equals(int.class)) {
+                        values.put(columnName, (Integer) columnValue);
+                    } else if (columnType.equals(Long.class) || columnType.equals(long.class)) {
+                        values.put(columnName, (Long) columnValue);
+                    } else if (columnType.equals(Float.class) || columnType.equals(float.class)) {
+                        values.put(columnName, (Float) columnValue);
+                    } else if (columnType.equals(Double.class) || columnType.equals(double.class)) {
+                        values.put(columnName, (Double) columnValue);
+                    } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
+                        values.put(columnName, (Boolean) columnValue);
+                    } else if (Date.class.equals(columnType)) {
+                        try {
+                            values.put(columnName, ((Date) column.get(this)).getTime());
+                        } catch (NullPointerException e) {
+                            values.put(columnName, (Long) null);
                         }
+                    } else if (Calendar.class.equals(columnType)) {
+                        try {
+                            values.put(columnName, ((Calendar) column.get(this)).getTimeInMillis());
+                        } catch (NullPointerException e) {
+                            values.put(columnName, (Long) null);
+                        }
+                    } else {
+                        values.put(columnName, String.valueOf(columnValue));
                     }
                 }
 
@@ -124,10 +122,7 @@ long save(SQLiteDatabase db) {
             }
         }
 
-        if (id == null)
-            id = db.insert(getSqlName(), null, values);
-        else
-            db.update(getSqlName(), values, "ID = ?", new String[]{String.valueOf(id)});
+        id = db.insertWithOnConflict(getSqlName(), null, values, SQLiteDatabase.CONFLICT_REPLACE);
 
         Log.i("Sugar", getClass().getSimpleName() + " saved : " + id);
         return id;

From a75e97fe77791b2552eef947e6d1902a3718420d Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Wed, 9 Jul 2014 21:31:46 -0700
Subject: [PATCH 018/305] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 225f1682..b8d2c181 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ Official documentation can be found [here](http://satyan.github.io/sugar). The e
 Sugar ORM was built in contrast to other ORM's to have:
 
 1. A simple, concise, and clean integration process with minimal configuration.
-3. Automatic table and column naming through reflection.
-4. Support for migrations between different schema versions.
+2. Automatic table and column naming through reflection.
+3. Support for migrations between different schema versions.
 
 ## Installing
 

From cc295b3a4fe49236d10d3b6edc7db3ca000a6fe3 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Wed, 9 Jul 2014 21:34:50 -0700
Subject: [PATCH 019/305] Update README.md

---
 README.md | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index b8d2c181..2cea7303 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ Official documentation can be found [here](http://satyan.github.io/sugar). The e
 
 Sugar ORM was built in contrast to other ORM's to have:
 
-1. A simple, concise, and clean integration process with minimal configuration.
-2. Automatic table and column naming through reflection.
-3. Support for migrations between different schema versions.
+- A simple, concise, and clean integration process with minimal configuration.
+- Automatic table and column naming through reflection.
+- Support for migrations between different schema versions.
 
 ## Installing
 
@@ -58,25 +58,25 @@ Please fork this repository and contribute back using [pull requests](https://gi
 
 #### v1.3 [[jar](https://github.com/satyan/sugar/releases/download/v1.3/sugar-1.3.jar)]
 
-1. Transaction Support
-2. Bulk Insert of records 
-3. Encrypted datastore (branch : sugar-cipher using sqlcipher)
-4. Removed Constructor with context parameter. Needs default constructor now.
-5. Enhancements to QueryBuilder
-6. Bug fixes and other improvements.
+- Transaction Support
+- Bulk Insert of records 
+- Encrypted datastore (branch : sugar-cipher using sqlcipher)
+- Removed Constructor with context parameter. Needs default constructor now.
+- Enhancements to QueryBuilder
+- Bug fixes and other improvements.
 
 #### v1.2 [[jar](https://github.com/satyan/sugar/releases/download/v1.2/sugar-1.2.jar)]
 
-1. package restriction for domain classes.
-2. metadata caching
-3. QueryBuilder v1
-4. Database Migrations
-5. Provision for Raw queries
-6. Better and more organized api guide and usage instructions.
+- package restriction for domain classes.
+- metadata caching
+- QueryBuilder v1
+- Database Migrations
+- Provision for Raw queries
+- Better and more organized api guide and usage instructions.
 
 #### v1.1 [[jar](https://github.com/satyan/sugar/releases/download/v1.1/sugar-1.1.jar)]
 
-1. Static api doesn't take context anymore. Hence
+- Static api doesn't take context anymore. Hence
 
 ```java
 Book.findById(context, Book.class, 1);
@@ -88,4 +88,4 @@ becomes
 Book.findById(Book.class, 1);
 ```
 
-2. Some cleanup in the code.
+- Some cleanup in the code.

From 913dbf3c8410a1b8b963377adec6c963204864cb Mon Sep 17 00:00:00 2001
From: androdevcafe <androdevcafe@gmail.com>
Date: Mon, 30 Jun 2014 00:59:25 +0200
Subject: [PATCH 020/305] Added 'unique' and 'not null' support Closes #112

---
 library/src/com/orm/SugarDb.java     | 10 ++++++++++
 library/src/com/orm/dsl/NotNull.java |  8 ++++++++
 library/src/com/orm/dsl/Unique.java  |  8 ++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 library/src/com/orm/dsl/NotNull.java
 create mode 100644 library/src/com/orm/dsl/Unique.java

diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index 227e55cf..1e7acc86 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -24,6 +24,10 @@
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
+
+import com.orm.dsl.NotNull;
+import com.orm.dsl.Unique;
+
 import dalvik.system.DexFile;
 
 public class SugarDb extends SQLiteOpenHelper {
@@ -168,6 +172,12 @@ private <T extends SugarRecord<?>> void createTable(T table, SQLiteDatabase sqLi
                     continue;
                 }
                 sb.append(", ").append(columnName).append(" ").append(columnType);
+                if(column.isAnnotationPresent(NotNull.class)) {
+                    sb.append(" NOT NULL");
+                }
+                if(column.isAnnotationPresent(Unique.class)) {
+                    sb.append(" UNIQUE");
+                }
             }
         }
         sb.append(" ) ");
diff --git a/library/src/com/orm/dsl/NotNull.java b/library/src/com/orm/dsl/NotNull.java
new file mode 100644
index 00000000..b2361851
--- /dev/null
+++ b/library/src/com/orm/dsl/NotNull.java
@@ -0,0 +1,8 @@
+package com.orm.dsl;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface NotNull {
+}
diff --git a/library/src/com/orm/dsl/Unique.java b/library/src/com/orm/dsl/Unique.java
new file mode 100644
index 00000000..7384b749
--- /dev/null
+++ b/library/src/com/orm/dsl/Unique.java
@@ -0,0 +1,8 @@
+package com.orm.dsl;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Unique {
+}

From 2ca05f4c4711fe0cfc1d66216d30fb6c05aa8a5f Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 10 Jul 2014 21:28:04 -0700
Subject: [PATCH 021/305] =?UTF-8?q?Insert=20a=20true=20null=20instead=20of?=
 =?UTF-8?q?=20a=20string=20=E2=80=9Cnull=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/src/com/orm/SugarRecord.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index 764b655e..f87630b4 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -113,7 +113,11 @@ long save(SQLiteDatabase db) {
                             values.put(columnName, (Long) null);
                         }
                     } else {
-                        values.put(columnName, String.valueOf(columnValue));
+                        if (columnValue == null) {
+                            values.putNull(columnName);
+                        } else {
+                            values.put(columnName, String.valueOf(columnValue));
+                        }
                     }
                 }
 

From 336d093253d1df8aaa793b2f981656c661a4b0bc Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Thu, 10 Jul 2014 21:31:38 -0700
Subject: [PATCH 022/305] Clean up table creation for date and calendar fields

---
 library/src/com/orm/SugarDb.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index 1e7acc86..dafdd97b 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -173,6 +173,9 @@ private <T extends SugarRecord<?>> void createTable(T table, SQLiteDatabase sqLi
                 }
                 sb.append(", ").append(columnName).append(" ").append(columnType);
                 if(column.isAnnotationPresent(NotNull.class)) {
+                    if (columnType.endsWith(" NULL")) {
+                        sb.delete(sb.length() - 5, sb.length());
+                    }
                     sb.append(" NOT NULL");
                 }
                 if(column.isAnnotationPresent(Unique.class)) {

From 458a583165d2eae54029f6b7707cde898700ab53 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Mon, 14 Jul 2014 21:11:01 -0700
Subject: [PATCH 023/305] Clean up Select sql method

---
 library/src/com/orm/query/Select.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/src/com/orm/query/Select.java b/library/src/com/orm/query/Select.java
index ceaac65c..aa2462fa 100644
--- a/library/src/com/orm/query/Select.java
+++ b/library/src/com/orm/query/Select.java
@@ -122,9 +122,7 @@ public T first() {
     String toSql() {
         StringBuilder sql = new StringBuilder();
 
-        sql.append("SELECT * FROM");
-
-        sql.append("FROM ");
+        sql.append("SELECT * FROM ");
 
         sql.append(SugarRecord.getTableName(this.record) + " ");
 

From a753b4dabc9553bf3adf2cde6f0db3bf72c8508b Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Mon, 14 Jul 2014 21:12:44 -0700
Subject: [PATCH 024/305] =?UTF-8?q?Fix=20nesting=20of=20=E2=80=9Cor?=
 =?UTF-8?q?=E2=80=9D=20and=20=E2=80=9Cand=E2=80=9D=20query=20building=20st?=
 =?UTF-8?q?atements=20Closes=20#104?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/src/com/orm/query/Select.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/library/src/com/orm/query/Select.java b/library/src/com/orm/query/Select.java
index aa2462fa..95688297 100644
--- a/library/src/com/orm/query/Select.java
+++ b/library/src/com/orm/query/Select.java
@@ -56,23 +56,29 @@ public Select<T> where(Condition... condition) {
     }
 
     private void mergeConditions(Condition[] conditions, Condition.Type type) {
+        StringBuilder toAppend = new StringBuilder("");
         for (Condition condition : conditions) {
 
-            if (!"".equals(whereClause)) {
-                whereClause += " " + type.name() + " ";
+            if (toAppend.length() != 0) {
+                toAppend.append(" " + type.name() + " ");
             }
 
             if(Condition.Check.LIKE.equals(condition.getCheck()) || Condition.Check.NOT_LIKE.equals(condition.getCheck())){
 
-                whereClause += condition.getProperty() + condition.getCheckSymbol() + "'" + condition.getValue().toString() +"'";
+                toAppend.append(condition.getProperty() + condition.getCheckSymbol() + "'" + condition.getValue().toString() + "'");
 
             }else{
 
-                whereClause += condition.getProperty() + condition.getCheckSymbol() + "? ";
+                toAppend.append(condition.getProperty() + condition.getCheckSymbol() + "? ");
                 args.add(condition.getValue());
             }
 
         }
+        
+        if (!"".equals(whereClause)) {
+            whereClause += " " + type.name() + " ";
+        }
+        whereClause += "(" + toAppend + ")";
     }
 
     public Select<T> whereOr(Condition... args) {

From 25588f3e2606afc1ef4da82047d4b24b74f918b3 Mon Sep 17 00:00:00 2001
From: Satya Narayan <satya@satyanarayan.in>
Date: Tue, 15 Jul 2014 19:40:51 -0700
Subject: [PATCH 025/305] Added Column annotation for custom naming of fields.
 It also combines @Unique and @NotNull annotations apart from name. Should be
 used as a holder for all column properties in future.

---
 example/src/com/example/Note.java          |  5 ++-
 example/src/com/example/SugarActivity.java |  6 +--
 library/src/com/orm/StringUtil.java        | 14 ++++++-
 library/src/com/orm/SugarDb.java           | 46 +++++++++++++++++-----
 library/src/com/orm/SugarRecord.java       |  8 ++--
 library/src/com/orm/dsl/Column.java        | 11 ++++++
 library/test/com/orm/StringUtilTest.java   | 14 +++----
 7 files changed, 77 insertions(+), 27 deletions(-)
 create mode 100644 library/src/com/orm/dsl/Column.java

diff --git a/example/src/com/example/Note.java b/example/src/com/example/Note.java
index 468b074c..8e6308f9 100755
--- a/example/src/com/example/Note.java
+++ b/example/src/com/example/Note.java
@@ -1,10 +1,13 @@
 package com.example;
 
-import android.content.Context;
 import com.orm.SugarRecord;
+import com.orm.dsl.Column;
 
 public class Note extends SugarRecord<Note>{
+
+    @Column(name = "noteId", unique = true, notNull = true)
     private int noteId;
+
     private String title;
     private String description;
    private String name;
diff --git a/example/src/com/example/SugarActivity.java b/example/src/com/example/SugarActivity.java
index 22dd9c1c..f5b8fe9f 100755
--- a/example/src/com/example/SugarActivity.java
+++ b/example/src/com/example/SugarActivity.java
@@ -32,9 +32,9 @@ private void initDb() {
         t2.save();
 
         Note n1 = new Note( 10, "note1", "description1", t1);
-        Note n2 = new Note(10, "note12", "description2", t1);
-        Note n3 = new Note( 10, "note13", "description3", t2);
-        Note n4 = new Note( 10, "note4", "description4", t2);
+        Note n2 = new Note(11, "note12", "description2", t1);
+        Note n3 = new Note( 12, "note13", "description3", t2);
+        Note n4 = new Note( 13, "note4", "description4", t2);
 
          TextNote textNote = new TextNote();
          textNote.desc = "Test";
diff --git a/library/src/com/orm/StringUtil.java b/library/src/com/orm/StringUtil.java
index 40fabf48..4f837a1b 100644
--- a/library/src/com/orm/StringUtil.java
+++ b/library/src/com/orm/StringUtil.java
@@ -1,7 +1,11 @@
 package com.orm;
 
+import com.orm.dsl.Column;
+
+import java.lang.reflect.Field;
+
 public class StringUtil {
-    public static String toSQLName(String javaNotation) {
+    public static String toSQLNameDefault(String javaNotation) {
             if(javaNotation.equalsIgnoreCase("_id"))
                     return "_id";
 
@@ -35,4 +39,12 @@ public static String toSQLName(String javaNotation) {
             return sb.toString();
     }
 
+    public static String toSQLName(Field field){
+        if(field.isAnnotationPresent(Column.class)){
+            Column annotation = field.getAnnotation(Column.class);
+            return annotation.name();
+        }
+
+        return toSQLNameDefault(field.getName());
+    }
 }
diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index dafdd97b..ceab2243 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -25,6 +25,7 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
+import com.orm.dsl.Column;
 import com.orm.dsl.NotNull;
 import com.orm.dsl.Unique;
 
@@ -60,7 +61,6 @@ private <T extends SugarRecord<?>> List<T> getDomainClasses(Context context) {
 
     @SuppressWarnings("unchecked")
     private <T extends SugarRecord<?>> T getDomainClass(String className, Context context) {
-        Log.i("Sugar", "domain class");
         Class<?> discoveredClass = null;
         try {
             discoveredClass = Class.forName(className, true, context.getClass().getClassLoader());
@@ -70,11 +70,14 @@ private <T extends SugarRecord<?>> T getDomainClass(String className, Context co
 
         if ((discoveredClass == null) ||
                 (!SugarRecord.class.isAssignableFrom(discoveredClass)) ||
+                SugarRecord.class.equals(discoveredClass) ||
                 Modifier.isAbstract(discoveredClass.getModifiers())) {
             return null;
         } else {
             try {
+                Log.i("Sugar", "domain class : " + discoveredClass.getSimpleName());
                 return (T) discoveredClass.getDeclaredConstructor().newInstance();
+
             } catch (InstantiationException e) {
                 Log.e("Sugar", e.getMessage());
             } catch (IllegalAccessException e) {
@@ -163,7 +166,7 @@ private <T extends SugarRecord<?>> void createTable(T table, SQLiteDatabase sqLi
                 " ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
 
         for (Field column : fields) {
-            String columnName = StringUtil.toSQLName(column.getName());
+            String columnName = StringUtil.toSQLName(column);
             String columnType = QueryBuilder.getColumnType(column.getType());
 
             if (columnType != null) {
@@ -171,15 +174,38 @@ private <T extends SugarRecord<?>> void createTable(T table, SQLiteDatabase sqLi
                 if (columnName.equalsIgnoreCase("Id")) {
                     continue;
                 }
-                sb.append(", ").append(columnName).append(" ").append(columnType);
-                if(column.isAnnotationPresent(NotNull.class)) {
-                    if (columnType.endsWith(" NULL")) {
-                        sb.delete(sb.length() - 5, sb.length());
+
+                if(column.isAnnotationPresent(Column.class)){
+                    Column columnAnnotation = column.getAnnotation(Column.class);
+                    columnName = columnAnnotation.name();
+
+                    sb.append(", ").append(columnName).append(" ").append(columnType);
+
+                    if (columnAnnotation.notNull()) {
+                        if (columnType.endsWith(" NULL")) {
+                            sb.delete(sb.length() - 5, sb.length());
+                        }
+                        sb.append(" NOT NULL");
+                    }
+
+                    if (columnAnnotation.unique()) {
+                        sb.append(" UNIQUE");
+                    }
+
+                }else {
+
+                    sb.append(", ").append(columnName).append(" ").append(columnType);
+
+                    if (column.isAnnotationPresent(NotNull.class)) {
+                        if (columnType.endsWith(" NULL")) {
+                            sb.delete(sb.length() - 5, sb.length());
+                        }
+                        sb.append(" NOT NULL");
+                    }
+
+                    if (column.isAnnotationPresent(Unique.class)) {
+                        sb.append(" UNIQUE");
                     }
-                    sb.append(" NOT NULL");
-                }
-                if(column.isAnnotationPresent(Unique.class)) {
-                    sb.append(" UNIQUE");
                 }
             }
         }
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index f87630b4..30eba6ee 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -1,7 +1,6 @@
 package com.orm;
 
 import android.content.ContentValues;
-import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
@@ -10,7 +9,6 @@
 import android.util.Log;
 import com.orm.dsl.Ignore;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -80,7 +78,7 @@ long save(SQLiteDatabase db) {
             column.setAccessible(true);
             Class<?> columnType = column.getType();
             try {
-                String columnName = StringUtil.toSQLName(column.getName());
+                String columnName = StringUtil.toSQLName(column);
                 Object columnValue = column.get(this);
                 if (SugarRecord.class.isAssignableFrom(columnType)) {
                     values.put(columnName,
@@ -272,7 +270,7 @@ void inflate(Cursor cursor) {
             field.setAccessible(true);
             try {
                 Class fieldType = field.getType();
-                String colName = StringUtil.toSQLName(field.getName());
+                String colName = StringUtil.toSQLName(field);
 
                 int columnIndex = cursor.getColumnIndex(colName);
 
@@ -390,7 +388,7 @@ public String getSqlName() {
 
 
     public static String getTableName(Class<?> type) {
-        return StringUtil.toSQLName(type.getSimpleName());
+        return StringUtil.toSQLNameDefault(type.getSimpleName());
     }
 
     public Long getId() {
diff --git a/library/src/com/orm/dsl/Column.java b/library/src/com/orm/dsl/Column.java
new file mode 100644
index 00000000..2c47e3c0
--- /dev/null
+++ b/library/src/com/orm/dsl/Column.java
@@ -0,0 +1,11 @@
+package com.orm.dsl;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Column {
+    String name();
+    boolean unique() default false;
+    boolean notNull() default false;
+}
diff --git a/library/test/com/orm/StringUtilTest.java b/library/test/com/orm/StringUtilTest.java
index 923bf98d..8f2b8786 100644
--- a/library/test/com/orm/StringUtilTest.java
+++ b/library/test/com/orm/StringUtilTest.java
@@ -7,17 +7,17 @@
 public class StringUtilTest {
     @Test
     public void testToSQLNameCaseConversion() throws Exception {
-        assertEquals("TESTLOWERCASE", StringUtil.toSQLName("testlowercase"));
-        assertEquals("TESTUPPERCASE", StringUtil.toSQLName("TESTUPPERCASE"));
+        assertEquals("TESTLOWERCASE", StringUtil.toSQLNameDefault("testlowercase"));
+        assertEquals("TESTUPPERCASE", StringUtil.toSQLNameDefault("TESTUPPERCASE"));
     }
 
     @Test
     public void testToSQLNameUnderscore(){
-        assertEquals("TEST_UNDERSCORE", StringUtil.toSQLName("testUnderscore"));
-        assertEquals("AB_CD", StringUtil.toSQLName("AbCd"));
-        assertEquals("AB_CD", StringUtil.toSQLName("ABCd"));
-        assertEquals("AB_CD", StringUtil.toSQLName("AbCD"));
-        assertEquals("SOME_DETAILS_OBJECT", StringUtil.toSQLName("SomeDetailsObject"));
+        assertEquals("TEST_UNDERSCORE", StringUtil.toSQLNameDefault("testUnderscore"));
+        assertEquals("AB_CD", StringUtil.toSQLNameDefault("AbCd"));
+        assertEquals("AB_CD", StringUtil.toSQLNameDefault("ABCd"));
+        assertEquals("AB_CD", StringUtil.toSQLNameDefault("AbCD"));
+        assertEquals("SOME_DETAILS_OBJECT", StringUtil.toSQLNameDefault("SomeDetailsObject"));
     }
 
 

From 36649d5514aae4b006ce3d6bff0028507ecba1da Mon Sep 17 00:00:00 2001
From: Satya Narayan <satya@satyanarayan.in>
Date: Tue, 15 Jul 2014 20:42:06 -0700
Subject: [PATCH 026/305] introduced Table annotation to handle custom table
 naming and removing the SugarRecord dependency

---
 example/src/com/example/Note.java          |  14 +-
 example/src/com/example/SugarActivity.java |  11 +-
 library/src/com/orm/StringUtil.java        |  69 ++++---
 library/src/com/orm/SugarDb.java           | 137 +++++++-------
 library/src/com/orm/SugarRecord.java       | 206 ++++++++-------------
 library/src/com/orm/dsl/Table.java         |   9 +
 library/src/com/orm/query/Select.java      |   3 +-
 7 files changed, 215 insertions(+), 234 deletions(-)
 create mode 100644 library/src/com/orm/dsl/Table.java

diff --git a/example/src/com/example/Note.java b/example/src/com/example/Note.java
index 8e6308f9..0ede586c 100755
--- a/example/src/com/example/Note.java
+++ b/example/src/com/example/Note.java
@@ -2,7 +2,9 @@
 
 import com.orm.SugarRecord;
 import com.orm.dsl.Column;
+import com.orm.dsl.Table;
 
+@Table(name = "Note")
 public class Note extends SugarRecord<Note>{
 
     @Column(name = "noteId", unique = true, notNull = true)
@@ -42,20 +44,20 @@ public String getTitle() {
         return title;
     }
 
-    public String getDescription() {
-        return description;
+    public void setTitle(String title) {
+        this.title = title;
     }
 
-    public Tag getTag() {
-        return tag;
+    public String getDescription() {
+        return description;
     }
 
     public void setDescription(String description){
         this.description = description;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
+    public Tag getTag() {
+        return tag;
     }
 
     @Override
diff --git a/example/src/com/example/SugarActivity.java b/example/src/com/example/SugarActivity.java
index f5b8fe9f..88b0d29c 100755
--- a/example/src/com/example/SugarActivity.java
+++ b/example/src/com/example/SugarActivity.java
@@ -2,11 +2,8 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.util.Log;
-import com.orm.Database;
-import com.orm.SugarApp;
+import com.orm.SugarRecord;
 
 public class SugarActivity extends Activity
 {
@@ -16,9 +13,9 @@ public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
-         Note.deleteAll(Note.class);
-        TextNote.deleteAll(TextNote.class);
-        Tag.deleteAll(Tag.class);
+        SugarRecord.deleteAll(Note.class);
+        SugarRecord.deleteAll(TextNote.class);
+        SugarRecord.deleteAll(Tag.class);
         initDb();
         Intent intent = new Intent(this, NoteListActivity.class);
         startActivity(intent);
diff --git a/library/src/com/orm/StringUtil.java b/library/src/com/orm/StringUtil.java
index 4f837a1b..2c9767ff 100644
--- a/library/src/com/orm/StringUtil.java
+++ b/library/src/com/orm/StringUtil.java
@@ -1,50 +1,59 @@
 package com.orm;
 
 import com.orm.dsl.Column;
+import com.orm.dsl.Table;
 
 import java.lang.reflect.Field;
 
 public class StringUtil {
     public static String toSQLNameDefault(String javaNotation) {
-            if(javaNotation.equalsIgnoreCase("_id"))
-                    return "_id";
-
-            StringBuilder sb = new StringBuilder();
-            char[] buf = javaNotation.toCharArray();
-
-            for (int i = 0; i < buf.length; i++) {
-                    char prevChar = (i > 0) ? buf[i - 1] : 0;
-                    char c = buf[i];
-                    char nextChar = (i < buf.length - 1) ? buf[i + 1] : 0;
-                    boolean isFirstChar = (i == 0);
-
-                    if (isFirstChar || Character.isLowerCase(c) || Character.isDigit(c)) {
-                            sb.append(Character.toUpperCase(c));
-                    } else if (Character.isUpperCase(c)) {
-                            if (Character.isLetterOrDigit(prevChar)) {
-                                    if (Character.isLowerCase(prevChar)) {
-                                            sb.append('_').append(Character.toUpperCase(c));
-                                    } else if (nextChar > 0 && Character.isLowerCase(nextChar)) {
-                                            sb.append('_').append(Character.toUpperCase(c));
-                                    } else {
-                                            sb.append(c);
-                                    }
-                            }
-                            else {
-                                    sb.append(c);
-                            }
+        if (javaNotation.equalsIgnoreCase("_id"))
+            return "_id";
+
+        StringBuilder sb = new StringBuilder();
+        char[] buf = javaNotation.toCharArray();
+
+        for (int i = 0; i < buf.length; i++) {
+            char prevChar = (i > 0) ? buf[i - 1] : 0;
+            char c = buf[i];
+            char nextChar = (i < buf.length - 1) ? buf[i + 1] : 0;
+            boolean isFirstChar = (i == 0);
+
+            if (isFirstChar || Character.isLowerCase(c) || Character.isDigit(c)) {
+                sb.append(Character.toUpperCase(c));
+            } else if (Character.isUpperCase(c)) {
+                if (Character.isLetterOrDigit(prevChar)) {
+                    if (Character.isLowerCase(prevChar)) {
+                        sb.append('_').append(Character.toUpperCase(c));
+                    } else if (nextChar > 0 && Character.isLowerCase(nextChar)) {
+                        sb.append('_').append(Character.toUpperCase(c));
+                    } else {
+                        sb.append(c);
                     }
+                } else {
+                    sb.append(c);
+                }
             }
+        }
 
-            return sb.toString();
+        return sb.toString();
     }
 
-    public static String toSQLName(Field field){
-        if(field.isAnnotationPresent(Column.class)){
+    public static String toSQLName(Field field) {
+        if (field.isAnnotationPresent(Column.class)) {
             Column annotation = field.getAnnotation(Column.class);
             return annotation.name();
         }
 
         return toSQLNameDefault(field.getName());
     }
+
+    public static String toSQLName(Class<?> table) {
+
+        if (table.isAnnotationPresent(Table.class)) {
+            Table annotation = table.getAnnotation(Table.class);
+            return annotation.name();
+        }
+        return StringUtil.toSQLNameDefault(table.getSimpleName());
+    }
 }
diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index ceab2243..0b3db0de 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -1,35 +1,22 @@
 package com.orm;
 
-import static com.orm.SugarConfig.getDatabaseVersion;
-import static com.orm.SugarConfig.getDebugEnabled;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
+import com.orm.dsl.*;
+import dalvik.system.DexFile;
 
-import com.orm.dsl.Column;
-import com.orm.dsl.NotNull;
-import com.orm.dsl.Unique;
+import java.io.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.util.*;
 
-import dalvik.system.DexFile;
+import static com.orm.SugarConfig.getDatabaseVersion;
+import static com.orm.SugarConfig.getDebugEnabled;
 
 public class SugarDb extends SQLiteOpenHelper {
     private Context context;
@@ -40,16 +27,45 @@ public SugarDb(Context context) {
 
     }
 
-    private <T extends SugarRecord<?>> List<T> getDomainClasses(Context context) {
-        List<T> domainClasses = new ArrayList<T>();
+    public static List<Field> getTableFields(Class table) {
+        List<Field> fieldList = SugarConfig.getFields(table);
+        if (fieldList != null) return fieldList;
+
+        Log.d("Sugar", "Fetching properties");
+        List<Field> typeFields = new ArrayList<Field>();
+
+        getAllFields(typeFields, table);
+
+        List<Field> toStore = new ArrayList<Field>();
+        for (Field field : typeFields) {
+            if (!field.isAnnotationPresent(Ignore.class) && !Modifier.isStatic(field.getModifiers()) && !Modifier.isTransient(field.getModifiers())) {
+                toStore.add(field);
+            }
+        }
+
+        SugarConfig.setFields(table, toStore);
+        return toStore;
+    }
+
+    private static List<Field> getAllFields(List<Field> fields, Class<?> type) {
+        Collections.addAll(fields, type.getDeclaredFields());
+
+        if (type.getSuperclass() != null) {
+            fields = getAllFields(fields, type.getSuperclass());
+        }
+
+        return fields;
+    }
+
+    private List<Class> getDomainClasses(Context context) {
+        List<Class> domainClasses = new ArrayList<Class>();
         try {
             for (String className : getAllClasses(context)) {
                 if (className.startsWith(SugarConfig.getDomainPackageName(context))) {
-                    T domainClass = getDomainClass(className, context);
+                    Class domainClass = getDomainClass(className, context);
                     if (domainClass != null) domainClasses.add(domainClass);
                 }
             }
-
         } catch (IOException e) {
             Log.e("Sugar", e.getMessage());
         } catch (PackageManager.NameNotFoundException e) {
@@ -59,8 +75,7 @@ private <T extends SugarRecord<?>> List<T> getDomainClasses(Context context) {
         return domainClasses;
     }
 
-    @SuppressWarnings("unchecked")
-    private <T extends SugarRecord<?>> T getDomainClass(String className, Context context) {
+    private Class getDomainClass(String className, Context context) {
         Class<?> discoveredClass = null;
         try {
             discoveredClass = Class.forName(className, true, context.getClass().getClassLoader());
@@ -68,29 +83,18 @@ private <T extends SugarRecord<?>> T getDomainClass(String className, Context co
             Log.e("Sugar", e.getMessage());
         }
 
-        if ((discoveredClass == null) ||
-                (!SugarRecord.class.isAssignableFrom(discoveredClass)) ||
-                SugarRecord.class.equals(discoveredClass) ||
-                Modifier.isAbstract(discoveredClass.getModifiers())) {
-            return null;
-        } else {
-            try {
-                Log.i("Sugar", "domain class : " + discoveredClass.getSimpleName());
-                return (T) discoveredClass.getDeclaredConstructor().newInstance();
-
-            } catch (InstantiationException e) {
-                Log.e("Sugar", e.getMessage());
-            } catch (IllegalAccessException e) {
-                Log.e("Sugar", e.getMessage());
-            } catch (NoSuchMethodException e) {
-                Log.e("Sugar", e.getMessage());
-            } catch (InvocationTargetException e) {
-                Log.e("Sugar", e.getMessage());
-            }
-        }
+        if ((discoveredClass != null) &&
+                ((SugarRecord.class.isAssignableFrom(discoveredClass) &&
+                        !SugarRecord.class.equals(discoveredClass)) ||
+                        discoveredClass.isAnnotationPresent(Table.class)) &&
+                !Modifier.isAbstract(discoveredClass.getModifiers())) {
 
-        return null;
+            Log.i("Sugar", "domain class : " + discoveredClass.getSimpleName());
+            return discoveredClass;
 
+        } else {
+            return null;
+        }
     }
 
     private List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
@@ -119,7 +123,7 @@ private List<String> getAllClasses(Context context) throws PackageManager.NameNo
         }
         return classNames;
     }
-    
+
     private void populateFiles(File path, List<String> fileNames, String parent) {
         if (path.isDirectory()) {
             for (File newPath : path.listFiles()) {
@@ -152,17 +156,20 @@ public void onCreate(SQLiteDatabase sqLiteDatabase) {
         createDatabase(sqLiteDatabase);
     }
 
-    private <T extends SugarRecord<?>> void createDatabase(SQLiteDatabase sqLiteDatabase) {
-        List<T> domainClasses = getDomainClasses(context);
-        for (T domain : domainClasses) {
+    private void createDatabase(SQLiteDatabase sqLiteDatabase) {
+        List<Class> domainClasses = getDomainClasses(context);
+        for (Class domain : domainClasses) {
             createTable(domain, sqLiteDatabase);
         }
     }
 
-    private <T extends SugarRecord<?>> void createTable(T table, SQLiteDatabase sqLiteDatabase) {
+    private <T extends SugarRecord<?>> void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
         Log.i("Sugar", "create table");
-        List<Field> fields = table.getTableFields();
-        StringBuilder sb = new StringBuilder("CREATE TABLE ").append(table.getSqlName()).append(
+        List<Field> fields = getTableFields(table);
+
+        String tableName = StringUtil.toSQLName(table);
+
+        StringBuilder sb = new StringBuilder("CREATE TABLE ").append(tableName).append(
                 " ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
 
         for (Field column : fields) {
@@ -211,7 +218,7 @@ private <T extends SugarRecord<?>> void createTable(T table, SQLiteDatabase sqLi
         }
         sb.append(" ) ");
 
-        Log.i("Sugar", "creating table " + table.getSqlName());
+        Log.i("Sugar", "creating table " + tableName);
 
         if (!"".equals(sb.toString()))
             sqLiteDatabase.execSQL(sb.toString());
@@ -232,11 +239,11 @@ public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
     /**
      * Create the tables that do not exist.
      */
-    private <T extends SugarRecord<?>> void doUpgrade(SQLiteDatabase sqLiteDatabase) {
-        List<T> domainClasses = getDomainClasses(context);
-        for (T domain : domainClasses) {
+    private void doUpgrade(SQLiteDatabase sqLiteDatabase) {
+        List<Class> domainClasses = getDomainClasses(context);
+        for (Class domain : domainClasses) {
             try {// we try to do a select, if fails then (?) there isn't the table
-                sqLiteDatabase.query(domain.tableName, null, null, null, null, null, null);
+                sqLiteDatabase.query(StringUtil.toSQLName(domain), null, null, null, null, null, null);
             } catch (SQLiteException e) {
                 Log.i("Sugar", String.format("creating table on update (error was '%s')", e.getMessage()));
                 createTable(domain, sqLiteDatabase);
@@ -244,10 +251,10 @@ private <T extends SugarRecord<?>> void doUpgrade(SQLiteDatabase sqLiteDatabase)
         }
     }
 
-    private <T extends SugarRecord<?>> void deleteTables(SQLiteDatabase sqLiteDatabase) {
-        List<T> tables = getDomainClasses(this.context);
-        for (T table : tables) {
-            sqLiteDatabase.execSQL("DROP TABLE IF EXISTS " + table.getSqlName());
+    private void deleteTables(SQLiteDatabase sqLiteDatabase) {
+        List<Class> tables = getDomainClasses(this.context);
+        for (Class table : tables) {
+            sqLiteDatabase.execSQL("DROP TABLE IF EXISTS " + StringUtil.toSQLName(table));
         }
     }
 
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index 30eba6ee..dfc80158 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -7,11 +7,9 @@
 import android.database.sqlite.SQLiteStatement;
 import android.text.TextUtils;
 import android.util.Log;
-import com.orm.dsl.Ignore;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -19,30 +17,18 @@
 
 public class SugarRecord<T>{
 
-    @Ignore
-    String tableName = getSqlName();
-
     protected Long id = null;
 
-    public void delete() {
-        SQLiteDatabase db = getSugarContext().getDatabase().getDB();
-        db.delete(this.tableName, "Id=?", new String[]{getId().toString()});
-    }
-
     public static <T extends SugarRecord<?>> void deleteAll(Class<T> type) {
         Database db = getSugarContext().getDatabase();
         SQLiteDatabase sqLiteDatabase = db.getDB();
-        sqLiteDatabase.delete(getTableName(type), null, null);
+        sqLiteDatabase.delete(StringUtil.toSQLName(type), null, null);
     }
 
     public static <T extends SugarRecord<?>> void deleteAll(Class<T> type, String whereClause, String... whereArgs ) {
         Database db = getSugarContext().getDatabase();
         SQLiteDatabase sqLiteDatabase = db.getDB();
-        sqLiteDatabase.delete(getTableName(type), whereClause, whereArgs);
-    }
-
-    public long save() {
-        return save(getSugarContext().getDatabase().getDB());
+        sqLiteDatabase.delete(StringUtil.toSQLName(type), whereClause, whereArgs);
     }
 
     @SuppressWarnings("deprecation")
@@ -70,72 +56,12 @@ public static <T extends SugarRecord<?>> void saveInTx(Collection<T> objects ) {
 
     }
 
-    long save(SQLiteDatabase db) {
-
-        List<Field> columns = getTableFields();
-        ContentValues values = new ContentValues(columns.size());
-        for (Field column : columns) {
-            column.setAccessible(true);
-            Class<?> columnType = column.getType();
-            try {
-                String columnName = StringUtil.toSQLName(column);
-                Object columnValue = column.get(this);
-                if (SugarRecord.class.isAssignableFrom(columnType)) {
-                    values.put(columnName,
-                            (columnValue != null)
-                                    ? String.valueOf(((SugarRecord) columnValue).id)
-                                    : "0");
-                } else {
-                    if (columnType.equals(Short.class) || columnType.equals(short.class)) {
-                        values.put(columnName, (Short) columnValue);
-                    } else if (columnType.equals(Integer.class) || columnType.equals(int.class)) {
-                        values.put(columnName, (Integer) columnValue);
-                    } else if (columnType.equals(Long.class) || columnType.equals(long.class)) {
-                        values.put(columnName, (Long) columnValue);
-                    } else if (columnType.equals(Float.class) || columnType.equals(float.class)) {
-                        values.put(columnName, (Float) columnValue);
-                    } else if (columnType.equals(Double.class) || columnType.equals(double.class)) {
-                        values.put(columnName, (Double) columnValue);
-                    } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
-                        values.put(columnName, (Boolean) columnValue);
-                    } else if (Date.class.equals(columnType)) {
-                        try {
-                            values.put(columnName, ((Date) column.get(this)).getTime());
-                        } catch (NullPointerException e) {
-                            values.put(columnName, (Long) null);
-                        }
-                    } else if (Calendar.class.equals(columnType)) {
-                        try {
-                            values.put(columnName, ((Calendar) column.get(this)).getTimeInMillis());
-                        } catch (NullPointerException e) {
-                            values.put(columnName, (Long) null);
-                        }
-                    } else {
-                        if (columnValue == null) {
-                            values.putNull(columnName);
-                        } else {
-                            values.put(columnName, String.valueOf(columnValue));
-                        }
-                    }
-                }
-
-            } catch (IllegalAccessException e) {
-                Log.e("Sugar", e.getMessage());
-            }
-        }
-
-        id = db.insertWithOnConflict(getSqlName(), null, values, SQLiteDatabase.CONFLICT_REPLACE);
-
-        Log.i("Sugar", getClass().getSimpleName() + " saved : " + id);
-        return id;
-    }
-
     public static <T extends SugarRecord<?>> List<T> listAll(Class<T> type) {
         return find(type, null, null, null, null, null);
     }
 
     public static <T extends SugarRecord<?>> T findById(Class<T> type, Long id) {
-        List<T> list = find( type, "id=?", new String[]{String.valueOf(id)}, null, null, "1");
+        List<T> list = find(type, "id=?", new String[]{String.valueOf(id)}, null, null, "1");
         if (list.isEmpty()) return null;
         return list.get(0);
     }
@@ -166,7 +92,7 @@ public static <T extends SugarRecord<?>> Iterator<T> findAsIterator(Class<T> typ
 
         Database db = getSugarContext().getDatabase();
         SQLiteDatabase sqLiteDatabase = db.getDB();
-        Cursor c = sqLiteDatabase.query(getTableName(type), null,
+        Cursor c = sqLiteDatabase.query(StringUtil.toSQLName(type), null,
                 whereClause, whereArgs, groupBy, null, orderBy, limit);
         return new CursorIterator<T>(type, c);
     }
@@ -209,7 +135,7 @@ public static <T extends SugarRecord<?>> List<T> find(Class<T> type,
         SQLiteDatabase sqLiteDatabase = db.getDB();
         T entity;
         List<T> toRet = new ArrayList<T>();
-        Cursor c = sqLiteDatabase.query(getTableName(type), null,
+        Cursor c = sqLiteDatabase.query(StringUtil.toSQLName(type), null,
                 whereClause, whereArgs, groupBy, null, orderBy, limit);
         try {
             while (c.moveToNext()) {
@@ -228,22 +154,22 @@ public static <T extends SugarRecord<?>> List<T> find(Class<T> type,
     public static <T extends SugarRecord<?>> long count(Class<?> type) {
         return count(type, null, null, null, null, null);
     }
-    
+
     public static <T extends SugarRecord<?>> long count(Class<?> type,
             String whereClause, String[] whereArgs) {
     	return count(type, whereClause, whereArgs, null, null, null);
     }
-    
+
     public static <T extends SugarRecord<?>> long count(Class<?> type,
             String whereClause, String[] whereArgs,
             String groupBy, String orderBy, String limit) {
-    	
+
     	Database db = getSugarContext().getDatabase();
         SQLiteDatabase sqLiteDatabase = db.getDB();
 
         long toRet = -1;
         String filter = (!TextUtils.isEmpty(whereClause)) ? " where "  + whereClause : "";
-        SQLiteStatement sqLiteStatament = sqLiteDatabase.compileStatement("SELECT count(*) FROM " + getTableName(type) + filter);
+        SQLiteStatement sqLiteStatament = sqLiteDatabase.compileStatement("SELECT count(*) FROM " + StringUtil.toSQLName(type) + filter);
 
         if (whereArgs != null) {
             for (int i = whereArgs.length; i != 0; i--) {
@@ -258,14 +184,83 @@ public static <T extends SugarRecord<?>> long count(Class<?> type,
         } finally {
             sqLiteStatament.close();
         }
-        
-    	return toRet;
+
+        return toRet;
+    }
+
+    public void delete() {
+        SQLiteDatabase db = getSugarContext().getDatabase().getDB();
+        db.delete(StringUtil.toSQLName(getClass()), "Id=?", new String[]{getId().toString()});
+    }
+
+    public long save() {
+        return save(getSugarContext().getDatabase().getDB());
+    }
+
+    long save(SQLiteDatabase db) {
+
+        List<Field> columns = SugarDb.getTableFields(getClass());
+        ContentValues values = new ContentValues(columns.size());
+        for (Field column : columns) {
+            column.setAccessible(true);
+            Class<?> columnType = column.getType();
+            try {
+                String columnName = StringUtil.toSQLName(column);
+                Object columnValue = column.get(this);
+                if (SugarRecord.class.isAssignableFrom(columnType)) {
+                    values.put(columnName,
+                            (columnValue != null)
+                                    ? String.valueOf(((SugarRecord) columnValue).id)
+                                    : "0");
+                } else {
+                    if (columnType.equals(Short.class) || columnType.equals(short.class)) {
+                        values.put(columnName, (Short) columnValue);
+                    } else if (columnType.equals(Integer.class) || columnType.equals(int.class)) {
+                        values.put(columnName, (Integer) columnValue);
+                    } else if (columnType.equals(Long.class) || columnType.equals(long.class)) {
+                        values.put(columnName, (Long) columnValue);
+                    } else if (columnType.equals(Float.class) || columnType.equals(float.class)) {
+                        values.put(columnName, (Float) columnValue);
+                    } else if (columnType.equals(Double.class) || columnType.equals(double.class)) {
+                        values.put(columnName, (Double) columnValue);
+                    } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
+                        values.put(columnName, (Boolean) columnValue);
+                    } else if (Date.class.equals(columnType)) {
+                        try {
+                            values.put(columnName, ((Date) column.get(this)).getTime());
+                        } catch (NullPointerException e) {
+                            values.put(columnName, (Long) null);
+                        }
+                    } else if (Calendar.class.equals(columnType)) {
+                        try {
+                            values.put(columnName, ((Calendar) column.get(this)).getTimeInMillis());
+                        } catch (NullPointerException e) {
+                            values.put(columnName, (Long) null);
+                        }
+                    } else {
+                        if (columnValue == null) {
+                            values.putNull(columnName);
+                        } else {
+                            values.put(columnName, String.valueOf(columnValue));
+                        }
+                    }
+                }
+
+            } catch (IllegalAccessException e) {
+                Log.e("Sugar", e.getMessage());
+            }
+        }
+
+        id = db.insertWithOnConflict(StringUtil.toSQLName(getClass()), null, values, SQLiteDatabase.CONFLICT_REPLACE);
+
+        Log.i("Sugar", getClass().getSimpleName() + " saved : " + id);
+        return id;
     }
 
     @SuppressWarnings("unchecked")
     void inflate(Cursor cursor) {
         Map<Field, Long> entities = new HashMap<Field, Long>();
-        List<Field> columns = getTableFields();
+        List<Field> columns = SugarDb.getTableFields(getClass());
         for (Field field : columns) {
             field.setAccessible(true);
             try {
@@ -352,45 +347,6 @@ void inflate(Cursor cursor) {
         }
     }
 
-    public List<Field> getTableFields() {
-        List<Field> fieldList = SugarConfig.getFields(getClass());
-        if(fieldList != null) return fieldList;
-
-        Log.d("Sugar", "Fetching properties");
-        List<Field> typeFields = new ArrayList<Field>();
-
-        getAllFields(typeFields, getClass());
-
-        List<Field> toStore = new ArrayList<Field>();
-        for (Field field : typeFields) {
-            if (!field.isAnnotationPresent(Ignore.class) && !Modifier.isStatic(field.getModifiers())&& !Modifier.isTransient(field.getModifiers())) {
-                toStore.add(field);
-            }
-        }
-
-        SugarConfig.setFields(getClass(), toStore);
-        return toStore;
-    }
-
-    private static List<Field> getAllFields(List<Field> fields, Class<?> type) {
-        Collections.addAll(fields, type.getDeclaredFields());
-
-        if (type.getSuperclass() != null) {
-            fields = getAllFields(fields, type.getSuperclass());
-        }
-
-        return fields;
-    }
-
-    public String getSqlName() {
-        return getTableName(getClass());
-    }
-
-
-    public static String getTableName(Class<?> type) {
-        return StringUtil.toSQLNameDefault(type.getSimpleName());
-    }
-
     public Long getId() {
         return id;
     }
diff --git a/library/src/com/orm/dsl/Table.java b/library/src/com/orm/dsl/Table.java
new file mode 100644
index 00000000..a801d9d7
--- /dev/null
+++ b/library/src/com/orm/dsl/Table.java
@@ -0,0 +1,9 @@
+package com.orm.dsl;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Table {
+    String name();
+}
diff --git a/library/src/com/orm/query/Select.java b/library/src/com/orm/query/Select.java
index 95688297..8c78bd43 100644
--- a/library/src/com/orm/query/Select.java
+++ b/library/src/com/orm/query/Select.java
@@ -1,5 +1,6 @@
 package com.orm.query;
 
+import com.orm.StringUtil;
 import com.orm.SugarRecord;
 
 import java.util.ArrayList;
@@ -130,7 +131,7 @@ String toSql() {
 
         sql.append("SELECT * FROM ");
 
-        sql.append(SugarRecord.getTableName(this.record) + " ");
+        sql.append(StringUtil.toSQLName(this.record) + " ");
 
         if (whereClause != null) {
             sql.append("WHERE " + whereClause + " ");

From 93b1f91a25ef4f6c9a45a22bca53e99118b4e5a0 Mon Sep 17 00:00:00 2001
From: Satya Narayan <satya@satyanarayan.in>
Date: Wed, 16 Jul 2014 17:43:28 -0700
Subject: [PATCH 027/305] remove dependency to extend SugarRecord. Now entities
 have a choice of extending SugarRecord or not. Both type of models will be
 supported.

Refactored the code to enable models without extending SugarRecord class. Following is a snapshot of changes:

1. Moved all naming to NamingHelper class.
2. All reflection related stuff moves to ReflectionUtil
3. Remove SugarRecord references from Generics. Class need not extend SugarRecord.
4. Improved the inflate logic for faster child record population.
5. Removed Database class. Wasn't adding much value.
6. Changed the example project to reflect the latest changes
---
 example/src/com/example/AddNoteActivity.java  |   6 +-
 example/src/com/example/NewNote.java          |  11 +
 example/src/com/example/Note.java             |   5 +-
 example/src/com/example/NoteListActivity.java |   5 +-
 example/src/com/example/NoteRelation.java     |   5 +-
 example/src/com/example/SugarActivity.java    |  31 +-
 example/src/com/example/Tag.java              |   6 +-
 example/src/com/example/TextNote.java         |   3 +
 library/src/com/orm/Database.java             |  24 --
 library/src/com/orm/DatabaseCreator.java      | 173 +++++++++++
 library/src/com/orm/SugarApp.java             |  20 +-
 library/src/com/orm/SugarDb.java              | 290 +-----------------
 library/src/com/orm/SugarRecord.java          | 253 +++++----------
 .../src/com/orm/SugarTransactionHelper.java   |   2 +-
 library/src/com/orm/query/Select.java         |  14 +-
 .../NamingHelper.java}                        |   6 +-
 .../com/orm/{ => util}/NumberComparator.java  |  18 +-
 .../src/com/orm/{ => util}/QueryBuilder.java  |   4 +-
 library/src/com/orm/util/ReflectionUtil.java  | 281 +++++++++++++++++
 .../src/com/orm/{ => util}/SugarConfig.java   |   2 +-
 .../orm/{ => util}/SugarCursorFactory.java    |   2 +-
 library/test/com/orm/NamingHelperTest.java    |  25 ++
 library/test/com/orm/StringUtilTest.java      |  24 --
 library/test/com/orm/query/TestRecord.java    |   3 +-
 24 files changed, 648 insertions(+), 565 deletions(-)
 create mode 100644 example/src/com/example/NewNote.java
 delete mode 100644 library/src/com/orm/Database.java
 create mode 100644 library/src/com/orm/DatabaseCreator.java
 rename library/src/com/orm/{StringUtil.java => util/NamingHelper.java} (93%)
 rename library/src/com/orm/{ => util}/NumberComparator.java (99%)
 rename library/src/com/orm/{ => util}/QueryBuilder.java (95%)
 create mode 100644 library/src/com/orm/util/ReflectionUtil.java
 rename library/src/com/orm/{ => util}/SugarConfig.java (99%)
 rename library/src/com/orm/{ => util}/SugarCursorFactory.java (97%)
 create mode 100644 library/test/com/orm/NamingHelperTest.java
 delete mode 100644 library/test/com/orm/StringUtilTest.java

diff --git a/example/src/com/example/AddNoteActivity.java b/example/src/com/example/AddNoteActivity.java
index 06a6c62f..aba5e236 100755
--- a/example/src/com/example/AddNoteActivity.java
+++ b/example/src/com/example/AddNoteActivity.java
@@ -9,6 +9,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import static com.orm.SugarRecord.save;
+
 
 public class AddNoteActivity extends Activity {
     public void onCreate(Bundle savedInstanceState) {
@@ -39,8 +41,8 @@ public void onCreate(Bundle savedInstanceState) {
         save.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 Tag tag = new Tag(tagBox.getText().toString());
-                tag.save();
-                new Note( 10, titleBox.getText().toString(), descBox.getText().toString(),tag).save();
+                save(tag);
+                save(new Note(10 + (int) (10 * Math.random()), titleBox.getText().toString(), descBox.getText().toString(), tag));
                 Intent intent = new Intent(AddNoteActivity.this, NoteListActivity.class);
                 startActivity(intent);
             }
diff --git a/example/src/com/example/NewNote.java b/example/src/com/example/NewNote.java
new file mode 100644
index 00000000..a80e2d4a
--- /dev/null
+++ b/example/src/com/example/NewNote.java
@@ -0,0 +1,11 @@
+package com.example;
+
+import com.orm.dsl.Table;
+
+@Table(name = "new_note")
+public class NewNote {
+
+    public long id;
+    public String name;
+
+}
diff --git a/example/src/com/example/Note.java b/example/src/com/example/Note.java
index 0ede586c..9f1edaa4 100755
--- a/example/src/com/example/Note.java
+++ b/example/src/com/example/Note.java
@@ -1,11 +1,10 @@
 package com.example;
 
-import com.orm.SugarRecord;
 import com.orm.dsl.Column;
 import com.orm.dsl.Table;
 
 @Table(name = "Note")
-public class Note extends SugarRecord<Note>{
+public class Note {
 
     @Column(name = "noteId", unique = true, notNull = true)
     private int noteId;
@@ -62,7 +61,7 @@ public Tag getTag() {
 
     @Override
     public String toString() {
-        return  title + "id: " + id + " - " + tag + " " + tag.getId();
+        return title + "id: " + noteId;
 
     }
 }
diff --git a/example/src/com/example/NoteListActivity.java b/example/src/com/example/NoteListActivity.java
index a5d0399b..09877f2d 100755
--- a/example/src/com/example/NoteListActivity.java
+++ b/example/src/com/example/NoteListActivity.java
@@ -6,7 +6,7 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
-
+import com.orm.SugarRecord;
 import com.orm.query.Condition;
 import com.orm.query.Select;
 
@@ -19,8 +19,9 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.notelist);
 
         List<Note> notes = Select.from(Note.class).orderBy("title").list();//Note.listAll(Note.class);
+        List<NewNote> list = SugarRecord.listAll(NewNote.class);
 
-        setListAdapter(new ArrayAdapter<Note>(this,android.R.layout.simple_list_item_1, notes));
+        setListAdapter(new ArrayAdapter<Note>(this, android.R.layout.simple_list_item_1, notes));
 
         findViewById(R.id.Button01).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
diff --git a/example/src/com/example/NoteRelation.java b/example/src/com/example/NoteRelation.java
index 1a971d7d..a64d055a 100644
--- a/example/src/com/example/NoteRelation.java
+++ b/example/src/com/example/NoteRelation.java
@@ -1,9 +1,10 @@
 package com.example;
 
 import android.content.Context;
-import com.orm.SugarRecord;
+import com.orm.dsl.Table;
 
-public class NoteRelation  extends SugarRecord<Note> {
+@Table(name = "note_relation")
+public class NoteRelation {
     String name;
     int noteId;
 
diff --git a/example/src/com/example/SugarActivity.java b/example/src/com/example/SugarActivity.java
index 88b0d29c..b7130f86 100755
--- a/example/src/com/example/SugarActivity.java
+++ b/example/src/com/example/SugarActivity.java
@@ -5,6 +5,8 @@
 import android.os.Bundle;
 import com.orm.SugarRecord;
 
+import static com.orm.SugarRecord.save;
+
 public class SugarActivity extends Activity
 {
     /** Called when the activity is first created. */
@@ -16,6 +18,7 @@ public void onCreate(Bundle savedInstanceState)
         SugarRecord.deleteAll(Note.class);
         SugarRecord.deleteAll(TextNote.class);
         SugarRecord.deleteAll(Tag.class);
+        SugarRecord.deleteAll(NewNote.class);
         initDb();
         Intent intent = new Intent(this, NoteListActivity.class);
         startActivity(intent);
@@ -25,8 +28,8 @@ private void initDb() {
 
         Tag t1 = new Tag("tag1");
         Tag t2 = new Tag("tag2");
-        t1.save();
-        t2.save();
+         save(t1);
+         save(t2);
 
         Note n1 = new Note( 10, "note1", "description1", t1);
         Note n2 = new Note(11, "note12", "description2", t1);
@@ -36,23 +39,25 @@ private void initDb() {
          TextNote textNote = new TextNote();
          textNote.desc = "Test";
 
-         textNote.save();
-        n1.save();
-        n2.save();
-        n3.save();
-        n4.save();
+         save(textNote);
+         save(n1);
+         save(n2);
+         save(n3);
+         save(n4);
 
          n1.setDescription("matrix");
          n1.setTitle("atrix");
-         n1.save();
+         save(n1);
          n2.setDescription("matrix");
          n2.setTitle("satrix");
-         n2.save();
+         save(n2);
          n3.setDescription("matrix");
          n3.setTitle("batrix");
-         n3.save();
-         
-        
+         save(n3);
 
-    }
+         NewNote newNote = new NewNote();
+         newNote.name = "name";
+         save(newNote);
+
+     }
 }
diff --git a/example/src/com/example/Tag.java b/example/src/com/example/Tag.java
index 24d8c145..6600c14a 100755
--- a/example/src/com/example/Tag.java
+++ b/example/src/com/example/Tag.java
@@ -1,9 +1,9 @@
 package com.example;
 
-import android.content.Context;
-import com.orm.SugarRecord;
+import com.orm.dsl.Table;
 
-public class Tag extends SugarRecord<Tag>{
+@Table(name = "tag")
+public class Tag {
     private String name;
 
     public Tag(String name) {
diff --git a/example/src/com/example/TextNote.java b/example/src/com/example/TextNote.java
index c4025774..91b7a33c 100644
--- a/example/src/com/example/TextNote.java
+++ b/example/src/com/example/TextNote.java
@@ -1,5 +1,8 @@
 package com.example;
 
+import com.orm.dsl.Table;
+
+@Table(name = "text_note")
 public class TextNote extends Note {
 
     public String desc;
diff --git a/library/src/com/orm/Database.java b/library/src/com/orm/Database.java
deleted file mode 100644
index 0896ee1f..00000000
--- a/library/src/com/orm/Database.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.orm;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-
-
-public class Database {
-    private SugarDb sugarDb;
-    private SQLiteDatabase sqLiteDatabase;
-
-    public Database(Context context){
-        this.sugarDb  = new SugarDb(context);
-    }
-
-
-    public synchronized SQLiteDatabase getDB() {
-        if (this.sqLiteDatabase == null) {
-            this.sqLiteDatabase = this.sugarDb.getWritableDatabase();
-        }
-
-        return this.sqLiteDatabase;
-    }
-
-}
diff --git a/library/src/com/orm/DatabaseCreator.java b/library/src/com/orm/DatabaseCreator.java
new file mode 100644
index 00000000..616e742e
--- /dev/null
+++ b/library/src/com/orm/DatabaseCreator.java
@@ -0,0 +1,173 @@
+package com.orm;
+
+import android.content.Context;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+import android.util.Log;
+import com.orm.dsl.Column;
+import com.orm.dsl.NotNull;
+import com.orm.dsl.Unique;
+import com.orm.util.NamingHelper;
+import com.orm.util.NumberComparator;
+import com.orm.util.QueryBuilder;
+import com.orm.util.ReflectionUtil;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static com.orm.util.ReflectionUtil.getDomainClasses;
+
+public class DatabaseCreator {
+
+    private Context context;
+
+    public DatabaseCreator(Context context) {
+        this.context = context;
+    }
+
+    public void createDatabase(SQLiteDatabase sqLiteDatabase) {
+        List<Class> domainClasses = getDomainClasses(context);
+        for (Class domain : domainClasses) {
+            createTable(domain, sqLiteDatabase);
+        }
+    }
+
+    public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
+        List<Class> domainClasses = getDomainClasses(context);
+        for (Class domain : domainClasses) {
+            try {// we try to do a select, if fails then (?) there isn't the table
+                sqLiteDatabase.query(NamingHelper.toSQLName(domain), null, null, null, null, null, null);
+            } catch (SQLiteException e) {
+                Log.i("Sugar", String.format("creating table on update (error was '%s')", e.getMessage()));
+                createTable(domain, sqLiteDatabase);
+            }
+        }
+
+        executeSugarUpgrade(sqLiteDatabase, oldVersion, newVersion);
+    }
+
+    public void deleteTables(SQLiteDatabase sqLiteDatabase) {
+        List<Class> tables = getDomainClasses(context);
+        for (Class table : tables) {
+            sqLiteDatabase.execSQL("DROP TABLE IF EXISTS " + NamingHelper.toSQLName(table));
+        }
+    }
+
+    private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+
+        boolean isSuccess = false;
+        try {
+            List<String> files = Arrays.asList(this.context.getAssets().list("sugar_upgrades"));
+            Collections.sort(files, new NumberComparator());
+
+            for (String file : files) {
+                Log.i("Sugar", "filename : " + file);
+                try {
+                    int version = Integer.valueOf(file.replace(".sql", ""));
+
+                    if ((version > oldVersion) && (version <= newVersion)) {
+                        executeScript(db, file);
+                        isSuccess = true;
+                    }
+                } catch (NumberFormatException e) {
+                    Log.i("Sugar", "not a sugar script. ignored." + file);
+                }
+            }
+        } catch (IOException e) {
+            Log.e("Sugar", e.getMessage());
+        }
+
+        return isSuccess;
+    }
+
+    private void executeScript(SQLiteDatabase db, String file) {
+        try {
+            InputStream is = this.context.getAssets().open("sugar_upgrades/" + file);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                Log.i("Sugar script", line);
+                db.execSQL(line.toString());
+            }
+        } catch (IOException e) {
+            Log.e("Sugar", e.getMessage());
+        }
+
+        Log.i("Sugar", "script executed");
+    }
+
+    private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
+        Log.i("Sugar", "create table");
+        List<Field> fields = ReflectionUtil.getTableFields(table);
+
+        String tableName = NamingHelper.toSQLName(table);
+
+        StringBuilder sb = new StringBuilder("CREATE TABLE ").append(tableName).append(
+                " ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
+
+        for (Field column : fields) {
+            String columnName = NamingHelper.toSQLName(column);
+            String columnType = QueryBuilder.getColumnType(column.getType());
+
+            if (columnType != null) {
+
+                if (columnName.equalsIgnoreCase("Id")) {
+                    continue;
+                }
+
+                if (column.isAnnotationPresent(Column.class)) {
+                    Column columnAnnotation = column.getAnnotation(Column.class);
+                    columnName = columnAnnotation.name();
+
+                    sb.append(", ").append(columnName).append(" ").append(columnType);
+
+                    if (columnAnnotation.notNull()) {
+                        if (columnType.endsWith(" NULL")) {
+                            sb.delete(sb.length() - 5, sb.length());
+                        }
+                        sb.append(" NOT NULL");
+                    }
+
+                    if (columnAnnotation.unique()) {
+                        sb.append(" UNIQUE");
+                    }
+
+                } else {
+
+                    sb.append(", ").append(columnName).append(" ").append(columnType);
+
+                    if (column.isAnnotationPresent(NotNull.class)) {
+                        if (columnType.endsWith(" NULL")) {
+                            sb.delete(sb.length() - 5, sb.length());
+                        }
+                        sb.append(" NOT NULL");
+                    }
+
+                    if (column.isAnnotationPresent(Unique.class)) {
+                        sb.append(" UNIQUE");
+                    }
+                }
+            }
+        }
+        sb.append(" ) ");
+
+        Log.i("Sugar", "creating table " + tableName);
+
+        if (!"".equals(sb.toString())) {
+            try {
+                sqLiteDatabase.execSQL(sb.toString());
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+
+}
diff --git a/library/src/com/orm/SugarApp.java b/library/src/com/orm/SugarApp.java
index ac7da99d..e2638a0e 100644
--- a/library/src/com/orm/SugarApp.java
+++ b/library/src/com/orm/SugarApp.java
@@ -2,13 +2,17 @@
 
 public class SugarApp extends android.app.Application{
 
-    private Database database;
     private static SugarApp sugarContext;
+    private SugarDb sugarDb;
+
+    public static SugarApp getSugarContext() {
+        return sugarContext;
+    }
 
     public void onCreate(){
         super.onCreate();
         SugarApp.sugarContext = this;
-        this.database = new Database(this);
+        this.sugarDb = new SugarDb(this);
     }
 
     /*
@@ -18,17 +22,13 @@ public void onCreate(){
      * Robolectric Android mock.
      */
     public void onTerminate(){
-        if (this.database != null) {
-            this.database.getDB().close();
+        if (this.sugarDb != null) {
+            this.sugarDb.getDB().close();
         }
         super.onTerminate();
     }
 
-    public static SugarApp getSugarContext(){
-        return sugarContext;
-    }
-
-    protected Database getDatabase() {
-        return database;
+    protected SugarDb getSugarDb() {
+        return sugarDb;
     }
 }
diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index 0b3db0de..7a097054 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -1,303 +1,39 @@
 package com.orm;
 
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-import com.orm.dsl.*;
-import dalvik.system.DexFile;
+import com.orm.util.SugarConfig;
+import com.orm.util.SugarCursorFactory;
 
-import java.io.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.util.*;
-
-import static com.orm.SugarConfig.getDatabaseVersion;
-import static com.orm.SugarConfig.getDebugEnabled;
+import static com.orm.util.SugarConfig.getDatabaseVersion;
+import static com.orm.util.SugarConfig.getDebugEnabled;
 
 public class SugarDb extends SQLiteOpenHelper {
-    private Context context;
+    private final DatabaseCreator databaseCreator;
+    private SQLiteDatabase sqLiteDatabase;
 
     public SugarDb(Context context) {
         super(context, SugarConfig.getDatabaseName(context), new SugarCursorFactory(getDebugEnabled(context)), getDatabaseVersion(context));
-        this.context = context;
-
-    }
-
-    public static List<Field> getTableFields(Class table) {
-        List<Field> fieldList = SugarConfig.getFields(table);
-        if (fieldList != null) return fieldList;
-
-        Log.d("Sugar", "Fetching properties");
-        List<Field> typeFields = new ArrayList<Field>();
-
-        getAllFields(typeFields, table);
-
-        List<Field> toStore = new ArrayList<Field>();
-        for (Field field : typeFields) {
-            if (!field.isAnnotationPresent(Ignore.class) && !Modifier.isStatic(field.getModifiers()) && !Modifier.isTransient(field.getModifiers())) {
-                toStore.add(field);
-            }
-        }
-
-        SugarConfig.setFields(table, toStore);
-        return toStore;
-    }
-
-    private static List<Field> getAllFields(List<Field> fields, Class<?> type) {
-        Collections.addAll(fields, type.getDeclaredFields());
-
-        if (type.getSuperclass() != null) {
-            fields = getAllFields(fields, type.getSuperclass());
-        }
-
-        return fields;
-    }
-
-    private List<Class> getDomainClasses(Context context) {
-        List<Class> domainClasses = new ArrayList<Class>();
-        try {
-            for (String className : getAllClasses(context)) {
-                if (className.startsWith(SugarConfig.getDomainPackageName(context))) {
-                    Class domainClass = getDomainClass(className, context);
-                    if (domainClass != null) domainClasses.add(domainClass);
-                }
-            }
-        } catch (IOException e) {
-            Log.e("Sugar", e.getMessage());
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e("Sugar", e.getMessage());
-        }
-
-        return domainClasses;
-    }
-
-    private Class getDomainClass(String className, Context context) {
-        Class<?> discoveredClass = null;
-        try {
-            discoveredClass = Class.forName(className, true, context.getClass().getClassLoader());
-        } catch (ClassNotFoundException e) {
-            Log.e("Sugar", e.getMessage());
-        }
-
-        if ((discoveredClass != null) &&
-                ((SugarRecord.class.isAssignableFrom(discoveredClass) &&
-                        !SugarRecord.class.equals(discoveredClass)) ||
-                        discoveredClass.isAnnotationPresent(Table.class)) &&
-                !Modifier.isAbstract(discoveredClass.getModifiers())) {
-
-            Log.i("Sugar", "domain class : " + discoveredClass.getSimpleName());
-            return discoveredClass;
-
-        } else {
-            return null;
-        }
-    }
-
-    private List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
-        String path = getSourcePath(context);
-        List<String> classNames = new ArrayList<String>();
-        try {
-            DexFile dexfile = new DexFile(path);
-            Enumeration<String> dexEntries = dexfile.entries();
-            while (dexEntries.hasMoreElements()) {
-                classNames.add(dexEntries.nextElement());
-            }
-        } catch (NullPointerException e) {
-            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-            Enumeration<URL> urls = classLoader.getResources("");
-            List<String> fileNames = new ArrayList<String>();
-            while (urls.hasMoreElements()) {
-                String classDirectoryName = urls.nextElement().getFile();
-                if (classDirectoryName.contains("bin") || classDirectoryName.contains("classes")) {
-                    File classDirectory = new File(classDirectoryName);
-                    for (File filePath : classDirectory.listFiles()) {
-                        populateFiles(filePath, fileNames, "");
-                    }
-                    classNames.addAll(fileNames);
-                }
-            }
-        }
-        return classNames;
-    }
-
-    private void populateFiles(File path, List<String> fileNames, String parent) {
-        if (path.isDirectory()) {
-            for (File newPath : path.listFiles()) {
-                if ("".equals(parent)) {
-                    populateFiles(newPath, fileNames, path.getName());
-                } else {
-                    populateFiles(newPath, fileNames, parent + "." + path.getName());
-                }
-            }
-        } else {
-            String pathName = path.getName();
-            String classSuffix = ".class";
-            pathName = pathName.endsWith(classSuffix) ?
-                    pathName.substring(0, pathName.length() - classSuffix.length()) : pathName;
-            if ("".equals(parent)) {
-                fileNames.add(pathName);
-            } else {
-                fileNames.add(parent + "." + pathName);
-            }
-        }
-    }
-
-    private String getSourcePath(Context context) throws PackageManager.NameNotFoundException {
-        return context.getPackageManager().getApplicationInfo(context.getPackageName(), 0).sourceDir;
+        databaseCreator = new DatabaseCreator(context);
     }
 
     @Override
     public void onCreate(SQLiteDatabase sqLiteDatabase) {
-        Log.i("Sugar", "on create");
-        createDatabase(sqLiteDatabase);
-    }
-
-    private void createDatabase(SQLiteDatabase sqLiteDatabase) {
-        List<Class> domainClasses = getDomainClasses(context);
-        for (Class domain : domainClasses) {
-            createTable(domain, sqLiteDatabase);
-        }
-    }
-
-    private <T extends SugarRecord<?>> void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
-        Log.i("Sugar", "create table");
-        List<Field> fields = getTableFields(table);
-
-        String tableName = StringUtil.toSQLName(table);
-
-        StringBuilder sb = new StringBuilder("CREATE TABLE ").append(tableName).append(
-                " ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
-
-        for (Field column : fields) {
-            String columnName = StringUtil.toSQLName(column);
-            String columnType = QueryBuilder.getColumnType(column.getType());
-
-            if (columnType != null) {
-
-                if (columnName.equalsIgnoreCase("Id")) {
-                    continue;
-                }
-
-                if(column.isAnnotationPresent(Column.class)){
-                    Column columnAnnotation = column.getAnnotation(Column.class);
-                    columnName = columnAnnotation.name();
-
-                    sb.append(", ").append(columnName).append(" ").append(columnType);
-
-                    if (columnAnnotation.notNull()) {
-                        if (columnType.endsWith(" NULL")) {
-                            sb.delete(sb.length() - 5, sb.length());
-                        }
-                        sb.append(" NOT NULL");
-                    }
-
-                    if (columnAnnotation.unique()) {
-                        sb.append(" UNIQUE");
-                    }
-
-                }else {
-
-                    sb.append(", ").append(columnName).append(" ").append(columnType);
-
-                    if (column.isAnnotationPresent(NotNull.class)) {
-                        if (columnType.endsWith(" NULL")) {
-                            sb.delete(sb.length() - 5, sb.length());
-                        }
-                        sb.append(" NOT NULL");
-                    }
-
-                    if (column.isAnnotationPresent(Unique.class)) {
-                        sb.append(" UNIQUE");
-                    }
-                }
-            }
-        }
-        sb.append(" ) ");
-
-        Log.i("Sugar", "creating table " + tableName);
-
-        if (!"".equals(sb.toString()))
-            sqLiteDatabase.execSQL(sb.toString());
+        databaseCreator.createDatabase(sqLiteDatabase);
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
-        Log.i("Sugar", "upgrading sugar");
-        // check if some tables are to be created
-        doUpgrade(sqLiteDatabase);
-
-        if (!executeSugarUpgrade(sqLiteDatabase, oldVersion, newVersion)) {
-            deleteTables(sqLiteDatabase);
-            onCreate(sqLiteDatabase);
-        }
+        databaseCreator.doUpgrade(sqLiteDatabase, oldVersion, newVersion);
     }
 
-    /**
-     * Create the tables that do not exist.
-     */
-    private void doUpgrade(SQLiteDatabase sqLiteDatabase) {
-        List<Class> domainClasses = getDomainClasses(context);
-        for (Class domain : domainClasses) {
-            try {// we try to do a select, if fails then (?) there isn't the table
-                sqLiteDatabase.query(StringUtil.toSQLName(domain), null, null, null, null, null, null);
-            } catch (SQLiteException e) {
-                Log.i("Sugar", String.format("creating table on update (error was '%s')", e.getMessage()));
-                createTable(domain, sqLiteDatabase);
-            }
+    public synchronized SQLiteDatabase getDB() {
+        if (this.sqLiteDatabase == null) {
+            this.sqLiteDatabase = getWritableDatabase();
         }
-    }
 
-    private void deleteTables(SQLiteDatabase sqLiteDatabase) {
-        List<Class> tables = getDomainClasses(this.context);
-        for (Class table : tables) {
-            sqLiteDatabase.execSQL("DROP TABLE IF EXISTS " + StringUtil.toSQLName(table));
-        }
+        return this.sqLiteDatabase;
     }
 
-    private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
-        boolean isSuccess = false;
-        try {
-            List<String> files = Arrays.asList(this.context.getAssets().list("sugar_upgrades"));
-            Collections.sort(files, new NumberComparator());
-
-            for (String file : files){
-                Log.i("Sugar", "filename : " + file);
-                try {
-                    int version = Integer.valueOf(file.replace(".sql", ""));
-
-                    if ((version > oldVersion) && (version <= newVersion)) {
-                        executeScript(db, file);
-                        isSuccess = true;
-                    }
-                } catch (NumberFormatException e) {
-                    Log.i("Sugar", "not a sugar script. ignored." + file);
-                }
-            }
-        } catch (IOException e) {
-            Log.e("Sugar", e.getMessage());
-        }
-
-        return isSuccess;
-    }
-
-    private void executeScript(SQLiteDatabase db, String file) {
-        try {
-            InputStream is = this.context.getAssets().open("sugar_upgrades/" + file);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                Log.i("Sugar script", line);
-                db.execSQL(line.toString());
-            }
-        } catch (IOException e) {
-            Log.e("Sugar", e.getMessage());
-        }
-
-        Log.i("Sugar", "script executed");
-    }
 }
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index dfc80158..efff7bd8 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -3,48 +3,48 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteStatement;
 import android.text.TextUtils;
 import android.util.Log;
+import com.orm.dsl.Table;
+import com.orm.util.NamingHelper;
+import com.orm.util.ReflectionUtil;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.sql.Timestamp;
 import java.util.*;
 
 import static com.orm.SugarApp.getSugarContext;
 
-public class SugarRecord<T>{
+public class SugarRecord {
 
     protected Long id = null;
 
-    public static <T extends SugarRecord<?>> void deleteAll(Class<T> type) {
-        Database db = getSugarContext().getDatabase();
+    public static <T> void deleteAll(Class<T> type) {
+        SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
-        sqLiteDatabase.delete(StringUtil.toSQLName(type), null, null);
+        sqLiteDatabase.delete(NamingHelper.toSQLName(type), null, null);
     }
 
-    public static <T extends SugarRecord<?>> void deleteAll(Class<T> type, String whereClause, String... whereArgs ) {
-        Database db = getSugarContext().getDatabase();
+    public static <T> void deleteAll(Class<T> type, String whereClause, String... whereArgs) {
+        SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
-        sqLiteDatabase.delete(StringUtil.toSQLName(type), whereClause, whereArgs);
+        sqLiteDatabase.delete(NamingHelper.toSQLName(type), whereClause, whereArgs);
     }
 
     @SuppressWarnings("deprecation")
-    public static <T extends SugarRecord<?>> void saveInTx(T... objects ) {
+    public static <T> void saveInTx(T... objects) {
         saveInTx(Arrays.asList(objects));
     }
 
     @SuppressWarnings("deprecation")
-    public static <T extends SugarRecord<?>> void saveInTx(Collection<T> objects ) {
-        SQLiteDatabase sqLiteDatabase = getSugarContext().getDatabase().getDB();
+    public static <T> void saveInTx(Collection<T> objects) {
+        SQLiteDatabase sqLiteDatabase = getSugarContext().getSugarDb().getDB();
 
         try{
             sqLiteDatabase.beginTransaction();
             sqLiteDatabase.setLockingEnabled(false);
             for(T object: objects){
-                object.save(sqLiteDatabase);
+                SugarRecord.save(object);
             }
             sqLiteDatabase.setTransactionSuccessful();
         }catch (Exception e){
@@ -56,55 +56,55 @@ public static <T extends SugarRecord<?>> void saveInTx(Collection<T> objects ) {
 
     }
 
-    public static <T extends SugarRecord<?>> List<T> listAll(Class<T> type) {
+    public static <T> List<T> listAll(Class<T> type) {
         return find(type, null, null, null, null, null);
     }
 
-    public static <T extends SugarRecord<?>> T findById(Class<T> type, Long id) {
+    public static <T> T findById(Class<T> type, Long id) {
         List<T> list = find(type, "id=?", new String[]{String.valueOf(id)}, null, null, "1");
         if (list.isEmpty()) return null;
         return list.get(0);
     }
 
-    public static <T extends SugarRecord<?>> T findById(Class<T> type, Integer id) {
+    public static <T> T findById(Class<T> type, Integer id) {
         return findById(type, Long.valueOf(id));
     }
 
-    public static <T extends SugarRecord<?>> Iterator<T> findAll(Class<T> type) {
+    public static <T> Iterator<T> findAll(Class<T> type) {
         return findAsIterator(type, null, null, null, null, null);
     }
 
-    public static <T extends SugarRecord<?>> Iterator<T> findAsIterator(Class<T> type,
+    public static <T> Iterator<T> findAsIterator(Class<T> type,
                                                                         String whereClause, String... whereArgs) {
         return findAsIterator(type, whereClause, whereArgs, null, null, null);
     }
 
-    public static <T extends SugarRecord<?>> Iterator<T> findWithQueryAsIterator(Class<T> type, String query, String... arguments) {
-        Database db = getSugarContext().getDatabase();
+    public static <T> Iterator<T> findWithQueryAsIterator(Class<T> type, String query, String... arguments) {
+        SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
         Cursor c = sqLiteDatabase.rawQuery(query, arguments);
         return new CursorIterator<T>(type, c);
     }
 
-    public static <T extends SugarRecord<?>> Iterator<T> findAsIterator(Class<T> type,
+    public static <T> Iterator<T> findAsIterator(Class<T> type,
                                                                     String whereClause, String[] whereArgs,
                                                                     String groupBy, String orderBy, String limit) {
 
-        Database db = getSugarContext().getDatabase();
+        SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
-        Cursor c = sqLiteDatabase.query(StringUtil.toSQLName(type), null,
+        Cursor c = sqLiteDatabase.query(NamingHelper.toSQLName(type), null,
                 whereClause, whereArgs, groupBy, null, orderBy, limit);
         return new CursorIterator<T>(type, c);
     }
 
-    public static <T extends SugarRecord<?>> List<T> find(Class<T> type,
+    public static <T> List<T> find(Class<T> type,
                                                        String whereClause, String... whereArgs) {
         return find(type, whereClause, whereArgs, null, null, null);
     }
 
-    public static <T extends SugarRecord<?>> List<T> findWithQuery(Class<T> type, String query, String... arguments){
+    public static <T> List<T> findWithQuery(Class<T> type, String query, String... arguments) {
 
-        Database db = getSugarContext().getDatabase();
+        SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
         T entity;
         List<T> toRet = new ArrayList<T>();
@@ -113,7 +113,7 @@ public static <T extends SugarRecord<?>> List<T> findWithQuery(Class<T> type, St
         try {
             while (c.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
-                entity.inflate(c);
+                SugarRecord.inflate(c, entity);
                 toRet.add(entity);
             }
         } catch (Exception e) {
@@ -125,22 +125,22 @@ public static <T extends SugarRecord<?>> List<T> findWithQuery(Class<T> type, St
     }
 
     public static void executeQuery(String query, String... arguments){
-        getSugarContext().getDatabase().getDB().execSQL(query, arguments);
+        getSugarContext().getSugarDb().getDB().execSQL(query, arguments);
     }
 
-    public static <T extends SugarRecord<?>> List<T> find(Class<T> type,
+    public static <T> List<T> find(Class<T> type,
                                                        String whereClause, String[] whereArgs,
                                                        String groupBy, String orderBy, String limit) {
-        Database db = getSugarContext().getDatabase();
+        SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
         T entity;
         List<T> toRet = new ArrayList<T>();
-        Cursor c = sqLiteDatabase.query(StringUtil.toSQLName(type), null,
+        Cursor c = sqLiteDatabase.query(NamingHelper.toSQLName(type), null,
                 whereClause, whereArgs, groupBy, null, orderBy, limit);
         try {
             while (c.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
-                entity.inflate(c);
+                SugarRecord.inflate(c, entity);
                 toRet.add(entity);
             }
         } catch (Exception e) {
@@ -151,25 +151,25 @@ public static <T extends SugarRecord<?>> List<T> find(Class<T> type,
         return toRet;
     }
 
-    public static <T extends SugarRecord<?>> long count(Class<?> type) {
+    public static <T> long count(Class<?> type) {
         return count(type, null, null, null, null, null);
     }
 
-    public static <T extends SugarRecord<?>> long count(Class<?> type,
+    public static <T> long count(Class<?> type,
             String whereClause, String[] whereArgs) {
     	return count(type, whereClause, whereArgs, null, null, null);
     }
 
-    public static <T extends SugarRecord<?>> long count(Class<?> type,
+    public static <T> long count(Class<?> type,
             String whereClause, String[] whereArgs,
             String groupBy, String orderBy, String limit) {
 
-    	Database db = getSugarContext().getDatabase();
+        SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
 
         long toRet = -1;
         String filter = (!TextUtils.isEmpty(whereClause)) ? " where "  + whereClause : "";
-        SQLiteStatement sqLiteStatament = sqLiteDatabase.compileStatement("SELECT count(*) FROM " + StringUtil.toSQLName(type) + filter);
+        SQLiteStatement sqLiteStatament = sqLiteDatabase.compileStatement("SELECT count(*) FROM " + NamingHelper.toSQLName(type) + filter);
 
         if (whereArgs != null) {
             for (int i = whereArgs.length; i != 0; i--) {
@@ -188,163 +188,56 @@ public static <T extends SugarRecord<?>> long count(Class<?> type,
         return toRet;
     }
 
-    public void delete() {
-        SQLiteDatabase db = getSugarContext().getDatabase().getDB();
-        db.delete(StringUtil.toSQLName(getClass()), "Id=?", new String[]{getId().toString()});
-    }
-
-    public long save() {
-        return save(getSugarContext().getDatabase().getDB());
+    public static long save(Object object) {
+        return save(getSugarContext().getSugarDb().getDB(), object);
     }
 
-    long save(SQLiteDatabase db) {
+    static long save(SQLiteDatabase db, Object object) {
 
-        List<Field> columns = SugarDb.getTableFields(getClass());
+        List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
         ContentValues values = new ContentValues(columns.size());
         for (Field column : columns) {
-            column.setAccessible(true);
-            Class<?> columnType = column.getType();
-            try {
-                String columnName = StringUtil.toSQLName(column);
-                Object columnValue = column.get(this);
-                if (SugarRecord.class.isAssignableFrom(columnType)) {
-                    values.put(columnName,
-                            (columnValue != null)
-                                    ? String.valueOf(((SugarRecord) columnValue).id)
-                                    : "0");
-                } else {
-                    if (columnType.equals(Short.class) || columnType.equals(short.class)) {
-                        values.put(columnName, (Short) columnValue);
-                    } else if (columnType.equals(Integer.class) || columnType.equals(int.class)) {
-                        values.put(columnName, (Integer) columnValue);
-                    } else if (columnType.equals(Long.class) || columnType.equals(long.class)) {
-                        values.put(columnName, (Long) columnValue);
-                    } else if (columnType.equals(Float.class) || columnType.equals(float.class)) {
-                        values.put(columnName, (Float) columnValue);
-                    } else if (columnType.equals(Double.class) || columnType.equals(double.class)) {
-                        values.put(columnName, (Double) columnValue);
-                    } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
-                        values.put(columnName, (Boolean) columnValue);
-                    } else if (Date.class.equals(columnType)) {
-                        try {
-                            values.put(columnName, ((Date) column.get(this)).getTime());
-                        } catch (NullPointerException e) {
-                            values.put(columnName, (Long) null);
-                        }
-                    } else if (Calendar.class.equals(columnType)) {
-                        try {
-                            values.put(columnName, ((Calendar) column.get(this)).getTimeInMillis());
-                        } catch (NullPointerException e) {
-                            values.put(columnName, (Long) null);
-                        }
-                    } else {
-                        if (columnValue == null) {
-                            values.putNull(columnName);
-                        } else {
-                            values.put(columnName, String.valueOf(columnValue));
-                        }
-                    }
-                }
-
-            } catch (IllegalAccessException e) {
-                Log.e("Sugar", e.getMessage());
-            }
+            ReflectionUtil.addFieldValueToColumn(values, column, object);
         }
 
-        id = db.insertWithOnConflict(StringUtil.toSQLName(getClass()), null, values, SQLiteDatabase.CONFLICT_REPLACE);
+        long id = db.insertWithOnConflict(NamingHelper.toSQLName(object.getClass()), null, values, SQLiteDatabase.CONFLICT_REPLACE);
+
+        ReflectionUtil.setFieldValueForId(object, id);
 
-        Log.i("Sugar", getClass().getSimpleName() + " saved : " + id);
+        Log.i("Sugar", object.getClass().getSimpleName() + " saved : " + id);
         return id;
     }
 
-    @SuppressWarnings("unchecked")
-    void inflate(Cursor cursor) {
-        Map<Field, Long> entities = new HashMap<Field, Long>();
-        List<Field> columns = SugarDb.getTableFields(getClass());
-        for (Field field : columns) {
-            field.setAccessible(true);
-            try {
-                Class fieldType = field.getType();
-                String colName = StringUtil.toSQLName(field);
+    private static void inflate(Cursor cursor, Object object) {
 
-                int columnIndex = cursor.getColumnIndex(colName);
+        List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
 
-                if (cursor.isNull(columnIndex)) {
-                    continue;
+        for (Field field : columns) {
+            if (field.getClass().isAnnotationPresent(Table.class)) {
+                try {
+                    long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toSQLName(field)));
+                    field.set(object, (id > 0) ? findById(field.getType(), id) : null);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
                 }
-
-                if(colName.equalsIgnoreCase("id")){
-                    long cid = cursor.getLong(columnIndex);
-                    field.set(this, Long.valueOf(cid));
-                }else if (fieldType.equals(long.class) || fieldType.equals(Long.class)) {
-                    field.set(this,
-                            cursor.getLong(columnIndex));
-                } else if (fieldType.equals(String.class)) {
-                    String val = cursor.getString(columnIndex);
-                    field.set(this, val != null && val.equals("null") ? null : val);
-                } else if (fieldType.equals(double.class) || fieldType.equals(Double.class)) {
-                    field.set(this,
-                            cursor.getDouble(columnIndex));
-                } else if (fieldType.equals(boolean.class) || fieldType.equals(Boolean.class)) {
-                    field.set(this,
-                            cursor.getString(columnIndex).equals("1"));
-                } else if (field.getType().getName().equals("[B")) {
-                    field.set(this,
-                            cursor.getBlob(columnIndex));
-                } else if (fieldType.equals(int.class) || fieldType.equals(Integer.class)) {
-                    field.set(this,
-                            cursor.getInt(columnIndex));
-                } else if (fieldType.equals(float.class) || fieldType.equals(Float.class)) {
-                    field.set(this,
-                            cursor.getFloat(columnIndex));
-                } else if (fieldType.equals(short.class) || fieldType.equals(Short.class)) {
-                    field.set(this,
-                            cursor.getShort(columnIndex));
-                } else if (fieldType.equals(Timestamp.class)) {
-                    long l = cursor.getLong(columnIndex);
-                    field.set(this, new Timestamp(l));
-                } else if (fieldType.equals(Date.class)) {
-                    long l = cursor.getLong(columnIndex);
-                    field.set(this, new Date(l));
-                } else if (fieldType.equals(Calendar.class)) {
-                    long l = cursor.getLong(columnIndex);
-                    Calendar c = Calendar.getInstance();
-                    c.setTimeInMillis(l);
-                    field.set(this, c);
-                } else if (Enum.class.isAssignableFrom(fieldType)) {
-                    try {
-                        Method valueOf = field.getType().getMethod("valueOf", String.class);
-                        String strVal = cursor.getString(columnIndex);
-                        Object enumVal = valueOf.invoke(field.getType(), strVal);
-                        field.set(this, enumVal);
-                    } catch (Exception e) {
-                        Log.e("Sugar", "Enum cannot be read from Sqlite3 database. Please check the type of field " + field.getName());
-                    }
-                } else if (SugarRecord.class.isAssignableFrom(fieldType)) {
-                    long id = cursor.getLong(columnIndex);
-                    if (id > 0)
-                        entities.put(field, id);
-                    else
-                        field.set(this, null);
-                } else
-                    Log.e("Sugar", "Class cannot be read from Sqlite3 database. Please check the type of field " + field.getName() + "(" + field.getType().getName() + ")");
-            } catch (IllegalArgumentException e) {
-                Log.e("field set error", e.getMessage());
-            } catch (IllegalAccessException e) {
-                Log.e("field set error", e.getMessage());
+            } else {
+                ReflectionUtil.setFieldValueFromCursor(cursor, field, object);
             }
-
         }
+    }
 
-        for (Field f : entities.keySet()) {
-            try {
-                f.set(this, findById((Class<? extends SugarRecord<?>>) f.getType(), 
-                        entities.get(f)));
-            } catch (SQLiteException e) {
-            } catch (IllegalArgumentException e) {
-            } catch (IllegalAccessException e) {
-            }
-        }
+    public void delete() {
+        SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
+        db.delete(NamingHelper.toSQLName(getClass()), "Id=?", new String[]{getId().toString()});
+    }
+
+    public long save() {
+        return save(getSugarContext().getSugarDb().getDB(), this);
+    }
+
+    @SuppressWarnings("unchecked")
+    void inflate(Cursor cursor) {
+        inflate(cursor, this);
     }
 
     public Long getId() {
@@ -355,7 +248,7 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    static class CursorIterator<E extends SugarRecord<?>> implements Iterator<E> {
+    static class CursorIterator<E> implements Iterator<E> {
         Class<E> type;
         Cursor cursor;
 
@@ -382,7 +275,7 @@ public E next() {
 
             try {
                 entity = type.getDeclaredConstructor().newInstance();
-                entity.inflate(cursor);
+                SugarRecord.inflate(cursor, entity);
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {
diff --git a/library/src/com/orm/SugarTransactionHelper.java b/library/src/com/orm/SugarTransactionHelper.java
index 505547df..ef3bf5fe 100644
--- a/library/src/com/orm/SugarTransactionHelper.java
+++ b/library/src/com/orm/SugarTransactionHelper.java
@@ -7,7 +7,7 @@ public class SugarTransactionHelper {
 
     public static void doInTansaction(SugarTransactionHelper.Callback callback) {
 
-        SQLiteDatabase database = SugarApp.getSugarContext().getDatabase().getDB();
+        SQLiteDatabase database = SugarApp.getSugarContext().getSugarDb().getDB();
 
         database.beginTransaction();
 
diff --git a/library/src/com/orm/query/Select.java b/library/src/com/orm/query/Select.java
index 8c78bd43..0d148d46 100644
--- a/library/src/com/orm/query/Select.java
+++ b/library/src/com/orm/query/Select.java
@@ -1,13 +1,13 @@
 package com.orm.query;
 
-import com.orm.StringUtil;
 import com.orm.SugarRecord;
+import com.orm.util.NamingHelper;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-public class Select<T extends SugarRecord<?>> implements Iterable {
+public class Select<T> implements Iterable {
 
     private Class<T> record;
     private String[] arguments;
@@ -23,7 +23,7 @@ public Select(Class<T> record) {
         this.record = record;
     }
 
-    public static <T extends SugarRecord<T>> Select<T> from(Class<T> record) {
+    public static <T> Select<T> from(Class<T> record) {
         return new Select<T>(record);
     }
 
@@ -107,7 +107,7 @@ public List<T> list() {
 
         if(arguments == null) arguments = convertArgs(args);
 
-        return T.find(record, whereClause, arguments, groupBy, orderBy, limit);
+        return SugarRecord.find(record, whereClause, arguments, groupBy, orderBy, limit);
 
     }
     
@@ -122,7 +122,7 @@ public T first() {
 
         if(arguments == null) arguments = convertArgs(args);
 
-        List<T> list = T.find(record, whereClause, arguments, groupBy, orderBy, "1");
+        List<T> list = SugarRecord.find(record, whereClause, arguments, groupBy, orderBy, "1");
         return list.size() > 0 ? list.get(0) : null;
     }
     
@@ -131,7 +131,7 @@ String toSql() {
 
         sql.append("SELECT * FROM ");
 
-        sql.append(StringUtil.toSQLName(this.record) + " ");
+        sql.append(NamingHelper.toSQLName(this.record) + " ");
 
         if (whereClause != null) {
             sql.append("WHERE " + whereClause + " ");
@@ -174,6 +174,6 @@ private String[] convertArgs(List<Object> argsList) {
     public Iterator<T> iterator() {
         if(arguments == null) arguments = convertArgs(args);
 
-        return T.findAsIterator(record, whereClause, arguments, groupBy, orderBy, limit);
+        return SugarRecord.findAsIterator(record, whereClause, arguments, groupBy, orderBy, limit);
     }
 }
diff --git a/library/src/com/orm/StringUtil.java b/library/src/com/orm/util/NamingHelper.java
similarity index 93%
rename from library/src/com/orm/StringUtil.java
rename to library/src/com/orm/util/NamingHelper.java
index 2c9767ff..5d8e7eaa 100644
--- a/library/src/com/orm/StringUtil.java
+++ b/library/src/com/orm/util/NamingHelper.java
@@ -1,11 +1,11 @@
-package com.orm;
+package com.orm.util;
 
 import com.orm.dsl.Column;
 import com.orm.dsl.Table;
 
 import java.lang.reflect.Field;
 
-public class StringUtil {
+public class NamingHelper {
     public static String toSQLNameDefault(String javaNotation) {
         if (javaNotation.equalsIgnoreCase("_id"))
             return "_id";
@@ -54,6 +54,6 @@ public static String toSQLName(Class<?> table) {
             Table annotation = table.getAnnotation(Table.class);
             return annotation.name();
         }
-        return StringUtil.toSQLNameDefault(table.getSimpleName());
+        return NamingHelper.toSQLNameDefault(table.getSimpleName());
     }
 }
diff --git a/library/src/com/orm/NumberComparator.java b/library/src/com/orm/util/NumberComparator.java
similarity index 99%
rename from library/src/com/orm/NumberComparator.java
rename to library/src/com/orm/util/NumberComparator.java
index 244d3281..c4284721 100644
--- a/library/src/com/orm/NumberComparator.java
+++ b/library/src/com/orm/util/NumberComparator.java
@@ -1,9 +1,17 @@
-package com.orm;
+package com.orm.util;
 
 import java.util.Comparator;
 
 public class NumberComparator implements Comparator<Object> {
 
+    static char charAt(String s, int i) {
+        if (i >= s.length()) {
+            return '\000';
+        }
+
+        return s.charAt(i);
+    }
+
     int compareRight(String a, String b) {
         int bias = 0;
         int ia = 0;
@@ -89,12 +97,4 @@ public int compare(Object o1, Object o2) {
             ib++;
         }
     }
-
-    static char charAt(String s, int i) {
-        if (i >= s.length()) {
-            return '\000';
-        }
-
-        return s.charAt(i);
-    }
 }
diff --git a/library/src/com/orm/QueryBuilder.java b/library/src/com/orm/util/QueryBuilder.java
similarity index 95%
rename from library/src/com/orm/QueryBuilder.java
rename to library/src/com/orm/util/QueryBuilder.java
index 6ca26fc9..77d6247e 100644
--- a/library/src/com/orm/QueryBuilder.java
+++ b/library/src/com/orm/util/QueryBuilder.java
@@ -1,4 +1,6 @@
-package com.orm;
+package com.orm.util;
+
+import com.orm.SugarRecord;
 
 public class QueryBuilder {
 
diff --git a/library/src/com/orm/util/ReflectionUtil.java b/library/src/com/orm/util/ReflectionUtil.java
new file mode 100644
index 00000000..7a213cae
--- /dev/null
+++ b/library/src/com/orm/util/ReflectionUtil.java
@@ -0,0 +1,281 @@
+package com.orm.util;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.util.Log;
+import com.orm.SugarRecord;
+import com.orm.dsl.Ignore;
+import com.orm.dsl.Table;
+import dalvik.system.DexFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.sql.Timestamp;
+import java.util.*;
+
+public class ReflectionUtil {
+
+    public static List<Field> getTableFields(Class table) {
+        List<Field> fieldList = SugarConfig.getFields(table);
+        if (fieldList != null) return fieldList;
+
+        Log.d("Sugar", "Fetching properties");
+        List<Field> typeFields = new ArrayList<Field>();
+
+        getAllFields(typeFields, table);
+
+        List<Field> toStore = new ArrayList<Field>();
+        for (Field field : typeFields) {
+            if (!field.isAnnotationPresent(Ignore.class) && !Modifier.isStatic(field.getModifiers()) && !Modifier.isTransient(field.getModifiers())) {
+                toStore.add(field);
+            }
+        }
+
+        SugarConfig.setFields(table, toStore);
+        return toStore;
+    }
+
+    private static List<Field> getAllFields(List<Field> fields, Class<?> type) {
+        Collections.addAll(fields, type.getDeclaredFields());
+
+        if (type.getSuperclass() != null) {
+            fields = getAllFields(fields, type.getSuperclass());
+        }
+
+        return fields;
+    }
+
+    public static void addFieldValueToColumn(ContentValues values, Field column, Object object) {
+        column.setAccessible(true);
+        Class<?> columnType = column.getType();
+        try {
+            String columnName = NamingHelper.toSQLName(column);
+            Object columnValue = column.get(object);
+
+            if (SugarRecord.class.isAssignableFrom(columnType)) {
+                values.put(columnName,
+                        (columnValue != null)
+                                ? String.valueOf(((SugarRecord) columnValue).getId())
+                                : "0");
+            } else {
+                if (columnType.equals(Short.class) || columnType.equals(short.class)) {
+                    values.put(columnName, (Short) columnValue);
+                } else if (columnType.equals(Integer.class) || columnType.equals(int.class)) {
+                    values.put(columnName, (Integer) columnValue);
+                } else if (columnType.equals(Long.class) || columnType.equals(long.class)) {
+                    values.put(columnName, (Long) columnValue);
+                } else if (columnType.equals(Float.class) || columnType.equals(float.class)) {
+                    values.put(columnName, (Float) columnValue);
+                } else if (columnType.equals(Double.class) || columnType.equals(double.class)) {
+                    values.put(columnName, (Double) columnValue);
+                } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
+                    values.put(columnName, (Boolean) columnValue);
+                } else if (Date.class.equals(columnType)) {
+                    try {
+                        values.put(columnName, ((Date) column.get(object)).getTime());
+                    } catch (NullPointerException e) {
+                        values.put(columnName, (Long) null);
+                    }
+                } else if (Calendar.class.equals(columnType)) {
+                    try {
+                        values.put(columnName, ((Calendar) column.get(object)).getTimeInMillis());
+                    } catch (NullPointerException e) {
+                        values.put(columnName, (Long) null);
+                    }
+                } else {
+                    if (columnValue == null) {
+                        values.putNull(columnName);
+                    } else {
+                        values.put(columnName, String.valueOf(columnValue));
+                    }
+                }
+            }
+
+        } catch (IllegalAccessException e) {
+            Log.e("Sugar", e.getMessage());
+        }
+    }
+
+    public static void setFieldValueFromCursor(Cursor cursor, Field field, Object object) {
+        field.setAccessible(true);
+        try {
+            Class fieldType = field.getType();
+            String colName = NamingHelper.toSQLName(field);
+
+            int columnIndex = cursor.getColumnIndex(colName);
+
+            if (cursor.isNull(columnIndex)) {
+                return;
+            }
+
+            if (colName.equalsIgnoreCase("id")) {
+                long cid = cursor.getLong(columnIndex);
+                field.set(object, Long.valueOf(cid));
+            } else if (fieldType.equals(long.class) || fieldType.equals(Long.class)) {
+                field.set(object,
+                        cursor.getLong(columnIndex));
+            } else if (fieldType.equals(String.class)) {
+                String val = cursor.getString(columnIndex);
+                field.set(object, val != null && val.equals("null") ? null : val);
+            } else if (fieldType.equals(double.class) || fieldType.equals(Double.class)) {
+                field.set(object,
+                        cursor.getDouble(columnIndex));
+            } else if (fieldType.equals(boolean.class) || fieldType.equals(Boolean.class)) {
+                field.set(object,
+                        cursor.getString(columnIndex).equals("1"));
+            } else if (field.getType().getName().equals("[B")) {
+                field.set(object,
+                        cursor.getBlob(columnIndex));
+            } else if (fieldType.equals(int.class) || fieldType.equals(Integer.class)) {
+                field.set(object,
+                        cursor.getInt(columnIndex));
+            } else if (fieldType.equals(float.class) || fieldType.equals(Float.class)) {
+                field.set(object,
+                        cursor.getFloat(columnIndex));
+            } else if (fieldType.equals(short.class) || fieldType.equals(Short.class)) {
+                field.set(object,
+                        cursor.getShort(columnIndex));
+            } else if (fieldType.equals(Timestamp.class)) {
+                long l = cursor.getLong(columnIndex);
+                field.set(object, new Timestamp(l));
+            } else if (fieldType.equals(Date.class)) {
+                long l = cursor.getLong(columnIndex);
+                field.set(object, new Date(l));
+            } else if (fieldType.equals(Calendar.class)) {
+                long l = cursor.getLong(columnIndex);
+                Calendar c = Calendar.getInstance();
+                c.setTimeInMillis(l);
+                field.set(object, c);
+            } else if (Enum.class.isAssignableFrom(fieldType)) {
+                try {
+                    Method valueOf = field.getType().getMethod("valueOf", String.class);
+                    String strVal = cursor.getString(columnIndex);
+                    Object enumVal = valueOf.invoke(field.getType(), strVal);
+                    field.set(object, enumVal);
+                } catch (Exception e) {
+                    Log.e("Sugar", "Enum cannot be read from Sqlite3 database. Please check the type of field " + field.getName());
+                }
+            } else
+                Log.e("Sugar", "Class cannot be read from Sqlite3 database. Please check the type of field " + field.getName() + "(" + field.getType().getName() + ")");
+        } catch (IllegalArgumentException e) {
+            Log.e("field set error", e.getMessage());
+        } catch (IllegalAccessException e) {
+            Log.e("field set error", e.getMessage());
+        }
+    }
+
+    public static void setFieldValueForId(Object object, Long value) {
+
+        try {
+            Field field = object.getClass().getField("id");
+
+            field.setAccessible(true);
+            field.set(object, value);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static List<Class> getDomainClasses(Context context) {
+        List<Class> domainClasses = new ArrayList<Class>();
+        try {
+            for (String className : getAllClasses(context)) {
+                if (className.startsWith(SugarConfig.getDomainPackageName(context))) {
+                    Class domainClass = getDomainClass(className, context);
+                    if (domainClass != null) domainClasses.add(domainClass);
+                }
+            }
+        } catch (IOException e) {
+            Log.e("Sugar", e.getMessage());
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e("Sugar", e.getMessage());
+        }
+
+        return domainClasses;
+    }
+
+
+    private static Class getDomainClass(String className, Context context) {
+        Class<?> discoveredClass = null;
+        try {
+            discoveredClass = Class.forName(className, true, context.getClass().getClassLoader());
+        } catch (ClassNotFoundException e) {
+            Log.e("Sugar", e.getMessage());
+        }
+
+        if ((discoveredClass != null) &&
+                ((SugarRecord.class.isAssignableFrom(discoveredClass) &&
+                        !SugarRecord.class.equals(discoveredClass)) ||
+                        discoveredClass.isAnnotationPresent(Table.class)) &&
+                !Modifier.isAbstract(discoveredClass.getModifiers())) {
+
+            Log.i("Sugar", "domain class : " + discoveredClass.getSimpleName());
+            return discoveredClass;
+
+        } else {
+            return null;
+        }
+    }
+
+
+    private static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
+        String path = getSourcePath(context);
+        List<String> classNames = new ArrayList<String>();
+        try {
+            DexFile dexfile = new DexFile(path);
+            Enumeration<String> dexEntries = dexfile.entries();
+            while (dexEntries.hasMoreElements()) {
+                classNames.add(dexEntries.nextElement());
+            }
+        } catch (NullPointerException e) {
+            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            Enumeration<URL> urls = classLoader.getResources("");
+            List<String> fileNames = new ArrayList<String>();
+            while (urls.hasMoreElements()) {
+                String classDirectoryName = urls.nextElement().getFile();
+                if (classDirectoryName.contains("bin") || classDirectoryName.contains("classes")) {
+                    File classDirectory = new File(classDirectoryName);
+                    for (File filePath : classDirectory.listFiles()) {
+                        populateFiles(filePath, fileNames, "");
+                    }
+                    classNames.addAll(fileNames);
+                }
+            }
+        }
+        return classNames;
+    }
+
+    private static void populateFiles(File path, List<String> fileNames, String parent) {
+        if (path.isDirectory()) {
+            for (File newPath : path.listFiles()) {
+                if ("".equals(parent)) {
+                    populateFiles(newPath, fileNames, path.getName());
+                } else {
+                    populateFiles(newPath, fileNames, parent + "." + path.getName());
+                }
+            }
+        } else {
+            String pathName = path.getName();
+            String classSuffix = ".class";
+            pathName = pathName.endsWith(classSuffix) ?
+                    pathName.substring(0, pathName.length() - classSuffix.length()) : pathName;
+            if ("".equals(parent)) {
+                fileNames.add(pathName);
+            } else {
+                fileNames.add(parent + "." + pathName);
+            }
+        }
+    }
+
+    private static String getSourcePath(Context context) throws PackageManager.NameNotFoundException {
+        return context.getPackageManager().getApplicationInfo(context.getPackageName(), 0).sourceDir;
+    }
+}
diff --git a/library/src/com/orm/SugarConfig.java b/library/src/com/orm/util/SugarConfig.java
similarity index 99%
rename from library/src/com/orm/SugarConfig.java
rename to library/src/com/orm/util/SugarConfig.java
index aaeb79b6..524adf29 100644
--- a/library/src/com/orm/SugarConfig.java
+++ b/library/src/com/orm/util/SugarConfig.java
@@ -1,4 +1,4 @@
-package com.orm;
+package com.orm.util;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
diff --git a/library/src/com/orm/SugarCursorFactory.java b/library/src/com/orm/util/SugarCursorFactory.java
similarity index 97%
rename from library/src/com/orm/SugarCursorFactory.java
rename to library/src/com/orm/util/SugarCursorFactory.java
index 17c60c59..538c8a9c 100644
--- a/library/src/com/orm/SugarCursorFactory.java
+++ b/library/src/com/orm/util/SugarCursorFactory.java
@@ -1,4 +1,4 @@
-package com.orm;
+package com.orm.util;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteCursor;
diff --git a/library/test/com/orm/NamingHelperTest.java b/library/test/com/orm/NamingHelperTest.java
new file mode 100644
index 00000000..d7c2e30e
--- /dev/null
+++ b/library/test/com/orm/NamingHelperTest.java
@@ -0,0 +1,25 @@
+package com.orm;
+
+import com.orm.util.NamingHelper;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+public class NamingHelperTest {
+    @Test
+    public void testToSQLNameCaseConversion() throws Exception {
+        assertEquals("TESTLOWERCASE", NamingHelper.toSQLNameDefault("testlowercase"));
+        assertEquals("TESTUPPERCASE", NamingHelper.toSQLNameDefault("TESTUPPERCASE"));
+    }
+
+    @Test
+    public void testToSQLNameUnderscore() {
+        assertEquals("TEST_UNDERSCORE", NamingHelper.toSQLNameDefault("testUnderscore"));
+        assertEquals("AB_CD", NamingHelper.toSQLNameDefault("AbCd"));
+        assertEquals("AB_CD", NamingHelper.toSQLNameDefault("ABCd"));
+        assertEquals("AB_CD", NamingHelper.toSQLNameDefault("AbCD"));
+        assertEquals("SOME_DETAILS_OBJECT", NamingHelper.toSQLNameDefault("SomeDetailsObject"));
+    }
+
+
+}
diff --git a/library/test/com/orm/StringUtilTest.java b/library/test/com/orm/StringUtilTest.java
deleted file mode 100644
index 8f2b8786..00000000
--- a/library/test/com/orm/StringUtilTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.orm;
-
-import org.junit.Test;
-
-import static junit.framework.Assert.assertEquals;
-
-public class StringUtilTest {
-    @Test
-    public void testToSQLNameCaseConversion() throws Exception {
-        assertEquals("TESTLOWERCASE", StringUtil.toSQLNameDefault("testlowercase"));
-        assertEquals("TESTUPPERCASE", StringUtil.toSQLNameDefault("TESTUPPERCASE"));
-    }
-
-    @Test
-    public void testToSQLNameUnderscore(){
-        assertEquals("TEST_UNDERSCORE", StringUtil.toSQLNameDefault("testUnderscore"));
-        assertEquals("AB_CD", StringUtil.toSQLNameDefault("AbCd"));
-        assertEquals("AB_CD", StringUtil.toSQLNameDefault("ABCd"));
-        assertEquals("AB_CD", StringUtil.toSQLNameDefault("AbCD"));
-        assertEquals("SOME_DETAILS_OBJECT", StringUtil.toSQLNameDefault("SomeDetailsObject"));
-    }
-
-
-}
diff --git a/library/test/com/orm/query/TestRecord.java b/library/test/com/orm/query/TestRecord.java
index 0751a936..50997205 100644
--- a/library/test/com/orm/query/TestRecord.java
+++ b/library/test/com/orm/query/TestRecord.java
@@ -1,10 +1,9 @@
 package com.orm.query;
 
 import android.content.Context;
-import com.orm.SugarApp;
 import com.orm.SugarRecord;
 
-public class TestRecord extends SugarRecord<TestRecord>{
+public class TestRecord extends SugarRecord {
 
     private String name;
 

From 169e4755da6441b2de1e74206933ef3ee0b40d59 Mon Sep 17 00:00:00 2001
From: Satya Narayan <satya@satyanarayan.in>
Date: Tue, 22 Jul 2014 19:15:57 -0700
Subject: [PATCH 028/305] table name is optional. That way simplifying the
 annotation.

---
 example/src/com/example/Note.java                         | 2 ++
 .../orm/{DatabaseCreator.java => SchemaGenerator.java}    | 4 ++--
 library/src/com/orm/SugarDb.java                          | 8 ++++----
 library/src/com/orm/dsl/Table.java                        | 2 +-
 library/src/com/orm/{dsl => util}/Collection.java         | 2 +-
 library/src/com/orm/util/NamingHelper.java                | 3 +++
 6 files changed, 13 insertions(+), 8 deletions(-)
 rename library/src/com/orm/{DatabaseCreator.java => SchemaGenerator.java} (98%)
 rename library/src/com/orm/{dsl => util}/Collection.java (97%)

diff --git a/example/src/com/example/Note.java b/example/src/com/example/Note.java
index 9f1edaa4..b83f730f 100755
--- a/example/src/com/example/Note.java
+++ b/example/src/com/example/Note.java
@@ -6,6 +6,8 @@
 @Table(name = "Note")
 public class Note {
 
+    private long id;
+
     @Column(name = "noteId", unique = true, notNull = true)
     private int noteId;
 
diff --git a/library/src/com/orm/DatabaseCreator.java b/library/src/com/orm/SchemaGenerator.java
similarity index 98%
rename from library/src/com/orm/DatabaseCreator.java
rename to library/src/com/orm/SchemaGenerator.java
index 616e742e..3dc1f72b 100644
--- a/library/src/com/orm/DatabaseCreator.java
+++ b/library/src/com/orm/SchemaGenerator.java
@@ -24,11 +24,11 @@
 
 import static com.orm.util.ReflectionUtil.getDomainClasses;
 
-public class DatabaseCreator {
+public class SchemaGenerator {
 
     private Context context;
 
-    public DatabaseCreator(Context context) {
+    public SchemaGenerator(Context context) {
         this.context = context;
     }
 
diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index 7a097054..2d4dbfd3 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -10,22 +10,22 @@
 import static com.orm.util.SugarConfig.getDebugEnabled;
 
 public class SugarDb extends SQLiteOpenHelper {
-    private final DatabaseCreator databaseCreator;
+    private final SchemaGenerator schemaGenerator;
     private SQLiteDatabase sqLiteDatabase;
 
     public SugarDb(Context context) {
         super(context, SugarConfig.getDatabaseName(context), new SugarCursorFactory(getDebugEnabled(context)), getDatabaseVersion(context));
-        databaseCreator = new DatabaseCreator(context);
+        schemaGenerator = new SchemaGenerator(context);
     }
 
     @Override
     public void onCreate(SQLiteDatabase sqLiteDatabase) {
-        databaseCreator.createDatabase(sqLiteDatabase);
+        schemaGenerator.createDatabase(sqLiteDatabase);
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
-        databaseCreator.doUpgrade(sqLiteDatabase, oldVersion, newVersion);
+        schemaGenerator.doUpgrade(sqLiteDatabase, oldVersion, newVersion);
     }
 
     public synchronized SQLiteDatabase getDB() {
diff --git a/library/src/com/orm/dsl/Table.java b/library/src/com/orm/dsl/Table.java
index a801d9d7..0dfaa18b 100644
--- a/library/src/com/orm/dsl/Table.java
+++ b/library/src/com/orm/dsl/Table.java
@@ -5,5 +5,5 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Table {
-    String name();
+    String name() default "";
 }
diff --git a/library/src/com/orm/dsl/Collection.java b/library/src/com/orm/util/Collection.java
similarity index 97%
rename from library/src/com/orm/dsl/Collection.java
rename to library/src/com/orm/util/Collection.java
index 6f1b5075..596a3e22 100644
--- a/library/src/com/orm/dsl/Collection.java
+++ b/library/src/com/orm/util/Collection.java
@@ -1,4 +1,4 @@
-package com.orm.dsl;
+package com.orm.util;
 import java.util.*;
 
 public class Collection {
diff --git a/library/src/com/orm/util/NamingHelper.java b/library/src/com/orm/util/NamingHelper.java
index 5d8e7eaa..116ab25d 100644
--- a/library/src/com/orm/util/NamingHelper.java
+++ b/library/src/com/orm/util/NamingHelper.java
@@ -52,6 +52,9 @@ public static String toSQLName(Class<?> table) {
 
         if (table.isAnnotationPresent(Table.class)) {
             Table annotation = table.getAnnotation(Table.class);
+            if ("".equals(annotation.name())) {
+                return NamingHelper.toSQLNameDefault(table.getSimpleName());
+            }
             return annotation.name();
         }
         return NamingHelper.toSQLNameDefault(table.getSimpleName());

From 5ab12699c6dacb311d72b1df4499381a50d008f0 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <huu@prismskylabs.com>
Date: Wed, 23 Jul 2014 22:47:00 -0700
Subject: [PATCH 029/305] Update id only when the model extends SugarRecord

---
 library/src/com/orm/SugarRecord.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index efff7bd8..07a64f5a 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -202,7 +202,9 @@ static long save(SQLiteDatabase db, Object object) {
 
         long id = db.insertWithOnConflict(NamingHelper.toSQLName(object.getClass()), null, values, SQLiteDatabase.CONFLICT_REPLACE);
 
-        ReflectionUtil.setFieldValueForId(object, id);
+        if (SugarRecord.class.isAssignableFrom(object.getClass())) {
+            ReflectionUtil.setFieldValueForId(object, id);
+        }
 
         Log.i("Sugar", object.getClass().getSimpleName() + " saved : " + id);
         return id;

From 2a310ad018f83298df55c46593c85d3d67c7bcc9 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 10 Aug 2014 09:08:51 -0700
Subject: [PATCH 030/305] Mostly nonfunctional formatting changes

---
 library/src/com/orm/SchemaGenerator.java      | 28 ++++----
 library/src/com/orm/SugarApp.java             |  7 +-
 library/src/com/orm/SugarDb.java              |  4 +-
 library/src/com/orm/SugarRecord.java          | 55 ++++++---------
 .../src/com/orm/SugarTransactionHelper.java   | 13 ++--
 library/src/com/orm/query/Condition.java      | 31 ++++++---
 library/src/com/orm/query/Select.java         | 69 ++++++++++---------
 library/src/com/orm/util/Collection.java      |  1 +
 library/src/com/orm/util/NamingHelper.java    |  7 +-
 .../src/com/orm/util/NumberComparator.java    |  5 +-
 library/src/com/orm/util/QueryBuilder.java    |  1 +
 library/src/com/orm/util/SugarConfig.java     | 25 +++----
 .../src/com/orm/util/SugarCursorFactory.java  | 10 ++-
 13 files changed, 132 insertions(+), 124 deletions(-)

diff --git a/library/src/com/orm/SchemaGenerator.java b/library/src/com/orm/SchemaGenerator.java
index 3dc1f72b..a7f25b51 100644
--- a/library/src/com/orm/SchemaGenerator.java
+++ b/library/src/com/orm/SchemaGenerator.java
@@ -42,14 +42,14 @@ public void createDatabase(SQLiteDatabase sqLiteDatabase) {
     public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
         List<Class> domainClasses = getDomainClasses(context);
         for (Class domain : domainClasses) {
-            try {// we try to do a select, if fails then (?) there isn't the table
+            try {  // we try to do a select, if fails then (?) there isn't the table
                 sqLiteDatabase.query(NamingHelper.toSQLName(domain), null, null, null, null, null, null);
             } catch (SQLiteException e) {
-                Log.i("Sugar", String.format("creating table on update (error was '%s')", e.getMessage()));
+                Log.i("Sugar", String.format("Creating table on update (error was '%s')",
+                        e.getMessage()));
                 createTable(domain, sqLiteDatabase);
             }
         }
-
         executeSugarUpgrade(sqLiteDatabase, oldVersion, newVersion);
     }
 
@@ -61,14 +61,14 @@ public void deleteTables(SQLiteDatabase sqLiteDatabase) {
     }
 
     private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
         boolean isSuccess = false;
+
         try {
             List<String> files = Arrays.asList(this.context.getAssets().list("sugar_upgrades"));
             Collections.sort(files, new NumberComparator());
-
             for (String file : files) {
                 Log.i("Sugar", "filename : " + file);
+
                 try {
                     int version = Integer.valueOf(file.replace(".sql", ""));
 
@@ -79,6 +79,7 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
                 } catch (NumberFormatException e) {
                     Log.i("Sugar", "not a sugar script. ignored." + file);
                 }
+
             }
         } catch (IOException e) {
             Log.e("Sugar", e.getMessage());
@@ -100,24 +101,21 @@ private void executeScript(SQLiteDatabase db, String file) {
             Log.e("Sugar", e.getMessage());
         }
 
-        Log.i("Sugar", "script executed");
+        Log.i("Sugar", "Script executed");
     }
 
     private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
-        Log.i("Sugar", "create table");
+        Log.i("Sugar", "Create table");
         List<Field> fields = ReflectionUtil.getTableFields(table);
-
         String tableName = NamingHelper.toSQLName(table);
-
-        StringBuilder sb = new StringBuilder("CREATE TABLE ").append(tableName).append(
-                " ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
+        StringBuilder sb = new StringBuilder("CREATE TABLE ");
+        sb.append(tableName).append(" ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
 
         for (Field column : fields) {
             String columnName = NamingHelper.toSQLName(column);
             String columnType = QueryBuilder.getColumnType(column.getType());
 
             if (columnType != null) {
-
                 if (columnName.equalsIgnoreCase("Id")) {
                     continue;
                 }
@@ -140,7 +138,6 @@ private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
                     }
 
                 } else {
-
                     sb.append(", ").append(columnName).append(" ").append(columnType);
 
                     if (column.isAnnotationPresent(NotNull.class)) {
@@ -156,9 +153,9 @@ private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
                 }
             }
         }
-        sb.append(" ) ");
 
-        Log.i("Sugar", "creating table " + tableName);
+        sb.append(" ) ");
+        Log.i("Sugar", "Creating table " + tableName);
 
         if (!"".equals(sb.toString())) {
             try {
@@ -166,7 +163,6 @@ private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
             } catch (SQLException e) {
                 e.printStackTrace();
             }
-
         }
     }
 
diff --git a/library/src/com/orm/SugarApp.java b/library/src/com/orm/SugarApp.java
index e2638a0e..18142acb 100644
--- a/library/src/com/orm/SugarApp.java
+++ b/library/src/com/orm/SugarApp.java
@@ -1,6 +1,6 @@
 package com.orm;
 
-public class SugarApp extends android.app.Application{
+public class SugarApp extends android.app.Application {
 
     private static SugarApp sugarContext;
     private SugarDb sugarDb;
@@ -9,7 +9,7 @@ public static SugarApp getSugarContext() {
         return sugarContext;
     }
 
-    public void onCreate(){
+    public void onCreate() {
         super.onCreate();
         SugarApp.sugarContext = this;
         this.sugarDb = new SugarDb(this);
@@ -21,7 +21,7 @@ public void onCreate(){
      * emulated process environments such as an emulator or
      * Robolectric Android mock.
      */
-    public void onTerminate(){
+    public void onTerminate() {
         if (this.sugarDb != null) {
             this.sugarDb.getDB().close();
         }
@@ -31,4 +31,5 @@ public void onTerminate(){
     protected SugarDb getSugarDb() {
         return sugarDb;
     }
+
 }
diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index 2d4dbfd3..21895f6b 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -10,11 +10,13 @@
 import static com.orm.util.SugarConfig.getDebugEnabled;
 
 public class SugarDb extends SQLiteOpenHelper {
+
     private final SchemaGenerator schemaGenerator;
     private SQLiteDatabase sqLiteDatabase;
 
     public SugarDb(Context context) {
-        super(context, SugarConfig.getDatabaseName(context), new SugarCursorFactory(getDebugEnabled(context)), getDatabaseVersion(context));
+        super(context, SugarConfig.getDatabaseName(context),
+                new SugarCursorFactory(getDebugEnabled(context)), getDatabaseVersion(context));
         schemaGenerator = new SchemaGenerator(context);
     }
 
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index 07a64f5a..a6a05f51 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -39,21 +39,19 @@ public static <T> void saveInTx(T... objects) {
     @SuppressWarnings("deprecation")
     public static <T> void saveInTx(Collection<T> objects) {
         SQLiteDatabase sqLiteDatabase = getSugarContext().getSugarDb().getDB();
-
-        try{
+        try {
             sqLiteDatabase.beginTransaction();
             sqLiteDatabase.setLockingEnabled(false);
-            for(T object: objects){
+            for (T object: objects) {
                 SugarRecord.save(object);
             }
             sqLiteDatabase.setTransactionSuccessful();
-        }catch (Exception e){
+        } catch (Exception e) {
             Log.i("Sugar", "Error in saving in transaction " + e.getMessage());
-        }finally {
+        } finally {
             sqLiteDatabase.endTransaction();
             sqLiteDatabase.setLockingEnabled(true);
         }
-
     }
 
     public static <T> List<T> listAll(Class<T> type) {
@@ -74,8 +72,7 @@ public static <T> Iterator<T> findAll(Class<T> type) {
         return findAsIterator(type, null, null, null, null, null);
     }
 
-    public static <T> Iterator<T> findAsIterator(Class<T> type,
-                                                                        String whereClause, String... whereArgs) {
+    public static <T> Iterator<T> findAsIterator(Class<T> type, String whereClause, String... whereArgs) {
         return findAsIterator(type, whereClause, whereArgs, null, null, null);
     }
 
@@ -86,24 +83,19 @@ public static <T> Iterator<T> findWithQueryAsIterator(Class<T> type, String quer
         return new CursorIterator<T>(type, c);
     }
 
-    public static <T> Iterator<T> findAsIterator(Class<T> type,
-                                                                    String whereClause, String[] whereArgs,
-                                                                    String groupBy, String orderBy, String limit) {
-
+    public static <T> Iterator<T> findAsIterator(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
         SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
-        Cursor c = sqLiteDatabase.query(NamingHelper.toSQLName(type), null,
-                whereClause, whereArgs, groupBy, null, orderBy, limit);
+        Cursor c = sqLiteDatabase.query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
+                groupBy, null, orderBy, limit);
         return new CursorIterator<T>(type, c);
     }
 
-    public static <T> List<T> find(Class<T> type,
-                                                       String whereClause, String... whereArgs) {
+    public static <T> List<T> find(Class<T> type, String whereClause, String... whereArgs) {
         return find(type, whereClause, whereArgs, null, null, null);
     }
 
     public static <T> List<T> findWithQuery(Class<T> type, String query, String... arguments) {
-
         SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
         T entity;
@@ -121,22 +113,21 @@ public static <T> List<T> findWithQuery(Class<T> type, String query, String... a
         } finally {
             c.close();
         }
+
         return toRet;
     }
 
-    public static void executeQuery(String query, String... arguments){
+    public static void executeQuery(String query, String... arguments) {
         getSugarContext().getSugarDb().getDB().execSQL(query, arguments);
     }
 
-    public static <T> List<T> find(Class<T> type,
-                                                       String whereClause, String[] whereArgs,
-                                                       String groupBy, String orderBy, String limit) {
+    public static <T> List<T> find(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
         SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
         T entity;
         List<T> toRet = new ArrayList<T>();
-        Cursor c = sqLiteDatabase.query(NamingHelper.toSQLName(type), null,
-                whereClause, whereArgs, groupBy, null, orderBy, limit);
+        Cursor c = sqLiteDatabase.query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
+                groupBy, null, orderBy, limit);
         try {
             while (c.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
@@ -155,15 +146,11 @@ public static <T> long count(Class<?> type) {
         return count(type, null, null, null, null, null);
     }
 
-    public static <T> long count(Class<?> type,
-            String whereClause, String[] whereArgs) {
+    public static <T> long count(Class<?> type, String whereClause, String[] whereArgs) {
     	return count(type, whereClause, whereArgs, null, null, null);
     }
 
-    public static <T> long count(Class<?> type,
-            String whereClause, String[] whereArgs,
-            String groupBy, String orderBy, String limit) {
-
+    public static <T> long count(Class<?> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
         SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
 
@@ -193,25 +180,24 @@ public static long save(Object object) {
     }
 
     static long save(SQLiteDatabase db, Object object) {
-
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
         ContentValues values = new ContentValues(columns.size());
         for (Field column : columns) {
             ReflectionUtil.addFieldValueToColumn(values, column, object);
         }
 
-        long id = db.insertWithOnConflict(NamingHelper.toSQLName(object.getClass()), null, values, SQLiteDatabase.CONFLICT_REPLACE);
+        long id = db.insertWithOnConflict(NamingHelper.toSQLName(object.getClass()), null, values,
+                SQLiteDatabase.CONFLICT_REPLACE);
 
         if (SugarRecord.class.isAssignableFrom(object.getClass())) {
             ReflectionUtil.setFieldValueForId(object, id);
         }
-
         Log.i("Sugar", object.getClass().getSimpleName() + " saved : " + id);
+
         return id;
     }
 
     private static void inflate(Cursor cursor, Object object) {
-
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
 
         for (Field field : columns) {
@@ -286,6 +272,7 @@ public E next() {
                     cursor.close();
                 }
             }
+
             return entity;
         }
 
@@ -293,8 +280,6 @@ public E next() {
         public void remove() {
             throw new UnsupportedOperationException();
         }
-
-
     }
 
 }
diff --git a/library/src/com/orm/SugarTransactionHelper.java b/library/src/com/orm/SugarTransactionHelper.java
index ef3bf5fe..d5758718 100644
--- a/library/src/com/orm/SugarTransactionHelper.java
+++ b/library/src/com/orm/SugarTransactionHelper.java
@@ -6,24 +6,27 @@
 public class SugarTransactionHelper {
 
     public static void doInTansaction(SugarTransactionHelper.Callback callback) {
-
         SQLiteDatabase database = SugarApp.getSugarContext().getSugarDb().getDB();
-
         database.beginTransaction();
 
         try {
-            Log.d(SugarTransactionHelper.class.getSimpleName(), "callback executing within transaction");
+            Log.d(SugarTransactionHelper.class.getSimpleName(),
+                    "Callback executing within transaction");
             callback.manipulateInTransaction();
             database.setTransactionSuccessful();
-            Log.d(SugarTransactionHelper.class.getSimpleName(), "callback successfully executed within transaction");
+            Log.d(SugarTransactionHelper.class.getSimpleName(),
+                    "Callback successfully executed within transaction");
         } catch (Throwable e) {
-            Log.d(SugarTransactionHelper.class.getSimpleName(), "could execute callback within transaction", e);
+            Log.d(SugarTransactionHelper.class.getSimpleName(),
+                    "Could execute callback within transaction", e);
         } finally {
             database.endTransaction();
         }
+
     }
 
     public static interface Callback {
         void manipulateInTransaction();
     }
+
 }
diff --git a/library/src/com/orm/query/Condition.java b/library/src/com/orm/query/Condition.java
index 6838b843..989bd458 100644
--- a/library/src/com/orm/query/Condition.java
+++ b/library/src/com/orm/query/Condition.java
@@ -1,16 +1,22 @@
 package com.orm.query;
 
 public class Condition {
+
     private String property;
     private Object value;
     private Check check;
 
     enum Check {
-        EQUALS(" = "), GREATER_THAN(" > "), LESSER_THAN(" < "), NOT_EQUALS (" != "), LIKE(" LIKE "), NOT_LIKE(" NOT LIKE ");
+        EQUALS(" = "),
+        GREATER_THAN(" > "),
+        LESSER_THAN(" < "),
+        NOT_EQUALS (" != "),
+        LIKE(" LIKE "),
+        NOT_LIKE(" NOT LIKE ");
+
         private String symbol;
 
         Check(String symbol) {
-
             this.symbol = symbol;
         }
 
@@ -20,48 +26,50 @@ public String getSymbol() {
     }
 
     enum Type {
-        AND, OR, NOT
+        AND,
+        OR,
+        NOT
     }
 
     public Condition(String property) {
         this.property = property;
     }
 
-    public static Condition prop(String property){
+    public static Condition prop(String property) {
         return new Condition(property);
     }
 
-    public Condition eq(Object value){
+    public Condition eq(Object value) {
         this.value = value;
         check = Check.EQUALS;
         return this;
     }
 
-    public Condition like(Object value){
+    public Condition like(Object value) {
         this.value = value;
         check = Check.LIKE;
         return this;
     }
 
-    public Condition notLike(Object value){
+    public Condition notLike(Object value) {
         this.value = value;
         check = Check.NOT_LIKE;
         return this;
     }
 
-    public Condition notEq(Object value){
+    public Condition notEq(Object value) {
         this.value = value;
         check = Check.NOT_EQUALS;
         return this;
     }
 
-    public Condition gt(Object value){
+    public Condition gt(Object value) {
         this.value = value;
         check = Check.GREATER_THAN;
         return this;
     }
 
-    public Condition lt(Object value){
+    public Condition lt(Object value) {
         this.value = value;
         check = Check.LESSER_THAN;
         return this;
@@ -79,7 +87,8 @@ public Check getCheck() {
         return check;
     }
 
-    public String getCheckSymbol(){
+    public String getCheckSymbol() {
         return check.getSymbol();
     }
+
 }
diff --git a/library/src/com/orm/query/Select.java b/library/src/com/orm/query/Select.java
index 0d148d46..9e91543c 100644
--- a/library/src/com/orm/query/Select.java
+++ b/library/src/com/orm/query/Select.java
@@ -16,7 +16,6 @@ public class Select<T> implements Iterable {
     private String groupBy;
     private String limit;
     private String offset;
-
     private List<Object> args = new ArrayList<Object>();
 
     public Select(Class<T> record) {
@@ -42,8 +41,6 @@ public Select<T> limit(String limit) {
         return this;
     }
 
-
-
     public Select<T> where(String whereClause) {
         this.whereClause = whereClause;
         return this;
@@ -59,26 +56,32 @@ public Select<T> where(Condition... condition) {
     private void mergeConditions(Condition[] conditions, Condition.Type type) {
         StringBuilder toAppend = new StringBuilder("");
         for (Condition condition : conditions) {
-
             if (toAppend.length() != 0) {
-                toAppend.append(" " + type.name() + " ");
+                toAppend.append(" ").append(type.name()).append(" ");
             }
 
-            if(Condition.Check.LIKE.equals(condition.getCheck()) || Condition.Check.NOT_LIKE.equals(condition.getCheck())){
-
-                toAppend.append(condition.getProperty() + condition.getCheckSymbol() + "'" + condition.getValue().toString() + "'");
-
-            }else{
-
-                toAppend.append(condition.getProperty() + condition.getCheckSymbol() + "? ");
+            if (Condition.Check.LIKE.equals(condition.getCheck()) ||
+                    Condition.Check.NOT_LIKE.equals(condition.getCheck())) {
+                toAppend
+                    .append(condition.getProperty())
+                    .append(condition.getCheckSymbol())
+                    .append("'")
+                    .append(condition.getValue().toString())
+                    .append("'");
+
+            } else {
+                toAppend
+                    .append(condition.getProperty())
+                    .append(condition.getCheckSymbol())
+                    .append("? ");
                 args.add(condition.getValue());
             }
-
         }
         
         if (!"".equals(whereClause)) {
             whereClause += " " + type.name() + " ";
         }
+
         whereClause += "(" + toAppend + ")";
     }
 
@@ -104,23 +107,25 @@ public Select<T> where(String whereClause, String[] args) {
     }
 
     public List<T> list() {
-
-        if(arguments == null) arguments = convertArgs(args);
+        if (arguments == null) {
+            arguments = convertArgs(args);
+        }
 
         return SugarRecord.find(record, whereClause, arguments, groupBy, orderBy, limit);
-
     }
     
     public long count() {
+        if (arguments == null) {
+            arguments = convertArgs(args);
+        }
     	
-    	if(arguments == null) arguments = convertArgs(args);
-    	
-    	return SugarRecord.count(record, whereClause, arguments, groupBy, orderBy, limit);
+        return SugarRecord.count(record, whereClause, arguments, groupBy, orderBy, limit);
     }
 
     public T first() {
-
-        if(arguments == null) arguments = convertArgs(args);
+        if (arguments == null) {
+            arguments = convertArgs(args);
+        }
 
         List<T> list = SugarRecord.find(record, whereClause, arguments, groupBy, orderBy, "1");
         return list.size() > 0 ? list.get(0) : null;
@@ -128,25 +133,22 @@ public T first() {
     
     String toSql() {
         StringBuilder sql = new StringBuilder();
-
-        sql.append("SELECT * FROM ");
-
-        sql.append(NamingHelper.toSQLName(this.record) + " ");
+        sql.append("SELECT * FROM ").append(NamingHelper.toSQLName(this.record)).append(" ");
 
         if (whereClause != null) {
-            sql.append("WHERE " + whereClause + " ");
+            sql.append("WHERE ").append(whereClause).append(" ");
         }
 
         if (orderBy != null) {
-            sql.append("ORDER BY " + orderBy + " ");
+            sql.append("ORDER BY ").append(orderBy).append(" ");
         }
 
         if (limit != null) {
-            sql.append("LIMIT " + limit + " ");
+            sql.append("LIMIT ").append(limit).append(" ");
         }
 
         if (offset != null) {
-            sql.append("OFFSET " + offset + " ");
+            sql.append("OFFSET ").append(offset).append(" ");
         }
 
         return sql.toString();
@@ -156,14 +158,14 @@ String getWhereCond() {
         return whereClause;
     }
 
-    String[] getArgs(){
+    String[] getArgs() {
         return convertArgs(args);
     }
 
     private String[] convertArgs(List<Object> argsList) {
         String[] argsArray = new String[argsList.size()];
 
-        for(int i=0; i< argsList.size();i++){
+        for (int i = 0; i < argsList.size(); i++) {
              argsArray[i] = argsList.get(i).toString();
         }
 
@@ -172,8 +174,11 @@ private String[] convertArgs(List<Object> argsList) {
 
     @Override
     public Iterator<T> iterator() {
-        if(arguments == null) arguments = convertArgs(args);
+        if (arguments == null) {
+            arguments = convertArgs(args);
+        }
 
         return SugarRecord.findAsIterator(record, whereClause, arguments, groupBy, orderBy, limit);
     }
+
 }
diff --git a/library/src/com/orm/util/Collection.java b/library/src/com/orm/util/Collection.java
index 596a3e22..fe7a7e63 100644
--- a/library/src/com/orm/util/Collection.java
+++ b/library/src/com/orm/util/Collection.java
@@ -36,4 +36,5 @@ public Entry(K key, V value) {
             this.value = value;
         }
     }
+
 }
diff --git a/library/src/com/orm/util/NamingHelper.java b/library/src/com/orm/util/NamingHelper.java
index 116ab25d..3d1622aa 100644
--- a/library/src/com/orm/util/NamingHelper.java
+++ b/library/src/com/orm/util/NamingHelper.java
@@ -6,9 +6,11 @@
 import java.lang.reflect.Field;
 
 public class NamingHelper {
+
     public static String toSQLNameDefault(String javaNotation) {
-        if (javaNotation.equalsIgnoreCase("_id"))
+        if (javaNotation.equalsIgnoreCase("_id")) {
             return "_id";
+        }
 
         StringBuilder sb = new StringBuilder();
         char[] buf = javaNotation.toCharArray();
@@ -49,7 +51,6 @@ public static String toSQLName(Field field) {
     }
 
     public static String toSQLName(Class<?> table) {
-
         if (table.isAnnotationPresent(Table.class)) {
             Table annotation = table.getAnnotation(Table.class);
             if ("".equals(annotation.name())) {
@@ -57,6 +58,8 @@ public static String toSQLName(Class<?> table) {
             }
             return annotation.name();
         }
+
         return NamingHelper.toSQLNameDefault(table.getSimpleName());
     }
+
 }
diff --git a/library/src/com/orm/util/NumberComparator.java b/library/src/com/orm/util/NumberComparator.java
index c4284721..b39ca9c9 100644
--- a/library/src/com/orm/util/NumberComparator.java
+++ b/library/src/com/orm/util/NumberComparator.java
@@ -4,7 +4,7 @@
 
 public class NumberComparator implements Comparator<Object> {
 
-    static char charAt(String s, int i) {
+    private static char charAt(String s, int i) {
         if (i >= s.length()) {
             return '\000';
         }
@@ -12,7 +12,7 @@ static char charAt(String s, int i) {
         return s.charAt(i);
     }
 
-    int compareRight(String a, String b) {
+    private int compareRight(String a, String b) {
         int bias = 0;
         int ia = 0;
         int ib = 0;
@@ -97,4 +97,5 @@ public int compare(Object o1, Object o2) {
             ib++;
         }
     }
+
 }
diff --git a/library/src/com/orm/util/QueryBuilder.java b/library/src/com/orm/util/QueryBuilder.java
index 77d6247e..6de9e8ca 100644
--- a/library/src/com/orm/util/QueryBuilder.java
+++ b/library/src/com/orm/util/QueryBuilder.java
@@ -37,4 +37,5 @@ public static String getColumnType(Class<?> type) {
 
         return "";
     }
+
 }
diff --git a/library/src/com/orm/util/SugarConfig.java b/library/src/com/orm/util/SugarConfig.java
index 524adf29..9568fa67 100644
--- a/library/src/com/orm/util/SugarConfig.java
+++ b/library/src/com/orm/util/SugarConfig.java
@@ -25,13 +25,12 @@ public static String getDatabaseName(Context context) {
         return databaseName;
     }
 
-    public static void setFields(Class<?> clazz, List<Field> fieldz){
+    public static void setFields(Class<?> clazz, List<Field> fieldz) {
          fields.put(clazz, fieldz);
     }
 
-    public static List<Field> getFields(Class<?> clazz){
-
-        if(fields.containsKey(clazz)){
+    public static List<Field> getFields(Class<?> clazz) {
+        if (fields.containsKey(clazz)) {
             List<Field> list = fields.get(clazz);
             return Collections.synchronizedList(list);
         }
@@ -39,14 +38,13 @@ public static List<Field> getFields(Class<?> clazz){
         return null;
     }
 
-    public static void clearCache(){
+    public static void clearCache() {
         fields.clear();
         fields = new HashMap<Class<?>, List<Field>>();
     }
 
     public static int getDatabaseVersion(Context context) {
         Integer databaseVersion = getMetaDataInteger(context, "VERSION");
-
         if ((databaseVersion == null) || (databaseVersion == 0)) {
             databaseVersion = 1;
         }
@@ -54,9 +52,8 @@ public static int getDatabaseVersion(Context context) {
         return databaseVersion;
     }
 
-    public static String getDomainPackageName(Context context){
+    public static String getDomainPackageName(Context context) {
         String domainPackageName = getMetaDataString(context, "DOMAIN_PACKAGE_NAME");
-
         if (domainPackageName == null) {
             domainPackageName = "";
         }
@@ -70,13 +67,13 @@ public static boolean getDebugEnabled(Context context) {
 
     public static String getMetaDataString(Context context, String name) {
         String value = null;
-
         PackageManager pm = context.getPackageManager();
+
         try {
             ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), 128);
             value = ai.metaData.getString(name);
         } catch (Exception e) {
-            Log.d("sugar", "Couldn't find config value: " + name);
+            Log.d("Sugar", "Couldn't find config value: " + name);
         }
 
         return value;
@@ -84,13 +81,13 @@ public static String getMetaDataString(Context context, String name) {
 
     public static Integer getMetaDataInteger(Context context, String name) {
         Integer value = null;
-
         PackageManager pm = context.getPackageManager();
+
         try {
             ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), 128);
             value = ai.metaData.getInt(name);
         } catch (Exception e) {
-            Log.d("sugar", "Couldn't find config value: " + name);
+            Log.d("Sugar", "Couldn't find config value: " + name);
         }
 
         return value;
@@ -98,13 +95,13 @@ public static Integer getMetaDataInteger(Context context, String name) {
 
     public static Boolean getMetaDataBoolean(Context context, String name) {
         Boolean value = false;
-
         PackageManager pm = context.getPackageManager();
+
         try {
             ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), 128);
             value = ai.metaData.getBoolean(name);
         } catch (Exception e) {
-            Log.d("sugar", "Couldn't find config value: " + name);
+            Log.d("Sugar", "Couldn't find config value: " + name);
         }
 
         return value;
diff --git a/library/src/com/orm/util/SugarCursorFactory.java b/library/src/com/orm/util/SugarCursorFactory.java
index 538c8a9c..12706516 100644
--- a/library/src/com/orm/util/SugarCursorFactory.java
+++ b/library/src/com/orm/util/SugarCursorFactory.java
@@ -15,18 +15,22 @@ public SugarCursorFactory() {
         this.debugEnabled = false;
     }
 
-    public SugarCursorFactory(boolean debugEnabled){
+    public SugarCursorFactory(boolean debugEnabled) {
 
         this.debugEnabled = debugEnabled;
     }
 
     @SuppressWarnings("deprecation")
-    public Cursor newCursor(SQLiteDatabase sqLiteDatabase, SQLiteCursorDriver sqLiteCursorDriver, String editTable, SQLiteQuery sqLiteQuery) {
+    public Cursor newCursor(SQLiteDatabase sqLiteDatabase,
+            SQLiteCursorDriver sqLiteCursorDriver,
+            String editTable,
+            SQLiteQuery sqLiteQuery) {
 
-        if(debugEnabled){
+        if (debugEnabled) {
             Log.d("SQL Log", sqLiteQuery.toString());
         }
 
         return new SQLiteCursor(sqLiteDatabase, sqLiteCursorDriver, editTable, sqLiteQuery);
     }
+
 }

From bcb9badc79aa3149f847e72efbe9da3d09923947 Mon Sep 17 00:00:00 2001
From: Jan Paul Imhoff <jan-paul.imhoff@sixt.com>
Date: Thu, 20 Feb 2014 10:20:28 +0100
Subject: [PATCH 031/305] Refactoring to a new startup routine. It is not
 needed to extend SugarApp in the client application anymore, instead a call
 to SugarContext.init(Context) has to be made in the Client application. To
 close the database we have to call SugarContext.terminate(Context) in
 Application.onTerminate()

---
 library/src/com/orm/SugarApp.java             | 35 -------------
 library/src/com/orm/SugarContext.java         | 50 +++++++++++++++++++
 library/src/com/orm/SugarRecord.java          |  2 +-
 .../src/com/orm/SugarTransactionHelper.java   |  2 +-
 4 files changed, 52 insertions(+), 37 deletions(-)
 delete mode 100644 library/src/com/orm/SugarApp.java
 create mode 100644 library/src/com/orm/SugarContext.java

diff --git a/library/src/com/orm/SugarApp.java b/library/src/com/orm/SugarApp.java
deleted file mode 100644
index 18142acb..00000000
--- a/library/src/com/orm/SugarApp.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.orm;
-
-public class SugarApp extends android.app.Application {
-
-    private static SugarApp sugarContext;
-    private SugarDb sugarDb;
-
-    public static SugarApp getSugarContext() {
-        return sugarContext;
-    }
-
-    public void onCreate() {
-        super.onCreate();
-        SugarApp.sugarContext = this;
-        this.sugarDb = new SugarDb(this);
-    }
-
-    /*
-     * Per issue #106 on Github, this method won't be called in
-     * any real Android device. This method is used purely in
-     * emulated process environments such as an emulator or
-     * Robolectric Android mock.
-     */
-    public void onTerminate() {
-        if (this.sugarDb != null) {
-            this.sugarDb.getDB().close();
-        }
-        super.onTerminate();
-    }
-
-    protected SugarDb getSugarDb() {
-        return sugarDb;
-    }
-
-}
diff --git a/library/src/com/orm/SugarContext.java b/library/src/com/orm/SugarContext.java
new file mode 100644
index 00000000..ea853766
--- /dev/null
+++ b/library/src/com/orm/SugarContext.java
@@ -0,0 +1,50 @@
+package com.orm;
+
+import android.content.Context;
+
+public class SugarContext {
+
+    private static SugarContext instance = null;
+    private SugarDb sugarDb;
+    private Context context;
+
+    private SugarContext(Context context) {
+        this.context = context;
+        this.sugarDb = new SugarDb(context);
+    }
+    
+    public static SugarContext getSugarContext() {
+        if (instance == null) {
+            throw new NullPointerException("SugarContext has not been initialized properly. Call SugarContext.init(Context) in your Application.onCreate() method and SugarContext.terminate() in your Application.onTerminate() method.");
+        }
+        return instance;
+    }
+
+    public static void init(Context context) {
+        instance = new SugarContext(context);
+    }
+
+    public static void terminate() {
+        if (instance == null) {
+            return;
+        }
+        instance.doTerminate();
+    }
+
+    /*
+     * Per issue #106 on Github, this method won't be called in
+     * any real Android device. This method is used purely in
+     * emulated process environments such as an emulator or
+     * Robolectric Android mock.
+     */
+    private void doTerminate() {
+        if (this.sugarDb != null) {
+            this.sugarDb.getDB().close();
+        }
+    }
+
+    protected SugarDb getSugarDb() {
+        return sugarDb;
+    }
+
+}
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index a6a05f51..2d854b64 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -13,7 +13,7 @@
 import java.lang.reflect.Field;
 import java.util.*;
 
-import static com.orm.SugarApp.getSugarContext;
+import static com.orm.SugarContext.getSugarContext;
 
 public class SugarRecord {
 
diff --git a/library/src/com/orm/SugarTransactionHelper.java b/library/src/com/orm/SugarTransactionHelper.java
index d5758718..0f2683f2 100644
--- a/library/src/com/orm/SugarTransactionHelper.java
+++ b/library/src/com/orm/SugarTransactionHelper.java
@@ -6,7 +6,7 @@
 public class SugarTransactionHelper {
 
     public static void doInTansaction(SugarTransactionHelper.Callback callback) {
-        SQLiteDatabase database = SugarApp.getSugarContext().getSugarDb().getDB();
+        SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
         database.beginTransaction();
 
         try {

From ea18cc8e84e8838f2ee928e431b73de85e0b494f Mon Sep 17 00:00:00 2001
From: Jan Paul Imhoff <jan-paul.imhoff@sixt.com>
Date: Thu, 20 Feb 2014 10:35:09 +0100
Subject: [PATCH 032/305] Modified the Example to be in line with the new
 startup system

---
 example/AndroidManifest.xml            |  2 +-
 example/src/com/example/ClientApp.java | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 example/src/com/example/ClientApp.java

diff --git a/example/AndroidManifest.xml b/example/AndroidManifest.xml
index e647f387..e03f036a 100755
--- a/example/AndroidManifest.xml
+++ b/example/AndroidManifest.xml
@@ -3,7 +3,7 @@
       package="com.example"
       android:versionCode="1"
       android:versionName="1.0">
-    <application android:label="@string/app_name" android:icon="@drawable/icon" android:name="com.orm.SugarApp">
+    <application android:label="@string/app_name" android:icon="@drawable/icon" android:name="ClientApp">
         <activity android:name="SugarActivity"
                   android:label="@string/app_name">
             <intent-filter>
diff --git a/example/src/com/example/ClientApp.java b/example/src/com/example/ClientApp.java
new file mode 100644
index 00000000..6e241a9d
--- /dev/null
+++ b/example/src/com/example/ClientApp.java
@@ -0,0 +1,21 @@
+package com.example;
+
+import com.orm.SugarContext;
+
+import android.app.Application;
+
+public class ClientApp extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        SugarContext.init(this);
+    }
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        SugarContext.terminate();
+    }
+
+}

From 5e893664594c8675d4bf99ed81a6b5c078efa7c8 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Mon, 18 Aug 2014 12:04:36 -0700
Subject: [PATCH 033/305] Preserve original behavior to allow existing
 applications to specify SugarApp in the manifest.

---
 library/src/com/orm/SugarApp.java | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 library/src/com/orm/SugarApp.java

diff --git a/library/src/com/orm/SugarApp.java b/library/src/com/orm/SugarApp.java
new file mode 100644
index 00000000..5140e1ee
--- /dev/null
+++ b/library/src/com/orm/SugarApp.java
@@ -0,0 +1,21 @@
+package com.orm;
+
+import com.orm.SugarContext;
+
+import android.app.Application;
+
+public class SugarApp extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        SugarContext.init(this);
+    }
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        SugarContext.terminate();
+    }
+
+}

From 53b8a9c95b0d958200b303299ef8f2cfd856a17a Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Mon, 18 Aug 2014 15:22:18 -0700
Subject: [PATCH 034/305] Add .gradle to ignore file to usher in support for
 Android Studio

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2adde673..76806924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@ library/gen
 library/.project
 library/.classpath
 library/library.iml
+library/.gradle
 *.class
 .DS_Store

From 02c88053c999eeb9260b484c02536228580e0c7f Mon Sep 17 00:00:00 2001
From: fhur <fernando@authy.com>
Date: Thu, 7 Aug 2014 23:20:43 -0500
Subject: [PATCH 035/305] Improved documentation and cleaned up NamingHelper

1. Added documentation to toSQLNameDefault, toSQLName(Field) and
toSQLName(Class)
2. Rewrote toSQLNameDefault as implementation was hard to understand
(refactored to make it more readable)
3. Added additional test cases to NamingHelper and created helper method
assertToSqlNameEquals(String,String) this helps make the test case
more readable.
---
 library/src/com/orm/util/NamingHelper.java | 67 +++++++++++++---------
 library/test/com/orm/NamingHelperTest.java | 25 +++++---
 2 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/library/src/com/orm/util/NamingHelper.java b/library/src/com/orm/util/NamingHelper.java
index 3d1622aa..e19d14bb 100644
--- a/library/src/com/orm/util/NamingHelper.java
+++ b/library/src/com/orm/util/NamingHelper.java
@@ -1,46 +1,51 @@
 package com.orm.util;
 
+import android.text.TextUtils;
+
 import com.orm.dsl.Column;
 import com.orm.dsl.Table;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 public class NamingHelper {
 
-    public static String toSQLNameDefault(String javaNotation) {
-        if (javaNotation.equalsIgnoreCase("_id")) {
+    /**
+     * Converts a given CamelCasedString to UPPER_CASE_UNDER_SCORE.
+     *
+     * @param camelCased  a non empty camelCased string
+     * @return the equivalent string converted to UPPER_CASE_UNDER_SCORE unless camelCased equals
+     *         "_id" (not case sensitive) in which case "_id" is returned
+     */
+    public static String toSQLNameDefault(String camelCased) {
+        if (camelCased.equalsIgnoreCase("_id")) {
             return "_id";
         }
 
-        StringBuilder sb = new StringBuilder();
-        char[] buf = javaNotation.toCharArray();
-
-        for (int i = 0; i < buf.length; i++) {
-            char prevChar = (i > 0) ? buf[i - 1] : 0;
-            char c = buf[i];
-            char nextChar = (i < buf.length - 1) ? buf[i + 1] : 0;
-            boolean isFirstChar = (i == 0);
-
-            if (isFirstChar || Character.isLowerCase(c) || Character.isDigit(c)) {
-                sb.append(Character.toUpperCase(c));
-            } else if (Character.isUpperCase(c)) {
-                if (Character.isLetterOrDigit(prevChar)) {
-                    if (Character.isLowerCase(prevChar)) {
-                        sb.append('_').append(Character.toUpperCase(c));
-                    } else if (nextChar > 0 && Character.isLowerCase(nextChar)) {
-                        sb.append('_').append(Character.toUpperCase(c));
-                    } else {
-                        sb.append(c);
-                    }
-                } else {
-                    sb.append(c);
-                }
+        List<String> words = new LinkedList<String>();
+        StringBuilder currentWord = new StringBuilder();
+        for(int i=0; i< camelCased.length(); i++){
+            char c = camelCased.charAt(i);
+            if(Character.isUpperCase(c)){
+                if(currentWord.length() == 0) words.add(currentWord.toString());
+                currentWord = new StringBuilder();
             }
+            currentWord.append(Character.toUpperCase(c));
         }
-
-        return sb.toString();
+        return TextUtils.join("_", words);
     }
 
+    /**
+     * Maps a Java Field object to the database's column name.
+     *
+     * @param field  the {@link java.lang.reflect.Field} that will be mapped
+     * @return the name of the given Field as represented in the database. If the Field is annotated
+     *         with {@link com.orm.dsl.Column} then the {@link com.orm.dsl.Column#name()} will be
+     *         returned. Else, the Field's {@link java.lang.reflect.Field#getName()} will be
+     *         converted from CamelCase to UNDER_SCORE notation
+     */
     public static String toSQLName(Field field) {
         if (field.isAnnotationPresent(Column.class)) {
             Column annotation = field.getAnnotation(Column.class);
@@ -50,6 +55,14 @@ public static String toSQLName(Field field) {
         return toSQLNameDefault(field.getName());
     }
 
+    /**
+     * Maps a Java Class to the name of the class.
+     *
+     * @param table  the generic {@link java.lang.Class<T>} that defines a database table
+     * @return if the given class is annotated with {@link com.orm.dsl.Table} then the value for
+     *         {@link com.orm.dsl.Table#name()} will be returned. Else, the class' simple name will 
+     *         be converted from CamelCase to UNDER_SCORE notation
+     */
     public static String toSQLName(Class<?> table) {
         if (table.isAnnotationPresent(Table.class)) {
             Table annotation = table.getAnnotation(Table.class);
diff --git a/library/test/com/orm/NamingHelperTest.java b/library/test/com/orm/NamingHelperTest.java
index d7c2e30e..28c705a0 100644
--- a/library/test/com/orm/NamingHelperTest.java
+++ b/library/test/com/orm/NamingHelperTest.java
@@ -8,18 +8,29 @@
 public class NamingHelperTest {
     @Test
     public void testToSQLNameCaseConversion() throws Exception {
-        assertEquals("TESTLOWERCASE", NamingHelper.toSQLNameDefault("testlowercase"));
-        assertEquals("TESTUPPERCASE", NamingHelper.toSQLNameDefault("TESTUPPERCASE"));
+        assertToSqlNameEquals("TESTLOWERCASE", "testlowercase");
+        assertToSqlNameEquals("TESTUPPERCASE", "TESTUPPERCASE");
     }
 
     @Test
     public void testToSQLNameUnderscore() {
-        assertEquals("TEST_UNDERSCORE", NamingHelper.toSQLNameDefault("testUnderscore"));
-        assertEquals("AB_CD", NamingHelper.toSQLNameDefault("AbCd"));
-        assertEquals("AB_CD", NamingHelper.toSQLNameDefault("ABCd"));
-        assertEquals("AB_CD", NamingHelper.toSQLNameDefault("AbCD"));
-        assertEquals("SOME_DETAILS_OBJECT", NamingHelper.toSQLNameDefault("SomeDetailsObject"));
+        assertToSqlNameEquals("TEST_UNDERSCORE", "testUnderscore");
+        assertToSqlNameEquals("AB_CD", "AbCd");
+        assertToSqlNameEquals("AB_CD", "ABCd");
+        assertToSqlNameEquals("AB_CD", "AbCD");
+        assertToSqlNameEquals("SOME_DETAILS_OBJECT", "SomeDetailsObject");
+        assertToSqlNameEquals("H_OL_A","hOlA");
+        assertToSqlNameEquals("A","a");
     }
 
+    /**
+     * Helper method that asserts a CamelCaseString is converted to UPPER_CASE_UNDER_SCORE.
+     *
+     * @param expected  a CamelCaseString
+     * @param actual    the expected UPPER_CASE_UNDER_SCORE string
+     */
+    private static void assertToSqlNameEquals(String expected, String actual) {
+        assertEquals(expected, NamingHelper.toSQLNameDefault(actual));
+    }
 
 }

From 060b3d567bde35fe54b71b6f13f9ef411013dc11 Mon Sep 17 00:00:00 2001
From: fhur <fernando@authy.com>
Date: Thu, 7 Aug 2014 23:52:35 -0500
Subject: [PATCH 036/305] rolled back changes, apparently this is not exacttly
 your typical CamelCase to UPPER_CASE_UNDER_SCORE algorithm

I thought ABC should have been converted to A_B_C (I was wrong). I have
reverted to previous algorithm.
---
 library/src/com/orm/util/NamingHelper.java | 34 ++++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/library/src/com/orm/util/NamingHelper.java b/library/src/com/orm/util/NamingHelper.java
index e19d14bb..dd86f8d1 100644
--- a/library/src/com/orm/util/NamingHelper.java
+++ b/library/src/com/orm/util/NamingHelper.java
@@ -24,17 +24,33 @@ public static String toSQLNameDefault(String camelCased) {
             return "_id";
         }
 
-        List<String> words = new LinkedList<String>();
-        StringBuilder currentWord = new StringBuilder();
-        for(int i=0; i< camelCased.length(); i++){
-            char c = camelCased.charAt(i);
-            if(Character.isUpperCase(c)){
-                if(currentWord.length() == 0) words.add(currentWord.toString());
-                currentWord = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
+        char[] buf = camelCased.toCharArray();
+
+        for (int i = 0; i < buf.length; i++) {
+            char prevChar = (i > 0) ? buf[i - 1] : 0;
+            char c = buf[i];
+            char nextChar = (i < buf.length - 1) ? buf[i + 1] : 0;
+            boolean isFirstChar = (i == 0);
+
+            if (isFirstChar || Character.isLowerCase(c) || Character.isDigit(c)) {
+                sb.append(Character.toUpperCase(c));
+            } else if (Character.isUpperCase(c)) {
+                if (Character.isLetterOrDigit(prevChar)) {
+                    if (Character.isLowerCase(prevChar)) {
+                        sb.append('_').append(Character.toUpperCase(c));
+                    } else if (nextChar > 0 && Character.isLowerCase(nextChar)) {
+                        sb.append('_').append(Character.toUpperCase(c));
+                    } else {
+                        sb.append(c);
+                    }
+                } else {
+                    sb.append(c);
+                }
             }
-            currentWord.append(Character.toUpperCase(c));
         }
-        return TextUtils.join("_", words);
+
+        return sb.toString();
     }
 
     /**

From 90ded2d242279c8e1dff6e4edaff28a983fce874 Mon Sep 17 00:00:00 2001
From: fhur <fernando@authy.com>
Date: Fri, 8 Aug 2014 19:31:19 -0500
Subject: [PATCH 037/305] Created ManifestHelper and moved AndroidManifest
 metadata read methods from SugarConfig to ManifestHelper

Reason: SugarConfig seemed to have 2 different responsibilities (holding
the field cache and retrieving data from the AndroidManifest), this
separates those concerns into 2 different classes.

Changes

1. Created ManifestHelper
   ManifestHelper provides methods for accessing the AndroidManifest's
   metadata (i.e. the database version, database name, etc.)
2. Added documentation to ManifestHelper
3. Refactored references that used SugarConfig to use ManifestHelper

Note:
There was an integer Flag with value 128, I'm not sure what that means
so I added a TODO.
---
 library/src/com/orm/SugarDb.java             |   9 +-
 library/src/com/orm/util/ManifestHelper.java | 134 +++++++++++++++++++
 library/src/com/orm/util/ReflectionUtil.java |   2 +-
 library/src/com/orm/util/SugarConfig.java    |  74 +---------
 4 files changed, 141 insertions(+), 78 deletions(-)
 create mode 100644 library/src/com/orm/util/ManifestHelper.java

diff --git a/library/src/com/orm/SugarDb.java b/library/src/com/orm/SugarDb.java
index 21895f6b..a15110a3 100644
--- a/library/src/com/orm/SugarDb.java
+++ b/library/src/com/orm/SugarDb.java
@@ -3,11 +3,12 @@
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import com.orm.util.SugarConfig;
+
+import com.orm.util.ManifestHelper;
 import com.orm.util.SugarCursorFactory;
 
-import static com.orm.util.SugarConfig.getDatabaseVersion;
-import static com.orm.util.SugarConfig.getDebugEnabled;
+import static com.orm.util.ManifestHelper.getDatabaseVersion;
+import static com.orm.util.ManifestHelper.getDebugEnabled;
 
 public class SugarDb extends SQLiteOpenHelper {
 
@@ -15,7 +16,7 @@ public class SugarDb extends SQLiteOpenHelper {
     private SQLiteDatabase sqLiteDatabase;
 
     public SugarDb(Context context) {
-        super(context, SugarConfig.getDatabaseName(context),
+        super(context, ManifestHelper.getDatabaseName(context),
                 new SugarCursorFactory(getDebugEnabled(context)), getDatabaseVersion(context));
         schemaGenerator = new SchemaGenerator(context);
     }
diff --git a/library/src/com/orm/util/ManifestHelper.java b/library/src/com/orm/util/ManifestHelper.java
new file mode 100644
index 00000000..f98f790e
--- /dev/null
+++ b/library/src/com/orm/util/ManifestHelper.java
@@ -0,0 +1,134 @@
+package com.orm.util;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.util.Log;
+
+/**
+ * Helper class for accessing properties in the AndroidManifest
+ */
+public class ManifestHelper {
+
+    /**
+     * TODO document the meaning of this 128 flag.
+     */
+    private final static int FLAG = 128;
+    /**
+     * Key for the database name meta data.
+     */
+    public final static String METADATA_DATABASE = "DATABASE";
+    /**
+     * Key for the database verison meta data.
+     */
+    public final static String METADATA_VERSION = "VERSION";
+    public final static String METADATA_DOMAIN_PACKAGE_NAME = "DOMAIN_PACKAGE_NAME";
+    public final static String METADATA_QUERY_LOG = "QUERY_LOG";
+    /**
+     * The default name for the database unless specified in the AndroidManifest.
+     */
+    public final static String DATABASE_DEFAULT_NAME = "Sugar.db";
+
+    /**
+     * Grabs the database version from the manifest.
+     *
+     * @param context  the {@link android.content.Context} of the Android application
+     * @return the database version as specified by the {@link #METADATA_VERSION} version or 1 of
+     *         not present
+     */
+    public static int getDatabaseVersion(Context context) {
+        Integer databaseVersion = getMetaDataInteger(context, METADATA_VERSION);
+
+        if ((databaseVersion == null) || (databaseVersion == 0)) {
+            databaseVersion = 1;
+        }
+
+        return databaseVersion;
+    }
+
+    /**
+     * Grabs the domain name of the model classes from the manifest. 
+     *
+     * @param context  the {@link android.content.Context} of the Android application
+     * @return the package String that Sugar uses to search for model classes
+     */
+    public static String getDomainPackageName(Context context){
+        String domainPackageName = getMetaDataString(context, METADATA_DOMAIN_PACKAGE_NAME);
+
+        if (domainPackageName == null) {
+            domainPackageName = "";
+        }
+
+        return domainPackageName;
+    }
+
+    /**
+     * Grabs the name of the database file specified in the manifest.
+     *
+     * @param context  the {@link android.content.Context} of the Android application
+     * @return the value for the {@value #METADATA_DATABASE} meta data in the AndroidManifest or
+     *         {@link #DATABASE_DEFAULT_NAME} if not present
+     */
+    public static String getDatabaseName(Context context) {
+        String databaseName = getMetaDataString(context, METADATA_DATABASE);
+
+        if (databaseName == null) {
+            databaseName = DATABASE_DEFAULT_NAME;
+        }
+
+        return databaseName;
+    }
+
+    /**
+     * Grabs the debug flag from the manifest.
+     *
+     * @param context  the {@link android.content.Context} of the Android application
+     * @return true if the debug flag is enabled
+     */
+    public static boolean getDebugEnabled(Context context) {
+        return getMetaDataBoolean(context, METADATA_QUERY_LOG);
+    }
+
+    private static String getMetaDataString(Context context, String name) {
+        String value = null;
+
+        PackageManager pm = context.getPackageManager();
+        try {
+            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), FLAG);
+            value = ai.metaData.getString(name);
+        } catch (Exception e) {
+            Log.d("sugar", "Couldn't find config value: " + name);
+        }
+
+        return value;
+    }
+
+    private static Integer getMetaDataInteger(Context context, String name) {
+        Integer value = null;
+
+        PackageManager pm = context.getPackageManager();
+        try {
+            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), FLAG);
+            value = ai.metaData.getInt(name);
+        } catch (Exception e) {
+            Log.d("sugar", "Couldn't find config value: " + name);
+        }
+
+        return value;
+    }
+
+    private static Boolean getMetaDataBoolean(Context context, String name) {
+        Boolean value = false;
+
+        PackageManager pm = context.getPackageManager();
+        try {
+            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), FLAG);
+            value = ai.metaData.getBoolean(name);
+        } catch (Exception e) {
+            Log.d("sugar", "Couldn't find config value: " + name);
+        }
+
+        return value;
+    }
+
+}
diff --git a/library/src/com/orm/util/ReflectionUtil.java b/library/src/com/orm/util/ReflectionUtil.java
index 7a213cae..b676d183 100644
--- a/library/src/com/orm/util/ReflectionUtil.java
+++ b/library/src/com/orm/util/ReflectionUtil.java
@@ -188,7 +188,7 @@ public static List<Class> getDomainClasses(Context context) {
         List<Class> domainClasses = new ArrayList<Class>();
         try {
             for (String className : getAllClasses(context)) {
-                if (className.startsWith(SugarConfig.getDomainPackageName(context))) {
+                if (className.startsWith(ManifestHelper.getDomainPackageName(context))) {
                     Class domainClass = getDomainClass(className, context);
                     if (domainClass != null) domainClasses.add(domainClass);
                 }
diff --git a/library/src/com/orm/util/SugarConfig.java b/library/src/com/orm/util/SugarConfig.java
index 9568fa67..b93da25e 100644
--- a/library/src/com/orm/util/SugarConfig.java
+++ b/library/src/com/orm/util/SugarConfig.java
@@ -11,20 +11,11 @@
 import java.util.List;
 import java.util.Map;
 
+
 public class SugarConfig {
 
     static Map<Class<?>, List<Field>> fields = new HashMap<Class<?>, List<Field>>();
 
-    public static String getDatabaseName(Context context) {
-        String databaseName = getMetaDataString(context, "DATABASE");
-
-        if (databaseName == null) {
-            databaseName = "Sugar.db";
-        }
-
-        return databaseName;
-    }
-
     public static void setFields(Class<?> clazz, List<Field> fieldz) {
          fields.put(clazz, fieldz);
     }
@@ -43,67 +34,4 @@ public static void clearCache() {
         fields = new HashMap<Class<?>, List<Field>>();
     }
 
-    public static int getDatabaseVersion(Context context) {
-        Integer databaseVersion = getMetaDataInteger(context, "VERSION");
-        if ((databaseVersion == null) || (databaseVersion == 0)) {
-            databaseVersion = 1;
-        }
-
-        return databaseVersion;
-    }
-
-    public static String getDomainPackageName(Context context) {
-        String domainPackageName = getMetaDataString(context, "DOMAIN_PACKAGE_NAME");
-        if (domainPackageName == null) {
-            domainPackageName = "";
-        }
-
-        return domainPackageName;
-    }
-
-    public static boolean getDebugEnabled(Context context) {
-        return getMetaDataBoolean(context, "QUERY_LOG");
-    }
-
-    public static String getMetaDataString(Context context, String name) {
-        String value = null;
-        PackageManager pm = context.getPackageManager();
-
-        try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), 128);
-            value = ai.metaData.getString(name);
-        } catch (Exception e) {
-            Log.d("Sugar", "Couldn't find config value: " + name);
-        }
-
-        return value;
-    }
-
-    public static Integer getMetaDataInteger(Context context, String name) {
-        Integer value = null;
-        PackageManager pm = context.getPackageManager();
-
-        try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), 128);
-            value = ai.metaData.getInt(name);
-        } catch (Exception e) {
-            Log.d("Sugar", "Couldn't find config value: " + name);
-        }
-
-        return value;
-    }
-
-    public static Boolean getMetaDataBoolean(Context context, String name) {
-        Boolean value = false;
-        PackageManager pm = context.getPackageManager();
-
-        try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), 128);
-            value = ai.metaData.getBoolean(name);
-        } catch (Exception e) {
-            Log.d("Sugar", "Couldn't find config value: " + name);
-        }
-
-        return value;
-    }
 }

From 64444466e4a062dcd02e2e5cc4b7fe5014050b2c Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Mon, 18 Aug 2014 16:54:26 -0700
Subject: [PATCH 038/305] Use self-documenting flag

---
 library/src/com/orm/util/ManifestHelper.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/library/src/com/orm/util/ManifestHelper.java b/library/src/com/orm/util/ManifestHelper.java
index f98f790e..fb65724c 100644
--- a/library/src/com/orm/util/ManifestHelper.java
+++ b/library/src/com/orm/util/ManifestHelper.java
@@ -10,10 +10,6 @@
  */
 public class ManifestHelper {
 
-    /**
-     * TODO document the meaning of this 128 flag.
-     */
-    private final static int FLAG = 128;
     /**
      * Key for the database name meta data.
      */
@@ -94,7 +90,8 @@ private static String getMetaDataString(Context context, String name) {
 
         PackageManager pm = context.getPackageManager();
         try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), FLAG);
+            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(),
+                    PackageManager.GET_META_DATA);
             value = ai.metaData.getString(name);
         } catch (Exception e) {
             Log.d("sugar", "Couldn't find config value: " + name);
@@ -108,7 +105,8 @@ private static Integer getMetaDataInteger(Context context, String name) {
 
         PackageManager pm = context.getPackageManager();
         try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), FLAG);
+            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(),
+                    PackageManager.GET_META_DATA);
             value = ai.metaData.getInt(name);
         } catch (Exception e) {
             Log.d("sugar", "Couldn't find config value: " + name);
@@ -122,7 +120,8 @@ private static Boolean getMetaDataBoolean(Context context, String name) {
 
         PackageManager pm = context.getPackageManager();
         try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(), FLAG);
+            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(),
+                    PackageManager.GET_META_DATA);
             value = ai.metaData.getBoolean(name);
         } catch (Exception e) {
             Log.d("sugar", "Couldn't find config value: " + name);

From 9c04bdc16d00695571477c4af954ea6b2a7a2423 Mon Sep 17 00:00:00 2001
From: Xudong Shen <xudshen@hotmail.com>
Date: Fri, 25 Jul 2014 14:19:51 +0800
Subject: [PATCH 039/305] add Timestamp convert on save()

---
 library/src/com/orm/util/ReflectionUtil.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/src/com/orm/util/ReflectionUtil.java b/library/src/com/orm/util/ReflectionUtil.java
index b676d183..3dc2b59d 100644
--- a/library/src/com/orm/util/ReflectionUtil.java
+++ b/library/src/com/orm/util/ReflectionUtil.java
@@ -76,6 +76,12 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
                     values.put(columnName, (Double) columnValue);
                 } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
                     values.put(columnName, (Boolean) columnValue);
+                } else if (Timestamp.class.equals(columnType)) {
+                    try {
+                        values.put(columnName, ((Timestamp) column.get(object)).getTime());
+                    } catch (NullPointerException e) {
+                        values.put(columnName, (Long) null);
+                    }
                 } else if (Date.class.equals(columnType)) {
                     try {
                         values.put(columnName, ((Date) column.get(object)).getTime());

From d6d36abf6a46d0c227ed63f976c9fa5235041008 Mon Sep 17 00:00:00 2001
From: Caleb Barde <caleb.barde@getbraintree.com>
Date: Thu, 21 Aug 2014 12:21:15 -0500
Subject: [PATCH 040/305] add Log on delete()

---
 library/src/com/orm/SugarRecord.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index 2d854b64..8448cad9 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -217,6 +217,7 @@ private static void inflate(Cursor cursor, Object object) {
     public void delete() {
         SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
         db.delete(NamingHelper.toSQLName(getClass()), "Id=?", new String[]{getId().toString()});
+        Log.i("Sugar", getClass().getSimpleName() + " deleted : " + getId().toString()});
     }
 
     public long save() {

From 58e5d98f22291d62b65dfe580afda96d44e01f13 Mon Sep 17 00:00:00 2001
From: Caleb Barde <caleb.barde@getbraintree.com>
Date: Fri, 22 Aug 2014 09:18:34 -0500
Subject: [PATCH 041/305] initial add of .travis.yml

---
 .travis.yml                          | 13 +++++++++++++
 library/build.properties             |  5 +++--
 library/build.xml                    | 27 ++++++++++++++++++++++-----
 library/src/com/orm/SugarRecord.java |  2 +-
 4 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..ab91b91e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: android
+android:
+  components:
+    - sys-img-x86-android-17
+    - build-tools-19.1.0
+    - android-17
+    - android-19
+
+before_script:
+  - cd library
+
+script:
+  - ant travis-all
diff --git a/library/build.properties b/library/build.properties
index ff5c1fe8..b5b95df0 100644
--- a/library/build.properties
+++ b/library/build.properties
@@ -1,2 +1,3 @@
-jdk.home.1.6=/Library/Java/Home
-android.home=/Users/ADMIN/Downloads/android-sdk-macosx/platforms/android-17/android.jar
\ No newline at end of file
+jdk.home.1.6=$JAVA_HOME
+android.home=/Users/ADMIN/Downloads/android-sdk-macosx/platforms/android-17/android.jar
+android.travis.home=/usr/local/android-sdk/platforms/android-17/android.jar
diff --git a/library/build.xml b/library/build.xml
index ef746a37..927b3904 100644
--- a/library/build.xml
+++ b/library/build.xml
@@ -20,6 +20,10 @@
     <pathelement location="${android.home}"/>
   </path>
 
+  <path id="sugar.travis.classpath">
+    <pathelement location="${android.travis.home}"/>
+  </path>
+
   <patternset id="excluded.from.compilation.sugar">
     <patternset refid="ignored.files"/>
   </patternset>
@@ -29,10 +33,10 @@
       <include name="src"/>
     </dirset>
   </path>
-  
+ 
   <target name="compile" description="Compile module sugar; production classes">
     <mkdir dir="${sugar.output.dir}"/>
-    <javac destdir="${sugar.output.dir}" fork="true" executable="${jdk.bin.1.6}/javac">
+    <javac destdir="${sugar.output.dir}" fork="false" executable="${jdk.bin.1.6}/javac">
       <classpath refid="sugar.classpath"/>
       <src refid="sugar.module.sourcepath"/>
       <patternset refid="excluded.from.compilation.sugar"/>
@@ -41,12 +45,25 @@
       <jar destfile="${sugar.output.dir}/sugar.jar" basedir="${sugar.output.dir}"/>
 
   </target>
-  
+
+  <target name="compile-travis" description="Compile module sugar for travis-cl">
+
+    <mkdir dir="${sugar.output.dir}"/>
+    <javac destdir="${sugar.output.dir}" fork="false" executable="${jdk.bin.1.6}/javac">
+      <classpath refid="sugar.travis.classpath"/>
+      <src refid="sugar.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.sugar"/>
+    </javac>
+
+      <jar destfile="${sugar.output.dir}/sugar.jar" basedir="${sugar.output.dir}"/>
+
+  </target>
 
   <target name="clean" description="cleanup module">
     <delete dir="${sugar.output.dir}"/>
   </target>
-
+      <patternset refid="excluded.from.compilation.sugar"/>
   <target name="all" depends="clean, compile" description="build all modules"/>
+  <target name="travis-all" depends="clean, compile-travis" description="build all modules for travis"/>
   
-</project>
\ No newline at end of file
+</project>
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/com/orm/SugarRecord.java
index 8448cad9..d3a5e8fc 100644
--- a/library/src/com/orm/SugarRecord.java
+++ b/library/src/com/orm/SugarRecord.java
@@ -217,7 +217,7 @@ private static void inflate(Cursor cursor, Object object) {
     public void delete() {
         SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
         db.delete(NamingHelper.toSQLName(getClass()), "Id=?", new String[]{getId().toString()});
-        Log.i("Sugar", getClass().getSimpleName() + " deleted : " + getId().toString()});
+        Log.i("Sugar", getClass().getSimpleName() + " deleted : " + getId().toString());
     }
 
     public long save() {

From eb7fe26b4a22976667168898879cfe3d3aaa3f3f Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sat, 23 Aug 2014 00:12:57 -0700
Subject: [PATCH 042/305] Add travis build status to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2cea7303..5495ab9a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Sugar ORM
+# Sugar ORM ![travis status](https://travis-ci.org/satyan/sugar.svg?branch=master)
 
 Insanely easy way to work with Android databases.
 

From 17694f505350ad062279dbce0f14eb3f4521c10b Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sat, 23 Aug 2014 00:14:35 -0700
Subject: [PATCH 043/305] Better travis status link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5495ab9a..4480e154 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Sugar ORM ![travis status](https://travis-ci.org/satyan/sugar.svg?branch=master)
+# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar)
 
 Insanely easy way to work with Android databases.
 

From 88b372ae6ba6acda685d0293e9d1ed5a48b796df Mon Sep 17 00:00:00 2001
From: Peter McAtominey <mcatominey08@gmail.com>
Date: Fri, 26 Sep 2014 19:48:54 +0100
Subject: [PATCH 044/305] Updated build.gradle meet minimum build requirements

---
 library/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index 43157b3c..5aa31cce 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -4,19 +4,19 @@ buildscript {
         }
 
         dependencies {
-            classpath 'com.android.tools.build:gradle:0.9.+'
+            classpath 'com.android.tools.build:gradle:0.12.2'
         }
     }
 
-    apply plugin: 'android-library'
+    apply plugin: 'com.android.library'
 
     dependencies {
-        compile 'com.android.support:support-v4:19.0.1'
+        compile 'com.android.support:support-v4:20.0.0'
     }
 
     android {
         compileSdkVersion 19
-        buildToolsVersion "19.0.3"
+        buildToolsVersion "19.1.0"
         sourceSets {
             main {
                 manifest.srcFile 'AndroidManifest.xml'

From ba2b6b40fdc1aadbeea7b7d3fc94a172ffb9b4c2 Mon Sep 17 00:00:00 2001
From: MSchwarzer-Haverbier <Michael.Schwarzer-Haverbier@ma-design.de>
Date: Wed, 15 Oct 2014 15:03:50 +0200
Subject: [PATCH 045/305] Update NamingHelper.java

Removed redundant call to UpperCase, as the given character already is in UpperCase (see line 38).
---
 library/src/com/orm/util/NamingHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/com/orm/util/NamingHelper.java b/library/src/com/orm/util/NamingHelper.java
index dd86f8d1..734b4a56 100644
--- a/library/src/com/orm/util/NamingHelper.java
+++ b/library/src/com/orm/util/NamingHelper.java
@@ -38,9 +38,9 @@ public static String toSQLNameDefault(String camelCased) {
             } else if (Character.isUpperCase(c)) {
                 if (Character.isLetterOrDigit(prevChar)) {
                     if (Character.isLowerCase(prevChar)) {
-                        sb.append('_').append(Character.toUpperCase(c));
+                        sb.append('_').append(c);
                     } else if (nextChar > 0 && Character.isLowerCase(nextChar)) {
-                        sb.append('_').append(Character.toUpperCase(c));
+                        sb.append('_').append(c);
                     } else {
                         sb.append(c);
                     }

From 8324aa324e88fca3e00190bd868c1a59518458b7 Mon Sep 17 00:00:00 2001
From: Neil Wells <neilw4@googlemail.com>
Date: Thu, 8 Jan 2015 13:00:44 +0000
Subject: [PATCH 046/305] Queries can now take SugarRecord objects as foreign
 keys

---
 library/src/com/orm/query/Condition.java | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/library/src/com/orm/query/Condition.java b/library/src/com/orm/query/Condition.java
index 989bd458..9e9a08d1 100644
--- a/library/src/com/orm/query/Condition.java
+++ b/library/src/com/orm/query/Condition.java
@@ -1,5 +1,7 @@
 package com.orm.query;
 
+import com.orm.SugarRecord;
+
 public class Condition {
 
     private String property;
@@ -40,37 +42,37 @@ public static Condition prop(String property) {
     }
 
     public Condition eq(Object value) {
-        this.value = value;
+        setValue(value);
         check = Check.EQUALS;
         return this;
     }
 
     public Condition like(Object value) {
-        this.value = value;
+        setValue(value);
         check = Check.LIKE;
         return this;
     }
 
     public Condition notLike(Object value) {
-        this.value = value;
+        setValue(value);
         check = Check.NOT_LIKE;
         return this;
     }
 
     public Condition notEq(Object value) {
-        this.value = value;
+        setValue(value);
         check = Check.NOT_EQUALS;
         return this;
     }
 
     public Condition gt(Object value) {
-        this.value = value;
+        setValue(value);
         check = Check.GREATER_THAN;
         return this;
     }
 
     public Condition lt(Object value) {
-        this.value = value;
+        setValue(value);
         check = Check.LESSER_THAN;
         return this;
     }
@@ -91,4 +93,12 @@ public String getCheckSymbol() {
         return check.getSymbol();
     }
 
+    private void setValue(Object value) {
+        if (value instanceof SugarRecord) {
+            this.value = ((SugarRecord)value).getId();
+        } else {
+            this.value = value;
+        }
+    }
+
 }

From cedafd7366aa69392a2680d5598c486f83c2dcfe Mon Sep 17 00:00:00 2001
From: sashas <solganik@gmail.com>
Date: Sat, 10 Jan 2015 20:25:10 +0200
Subject: [PATCH 047/305] robolectric-sugarorm test failure on "table already
 exists"

IF you run tobolectric test from command line via gradle tests fails with "already exists" error, this error is casued by the fact that when
robolectric tests are run there are 2 java pathes on context
app/build/intermediates/classes/debug/  and
app/build/test-classes/debug/

This bug caused all clases that are found  under first director yto appear twice, which caused sugarorm to try and create the same tables twice which lead to failure.
---
 library/src/com/orm/util/ReflectionUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/com/orm/util/ReflectionUtil.java b/library/src/com/orm/util/ReflectionUtil.java
index 3dc2b59d..8fc3a242 100644
--- a/library/src/com/orm/util/ReflectionUtil.java
+++ b/library/src/com/orm/util/ReflectionUtil.java
@@ -244,8 +244,8 @@ private static List<String> getAllClasses(Context context) throws PackageManager
         } catch (NullPointerException e) {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             Enumeration<URL> urls = classLoader.getResources("");
-            List<String> fileNames = new ArrayList<String>();
             while (urls.hasMoreElements()) {
+                List<String> fileNames = new ArrayList<String>();
                 String classDirectoryName = urls.nextElement().getFile();
                 if (classDirectoryName.contains("bin") || classDirectoryName.contains("classes")) {
                     File classDirectory = new File(classDirectoryName);

From 9753600377babff606c0b36ee343eaacce663c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hoffmann=20Andr=C3=A1s?= <hoffmann.andras@1nd.hu>
Date: Thu, 15 Jan 2015 14:46:45 +0100
Subject: [PATCH 048/305] doInTransaction typo

---
 library/src/com/orm/SugarTransactionHelper.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/src/com/orm/SugarTransactionHelper.java b/library/src/com/orm/SugarTransactionHelper.java
index 0f2683f2..73440635 100644
--- a/library/src/com/orm/SugarTransactionHelper.java
+++ b/library/src/com/orm/SugarTransactionHelper.java
@@ -5,7 +5,7 @@
 
 public class SugarTransactionHelper {
 
-    public static void doInTansaction(SugarTransactionHelper.Callback callback) {
+    public static void doInTransaction(SugarTransactionHelper.Callback callback) {
         SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
         database.beginTransaction();
 
@@ -22,11 +22,9 @@ public static void doInTansaction(SugarTransactionHelper.Callback callback) {
         } finally {
             database.endTransaction();
         }
-
     }
 
     public static interface Callback {
         void manipulateInTransaction();
     }
-
 }

From ed634b9a948ac94a8624276cbef913150b825a40 Mon Sep 17 00:00:00 2001
From: Ishan Khanna <boilingstocks@gmail.com>
Date: Tue, 5 Aug 2014 20:32:03 +0530
Subject: [PATCH 049/305] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4480e154..55d1a606 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Declare the dependency in Maven:
 
 Download the source code and import it as a library project in Eclipse. The project is available in the folder **library**. For more information on how to do this, read [here](http://developer.android.com/tools/projects/index.html#LibraryProjects).
 
-#### Use a jar
+#### As a jar
 
 Visit the [releases](https://github.com/satyan/sugar/releases) page to download jars directly. You can drop them into your `libs` folder and configure the Java build path to include the library. See this [tutorial](http://www.vogella.com/tutorials/AndroidLibraryProjects/article.html) for an excellent guide on how to do this.
 

From 623b31d6e1f1bb34eee7033cb3d468ddde75c9e0 Mon Sep 17 00:00:00 2001
From: Ishan Khanna <ishan1604@gmail.com>
Date: Fri, 5 Sep 2014 13:08:00 -0800
Subject: [PATCH 050/305] Migrated to Gradle Build closes #160

---
 .gitignore          |  3 +++
 example/example.iml | 18 ++++++++++++++++++
 sugar.iml           | 12 ++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 example/example.iml
 create mode 100644 sugar.iml

diff --git a/.gitignore b/.gitignore
index 76806924..7278b5fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ library/library.iml
 library/.gradle
 *.class
 .DS_Store
+*.idea
+example/gen
+*/local.properties
diff --git a/example/example.iml b/example/example.iml
new file mode 100644
index 00000000..024684bf
--- /dev/null
+++ b/example/example.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="library" />
+  </component>
+</module>
diff --git a/sugar.iml b/sugar.iml
new file mode 100644
index 00000000..e7239020
--- /dev/null
+++ b/sugar.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

From eadd351dc7ce471d248701739a277692b8f23995 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 27 Jan 2015 22:19:38 -0800
Subject: [PATCH 051/305] Update tools and libraries to support official
 Android Studio 1.0 release

---
 library/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index 5aa31cce..8d8edc7e 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -4,19 +4,19 @@ buildscript {
         }
 
         dependencies {
-            classpath 'com.android.tools.build:gradle:0.12.2'
+            classpath 'com.android.tools.build:gradle:1.0.0'
         }
     }
 
     apply plugin: 'com.android.library'
 
     dependencies {
-        compile 'com.android.support:support-v4:20.0.0'
+        compile 'com.android.support:support-v4:21.0.3'
     }
 
     android {
-        compileSdkVersion 19
-        buildToolsVersion "19.1.0"
+        compileSdkVersion 21
+        buildToolsVersion "21.1.2"
         sourceSets {
             main {
                 manifest.srcFile 'AndroidManifest.xml'

From 2bcfacae0b7556a26a704371db71b8f661f85398 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:28:57 -0700
Subject: [PATCH 052/305] Use more standard project directory for the library

---
 library/{ => src/main}/AndroidManifest.xml                     | 3 +--
 library/src/{ => main/java}/com/orm/SchemaGenerator.java       | 0
 library/src/{ => main/java}/com/orm/SugarApp.java              | 0
 library/src/{ => main/java}/com/orm/SugarContext.java          | 0
 library/src/{ => main/java}/com/orm/SugarDb.java               | 0
 library/src/{ => main/java}/com/orm/SugarRecord.java           | 0
 .../src/{ => main/java}/com/orm/SugarTransactionHelper.java    | 0
 library/src/{ => main/java}/com/orm/dsl/Column.java            | 0
 library/src/{ => main/java}/com/orm/dsl/Ignore.java            | 0
 library/src/{ => main/java}/com/orm/dsl/NotNull.java           | 0
 library/src/{ => main/java}/com/orm/dsl/Table.java             | 0
 library/src/{ => main/java}/com/orm/dsl/Unique.java            | 0
 library/src/{ => main/java}/com/orm/query/Condition.java       | 0
 library/src/{ => main/java}/com/orm/query/Select.java          | 0
 library/src/{ => main/java}/com/orm/util/Collection.java       | 0
 library/src/{ => main/java}/com/orm/util/ManifestHelper.java   | 0
 library/src/{ => main/java}/com/orm/util/NamingHelper.java     | 0
 library/src/{ => main/java}/com/orm/util/NumberComparator.java | 0
 library/src/{ => main/java}/com/orm/util/QueryBuilder.java     | 0
 library/src/{ => main/java}/com/orm/util/ReflectionUtil.java   | 0
 library/src/{ => main/java}/com/orm/util/SugarConfig.java      | 0
 .../src/{ => main/java}/com/orm/util/SugarCursorFactory.java   | 0
 22 files changed, 1 insertion(+), 2 deletions(-)
 rename library/{ => src/main}/AndroidManifest.xml (69%)
 rename library/src/{ => main/java}/com/orm/SchemaGenerator.java (100%)
 rename library/src/{ => main/java}/com/orm/SugarApp.java (100%)
 rename library/src/{ => main/java}/com/orm/SugarContext.java (100%)
 rename library/src/{ => main/java}/com/orm/SugarDb.java (100%)
 rename library/src/{ => main/java}/com/orm/SugarRecord.java (100%)
 rename library/src/{ => main/java}/com/orm/SugarTransactionHelper.java (100%)
 rename library/src/{ => main/java}/com/orm/dsl/Column.java (100%)
 rename library/src/{ => main/java}/com/orm/dsl/Ignore.java (100%)
 rename library/src/{ => main/java}/com/orm/dsl/NotNull.java (100%)
 rename library/src/{ => main/java}/com/orm/dsl/Table.java (100%)
 rename library/src/{ => main/java}/com/orm/dsl/Unique.java (100%)
 rename library/src/{ => main/java}/com/orm/query/Condition.java (100%)
 rename library/src/{ => main/java}/com/orm/query/Select.java (100%)
 rename library/src/{ => main/java}/com/orm/util/Collection.java (100%)
 rename library/src/{ => main/java}/com/orm/util/ManifestHelper.java (100%)
 rename library/src/{ => main/java}/com/orm/util/NamingHelper.java (100%)
 rename library/src/{ => main/java}/com/orm/util/NumberComparator.java (100%)
 rename library/src/{ => main/java}/com/orm/util/QueryBuilder.java (100%)
 rename library/src/{ => main/java}/com/orm/util/ReflectionUtil.java (100%)
 rename library/src/{ => main/java}/com/orm/util/SugarConfig.java (100%)
 rename library/src/{ => main/java}/com/orm/util/SugarCursorFactory.java (100%)

diff --git a/library/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
similarity index 69%
rename from library/AndroidManifest.xml
rename to library/src/main/AndroidManifest.xml
index a48c294b..849de626 100644
--- a/library/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.orm.dsl"
           android:versionCode="1"
-          android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="8" />
+          android:versionName="1.3.1">
 
 </manifest>
\ No newline at end of file
diff --git a/library/src/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
similarity index 100%
rename from library/src/com/orm/SchemaGenerator.java
rename to library/src/main/java/com/orm/SchemaGenerator.java
diff --git a/library/src/com/orm/SugarApp.java b/library/src/main/java/com/orm/SugarApp.java
similarity index 100%
rename from library/src/com/orm/SugarApp.java
rename to library/src/main/java/com/orm/SugarApp.java
diff --git a/library/src/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
similarity index 100%
rename from library/src/com/orm/SugarContext.java
rename to library/src/main/java/com/orm/SugarContext.java
diff --git a/library/src/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
similarity index 100%
rename from library/src/com/orm/SugarDb.java
rename to library/src/main/java/com/orm/SugarDb.java
diff --git a/library/src/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
similarity index 100%
rename from library/src/com/orm/SugarRecord.java
rename to library/src/main/java/com/orm/SugarRecord.java
diff --git a/library/src/com/orm/SugarTransactionHelper.java b/library/src/main/java/com/orm/SugarTransactionHelper.java
similarity index 100%
rename from library/src/com/orm/SugarTransactionHelper.java
rename to library/src/main/java/com/orm/SugarTransactionHelper.java
diff --git a/library/src/com/orm/dsl/Column.java b/library/src/main/java/com/orm/dsl/Column.java
similarity index 100%
rename from library/src/com/orm/dsl/Column.java
rename to library/src/main/java/com/orm/dsl/Column.java
diff --git a/library/src/com/orm/dsl/Ignore.java b/library/src/main/java/com/orm/dsl/Ignore.java
similarity index 100%
rename from library/src/com/orm/dsl/Ignore.java
rename to library/src/main/java/com/orm/dsl/Ignore.java
diff --git a/library/src/com/orm/dsl/NotNull.java b/library/src/main/java/com/orm/dsl/NotNull.java
similarity index 100%
rename from library/src/com/orm/dsl/NotNull.java
rename to library/src/main/java/com/orm/dsl/NotNull.java
diff --git a/library/src/com/orm/dsl/Table.java b/library/src/main/java/com/orm/dsl/Table.java
similarity index 100%
rename from library/src/com/orm/dsl/Table.java
rename to library/src/main/java/com/orm/dsl/Table.java
diff --git a/library/src/com/orm/dsl/Unique.java b/library/src/main/java/com/orm/dsl/Unique.java
similarity index 100%
rename from library/src/com/orm/dsl/Unique.java
rename to library/src/main/java/com/orm/dsl/Unique.java
diff --git a/library/src/com/orm/query/Condition.java b/library/src/main/java/com/orm/query/Condition.java
similarity index 100%
rename from library/src/com/orm/query/Condition.java
rename to library/src/main/java/com/orm/query/Condition.java
diff --git a/library/src/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
similarity index 100%
rename from library/src/com/orm/query/Select.java
rename to library/src/main/java/com/orm/query/Select.java
diff --git a/library/src/com/orm/util/Collection.java b/library/src/main/java/com/orm/util/Collection.java
similarity index 100%
rename from library/src/com/orm/util/Collection.java
rename to library/src/main/java/com/orm/util/Collection.java
diff --git a/library/src/com/orm/util/ManifestHelper.java b/library/src/main/java/com/orm/util/ManifestHelper.java
similarity index 100%
rename from library/src/com/orm/util/ManifestHelper.java
rename to library/src/main/java/com/orm/util/ManifestHelper.java
diff --git a/library/src/com/orm/util/NamingHelper.java b/library/src/main/java/com/orm/util/NamingHelper.java
similarity index 100%
rename from library/src/com/orm/util/NamingHelper.java
rename to library/src/main/java/com/orm/util/NamingHelper.java
diff --git a/library/src/com/orm/util/NumberComparator.java b/library/src/main/java/com/orm/util/NumberComparator.java
similarity index 100%
rename from library/src/com/orm/util/NumberComparator.java
rename to library/src/main/java/com/orm/util/NumberComparator.java
diff --git a/library/src/com/orm/util/QueryBuilder.java b/library/src/main/java/com/orm/util/QueryBuilder.java
similarity index 100%
rename from library/src/com/orm/util/QueryBuilder.java
rename to library/src/main/java/com/orm/util/QueryBuilder.java
diff --git a/library/src/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
similarity index 100%
rename from library/src/com/orm/util/ReflectionUtil.java
rename to library/src/main/java/com/orm/util/ReflectionUtil.java
diff --git a/library/src/com/orm/util/SugarConfig.java b/library/src/main/java/com/orm/util/SugarConfig.java
similarity index 100%
rename from library/src/com/orm/util/SugarConfig.java
rename to library/src/main/java/com/orm/util/SugarConfig.java
diff --git a/library/src/com/orm/util/SugarCursorFactory.java b/library/src/main/java/com/orm/util/SugarCursorFactory.java
similarity index 100%
rename from library/src/com/orm/util/SugarCursorFactory.java
rename to library/src/main/java/com/orm/util/SugarCursorFactory.java

From 0c0500a65775d5a8763903d11e0f2a648d742ee7 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:29:22 -0700
Subject: [PATCH 053/305] Remove unnecessary files

---
 library/project.properties     | 3 ---
 library/res/values/strings.xml | 4 ----
 2 files changed, 7 deletions(-)
 delete mode 100644 library/project.properties
 delete mode 100644 library/res/values/strings.xml

diff --git a/library/project.properties b/library/project.properties
deleted file mode 100644
index 05d02d38..00000000
--- a/library/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library=true
-# Project target.
-target=android-15
diff --git a/library/res/values/strings.xml b/library/res/values/strings.xml
deleted file mode 100644
index 0d2c4cc4..00000000
--- a/library/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-</resources>
\ No newline at end of file

From c726b345d31fd10a1f4899be9a49c525e29afdc5 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:30:24 -0700
Subject: [PATCH 054/305] Upgrade .gitignore

---
 .gitignore | 52 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7278b5fa..9ea91260 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,44 @@
-library/bin
-library/build
-library/gen
-library/.project
-library/.classpath
-library/library.iml
-library/.gradle
+.DS_Store
+
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
 *.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+
+*.a
+*.dylib
+*.log
+*.o
+*.pot
+*.pyc
+*.pydevproject
+*.so
+*.suo
+*.xcworkspace
+*_ReSharper*
+
 .DS_Store
-*.idea
-example/gen
-*/local.properties
+._.DS_Store
+
+project.properties
+
+.settings
+build/
+.gradle/
+.idea

From 68164a89de299e419ddcc0731e17860cabea1489 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:31:34 -0700
Subject: [PATCH 055/305] Update gradle build process

---
 build.gradle                             |  16 +++
 gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 49896 bytes
 gradle/wrapper/gradle-wrapper.properties |   6 +
 gradlew                                  | 164 +++++++++++++++++++++++
 gradlew.bat                              |  90 +++++++++++++
 library/build.gradle                     |  61 ++++++---
 library/library.iml                      |  97 ++++++++++++++
 settings.gradle                          |   1 +
 sugar.iml                                |  11 +-
 9 files changed, 423 insertions(+), 23 deletions(-)
 create mode 100644 build.gradle
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100644 gradlew
 create mode 100644 gradlew.bat
 create mode 100644 library/library.iml
 create mode 100644 settings.gradle

diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..358b5504
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,16 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        jcenter()
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8c0fb64a8698b08ecc4158d828ca593c4928e9dd
GIT binary patch
literal 49896
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
N6sQqkUiJO2{|C|0X_No}

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..0c71e760
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 00000000..91a7e269
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..aec99730
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/library/build.gradle b/library/build.gradle
index 8d8edc7e..555061e8 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,29 +1,48 @@
-buildscript {
-        repositories {
-            mavenCentral()
-        }
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+
+group 'com.github.satyan'
+version '1.3.1'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 21
+    }
 
-        dependencies {
-            classpath 'com.android.tools.build:gradle:1.0.0'
+    buildTypes {
+        release {
+            minifyEnabled false
         }
     }
+}
 
-    apply plugin: 'com.android.library'
+dependencies {
+    compile 'com.android.support:support-v4:21.0.3'
+}
 
-    dependencies {
-        compile 'com.android.support:support-v4:21.0.3'
-    }
+task libraryJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    baseName 'sugar'
+}
 
-    android {
-        compileSdkVersion 21
-        buildToolsVersion "21.1.2"
-        sourceSets {
-            main {
-                manifest.srcFile 'AndroidManifest.xml'
-                java.srcDirs = ['src']
-                resources.srcDirs = ['src']
-                res.srcDirs = ['res']
-                assets.srcDirs = ['assets']
-            }
+publishing {
+    publications {
+        artifactJar(MavenPublication) {
+            artifact libraryJar
+            artifactId 'sugar'
+            groupId project.group
         }
+        artifactAar(MavenPublication) {
+            artifact bundleRelease
+            artifactId 'sugar'
+            groupId project.group
+        }
+    }
+    repositories {
+        mavenCentral()
     }
+}
diff --git a/library/library.iml b/library/library.iml
new file mode 100644
index 00000000..4c42fe43
--- /dev/null
+++ b/library/library.iml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.satyan" external.system.module.version="1.3.1" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":library" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="LIBRARY_PROJECT" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/publications" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+  </component>
+</module>
+
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..d8f14a13
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':library'
diff --git a/sugar.iml b/sugar.iml
index e7239020..00bc43cf 100644
--- a/sugar.iml
+++ b/sugar.iml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
+

From e5669d2568439ba2eace1a19a76aaec8b6b580c3 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:47:24 -0700
Subject: [PATCH 056/305] Use maven local first

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 358b5504..fc79749e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenCentral()
         mavenLocal()
+        mavenCentral()
         jcenter()
     }
 }

From 18b69a1cb43dc1a026569b9be92cce3f6ab112ba Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:48:04 -0700
Subject: [PATCH 057/305] Move example files into more standard structure

---
 example/{ => src/main}/AndroidManifest.xml          |   0
 example/{ => src/main}/assets/sugar_upgrades/3.sql  |   0
 .../java}/com/example/AddNoteActivity.java          |   0
 .../src/{ => main/java}/com/example/ClientApp.java  |   0
 .../src/{ => main/java}/com/example/NewNote.java    |   0
 example/src/{ => main/java}/com/example/Note.java   |   0
 .../java}/com/example/NoteListActivity.java         |   0
 .../{ => main/java}/com/example/NoteRelation.java   |   0
 .../{ => main/java}/com/example/SugarActivity.java  |   0
 example/src/{ => main/java}/com/example/Tag.java    |   0
 .../src/{ => main/java}/com/example/TextNote.java   |   0
 example/{ => src/main}/res/drawable-hdpi/icon.png   | Bin
 example/{ => src/main}/res/drawable-ldpi/icon.png   | Bin
 example/{ => src/main}/res/drawable-mdpi/icon.png   | Bin
 example/{ => src/main}/res/layout/main.xml          |   0
 example/{ => src/main}/res/layout/notelist.xml      |   0
 example/{ => src/main}/res/values/strings.xml       |   0
 17 files changed, 0 insertions(+), 0 deletions(-)
 rename example/{ => src/main}/AndroidManifest.xml (100%)
 rename example/{ => src/main}/assets/sugar_upgrades/3.sql (100%)
 rename example/src/{ => main/java}/com/example/AddNoteActivity.java (100%)
 rename example/src/{ => main/java}/com/example/ClientApp.java (100%)
 rename example/src/{ => main/java}/com/example/NewNote.java (100%)
 rename example/src/{ => main/java}/com/example/Note.java (100%)
 rename example/src/{ => main/java}/com/example/NoteListActivity.java (100%)
 rename example/src/{ => main/java}/com/example/NoteRelation.java (100%)
 rename example/src/{ => main/java}/com/example/SugarActivity.java (100%)
 rename example/src/{ => main/java}/com/example/Tag.java (100%)
 rename example/src/{ => main/java}/com/example/TextNote.java (100%)
 rename example/{ => src/main}/res/drawable-hdpi/icon.png (100%)
 rename example/{ => src/main}/res/drawable-ldpi/icon.png (100%)
 rename example/{ => src/main}/res/drawable-mdpi/icon.png (100%)
 rename example/{ => src/main}/res/layout/main.xml (100%)
 rename example/{ => src/main}/res/layout/notelist.xml (100%)
 rename example/{ => src/main}/res/values/strings.xml (100%)

diff --git a/example/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
similarity index 100%
rename from example/AndroidManifest.xml
rename to example/src/main/AndroidManifest.xml
diff --git a/example/assets/sugar_upgrades/3.sql b/example/src/main/assets/sugar_upgrades/3.sql
similarity index 100%
rename from example/assets/sugar_upgrades/3.sql
rename to example/src/main/assets/sugar_upgrades/3.sql
diff --git a/example/src/com/example/AddNoteActivity.java b/example/src/main/java/com/example/AddNoteActivity.java
similarity index 100%
rename from example/src/com/example/AddNoteActivity.java
rename to example/src/main/java/com/example/AddNoteActivity.java
diff --git a/example/src/com/example/ClientApp.java b/example/src/main/java/com/example/ClientApp.java
similarity index 100%
rename from example/src/com/example/ClientApp.java
rename to example/src/main/java/com/example/ClientApp.java
diff --git a/example/src/com/example/NewNote.java b/example/src/main/java/com/example/NewNote.java
similarity index 100%
rename from example/src/com/example/NewNote.java
rename to example/src/main/java/com/example/NewNote.java
diff --git a/example/src/com/example/Note.java b/example/src/main/java/com/example/Note.java
similarity index 100%
rename from example/src/com/example/Note.java
rename to example/src/main/java/com/example/Note.java
diff --git a/example/src/com/example/NoteListActivity.java b/example/src/main/java/com/example/NoteListActivity.java
similarity index 100%
rename from example/src/com/example/NoteListActivity.java
rename to example/src/main/java/com/example/NoteListActivity.java
diff --git a/example/src/com/example/NoteRelation.java b/example/src/main/java/com/example/NoteRelation.java
similarity index 100%
rename from example/src/com/example/NoteRelation.java
rename to example/src/main/java/com/example/NoteRelation.java
diff --git a/example/src/com/example/SugarActivity.java b/example/src/main/java/com/example/SugarActivity.java
similarity index 100%
rename from example/src/com/example/SugarActivity.java
rename to example/src/main/java/com/example/SugarActivity.java
diff --git a/example/src/com/example/Tag.java b/example/src/main/java/com/example/Tag.java
similarity index 100%
rename from example/src/com/example/Tag.java
rename to example/src/main/java/com/example/Tag.java
diff --git a/example/src/com/example/TextNote.java b/example/src/main/java/com/example/TextNote.java
similarity index 100%
rename from example/src/com/example/TextNote.java
rename to example/src/main/java/com/example/TextNote.java
diff --git a/example/res/drawable-hdpi/icon.png b/example/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from example/res/drawable-hdpi/icon.png
rename to example/src/main/res/drawable-hdpi/icon.png
diff --git a/example/res/drawable-ldpi/icon.png b/example/src/main/res/drawable-ldpi/icon.png
similarity index 100%
rename from example/res/drawable-ldpi/icon.png
rename to example/src/main/res/drawable-ldpi/icon.png
diff --git a/example/res/drawable-mdpi/icon.png b/example/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from example/res/drawable-mdpi/icon.png
rename to example/src/main/res/drawable-mdpi/icon.png
diff --git a/example/res/layout/main.xml b/example/src/main/res/layout/main.xml
similarity index 100%
rename from example/res/layout/main.xml
rename to example/src/main/res/layout/main.xml
diff --git a/example/res/layout/notelist.xml b/example/src/main/res/layout/notelist.xml
similarity index 100%
rename from example/res/layout/notelist.xml
rename to example/src/main/res/layout/notelist.xml
diff --git a/example/res/values/strings.xml b/example/src/main/res/values/strings.xml
similarity index 100%
rename from example/res/values/strings.xml
rename to example/src/main/res/values/strings.xml

From 71a3e901ca69da8e0c7d79e3de308deb9b02317a Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:48:21 -0700
Subject: [PATCH 058/305] Remove unused files

---
 example/example/project.properties | 15 -------------
 example/local.properties           | 10 ---------
 example/proguard.cfg               | 36 ------------------------------
 3 files changed, 61 deletions(-)
 delete mode 100644 example/example/project.properties
 delete mode 100755 example/local.properties
 delete mode 100755 example/proguard.cfg

diff --git a/example/example/project.properties b/example/example/project.properties
deleted file mode 100644
index debfe960..00000000
--- a/example/example/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-3
-android.library.reference.1=../library
diff --git a/example/local.properties b/example/local.properties
deleted file mode 100755
index 2543c8bd..00000000
--- a/example/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/satya/software/android-sdk-linux_x86
diff --git a/example/proguard.cfg b/example/proguard.cfg
deleted file mode 100755
index 12dd0392..00000000
--- a/example/proguard.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
--keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}

From 0c7a7e07453daa49dfc222d4d0862eaf4aadb94c Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:48:43 -0700
Subject: [PATCH 059/305] Update minimum sdk for library

---
 library/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/build.gradle b/library/build.gradle
index 555061e8..5e2e71ef 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -9,7 +9,7 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 9
         targetSdkVersion 21
     }
 

From bb44e5bb209d50cf77a92b6dce7f718bc3f362eb Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Thu, 26 Mar 2015 23:49:03 -0700
Subject: [PATCH 060/305] Enable gradle for the example project

---
 example/build.gradle | 23 ++++++++++++
 example/example.iml  | 89 ++++++++++++++++++++++++++++++++++++++++----
 settings.gradle      |  1 +
 3 files changed, 106 insertions(+), 7 deletions(-)
 create mode 100644 example/build.gradle

diff --git a/example/build.gradle b/example/build.gradle
new file mode 100644
index 00000000..7576eb25
--- /dev/null
+++ b/example/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        applicationId "com.example"
+        minSdkVersion 9
+        targetSdkVersion 21
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.github.satyan:sugar:1.3.1'
+}
\ No newline at end of file
diff --git a/example/example.iml b/example/example.iml
index 024684bf..e1507057 100644
--- a/example/example.iml
+++ b/example/example.iml
@@ -1,18 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="sugar" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":example" />
+      </configuration>
+    </facet>
     <facet type="android" name="Android">
-      <configuration />
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="library" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="sugar-1.3.1" level="project" />
   </component>
 </module>
+
diff --git a/settings.gradle b/settings.gradle
index d8f14a13..507c9f4a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':library'
+include ':example'

From 1d183d098f9f563b6dd45532baaf58f64d56297d Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 19:52:57 -0700
Subject: [PATCH 061/305] Add robolectric gradle dependency to support more
 unit testing in the example project

---
 build.gradle         |  1 +
 example/build.gradle | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index fc79749e..35875814 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'org.robolectric:robolectric-gradle-plugin:1.0.1'
     }
 }
 
diff --git a/example/build.gradle b/example/build.gradle
index 7576eb25..d93d68bd 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'org.robolectric'
 
 android {
     compileSdkVersion 21
@@ -20,4 +21,33 @@ android {
 dependencies {
     compile 'com.android.support:support-v4:21.0.3'
     compile 'com.github.satyan:sugar:1.3.1'
-}
\ No newline at end of file
+    testCompile 'org.robolectric:robolectric:2.4'
+    testCompile 'junit:junit:4.12'
+}
+
+robolectric {
+    // Configure includes / excludes
+    include '**/*Test.class'
+    exclude '**/espresso/**/*.class'
+
+    // Configure max heap size of the test JVM
+    maxHeapSize = '2048m'
+
+    // Configure the test JVM arguments - Does not apply to Java 8
+    jvmArgs '-XX:MaxPermSize=512m', '-XX:-UseSplitVerifier'
+
+    // Specify max number of processes (default is 1)
+    maxParallelForks = 4
+
+    // Specify max number of test classes to execute in a test process
+    // before restarting the process (default is unlimited)
+    forkEvery = 150
+
+    // configure whether failing tests should fail the build
+    ignoreFailures true
+
+    // use afterTest to listen to the test execution results
+    afterTest { descriptor, result ->
+        println "Executing test for ${descriptor.name} with result: ${result.resultType}"
+    }
+}

From b28e2c35b6a08874e55a4f29635123cedee04f58 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 19:53:04 -0700
Subject: [PATCH 062/305] Restructure the example project

---
 example/example.iml                           | 54 ++++++++++++-------
 example/src/main/AndroidManifest.xml          |  7 ++-
 .../{ => activities}/AddNoteActivity.java     |  8 ++-
 .../{ => activities}/NoteListActivity.java    |  8 ++-
 .../{ => activities}/SugarActivity.java       |  8 ++-
 .../com/example/{ => models}/NewNote.java     |  2 +-
 .../java/com/example/{ => models}/Note.java   |  2 +-
 .../example/{ => models}/NoteRelation.java    |  2 +-
 .../java/com/example/{ => models}/Tag.java    |  2 +-
 .../com/example/{ => models}/TextNote.java    |  2 +-
 10 files changed, 63 insertions(+), 32 deletions(-)
 rename example/src/main/java/com/example/{ => activities}/AddNoteActivity.java (93%)
 mode change 100755 => 100644
 rename example/src/main/java/com/example/{ => activities}/NoteListActivity.java (91%)
 mode change 100755 => 100644
 rename example/src/main/java/com/example/{ => activities}/SugarActivity.java (89%)
 mode change 100755 => 100644
 rename example/src/main/java/com/example/{ => models}/NewNote.java (81%)
 rename example/src/main/java/com/example/{ => models}/Note.java (98%)
 mode change 100755 => 100644
 rename example/src/main/java/com/example/{ => models}/NoteRelation.java (95%)
 rename example/src/main/java/com/example/{ => models}/Tag.java (91%)
 mode change 100755 => 100644
 rename example/src/main/java/com/example/{ => models}/TextNote.java (84%)

diff --git a/example/example.iml b/example/example.iml
index e1507057..227821f1 100644
--- a/example/example.iml
+++ b/example/example.iml
@@ -9,12 +9,11 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -25,7 +24,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -34,12 +33,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -47,6 +40,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -54,13 +54,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,13 +80,32 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
     <orderEntry type="library" exported="" name="sugar-1.3.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockable-android-21" level="project" />
   </component>
 </module>
 
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
index e03f036a..ca949ff1 100755
--- a/example/src/main/AndroidManifest.xml
+++ b/example/src/main/AndroidManifest.xml
@@ -4,15 +4,14 @@
       android:versionCode="1"
       android:versionName="1.0">
     <application android:label="@string/app_name" android:icon="@drawable/icon" android:name="ClientApp">
-        <activity android:name="SugarActivity"
-                  android:label="@string/app_name">
+        <activity android:name=".activities.SugarActivity" android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".NoteListActivity"/>
-        <activity android:name=".AddNoteActivity"/>
+        <activity android:name=".activities.NoteListActivity"/>
+        <activity android:name=".activities.AddNoteActivity"/>
 
         <meta-data android:name="DATABASE" android:value="sugar_example.db" />
         <meta-data android:name="VERSION" android:value="3" />
diff --git a/example/src/main/java/com/example/AddNoteActivity.java b/example/src/main/java/com/example/activities/AddNoteActivity.java
old mode 100755
new mode 100644
similarity index 93%
rename from example/src/main/java/com/example/AddNoteActivity.java
rename to example/src/main/java/com/example/activities/AddNoteActivity.java
index aba5e236..cbb54a20
--- a/example/src/main/java/com/example/AddNoteActivity.java
+++ b/example/src/main/java/com/example/activities/AddNoteActivity.java
@@ -1,4 +1,4 @@
-package com.example;
+package com.example.activities;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -9,6 +9,10 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.example.R;
+import com.example.models.Note;
+import com.example.models.Tag;
+
 import static com.orm.SugarRecord.save;
 
 
@@ -49,4 +53,4 @@ public void onClick(View view) {
         });
 
     }
-}
\ No newline at end of file
+}
diff --git a/example/src/main/java/com/example/NoteListActivity.java b/example/src/main/java/com/example/activities/NoteListActivity.java
old mode 100755
new mode 100644
similarity index 91%
rename from example/src/main/java/com/example/NoteListActivity.java
rename to example/src/main/java/com/example/activities/NoteListActivity.java
index 09877f2d..7b91201b
--- a/example/src/main/java/com/example/NoteListActivity.java
+++ b/example/src/main/java/com/example/activities/NoteListActivity.java
@@ -1,4 +1,4 @@
-package com.example;
+package com.example.activities;
 
 import android.app.ListActivity;
 import android.content.Intent;
@@ -6,6 +6,10 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
+
+import com.example.R;
+import com.example.models.NewNote;
+import com.example.models.Note;
 import com.orm.SugarRecord;
 import com.orm.query.Condition;
 import com.orm.query.Select;
@@ -35,4 +39,4 @@ public void onClick(View view) {
         Log.d("COUNT", "Count: " + Select.from(Note.class).where(new Condition[]{new Condition("title").eq("note")}).count() + "/" + notes.size());
     }
 
-}
\ No newline at end of file
+}
diff --git a/example/src/main/java/com/example/SugarActivity.java b/example/src/main/java/com/example/activities/SugarActivity.java
old mode 100755
new mode 100644
similarity index 89%
rename from example/src/main/java/com/example/SugarActivity.java
rename to example/src/main/java/com/example/activities/SugarActivity.java
index b7130f86..68ceca8e
--- a/example/src/main/java/com/example/SugarActivity.java
+++ b/example/src/main/java/com/example/activities/SugarActivity.java
@@ -1,8 +1,14 @@
-package com.example;
+package com.example.activities;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+
+import com.example.R;
+import com.example.models.NewNote;
+import com.example.models.Note;
+import com.example.models.Tag;
+import com.example.models.TextNote;
 import com.orm.SugarRecord;
 
 import static com.orm.SugarRecord.save;
diff --git a/example/src/main/java/com/example/NewNote.java b/example/src/main/java/com/example/models/NewNote.java
similarity index 81%
rename from example/src/main/java/com/example/NewNote.java
rename to example/src/main/java/com/example/models/NewNote.java
index a80e2d4a..45806744 100644
--- a/example/src/main/java/com/example/NewNote.java
+++ b/example/src/main/java/com/example/models/NewNote.java
@@ -1,4 +1,4 @@
-package com.example;
+package com.example.models;
 
 import com.orm.dsl.Table;
 
diff --git a/example/src/main/java/com/example/Note.java b/example/src/main/java/com/example/models/Note.java
old mode 100755
new mode 100644
similarity index 98%
rename from example/src/main/java/com/example/Note.java
rename to example/src/main/java/com/example/models/Note.java
index b83f730f..79151644
--- a/example/src/main/java/com/example/Note.java
+++ b/example/src/main/java/com/example/models/Note.java
@@ -1,4 +1,4 @@
-package com.example;
+package com.example.models;
 
 import com.orm.dsl.Column;
 import com.orm.dsl.Table;
diff --git a/example/src/main/java/com/example/NoteRelation.java b/example/src/main/java/com/example/models/NoteRelation.java
similarity index 95%
rename from example/src/main/java/com/example/NoteRelation.java
rename to example/src/main/java/com/example/models/NoteRelation.java
index a64d055a..282f0a43 100644
--- a/example/src/main/java/com/example/NoteRelation.java
+++ b/example/src/main/java/com/example/models/NoteRelation.java
@@ -1,4 +1,4 @@
-package com.example;
+package com.example.models;
 
 import android.content.Context;
 import com.orm.dsl.Table;
diff --git a/example/src/main/java/com/example/Tag.java b/example/src/main/java/com/example/models/Tag.java
old mode 100755
new mode 100644
similarity index 91%
rename from example/src/main/java/com/example/Tag.java
rename to example/src/main/java/com/example/models/Tag.java
index 6600c14a..bcb7aaf2
--- a/example/src/main/java/com/example/Tag.java
+++ b/example/src/main/java/com/example/models/Tag.java
@@ -1,4 +1,4 @@
-package com.example;
+package com.example.models;
 
 import com.orm.dsl.Table;
 
diff --git a/example/src/main/java/com/example/TextNote.java b/example/src/main/java/com/example/models/TextNote.java
similarity index 84%
rename from example/src/main/java/com/example/TextNote.java
rename to example/src/main/java/com/example/models/TextNote.java
index 91b7a33c..bd044bfa 100644
--- a/example/src/main/java/com/example/TextNote.java
+++ b/example/src/main/java/com/example/models/TextNote.java
@@ -1,4 +1,4 @@
-package com.example;
+package com.example.models;
 
 import com.orm.dsl.Table;
 

From 1b49132e8a9c4c3afd84d6dce53a9eef6725e0a6 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 19:53:10 -0700
Subject: [PATCH 063/305] Restructure test directory of library project

---
 library/build.gradle                          |  1 +
 library/library.iml                           | 39 ++++++++++---------
 .../test/java}/com/orm/NamingHelperTest.java  |  1 +
 .../java}/com/orm/query/DummyContext.java     | 32 ++++++++++++++-
 .../test/java}/com/orm/query/SelectTest.java  |  3 +-
 .../test/java}/com/orm/query/TestRecord.java  |  0
 6 files changed, 54 insertions(+), 22 deletions(-)
 rename library/{test => src/test/java}/com/orm/NamingHelperTest.java (99%)
 rename library/{test => src/test/java}/com/orm/query/DummyContext.java (96%)
 rename library/{test => src/test/java}/com/orm/query/SelectTest.java (97%)
 rename library/{test => src/test/java}/com/orm/query/TestRecord.java (100%)

diff --git a/library/build.gradle b/library/build.gradle
index 5e2e71ef..e37db9dd 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -22,6 +22,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:21.0.3'
+    testCompile 'junit:junit:4.12'
 }
 
 task libraryJar(type: Jar) {
diff --git a/library/library.iml b/library/library.iml
index 4c42fe43..33525dbc 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -9,12 +9,11 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -26,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -35,12 +34,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -48,6 +41,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -55,13 +55,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,9 +81,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/publications" />
       <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -92,6 +90,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockable-android-21" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
   </component>
 </module>
 
diff --git a/library/test/com/orm/NamingHelperTest.java b/library/src/test/java/com/orm/NamingHelperTest.java
similarity index 99%
rename from library/test/com/orm/NamingHelperTest.java
rename to library/src/test/java/com/orm/NamingHelperTest.java
index 28c705a0..3166a107 100644
--- a/library/test/com/orm/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/NamingHelperTest.java
@@ -1,6 +1,7 @@
 package com.orm;
 
 import com.orm.util.NamingHelper;
+
 import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/library/test/com/orm/query/DummyContext.java b/library/src/test/java/com/orm/query/DummyContext.java
similarity index 96%
rename from library/test/com/orm/query/DummyContext.java
rename to library/src/test/java/com/orm/query/DummyContext.java
index cb7c6f4b..5505b37f 100644
--- a/library/test/com/orm/query/DummyContext.java
+++ b/library/src/test/java/com/orm/query/DummyContext.java
@@ -19,7 +19,37 @@
 
 import java.io.*;
 
-public class DummyContext extends Context{
+public class DummyContext extends Context {
+    @Override
+    public File getCodeCacheDir() {
+        return null;
+    }
+
+    @Override
+    public File[] getExternalFilesDirs(String type) {
+        return null;
+    }
+
+    @Override
+    public File[] getExternalCacheDirs() {
+        return null;
+    }
+
+    @Override
+    public File getNoBackupFilesDir() {
+        return null;
+    }
+
+    @Override
+    public File[] getObbDirs() {
+        return null;
+    }
+
+    @Override
+    public File[] getExternalMediaDirs() {
+        return null;
+    }
+
     @Override
     public AssetManager getAssets() {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
diff --git a/library/test/com/orm/query/SelectTest.java b/library/src/test/java/com/orm/query/SelectTest.java
similarity index 97%
rename from library/test/com/orm/query/SelectTest.java
rename to library/src/test/java/com/orm/query/SelectTest.java
index a0fa01e9..ae618ac5 100644
--- a/library/test/com/orm/query/SelectTest.java
+++ b/library/src/test/java/com/orm/query/SelectTest.java
@@ -1,9 +1,8 @@
 package com.orm.query;
 
-import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
-import static com.orm.query.Condition.prop;
 import static junit.framework.Assert.assertEquals;
 
 public class SelectTest {
diff --git a/library/test/com/orm/query/TestRecord.java b/library/src/test/java/com/orm/query/TestRecord.java
similarity index 100%
rename from library/test/com/orm/query/TestRecord.java
rename to library/src/test/java/com/orm/query/TestRecord.java

From 57ddc88796dfbe433b62a980c8867f0c787dc6e0 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 19:53:12 -0700
Subject: [PATCH 064/305] Clean up example project source files

---
 .../src/main/java/com/example/ClientApp.java  |  6 +-
 .../example/activities/AddNoteActivity.java   |  7 +--
 .../example/activities/NoteListActivity.java  | 18 +++---
 .../com/example/activities/SugarActivity.java | 56 +++++++++----------
 .../main/java/com/example/models/NewNote.java |  2 -
 .../main/java/com/example/models/Note.java    |  8 +--
 .../java/com/example/models/NoteRelation.java |  6 +-
 .../java/com/example/models/TextNote.java     |  3 -
 8 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/example/src/main/java/com/example/ClientApp.java b/example/src/main/java/com/example/ClientApp.java
index 6e241a9d..e546e11d 100644
--- a/example/src/main/java/com/example/ClientApp.java
+++ b/example/src/main/java/com/example/ClientApp.java
@@ -1,11 +1,10 @@
 package com.example;
 
-import com.orm.SugarContext;
-
 import android.app.Application;
 
-public class ClientApp extends Application {
+import com.orm.SugarContext;
 
+public class ClientApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
@@ -17,5 +16,4 @@ public void onTerminate() {
         super.onTerminate();
         SugarContext.terminate();
     }
-
 }
diff --git a/example/src/main/java/com/example/activities/AddNoteActivity.java b/example/src/main/java/com/example/activities/AddNoteActivity.java
index cbb54a20..02ed08ce 100644
--- a/example/src/main/java/com/example/activities/AddNoteActivity.java
+++ b/example/src/main/java/com/example/activities/AddNoteActivity.java
@@ -9,11 +9,11 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.example.R;
+import static com.orm.SugarRecord.save;
+
 import com.example.models.Note;
 import com.example.models.Tag;
-
-import static com.orm.SugarRecord.save;
+import com.example.R;
 
 
 public class AddNoteActivity extends Activity {
@@ -51,6 +51,5 @@ public void onClick(View view) {
                 startActivity(intent);
             }
         });
-
     }
 }
diff --git a/example/src/main/java/com/example/activities/NoteListActivity.java b/example/src/main/java/com/example/activities/NoteListActivity.java
index 7b91201b..9b85b90e 100644
--- a/example/src/main/java/com/example/activities/NoteListActivity.java
+++ b/example/src/main/java/com/example/activities/NoteListActivity.java
@@ -7,14 +7,15 @@
 import android.view.View;
 import android.widget.ArrayAdapter;
 
-import com.example.R;
-import com.example.models.NewNote;
-import com.example.models.Note;
-import com.orm.SugarRecord;
+import java.util.List;
+
 import com.orm.query.Condition;
 import com.orm.query.Select;
+import com.orm.SugarRecord;
 
-import java.util.List;
+import com.example.models.NewNote;
+import com.example.models.Note;
+import com.example.R;
 
 
 public class NoteListActivity extends ListActivity {
@@ -22,7 +23,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.notelist);
 
-        List<Note> notes = Select.from(Note.class).orderBy("title").list();//Note.listAll(Note.class);
+        List<Note> notes = Select.from(Note.class).orderBy("title").list();
         List<NewNote> list = SugarRecord.listAll(NewNote.class);
 
         setListAdapter(new ArrayAdapter<Note>(this, android.R.layout.simple_list_item_1, notes));
@@ -33,10 +34,7 @@ public void onClick(View view) {
                 startActivity(intent);
             }
         });
-        
-        // TEST COUNT
-//        android.util.Log.d("COUNT", "Count: " + Select.from(Note.class).where("title like '%ba%'").count() +"/"+notes.size());
+
         Log.d("COUNT", "Count: " + Select.from(Note.class).where(new Condition[]{new Condition("title").eq("note")}).count() + "/" + notes.size());
     }
-
 }
diff --git a/example/src/main/java/com/example/activities/SugarActivity.java b/example/src/main/java/com/example/activities/SugarActivity.java
index 68ceca8e..bf5a7110 100644
--- a/example/src/main/java/com/example/activities/SugarActivity.java
+++ b/example/src/main/java/com/example/activities/SugarActivity.java
@@ -4,14 +4,16 @@
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.example.R;
+import com.orm.SugarRecord;
+
+import static com.orm.SugarRecord.save;
+
 import com.example.models.NewNote;
 import com.example.models.Note;
 import com.example.models.Tag;
 import com.example.models.TextNote;
-import com.orm.SugarRecord;
+import com.example.R;
 
-import static com.orm.SugarRecord.save;
 
 public class SugarActivity extends Activity
 {
@@ -30,40 +32,38 @@ public void onCreate(Bundle savedInstanceState)
         startActivity(intent);
     }
 
-     private void initDb() {
-
+    private void initDb() {
         Tag t1 = new Tag("tag1");
         Tag t2 = new Tag("tag2");
-         save(t1);
-         save(t2);
+        save(t1);
+        save(t2);
 
         Note n1 = new Note( 10, "note1", "description1", t1);
         Note n2 = new Note(11, "note12", "description2", t1);
         Note n3 = new Note( 12, "note13", "description3", t2);
         Note n4 = new Note( 13, "note4", "description4", t2);
 
-         TextNote textNote = new TextNote();
-         textNote.desc = "Test";
+        TextNote textNote = new TextNote();
+        textNote.desc = "Test";
 
-         save(textNote);
-         save(n1);
-         save(n2);
-         save(n3);
-         save(n4);
+        save(textNote);
+        save(n1);
+        save(n2);
+        save(n3);
+        save(n4);
 
-         n1.setDescription("matrix");
-         n1.setTitle("atrix");
-         save(n1);
-         n2.setDescription("matrix");
-         n2.setTitle("satrix");
-         save(n2);
-         n3.setDescription("matrix");
-         n3.setTitle("batrix");
-         save(n3);
+        n1.setDescription("matrix");
+        n1.setTitle("atrix");
+        save(n1);
+        n2.setDescription("matrix");
+        n2.setTitle("satrix");
+        save(n2);
+        n3.setDescription("matrix");
+        n3.setTitle("batrix");
+        save(n3);
 
-         NewNote newNote = new NewNote();
-         newNote.name = "name";
-         save(newNote);
-
-     }
+        NewNote newNote = new NewNote();
+        newNote.name = "name";
+        save(newNote);
+    }
 }
diff --git a/example/src/main/java/com/example/models/NewNote.java b/example/src/main/java/com/example/models/NewNote.java
index 45806744..1ca63424 100644
--- a/example/src/main/java/com/example/models/NewNote.java
+++ b/example/src/main/java/com/example/models/NewNote.java
@@ -4,8 +4,6 @@
 
 @Table(name = "new_note")
 public class NewNote {
-
     public long id;
     public String name;
-
 }
diff --git a/example/src/main/java/com/example/models/Note.java b/example/src/main/java/com/example/models/Note.java
index 79151644..fe714558 100644
--- a/example/src/main/java/com/example/models/Note.java
+++ b/example/src/main/java/com/example/models/Note.java
@@ -5,15 +5,13 @@
 
 @Table(name = "Note")
 public class Note {
-
     private long id;
 
     @Column(name = "noteId", unique = true, notNull = true)
     private int noteId;
-
     private String title;
     private String description;
-   private String name;
+    private String name;
     private Integer noteNumber = 2;
     private Float tagNumber = 4.0f;
     private float tagNo = 5.0f;
@@ -23,7 +21,7 @@ public class Note {
     private double noteTagNumber = 24.4;
     private Tag tag;
 
-    public Note(){
+    public Note() {
     }
 
     public Note(int noteId, String title, String description, Tag tag) {
@@ -53,7 +51,7 @@ public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description){
+    public void setDescription(String description) {
         this.description = description;
     }
 
diff --git a/example/src/main/java/com/example/models/NoteRelation.java b/example/src/main/java/com/example/models/NoteRelation.java
index 282f0a43..788baa0d 100644
--- a/example/src/main/java/com/example/models/NoteRelation.java
+++ b/example/src/main/java/com/example/models/NoteRelation.java
@@ -1,6 +1,7 @@
 package com.example.models;
 
 import android.content.Context;
+
 import com.orm.dsl.Table;
 
 @Table(name = "note_relation")
@@ -8,15 +9,14 @@ public class NoteRelation {
     String name;
     int noteId;
 
-
     public NoteRelation() {
     }
 
     public NoteRelation(Context context, String name, int noteId) {
         this.name = name;
         this.noteId = noteId;
-
     }
+
     public String getName() {
         return name;
     }
@@ -32,6 +32,4 @@ public int getNoteId() {
     public void setNoteId(int noteId) {
         this.noteId = noteId;
     }
-
-
 }
diff --git a/example/src/main/java/com/example/models/TextNote.java b/example/src/main/java/com/example/models/TextNote.java
index bd044bfa..afb3ef73 100644
--- a/example/src/main/java/com/example/models/TextNote.java
+++ b/example/src/main/java/com/example/models/TextNote.java
@@ -4,11 +4,8 @@
 
 @Table(name = "text_note")
 public class TextNote extends Note {
-
     public String desc;
 
     public TextNote() {
     }
-
-
 }

From 7b4d5f6c1227c650437e0592adf2d27c0bc61eaa Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 19:53:15 -0700
Subject: [PATCH 065/305] Remove executable bits from files

---
 example/build.properties             | 0
 example/build.xml                    | 0
 example/src/main/AndroidManifest.xml | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 example/build.properties
 mode change 100755 => 100644 example/build.xml
 mode change 100755 => 100644 example/src/main/AndroidManifest.xml

diff --git a/example/build.properties b/example/build.properties
old mode 100755
new mode 100644
diff --git a/example/build.xml b/example/build.xml
old mode 100755
new mode 100644
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
old mode 100755
new mode 100644

From 7aa0c76895640cfa8f0352febfc7a9acc8d7807c Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 20:02:25 -0700
Subject: [PATCH 066/305] Update travis build to use gradle

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab91b91e..e5290eb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,12 @@
 language: android
 android:
   components:
-    - sys-img-x86-android-17
-    - build-tools-19.1.0
-    - android-17
-    - android-19
+    - sys-img-armeabi-v7a-android-21
+    - build-tools-21.1.2
+    - android-21
 
 before_script:
   - cd library
 
 script:
-  - ant travis-all
+  - gradle clean build test

From 03e9869a3dc343909aacd576f3ab9a3fb5d05fe1 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 20:12:40 -0700
Subject: [PATCH 067/305] Fix up some library tests

---
 .../test/java/com/orm/query/SelectTest.java   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/library/src/test/java/com/orm/query/SelectTest.java b/library/src/test/java/com/orm/query/SelectTest.java
index ae618ac5..f444e7ee 100644
--- a/library/src/test/java/com/orm/query/SelectTest.java
+++ b/library/src/test/java/com/orm/query/SelectTest.java
@@ -1,7 +1,6 @@
 package com.orm.query;
 
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static junit.framework.Assert.assertEquals;
 
@@ -10,12 +9,12 @@ public class SelectTest {
     @Test
     public void testMergeCondition(){
         Select where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"));
-        assertEquals("test = ? ", where.getWhereCond());
+        assertEquals("(test = ? )", where.getWhereCond());
         assertEquals(1, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
 
         where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"), Condition.prop("prop").eq(2));
-        assertEquals("test = ?  AND prop = ? ", where.getWhereCond());
+        assertEquals("(test = ?  AND prop = ? )", where.getWhereCond());
         assertEquals(2, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
         assertEquals("2", where.getArgs()[1]);
@@ -25,12 +24,12 @@ public void testMergeCondition(){
     @Test
     public void testWhere(){
         Select where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"));
-        assertEquals("test = ? ", where.getWhereCond());
+        assertEquals("(test = ? )", where.getWhereCond());
         assertEquals(1, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
 
         where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"), Condition.prop("prop").eq(2));
-        assertEquals("test = ?  AND prop = ? ", where.getWhereCond());
+        assertEquals("(test = ?  AND prop = ? )", where.getWhereCond());
         assertEquals(2, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
         assertEquals("2", where.getArgs()[1]);
@@ -40,12 +39,12 @@ public void testWhere(){
     @Test
     public void testWhereOr(){
         Select where = Select.from(TestRecord.class).whereOr(Condition.prop("test").eq("satya"));
-        assertEquals("test = ? ", where.getWhereCond());
+        assertEquals("(test = ? )", where.getWhereCond());
         assertEquals(1, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
 
         where = Select.from(TestRecord.class).whereOr(Condition.prop("test").eq("satya"), Condition.prop("prop").eq(2));
-        assertEquals("test = ?  OR prop = ? ", where.getWhereCond());
+        assertEquals("(test = ?  OR prop = ? )", where.getWhereCond());
         assertEquals(2, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
         assertEquals("2", where.getArgs()[1]);
@@ -54,13 +53,13 @@ public void testWhereOr(){
     @Test
     public void testAnd(){
         Select where = Select.from(TestRecord.class).whereOr(Condition.prop("test").eq("satya"));
-        assertEquals("test = ? ", where.getWhereCond());
+        assertEquals("(test = ? )", where.getWhereCond());
         assertEquals(1, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
 
         where.and(Condition.prop("prop").eq(2));
 
-        assertEquals("test = ?  AND prop = ? ", where.getWhereCond());
+        assertEquals("(test = ? ) AND (prop = ? )", where.getWhereCond());
         assertEquals(2, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
         assertEquals("2", where.getArgs()[1]);
@@ -69,13 +68,13 @@ public void testAnd(){
     @Test
     public void testOr(){
         Select where = Select.from(TestRecord.class).whereOr(Condition.prop("test").eq("satya"));
-        assertEquals("test = ? ", where.getWhereCond());
+        assertEquals("(test = ? )", where.getWhereCond());
         assertEquals(1, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
 
         where.or(Condition.prop("prop").eq(2));
 
-        assertEquals("test = ?  OR prop = ? ", where.getWhereCond());
+        assertEquals("(test = ? ) OR (prop = ? )", where.getWhereCond());
         assertEquals(2, where.getArgs().length);
         assertEquals("satya", where.getArgs()[0]);
         assertEquals("2", where.getArgs()[1]);

From 191888254075b2ba1737fd3e233c53d4f3578a9c Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 20:15:07 -0700
Subject: [PATCH 068/305] Stop tracking .iml files

---
 .gitignore          |   1 +
 example/example.iml | 111 --------------------------------------------
 library/library.iml |  98 --------------------------------------
 3 files changed, 1 insertion(+), 209 deletions(-)
 delete mode 100644 example/example.iml
 delete mode 100644 library/library.iml

diff --git a/.gitignore b/.gitignore
index 9ea91260..8cfcff0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ project.properties
 build/
 .gradle/
 .idea
+*.iml
diff --git a/example/example.iml b/example/example.iml
deleted file mode 100644
index 227821f1..00000000
--- a/example/example.iml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="sugar" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":example" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
-    <orderEntry type="library" exported="" name="sugar-1.3.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="mockable-android-21" level="project" />
-  </component>
-</module>
-
diff --git a/library/library.iml b/library/library.iml
deleted file mode 100644
index 33525dbc..00000000
--- a/library/library.iml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.satyan" external.system.module.version="1.3.1" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":library" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="mockable-android-21" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
-  </component>
-</module>
-

From 9d9d76b1c835202454a627d72b436419fe8b23c4 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 20:40:16 -0700
Subject: [PATCH 069/305] Add jacoco test coverage

---
 example/build.gradle | 45 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/example/build.gradle b/example/build.gradle
index d93d68bd..8d1944b8 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'org.robolectric'
+apply plugin: 'jacoco'
 
 android {
     compileSdkVersion 21
@@ -15,6 +16,14 @@ android {
         release {
             minifyEnabled false
         }
+
+        debug {
+            testCoverageEnabled true
+        }
+    }
+
+    jacoco {
+        version "0.7.1.201405082137"
     }
 }
 
@@ -51,3 +60,39 @@ robolectric {
         println "Executing test for ${descriptor.name} with result: ${result.resultType}"
     }
 }
+
+
+jacoco {
+    toolVersion "0.7.1.201405082137"
+}
+
+def coverageSourceDirs = [
+    'src/main/java',
+]
+
+task jacocoTestReport(type: JacocoReport, dependsOn: "testDebug") {
+    group = "Reporting"
+    description = "Generate Jacoco coverage reports after running tests."
+    reports {
+        xml.enabled = true
+        html.enabled = true
+    }
+    classDirectories = fileTree(
+        dir: './build/intermediates/classes/debug',
+        excludes: ['**/R*.class',
+                   '**/*$InjectAdapter.class',
+                   '**/*$ModuleAdapter.class',
+                   '**/*$ViewInjector*.class'
+        ])
+    sourceDirectories = files(coverageSourceDirs)
+    executionData = files("$buildDir/jacoco/testDebug.exec")
+    // Bit hacky but fixes https://code.google.com/p/android/issues/detail?id=69174.
+    // We iterate through the compiled .class tree and rename $$ to $.
+    doFirst {
+        new File("$buildDir/intermediates/classes/").eachFileRecurse { file ->
+            if (file.name.contains('$$')) {
+                file.renameTo(file.path.replace('$$', '$'))
+            }
+        }
+    }
+}

From c6371843236a74dba58077e75db2a1f2db070021 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 20:40:50 -0700
Subject: [PATCH 070/305] Build both the library and example

---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5290eb5..730801c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,5 @@ android:
     - build-tools-21.1.2
     - android-21
 
-before_script:
-  - cd library
-
 script:
-  - gradle clean build test
+  - gradle clean build test example:jacocoTestReport

From 595bdcd7cb28304174416ed3d1fe3b52a0231316 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 20:49:37 -0700
Subject: [PATCH 071/305] Publish sugar locally and make it available for the
 example project

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 730801c4..fea0b5c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: android
+
 android:
   components:
     - sys-img-armeabi-v7a-android-21
@@ -6,4 +7,8 @@ android:
     - android-21
 
 script:
-  - gradle clean build test example:jacocoTestReport
+  - gradle clean library:build library:PublishToMavenLocal example:build test example:jacocoTestReport
+
+cache:
+  directories:
+    - $HOME/.m2

From fd0fecf52e36006a6f55ed1a4d8798bf031bb0f3 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 21:39:45 -0700
Subject: [PATCH 072/305] Fix travis example build

---
 .travis.yml          | 2 +-
 example/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fea0b5c8..fc678b1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ android:
     - android-21
 
 script:
-  - gradle clean library:build library:PublishToMavenLocal example:build test example:jacocoTestReport
+  - gradle clean library:build library:libraryJar example:build test example:jacocoTestReport
 
 cache:
   directories:
diff --git a/example/build.gradle b/example/build.gradle
index 8d1944b8..f3269d33 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -29,7 +29,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:21.0.3'
-    compile 'com.github.satyan:sugar:1.3.1'
+    compile files('../library/build/libs/sugar-1.3.1.jar')
     testCompile 'org.robolectric:robolectric:2.4'
     testCompile 'junit:junit:4.12'
 }

From ce638aa1b7f5ef3e5c7b7fd2799e7db8adc482ba Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 21:40:09 -0700
Subject: [PATCH 073/305] Add coveralls support

---
 .travis.yml          | 2 +-
 build.gradle         | 3 ++-
 example/build.gradle | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fc678b1d..db6041f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ android:
     - android-21
 
 script:
-  - gradle clean library:build library:libraryJar example:build test example:jacocoTestReport
+  - gradle clean library:build library:libraryJar example:build test example:jacocoTestReport example:coveralls
 
 cache:
   directories:
diff --git a/build.gradle b/build.gradle
index 35875814..a93c3456 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,11 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.1.0'
         classpath 'org.robolectric:robolectric-gradle-plugin:1.0.1'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }
 
diff --git a/example/build.gradle b/example/build.gradle
index f3269d33..e37ea8e0 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'org.robolectric'
 apply plugin: 'jacoco'
+apply plugin: 'com.github.kt3k.coveralls'
 
 android {
     compileSdkVersion 21

From ad908cb78fc600bb69d42486c8f750721d4dc50d Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 21:49:24 -0700
Subject: [PATCH 074/305] Add a simple note test to example

---
 .../java/com/example/sugartest/NoteTest.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 example/src/test/java/com/example/sugartest/NoteTest.java

diff --git a/example/src/test/java/com/example/sugartest/NoteTest.java b/example/src/test/java/com/example/sugartest/NoteTest.java
new file mode 100644
index 00000000..675ee839
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/NoteTest.java
@@ -0,0 +1,20 @@
+package com.example.sugartest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import com.example.models.Note;
+import com.example.models.Tag;
+
+
+@RunWith(RobolectricTestRunner.class)
+@Config(emulateSdk = 18, manifest = "example/src/main/AndroidManifest.xml")
+public class NoteTest {
+    @Test
+    public void simpleNoteTest() throws Exception {
+        Note note = new Note(0, "Note", "this is a note", new Tag("tag"));
+        assert(note.getTitle().equals("Note"));
+    }
+}

From 8bd85f7bc7252090a58b01d15bbe4532895f7e73 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 21:52:24 -0700
Subject: [PATCH 075/305] Add coverage badge to README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 55d1a606..1fbbcf6f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar)
+# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg)](https://coveralls.io/r/satyan/sugar)
 
 Insanely easy way to work with Android databases.
 

From 1a770c7531bad01083af9fa427956dd5c2324506 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 27 Mar 2015 21:59:48 -0700
Subject: [PATCH 076/305] Specify jacoco xml file for coveralls

---
 example/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/example/build.gradle b/example/build.gradle
index e37ea8e0..f7735353 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -97,3 +97,7 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "testDebug") {
         }
     }
 }
+
+coveralls {
+    jacocoReportPath = "${buildDir}/reports/jacoco/jacocoTestReport/jacocoTestReport.xml"
+}

From 89c2774a5fc83f3bf4f96f9b33c0d70715f3ed8c Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sat, 28 Mar 2015 01:39:04 -0700
Subject: [PATCH 077/305] Cleaner dependency requirement between example and
 library

---
 example/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/build.gradle b/example/build.gradle
index f7735353..d19bff1f 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -29,8 +29,8 @@ android {
 }
 
 dependencies {
+    compile project (':library')
     compile 'com.android.support:support-v4:21.0.3'
-    compile files('../library/build/libs/sugar-1.3.1.jar')
     testCompile 'org.robolectric:robolectric:2.4'
     testCompile 'junit:junit:4.12'
 }

From 62b505529bb7f97c9f88cc48546980ff8ff09799 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sat, 28 Mar 2015 01:42:05 -0700
Subject: [PATCH 078/305] Enable coveralls for the entire project

---
 .travis.yml          |  2 +-
 build.gradle         | 69 ++++++++++++++++++++++++++++++++++++++++++++
 example/build.gradle | 50 --------------------------------
 3 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index db6041f2..5c8449f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ android:
     - android-21
 
 script:
-  - gradle clean library:build library:libraryJar example:build test example:jacocoTestReport example:coveralls
+  - gradle clean build coveralls
 
 cache:
   directories:
diff --git a/build.gradle b/build.gradle
index a93c3456..27431de8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,6 @@
+apply plugin: 'jacoco'
+apply plugin: 'com.github.kt3k.coveralls'
+
 buildscript {
     repositories {
         mavenCentral()
@@ -16,3 +19,69 @@ allprojects {
         jcenter()
     }
 }
+
+subprojects { proj ->
+    apply plugin: 'jacoco'
+
+    jacoco {
+        version "0.7.1.201405082137"
+    }
+
+    task jacocoTestReport(type: JacocoReport, dependsOn: "testDebug") {
+        group = "Reporting"
+        description = "Generate Jacoco coverage reports after running tests."
+        reports {
+            xml.enabled = true
+            html.enabled = true
+        }
+        classDirectories = fileTree(
+            dir: 'build/intermediates/classes/debug',
+            excludes: ['**/R*.class',
+                       '**/BuildConfig*'])
+        sourceDirectories = files('src/main/java')
+        executionData = files('build/jacoco/testDebug.exec')
+        doFirst {
+            files('build/intermediates/classes/debug').getFiles().each { file ->
+                if (file.name.contains('$$')) {
+                    file.renameTo(file.path.replace('$$', '$'))
+                }
+            }
+        }
+    }
+}
+
+jacoco {
+    toolVersion "0.7.1.201405082137"
+}
+
+task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
+    group = "Reporting"
+    description = 'Generates an aggregate report from all subprojects'
+    dependsOn(subprojects.jacocoTestReport)
+
+    additionalSourceDirs = files('example/src/main/java') + files('library/src/main/java')
+    sourceDirectories = files('example/src/main/java') + files('library/src/main/java')
+    classDirectories = files('example/build/intermediates/classes/debug') + files('library/build/intermediates/classes/debug')
+    executionData = files(subprojects.jacocoTestReport.executionData)
+
+    reports {
+        html.enabled = true
+        xml.enabled = true
+    }
+
+    doFirst {
+        executionData = files(executionData.findAll { it.exists() })
+    }
+}
+
+coveralls {
+    jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
+}
+
+tasks.coveralls {
+    group = 'Coverage reports'
+    description = 'Uploads the aggregated coverage report to Coveralls'
+
+    dependsOn jacocoRootReport
+    onlyIf { System.env.'CI' }
+}
diff --git a/example/build.gradle b/example/build.gradle
index d19bff1f..8ab86abb 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,7 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'org.robolectric'
-apply plugin: 'jacoco'
-apply plugin: 'com.github.kt3k.coveralls'
 
 android {
     compileSdkVersion 21
@@ -17,14 +15,6 @@ android {
         release {
             minifyEnabled false
         }
-
-        debug {
-            testCoverageEnabled true
-        }
-    }
-
-    jacoco {
-        version "0.7.1.201405082137"
     }
 }
 
@@ -61,43 +51,3 @@ robolectric {
         println "Executing test for ${descriptor.name} with result: ${result.resultType}"
     }
 }
-
-
-jacoco {
-    toolVersion "0.7.1.201405082137"
-}
-
-def coverageSourceDirs = [
-    'src/main/java',
-]
-
-task jacocoTestReport(type: JacocoReport, dependsOn: "testDebug") {
-    group = "Reporting"
-    description = "Generate Jacoco coverage reports after running tests."
-    reports {
-        xml.enabled = true
-        html.enabled = true
-    }
-    classDirectories = fileTree(
-        dir: './build/intermediates/classes/debug',
-        excludes: ['**/R*.class',
-                   '**/*$InjectAdapter.class',
-                   '**/*$ModuleAdapter.class',
-                   '**/*$ViewInjector*.class'
-        ])
-    sourceDirectories = files(coverageSourceDirs)
-    executionData = files("$buildDir/jacoco/testDebug.exec")
-    // Bit hacky but fixes https://code.google.com/p/android/issues/detail?id=69174.
-    // We iterate through the compiled .class tree and rename $$ to $.
-    doFirst {
-        new File("$buildDir/intermediates/classes/").eachFileRecurse { file ->
-            if (file.name.contains('$$')) {
-                file.renameTo(file.path.replace('$$', '$'))
-            }
-        }
-    }
-}
-
-coveralls {
-    jacocoReportPath = "${buildDir}/reports/jacoco/jacocoTestReport/jacocoTestReport.xml"
-}

From e76d6bdddf1d7c5a751af1691f1f13ed892305ef Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sat, 28 Mar 2015 01:54:03 -0700
Subject: [PATCH 079/305] Add source directory for coveralls

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 27431de8..024245fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,6 +75,7 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
 }
 
 coveralls {
+    sourceDirs = files('example/src/main/java').flatten() + files('library/src/main/java').flatten()
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
 }
 

From 95a8939971a5a3755e273b6c6709d4f52848b5ae Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sat, 28 Mar 2015 02:05:56 -0700
Subject: [PATCH 080/305] Use master coverage badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1fbbcf6f..381ce2b9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg)](https://coveralls.io/r/satyan/sugar)
+# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg?branch=master)](https://coveralls.io/r/satyan/sugar?branch=master)
 
 Insanely easy way to work with Android databases.
 

From 348e3da5cccb22e0f370f684e05dc3678ae1ab61 Mon Sep 17 00:00:00 2001
From: Soheil <user@Soben.local>
Date: Thu, 18 Dec 2014 21:52:04 +0330
Subject: [PATCH 081/305] Address bug in persisting relationships Fixes #215

Thanks @jivimberg for the suggestions
---
 library/src/main/java/com/orm/SugarRecord.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index d3a5e8fc..494e234a 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -201,10 +201,13 @@ private static void inflate(Cursor cursor, Object object) {
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
 
         for (Field field : columns) {
-            if (field.getClass().isAnnotationPresent(Table.class)) {
+        	field.setAccessible(true);
+            Class<?> fieldType = field.getType();
+            if (fieldType.isAnnotationPresent(Table.class) ||
+                    SugarRecord.class.isAssignableFrom(fieldType)) {
                 try {
                     long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toSQLName(field)));
-                    field.set(object, (id > 0) ? findById(field.getType(), id) : null);
+                    field.set(object, (id > 0) ? findById(fieldType, id) : null);
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }

From 5fc956e39e7090f6e36ec43035d8e2ffbcdd830e Mon Sep 17 00:00:00 2001
From: Soheil <user@Soben.local>
Date: Fri, 19 Dec 2014 15:41:33 +0330
Subject: [PATCH 082/305] Implement getDeepField and use it in ReflectionUtil
 References #201 References #236 Closes #216

---
 .../java/com/orm/util/ReflectionUtil.java     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 8fc3a242..b755f7f0 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -5,10 +5,10 @@
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.util.Log;
+
 import com.orm.SugarRecord;
 import com.orm.dsl.Ignore;
 import com.orm.dsl.Table;
-import dalvik.system.DexFile;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,7 +17,14 @@
 import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.List;
+
+import dalvik.system.DexFile;
 
 public class ReflectionUtil {
 
@@ -175,12 +182,25 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
             Log.e("field set error", e.getMessage());
         }
     }
+    
+    private static Field getDeepField(String fieldName, Class<?> type) throws NoSuchFieldException {
+        try {
+            Field field = type.getDeclaredField(fieldName);
+            return field;
+        } catch (NoSuchFieldException e) {
+            Class superclass = type.getSuperclass();
+            if (superclass != null) {
+                Field field = getDeepField(fieldName, superclass);
+                return field;
+            } else {
+                throw e;
+            }
+        }
+    }
 
     public static void setFieldValueForId(Object object, Long value) {
-
         try {
-            Field field = object.getClass().getField("id");
-
+            Field field = getDeepField("id", object.getClass());
             field.setAccessible(true);
             field.set(object, value);
         } catch (IllegalAccessException e) {

From 23cfd743615de7dce527bfc776caaa65513811af Mon Sep 17 00:00:00 2001
From: Juan Ignacio Vimberg <jivimberg@gmail.com>
Date: Wed, 21 Jan 2015 23:35:50 -0800
Subject: [PATCH 083/305] Cast to a SugarRecord instead of using ReflectionUtil
 when setting id Fixes #201 Closes #236

---
 library/src/main/java/com/orm/SugarRecord.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 494e234a..133c6918 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -190,7 +190,7 @@ static long save(SQLiteDatabase db, Object object) {
                 SQLiteDatabase.CONFLICT_REPLACE);
 
         if (SugarRecord.class.isAssignableFrom(object.getClass())) {
-            ReflectionUtil.setFieldValueForId(object, id);
+            ((SugarRecord) object).setId(id);
         }
         Log.i("Sugar", object.getClass().getSimpleName() + " saved : " + id);
 

From 357b56372476c54e802652c91f6b0b8b9c7d8032 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 13:37:59 -0700
Subject: [PATCH 084/305] Add SimpleExtendedModel and tests

---
 .../example/models/SimpleExtendedModel.java   |   8 +
 .../sugartest/SimpleExtendedModelTests.java   | 250 ++++++++++++++++++
 2 files changed, 258 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/SimpleExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java

diff --git a/example/src/main/java/com/example/models/SimpleExtendedModel.java b/example/src/main/java/com/example/models/SimpleExtendedModel.java
new file mode 100644
index 00000000..77f75b63
--- /dev/null
+++ b/example/src/main/java/com/example/models/SimpleExtendedModel.java
@@ -0,0 +1,8 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+
+public class SimpleExtendedModel extends SugarRecord {
+    public SimpleExtendedModel() {}
+}
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
new file mode 100644
index 00000000..ccae3fb7
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
@@ -0,0 +1,250 @@
+package com.example.sugartest;
+
+import com.example.models.SimpleExtendedModel;
+import com.orm.SugarRecord;
+import com.orm.util.NamingHelper;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class SimpleExtendedModelTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        save(new SimpleExtendedModel());
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void twoSaveTest() throws Exception {
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void manySaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void defaultIdTest() throws Exception {
+        assertEquals(1L, save(new SimpleExtendedModel()));
+    }
+
+    @Test
+    public void whereCountTest() throws Exception {
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void whereNoCountTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"3"}));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"a"}));
+    }
+
+    @Test
+    public void whereBrokenCountTest() throws Exception {
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void saveMethodTest() throws Exception {
+        SimpleExtendedModel model = new SimpleExtendedModel();
+        model.save();
+        assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void deleteTest() throws Exception {
+        SimpleExtendedModel model = new SimpleExtendedModel();
+        save(model);
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        model.delete();
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void deleteAllTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        SugarRecord.deleteAll(SimpleExtendedModel.class);
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void deleteAllWhereTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        SugarRecord.deleteAll(SimpleExtendedModel.class, "id > ?", new String[]{"1"});
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void saveInTransactionTest() throws Exception {
+        SugarRecord.saveInTx(new SimpleExtendedModel(), new SimpleExtendedModel());
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void listAllTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        List<SimpleExtendedModel> models = SugarRecord.listAll(SimpleExtendedModel.class);
+        assertEquals(100, models.size());
+        for (long i = 1; i <= 100; i++) {
+            assertEquals(new Long(i), models.get((int) i - 1).getId());
+        }
+    }
+
+    @Test
+    public void findTest() throws Exception {
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        List<SimpleExtendedModel> models =
+                SugarRecord.find(SimpleExtendedModel.class, "id = ?", "2");
+        assertEquals(1, models.size());
+        assertEquals(new Long(2L), models.get(0).getId());
+    }
+
+    @Test
+    public void findWithQueryTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        List<SimpleExtendedModel> models =
+                SugarRecord.findWithQuery(SimpleExtendedModel.class, "Select * from " +
+                                          NamingHelper.toSQLName(SimpleExtendedModel.class) +
+                                          " where id >= ? ", "50");
+        for (SimpleExtendedModel model : models) {
+            assertEquals(new Long(75), model.getId(), 25L);
+        }
+    }
+
+    @Test
+    public void findByIdTest() throws Exception {
+        save(new SimpleExtendedModel());
+        assertEquals(new Long(1L), SugarRecord.findById(SimpleExtendedModel.class, 1L).getId());
+    }
+
+    @Test
+    public void findByIdIntegerTest() throws Exception {
+        save(new SimpleExtendedModel());
+        assertEquals(new Long(1L), SugarRecord.findById(SimpleExtendedModel.class, 1).getId());
+    }
+
+    @Test
+    public void findByIdNullTest() throws Exception {
+        save(new SimpleExtendedModel());
+        assertNull(SugarRecord.findById(SimpleExtendedModel.class, 2L));
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAll(SimpleExtendedModel.class);
+        for (int i = 1; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleExtendedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(new Long(i), model.getId());
+        }
+    }
+
+    @Test
+    public void findAsIteratorTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
+                "id >= ?", "50");
+        for (int i = 50; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleExtendedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(new Long(i), model.getId());
+        }
+    }
+
+    @Test
+    public void findWithQueryAsIteratorTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        Iterator<SimpleExtendedModel> cursor =
+                SugarRecord.findWithQueryAsIterator(SimpleExtendedModel.class,
+                                                    "Select * from " +
+                                                    NamingHelper.toSQLName(SimpleExtendedModel.class) +
+                                                    " where id >= ? ", "50");
+        for (int i = 50; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleExtendedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(new Long(i), model.getId());
+        }
+    }
+
+    @Test(expected=NoSuchElementException.class)
+    public void findAsIteratorOutOfBoundsTest() throws Exception {
+        save(new SimpleExtendedModel());
+        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
+                "id = ?", "1");
+        assertTrue(cursor.hasNext());
+        SimpleExtendedModel model = cursor.next();
+        assertNotNull(model);
+        assertEquals(new Long(1), model.getId());
+        // This should throw a NoSuchElementException
+        cursor.next();
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void disallowRemoveCursorTest() throws Exception {
+        save(new SimpleExtendedModel());
+        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
+                "id = ?", "1");
+        assertTrue(cursor.hasNext());
+        SimpleExtendedModel model = cursor.next();
+        assertNotNull(model);
+        assertEquals(new Long(1), model.getId());
+        // This should throw a UnsupportedOperationException
+        cursor.remove();
+    }
+
+    @Test
+    public void vacuumTest() throws Exception {
+        SugarRecord.executeQuery("Vacuum");
+    }
+}
\ No newline at end of file

From ad51cbbeea66455515c55761383a6b7af3415cbf Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 13:46:41 -0700
Subject: [PATCH 085/305] Add SimpleAnnotatedModel and tests

---
 .../example/models/SimpleAnnotatedModel.java  |  15 ++
 .../sugartest/SimpleAnnotatedModelTests.java  | 234 ++++++++++++++++++
 2 files changed, 249 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/SimpleAnnotatedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java

diff --git a/example/src/main/java/com/example/models/SimpleAnnotatedModel.java b/example/src/main/java/com/example/models/SimpleAnnotatedModel.java
new file mode 100644
index 00000000..08d3b0fd
--- /dev/null
+++ b/example/src/main/java/com/example/models/SimpleAnnotatedModel.java
@@ -0,0 +1,15 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+
+@Table
+public class SimpleAnnotatedModel {
+    private Long id;
+
+    public SimpleAnnotatedModel() {}
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
new file mode 100644
index 00000000..5c3ed6a9
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
@@ -0,0 +1,234 @@
+package com.example.sugartest;
+
+import com.example.models.SimpleAnnotatedModel;
+import com.orm.SugarRecord;
+import com.orm.util.NamingHelper;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class SimpleAnnotatedModelTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoSaveTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void manySaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void defaultIdTest() throws Exception {
+        assertEquals(1L, save(new SimpleAnnotatedModel()));
+    }
+
+    @Test
+    public void whereCountTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void whereNoCountTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"3"}));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"a"}));
+    }
+
+    @Test
+    public void whereBrokenCountTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        assertEquals(-1L, SugarRecord.count(SimpleAnnotatedModel.class, "di = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void deleteAllTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        SugarRecord.deleteAll(SimpleAnnotatedModel.class);
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void deleteAllWhereTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        SugarRecord.deleteAll(SimpleAnnotatedModel.class, "id > ?", new String[]{"1"});
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void saveInTransactionTest() throws Exception {
+        SugarRecord.saveInTx(new SimpleAnnotatedModel(), new SimpleAnnotatedModel());
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void listAllTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        List<SimpleAnnotatedModel> models = SugarRecord.listAll(SimpleAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (long i = 1; i <= 100; i++) {
+            assertEquals(new Long(i), models.get((int) i - 1).getId());
+        }
+    }
+
+    @Test
+    public void findTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.find(SimpleAnnotatedModel.class, "id = ?", "2");
+        assertEquals(1, models.size());
+        assertEquals(new Long(2L), models.get(0).getId());
+    }
+
+    @Test
+    public void findWithQueryTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findWithQuery(SimpleAnnotatedModel.class, "Select * from " +
+                        NamingHelper.toSQLName(SimpleAnnotatedModel.class) +
+                        " where id >= ? ", "50");
+        for (SimpleAnnotatedModel model : models) {
+            assertEquals(new Long(75), model.getId(), 25L);
+        }
+    }
+
+    @Test
+    public void findByIdTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        assertEquals(new Long(1L), SugarRecord.findById(SimpleAnnotatedModel.class, 1L).getId());
+    }
+
+    @Test
+    public void findByIdIntegerTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        assertEquals(new Long(1L), SugarRecord.findById(SimpleAnnotatedModel.class, 1).getId());
+    }
+
+    @Test
+    public void findByIdNullTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        assertNull(SugarRecord.findById(SimpleAnnotatedModel.class, 2L));
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAll(SimpleAnnotatedModel.class);
+        for (int i = 1; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleAnnotatedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(new Long(i), model.getId());
+        }
+    }
+
+    @Test
+    public void findAsIteratorTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
+                "id >= ?", "50");
+        for (int i = 50; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleAnnotatedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(new Long(i), model.getId());
+        }
+    }
+
+    @Test
+    public void findWithQueryAsIteratorTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        Iterator<SimpleAnnotatedModel> cursor =
+                SugarRecord.findWithQueryAsIterator(SimpleAnnotatedModel.class,
+                        "Select * from " +
+                                NamingHelper.toSQLName(SimpleAnnotatedModel.class) +
+                                " where id >= ? ", "50");
+        for (int i = 50; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleAnnotatedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(new Long(i), model.getId());
+        }
+    }
+
+    @Test(expected=NoSuchElementException.class)
+    public void findAsIteratorOutOfBoundsTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
+                "id = ?", "1");
+        assertTrue(cursor.hasNext());
+        SimpleAnnotatedModel model = cursor.next();
+        assertNotNull(model);
+        assertEquals(new Long(1), model.getId());
+        // This should throw a NoSuchElementException
+        cursor.next();
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void disallowRemoveCursorTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
+                "id = ?", "1");
+        assertTrue(cursor.hasNext());
+        SimpleAnnotatedModel model = cursor.next();
+        assertNotNull(model);
+        assertEquals(new Long(1), model.getId());
+        // This should throw a UnsupportedOperationException
+        cursor.remove();
+    }
+
+    @Test
+    public void vacuumTest() throws Exception {
+        SugarRecord.executeQuery("Vacuum");
+    }
+}
\ No newline at end of file

From 4ad5eb4c3d588c4ec774327f7cbf8adcea3d6356 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 16:20:00 -0700
Subject: [PATCH 086/305] Fix count with query method

---
 .../src/main/java/com/orm/SugarRecord.java    | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 133c6918..2c1a0655 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -3,15 +3,22 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteStatement;
 import android.text.TextUtils;
 import android.util.Log;
+
 import com.orm.dsl.Table;
 import com.orm.util.NamingHelper;
 import com.orm.util.ReflectionUtil;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
 
 import static com.orm.SugarContext.getSugarContext;
 
@@ -156,20 +163,24 @@ public static <T> long count(Class<?> type, String whereClause, String[] whereAr
 
         long toRet = -1;
         String filter = (!TextUtils.isEmpty(whereClause)) ? " where "  + whereClause : "";
-        SQLiteStatement sqLiteStatament = sqLiteDatabase.compileStatement("SELECT count(*) FROM " + NamingHelper.toSQLName(type) + filter);
+        SQLiteStatement sqliteStatement;
+        try {
+            sqliteStatement = sqLiteDatabase.compileStatement("SELECT count(*) FROM " + NamingHelper.toSQLName(type) + filter);
+        } catch (SQLiteException e) {
+            e.printStackTrace();
+            return toRet;
+        }
 
         if (whereArgs != null) {
             for (int i = whereArgs.length; i != 0; i--) {
-                sqLiteStatament.bindString(i, whereArgs[i - 1]);
+                sqliteStatement.bindString(i, whereArgs[i - 1]);
             }
         }
 
         try {
-            toRet = sqLiteStatament.simpleQueryForLong();
-        } catch (Exception e) {
-            e.printStackTrace();
+            toRet = sqliteStatement.simpleQueryForLong();
         } finally {
-            sqLiteStatament.close();
+            sqliteStatement.close();
         }
 
         return toRet;

From 42995e6e0499f8ff8ab8c6d72629164aa4260b83 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sat, 28 Mar 2015 12:03:00 -0700
Subject: [PATCH 087/305] Use a subclassed test runner

---
 .../java/com/example/sugartest/NoteTest.java  |  6 ++---
 .../RobolectricGradleTestRunner.java          | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java

diff --git a/example/src/test/java/com/example/sugartest/NoteTest.java b/example/src/test/java/com/example/sugartest/NoteTest.java
index 675ee839..f483dbc6 100644
--- a/example/src/test/java/com/example/sugartest/NoteTest.java
+++ b/example/src/test/java/com/example/sugartest/NoteTest.java
@@ -2,15 +2,15 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 import com.example.models.Note;
 import com.example.models.Tag;
 
 
-@RunWith(RobolectricTestRunner.class)
-@Config(emulateSdk = 18, manifest = "example/src/main/AndroidManifest.xml")
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
 public class NoteTest {
     @Test
     public void simpleNoteTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java b/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
new file mode 100644
index 00000000..765df649
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
@@ -0,0 +1,23 @@
+package com.example.sugartest;
+
+import com.example.ClientApp;
+
+import org.junit.runners.model.InitializationError;
+import org.robolectric.AndroidManifest;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.res.Fs;
+
+public class RobolectricGradleTestRunner extends RobolectricTestRunner {
+    public RobolectricGradleTestRunner(Class<?> testClass) throws InitializationError {
+        super(testClass);
+    }
+
+    @Override protected AndroidManifest getAppManifest(Config config) {
+        String myAppPath = ClientApp.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        String manifestPath = myAppPath + "../../../../src/main/AndroidManifest.xml";
+        String resPath = myAppPath + "../../../../src/main/res";
+        String assetPath = myAppPath + "../../../../src/main/assets";
+        return createAppManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resPath), Fs.fileFromPath(assetPath));
+    }
+}
\ No newline at end of file

From b4faa634b4075b2c337b9abaa1b025cb93f4472e Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 18:59:26 -0700
Subject: [PATCH 088/305] Add RelationshipExtendedModel and tests

---
 .../models/RelationshipExtendedModel.java     |  18 +++
 .../sugartest/RelationshipExtendedTests.java  | 108 ++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/RelationshipExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java

diff --git a/example/src/main/java/com/example/models/RelationshipExtendedModel.java b/example/src/main/java/com/example/models/RelationshipExtendedModel.java
new file mode 100644
index 00000000..afa2d105
--- /dev/null
+++ b/example/src/main/java/com/example/models/RelationshipExtendedModel.java
@@ -0,0 +1,18 @@
+package com.example.models;
+
+
+import com.orm.SugarRecord;
+
+public class RelationshipExtendedModel extends SugarRecord {
+    private SimpleExtendedModel simple;
+
+    public RelationshipExtendedModel() {}
+
+    public RelationshipExtendedModel(SimpleExtendedModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleExtendedModel getSimple() {
+        return simple;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java b/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java
new file mode 100644
index 00000000..f3ba1355
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java
@@ -0,0 +1,108 @@
+package com.example.sugartest;
+
+import com.example.models.RelationshipExtendedModel;
+import com.example.models.SimpleExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class RelationshipExtendedTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        save(new RelationshipExtendedModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        save(new RelationshipExtendedModel(simple));
+        save(new RelationshipExtendedModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        save(new RelationshipExtendedModel(simple));
+        save(new RelationshipExtendedModel(another_simple));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipExtendedModel(simple));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            save(new RelationshipExtendedModel(simple));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipExtendedModel(simple));
+        }
+        List<RelationshipExtendedModel> models =
+                SugarRecord.listAll(RelationshipExtendedModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipExtendedModel model : models) {
+            assertEquals(simple.getId(), model.getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            save(new RelationshipExtendedModel(simple));
+        }
+        List<RelationshipExtendedModel> models =
+                SugarRecord.listAll(RelationshipExtendedModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipExtendedModel model : models) {
+            assertEquals(model.getId(), model.getSimple().getId());
+        }
+    }
+}

From a0bc007b87a0ee5584b189219e45bf6f8db6597f Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 19:00:02 -0700
Subject: [PATCH 089/305] Add RelationshipAnnotatedModel and tests

---
 .../models/RelationshipAnnotatedModel.java    |  23 ++++
 .../sugartest/RelationshipAnnotatedTests.java | 108 ++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java

diff --git a/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java b/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
new file mode 100644
index 00000000..aa0fff9c
--- /dev/null
+++ b/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
@@ -0,0 +1,23 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class RelationshipAnnotatedModel {
+    private SimpleAnnotatedModel simple;
+    private Long id;
+
+    public RelationshipAnnotatedModel() {}
+
+    public RelationshipAnnotatedModel(SimpleAnnotatedModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleAnnotatedModel getSimple() {
+        return simple;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java b/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java
new file mode 100644
index 00000000..83326c0c
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java
@@ -0,0 +1,108 @@
+package com.example.sugartest;
+
+import com.example.models.RelationshipAnnotatedModel;
+import com.example.models.SimpleAnnotatedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class RelationshipAnnotatedTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        save(new RelationshipAnnotatedModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        save(new RelationshipAnnotatedModel(simple));
+        save(new RelationshipAnnotatedModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        save(new RelationshipAnnotatedModel(simple));
+        save(new RelationshipAnnotatedModel(another_simple));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipAnnotatedModel(simple));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            save(new RelationshipAnnotatedModel(simple));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipAnnotatedModel(simple));
+        }
+        List<RelationshipAnnotatedModel> models =
+                SugarRecord.listAll(RelationshipAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipAnnotatedModel model : models) {
+            assertEquals(simple.getId(), model.getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            save(new RelationshipAnnotatedModel(simple));
+        }
+        List<RelationshipAnnotatedModel> models =
+                SugarRecord.listAll(RelationshipAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipAnnotatedModel model : models) {
+            assertEquals(model.getId(), model.getSimple().getId());
+        }
+    }
+}

From 66a5b3788466179ee23917c97526c523642317a2 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 19:00:36 -0700
Subject: [PATCH 090/305] Fix foreign key errors using annotated models

---
 library/src/main/java/com/orm/SugarRecord.java   | 16 +++++++++++++++-
 .../main/java/com/orm/util/ReflectionUtil.java   | 13 ++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 2c1a0655..7e46ec00 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -193,16 +193,30 @@ public static long save(Object object) {
     static long save(SQLiteDatabase db, Object object) {
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
         ContentValues values = new ContentValues(columns.size());
+        Field idField = null;
         for (Field column : columns) {
             ReflectionUtil.addFieldValueToColumn(values, column, object);
+            if (column.getName() == "id") {
+                idField = column;
+            }
         }
 
         long id = db.insertWithOnConflict(NamingHelper.toSQLName(object.getClass()), null, values,
                 SQLiteDatabase.CONFLICT_REPLACE);
 
-        if (SugarRecord.class.isAssignableFrom(object.getClass())) {
+        if (object.getClass().isAnnotationPresent(Table.class)) {
+            if (idField != null) {
+                idField.setAccessible(true);
+                try {
+                    idField.set(object, new Long(id));
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        } else if (SugarRecord.class.isAssignableFrom(object.getClass())) {
             ((SugarRecord) object).setId(id);
         }
+
         Log.i("Sugar", object.getClass().getSimpleName() + " saved : " + id);
 
         return id;
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index b755f7f0..dd8c419f 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -65,7 +65,18 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
             String columnName = NamingHelper.toSQLName(column);
             Object columnValue = column.get(object);
 
-            if (SugarRecord.class.isAssignableFrom(columnType)) {
+            if (columnType.isAnnotationPresent(Table.class)) {
+                Field field = null;
+                try {
+                    field = columnType.getDeclaredField("id");
+                    field.setAccessible(true);
+                } catch (NoSuchFieldException e) {
+                    e.printStackTrace();
+                }
+                values.put(columnName,
+                        (field != null)
+                                ? String.valueOf(field.get(columnValue)) : "0");
+            } else if (SugarRecord.class.isAssignableFrom(columnType)) {
                 values.put(columnName,
                         (columnValue != null)
                                 ? String.valueOf(((SugarRecord) columnValue).getId())

From fbd41760f1b531f403e5ce1fad3564c25de0f2ec Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 19:06:40 -0700
Subject: [PATCH 091/305] Add RelationshipMixedAModel and tests

---
 .../models/RelationshipMixedAModel.java       |  18 +++
 .../sugartest/RelationshipMixedATests.java    | 108 ++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/RelationshipMixedAModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/RelationshipMixedATests.java

diff --git a/example/src/main/java/com/example/models/RelationshipMixedAModel.java b/example/src/main/java/com/example/models/RelationshipMixedAModel.java
new file mode 100644
index 00000000..f09dd5c0
--- /dev/null
+++ b/example/src/main/java/com/example/models/RelationshipMixedAModel.java
@@ -0,0 +1,18 @@
+package com.example.models;
+
+
+import com.orm.SugarRecord;
+
+public class RelationshipMixedAModel extends SugarRecord {
+    private SimpleAnnotatedModel simple;
+
+    public RelationshipMixedAModel() {}
+
+    public RelationshipMixedAModel(SimpleAnnotatedModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleAnnotatedModel getSimple() {
+        return simple;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java b/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java
new file mode 100644
index 00000000..2793d247
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java
@@ -0,0 +1,108 @@
+package com.example.sugartest;
+
+import com.example.models.RelationshipMixedAModel;
+import com.example.models.SimpleAnnotatedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class RelationshipMixedATests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        save(new RelationshipMixedAModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        save(new RelationshipMixedAModel(simple));
+        save(new RelationshipMixedAModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        save(new RelationshipMixedAModel(simple));
+        save(new RelationshipMixedAModel(another_simple));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipMixedAModel(simple));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            save(new RelationshipMixedAModel(simple));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipMixedAModel(simple));
+        }
+        List<RelationshipMixedAModel> models =
+                SugarRecord.listAll(RelationshipMixedAModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipMixedAModel model : models) {
+            assertEquals(simple.getId(), model.getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            save(new RelationshipMixedAModel(simple));
+        }
+        List<RelationshipMixedAModel> models =
+                SugarRecord.listAll(RelationshipMixedAModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipMixedAModel model : models) {
+            assertEquals(model.getId(), model.getSimple().getId());
+        }
+    }
+}

From b66098ef8c4556c5defe436dd0d76c2d2d4757b8 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 19:06:54 -0700
Subject: [PATCH 092/305] Add RelationshipMixedBModel and tests

---
 .../models/RelationshipMixedBModel.java       |  24 ++++
 .../sugartest/RelationshipMixedBTests.java    | 108 ++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/RelationshipMixedBModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java

diff --git a/example/src/main/java/com/example/models/RelationshipMixedBModel.java b/example/src/main/java/com/example/models/RelationshipMixedBModel.java
new file mode 100644
index 00000000..9c9d2771
--- /dev/null
+++ b/example/src/main/java/com/example/models/RelationshipMixedBModel.java
@@ -0,0 +1,24 @@
+package com.example.models;
+
+
+import com.orm.dsl.Table;
+
+@Table
+public class RelationshipMixedBModel {
+    private SimpleExtendedModel simple;
+    private Long id;
+
+    public RelationshipMixedBModel() {}
+
+    public RelationshipMixedBModel(SimpleExtendedModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleExtendedModel getSimple() {
+        return simple;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java b/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java
new file mode 100644
index 00000000..408ffefe
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java
@@ -0,0 +1,108 @@
+package com.example.sugartest;
+
+import com.example.models.RelationshipMixedBModel;
+import com.example.models.SimpleExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class RelationshipMixedBTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        save(new RelationshipMixedBModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        save(new RelationshipMixedBModel(simple));
+        save(new RelationshipMixedBModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        save(new RelationshipMixedBModel(simple));
+        save(new RelationshipMixedBModel(another_simple));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipMixedBModel(simple));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            save(new RelationshipMixedBModel(simple));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipMixedBModel(simple));
+        }
+        List<RelationshipMixedBModel> models =
+                SugarRecord.listAll(RelationshipMixedBModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipMixedBModel model : models) {
+            assertEquals(simple.getId(), model.getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            save(new RelationshipMixedBModel(simple));
+        }
+        List<RelationshipMixedBModel> models =
+                SugarRecord.listAll(RelationshipMixedBModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipMixedBModel model : models) {
+            assertEquals(model.getId(), model.getSimple().getId());
+        }
+    }
+}

From a55748a647c8103fb0e336485d532e23adb6afd4 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 19:42:28 -0700
Subject: [PATCH 093/305] Added nested models and tests

---
 .../example/models/NestedAnnotatedModel.java  |  23 +++
 .../example/models/NestedExtendedModel.java   |  18 +++
 .../example/models/NestedMixedAAModel.java    |  18 +++
 .../example/models/NestedMixedABModel.java    |  18 +++
 .../example/models/NestedMixedBAModel.java    |  24 ++++
 .../example/models/NestedMixedBBModel.java    |  24 ++++
 .../sugartest/NestedAnnotatedTests.java       | 131 ++++++++++++++++++
 .../sugartest/NestedExtendedTests.java        | 131 ++++++++++++++++++
 .../example/sugartest/NestedMixedAATests.java | 131 ++++++++++++++++++
 .../example/sugartest/NestedMixedABTests.java | 131 ++++++++++++++++++
 .../example/sugartest/NestedMixedBATests.java | 131 ++++++++++++++++++
 .../example/sugartest/NestedMixedBBTests.java | 131 ++++++++++++++++++
 12 files changed, 911 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/NestedAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/NestedExtendedModel.java
 create mode 100644 example/src/main/java/com/example/models/NestedMixedAAModel.java
 create mode 100644 example/src/main/java/com/example/models/NestedMixedABModel.java
 create mode 100644 example/src/main/java/com/example/models/NestedMixedBAModel.java
 create mode 100644 example/src/main/java/com/example/models/NestedMixedBBModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
 create mode 100644 example/src/test/java/com/example/sugartest/NestedExtendedTests.java
 create mode 100644 example/src/test/java/com/example/sugartest/NestedMixedAATests.java
 create mode 100644 example/src/test/java/com/example/sugartest/NestedMixedABTests.java
 create mode 100644 example/src/test/java/com/example/sugartest/NestedMixedBATests.java
 create mode 100644 example/src/test/java/com/example/sugartest/NestedMixedBBTests.java

diff --git a/example/src/main/java/com/example/models/NestedAnnotatedModel.java b/example/src/main/java/com/example/models/NestedAnnotatedModel.java
new file mode 100644
index 00000000..8e834486
--- /dev/null
+++ b/example/src/main/java/com/example/models/NestedAnnotatedModel.java
@@ -0,0 +1,23 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class NestedAnnotatedModel {
+    private RelationshipAnnotatedModel nested;
+    private Long id;
+
+    public NestedAnnotatedModel() {}
+
+    public NestedAnnotatedModel(RelationshipAnnotatedModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipAnnotatedModel getNested() {
+        return nested;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/main/java/com/example/models/NestedExtendedModel.java b/example/src/main/java/com/example/models/NestedExtendedModel.java
new file mode 100644
index 00000000..369107c5
--- /dev/null
+++ b/example/src/main/java/com/example/models/NestedExtendedModel.java
@@ -0,0 +1,18 @@
+package com.example.models;
+
+
+import com.orm.SugarRecord;
+
+public class NestedExtendedModel extends SugarRecord {
+    private RelationshipExtendedModel nested;
+
+    public NestedExtendedModel() {}
+
+    public NestedExtendedModel(RelationshipExtendedModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipExtendedModel getNested() {
+        return nested;
+    }
+}
diff --git a/example/src/main/java/com/example/models/NestedMixedAAModel.java b/example/src/main/java/com/example/models/NestedMixedAAModel.java
new file mode 100644
index 00000000..f5f70753
--- /dev/null
+++ b/example/src/main/java/com/example/models/NestedMixedAAModel.java
@@ -0,0 +1,18 @@
+package com.example.models;
+
+
+import com.orm.SugarRecord;
+
+public class NestedMixedAAModel extends SugarRecord {
+    private RelationshipMixedAModel nested;
+
+    public NestedMixedAAModel() {}
+
+    public NestedMixedAAModel(RelationshipMixedAModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipMixedAModel getNested() {
+        return nested;
+    }
+}
diff --git a/example/src/main/java/com/example/models/NestedMixedABModel.java b/example/src/main/java/com/example/models/NestedMixedABModel.java
new file mode 100644
index 00000000..045de69f
--- /dev/null
+++ b/example/src/main/java/com/example/models/NestedMixedABModel.java
@@ -0,0 +1,18 @@
+package com.example.models;
+
+
+import com.orm.SugarRecord;
+
+public class NestedMixedABModel extends SugarRecord {
+    private RelationshipMixedBModel nested;
+
+    public NestedMixedABModel() {}
+
+    public NestedMixedABModel(RelationshipMixedBModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipMixedBModel getNested() {
+        return nested;
+    }
+}
diff --git a/example/src/main/java/com/example/models/NestedMixedBAModel.java b/example/src/main/java/com/example/models/NestedMixedBAModel.java
new file mode 100644
index 00000000..55a1e63b
--- /dev/null
+++ b/example/src/main/java/com/example/models/NestedMixedBAModel.java
@@ -0,0 +1,24 @@
+package com.example.models;
+
+
+import com.orm.dsl.Table;
+
+@Table
+public class NestedMixedBAModel {
+    private RelationshipMixedAModel nested;
+    private Long id;
+
+    public NestedMixedBAModel() {}
+
+    public NestedMixedBAModel(RelationshipMixedAModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipMixedAModel getNested() {
+        return nested;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/main/java/com/example/models/NestedMixedBBModel.java b/example/src/main/java/com/example/models/NestedMixedBBModel.java
new file mode 100644
index 00000000..b784f407
--- /dev/null
+++ b/example/src/main/java/com/example/models/NestedMixedBBModel.java
@@ -0,0 +1,24 @@
+package com.example.models;
+
+
+import com.orm.dsl.Table;
+
+@Table
+public class NestedMixedBBModel {
+    private RelationshipMixedBModel nested;
+    private Long id;
+
+    public NestedMixedBBModel() {}
+
+    public NestedMixedBBModel(RelationshipMixedBModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipMixedBModel getNested() {
+        return nested;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java b/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
new file mode 100644
index 00000000..267441ad
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
@@ -0,0 +1,131 @@
+package com.example.sugartest;
+
+import com.example.models.NestedAnnotatedModel;
+import com.example.models.RelationshipAnnotatedModel;
+import com.example.models.SimpleAnnotatedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class NestedAnnotatedTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(NestedAnnotatedModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        save(new NestedAnnotatedModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        save(new NestedAnnotatedModel(nested));
+        save(new NestedAnnotatedModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        RelationshipAnnotatedModel another_nested = new RelationshipAnnotatedModel(another_simple);
+        save(another_nested);
+        save(new NestedAnnotatedModel(nested));
+        save(new NestedAnnotatedModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedAnnotatedModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+            save(nested);
+            save(new NestedAnnotatedModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedAnnotatedModel(nested));
+        }
+        List<NestedAnnotatedModel> models = SugarRecord.listAll(NestedAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (NestedAnnotatedModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+            save(nested);
+            save(new NestedAnnotatedModel(nested));
+        }
+        List<NestedAnnotatedModel> models = SugarRecord.listAll(NestedAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (NestedAnnotatedModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/NestedExtendedTests.java b/example/src/test/java/com/example/sugartest/NestedExtendedTests.java
new file mode 100644
index 00000000..1c4171f6
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/NestedExtendedTests.java
@@ -0,0 +1,131 @@
+package com.example.sugartest;
+
+import com.example.models.NestedExtendedModel;
+import com.example.models.RelationshipExtendedModel;
+import com.example.models.SimpleExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class NestedExtendedTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(NestedExtendedModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        save(new NestedExtendedModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        save(new NestedExtendedModel(nested));
+        save(new NestedExtendedModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        RelationshipExtendedModel another_nested = new RelationshipExtendedModel(another_simple);
+        save(another_nested);
+        save(new NestedExtendedModel(nested));
+        save(new NestedExtendedModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedExtendedModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+            save(nested);
+            save(new NestedExtendedModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedExtendedModel(nested));
+        }
+        List<NestedExtendedModel> models = SugarRecord.listAll(NestedExtendedModel.class);
+        assertEquals(100, models.size());
+        for (NestedExtendedModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+            save(nested);
+            save(new NestedExtendedModel(nested));
+        }
+        List<NestedExtendedModel> models = SugarRecord.listAll(NestedExtendedModel.class);
+        assertEquals(100, models.size());
+        for (NestedExtendedModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedAATests.java b/example/src/test/java/com/example/sugartest/NestedMixedAATests.java
new file mode 100644
index 00000000..7d25a88c
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/NestedMixedAATests.java
@@ -0,0 +1,131 @@
+package com.example.sugartest;
+
+import com.example.models.NestedMixedAAModel;
+import com.example.models.RelationshipMixedAModel;
+import com.example.models.SimpleAnnotatedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class NestedMixedAATests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(NestedMixedAAModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        save(new NestedMixedAAModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(1L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        save(new NestedMixedAAModel(nested));
+        save(new NestedMixedAAModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        RelationshipMixedAModel another_nested = new RelationshipMixedAModel(another_simple);
+        save(another_nested);
+        save(new NestedMixedAAModel(nested));
+        save(new NestedMixedAAModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedAAModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+            save(nested);
+            save(new NestedMixedAAModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedAAModel(nested));
+        }
+        List<NestedMixedAAModel> models = SugarRecord.listAll(NestedMixedAAModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedAAModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+            save(nested);
+            save(new NestedMixedAAModel(nested));
+        }
+        List<NestedMixedAAModel> models = SugarRecord.listAll(NestedMixedAAModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedAAModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedABTests.java b/example/src/test/java/com/example/sugartest/NestedMixedABTests.java
new file mode 100644
index 00000000..78de85ef
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/NestedMixedABTests.java
@@ -0,0 +1,131 @@
+package com.example.sugartest;
+
+import com.example.models.NestedMixedABModel;
+import com.example.models.RelationshipMixedBModel;
+import com.example.models.SimpleExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class NestedMixedABTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(NestedMixedABModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        save(new NestedMixedABModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(1L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        save(new NestedMixedABModel(nested));
+        save(new NestedMixedABModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        RelationshipMixedBModel another_nested = new RelationshipMixedBModel(another_simple);
+        save(another_nested);
+        save(new NestedMixedABModel(nested));
+        save(new NestedMixedABModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedABModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+            save(nested);
+            save(new NestedMixedABModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedABModel(nested));
+        }
+        List<NestedMixedABModel> models = SugarRecord.listAll(NestedMixedABModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedABModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+            save(nested);
+            save(new NestedMixedABModel(nested));
+        }
+        List<NestedMixedABModel> models = SugarRecord.listAll(NestedMixedABModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedABModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedBATests.java b/example/src/test/java/com/example/sugartest/NestedMixedBATests.java
new file mode 100644
index 00000000..23d2d14b
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/NestedMixedBATests.java
@@ -0,0 +1,131 @@
+package com.example.sugartest;
+
+import com.example.models.NestedMixedBAModel;
+import com.example.models.RelationshipMixedAModel;
+import com.example.models.SimpleAnnotatedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class NestedMixedBATests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(NestedMixedBAModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        save(new NestedMixedBAModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(1L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        save(new NestedMixedBAModel(nested));
+        save(new NestedMixedBAModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        RelationshipMixedAModel another_nested = new RelationshipMixedAModel(another_simple);
+        save(another_nested);
+        save(new NestedMixedBAModel(nested));
+        save(new NestedMixedBAModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedBAModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+            save(nested);
+            save(new NestedMixedBAModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedBAModel(nested));
+        }
+        List<NestedMixedBAModel> models = SugarRecord.listAll(NestedMixedBAModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedBAModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+            save(nested);
+            save(new NestedMixedBAModel(nested));
+        }
+        List<NestedMixedBAModel> models = SugarRecord.listAll(NestedMixedBAModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedBAModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java b/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java
new file mode 100644
index 00000000..dc325a90
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java
@@ -0,0 +1,131 @@
+package com.example.sugartest;
+
+import com.example.models.NestedMixedBBModel;
+import com.example.models.RelationshipMixedBModel;
+import com.example.models.SimpleExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class NestedMixedBBTests {
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, SugarRecord.count(NestedMixedBBModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        save(new NestedMixedBBModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(1L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        save(new NestedMixedBBModel(nested));
+        save(new NestedMixedBBModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        RelationshipMixedBModel another_nested = new RelationshipMixedBModel(another_simple);
+        save(another_nested);
+        save(new NestedMixedBBModel(nested));
+        save(new NestedMixedBBModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedBBModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+            save(nested);
+            save(new NestedMixedBBModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedBBModel(nested));
+        }
+        List<NestedMixedBBModel> models = SugarRecord.listAll(NestedMixedBBModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedBBModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+            save(nested);
+            save(new NestedMixedBBModel(nested));
+        }
+        List<NestedMixedBBModel> models = SugarRecord.listAll(NestedMixedBBModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedBBModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}

From 0fead1d82eb0b95532a5ec45dbfa9ce639d54c75 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 23:17:15 -0700
Subject: [PATCH 094/305] Add string field models and tests

---
 .../models/StringFieldAnnotatedModel.java     | 19 ++++++++
 .../models/StringFieldExtendedModel.java      | 17 +++++++
 .../example/sugartest/StringFieldTests.java   | 48 +++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/StringFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/StringFieldTests.java

diff --git a/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java b/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
new file mode 100644
index 00000000..1e7e8ffe
--- /dev/null
+++ b/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
@@ -0,0 +1,19 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class StringFieldAnnotatedModel {
+    private String string;
+    private Long id;
+
+    public StringFieldAnnotatedModel() {}
+
+    public StringFieldAnnotatedModel(String string) {
+        this.string = string;
+    }
+
+    public String getString() {
+        return string;
+    }
+}
diff --git a/example/src/main/java/com/example/models/StringFieldExtendedModel.java b/example/src/main/java/com/example/models/StringFieldExtendedModel.java
new file mode 100644
index 00000000..f962123a
--- /dev/null
+++ b/example/src/main/java/com/example/models/StringFieldExtendedModel.java
@@ -0,0 +1,17 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class StringFieldExtendedModel extends SugarRecord {
+    private String string;
+
+    public StringFieldExtendedModel() {}
+
+    public StringFieldExtendedModel(String string) {
+        this.string = string;
+    }
+
+    public String getString() {
+        return string;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/StringFieldTests.java b/example/src/test/java/com/example/sugartest/StringFieldTests.java
new file mode 100644
index 00000000..c37446e4
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/StringFieldTests.java
@@ -0,0 +1,48 @@
+package com.example.sugartest;
+
+
+import com.example.models.StringFieldAnnotatedModel;
+import com.example.models.StringFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class StringFieldTests {
+    @Test
+    public void nullStringExtendedTest() {
+        save(new StringFieldExtendedModel());
+        StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
+        assertNull(model.getString());
+    }
+
+    @Test
+    public void nullStringAnnotatedTest() {
+        save(new StringFieldAnnotatedModel());
+        StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
+        assertNull(model.getString());
+    }
+
+    @Test
+    public void stringExtendedTest() {
+        String string = "Test String";
+        save(new StringFieldExtendedModel(string));
+        StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
+        assertEquals(string, model.getString());
+    }
+
+    @Test
+    public void stringAnnotatedTest() {
+        String string = "Test String";
+        save(new StringFieldAnnotatedModel(string));
+        StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
+        assertEquals(string, model.getString());
+    }
+}

From 6e25b6347b2b7dc2d54ecab1a4161e4a6b80d73b Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 23:23:51 -0700
Subject: [PATCH 095/305] Add integer field models and tests

---
 .../models/IntegerFieldAnnotatedModel.java    | 28 +++++++
 .../models/IntegerFieldExtendedModel.java     | 26 +++++++
 .../example/sugartest/IntegerFieldTests.java  | 76 +++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/IntegerFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/IntegerFieldTests.java

diff --git a/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java b/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
new file mode 100644
index 00000000..1b860ce1
--- /dev/null
+++ b/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class IntegerFieldAnnotatedModel {
+    private Integer integer;
+    private int rawInteger;
+    public Long id;
+
+    public IntegerFieldAnnotatedModel() {}
+
+    public IntegerFieldAnnotatedModel(Integer integer) {
+        this.integer = integer;
+    }
+
+    public IntegerFieldAnnotatedModel(int rawInteger) {
+        this.rawInteger = rawInteger;
+    }
+
+    public Integer getInteger() {
+        return integer;
+    }
+
+    public int getInt() {
+        return rawInteger;
+    }
+}
diff --git a/example/src/main/java/com/example/models/IntegerFieldExtendedModel.java b/example/src/main/java/com/example/models/IntegerFieldExtendedModel.java
new file mode 100644
index 00000000..b05df191
--- /dev/null
+++ b/example/src/main/java/com/example/models/IntegerFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class IntegerFieldExtendedModel extends SugarRecord {
+    private Integer integer;
+    private int rawInteger;
+
+    public IntegerFieldExtendedModel() {}
+
+    public IntegerFieldExtendedModel(Integer integer) {
+        this.integer = integer;
+    }
+
+    public IntegerFieldExtendedModel(int rawInteger) {
+        this.rawInteger = rawInteger;
+    }
+
+    public Integer getInteger() {
+        return integer;
+    }
+
+    public int getInt() {
+        return rawInteger;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/IntegerFieldTests.java b/example/src/test/java/com/example/sugartest/IntegerFieldTests.java
new file mode 100644
index 00000000..badb29dd
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/IntegerFieldTests.java
@@ -0,0 +1,76 @@
+package com.example.sugartest;
+
+
+import com.example.models.IntegerFieldAnnotatedModel;
+import com.example.models.IntegerFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class IntegerFieldTests {
+    @Test
+    public void nullIntegerExtendedTest() {
+        save(new IntegerFieldExtendedModel());
+        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        assertNull(model.getInteger());
+    }
+
+    @Test
+    public void nullIntExtendedTest() {
+        save(new IntegerFieldExtendedModel());
+        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        assertEquals(0, model.getInt());
+    }
+
+    @Test
+    public void nullIntegerAnnotatedTest() {
+        save(new IntegerFieldAnnotatedModel());
+        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        assertNull(model.getInteger());
+    }
+
+    @Test
+    public void nullIntAnnotatedTest() {
+        save(new IntegerFieldAnnotatedModel());
+        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        assertEquals(0, model.getInt());
+    }
+
+    @Test
+    public void integerExtendedTest() {
+        Integer integer = new Integer(25);
+        save(new IntegerFieldExtendedModel(integer));
+        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        assertEquals(integer, model.getInteger());
+    }
+
+    @Test
+    public void intExtendedTest() {
+        save(new IntegerFieldExtendedModel(25));
+        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        assertEquals(25, model.getInt());
+    }
+
+    @Test
+    public void integerAnnotatedTest() {
+        Integer integer = new Integer(25);
+        save(new IntegerFieldAnnotatedModel(integer));
+        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        assertEquals(integer, model.getInteger());
+    }
+
+    @Test
+    public void intAnnotatedTest() {
+        save(new IntegerFieldAnnotatedModel(25));
+        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        assertEquals(25, model.getInt());
+    }
+}

From b0f3383f0ba705f5023a89d3ee2cc90def6522f5 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 23:33:24 -0700
Subject: [PATCH 096/305] Add long field models and tests

---
 .../models/LongFieldAnnotatedModel.java       | 28 +++++++
 .../models/LongFieldExtendedModel.java        | 26 +++++++
 .../com/example/sugartest/LongFieldTests.java | 76 +++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/LongFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/LongFieldTests.java

diff --git a/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java b/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
new file mode 100644
index 00000000..c3986576
--- /dev/null
+++ b/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class LongFieldAnnotatedModel {
+    private Long objectLong;
+    private long rawLong;
+    private Long id;
+
+    public LongFieldAnnotatedModel() {}
+
+    public LongFieldAnnotatedModel(Long objectLong) {
+        this.objectLong = objectLong;
+    }
+
+    public LongFieldAnnotatedModel(long rawLong) {
+        this.rawLong = rawLong;
+    }
+
+    public Long getLong() {
+        return objectLong;
+    }
+
+    public long getRawLong() {
+        return rawLong;
+    }
+}
diff --git a/example/src/main/java/com/example/models/LongFieldExtendedModel.java b/example/src/main/java/com/example/models/LongFieldExtendedModel.java
new file mode 100644
index 00000000..19ccdaa5
--- /dev/null
+++ b/example/src/main/java/com/example/models/LongFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class LongFieldExtendedModel extends SugarRecord {
+    private Long objectLong;
+    private long rawLong;
+
+    public LongFieldExtendedModel() {}
+
+    public LongFieldExtendedModel(Long objectLong) {
+        this.objectLong = objectLong;
+    }
+
+    public LongFieldExtendedModel(long rawLong) {
+        this.rawLong = rawLong;
+    }
+
+    public Long getLong() {
+        return objectLong;
+    }
+
+    public long getRawLong() {
+        return rawLong;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/LongFieldTests.java b/example/src/test/java/com/example/sugartest/LongFieldTests.java
new file mode 100644
index 00000000..5f3f8998
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/LongFieldTests.java
@@ -0,0 +1,76 @@
+package com.example.sugartest;
+
+
+import com.example.models.LongFieldAnnotatedModel;
+import com.example.models.LongFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class LongFieldTests {
+    @Test
+    public void nullLongExtendedTest() {
+        save(new LongFieldExtendedModel());
+        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        assertNull(model.getLong());
+    }
+
+    @Test
+    public void nullRawLongExtendedTest() {
+        save(new LongFieldExtendedModel());
+        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        assertEquals(0L, model.getRawLong());
+    }
+
+    @Test
+    public void nullLongAnnotatedTest() {
+        save(new LongFieldAnnotatedModel());
+        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        assertNull(model.getLong());
+    }
+
+    @Test
+    public void nullRawLongAnnotatedTest() {
+        save(new LongFieldAnnotatedModel());
+        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        assertEquals(0L, model.getRawLong());
+    }
+
+    @Test
+    public void objectLongExtendedTest() {
+        Long objectLong = new Long(25L);
+        save(new LongFieldExtendedModel(objectLong));
+        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        assertEquals(objectLong, model.getLong());
+    }
+
+    @Test
+    public void rawLongExtendedTest() {
+        save(new LongFieldExtendedModel(25L));
+        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        assertEquals(25L, model.getRawLong());
+    }
+
+    @Test
+    public void objectLongAnnotatedTest() {
+        Long objectLong = new Long(25L);
+        save(new LongFieldAnnotatedModel(objectLong));
+        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        assertEquals(objectLong, model.getLong());
+    }
+
+    @Test
+    public void rawLongAnnotatedTest() {
+        save(new LongFieldAnnotatedModel(25L));
+        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        assertEquals(25L, model.getRawLong());
+    }
+}

From bb935e50a4bb96d16980198d2ce3f01e26284a19 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 23:37:54 -0700
Subject: [PATCH 097/305] Add short field models and tests

---
 .../models/ShortFieldAnnotatedModel.java      | 28 +++++++
 .../models/ShortFieldExtendedModel.java       | 26 +++++++
 .../example/sugartest/ShortFieldTests.java    | 76 +++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/ShortFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/ShortFieldTests.java

diff --git a/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java b/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
new file mode 100644
index 00000000..8393974b
--- /dev/null
+++ b/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class ShortFieldAnnotatedModel {
+    private Short objectShort;
+    private short rawShort;
+    private Long id;
+
+    public ShortFieldAnnotatedModel() {}
+
+    public ShortFieldAnnotatedModel(Short objectShort) {
+        this.objectShort = objectShort;
+    }
+
+    public ShortFieldAnnotatedModel(short rawShort) {
+        this.rawShort = rawShort;
+    }
+
+    public Short getShort() {
+        return objectShort;
+    }
+
+    public short getRawShort() {
+        return rawShort;
+    }
+}
diff --git a/example/src/main/java/com/example/models/ShortFieldExtendedModel.java b/example/src/main/java/com/example/models/ShortFieldExtendedModel.java
new file mode 100644
index 00000000..5373bb23
--- /dev/null
+++ b/example/src/main/java/com/example/models/ShortFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class ShortFieldExtendedModel extends SugarRecord {
+    private Short objectShort;
+    private short rawShort;
+
+    public ShortFieldExtendedModel() {}
+
+    public ShortFieldExtendedModel(Short objectShort) {
+        this.objectShort = objectShort;
+    }
+
+    public ShortFieldExtendedModel(short rawShort) {
+        this.rawShort = rawShort;
+    }
+
+    public Short getShort() {
+        return objectShort;
+    }
+
+    public short getRawShort() {
+        return rawShort;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/ShortFieldTests.java b/example/src/test/java/com/example/sugartest/ShortFieldTests.java
new file mode 100644
index 00000000..dd22b662
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/ShortFieldTests.java
@@ -0,0 +1,76 @@
+package com.example.sugartest;
+
+
+import com.example.models.ShortFieldAnnotatedModel;
+import com.example.models.ShortFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class ShortFieldTests {
+    @Test
+    public void nullShortExtendedTest() {
+        save(new ShortFieldExtendedModel());
+        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        assertNull(model.getShort());
+    }
+
+    @Test
+    public void nullRawShortExtendedTest() {
+        save(new ShortFieldExtendedModel());
+        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        assertEquals((short) 0, model.getRawShort());
+    }
+
+    @Test
+    public void nullShortAnnotatedTest() {
+        save(new ShortFieldAnnotatedModel());
+        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        assertNull(model.getShort());
+    }
+
+    @Test
+    public void nullRawShortAnnotatedTest() {
+        save(new ShortFieldAnnotatedModel());
+        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        assertEquals((short) 0, model.getRawShort());
+    }
+
+    @Test
+    public void objectShortExtendedTest() {
+        Short objectShort = new Short((short) 25);
+        save(new ShortFieldExtendedModel(objectShort));
+        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        assertEquals(objectShort, model.getShort());
+    }
+
+    @Test
+    public void rawShortExtendedTest() {
+        save(new ShortFieldExtendedModel((short) 25));
+        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        assertEquals((short) 25, model.getRawShort());
+    }
+
+    @Test
+    public void objectShortAnnotatedTest() {
+        Short objectShort = new Short((short) 25);
+        save(new ShortFieldAnnotatedModel(objectShort));
+        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        assertEquals(objectShort, model.getShort());
+    }
+
+    @Test
+    public void rawShortAnnotatedTest() {
+        save(new ShortFieldAnnotatedModel((short) 25));
+        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        assertEquals((short) 25, model.getRawShort());
+    }
+}

From 98027f266dee0a87cbc4553a8ec04d75413bb32a Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 23:43:27 -0700
Subject: [PATCH 098/305] Add float field models and tests

---
 .../models/FloatFieldAnnotatedModel.java      | 28 +++++++
 .../models/FloatFieldExtendedModel.java       | 26 +++++++
 .../example/sugartest/FloatFieldTests.java    | 76 +++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/FloatFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/FloatFieldTests.java

diff --git a/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java b/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
new file mode 100644
index 00000000..6d7f5e42
--- /dev/null
+++ b/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class FloatFieldAnnotatedModel {
+    private Float objectFloat;
+    private float rawFloat;
+    private Long id;
+
+    public FloatFieldAnnotatedModel() {}
+
+    public FloatFieldAnnotatedModel(Float objectFloat) {
+        this.objectFloat = objectFloat;
+    }
+
+    public FloatFieldAnnotatedModel(float rawFloat) {
+        this.rawFloat = rawFloat;
+    }
+
+    public Float getFloat() {
+        return objectFloat;
+    }
+
+    public float getRawFloat() {
+        return rawFloat;
+    }
+}
diff --git a/example/src/main/java/com/example/models/FloatFieldExtendedModel.java b/example/src/main/java/com/example/models/FloatFieldExtendedModel.java
new file mode 100644
index 00000000..0abf904b
--- /dev/null
+++ b/example/src/main/java/com/example/models/FloatFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class FloatFieldExtendedModel extends SugarRecord {
+    private Float objectFloat;
+    private float rawFloat;
+
+    public FloatFieldExtendedModel() {}
+
+    public FloatFieldExtendedModel(Float objectFloat) {
+        this.objectFloat = objectFloat;
+    }
+
+    public FloatFieldExtendedModel(float rawFloat) {
+        this.rawFloat = rawFloat;
+    }
+
+    public Float getFloat() {
+        return objectFloat;
+    }
+
+    public float getRawFloat() {
+        return rawFloat;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/FloatFieldTests.java b/example/src/test/java/com/example/sugartest/FloatFieldTests.java
new file mode 100644
index 00000000..669f2703
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/FloatFieldTests.java
@@ -0,0 +1,76 @@
+package com.example.sugartest;
+
+
+import com.example.models.FloatFieldAnnotatedModel;
+import com.example.models.FloatFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class FloatFieldTests {
+    @Test
+    public void nullFloatExtendedTest() {
+        save(new FloatFieldExtendedModel());
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        assertNull(model.getFloat());
+    }
+
+    @Test
+    public void nullRawFloatExtendedTest() {
+        save(new FloatFieldExtendedModel());
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        assertEquals(0F, model.getRawFloat(), 0.0000000001F);
+    }
+
+    @Test
+    public void nullFloatAnnotatedTest() {
+        save(new FloatFieldAnnotatedModel());
+        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        assertNull(model.getFloat());
+    }
+
+    @Test
+    public void nullRawFloatAnnotatedTest() {
+        save(new FloatFieldAnnotatedModel());
+        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        assertEquals(0F, model.getRawFloat(), 0.0000000001F);
+    }
+
+    @Test
+    public void objectFloatExtendedTest() {
+        Float objectFloat = new Float(25F);
+        save(new FloatFieldExtendedModel(objectFloat));
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        assertEquals(objectFloat, model.getFloat());
+    }
+
+    @Test
+    public void rawFloatExtendedTest() {
+        save(new FloatFieldExtendedModel(25F));
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        assertEquals(25F, model.getRawFloat(), 0.0000000001F);
+    }
+
+    @Test
+    public void objectFloatAnnotatedTest() {
+        Float objectFloat = new Float(25F);
+        save(new FloatFieldAnnotatedModel(objectFloat));
+        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        assertEquals(objectFloat, model.getFloat());
+    }
+
+    @Test
+    public void rawFloatAnnotatedTest() {
+        save(new FloatFieldAnnotatedModel(25F));
+        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        assertEquals(25F, model.getRawFloat(), 0.0000000001F);
+    }
+}

From a5e86cf5da98db8c1cc2a2edfc5901c805d5cf21 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 23:45:51 -0700
Subject: [PATCH 099/305] Add double field models and tests

---
 .../models/DoubleFieldAnnotatedModel.java     | 28 +++++++
 .../models/DoubleFieldExtendedModel.java      | 26 +++++++
 .../example/sugartest/DoubleFieldTests.java   | 76 +++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/DoubleFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/DoubleFieldTests.java

diff --git a/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java b/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
new file mode 100644
index 00000000..2f5fd428
--- /dev/null
+++ b/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class DoubleFieldAnnotatedModel {
+    private Double objectDouble;
+    private double rawDouble;
+    private Long id;
+
+    public DoubleFieldAnnotatedModel() {}
+
+    public DoubleFieldAnnotatedModel(Double objectDouble) {
+        this.objectDouble = objectDouble;
+    }
+
+    public DoubleFieldAnnotatedModel(double rawDouble) {
+        this.rawDouble = rawDouble;
+    }
+
+    public Double getDouble() {
+        return objectDouble;
+    }
+
+    public double getRawDouble() {
+        return rawDouble;
+    }
+}
diff --git a/example/src/main/java/com/example/models/DoubleFieldExtendedModel.java b/example/src/main/java/com/example/models/DoubleFieldExtendedModel.java
new file mode 100644
index 00000000..b0708b7c
--- /dev/null
+++ b/example/src/main/java/com/example/models/DoubleFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class DoubleFieldExtendedModel extends SugarRecord {
+    private Double objectDouble;
+    private double rawDouble;
+
+    public DoubleFieldExtendedModel() {}
+
+    public DoubleFieldExtendedModel(Double objectDouble) {
+        this.objectDouble = objectDouble;
+    }
+
+    public DoubleFieldExtendedModel(double rawDouble) {
+        this.rawDouble = rawDouble;
+    }
+
+    public Double getDouble() {
+        return objectDouble;
+    }
+
+    public double getRawDouble() {
+        return rawDouble;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/DoubleFieldTests.java b/example/src/test/java/com/example/sugartest/DoubleFieldTests.java
new file mode 100644
index 00000000..86f5bfde
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/DoubleFieldTests.java
@@ -0,0 +1,76 @@
+package com.example.sugartest;
+
+
+import com.example.models.DoubleFieldAnnotatedModel;
+import com.example.models.DoubleFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class DoubleFieldTests {
+    @Test
+    public void nullDoubleExtendedTest() {
+        save(new DoubleFieldExtendedModel());
+        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        assertNull(model.getDouble());
+    }
+
+    @Test
+    public void nullRawDoubleExtendedTest() {
+        save(new DoubleFieldExtendedModel());
+        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        assertEquals(0.0, model.getRawDouble(), 0.0000000001);
+    }
+
+    @Test
+    public void nullDoubleAnnotatedTest() {
+        save(new DoubleFieldAnnotatedModel());
+        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        assertNull(model.getDouble());
+    }
+
+    @Test
+    public void nullRawDoubleAnnotatedTest() {
+        save(new DoubleFieldAnnotatedModel());
+        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        assertEquals(0.0, model.getRawDouble(), 0.0000000001);
+    }
+
+    @Test
+    public void objectDoubleExtendedTest() {
+        Double objectDouble = new Double(25.0);
+        save(new DoubleFieldExtendedModel(objectDouble));
+        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        assertEquals(objectDouble, model.getDouble());
+    }
+
+    @Test
+    public void rawDoubleExtendedTest() {
+        save(new DoubleFieldExtendedModel(25.0));
+        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        assertEquals(25.0, model.getRawDouble(), 0.0000000001);
+    }
+
+    @Test
+    public void objectDoubleAnnotatedTest() {
+        Double objectDouble = new Double(25.0);
+        save(new DoubleFieldAnnotatedModel(objectDouble));
+        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        assertEquals(objectDouble, model.getDouble());
+    }
+
+    @Test
+    public void rawDoubleAnnotatedTest() {
+        save(new DoubleFieldAnnotatedModel(25.0));
+        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        assertEquals(25.0, model.getRawDouble(), 0.0000000001);
+    }
+}

From 3b90e871bc6b810986bfcca0f407116ab4764188 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Sun, 29 Mar 2015 23:52:46 -0700
Subject: [PATCH 100/305] Add boolean field models and tests

---
 .../models/BooleanFieldAnnotatedModel.java    | 28 +++++++
 .../models/BooleanFieldExtendedModel.java     | 26 +++++++
 .../example/sugartest/BooleanFieldTests.java  | 76 +++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/BooleanFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/BooleanFieldTests.java

diff --git a/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java b/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
new file mode 100644
index 00000000..d3a63edc
--- /dev/null
+++ b/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class BooleanFieldAnnotatedModel {
+    private Boolean objectBoolean;
+    private boolean rawBoolean;
+    private Long id;
+
+    public BooleanFieldAnnotatedModel() {}
+
+    public BooleanFieldAnnotatedModel(Boolean objectBoolean) {
+        this.objectBoolean = objectBoolean;
+    }
+
+    public BooleanFieldAnnotatedModel(boolean rawBoolean) {
+        this.rawBoolean = rawBoolean;
+    }
+
+    public Boolean getBoolean() {
+        return objectBoolean;
+    }
+
+    public boolean getRawBoolean() {
+        return rawBoolean;
+    }
+}
diff --git a/example/src/main/java/com/example/models/BooleanFieldExtendedModel.java b/example/src/main/java/com/example/models/BooleanFieldExtendedModel.java
new file mode 100644
index 00000000..972855cd
--- /dev/null
+++ b/example/src/main/java/com/example/models/BooleanFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class BooleanFieldExtendedModel extends SugarRecord {
+    private Boolean objectBoolean;
+    private boolean rawBoolean;
+
+    public BooleanFieldExtendedModel() {}
+
+    public BooleanFieldExtendedModel(Boolean objectBoolean) {
+        this.objectBoolean = objectBoolean;
+    }
+
+    public BooleanFieldExtendedModel(boolean rawBoolean) {
+        this.rawBoolean = rawBoolean;
+    }
+
+    public Boolean getBoolean() {
+        return objectBoolean;
+    }
+
+    public boolean getRawBoolean() {
+        return rawBoolean;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/BooleanFieldTests.java b/example/src/test/java/com/example/sugartest/BooleanFieldTests.java
new file mode 100644
index 00000000..849f5520
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/BooleanFieldTests.java
@@ -0,0 +1,76 @@
+package com.example.sugartest;
+
+
+import com.example.models.BooleanFieldAnnotatedModel;
+import com.example.models.BooleanFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class BooleanFieldTests {
+    @Test
+    public void nullBooleanExtendedTest() {
+        save(new BooleanFieldExtendedModel());
+        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        assertNull(model.getBoolean());
+    }
+
+    @Test
+    public void nullRawBooleanExtendedTest() {
+        save(new BooleanFieldExtendedModel());
+        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        assertEquals(false, model.getRawBoolean());
+    }
+
+    @Test
+    public void nullBooleanAnnotatedTest() {
+        save(new BooleanFieldAnnotatedModel());
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        assertNull(model.getBoolean());
+    }
+
+    @Test
+    public void nullRawBooleanAnnotatedTest() {
+        save(new BooleanFieldAnnotatedModel());
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        assertEquals(false, model.getRawBoolean());
+    }
+
+    @Test
+    public void objectBooleanExtendedTest() {
+        Boolean objectBoolean = new Boolean(true);
+        save(new BooleanFieldExtendedModel(objectBoolean));
+        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        assertEquals(objectBoolean, model.getBoolean());
+    }
+
+    @Test
+    public void rawBooleanExtendedTest() {
+        save(new BooleanFieldExtendedModel(true));
+        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        assertEquals(true, model.getRawBoolean());
+    }
+
+    @Test
+    public void objectBooleanAnnotatedTest() {
+        Boolean objectBoolean = new Boolean(true);
+        save(new BooleanFieldAnnotatedModel(objectBoolean));
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        assertEquals(objectBoolean, model.getBoolean());
+    }
+
+    @Test
+    public void rawBooleanAnnotatedTest() {
+        save(new BooleanFieldAnnotatedModel(true));
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        assertEquals(true, model.getRawBoolean());
+    }
+}

From 6370b6067fb9ce6096dfce658d43eb96949f87a7 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 08:05:51 -0700
Subject: [PATCH 101/305] Add IncompleteAnnotatedModel and test

---
 .../models/IncompleteAnnotatedModel.java      |  9 ++++++++
 .../IncompleteAnnotatedModelTests.java        | 21 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java

diff --git a/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java b/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
new file mode 100644
index 00000000..e524d22f
--- /dev/null
+++ b/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
@@ -0,0 +1,9 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class IncompleteAnnotatedModel {
+    // An annotated model must provide a Long id field. A setter or getter is optional
+    public IncompleteAnnotatedModel() {}
+}
diff --git a/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
new file mode 100644
index 00000000..5b3c94ba
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
@@ -0,0 +1,21 @@
+package com.example.sugartest;
+
+
+import android.database.sqlite.SQLiteException;
+
+import com.example.models.IncompleteAnnotatedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class IncompleteAnnotatedModelTests {
+    @Test(expected=SQLiteException.class)
+    public void noIdFieldTest() {
+        save(new IncompleteAnnotatedModel());
+    }
+}

From bee5ef31e20d3a2813b066d4e7f07b175425159c Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 19:50:19 -0700
Subject: [PATCH 102/305] Make gradle wrappers executable

---
 gradlew     | 0
 gradlew.bat | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 gradlew
 mode change 100644 => 100755 gradlew.bat

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/gradlew.bat b/gradlew.bat
old mode 100644
new mode 100755

From 110e4e22f13774d7a83adbe5beecb6c02a9b10d2 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 20:33:41 -0700
Subject: [PATCH 103/305] Add ListAllOrderByTests

---
 .../sugartest/ListAllOrderByTests.java        | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 example/src/test/java/com/example/sugartest/ListAllOrderByTests.java

diff --git a/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java b/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java
new file mode 100644
index 00000000..e6dfb8e3
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java
@@ -0,0 +1,53 @@
+package com.example.sugartest;
+
+
+import com.example.models.IntegerFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class ListAllOrderByTests {
+    @Test
+    public void listAllOrderByEmptyTest() {
+        assertEquals(0L, SugarRecord.listAll(IntegerFieldExtendedModel.class, "id").size());
+    }
+
+    @Test
+    public void listAllOrderByIdTest() {
+        for(int i = 1; i <= 100; i++) {
+            save(new IntegerFieldExtendedModel(i));
+        }
+        List<IntegerFieldExtendedModel> models =
+                SugarRecord.listAll(IntegerFieldExtendedModel.class, "id");
+        assertEquals(100L, models.size());
+        Long id = models.get(0).getId();
+        for(int i = 1; i < 100; i++) {
+            assertTrue(id <models.get(i).getId());
+        }
+    }
+
+    @Test
+    public void listAllOrderByFieldTest() {
+        for(int i = 1; i <= 100; i++) {
+            save(new IntegerFieldExtendedModel(i));
+        }
+        List<IntegerFieldExtendedModel> models =
+                SugarRecord.listAll(IntegerFieldExtendedModel.class, "raw_integer");
+        assertEquals(100L, models.size());
+        int raw = models.get(0).getInt();
+        for(int i = 1; i < 100; i++) {
+            assertTrue(raw < models.get(i).getInt());
+        }
+    }
+}

From d6fa570467c5e02423c95854605a0d531139ad88 Mon Sep 17 00:00:00 2001
From: Shyish <Shyish@users.noreply.github.com>
Date: Thu, 26 Mar 2015 21:06:55 +0100
Subject: [PATCH 104/305] ListAll with orderBy Closes #285

---
 library/src/main/java/com/orm/SugarRecord.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 7e46ec00..b70397c4 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -64,6 +64,10 @@ public static <T> void saveInTx(Collection<T> objects) {
     public static <T> List<T> listAll(Class<T> type) {
         return find(type, null, null, null, null, null);
     }
+    
+    public static <T> List<T> listAll(Class<T> type, String orderBy) {
+        return find(type, null, null, null, orderBy, null);
+    }
 
     public static <T> T findById(Class<T> type, Long id) {
         List<T> list = find(type, "id=?", new String[]{String.valueOf(id)}, null, null, "1");

From 82bc889306abe26a1c34edca6a38baec848ea800 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 21:06:43 -0700
Subject: [PATCH 105/305] Add delete and delete in transaction tests

---
 .../sugartest/SimpleAnnotatedModelTests.java  | 36 +++++++++++++++++++
 .../sugartest/SimpleExtendedModelTests.java   | 29 ++++++++++++++-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
index 5c3ed6a9..4117cc48 100644
--- a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
@@ -8,6 +8,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -76,6 +77,15 @@ public void whereBrokenCountTest() throws Exception {
         assertEquals(-1L, SugarRecord.count(SimpleAnnotatedModel.class, "di = ?", new String[]{"1"}));
     }
 
+    @Test
+    public void deleteTest() throws Exception {
+        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
+        save(model);
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        SugarRecord.delete(model);
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
     @Test
     public void deleteAllTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
@@ -94,6 +104,32 @@ public void deleteAllWhereTest() throws Exception {
         assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
+    @Test
+    public void deleteInTransactionFewTest() throws Exception {
+        SimpleAnnotatedModel first = new SimpleAnnotatedModel();
+        SimpleAnnotatedModel second = new SimpleAnnotatedModel();
+        SimpleAnnotatedModel third = new SimpleAnnotatedModel();
+        save(first);
+        save(second);
+        save(third);
+        assertEquals(3L, SugarRecord.count(SimpleAnnotatedModel.class));
+        SugarRecord.deleteInTx(first, second, third);
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void deleteInTransactionManyTest() throws Exception {
+        List<SimpleAnnotatedModel> models = new ArrayList<>();
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel model = new SimpleAnnotatedModel();
+            models.add(model);
+            save(model);
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        SugarRecord.deleteInTx(models);
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
     @Test
     public void saveInTransactionTest() throws Exception {
         SugarRecord.saveInTx(new SimpleAnnotatedModel(), new SimpleAnnotatedModel());
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
index ccae3fb7..50e5f09f 100644
--- a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
@@ -8,6 +8,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -88,7 +89,7 @@ public void deleteTest() throws Exception {
         SimpleExtendedModel model = new SimpleExtendedModel();
         save(model);
         assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        model.delete();
+        SugarRecord.delete(model);
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
@@ -110,6 +111,32 @@ public void deleteAllWhereTest() throws Exception {
         assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
+    @Test
+    public void deleteInTransactionFewTest() throws Exception {
+        SimpleExtendedModel first = new SimpleExtendedModel();
+        SimpleExtendedModel second = new SimpleExtendedModel();
+        SimpleExtendedModel third = new SimpleExtendedModel();
+        save(first);
+        save(second);
+        save(third);
+        assertEquals(3L, SugarRecord.count(SimpleExtendedModel.class));
+        SugarRecord.deleteInTx(first, second, third);
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void deleteInTransactionManyTest() throws Exception {
+        List<SimpleExtendedModel> models = new ArrayList<>();
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel model = new SimpleExtendedModel();
+            models.add(model);
+            save(model);
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        SugarRecord.deleteInTx(models);
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
     @Test
     public void saveInTransactionTest() throws Exception {
         SugarRecord.saveInTx(new SimpleExtendedModel(), new SimpleExtendedModel());

From e60c57150992598a1b5b813a91933d59fbf47fa0 Mon Sep 17 00:00:00 2001
From: Jeroen Mols <jmols.mobile@gmail.com>
Date: Sat, 31 Jan 2015 11:37:33 +0100
Subject: [PATCH 106/305] Added bulk delete for persisted objects Closes #253

---
 .../src/main/java/com/orm/SugarRecord.java    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index b70397c4..d5538c6a 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -61,6 +61,29 @@ public static <T> void saveInTx(Collection<T> objects) {
         }
     }
 
+    @SuppressWarnings("deprecation")
+    public static <T> void deleteInTx(T... objects) {
+        deleteInTx(Arrays.asList(objects));
+    }
+
+    @SuppressWarnings("deprecation")
+    public static <T> void deleteInTx(Collection<T> objects) {
+        SQLiteDatabase sqLiteDatabase = getSugarContext().getSugarDb().getDB();
+        try {
+            sqLiteDatabase.beginTransaction();
+            sqLiteDatabase.setLockingEnabled(false);
+            for (T object : objects) {
+                SugarRecord.delete(object);
+            }
+            sqLiteDatabase.setTransactionSuccessful();
+        } catch (Exception e) {
+            Log.i("Sugar", "Error in deleting in transaction " + e.getMessage());
+        } finally {
+            sqLiteDatabase.endTransaction();
+            sqLiteDatabase.setLockingEnabled(true);
+        }
+    }
+
     public static <T> List<T> listAll(Class<T> type) {
         return find(type, null, null, null, null, null);
     }
@@ -251,6 +274,14 @@ public void delete() {
         db.delete(NamingHelper.toSQLName(getClass()), "Id=?", new String[]{getId().toString()});
         Log.i("Sugar", getClass().getSimpleName() + " deleted : " + getId().toString());
     }
+    
+    public static void delete(Object object) {
+        if (!(object instanceof SugarRecord)) {
+            Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - not a sugarRecord");
+            return;
+        }
+        ((SugarRecord) object).delete();
+    }
 
     public long save() {
         return save(getSugarContext().getSugarDb().getDB(), this);

From c55821a63a048719c55e21f9c41a9bd745111dd1 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 21:27:51 -0700
Subject: [PATCH 107/305] Fix up some delete methods

---
 .../src/main/java/com/orm/SugarRecord.java    | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index d5538c6a..f6c9ef13 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -270,17 +270,46 @@ private static void inflate(Cursor cursor, Object object) {
     }
 
     public void delete() {
-        SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
-        db.delete(NamingHelper.toSQLName(getClass()), "Id=?", new String[]{getId().toString()});
-        Log.i("Sugar", getClass().getSimpleName() + " deleted : " + getId().toString());
+        Long id = getId();
+        Class<?> type = getClass();
+        if (id != null && id > 0L) {
+            SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
+            db.delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()});
+            Log.i("Sugar", type.getSimpleName() + " deleted : " + id.toString());
+        } else {
+            Log.i("Sugar", "Cannot delete object: " + type.getSimpleName() + " - object has not been saved");
+            return;
+        }
     }
     
     public static void delete(Object object) {
-        if (!(object instanceof SugarRecord)) {
-            Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - not a sugarRecord");
+        Class<?> type = object.getClass();
+        if (type.isAnnotationPresent(Table.class)) {
+            try {
+                Field field = type.getDeclaredField("id");
+                field.setAccessible(true);
+                Long id = (Long) field.get(object);
+                if (id != null && id > 0L) {
+                    SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
+                    db.delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()});
+                    Log.i("Sugar", type.getSimpleName() + " deleted : " + id.toString());
+                } else {
+                    Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - object has not been saved");
+                    return;
+                }
+            } catch (NoSuchFieldException e) {
+                Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - annotated object has no id");
+                return;
+            } catch (IllegalAccessException e) {
+                Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - can't access id");
+                return;
+            }
+        } else if (SugarRecord.class.isAssignableFrom(type)) {
+            ((SugarRecord) object).delete();
+        } else {
+            Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - not persisted");
             return;
         }
-        ((SugarRecord) object).delete();
     }
 
     public long save() {

From abf4a494bf8211fb676ed710d005e21d636e15c2 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 21:28:07 -0700
Subject: [PATCH 108/305] Add unsaved delete tests

---
 .../com/example/sugartest/SimpleAnnotatedModelTests.java  | 8 ++++++++
 .../com/example/sugartest/SimpleExtendedModelTests.java   | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
index 4117cc48..35a31f12 100644
--- a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
@@ -86,6 +86,14 @@ public void deleteTest() throws Exception {
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
+    @Test
+    public void deleteUnsavedTest() throws Exception {
+        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        SugarRecord.delete(model);
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
     @Test
     public void deleteAllTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
index 50e5f09f..f683fc31 100644
--- a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
@@ -93,6 +93,14 @@ public void deleteTest() throws Exception {
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
+    @Test
+    public void deleteUnsavedTest() throws Exception {
+        SimpleExtendedModel model = new SimpleExtendedModel();
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        SugarRecord.delete(model);
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
     @Test
     public void deleteAllTest() throws Exception {
         for (int i = 1; i <= 100; i++) {

From 6808ef4e8723c28b95bb76142c5764f84f665945 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 21:50:34 -0700
Subject: [PATCH 109/305] Use a single test executor

---
 example/build.gradle | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/example/build.gradle b/example/build.gradle
index 8ab86abb..a017d24a 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -36,13 +36,6 @@ robolectric {
     // Configure the test JVM arguments - Does not apply to Java 8
     jvmArgs '-XX:MaxPermSize=512m', '-XX:-UseSplitVerifier'
 
-    // Specify max number of processes (default is 1)
-    maxParallelForks = 4
-
-    // Specify max number of test classes to execute in a test process
-    // before restarting the process (default is unlimited)
-    forkEvery = 150
-
     // configure whether failing tests should fail the build
     ignoreFailures true
 

From 7cc9ca3f34a93b93c6484c57811bdde15f89a953 Mon Sep 17 00:00:00 2001
From: Chinseok Lee <allieuslee@gmail.com>
Date: Thu, 27 Nov 2014 05:35:06 +0900
Subject: [PATCH 110/305] Performance Improvement for getDomainClasses() Closes
 #202

Thanks @allieus for the pull request!
---
 .../src/main/java/com/orm/util/ReflectionUtil.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index dd8c419f..15ce2276 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -225,10 +225,8 @@ public static List<Class> getDomainClasses(Context context) {
         List<Class> domainClasses = new ArrayList<Class>();
         try {
             for (String className : getAllClasses(context)) {
-                if (className.startsWith(ManifestHelper.getDomainPackageName(context))) {
-                    Class domainClass = getDomainClass(className, context);
-                    if (domainClass != null) domainClasses.add(domainClass);
-                }
+                Class domainClass = getDomainClass(className, context);
+                if (domainClass != null) domainClasses.add(domainClass);
             }
         } catch (IOException e) {
             Log.e("Sugar", e.getMessage());
@@ -264,13 +262,15 @@ private static Class getDomainClass(String className, Context context) {
 
 
     private static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
+        String packageName = ManifestHelper.getDomainPackageName(context);
         String path = getSourcePath(context);
         List<String> classNames = new ArrayList<String>();
         try {
             DexFile dexfile = new DexFile(path);
             Enumeration<String> dexEntries = dexfile.entries();
             while (dexEntries.hasMoreElements()) {
-                classNames.add(dexEntries.nextElement());
+                String className = dexEntries.nextElement();
+                if (className.startsWith(packageName)) classNames.add(className);
             }
         } catch (NullPointerException e) {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
@@ -283,7 +283,9 @@ private static List<String> getAllClasses(Context context) throws PackageManager
                     for (File filePath : classDirectory.listFiles()) {
                         populateFiles(filePath, fileNames, "");
                     }
-                    classNames.addAll(fileNames);
+                    for (String fileName : fileNames) {
+                        if (fileName.startsWith(packageName)) classNames.add(fileName);
+                    }
                 }
             }
         }

From 07fd12772d91552f5650c62684de85eb4842913a Mon Sep 17 00:00:00 2001
From: wf2030 <knight2030@163.com>
Date: Wed, 28 Jan 2015 11:07:03 +0800
Subject: [PATCH 111/305] Use sqlite_master to determine if a table exists
 Closes #246

Thanks @wf2030 for the pull request!
---
 library/src/main/java/com/orm/SchemaGenerator.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index a7f25b51..590e259e 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -1,10 +1,11 @@
 package com.orm;
 
 import android.content.Context;
+import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
 import android.util.Log;
+
 import com.orm.dsl.Column;
 import com.orm.dsl.NotNull;
 import com.orm.dsl.Unique;
@@ -41,13 +42,11 @@ public void createDatabase(SQLiteDatabase sqLiteDatabase) {
 
     public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
         List<Class> domainClasses = getDomainClasses(context);
+        String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
         for (Class domain : domainClasses) {
-            try {  // we try to do a select, if fails then (?) there isn't the table
-                sqLiteDatabase.query(NamingHelper.toSQLName(domain), null, null, null, null, null, null);
-            } catch (SQLiteException e) {
-                Log.i("Sugar", String.format("Creating table on update (error was '%s')",
-                        e.getMessage()));
-                createTable(domain, sqLiteDatabase);
+            Cursor c = sqLiteDatabase.rawQuery(String.format(sql, NamingHelper.toSQLName(domain)), null);
+            if (c.moveToFirst() && c.getInt(0) == 0) {
+            	createTable(domain, sqLiteDatabase);
             }
         }
         executeSugarUpgrade(sqLiteDatabase, oldVersion, newVersion);

From 7dd20cffdb0b7b369473a9b2f94985e4714db674 Mon Sep 17 00:00:00 2001
From: Dominic Wong <dominic.wong.617@gmail.com>
Date: Wed, 25 Feb 2015 11:13:20 +0800
Subject: [PATCH 112/305] Add SugarRecord.findById function that accepts an
 array of id strings as an argument Closes #273

Thanks @dominicwong617 for the pull request!
---
 library/src/main/java/com/orm/SugarRecord.java    |  7 +++++++
 .../src/main/java/com/orm/util/QueryBuilder.java  | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index f6c9ef13..f021b973 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -11,7 +11,9 @@
 import com.orm.dsl.Table;
 import com.orm.util.NamingHelper;
 import com.orm.util.ReflectionUtil;
+import com.orm.util.QueryBuilder;
 
+import java.lang.String;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -102,6 +104,11 @@ public static <T> T findById(Class<T> type, Integer id) {
         return findById(type, Long.valueOf(id));
     }
 
+    public static <T> List<T> findById(Class<T> type, String[] ids) {
+        String whereClause = "id IN (" + QueryBuilder.generatePlaceholders(ids.length) + ")";
+        return find(type, whereClause, ids);
+    }
+
     public static <T> Iterator<T> findAll(Class<T> type) {
         return findAsIterator(type, null, null, null, null, null);
     }
diff --git a/library/src/main/java/com/orm/util/QueryBuilder.java b/library/src/main/java/com/orm/util/QueryBuilder.java
index 6de9e8ca..5dfa36c6 100644
--- a/library/src/main/java/com/orm/util/QueryBuilder.java
+++ b/library/src/main/java/com/orm/util/QueryBuilder.java
@@ -2,6 +2,9 @@
 
 import com.orm.SugarRecord;
 
+import java.lang.RuntimeException;
+import java.lang.StringBuilder;
+
 public class QueryBuilder {
 
     public static String getColumnType(Class<?> type) {
@@ -38,4 +41,16 @@ public static String getColumnType(Class<?> type) {
         return "";
     }
 
+    public static String generatePlaceholders(int numberOfArgs) {
+        if (numberOfArgs < 1) {
+            throw new RuntimeException("The number of arguments must be greater than or equal to 1.");
+        }
+
+        StringBuilder stringBuilder = new StringBuilder(numberOfArgs * 2 - 1);
+        stringBuilder.append("?");
+        for (int i = 1; i < numberOfArgs; i++) {
+            stringBuilder.append(",?");
+        }
+        return stringBuilder.toString();
+    }
 }

From 56dd86b8dc54357668bef03972969053aec2228e Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 23:38:00 -0700
Subject: [PATCH 113/305] Add query builder test

---
 .../java/com/orm/query/QueryBuilderTests.java | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 library/src/test/java/com/orm/query/QueryBuilderTests.java

diff --git a/library/src/test/java/com/orm/query/QueryBuilderTests.java b/library/src/test/java/com/orm/query/QueryBuilderTests.java
new file mode 100644
index 00000000..96e3c79f
--- /dev/null
+++ b/library/src/test/java/com/orm/query/QueryBuilderTests.java
@@ -0,0 +1,29 @@
+package com.orm.query;
+
+import com.orm.util.QueryBuilder;
+
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+public class QueryBuilderTests {
+    @Test(expected=RuntimeException.class)
+    public void noArgumentsTest() {
+        QueryBuilder.generatePlaceholders(0);
+    }
+
+    @Test()
+    public void oneArgumentsTest() {
+        assertEquals("?", QueryBuilder.generatePlaceholders(1));
+    }
+
+    @Test
+    public void twoArgumentsTest() {
+        assertEquals("?,?", QueryBuilder.generatePlaceholders(2));
+    }
+
+    @Test
+    public void manyArgumentsTest() {
+        assertEquals("?,?,?,?,?,?,?,?,?,?", QueryBuilder.generatePlaceholders(10));
+    }
+}

From 45dce3f593407df5024c115dddce509d80d5e982 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Tue, 31 Mar 2015 23:38:12 -0700
Subject: [PATCH 114/305] Add findById string array tests

---
 .../sugartest/SimpleAnnotatedModelTests.java  | 56 +++++++++++++++++++
 .../sugartest/SimpleExtendedModelTests.java   | 56 +++++++++++++++++++
 2 files changed, 112 insertions(+)

diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
index 35a31f12..b058435a 100644
--- a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
@@ -192,6 +192,62 @@ public void findByIdIntegerTest() throws Exception {
         assertEquals(new Long(1L), SugarRecord.findById(SimpleAnnotatedModel.class, 1).getId());
     }
 
+    @Test
+    public void findByIdStringsNullTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        assertEquals(0, SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{""}).size());
+    }
+
+    @Test
+    public void findByIdStringsOneTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1"});
+        assertEquals(1, models.size());
+        assertEquals(new Long(1L), models.get(0).getId());
+    }
+
+    @Test
+    public void findByIdStringsTwoTest() throws Exception {
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1", "3"});
+        assertEquals(2, models.size());
+        assertEquals(new Long(1L), models.get(0).getId());
+        assertEquals(new Long(3L), models.get(1).getId());
+    }
+
+    @Test
+    public void findByIdStringsManyTest() throws Exception {
+        for (int i = 1; i <= 10; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1", "3", "6", "10"});
+        assertEquals(4, models.size());
+        assertEquals(new Long(1L), models.get(0).getId());
+        assertEquals(new Long(3L), models.get(1).getId());
+        assertEquals(new Long(6L), models.get(2).getId());
+        assertEquals(new Long(10L), models.get(3).getId());
+    }
+
+    @Test
+    public void findByIdStringsOrderTest() throws Exception {
+        for (int i = 1; i <= 10; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"10", "6", "3", "1"});
+        assertEquals(4, models.size());
+        // The order of the query doesn't matter
+        assertEquals(new Long(1L), models.get(0).getId());
+        assertEquals(new Long(3L), models.get(1).getId());
+        assertEquals(new Long(6L), models.get(2).getId());
+        assertEquals(new Long(10L), models.get(3).getId());
+    }
+
     @Test
     public void findByIdNullTest() throws Exception {
         save(new SimpleAnnotatedModel());
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
index f683fc31..eb61a212 100644
--- a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
@@ -199,6 +199,62 @@ public void findByIdIntegerTest() throws Exception {
         assertEquals(new Long(1L), SugarRecord.findById(SimpleExtendedModel.class, 1).getId());
     }
 
+    @Test
+    public void findByIdStringsNullTest() throws Exception {
+        save(new SimpleExtendedModel());
+        assertEquals(0, SugarRecord.findById(SimpleExtendedModel.class, new String[]{""}).size());
+    }
+
+    @Test
+    public void findByIdStringsOneTest() throws Exception {
+        save(new SimpleExtendedModel());
+        List<SimpleExtendedModel> models =
+                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1"});
+        assertEquals(1, models.size());
+        assertEquals(new Long(1L), models.get(0).getId());
+    }
+
+    @Test
+    public void findByIdStringsTwoTest() throws Exception {
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        List<SimpleExtendedModel> models =
+                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1", "3"});
+        assertEquals(2, models.size());
+        assertEquals(new Long(1L), models.get(0).getId());
+        assertEquals(new Long(3L), models.get(1).getId());
+    }
+
+    @Test
+    public void findByIdStringsManyTest() throws Exception {
+        for (int i = 1; i <= 10; i++) {
+            save(new SimpleExtendedModel());
+        }
+        List<SimpleExtendedModel> models =
+                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1", "3", "6", "10"});
+        assertEquals(4, models.size());
+        assertEquals(new Long(1L), models.get(0).getId());
+        assertEquals(new Long(3L), models.get(1).getId());
+        assertEquals(new Long(6L), models.get(2).getId());
+        assertEquals(new Long(10L), models.get(3).getId());
+    }
+
+    @Test
+    public void findByIdStringsOrderTest() throws Exception {
+        for (int i = 1; i <= 10; i++) {
+            save(new SimpleExtendedModel());
+        }
+        List<SimpleExtendedModel> models =
+                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"10", "6", "3", "1"});
+        assertEquals(4, models.size());
+        // The order of the query doesn't matter
+        assertEquals(new Long(1L), models.get(0).getId());
+        assertEquals(new Long(3L), models.get(1).getId());
+        assertEquals(new Long(6L), models.get(2).getId());
+        assertEquals(new Long(10L), models.get(3).getId());
+    }
+
     @Test
     public void findByIdNullTest() throws Exception {
         save(new SimpleExtendedModel());

From 411ce64575d928b6721ac70548f2b0166f7d450b Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Wed, 1 Apr 2015 20:07:14 -0700
Subject: [PATCH 115/305] Use gradlew do a connectivity check

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5c8449f2..7e2b96b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ android:
     - android-21
 
 script:
-  - gradle clean build coveralls
+  - ./gradlew clean build connectedCheck coveralls
 
 cache:
   directories:

From 3e0ad6bb9e410a4ce3c14699776b3fd59ea99798 Mon Sep 17 00:00:00 2001
From: Chris Desch <cdesch@gmail.com>
Date: Tue, 31 Mar 2015 11:42:20 -0400
Subject: [PATCH 116/305] Adding first and last helpers for record retrieval

Adding Adding first and last helpers for record retrieval. Respectively, the first method gets the first record and the last method gets the last record.
---
 library/src/main/java/com/orm/SugarRecord.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index f021b973..ee80e4e6 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -109,6 +109,14 @@ public static <T> List<T> findById(Class<T> type, String[] ids) {
         return find(type, whereClause, ids);
     }
 
+    public static <T> T first(Class<T>type){
+        return findById(type, 0);
+    }
+
+    public static <T> T last(Class<T>type){
+        return findById(type, count(type) - 1);
+    }
+
     public static <T> Iterator<T> findAll(Class<T> type) {
         return findAsIterator(type, null, null, null, null, null);
     }

From 7e8590aac069d1c0947a04b62cfe04ac32b99f87 Mon Sep 17 00:00:00 2001
From: Chris Desch <cdesch@gmail.com>
Date: Tue, 31 Mar 2015 13:37:08 -0400
Subject: [PATCH 117/305] Adding tests for Helper methods first and last

Adding tests for Helper methods first and last
---
 .../example/sugartest/HelperRecordTests.java  | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 example/src/test/java/com/example/sugartest/HelperRecordTests.java

diff --git a/example/src/test/java/com/example/sugartest/HelperRecordTests.java b/example/src/test/java/com/example/sugartest/HelperRecordTests.java
new file mode 100644
index 00000000..b9e81bb1
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/HelperRecordTests.java
@@ -0,0 +1,53 @@
+package com.example.sugartest;
+
+
+import com.example.models.FloatFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class HelperRecordTests {
+    @Test
+    public void firstHelperTest() {
+        save(new FloatFieldExtendedModel(0.25F));
+        save(new FloatFieldExtendedModel(0.5F));
+        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+        assertEquals(model.getFloat(), 0.25F);
+    }
+
+    @Test
+    public void lastHelperTest() {
+        save(new FloatFieldExtendedModel(0.25F));
+        save(new FloatFieldExtendedModel(0.5F));
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class);
+        assertEquals(model.getFloat(), 0.5F);
+    }
+
+    @Test
+    public void nullFirstHelperTest() {
+        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+        assertNull(model);
+    }
+
+    @Test
+    public void nullLastHelperTest() {
+        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+        assertNull(model);
+    }
+
+    @Test
+    public void oneItemHelperTest() {
+        save(new FloatFieldExtendedModel(0.25F));
+        FloatFieldExtendedModel firstModel = SugarRecord.first(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel lastModel = SugarRecord.last(FloatFieldExtendedModel.class);
+        assertEquals(firstModel.getFloat(), lastModel.getFloat() );
+    }
+}

From bc5c29f20c4444a794b93dbaf5feb5dd04cb09e7 Mon Sep 17 00:00:00 2001
From: Chris Desch <cdesch@gmail.com>
Date: Tue, 31 Mar 2015 15:46:12 -0400
Subject: [PATCH 118/305] Fixing Helper Method

Record indexes start at 1, not 0
---
 library/src/main/java/com/orm/SugarRecord.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index ee80e4e6..110f1589 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -110,11 +110,11 @@ public static <T> List<T> findById(Class<T> type, String[] ids) {
     }
 
     public static <T> T first(Class<T>type){
-        return findById(type, 0);
+        return findById(type, 1);
     }
 
     public static <T> T last(Class<T>type){
-        return findById(type, count(type) - 1);
+        return findById(type, count(type));
     }
 
     public static <T> Iterator<T> findAll(Class<T> type) {

From f5cdd39f567688979cb97e1cfe5a13999db2fbd1 Mon Sep 17 00:00:00 2001
From: Chris Desch <cdesch@gmail.com>
Date: Tue, 31 Mar 2015 15:46:48 -0400
Subject: [PATCH 119/305] Fixing first/last Helper Test Cases

TestCases for first/last helper are passing.

Signed-off-by: Chris Desch <cdesch@gmail.com>
---
 .../example/sugartest/HelperRecordTests.java  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/example/src/test/java/com/example/sugartest/HelperRecordTests.java b/example/src/test/java/com/example/sugartest/HelperRecordTests.java
index b9e81bb1..79228533 100644
--- a/example/src/test/java/com/example/sugartest/HelperRecordTests.java
+++ b/example/src/test/java/com/example/sugartest/HelperRecordTests.java
@@ -11,24 +11,30 @@
 import static com.orm.SugarRecord.save;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertFalse;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(emulateSdk=18)
 public class HelperRecordTests {
     @Test
     public void firstHelperTest() {
-        save(new FloatFieldExtendedModel(0.25F));
-        save(new FloatFieldExtendedModel(0.5F));
+
+        Float firstObjectFloat = new Float(25F);
+        Float lastObjectFloat = new Float(50F);
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(lastObjectFloat));
         FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
-        assertEquals(model.getFloat(), 0.25F);
+        assertEquals(firstObjectFloat, model.getFloat() );
     }
 
     @Test
     public void lastHelperTest() {
-        save(new FloatFieldExtendedModel(0.25F));
-        save(new FloatFieldExtendedModel(0.5F));
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class);
-        assertEquals(model.getFloat(), 0.5F);
+        Float firstObjectFloat = new Float(25F);
+        Float lastObjectFloat = new Float(50F);
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(lastObjectFloat));
+        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+        assertEquals(lastObjectFloat, model.getFloat() );
     }
 
     @Test
@@ -45,9 +51,9 @@ public void nullLastHelperTest() {
 
     @Test
     public void oneItemHelperTest() {
-        save(new FloatFieldExtendedModel(0.25F));
+        save(new FloatFieldExtendedModel(new Float(25F)));
         FloatFieldExtendedModel firstModel = SugarRecord.first(FloatFieldExtendedModel.class);
         FloatFieldExtendedModel lastModel = SugarRecord.last(FloatFieldExtendedModel.class);
-        assertEquals(firstModel.getFloat(), lastModel.getFloat() );
+        assertEquals(firstModel.getFloat(), lastModel.getFloat());
     }
 }

From 04bc488ffaf8c37fa60154a0140f2e2eddb2601d Mon Sep 17 00:00:00 2001
From: Chris Desch <cdesch@gmail.com>
Date: Wed, 1 Apr 2015 12:29:34 -0400
Subject: [PATCH 120/305] Fixing helper methods and test cases Closes #290

Added test cases for the use case of the table having deleted elements.
Changed the helper methods first() and last() to use findByQuery() instead of index.

Signed-off-by: Chris Desch <cdesch@gmail.com>

Thanks @cdesch for the pull request!
---
 .../example/sugartest/HelperRecordTests.java  | 46 ++++++++++++++++---
 .../src/main/java/com/orm/SugarRecord.java    |  8 +++-
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/example/src/test/java/com/example/sugartest/HelperRecordTests.java b/example/src/test/java/com/example/sugartest/HelperRecordTests.java
index 79228533..b39d11d1 100644
--- a/example/src/test/java/com/example/sugartest/HelperRecordTests.java
+++ b/example/src/test/java/com/example/sugartest/HelperRecordTests.java
@@ -18,42 +18,74 @@
 public class HelperRecordTests {
     @Test
     public void firstHelperTest() {
-
         Float firstObjectFloat = new Float(25F);
         Float lastObjectFloat = new Float(50F);
         save(new FloatFieldExtendedModel(firstObjectFloat));
         save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel model = FloatFieldExtendedModel.first(FloatFieldExtendedModel.class);
         assertEquals(firstObjectFloat, model.getFloat() );
     }
 
+    @Test
+    public void firstHelperDeletedRecordTest() {
+        System.out.println("bla");
+        Float firstObjectFloat = new Float(15F);
+        Float secondObjectFloat = new Float(25F);
+        Float thirdObjectFloat = new Float(35F);
+        Float fourthObjectFloat = new Float(45F);
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(secondObjectFloat));
+        save(new FloatFieldExtendedModel(thirdObjectFloat));
+        save(new FloatFieldExtendedModel(fourthObjectFloat));
+        FloatFieldExtendedModel firstRecord = FloatFieldExtendedModel.findById(FloatFieldExtendedModel.class,1);
+        firstRecord.delete();
+        FloatFieldExtendedModel model = FloatFieldExtendedModel.first(FloatFieldExtendedModel.class);
+        assertEquals(secondObjectFloat, model.getFloat() );
+    }
+
     @Test
     public void lastHelperTest() {
         Float firstObjectFloat = new Float(25F);
         Float lastObjectFloat = new Float(50F);
         save(new FloatFieldExtendedModel(firstObjectFloat));
         save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel model = FloatFieldExtendedModel.last(FloatFieldExtendedModel.class);
         assertEquals(lastObjectFloat, model.getFloat() );
     }
 
+    @Test
+    public void lastHelperDeletedRecordTest() {
+        Float firstObjectFloat = new Float(15F);
+        Float secondObjectFloat = new Float(25F);
+        Float thirdObjectFloat = new Float(35F);
+        Float fourthObjectFloat = new Float(45F);
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(secondObjectFloat));
+        save(new FloatFieldExtendedModel(thirdObjectFloat));
+        save(new FloatFieldExtendedModel(fourthObjectFloat));
+        FloatFieldExtendedModel lastRecord = FloatFieldExtendedModel.findById(FloatFieldExtendedModel.class, 4);
+        lastRecord.delete();
+        FloatFieldExtendedModel model = FloatFieldExtendedModel.last(FloatFieldExtendedModel.class);
+        assertEquals(thirdObjectFloat, model.getFloat());
+    }
+
     @Test
     public void nullFirstHelperTest() {
-        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel model = FloatFieldExtendedModel.first(FloatFieldExtendedModel.class);
         assertNull(model);
     }
 
     @Test
     public void nullLastHelperTest() {
-        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel model = FloatFieldExtendedModel.last(FloatFieldExtendedModel.class);
         assertNull(model);
     }
 
     @Test
     public void oneItemHelperTest() {
         save(new FloatFieldExtendedModel(new Float(25F)));
-        FloatFieldExtendedModel firstModel = SugarRecord.first(FloatFieldExtendedModel.class);
-        FloatFieldExtendedModel lastModel = SugarRecord.last(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel firstModel = FloatFieldExtendedModel.first(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel lastModel = FloatFieldExtendedModel.last(FloatFieldExtendedModel.class);
         assertEquals(firstModel.getFloat(), lastModel.getFloat());
     }
 }
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 110f1589..9226cba7 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -110,11 +110,15 @@ public static <T> List<T> findById(Class<T> type, String[] ids) {
     }
 
     public static <T> T first(Class<T>type){
-        return findById(type, 1);
+        List<T> list = findWithQuery(type, "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ROWID ASC LIMIT 1" );
+        if (list.isEmpty()) return null;
+        return list.get(0);
     }
 
     public static <T> T last(Class<T>type){
-        return findById(type, count(type));
+        List<T> list = findWithQuery(type, "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ROWID DESC LIMIT 1");
+        if (list.isEmpty()) return null;
+        return list.get(0);
     }
 
     public static <T> Iterator<T> findAll(Class<T> type) {

From f69895b74c4a39f5d3ddba2397b2a1fcb9cc5345 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Wed, 1 Apr 2015 20:22:18 -0700
Subject: [PATCH 121/305] Expand tests and some minor cleanup

---
 .../example/sugartest/FirstAndLastTests.java  | 158 ++++++++++++++++++
 .../example/sugartest/HelperRecordTests.java  |  91 ----------
 .../src/main/java/com/orm/SugarRecord.java    |  18 +-
 3 files changed, 170 insertions(+), 97 deletions(-)
 create mode 100644 example/src/test/java/com/example/sugartest/FirstAndLastTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/HelperRecordTests.java

diff --git a/example/src/test/java/com/example/sugartest/FirstAndLastTests.java b/example/src/test/java/com/example/sugartest/FirstAndLastTests.java
new file mode 100644
index 00000000..75108b83
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/FirstAndLastTests.java
@@ -0,0 +1,158 @@
+package com.example.sugartest;
+
+
+import com.example.models.FloatFieldAnnotatedModel;
+import com.example.models.FloatFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class FirstAndLastTests {
+    @Test
+    public void firstExtendedTest() {
+        Float firstObjectFloat = new Float(25F);
+        Float lastObjectFloat = new Float(50F);
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(lastObjectFloat));
+        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+        assertEquals(firstObjectFloat, model.getFloat());
+    }
+
+    @Test
+    public void firstDeletedRecordExtendedTest() {
+        Float firstObjectFloat = new Float(15F);
+        Float secondObjectFloat = new Float(25F);
+        Float thirdObjectFloat = new Float(35F);
+        Float fourthObjectFloat = new Float(45F);
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(secondObjectFloat));
+        save(new FloatFieldExtendedModel(thirdObjectFloat));
+        save(new FloatFieldExtendedModel(fourthObjectFloat));
+        FloatFieldExtendedModel firstRecord = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        firstRecord.delete();
+        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+        assertEquals(secondObjectFloat, model.getFloat());
+    }
+
+    @Test
+    public void lastExtendedTest() {
+        Float firstObjectFloat = new Float(25F);
+        Float lastObjectFloat = new Float(50F);
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(lastObjectFloat));
+        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+        assertEquals(lastObjectFloat, model.getFloat());
+    }
+
+    @Test
+    public void lastDeletedRecordExtendedTest() {
+        Float firstObjectFloat = new Float(15F);
+        Float secondObjectFloat = new Float(25F);
+        Float thirdObjectFloat = new Float(35F);
+        Float fourthObjectFloat = new Float(45F);
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(secondObjectFloat));
+        save(new FloatFieldExtendedModel(thirdObjectFloat));
+        save(new FloatFieldExtendedModel(fourthObjectFloat));
+        FloatFieldExtendedModel lastRecord = SugarRecord.findById(FloatFieldExtendedModel.class, 4);
+        lastRecord.delete();
+        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+        assertEquals(thirdObjectFloat, model.getFloat());
+    }
+
+    @Test
+    public void nullFirstExtendedTest() {
+        assertNull(SugarRecord.first(FloatFieldExtendedModel.class));
+    }
+
+    @Test
+    public void nullLastExtendedTest() {
+        assertNull(SugarRecord.last(FloatFieldExtendedModel.class));
+    }
+
+    @Test
+    public void oneItemExtendedTest() {
+        save(new FloatFieldExtendedModel(new Float(25F)));
+        FloatFieldExtendedModel firstModel = SugarRecord.first(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel lastModel = SugarRecord.last(FloatFieldExtendedModel.class);
+        assertEquals(firstModel.getFloat(), lastModel.getFloat());
+    }
+
+    @Test
+    public void firstAnnotatedTest() {
+        Float firstObjectFloat = new Float(25F);
+        Float lastObjectFloat = new Float(50F);
+        save(new FloatFieldAnnotatedModel(firstObjectFloat));
+        save(new FloatFieldAnnotatedModel(lastObjectFloat));
+        FloatFieldAnnotatedModel model = SugarRecord.first(FloatFieldAnnotatedModel.class);
+        assertEquals(firstObjectFloat, model.getFloat());
+    }
+
+    @Test
+    public void firstDeletedRecordAnnotatedTest() {
+        Float firstObjectFloat = new Float(15F);
+        Float secondObjectFloat = new Float(25F);
+        Float thirdObjectFloat = new Float(35F);
+        Float fourthObjectFloat = new Float(45F);
+        save(new FloatFieldAnnotatedModel(firstObjectFloat));
+        save(new FloatFieldAnnotatedModel(secondObjectFloat));
+        save(new FloatFieldAnnotatedModel(thirdObjectFloat));
+        save(new FloatFieldAnnotatedModel(fourthObjectFloat));
+        FloatFieldAnnotatedModel firstRecord = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        SugarRecord.delete(firstRecord);
+        FloatFieldAnnotatedModel model = SugarRecord.first(FloatFieldAnnotatedModel.class);
+        assertEquals(secondObjectFloat, model.getFloat());
+    }
+
+    @Test
+    public void lastAnnotatedTest() {
+        Float firstObjectFloat = new Float(25F);
+        Float lastObjectFloat = new Float(50F);
+        save(new FloatFieldAnnotatedModel(firstObjectFloat));
+        save(new FloatFieldAnnotatedModel(lastObjectFloat));
+        FloatFieldAnnotatedModel model = SugarRecord.last(FloatFieldAnnotatedModel.class);
+        assertEquals(lastObjectFloat, model.getFloat());
+    }
+
+    @Test
+    public void lastDeletedRecordAnnotatedTest() {
+        Float firstObjectFloat = new Float(15F);
+        Float secondObjectFloat = new Float(25F);
+        Float thirdObjectFloat = new Float(35F);
+        Float fourthObjectFloat = new Float(45F);
+        save(new FloatFieldAnnotatedModel(firstObjectFloat));
+        save(new FloatFieldAnnotatedModel(secondObjectFloat));
+        save(new FloatFieldAnnotatedModel(thirdObjectFloat));
+        save(new FloatFieldAnnotatedModel(fourthObjectFloat));
+        FloatFieldAnnotatedModel lastRecord = SugarRecord.findById(FloatFieldAnnotatedModel.class, 4);
+        SugarRecord.delete(lastRecord);
+        FloatFieldAnnotatedModel model = SugarRecord.last(FloatFieldAnnotatedModel.class);
+        assertEquals(thirdObjectFloat, model.getFloat());
+    }
+
+    @Test
+    public void nullFirstAnnotatedTest() {
+        assertNull(SugarRecord.first(FloatFieldAnnotatedModel.class));
+    }
+
+    @Test
+    public void nullLastAnnotatedTest() {
+        assertNull(SugarRecord.last(FloatFieldAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneItemAnnotatedTest() {
+        save(new FloatFieldAnnotatedModel(new Float(25F)));
+        FloatFieldAnnotatedModel firstModel = SugarRecord.first(FloatFieldAnnotatedModel.class);
+        FloatFieldAnnotatedModel lastModel = SugarRecord.last(FloatFieldAnnotatedModel.class);
+        assertEquals(firstModel.getFloat(), lastModel.getFloat());
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/HelperRecordTests.java b/example/src/test/java/com/example/sugartest/HelperRecordTests.java
deleted file mode 100644
index b39d11d1..00000000
--- a/example/src/test/java/com/example/sugartest/HelperRecordTests.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.FloatFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertFalse;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
-public class HelperRecordTests {
-    @Test
-    public void firstHelperTest() {
-        Float firstObjectFloat = new Float(25F);
-        Float lastObjectFloat = new Float(50F);
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = FloatFieldExtendedModel.first(FloatFieldExtendedModel.class);
-        assertEquals(firstObjectFloat, model.getFloat() );
-    }
-
-    @Test
-    public void firstHelperDeletedRecordTest() {
-        System.out.println("bla");
-        Float firstObjectFloat = new Float(15F);
-        Float secondObjectFloat = new Float(25F);
-        Float thirdObjectFloat = new Float(35F);
-        Float fourthObjectFloat = new Float(45F);
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(secondObjectFloat));
-        save(new FloatFieldExtendedModel(thirdObjectFloat));
-        save(new FloatFieldExtendedModel(fourthObjectFloat));
-        FloatFieldExtendedModel firstRecord = FloatFieldExtendedModel.findById(FloatFieldExtendedModel.class,1);
-        firstRecord.delete();
-        FloatFieldExtendedModel model = FloatFieldExtendedModel.first(FloatFieldExtendedModel.class);
-        assertEquals(secondObjectFloat, model.getFloat() );
-    }
-
-    @Test
-    public void lastHelperTest() {
-        Float firstObjectFloat = new Float(25F);
-        Float lastObjectFloat = new Float(50F);
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = FloatFieldExtendedModel.last(FloatFieldExtendedModel.class);
-        assertEquals(lastObjectFloat, model.getFloat() );
-    }
-
-    @Test
-    public void lastHelperDeletedRecordTest() {
-        Float firstObjectFloat = new Float(15F);
-        Float secondObjectFloat = new Float(25F);
-        Float thirdObjectFloat = new Float(35F);
-        Float fourthObjectFloat = new Float(45F);
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(secondObjectFloat));
-        save(new FloatFieldExtendedModel(thirdObjectFloat));
-        save(new FloatFieldExtendedModel(fourthObjectFloat));
-        FloatFieldExtendedModel lastRecord = FloatFieldExtendedModel.findById(FloatFieldExtendedModel.class, 4);
-        lastRecord.delete();
-        FloatFieldExtendedModel model = FloatFieldExtendedModel.last(FloatFieldExtendedModel.class);
-        assertEquals(thirdObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void nullFirstHelperTest() {
-        FloatFieldExtendedModel model = FloatFieldExtendedModel.first(FloatFieldExtendedModel.class);
-        assertNull(model);
-    }
-
-    @Test
-    public void nullLastHelperTest() {
-        FloatFieldExtendedModel model = FloatFieldExtendedModel.last(FloatFieldExtendedModel.class);
-        assertNull(model);
-    }
-
-    @Test
-    public void oneItemHelperTest() {
-        save(new FloatFieldExtendedModel(new Float(25F)));
-        FloatFieldExtendedModel firstModel = FloatFieldExtendedModel.first(FloatFieldExtendedModel.class);
-        FloatFieldExtendedModel lastModel = FloatFieldExtendedModel.last(FloatFieldExtendedModel.class);
-        assertEquals(firstModel.getFloat(), lastModel.getFloat());
-    }
-}
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 9226cba7..23ea91a7 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -109,15 +109,21 @@ public static <T> List<T> findById(Class<T> type, String[] ids) {
         return find(type, whereClause, ids);
     }
 
-    public static <T> T first(Class<T>type){
-        List<T> list = findWithQuery(type, "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ROWID ASC LIMIT 1" );
-        if (list.isEmpty()) return null;
+    public static <T> T first(Class<T>type) {
+        List<T> list = findWithQuery(type,
+                "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ID ASC LIMIT 1");
+        if (list.isEmpty()) {
+            return null;
+        }
         return list.get(0);
     }
 
-    public static <T> T last(Class<T>type){
-        List<T> list = findWithQuery(type, "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ROWID DESC LIMIT 1");
-        if (list.isEmpty()) return null;
+    public static <T> T last(Class<T>type) {
+        List<T> list = findWithQuery(type,
+                "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ID DESC LIMIT 1");
+        if (list.isEmpty()) {
+            return null;
+        }
         return list.get(0);
     }
 

From 189c2bc1e87ed3e96835d340b10009520a159eeb Mon Sep 17 00:00:00 2001
From: Neil Wells <neilw4@googlemail.com>
Date: Wed, 1 Apr 2015 11:08:34 +0100
Subject: [PATCH 122/305] Support querying for null values

---
 .../main/java/com/orm/query/Condition.java    | 22 ++++++++++++++++++-
 .../src/main/java/com/orm/query/Select.java   |  6 ++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/query/Condition.java b/library/src/main/java/com/orm/query/Condition.java
index 9e9a08d1..52ae052c 100644
--- a/library/src/main/java/com/orm/query/Condition.java
+++ b/library/src/main/java/com/orm/query/Condition.java
@@ -14,7 +14,9 @@ enum Check {
         LESSER_THAN(" < "),
         NOT_EQUALS (" != "),
         LIKE(" LIKE "),
-        NOT_LIKE(" NOT LIKE ");
+        NOT_LIKE(" NOT LIKE "),
+        IS_NULL(" IS NULL "),
+        IS_NOT_NULL(" IS NOT NULL ");
 
         private String symbol;
 
@@ -42,6 +44,9 @@ public static Condition prop(String property) {
     }
 
     public Condition eq(Object value) {
+        if (value == null) {
+            return isNull();
+        }
         setValue(value);
         check = Check.EQUALS;
         return this;
@@ -60,6 +65,9 @@ public Condition notLike(Object value) {
     }
 
     public Condition notEq(Object value) {
+        if (value == null) {
+            return isNotNull();
+        }
         setValue(value);
         check = Check.NOT_EQUALS;
         return this;
@@ -77,6 +85,18 @@ public Condition lt(Object value) {
         return this;
     }
 
+    public Condition isNull() {
+        setValue(null);
+        check = Check.IS_NULL;
+        return this;
+    }
+
+    public Condition isNotNull() {
+        setValue(null);
+        check = Check.IS_NOT_NULL;
+        return this;
+    }
+
     public String getProperty() {
         return property;
     }
diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 9e91543c..9c52a9b4 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -68,7 +68,11 @@ private void mergeConditions(Condition[] conditions, Condition.Type type) {
                     .append("'")
                     .append(condition.getValue().toString())
                     .append("'");
-
+            } else if (Condition.Check.IS_NULL.equals(condition.getCheck()) ||
+                    Condition.Check.IS_NOT_NULL.equals(condition.getCheck())) {
+                toAppend
+                    .append(condition.getProperty())
+                    .append(condition.getCheckSymbol());
             } else {
                 toAppend
                     .append(condition.getProperty())

From 6bea27ce694cd548462440b48e5e64fb989b10ed Mon Sep 17 00:00:00 2001
From: Neil Wells <neilw4@googlemail.com>
Date: Wed, 1 Apr 2015 11:28:02 +0100
Subject: [PATCH 123/305] Test queries for null values Closes #293 Closes #7
 Closes #287

Thanks @neilw4 for the pull request!
---
 .../test/java/com/orm/query/SelectTest.java   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/library/src/test/java/com/orm/query/SelectTest.java b/library/src/test/java/com/orm/query/SelectTest.java
index f444e7ee..3ab345ae 100644
--- a/library/src/test/java/com/orm/query/SelectTest.java
+++ b/library/src/test/java/com/orm/query/SelectTest.java
@@ -80,5 +80,25 @@ public void testOr(){
         assertEquals("2", where.getArgs()[1]);
     }
 
+    @Test
+    public void testIsNull() {
+        Select where = Select.from(TestRecord.class).where(Condition.prop("test").isNull());
+        assertEquals("(test IS NULL )", where.getWhereCond());
+        assertEquals(0, where.getArgs().length);
+
+        where = Select.from(TestRecord.class).where(Condition.prop("test").eq(null));
+        assertEquals("(test IS NULL )", where.getWhereCond());
+        assertEquals(0, where.getArgs().length);
+    }
 
+    @Test
+    public void testIsNotNull() {
+        Select where = Select.from(TestRecord.class).where(Condition.prop("test").isNotNull());
+        assertEquals("(test IS NOT NULL )", where.getWhereCond());
+        assertEquals(0, where.getArgs().length);
+
+        where = Select.from(TestRecord.class).where(Condition.prop("test").notEq(null));
+        assertEquals("(test IS NOT NULL )", where.getWhereCond());
+        assertEquals(0, where.getArgs().length);
+    }
 }

From 9fabcc1e1f3318fe6a082e984008f3d03a42c858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Esteves?= <andresteves@gmail.com>
Date: Thu, 20 Nov 2014 14:08:11 +0000
Subject: [PATCH 124/305] Update ReflectionUtil.java to handle byte[] storage
 and retrieving Closes #197 Closes #175 Closes #249

Thanks @andresteves for the pull request!
---
 .../main/java/com/orm/util/ReflectionUtil.java   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 15ce2276..adbed45e 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -112,6 +112,12 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
                     } catch (NullPointerException e) {
                         values.put(columnName, (Long) null);
                     }
+                } else if (columnType.equals(byte[].class)) {
+                    if (columnValue == null) {
+                        values.put(columnName, "".getBytes());
+                    } else {
+                        values.put(columnName, (byte[]) columnValue);
+                    }
                 } else {
                     if (columnValue == null) {
                         values.putNull(columnName);
@@ -153,9 +159,6 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
             } else if (fieldType.equals(boolean.class) || fieldType.equals(Boolean.class)) {
                 field.set(object,
                         cursor.getString(columnIndex).equals("1"));
-            } else if (field.getType().getName().equals("[B")) {
-                field.set(object,
-                        cursor.getBlob(columnIndex));
             } else if (fieldType.equals(int.class) || fieldType.equals(Integer.class)) {
                 field.set(object,
                         cursor.getInt(columnIndex));
@@ -176,6 +179,13 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
                 Calendar c = Calendar.getInstance();
                 c.setTimeInMillis(l);
                 field.set(object, c);
+            } else if (fieldType.equals(byte[].class)) {
+                byte[] bytes = cursor.getBlob(columnIndex);
+                if (bytes == null) {
+                    field.set(object, "".getBytes());
+                } else {
+                    field.set(object, cursor.getBlob(columnIndex));
+                }
             } else if (Enum.class.isAssignableFrom(fieldType)) {
                 try {
                     Method valueOf = field.getType().getMethod("valueOf", String.class);

From 95bde0b810d0e039041afaef4fd2846aac77c71c Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 3 Apr 2015 20:26:21 -0700
Subject: [PATCH 125/305] Add byte array models and tests

---
 .../models/ByteArrayAnnotatedModel.java       | 23 ++++++++
 .../models/ByteArrayExtendedModel.java        | 17 ++++++
 .../sugartest/ByteArrayFieldTests.java        | 54 +++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/ByteArrayExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java

diff --git a/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java b/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
new file mode 100644
index 00000000..da0b3ece
--- /dev/null
+++ b/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
@@ -0,0 +1,23 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class ByteArrayAnnotatedModel {
+    private byte[] byteArray;
+    private Long id;
+
+    public ByteArrayAnnotatedModel() {}
+
+    public ByteArrayAnnotatedModel(byte[] byteArray) {
+        this.byteArray = byteArray;
+    }
+
+    public byte[] getByteArray() {
+        return byteArray;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/main/java/com/example/models/ByteArrayExtendedModel.java b/example/src/main/java/com/example/models/ByteArrayExtendedModel.java
new file mode 100644
index 00000000..7808c514
--- /dev/null
+++ b/example/src/main/java/com/example/models/ByteArrayExtendedModel.java
@@ -0,0 +1,17 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class ByteArrayExtendedModel extends SugarRecord {
+    private byte[] byteArray;
+
+    public ByteArrayExtendedModel() {}
+
+    public ByteArrayExtendedModel(byte[] byteArray) {
+        this.byteArray = byteArray;
+    }
+
+    public byte[] getByteArray() {
+        return byteArray;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java b/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java
new file mode 100644
index 00000000..b8ae0cfd
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java
@@ -0,0 +1,54 @@
+package com.example.sugartest;
+
+
+import com.example.models.ByteArrayAnnotatedModel;
+import com.example.models.ByteArrayExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class ByteArrayFieldTests {
+    @Test
+    public void nullByteArrayExtendedTest() {
+        byte[] array = "".getBytes();
+        save(new ByteArrayExtendedModel());
+        ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
+        assertEquals(new String(array), new String(model.getByteArray()));
+        assertArrayEquals(array, model.getByteArray());
+    }
+
+    @Test
+    public void nullByteArrayAnnotatedTest() {
+        byte[] array = "".getBytes();
+        save(new ByteArrayAnnotatedModel());
+        ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
+        assertEquals(new String(array), new String(model.getByteArray()));
+        assertArrayEquals(array, model.getByteArray());
+    }
+
+    @Test
+    public void byteArrayExtendedTest() {
+        byte[] array = "hello".getBytes();
+        save(new ByteArrayExtendedModel(array));
+        ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
+        assertEquals(new String(array), new String(model.getByteArray()));
+        assertArrayEquals(array, model.getByteArray());
+    }
+
+    @Test
+    public void byteArrayAnnotatedTest() {
+        byte[] array = "hello".getBytes();
+        save(new ByteArrayAnnotatedModel(array));
+        ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
+        assertEquals(new String(array), new String(model.getByteArray()));
+        assertArrayEquals(array, model.getByteArray());
+    }
+}

From 384b31d357a51dda5d0865056a82bd93ca1c901d Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 3 Apr 2015 20:26:31 -0700
Subject: [PATCH 126/305] Update sugar.iml

---
 sugar.iml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sugar.iml b/sugar.iml
index 00bc43cf..e19b5594 100644
--- a/sugar.iml
+++ b/sugar.iml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="sugar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
@@ -15,5 +16,4 @@
     <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

From 9ee25538fc75000b3466f7681e4cedf1b353ee1e Mon Sep 17 00:00:00 2001
From: Rafael Dias <dias.rafael@gmail.com>
Date: Fri, 11 Jul 2014 15:22:40 -0300
Subject: [PATCH 127/305] Add support to BigDecimal data type Closes #116

Thanks @diasrafael for the pull request!
---
 library/src/main/java/com/orm/util/QueryBuilder.java   |  4 +++-
 library/src/main/java/com/orm/util/ReflectionUtil.java | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/util/QueryBuilder.java b/library/src/main/java/com/orm/util/QueryBuilder.java
index 5dfa36c6..e1c3557f 100644
--- a/library/src/main/java/com/orm/util/QueryBuilder.java
+++ b/library/src/main/java/com/orm/util/QueryBuilder.java
@@ -4,6 +4,7 @@
 
 import java.lang.RuntimeException;
 import java.lang.StringBuilder;
+import java.math.BigDecimal;
 
 public class QueryBuilder {
 
@@ -34,7 +35,8 @@ public static String getColumnType(Class<?> type) {
             return "FLOAT";
         }
 
-        if ((type.equals(String.class)) || (type.equals(Character.TYPE))) {
+        if ((type.equals(String.class)) || (type.equals(Character.TYPE)) ||
+                (type.equals(BigDecimal.class))) {
             return "TEXT";
         }
 
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index adbed45e..43206f69 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -15,6 +15,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
 import java.net.URL;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -94,6 +95,12 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
                     values.put(columnName, (Double) columnValue);
                 } else if (columnType.equals(Boolean.class) || columnType.equals(boolean.class)) {
                     values.put(columnName, (Boolean) columnValue);
+                } else if (columnType.equals(BigDecimal.class)) {
+                    try {
+                        values.put(columnName, column.get(object).toString());
+                    } catch (NullPointerException e) {
+                        values.putNull(columnName);
+                    }
                 } else if (Timestamp.class.equals(columnType)) {
                     try {
                         values.put(columnName, ((Timestamp) column.get(object)).getTime());
@@ -168,6 +175,9 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
             } else if (fieldType.equals(short.class) || fieldType.equals(Short.class)) {
                 field.set(object,
                         cursor.getShort(columnIndex));
+            } else if (fieldType.equals(BigDecimal.class)) {
+                String val = cursor.getString(columnIndex);
+                field.set(object, val != null && val.equals("null") ? null : new BigDecimal(val));
             } else if (fieldType.equals(Timestamp.class)) {
                 long l = cursor.getLong(columnIndex);
                 field.set(object, new Timestamp(l));

From 550455948e38448ea86dd5d4c1dc1e75bbddb4ae Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 3 Apr 2015 22:03:12 -0700
Subject: [PATCH 128/305] Add BigDecimal models and tests

---
 .../models/BigDecimalFieldAnnotatedModel.java | 25 +++++++++
 .../models/BigDecimalFieldExtendedModel.java  | 19 +++++++
 .../sugartest/BigDecimalFieldTests.java       | 53 +++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/BigDecimalFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java

diff --git a/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java b/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
new file mode 100644
index 00000000..b3b60e98
--- /dev/null
+++ b/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
@@ -0,0 +1,25 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+import java.math.BigDecimal;
+
+@Table
+public class BigDecimalFieldAnnotatedModel {
+    private BigDecimal decimal;
+    private Long id;
+
+    public BigDecimalFieldAnnotatedModel() {}
+
+    public BigDecimalFieldAnnotatedModel(BigDecimal decimal) {
+        this.decimal = decimal;
+    }
+
+    public BigDecimal getBigDecimal() {
+        return decimal;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/main/java/com/example/models/BigDecimalFieldExtendedModel.java b/example/src/main/java/com/example/models/BigDecimalFieldExtendedModel.java
new file mode 100644
index 00000000..e258cf32
--- /dev/null
+++ b/example/src/main/java/com/example/models/BigDecimalFieldExtendedModel.java
@@ -0,0 +1,19 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+import java.math.BigDecimal;
+
+public class BigDecimalFieldExtendedModel extends SugarRecord {
+    private BigDecimal decimal;
+
+    public BigDecimalFieldExtendedModel() {}
+
+    public BigDecimalFieldExtendedModel(BigDecimal decimal) {
+        this.decimal = decimal;
+    }
+
+    public BigDecimal getBigDecimal() {
+        return decimal;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java b/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java
new file mode 100644
index 00000000..f50550ab
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java
@@ -0,0 +1,53 @@
+package com.example.sugartest;
+
+
+import com.example.models.BigDecimalFieldAnnotatedModel;
+import com.example.models.BigDecimalFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.math.BigDecimal;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class BigDecimalFieldTests {
+    @Test
+    public void nullBigDecimalExtendedTest() {
+        save(new BigDecimalFieldExtendedModel());
+        BigDecimalFieldExtendedModel model =
+                SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
+        assertNull(model.getBigDecimal());
+    }
+
+    @Test
+    public void nullBigDecimalAnnotatedTest() {
+        save(new BigDecimalFieldAnnotatedModel());
+        BigDecimalFieldAnnotatedModel model =
+                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
+        assertNull(model.getBigDecimal());
+    }
+
+    @Test
+    public void bigDecimalExtendedTest() {
+        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
+        save(new BigDecimalFieldExtendedModel(decimal));
+        BigDecimalFieldExtendedModel model = SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
+        assertEquals(decimal, model.getBigDecimal());
+    }
+
+    @Test
+    public void bigDecimalAnnotatedTest() {
+        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
+        save(new BigDecimalFieldAnnotatedModel(decimal));
+        BigDecimalFieldAnnotatedModel model =
+                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
+        assertEquals(decimal, model.getBigDecimal());
+    }
+}

From 31dd0f37a11a115bc569b58c455eca83f11f4cad Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Mon, 6 Apr 2015 17:56:15 -0700
Subject: [PATCH 129/305] Add classes to the libraryJar task Closes #296

---
 library/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/build.gradle b/library/build.gradle
index e37db9dd..e299a364 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -26,7 +26,9 @@ dependencies {
 }
 
 task libraryJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
+    dependsOn assembleRelease
+    from android.sourceSets.main.java.srcDirs,
+         ['build/intermediates/classes/release/'] // Add the release classes into the jar
     baseName 'sugar'
 }
 

From c99cd8b46f6d9b9f4227f0037bdb4e9d737e3ca2 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Mon, 6 Apr 2015 23:04:38 -0700
Subject: [PATCH 130/305] Add tests for saving models multiple times

---
 .../models/StringFieldAnnotatedModel.java     |  4 +
 .../models/StringFieldAnnotatedNoIdModel.java | 22 +++++
 .../models/StringFieldExtendedModel.java      |  4 +
 .../example/sugartest/MultipleSaveTests.java  | 93 +++++++++++++++++++
 4 files changed, 123 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/MultipleSaveTests.java

diff --git a/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java b/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
index 1e7e8ffe..05420d44 100644
--- a/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
@@ -16,4 +16,8 @@ public StringFieldAnnotatedModel(String string) {
     public String getString() {
         return string;
     }
+
+    public void setString(String string) {
+        this.string = string;
+    }
 }
diff --git a/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java b/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
new file mode 100644
index 00000000..1c12d581
--- /dev/null
+++ b/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
@@ -0,0 +1,22 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class StringFieldAnnotatedNoIdModel {
+    private String string;
+
+    public StringFieldAnnotatedNoIdModel() {}
+
+    public StringFieldAnnotatedNoIdModel(String string) {
+        this.string = string;
+    }
+
+    public String getString() {
+        return string;
+    }
+
+    public void setString(String string) {
+        this.string = string;
+    }
+}
diff --git a/example/src/main/java/com/example/models/StringFieldExtendedModel.java b/example/src/main/java/com/example/models/StringFieldExtendedModel.java
index f962123a..33bab4e9 100644
--- a/example/src/main/java/com/example/models/StringFieldExtendedModel.java
+++ b/example/src/main/java/com/example/models/StringFieldExtendedModel.java
@@ -14,4 +14,8 @@ public StringFieldExtendedModel(String string) {
     public String getString() {
         return string;
     }
+
+    public void setString(String string) {
+        this.string = string;
+    }
 }
diff --git a/example/src/test/java/com/example/sugartest/MultipleSaveTests.java b/example/src/test/java/com/example/sugartest/MultipleSaveTests.java
new file mode 100644
index 00000000..05dc4939
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/MultipleSaveTests.java
@@ -0,0 +1,93 @@
+package com.example.sugartest;
+
+
+import com.example.models.StringFieldAnnotatedModel;
+import com.example.models.StringFieldAnnotatedNoIdModel;
+import com.example.models.StringFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class MultipleSaveTests {
+    @Test
+    public void stringMultipleSaveOriginalExtendedTest() {
+        String string = "Test String";
+        StringFieldExtendedModel model = new StringFieldExtendedModel(string);
+        long id = save(model);
+        StringFieldExtendedModel query = SugarRecord.findById(StringFieldExtendedModel.class, id);
+        assertEquals(string, query.getString());
+        model.setString("Another test");
+        assertEquals(id, save(model));
+        assertNull(SugarRecord.findById(StringFieldExtendedModel.class, 2));
+    }
+
+    @Test
+    public void stringMultipleSaveQueriedExtendedTest() {
+        String string = "Test String";
+        StringFieldExtendedModel model = new StringFieldExtendedModel(string);
+        long id = save(model);
+        StringFieldExtendedModel query = SugarRecord.findById(StringFieldExtendedModel.class, id);
+        assertEquals(string, query.getString());
+        query.setString("Another test");
+        assertEquals(id, save(query));
+        assertNull(SugarRecord.findById(StringFieldExtendedModel.class, 2));
+    }
+
+    @Test
+    public void stringMultipleSaveOriginalAnnotatedTest() {
+        String string = "Test String";
+        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
+        long id = save(model);
+        StringFieldAnnotatedModel query = SugarRecord.findById(StringFieldAnnotatedModel.class, id);
+        assertEquals(string, query.getString());
+        model.setString("Another test");
+        assertEquals(id, save(model));
+        assertNull(SugarRecord.findById(StringFieldAnnotatedModel.class, 2));
+    }
+
+    @Test
+    public void stringMultipleSaveQueriedAnnotatedTest() {
+        String string = "Test String";
+        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
+        long id = save(model);
+        StringFieldAnnotatedModel query = SugarRecord.findById(StringFieldAnnotatedModel.class, id);
+        assertEquals(string, query.getString());
+        query.setString("Another test");
+        assertEquals(id, save(query));
+        assertNull(SugarRecord.findById(StringFieldAnnotatedModel.class, 2));
+    }
+
+    @Test
+    public void stringMultipleSaveOriginalAnnotatedNoIdTest() {
+        String string = "Test String";
+        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
+        long id = save(model);
+        StringFieldAnnotatedNoIdModel query =
+                SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, id);
+        assertEquals(string, query.getString());
+        model.setString("Another test");
+        assertEquals(id, save(model));
+        assertNull(SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, 2));
+    }
+
+    @Test
+    public void stringMultipleSaveQueriedAnnotatedNoIdTest() {
+        String string = "Test String";
+        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
+        long id = save(model);
+        StringFieldAnnotatedNoIdModel query =
+                SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, id);
+        assertEquals(string, query.getString());
+        query.setString("Another test");
+        assertEquals(id, save(query));
+        assertNull(SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, 2));
+    }
+}

From 673619760cfea278ad8a3438e4e5a563821b9fd9 Mon Sep 17 00:00:00 2001
From: Juan Ignacio Vimberg <jivimberg@gmail.com>
Date: Sat, 31 Jan 2015 10:59:54 -0800
Subject: [PATCH 131/305] Use a map to keep track of annotated entities and
 their sugar id values Fixes #185 Fixes #243

---
 library/build.gradle                            |  1 +
 library/src/main/java/com/orm/SugarContext.java |  9 +++++++++
 library/src/main/java/com/orm/SugarRecord.java  | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/library/build.gradle b/library/build.gradle
index e299a364..df1a932a 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -22,6 +22,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.google.guava:guava:18.0'
     testCompile 'junit:junit:4.12'
 }
 
diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index ea853766..61acf813 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -2,15 +2,21 @@
 
 import android.content.Context;
 
+import com.google.common.collect.MapMaker;
+
+import java.util.concurrent.ConcurrentMap;
+
 public class SugarContext {
 
     private static SugarContext instance = null;
     private SugarDb sugarDb;
     private Context context;
+    private ConcurrentMap<Object, Long> entitiesMap;
 
     private SugarContext(Context context) {
         this.context = context;
         this.sugarDb = new SugarDb(context);
+        this.entitiesMap = new MapMaker().weakKeys().makeMap();
     }
     
     public static SugarContext getSugarContext() {
@@ -47,4 +53,7 @@ protected SugarDb getSugarDb() {
         return sugarDb;
     }
 
+    ConcurrentMap<Object, Long> getEntitiesMap() {
+        return entitiesMap;
+    }
 }
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 23ea91a7..4e8acfbe 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -243,6 +243,7 @@ public static long save(Object object) {
     }
 
     static long save(SQLiteDatabase db, Object object) {
+        Map<Object, Long> entitiesMap = getSugarContext().getEntitiesMap();
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
         ContentValues values = new ContentValues(columns.size());
         Field idField = null;
@@ -253,6 +254,11 @@ static long save(SQLiteDatabase db, Object object) {
             }
         }
 
+        boolean isSugarEntity = isSugarEntity(object);
+        if (isSugarEntity && entitiesMap.containsKey(object)) {
+                values.put("id", entitiesMap.get(object));
+        }
+
         long id = db.insertWithOnConflict(NamingHelper.toSQLName(object.getClass()), null, values,
                 SQLiteDatabase.CONFLICT_REPLACE);
 
@@ -264,6 +270,8 @@ static long save(SQLiteDatabase db, Object object) {
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }
+            } else {
+                entitiesMap.put(object, id);
             }
         } else if (SugarRecord.class.isAssignableFrom(object.getClass())) {
             ((SugarRecord) object).setId(id);
@@ -274,6 +282,10 @@ static long save(SQLiteDatabase db, Object object) {
         return id;
     }
 
+    private static boolean isSugarEntity(Object object) {
+        return object.getClass().isAnnotationPresent(Table.class) || SugarRecord.class.isAssignableFrom(object.getClass());
+    }
+
     private static void inflate(Cursor cursor, Object object) {
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
 

From 0fdc4dd98c90569ad34847fa7543220552f72898 Mon Sep 17 00:00:00 2001
From: Juan Ignacio Vimberg <jivimberg@gmail.com>
Date: Sat, 31 Jan 2015 11:30:58 -0800
Subject: [PATCH 132/305] Properly obtain the id from a foreign key model Fixes
 #215

---
 library/src/main/java/com/orm/SugarRecord.java     | 12 ++++++------
 .../src/main/java/com/orm/util/ReflectionUtil.java | 14 +++++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 4e8acfbe..a7591b51 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -20,6 +20,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.NoSuchElementException;
 
 import static com.orm.SugarContext.getSugarContext;
@@ -248,13 +249,13 @@ static long save(SQLiteDatabase db, Object object) {
         ContentValues values = new ContentValues(columns.size());
         Field idField = null;
         for (Field column : columns) {
-            ReflectionUtil.addFieldValueToColumn(values, column, object);
+            ReflectionUtil.addFieldValueToColumn(values, column, object, entitiesMap);
             if (column.getName() == "id") {
                 idField = column;
             }
         }
 
-        boolean isSugarEntity = isSugarEntity(object);
+        boolean isSugarEntity = isSugarEntity(object.getClass());
         if (isSugarEntity && entitiesMap.containsKey(object)) {
                 values.put("id", entitiesMap.get(object));
         }
@@ -282,8 +283,8 @@ static long save(SQLiteDatabase db, Object object) {
         return id;
     }
 
-    private static boolean isSugarEntity(Object object) {
-        return object.getClass().isAnnotationPresent(Table.class) || SugarRecord.class.isAssignableFrom(object.getClass());
+    public static boolean isSugarEntity(Class<?> objectClass) {
+        return objectClass.isAnnotationPresent(Table.class) || SugarRecord.class.isAssignableFrom(objectClass);
     }
 
     private static void inflate(Cursor cursor, Object object) {
@@ -292,8 +293,7 @@ private static void inflate(Cursor cursor, Object object) {
         for (Field field : columns) {
         	field.setAccessible(true);
             Class<?> fieldType = field.getType();
-            if (fieldType.isAnnotationPresent(Table.class) ||
-                    SugarRecord.class.isAssignableFrom(fieldType)) {
+            if (isSugarEntity(fieldType)) {
                 try {
                     long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toSQLName(field)));
                     field.set(object, (id > 0) ? findById(fieldType, id) : null);
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 43206f69..5f8dcf31 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -24,6 +24,7 @@
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Map;
 
 import dalvik.system.DexFile;
 
@@ -59,7 +60,8 @@ private static List<Field> getAllFields(List<Field> fields, Class<?> type) {
         return fields;
     }
 
-    public static void addFieldValueToColumn(ContentValues values, Field column, Object object) {
+    public static void addFieldValueToColumn(ContentValues values, Field column, Object object,
+            Map<Object, Long> entitiesMap) {
         column.setAccessible(true);
         Class<?> columnType = column.getType();
         try {
@@ -71,12 +73,14 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
                 try {
                     field = columnType.getDeclaredField("id");
                     field.setAccessible(true);
+                    values.put(columnName,
+                            (field != null)
+                                    ? String.valueOf(field.get(columnValue)) : "0");
                 } catch (NoSuchFieldException e) {
-                    e.printStackTrace();
+                    if (entitiesMap.containsKey(columnValue)) {
+                        values.put(columnName, entitiesMap.get(columnValue));
+                    }
                 }
-                values.put(columnName,
-                        (field != null)
-                                ? String.valueOf(field.get(columnValue)) : "0");
             } else if (SugarRecord.class.isAssignableFrom(columnType)) {
                 values.put(columnName,
                         (columnValue != null)

From 1f49d7c9bfabe72bdcbb02f7639d38d8aee27756 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Mon, 6 Apr 2015 23:56:03 -0700
Subject: [PATCH 133/305] Fixed remaining annotated id issue Closes #254
 References #185 References #215 References #243

Thanks @jivimberg for the pull request!
---
 library/src/main/java/com/orm/SugarRecord.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index a7591b51..6088f6a1 100644
--- 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 {

From 95eb3679685e083745a01937031bb67b986026a2 Mon Sep 17 00:00:00 2001
From: Karson Miller <nosrak113@gmail.com>
Date: Wed, 4 Feb 2015 09:30:48 -0800
Subject: [PATCH 134/305] Stop SugarRecord from interacting with other libs
 Closes #258

---
 library/src/main/java/com/orm/SugarRecord.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 6088f6a1..ba26fd44 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -27,7 +27,7 @@
 
 public class SugarRecord {
 
-    protected Long id = null;
+    private Long id = null;
 
     public static <T> void deleteAll(Class<T> type) {
         SugarDb db = getSugarContext().getSugarDb();

From 076043a8f5fe503bda7aebace9ca803480199820 Mon Sep 17 00:00:00 2001
From: Pierre Rossines <pierre.rossines@ecoco2.com>
Date: Fri, 10 Apr 2015 20:47:08 -0700
Subject: [PATCH 135/305] Fixed a bug when saving a row that was already in the
 db. Closes #303

Thanks @RossinesP for the pull request!
---
 library/src/main/java/com/orm/SugarRecord.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index ba26fd44..0645dfb2 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -250,7 +250,7 @@ static long save(SQLiteDatabase db, Object object) {
         Field idField = null;
         for (Field column : columns) {
             ReflectionUtil.addFieldValueToColumn(values, column, object, entitiesMap);
-            if (column.getName() == "id") {
+            if (column.getName().equals("id")) {
                 idField = column;
             }
         }

From 4cb3154d9f2be7803e749414bf007fedcd4d3ed7 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 10 Apr 2015 21:06:55 -0700
Subject: [PATCH 136/305] Use normal gradle instead of the wrapper to bypass
 build errors when the gradle download server is down

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7e2b96b3..f6784c11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ android:
     - android-21
 
 script:
-  - ./gradlew clean build connectedCheck coveralls
+  - gradle clean build connectedCheck coveralls
 
 cache:
   directories:

From 5884ddddaf0302b861c7018fe1f54f1cff3c25e5 Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 10 Apr 2015 20:47:08 -0700
Subject: [PATCH 137/305] Remove unused activities

---
 example/src/main/AndroidManifest.xml          |  3 -
 .../example/activities/AddNoteActivity.java   | 55 -------------------
 .../example/activities/NoteListActivity.java  | 40 --------------
 .../com/example/activities/SugarActivity.java |  2 -
 example/src/main/res/layout/notelist.xml      | 25 ---------
 5 files changed, 125 deletions(-)
 delete mode 100644 example/src/main/java/com/example/activities/AddNoteActivity.java
 delete mode 100644 example/src/main/java/com/example/activities/NoteListActivity.java
 delete mode 100755 example/src/main/res/layout/notelist.xml

diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
index ca949ff1..eb802533 100644
--- a/example/src/main/AndroidManifest.xml
+++ b/example/src/main/AndroidManifest.xml
@@ -10,9 +10,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activities.NoteListActivity"/>
-        <activity android:name=".activities.AddNoteActivity"/>
-
         <meta-data android:name="DATABASE" android:value="sugar_example.db" />
         <meta-data android:name="VERSION" android:value="3" />
         <meta-data android:name="QUERY_LOG" android:value="true" />
diff --git a/example/src/main/java/com/example/activities/AddNoteActivity.java b/example/src/main/java/com/example/activities/AddNoteActivity.java
deleted file mode 100644
index 02ed08ce..00000000
--- a/example/src/main/java/com/example/activities/AddNoteActivity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.example.activities;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import static com.orm.SugarRecord.save;
-
-import com.example.models.Note;
-import com.example.models.Tag;
-import com.example.R;
-
-
-public class AddNoteActivity extends Activity {
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-
-        LinearLayout view = (LinearLayout) findViewById(R.id.layout);
-        TextView titleText = new TextView(this);
-        titleText.setText("Title");
-        TextView descText = new TextView(this);
-        descText.setText("Description");
-        TextView tagText = new TextView(this);
-        tagText.setText("Tag");
-        final EditText titleBox = new EditText(this);
-        final EditText descBox = new EditText(this);
-        final EditText tagBox = new EditText(this);
-
-        Button save = new Button(this);
-        save.setText("Save");
-        view.addView(titleText);
-        view.addView(titleBox);
-        view.addView(descText);
-        view.addView(descBox);
-        view.addView(tagText);
-        view.addView(tagBox);
-        view.addView(save);
-
-        save.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                Tag tag = new Tag(tagBox.getText().toString());
-                save(tag);
-                save(new Note(10 + (int) (10 * Math.random()), titleBox.getText().toString(), descBox.getText().toString(), tag));
-                Intent intent = new Intent(AddNoteActivity.this, NoteListActivity.class);
-                startActivity(intent);
-            }
-        });
-    }
-}
diff --git a/example/src/main/java/com/example/activities/NoteListActivity.java b/example/src/main/java/com/example/activities/NoteListActivity.java
deleted file mode 100644
index 9b85b90e..00000000
--- a/example/src/main/java/com/example/activities/NoteListActivity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.example.activities;
-
-import android.app.ListActivity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.ArrayAdapter;
-
-import java.util.List;
-
-import com.orm.query.Condition;
-import com.orm.query.Select;
-import com.orm.SugarRecord;
-
-import com.example.models.NewNote;
-import com.example.models.Note;
-import com.example.R;
-
-
-public class NoteListActivity extends ListActivity {
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.notelist);
-
-        List<Note> notes = Select.from(Note.class).orderBy("title").list();
-        List<NewNote> list = SugarRecord.listAll(NewNote.class);
-
-        setListAdapter(new ArrayAdapter<Note>(this, android.R.layout.simple_list_item_1, notes));
-
-        findViewById(R.id.Button01).setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                Intent intent = new Intent(NoteListActivity.this, AddNoteActivity.class);
-                startActivity(intent);
-            }
-        });
-
-        Log.d("COUNT", "Count: " + Select.from(Note.class).where(new Condition[]{new Condition("title").eq("note")}).count() + "/" + notes.size());
-    }
-}
diff --git a/example/src/main/java/com/example/activities/SugarActivity.java b/example/src/main/java/com/example/activities/SugarActivity.java
index bf5a7110..83670252 100644
--- a/example/src/main/java/com/example/activities/SugarActivity.java
+++ b/example/src/main/java/com/example/activities/SugarActivity.java
@@ -28,8 +28,6 @@ public void onCreate(Bundle savedInstanceState)
         SugarRecord.deleteAll(Tag.class);
         SugarRecord.deleteAll(NewNote.class);
         initDb();
-        Intent intent = new Intent(this, NoteListActivity.class);
-        startActivity(intent);
     }
 
     private void initDb() {
diff --git a/example/src/main/res/layout/notelist.xml b/example/src/main/res/layout/notelist.xml
deleted file mode 100755
index b07f003f..00000000
--- a/example/src/main/res/layout/notelist.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical" android:layout_width="fill_parent"
-        android:layout_height="fill_parent" android:paddingRight="8dp"
-        android:paddingLeft="8dp">
-
-        <ListView android:id="@id/android:list" android:layout_width="fill_parent"
-                android:layout_height="fill_parent" android:layout_weight="1"
-                android:drawSelectorOnTop="false">
-
-        </ListView>
-
-        <LinearLayout android:id="@+id/LinearLayout01"
-                android:layout_height="wrap_content" android:orientation="horizontal"
-                android:background="#FFFFFF" android:layout_width="fill_parent"
-                android:padding="5dp">
-
-                <Button android:id="@+id/Button01" android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" android:lines="2" android:width="100dp"
-                        android:text="Add Note" />
-
-        </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file

From 2bea7973d3bcec2c94b11ccbf2a5358782e2b3be Mon Sep 17 00:00:00 2001
From: Huu Nguyen <whoshuu@gmail.com>
Date: Fri, 10 Apr 2015 20:47:08 -0700
Subject: [PATCH 138/305] Remove unused models and poor test

---
 .../com/example/activities/SugarActivity.java | 48 -------------
 .../main/java/com/example/models/NewNote.java |  9 ---
 .../main/java/com/example/models/Note.java    | 67 -------------------
 .../java/com/example/models/NoteRelation.java | 35 ----------
 .../src/main/java/com/example/models/Tag.java | 24 -------
 .../java/com/example/models/TextNote.java     | 11 ---
 .../java/com/example/sugartest/NoteTest.java  | 20 ------
 7 files changed, 214 deletions(-)
 delete mode 100644 example/src/main/java/com/example/models/NewNote.java
 delete mode 100644 example/src/main/java/com/example/models/Note.java
 delete mode 100644 example/src/main/java/com/example/models/NoteRelation.java
 delete mode 100644 example/src/main/java/com/example/models/Tag.java
 delete mode 100644 example/src/main/java/com/example/models/TextNote.java
 delete mode 100644 example/src/test/java/com/example/sugartest/NoteTest.java

diff --git a/example/src/main/java/com/example/activities/SugarActivity.java b/example/src/main/java/com/example/activities/SugarActivity.java
index 83670252..197314a0 100644
--- a/example/src/main/java/com/example/activities/SugarActivity.java
+++ b/example/src/main/java/com/example/activities/SugarActivity.java
@@ -4,14 +4,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.orm.SugarRecord;
-
-import static com.orm.SugarRecord.save;
-
-import com.example.models.NewNote;
-import com.example.models.Note;
-import com.example.models.Tag;
-import com.example.models.TextNote;
 import com.example.R;
 
 
@@ -23,45 +15,5 @@ public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
-        SugarRecord.deleteAll(Note.class);
-        SugarRecord.deleteAll(TextNote.class);
-        SugarRecord.deleteAll(Tag.class);
-        SugarRecord.deleteAll(NewNote.class);
-        initDb();
-    }
-
-    private void initDb() {
-        Tag t1 = new Tag("tag1");
-        Tag t2 = new Tag("tag2");
-        save(t1);
-        save(t2);
-
-        Note n1 = new Note( 10, "note1", "description1", t1);
-        Note n2 = new Note(11, "note12", "description2", t1);
-        Note n3 = new Note( 12, "note13", "description3", t2);
-        Note n4 = new Note( 13, "note4", "description4", t2);
-
-        TextNote textNote = new TextNote();
-        textNote.desc = "Test";
-
-        save(textNote);
-        save(n1);
-        save(n2);
-        save(n3);
-        save(n4);
-
-        n1.setDescription("matrix");
-        n1.setTitle("atrix");
-        save(n1);
-        n2.setDescription("matrix");
-        n2.setTitle("satrix");
-        save(n2);
-        n3.setDescription("matrix");
-        n3.setTitle("batrix");
-        save(n3);
-
-        NewNote newNote = new NewNote();
-        newNote.name = "name";
-        save(newNote);
     }
 }
diff --git a/example/src/main/java/com/example/models/NewNote.java b/example/src/main/java/com/example/models/NewNote.java
deleted file mode 100644
index 1ca63424..00000000
--- a/example/src/main/java/com/example/models/NewNote.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.example.models;
-
-import com.orm.dsl.Table;
-
-@Table(name = "new_note")
-public class NewNote {
-    public long id;
-    public String name;
-}
diff --git a/example/src/main/java/com/example/models/Note.java b/example/src/main/java/com/example/models/Note.java
deleted file mode 100644
index fe714558..00000000
--- a/example/src/main/java/com/example/models/Note.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.example.models;
-
-import com.orm.dsl.Column;
-import com.orm.dsl.Table;
-
-@Table(name = "Note")
-public class Note {
-    private long id;
-
-    @Column(name = "noteId", unique = true, notNull = true)
-    private int noteId;
-    private String title;
-    private String description;
-    private String name;
-    private Integer noteNumber = 2;
-    private Float tagNumber = 4.0f;
-    private float tagNo = 5.0f;
-    private Boolean isTag = true;
-    private boolean isTagged = false;
-    private Double noteTagNo = 40.5;
-    private double noteTagNumber = 24.4;
-    private Tag tag;
-
-    public Note() {
-    }
-
-    public Note(int noteId, String title, String description, Tag tag) {
-        this.noteId = noteId;
-        this.title = title;
-        this.description = description;
-        this.tag = tag;
-    }
-
-    public int getNoteId() {
-        return noteId;
-    }
-
-    public void setNoteId(int noteId) {
-        this.noteId = noteId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Tag getTag() {
-        return tag;
-    }
-
-    @Override
-    public String toString() {
-        return title + "id: " + noteId;
-
-    }
-}
diff --git a/example/src/main/java/com/example/models/NoteRelation.java b/example/src/main/java/com/example/models/NoteRelation.java
deleted file mode 100644
index 788baa0d..00000000
--- a/example/src/main/java/com/example/models/NoteRelation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.example.models;
-
-import android.content.Context;
-
-import com.orm.dsl.Table;
-
-@Table(name = "note_relation")
-public class NoteRelation {
-    String name;
-    int noteId;
-
-    public NoteRelation() {
-    }
-
-    public NoteRelation(Context context, String name, int noteId) {
-        this.name = name;
-        this.noteId = noteId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getNoteId() {
-        return noteId;
-    }
-
-    public void setNoteId(int noteId) {
-        this.noteId = noteId;
-    }
-}
diff --git a/example/src/main/java/com/example/models/Tag.java b/example/src/main/java/com/example/models/Tag.java
deleted file mode 100644
index bcb7aaf2..00000000
--- a/example/src/main/java/com/example/models/Tag.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.models;
-
-import com.orm.dsl.Table;
-
-@Table(name = "tag")
-public class Tag {
-    private String name;
-
-    public Tag(String name) {
-        this.name = name;
-    }
-
-    public Tag() {
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String toString() {
-        return getName();
-    }
-}
diff --git a/example/src/main/java/com/example/models/TextNote.java b/example/src/main/java/com/example/models/TextNote.java
deleted file mode 100644
index afb3ef73..00000000
--- a/example/src/main/java/com/example/models/TextNote.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.models;
-
-import com.orm.dsl.Table;
-
-@Table(name = "text_note")
-public class TextNote extends Note {
-    public String desc;
-
-    public TextNote() {
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/NoteTest.java b/example/src/test/java/com/example/sugartest/NoteTest.java
deleted file mode 100644
index f483dbc6..00000000
--- a/example/src/test/java/com/example/sugartest/NoteTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.example.sugartest;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-import com.example.models.Note;
-import com.example.models.Tag;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
-public class NoteTest {
-    @Test
-    public void simpleNoteTest() throws Exception {
-        Note note = new Note(0, "Note", "this is a note", new Tag("tag"));
-        assert(note.getTitle().equals("Note"));
-    }
-}

From d72161ca45cd6ce7cc4c5cfb421df03b3561881e Mon Sep 17 00:00:00 2001
From: Ben O'Halloran <ben@ohalloran.io>
Date: Fri, 10 Apr 2015 11:49:09 -0400
Subject: [PATCH 139/305] Enums serialize using .name() References #304
 References #300 References #292

---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 5f8dcf31..c27ec355 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -61,7 +61,7 @@ private static List<Field> getAllFields(List<Field> fields, Class<?> type) {
     }
 
     public static void addFieldValueToColumn(ContentValues values, Field column, Object object,
-            Map<Object, Long> entitiesMap) {
+                                             Map<Object, Long> entitiesMap) {
         column.setAccessible(true);
         Class<?> columnType = column.getType();
         try {
@@ -132,6 +132,8 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
                 } else {
                     if (columnValue == null) {
                         values.putNull(columnName);
+                    } else if (columnType.isEnum()) {
+                        values.put(columnName, ((Enum) columnValue).name());
                     } else {
                         values.put(columnName, String.valueOf(columnValue));
                     }
@@ -217,7 +219,7 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
             Log.e("field set error", e.getMessage());
         }
     }
-    
+
     private static Field getDeepField(String fieldName, Class<?> type) throws NoSuchFieldException {
         try {
             Field field = type.getDeclaredField(fieldName);

From ec8573efbda1f53561cc301afad61aece58a22a5 Mon Sep 17 00:00:00 2001
From: Ben O'Halloran <ben@ohalloran.io>
Date: Fri, 10 Apr 2015 13:20:02 -0400
Subject: [PATCH 140/305] Add basic tests for enums with overriden and default
 toString methods Closes #304 Fixes #300 References #292

Thanks @benohalloran for the pull request!
---
 .../models/EnumFieldAnnotatedModel.java       | 52 ++++++++++++
 .../models/EnumFieldExtendedModel.java        | 46 +++++++++++
 .../com/example/sugartest/EnumFieldTests.java | 81 +++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
 create mode 100644 example/src/main/java/com/example/models/EnumFieldExtendedModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/EnumFieldTests.java

diff --git a/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java b/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
new file mode 100644
index 00000000..34bf2f7e
--- /dev/null
+++ b/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
@@ -0,0 +1,52 @@
+package com.example.models;
+
+import com.orm.dsl.Table;
+
+@Table
+public class EnumFieldAnnotatedModel {
+    public static enum DefaultEnum {
+        ONE, TWO
+    }
+
+    public static enum OverrideEnum {
+        ONE, TWO;
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase();
+        }
+    }
+
+    private OverrideEnum overrideEnum;
+    private DefaultEnum defaultEnum;
+    private Long id;
+
+    public EnumFieldAnnotatedModel() {
+
+    }
+
+    public EnumFieldAnnotatedModel(OverrideEnum e1, DefaultEnum d1) {
+        overrideEnum = e1;
+        defaultEnum = d1;
+    }
+
+    public DefaultEnum getDefaultEnum() {
+        return defaultEnum;
+    }
+
+    public void setDefaultEnum(DefaultEnum defaultEnum) {
+        this.defaultEnum = defaultEnum;
+    }
+
+    public void setOverrideEnum(OverrideEnum overrideEnum) {
+        this.overrideEnum = overrideEnum;
+    }
+
+    public OverrideEnum getOverrideEnum() {
+        return overrideEnum;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/example/src/main/java/com/example/models/EnumFieldExtendedModel.java b/example/src/main/java/com/example/models/EnumFieldExtendedModel.java
new file mode 100644
index 00000000..df3a093b
--- /dev/null
+++ b/example/src/main/java/com/example/models/EnumFieldExtendedModel.java
@@ -0,0 +1,46 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class EnumFieldExtendedModel extends SugarRecord {
+    public static enum DefaultEnum {
+        ONE, TWO
+    }
+
+    public static enum OverrideEnum {
+        ONE, TWO;
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase();
+        }
+    }
+
+    private OverrideEnum overrideEnum;
+    private DefaultEnum defaultEnum;
+
+    public EnumFieldExtendedModel() {
+
+    }
+
+    public EnumFieldExtendedModel(OverrideEnum e1, DefaultEnum d1) {
+        overrideEnum = e1;
+        defaultEnum = d1;
+    }
+
+    public DefaultEnum getDefaultEnum() {
+        return defaultEnum;
+    }
+
+    public void setDefaultEnum(DefaultEnum defaultEnum) {
+        this.defaultEnum = defaultEnum;
+    }
+
+    public void setOverrideEnum(OverrideEnum overrideEnum) {
+        this.overrideEnum = overrideEnum;
+    }
+
+    public OverrideEnum getOverrideEnum() {
+        return overrideEnum;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/EnumFieldTests.java b/example/src/test/java/com/example/sugartest/EnumFieldTests.java
new file mode 100644
index 00000000..7ce17380
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/EnumFieldTests.java
@@ -0,0 +1,81 @@
+package com.example.sugartest;
+
+import com.example.models.EnumFieldAnnotatedModel;
+import com.example.models.EnumFieldExtendedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk = 18)
+public class EnumFieldTests {
+    @Test
+    public void nullDefaultEnumExtendedTest() {
+        save(new EnumFieldExtendedModel());
+        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        assertNull(model.getDefaultEnum());
+    }
+
+    @Test
+    public void nullOverriddenEnumExtendedTest() {
+        save(new EnumFieldExtendedModel());
+        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        assertNull(model.getOverrideEnum());
+    }
+    @Test
+    public void nullDefaultEnumAnnotatedTest() {
+        save(new EnumFieldAnnotatedModel());
+        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        assertNull(model.getDefaultEnum());
+    }
+
+    @Test
+    public void nullOverriddenEnumAnnotatedTest() {
+        save(new EnumFieldAnnotatedModel());
+        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        assertNull(model.getOverrideEnum());
+    }
+
+    @Test
+    public void defaultEnumExtendedTest() {
+        save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
+                EnumFieldExtendedModel.DefaultEnum.TWO));
+        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        assertNotNull(model);
+        assertEquals(model.getDefaultEnum(), EnumFieldExtendedModel.DefaultEnum.TWO);
+    }
+
+    @Test
+    public void overriddenEnumExtendedTest() {
+        save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
+                EnumFieldExtendedModel.DefaultEnum.TWO));
+        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        assertNotNull(model);
+        assertEquals(model.getOverrideEnum(), EnumFieldExtendedModel.OverrideEnum.ONE);
+    }
+
+    @Test
+    public void defaultEnumAnnotatedTest() {
+        save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
+                EnumFieldAnnotatedModel.DefaultEnum.TWO));
+        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        assertNotNull(model);
+        assertEquals(model.getDefaultEnum(), EnumFieldAnnotatedModel.DefaultEnum.TWO);
+    }
+
+    @Test
+    public void overriddenEnumAnnotatedTest() {
+        save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
+                EnumFieldAnnotatedModel.DefaultEnum.TWO));
+        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        assertNotNull(model);
+        assertEquals(model.getOverrideEnum(), EnumFieldAnnotatedModel.OverrideEnum.ONE);
+    }
+}

From a45dd1a00b85fa86aa66d731a3a00790e4102d6a Mon Sep 17 00:00:00 2001
From: Shyish <Shyish@users.noreply.github.com>
Date: Mon, 6 Apr 2015 18:51:51 +0200
Subject: [PATCH 141/305] Update SugarRecord to return sensible values on
 multiple operations Add tests to validate behavior of parameters Closes #306

Thanks @Shyish for the pull request!
---
 .../java/com/example/models/NoSugarModel.java |  7 +++
 .../IncompleteAnnotatedModelTests.java        |  9 ++-
 .../example/sugartest/NoSugarModelTests.java  | 28 ++++++++++
 .../sugartest/SimpleAnnotatedModelTests.java  | 48 +++++++++++-----
 .../sugartest/SimpleExtendedModelTests.java   | 48 +++++++++++-----
 .../src/main/java/com/orm/SugarRecord.java    | 56 ++++++++++---------
 6 files changed, 143 insertions(+), 53 deletions(-)
 create mode 100644 example/src/main/java/com/example/models/NoSugarModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/NoSugarModelTests.java

diff --git a/example/src/main/java/com/example/models/NoSugarModel.java b/example/src/main/java/com/example/models/NoSugarModel.java
new file mode 100644
index 00000000..0e2d55e8
--- /dev/null
+++ b/example/src/main/java/com/example/models/NoSugarModel.java
@@ -0,0 +1,7 @@
+package com.example.models;
+
+
+public class NoSugarModel {
+    public NoSugarModel() {
+    }
+}
\ No newline at end of file
diff --git a/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
index 5b3c94ba..4959f757 100644
--- a/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
@@ -9,13 +9,20 @@
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
+import static com.orm.SugarRecord.delete;
 import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertFalse;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(emulateSdk=18)
 public class IncompleteAnnotatedModelTests {
     @Test(expected=SQLiteException.class)
-    public void noIdFieldTest() {
+    public void saveNoIdFieldTest() {
         save(new IncompleteAnnotatedModel());
     }
+
+    @Test
+    public void deleteNoIdFieldTest() {
+        assertFalse(delete(new IncompleteAnnotatedModel()));
+    }
 }
diff --git a/example/src/test/java/com/example/sugartest/NoSugarModelTests.java b/example/src/test/java/com/example/sugartest/NoSugarModelTests.java
new file mode 100644
index 00000000..f638d56b
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/NoSugarModelTests.java
@@ -0,0 +1,28 @@
+package com.example.sugartest;
+
+import com.example.models.NoSugarModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk=18)
+public class NoSugarModelTests {
+    @Test
+    public void deleteTest() throws Exception {
+        NoSugarModel model = new NoSugarModel();
+        assertFalse(SugarRecord.delete(model));
+    }
+
+    @Test
+    public void saveInTransactionTest() throws Exception {
+        SugarRecord.saveInTx(new NoSugarModel(), new NoSugarModel());
+        assertEquals(-1L, SugarRecord.count(NoSugarModel.class));
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
index b058435a..77a14677 100644
--- a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
@@ -8,6 +8,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -15,6 +16,7 @@
 
 import static com.orm.SugarRecord.save;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -82,7 +84,7 @@ public void deleteTest() throws Exception {
         SimpleAnnotatedModel model = new SimpleAnnotatedModel();
         save(model);
         assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        SugarRecord.delete(model);
+        assertTrue(SugarRecord.delete(model));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
@@ -90,25 +92,41 @@ public void deleteTest() throws Exception {
     public void deleteUnsavedTest() throws Exception {
         SimpleAnnotatedModel model = new SimpleAnnotatedModel();
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-        SugarRecord.delete(model);
+        assertFalse(SugarRecord.delete(model));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
+    @Test
+    public void deleteWrongTest() throws Exception {
+        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
+        save(model);
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        Field idField = model.getClass().getDeclaredField("id");
+        idField.setAccessible(true);
+        idField.set(model, Long.MAX_VALUE);
+        assertFalse(SugarRecord.delete(model));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
     @Test
     public void deleteAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
+        int elementNumber = 100;
+        for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleAnnotatedModel());
         }
-        SugarRecord.deleteAll(SimpleAnnotatedModel.class);
+        assertEquals(elementNumber, SugarRecord.deleteAll(SimpleAnnotatedModel.class));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void deleteAllWhereTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
+        int elementNumber = 100;
+        for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleAnnotatedModel());
         }
-        SugarRecord.deleteAll(SimpleAnnotatedModel.class, "id > ?", new String[]{"1"});
+        assertEquals(elementNumber - 1, SugarRecord.deleteAll(SimpleAnnotatedModel.class,
+                                                              "id > ?",
+                                                              new String[]{"1"}));
         assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
@@ -119,22 +137,26 @@ public void deleteInTransactionFewTest() throws Exception {
         SimpleAnnotatedModel third = new SimpleAnnotatedModel();
         save(first);
         save(second);
-        save(third);
-        assertEquals(3L, SugarRecord.count(SimpleAnnotatedModel.class));
-        SugarRecord.deleteInTx(first, second, third);
+        // Not saving last model
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2, SugarRecord.deleteInTx(first, second, third));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void deleteInTransactionManyTest() throws Exception {
+        long elementNumber = 100;
         List<SimpleAnnotatedModel> models = new ArrayList<>();
-        for (int i = 1; i <= 100; i++) {
+        for (int i = 1; i <= elementNumber; i++) {
             SimpleAnnotatedModel model = new SimpleAnnotatedModel();
             models.add(model);
-            save(model);
+            // Not saving last model
+            if (i < elementNumber) {
+                save(model);
+            }
         }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        SugarRecord.deleteInTx(models);
+        assertEquals(elementNumber - 1, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(elementNumber - 1, SugarRecord.deleteInTx(models));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
index eb61a212..704ea5c3 100644
--- a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
@@ -8,6 +8,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -15,6 +16,7 @@
 
 import static com.orm.SugarRecord.save;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -89,7 +91,7 @@ public void deleteTest() throws Exception {
         SimpleExtendedModel model = new SimpleExtendedModel();
         save(model);
         assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        SugarRecord.delete(model);
+        assertTrue(SugarRecord.delete(model));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
@@ -97,25 +99,41 @@ public void deleteTest() throws Exception {
     public void deleteUnsavedTest() throws Exception {
         SimpleExtendedModel model = new SimpleExtendedModel();
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-        SugarRecord.delete(model);
+        assertFalse(SugarRecord.delete(model));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
+    @Test
+    public void deleteWrongTest() throws Exception {
+        SimpleExtendedModel model = new SimpleExtendedModel();
+        save(model);
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        Field idField = model.getClass().getSuperclass().getDeclaredField("id");
+        idField.setAccessible(true);
+        idField.set(model, Long.MAX_VALUE);
+        assertFalse(SugarRecord.delete(model));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
     @Test
     public void deleteAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
+        int elementNumber = 100;
+        for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleExtendedModel());
         }
-        SugarRecord.deleteAll(SimpleExtendedModel.class);
+        assertEquals(elementNumber, SugarRecord.deleteAll(SimpleExtendedModel.class));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
     @Test
     public void deleteAllWhereTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
+        int elementNumber = 100;
+        for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleExtendedModel());
         }
-        SugarRecord.deleteAll(SimpleExtendedModel.class, "id > ?", new String[]{"1"});
+        assertEquals(elementNumber - 1, SugarRecord.deleteAll(SimpleExtendedModel.class,
+                                                              "id > ?",
+                                                              new String[]{"1"}));
         assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
@@ -126,22 +144,26 @@ public void deleteInTransactionFewTest() throws Exception {
         SimpleExtendedModel third = new SimpleExtendedModel();
         save(first);
         save(second);
-        save(third);
-        assertEquals(3L, SugarRecord.count(SimpleExtendedModel.class));
-        SugarRecord.deleteInTx(first, second, third);
+        // Not saving last model
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2, SugarRecord.deleteInTx(first, second, third));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
     @Test
     public void deleteInTransactionManyTest() throws Exception {
+        long elementNumber = 100;
         List<SimpleExtendedModel> models = new ArrayList<>();
-        for (int i = 1; i <= 100; i++) {
+        for (int i = 1; i <= elementNumber; i++) {
             SimpleExtendedModel model = new SimpleExtendedModel();
             models.add(model);
-            save(model);
+            // Not saving last model
+            if (i < elementNumber) {
+                save(model);
+            }
         }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        SugarRecord.deleteInTx(models);
+        assertEquals(elementNumber - 1, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(elementNumber - 1, SugarRecord.deleteInTx(models));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 0645dfb2..0f76b766 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -29,16 +29,14 @@ public class SugarRecord {
 
     private Long id = null;
 
-    public static <T> void deleteAll(Class<T> type) {
-        SugarDb db = getSugarContext().getSugarDb();
-        SQLiteDatabase sqLiteDatabase = db.getDB();
-        sqLiteDatabase.delete(NamingHelper.toSQLName(type), null, null);
+    public static <T> int deleteAll(Class<T> type) {
+        return deleteAll(type, null);
     }
 
-    public static <T> void deleteAll(Class<T> type, String whereClause, String... whereArgs) {
+    public static <T> int deleteAll(Class<T> type, String whereClause, String... whereArgs) {
         SugarDb db = getSugarContext().getSugarDb();
         SQLiteDatabase sqLiteDatabase = db.getDB();
-        sqLiteDatabase.delete(NamingHelper.toSQLName(type), whereClause, whereArgs);
+        return sqLiteDatabase.delete(NamingHelper.toSQLName(type), whereClause, whereArgs);
     }
 
     @SuppressWarnings("deprecation")
@@ -53,7 +51,7 @@ public static <T> void saveInTx(Collection<T> objects) {
             sqLiteDatabase.beginTransaction();
             sqLiteDatabase.setLockingEnabled(false);
             for (T object: objects) {
-                SugarRecord.save(object);
+                save(object);
             }
             sqLiteDatabase.setTransactionSuccessful();
         } catch (Exception e) {
@@ -65,26 +63,31 @@ public static <T> void saveInTx(Collection<T> objects) {
     }
 
     @SuppressWarnings("deprecation")
-    public static <T> void deleteInTx(T... objects) {
-        deleteInTx(Arrays.asList(objects));
+    public static <T> int deleteInTx(T... objects) {
+        return deleteInTx(Arrays.asList(objects));
     }
 
     @SuppressWarnings("deprecation")
-    public static <T> void deleteInTx(Collection<T> objects) {
+    public static <T> int deleteInTx(Collection<T> objects) {
         SQLiteDatabase sqLiteDatabase = getSugarContext().getSugarDb().getDB();
+        int deletedRows = 0;
         try {
             sqLiteDatabase.beginTransaction();
             sqLiteDatabase.setLockingEnabled(false);
             for (T object : objects) {
-                SugarRecord.delete(object);
+                if (delete(object)) {
+                    ++deletedRows;
+                }
             }
             sqLiteDatabase.setTransactionSuccessful();
         } catch (Exception e) {
+            deletedRows = 0;
             Log.i("Sugar", "Error in deleting in transaction " + e.getMessage());
         } finally {
             sqLiteDatabase.endTransaction();
             sqLiteDatabase.setLockingEnabled(true);
         }
+        return deletedRows;
     }
 
     public static <T> List<T> listAll(Class<T> type) {
@@ -165,7 +168,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, getSugarContext().getEntitiesMap());
+                inflate(c, entity, getSugarContext().getEntitiesMap());
                 toRet.add(entity);
             }
         } catch (Exception e) {
@@ -191,7 +194,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, getSugarContext().getEntitiesMap());
+                inflate(c, entity, getSugarContext().getEntitiesMap());
                 toRet.add(entity);
             }
         } catch (Exception e) {
@@ -309,20 +312,20 @@ private static void inflate(Cursor cursor, Object object, Map<Object, Long> enti
         }
     }
 
-    public void delete() {
+    public boolean delete() {
         Long id = getId();
         Class<?> type = getClass();
         if (id != null && id > 0L) {
             SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
-            db.delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()});
-            Log.i("Sugar", type.getSimpleName() + " deleted : " + id.toString());
+            Log.i("Sugar", type.getSimpleName() + " deleted : " + id);
+            return db.delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()}) == 1;
         } else {
             Log.i("Sugar", "Cannot delete object: " + type.getSimpleName() + " - object has not been saved");
-            return;
+            return false;
         }
     }
     
-    public static void delete(Object object) {
+    public static boolean delete(Object object) {
         Class<?> type = object.getClass();
         if (type.isAnnotationPresent(Table.class)) {
             try {
@@ -331,24 +334,25 @@ public static void delete(Object object) {
                 Long id = (Long) field.get(object);
                 if (id != null && id > 0L) {
                     SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
-                    db.delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()});
-                    Log.i("Sugar", type.getSimpleName() + " deleted : " + id.toString());
+                    boolean deleted = db.delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()}) == 1;
+                    Log.i("Sugar", type.getSimpleName() + " deleted : " + id);
+                    return deleted;
                 } else {
                     Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - object has not been saved");
-                    return;
+                    return false;
                 }
             } catch (NoSuchFieldException e) {
                 Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - annotated object has no id");
-                return;
+                return false;
             } catch (IllegalAccessException e) {
                 Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - can't access id");
-                return;
+                return false;
             }
         } else if (SugarRecord.class.isAssignableFrom(type)) {
-            ((SugarRecord) object).delete();
+            return ((SugarRecord) object).delete();
         } else {
             Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - not persisted");
-            return;
+            return false;
         }
     }
 
@@ -396,7 +400,7 @@ public E next() {
 
             try {
                 entity = type.getDeclaredConstructor().newInstance();
-                SugarRecord.inflate(cursor, entity, getSugarContext().getEntitiesMap());
+                inflate(cursor, entity, getSugarContext().getEntitiesMap());
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {

From ec0b465de3c8413977af6e18627885735d0e19db Mon Sep 17 00:00:00 2001
From: Ben O'Halloran <ben@ohalloran.io>
Date: Thu, 16 Apr 2015 00:20:38 -0400
Subject: [PATCH 142/305] Cursors for adapters

---
 .../java/com/example/models/SimpleModel.java  | 33 +++++++++++
 .../com/example/sugartest/CursorTests.java    | 56 +++++++++++++++++++
 .../src/main/java/com/orm/SugarRecord.java    | 30 ++++++----
 .../src/main/java/com/orm/query/Select.java   |  5 ++
 .../main/java/com/orm/util/SugarCursor.java   | 39 +++++++++++++
 5 files changed, 152 insertions(+), 11 deletions(-)
 create mode 100644 example/src/main/java/com/example/models/SimpleModel.java
 create mode 100644 example/src/test/java/com/example/sugartest/CursorTests.java
 create mode 100644 library/src/main/java/com/orm/util/SugarCursor.java

diff --git a/example/src/main/java/com/example/models/SimpleModel.java b/example/src/main/java/com/example/models/SimpleModel.java
new file mode 100644
index 00000000..dd482ee5
--- /dev/null
+++ b/example/src/main/java/com/example/models/SimpleModel.java
@@ -0,0 +1,33 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+
+public class SimpleModel extends SugarRecord {
+    private String str;
+    private int integer;
+    private boolean bool;
+
+    public String getStr() {
+        return str;
+    }
+
+    public void setStr(String str) {
+        this.str = str;
+    }
+
+    public int getInteger() {
+        return integer;
+    }
+
+    public void setInteger(int integer) {
+        this.integer = integer;
+    }
+
+    public boolean isBool() {
+        return bool;
+    }
+
+    public void setBool(boolean bool) {
+        this.bool = bool;
+    }
+}
diff --git a/example/src/test/java/com/example/sugartest/CursorTests.java b/example/src/test/java/com/example/sugartest/CursorTests.java
new file mode 100644
index 00000000..708d8dd0
--- /dev/null
+++ b/example/src/test/java/com/example/sugartest/CursorTests.java
@@ -0,0 +1,56 @@
+package com.example.sugartest;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.database.Cursor;
+import android.os.Build;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorAdapter;
+import android.widget.TextView;
+
+import com.example.models.SimpleModel;
+import com.orm.query.Select;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static junit.framework.Assert.assertNotSame;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(emulateSdk = 18)
+public class CursorTests {
+    @Test
+    public void testColumnNames() {
+        save(new SimpleModel());
+        Cursor c = Select.from(SimpleModel.class).getCursor();
+        for (String col : new String[]{"STR", "INTEGER", "BOOL", "ID"}) {
+            assertNotSame("Missing column for field: " + col, -1, c.getColumnIndex(col));
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    @Test
+    public void testMakeAdapter() {
+        save(new SimpleModel());
+        Cursor c = Select.from(SimpleModel.class).getCursor();
+        CursorAdapter adapter = new CursorAdapter(Robolectric.application, c, true) {
+            @Override
+            public View newView(Context context, Cursor cursor, ViewGroup parent) {
+                TextView tv = new TextView(context);
+                String s = cursor.getString(cursor.getColumnIndex("STR"));
+                tv.setText(s);
+                return null;
+            }
+
+            @Override
+            public void bindView(View view, Context context, Cursor cursor) {
+                String s = cursor.getString(cursor.getColumnIndex("STR"));
+                ((TextView) view).setText(s);
+            }
+        };
+    }
+}
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 0f76b766..d0772320 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -10,10 +10,10 @@
 
 import com.orm.dsl.Table;
 import com.orm.util.NamingHelper;
-import com.orm.util.ReflectionUtil;
 import com.orm.util.QueryBuilder;
+import com.orm.util.ReflectionUtil;
+import com.orm.util.SugarCursor;
 
-import java.lang.String;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,6 +39,14 @@ public static <T> int deleteAll(Class<T> type, String whereClause, String... whe
         return sqLiteDatabase.delete(NamingHelper.toSQLName(type), whereClause, whereArgs);
     }
 
+    public static <T> Cursor getCursor(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
+        SugarDb db = getSugarContext().getSugarDb();
+        SQLiteDatabase sqLiteDatabase = db.getDB();
+        Cursor raw = sqLiteDatabase.query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
+                groupBy, null, orderBy, limit);
+        return new SugarCursor(raw);
+    }
+
     @SuppressWarnings("deprecation")
     public static <T> void saveInTx(T... objects) {
         saveInTx(Arrays.asList(objects));
@@ -50,7 +58,7 @@ public static <T> void saveInTx(Collection<T> objects) {
         try {
             sqLiteDatabase.beginTransaction();
             sqLiteDatabase.setLockingEnabled(false);
-            for (T object: objects) {
+            for (T object : objects) {
                 save(object);
             }
             sqLiteDatabase.setTransactionSuccessful();
@@ -93,7 +101,7 @@ public static <T> int deleteInTx(Collection<T> objects) {
     public static <T> List<T> listAll(Class<T> type) {
         return find(type, null, null, null, null, null);
     }
-    
+
     public static <T> List<T> listAll(Class<T> type, String orderBy) {
         return find(type, null, null, null, orderBy, null);
     }
@@ -113,7 +121,7 @@ public static <T> List<T> findById(Class<T> type, String[] ids) {
         return find(type, whereClause, ids);
     }
 
-    public static <T> T first(Class<T>type) {
+    public static <T> T first(Class<T> type) {
         List<T> list = findWithQuery(type,
                 "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ID ASC LIMIT 1");
         if (list.isEmpty()) {
@@ -122,7 +130,7 @@ public static <T> T first(Class<T>type) {
         return list.get(0);
     }
 
-    public static <T> T last(Class<T>type) {
+    public static <T> T last(Class<T> type) {
         List<T> list = findWithQuery(type,
                 "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ID DESC LIMIT 1");
         if (list.isEmpty()) {
@@ -210,7 +218,7 @@ public static <T> long count(Class<?> type) {
     }
 
     public static <T> long count(Class<?> type, String whereClause, String[] whereArgs) {
-    	return count(type, whereClause, whereArgs, null, null, null);
+        return count(type, whereClause, whereArgs, null, null, null);
     }
 
     public static <T> long count(Class<?> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
@@ -218,7 +226,7 @@ public static <T> long count(Class<?> type, String whereClause, String[] whereAr
         SQLiteDatabase sqLiteDatabase = db.getDB();
 
         long toRet = -1;
-        String filter = (!TextUtils.isEmpty(whereClause)) ? " where "  + whereClause : "";
+        String filter = (!TextUtils.isEmpty(whereClause)) ? " where " + whereClause : "";
         SQLiteStatement sqliteStatement;
         try {
             sqliteStatement = sqLiteDatabase.compileStatement("SELECT count(*) FROM " + NamingHelper.toSQLName(type) + filter);
@@ -260,7 +268,7 @@ static long save(SQLiteDatabase db, Object object) {
 
         boolean isSugarEntity = isSugarEntity(object.getClass());
         if (isSugarEntity && entitiesMap.containsKey(object)) {
-                values.put("id", entitiesMap.get(object));
+            values.put("id", entitiesMap.get(object));
         }
 
         long id = db.insertWithOnConflict(NamingHelper.toSQLName(object.getClass()), null, values,
@@ -297,7 +305,7 @@ private static void inflate(Cursor cursor, Object object, Map<Object, Long> enti
         }
 
         for (Field field : columns) {
-        	field.setAccessible(true);
+            field.setAccessible(true);
             Class<?> fieldType = field.getType();
             if (isSugarEntity(fieldType)) {
                 try {
@@ -324,7 +332,7 @@ public boolean delete() {
             return false;
         }
     }
-    
+
     public static boolean delete(Object object) {
         Class<?> type = object.getClass();
         if (type.isAnnotationPresent(Table.class)) {
diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 9c52a9b4..cadea7b3 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -1,5 +1,7 @@
 package com.orm.query;
 
+import android.database.Cursor;
+
 import com.orm.SugarRecord;
 import com.orm.util.NamingHelper;
 
@@ -110,6 +112,9 @@ public Select<T> where(String whereClause, String[] args) {
         return this;
     }
 
+    public Cursor getCursor() {
+       return SugarRecord.getCursor(record, whereClause, arguments, groupBy, orderBy, limit);
+    }
     public List<T> list() {
         if (arguments == null) {
             arguments = convertArgs(args);
diff --git a/library/src/main/java/com/orm/util/SugarCursor.java b/library/src/main/java/com/orm/util/SugarCursor.java
new file mode 100644
index 00000000..7f4471db
--- /dev/null
+++ b/library/src/main/java/com/orm/util/SugarCursor.java
@@ -0,0 +1,39 @@
+package com.orm.util;
+
+import android.database.Cursor;
+import android.database.CursorWrapper;
+
+public class SugarCursor extends CursorWrapper {
+    /**
+     * Creates a cursor wrapper.
+     *
+     * @param cursor The underlying cursor to wrap.
+     */
+    public SugarCursor(Cursor cursor) {
+        super(cursor);
+    }
+
+    @Override
+    public int getColumnIndexOrThrow(String columnName) throws IllegalArgumentException {
+        try {
+            return super.getColumnIndexOrThrow(columnName);
+        } catch (IllegalArgumentException e) {
+            if (columnName.equals("_id"))
+                return super.getColumnIndexOrThrow("ID");
+            else
+                throw e;
+        }
+    }
+
+    @Override
+    public int getColumnIndex(String columnName) {
+        try {
+            return super.getColumnIndex(columnName);
+        } catch (Exception e) {
+            if (columnName.equals("_id"))
+                return super.getColumnIndex("ID");
+            else
+                throw e;
+        }
+    }
+}

From e0077a2e0cf0c20d610273ce029f63d8ad535dd9 Mon Sep 17 00:00:00 2001
From: Ben O'Halloran <ben@ohalloran.io>
Date: Thu, 16 Apr 2015 11:47:48 -0400
Subject: [PATCH 143/305] Add Test, Consistency update

make getColumnIndex return -1 when invalid column name is passed
---
 .../java/com/example/sugartest/CursorTests.java  | 15 +++++++++++++++
 .../src/main/java/com/orm/util/SugarCursor.java  | 16 +++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/example/src/test/java/com/example/sugartest/CursorTests.java b/example/src/test/java/com/example/sugartest/CursorTests.java
index 708d8dd0..b900f569 100644
--- a/example/src/test/java/com/example/sugartest/CursorTests.java
+++ b/example/src/test/java/com/example/sugartest/CursorTests.java
@@ -19,6 +19,7 @@
 
 import static com.orm.SugarRecord.save;
 import static junit.framework.Assert.assertNotSame;
+import static junit.framework.Assert.assertSame;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(emulateSdk = 18)
@@ -31,6 +32,20 @@ public void testColumnNames() {
             assertNotSame("Missing column for field: " + col, -1, c.getColumnIndex(col));
         }
     }
+    @Test
+    public void testSugarCursor(){
+        save(new SimpleModel());
+        Cursor cursor = Select.from(SimpleModel.class).getCursor();
+        assertNotSame("No _id", -1, cursor.getColumnIndex("_id"));
+        assertSame("_id != ID", cursor.getColumnIndex("_id"), cursor.getColumnIndex("ID"));
+    }
+
+    @Test
+    public void testNoColumn(){
+        save(new SimpleModel());
+        Cursor cursor = Select.from(SimpleModel.class).getCursor();
+        assertSame(-1, cursor.getColumnIndex("nonexistent"));
+    }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @Test
diff --git a/library/src/main/java/com/orm/util/SugarCursor.java b/library/src/main/java/com/orm/util/SugarCursor.java
index 7f4471db..e326f49b 100644
--- a/library/src/main/java/com/orm/util/SugarCursor.java
+++ b/library/src/main/java/com/orm/util/SugarCursor.java
@@ -4,11 +4,6 @@
 import android.database.CursorWrapper;
 
 public class SugarCursor extends CursorWrapper {
-    /**
-     * Creates a cursor wrapper.
-     *
-     * @param cursor The underlying cursor to wrap.
-     */
     public SugarCursor(Cursor cursor) {
         super(cursor);
     }
@@ -27,13 +22,8 @@ public int getColumnIndexOrThrow(String columnName) throws IllegalArgumentExcept
 
     @Override
     public int getColumnIndex(String columnName) {
-        try {
-            return super.getColumnIndex(columnName);
-        } catch (Exception e) {
-            if (columnName.equals("_id"))
-                return super.getColumnIndex("ID");
-            else
-                throw e;
-        }
+        if (columnName.equals("_id"))
+            columnName = "ID";
+        return super.getColumnIndex(columnName);
     }
 }

From ff29934533a8a1dfb041ce1bd6c356712da667bc Mon Sep 17 00:00:00 2001
From: Brendan Ribera <brendan.ribera@gmail.com>
Date: Thu, 16 Apr 2015 17:35:14 -0700
Subject: [PATCH 144/305] Fix StrictMode crashes by calling `close` on our
 DexFiles

---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index c27ec355..a740b42d 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -291,8 +291,9 @@ private static List<String> getAllClasses(Context context) throws PackageManager
         String packageName = ManifestHelper.getDomainPackageName(context);
         String path = getSourcePath(context);
         List<String> classNames = new ArrayList<String>();
+        DexFile dexfile = null;
         try {
-            DexFile dexfile = new DexFile(path);
+            dexfile = new DexFile(path);
             Enumeration<String> dexEntries = dexfile.entries();
             while (dexEntries.hasMoreElements()) {
                 String className = dexEntries.nextElement();
@@ -314,6 +315,8 @@ private static List<String> getAllClasses(Context context) throws PackageManager
                     }
                 }
             }
+        } finally {
+            if (null != dexfile) dexfile.close();
         }
         return classNames;
     }

From b03f5b9054457ea47bd021d1f78848b87a8f4659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20H=C3=A4ggqvist?= <victor@hggqvst.com>
Date: Sat, 9 May 2015 19:13:35 +0200
Subject: [PATCH 145/305] Update readme Gradle dependency version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 381ce2b9..98db9394 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ There are four ways to install Sugar:
 This is the preferred way. Simply add:
 
 ```groovy
-compile 'com.github.satyan:sugar:1.3'
+compile 'com.github.satyan:sugar:1.3.1'
 ```
 
 to your project dependencies and run `gradle build` or `gradle assemble`.

From 72dfc886edc4f26a36838447f1181a4ce2358e4e Mon Sep 17 00:00:00 2001
From: CHN-XCHU <theron.chu@gmail.com>
Date: Mon, 11 May 2015 17:58:51 +0800
Subject: [PATCH 146/305] Update ReflectionUtil.java

In order to get all classes from all dexes when we enable multi-dex,we need some updates.
---
 .../java/com/orm/util/ReflectionUtil.java     | 73 ++++++++++++++++---
 1 file changed, 61 insertions(+), 12 deletions(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index c27ec355..2f8881e4 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -286,38 +286,87 @@ private static Class getDomainClass(String className, Context context) {
         }
     }
 
+private static final String EXTRACTED_NAME_EXT = ".classes";
+    private static final String EXTRACTED_SUFFIX = ".zip";
+
+    private static final String SECONDARY_FOLDER_NAME = "code_cache" + File.separator +
+            "secondary-dexes";
+
+    private static final String PREFS_FILE = "multidex.version";
+    private static final String KEY_DEX_NUMBER = "dex.number";
+
+    private static SharedPreferences getMultiDexPreferences(Context context) {
+        return context.getSharedPreferences(PREFS_FILE,
+                Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
+                        ? Context.MODE_PRIVATE
+                        : Context.MODE_PRIVATE | Context.MODE_MULTI_PROCESS);
+    }
 
     private static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
-        String packageName = ManifestHelper.getDomainPackageName(context);
-        String path = getSourcePath(context);
-        List<String> classNames = new ArrayList<String>();
+        List<String> paths = getSourcePaths(context);
+        List<String> classNames = new ArrayList<>();
         try {
-            DexFile dexfile = new DexFile(path);
-            Enumeration<String> dexEntries = dexfile.entries();
-            while (dexEntries.hasMoreElements()) {
-                String className = dexEntries.nextElement();
-                if (className.startsWith(packageName)) classNames.add(className);
+            for (int i = 0; i <paths.size(); i++){
+                String path = paths.get(i);
+                DexFile dexfile = null;
+                if (path.endsWith(EXTRACTED_SUFFIX)) {
+                    //NOT use new DexFile(path) here, because it will throw "permission error in /data/dalvik-cache"
+                    dexfile = DexFile.loadDex(path, path + ".tmp", 0);
+                } else {
+                    dexfile = new DexFile(path);
+                }
+
+                Enumeration<String> dexEntries = dexfile.entries();
+                while (dexEntries.hasMoreElements()) {
+                    classNames.add(dexEntries.nextElement());
+                }
             }
         } catch (NullPointerException e) {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             Enumeration<URL> urls = classLoader.getResources("");
+            List<String> fileNames = new ArrayList<String>();
             while (urls.hasMoreElements()) {
-                List<String> fileNames = new ArrayList<String>();
                 String classDirectoryName = urls.nextElement().getFile();
                 if (classDirectoryName.contains("bin") || classDirectoryName.contains("classes")) {
                     File classDirectory = new File(classDirectoryName);
                     for (File filePath : classDirectory.listFiles()) {
                         populateFiles(filePath, fileNames, "");
                     }
-                    for (String fileName : fileNames) {
-                        if (fileName.startsWith(packageName)) classNames.add(fileName);
-                    }
+                    classNames.addAll(fileNames);
                 }
             }
         }
         return classNames;
     }
 
+    public static List<String> getSourcePaths(Context context) throws PackageManager.NameNotFoundException, IOException {
+        ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), 0);
+        File sourceApk = new File(applicationInfo.sourceDir);
+        File dexDir = new File(applicationInfo.dataDir, SECONDARY_FOLDER_NAME);
+
+        List<String> sourcePaths = new ArrayList<String>();
+        //default apk path
+        sourcePaths.add(applicationInfo.sourceDir);
+
+        String extractedFilePrefix = sourceApk.getName() + EXTRACTED_NAME_EXT;
+
+        //get the dex number
+        int totalDexNumber = getMultiDexPreferences(context).getInt(KEY_DEX_NUMBER, 1);
+
+        //get other dexes
+        for (int i = 2; i <= totalDexNumber; i++) {
+            String fileName = extractedFilePrefix + i + EXTRACTED_SUFFIX;
+            File extractedFile = new File(dexDir, fileName);
+            if (extractedFile.isFile()) {
+                sourcePaths.add(extractedFile.getAbsolutePath());
+            } else {
+                throw new IOException("Missing extracted secondary dex file '" +
+                        extractedFile.getPath() + "'");
+            }
+        }
+
+        return sourcePaths;
+    }
     private static void populateFiles(File path, List<String> fileNames, String parent) {
         if (path.isDirectory()) {
             for (File newPath : path.listFiles()) {

From a66d610aefd1ebab3bf03fd318cff1e0defff10e Mon Sep 17 00:00:00 2001
From: CHN-XCHU <theron.chu@gmail.com>
Date: Mon, 11 May 2015 17:59:33 +0800
Subject: [PATCH 147/305] Update ReflectionUtil.java

---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 2f8881e4..1d76eda5 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -286,7 +286,7 @@ private static Class getDomainClass(String className, Context context) {
         }
     }
 
-private static final String EXTRACTED_NAME_EXT = ".classes";
+    private static final String EXTRACTED_NAME_EXT = ".classes";
     private static final String EXTRACTED_SUFFIX = ".zip";
 
     private static final String SECONDARY_FOLDER_NAME = "code_cache" + File.separator +

From d75766c5b40549db7dd147c196583bb857adb1ed Mon Sep 17 00:00:00 2001
From: CHN-XCHU <theron.chu@gmail.com>
Date: Tue, 12 May 2015 18:08:49 +0800
Subject: [PATCH 148/305] Update ReflectionUtil.java

miss some imports
---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 1d76eda5..14d2cd10 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -2,8 +2,11 @@
 
 import android.content.ContentValues;
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
+import android.os.Build;
 import android.util.Log;
 
 import com.orm.SugarRecord;

From 2a3e292eda24f095a3042ddebf2068db767751b6 Mon Sep 17 00:00:00 2001
From: Satya Narayan <satya@satyanarayan.in>
Date: Mon, 6 Jul 2015 16:03:15 -0700
Subject: [PATCH 149/305] maven publish configuration

---
 build.gradle              |  9 +++-
 example/build.gradle      |  4 +-
 gradle.properties         | 33 ++++++++++++++
 library/build.gradle      | 24 +---------
 library/gradle.properties |  3 ++
 maven_push.gradle         | 92 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 140 insertions(+), 25 deletions(-)
 create mode 100644 gradle.properties
 create mode 100644 library/gradle.properties
 create mode 100644 maven_push.gradle

diff --git a/build.gradle b/build.gradle
index 024245fe..1d899395 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,13 +6,20 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.1.1'
         classpath 'org.robolectric:robolectric-gradle-plugin:1.0.1'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }
 
+def isReleaseBuild() {
+    return version.contains("SNAPSHOT") == false
+}
+
 allprojects {
+    version = VERSION_NAME
+    group = GROUP
+
     repositories {
         mavenLocal()
         mavenCentral()
diff --git a/example/build.gradle b/example/build.gradle
index a017d24a..33c718c8 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -20,14 +20,14 @@ android {
 
 dependencies {
     compile project (':library')
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:support-v4:22.2.0'
     testCompile 'org.robolectric:robolectric:2.4'
     testCompile 'junit:junit:4.12'
 }
 
 robolectric {
     // Configure includes / excludes
-    include '**/*Test.class'
+    include '**/*Tests.class'
     exclude '**/espresso/**/*.class'
 
     // Configure max heap size of the test JVM
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..2ec9c9ec
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,33 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+VERSION_NAME=1.4
+VERSION_CODE=1
+GROUP=com.github.satyan
+
+POM_DESCRIPTION=Sugar ORM - Insanely easy way to work with android database
+POM_URL=https://github.com/satyan/sugar
+POM_SCM_URL=https://github.com/satyan/sugar
+POM_SCM_CONNECTION=scm:git@github.com:satyan/sugar.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:satyan/sugar.git
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=satyan
+POM_DEVELOPER_NAME=Satya Narayan
\ No newline at end of file
diff --git a/library/build.gradle b/library/build.gradle
index df1a932a..7a94ca8d 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,8 +1,5 @@
 apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-
-group 'com.github.satyan'
-version '1.3.1'
+apply from: '../maven_push.gradle'
 
 android {
     compileSdkVersion 21
@@ -21,7 +18,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:support-v4:22.2.0'
     compile 'com.google.guava:guava:18.0'
     testCompile 'junit:junit:4.12'
 }
@@ -33,20 +30,3 @@ task libraryJar(type: Jar) {
     baseName 'sugar'
 }
 
-publishing {
-    publications {
-        artifactJar(MavenPublication) {
-            artifact libraryJar
-            artifactId 'sugar'
-            groupId project.group
-        }
-        artifactAar(MavenPublication) {
-            artifact bundleRelease
-            artifactId 'sugar'
-            groupId project.group
-        }
-    }
-    repositories {
-        mavenCentral()
-    }
-}
diff --git a/library/gradle.properties b/library/gradle.properties
new file mode 100644
index 00000000..07fe1d15
--- /dev/null
+++ b/library/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=Sugar ORM
+POM_ARTIFACT_ID=sugar
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/maven_push.gradle b/maven_push.gradle
new file mode 100644
index 00000000..b741e61b
--- /dev/null
+++ b/maven_push.gradle
@@ -0,0 +1,92 @@
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+def sonatypeRepositoryUrl
+if (isReleaseBuild()) {
+    println 'RELEASE BUILD'
+    sonatypeRepositoryUrl = hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
+            : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+} else {
+    println 'DEBUG BUILD'
+    sonatypeRepositoryUrl = hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
+            : "https://oss.sonatype.org/content/repositories/snapshots/"
+}
+
+def getRepositoryUsername() {
+    return hasProperty('nexusUsername') ? nexusUsername : ""
+}
+
+def getRepositoryPassword() {
+    return hasProperty('nexusPassword') ? nexusPassword : ""
+}
+
+afterEvaluate { project ->
+    uploadArchives {
+        repositories {
+            mavenDeployer {
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+                pom.artifactId = POM_ARTIFACT_ID
+
+                repository(url: sonatypeRepositoryUrl) {
+                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
+                }
+
+                pom.project {
+                    name POM_NAME
+                    packaging POM_PACKAGING
+                    description POM_DESCRIPTION
+                    url POM_URL
+
+                    scm {
+                        url POM_SCM_URL
+                        connection POM_SCM_CONNECTION
+                        developerConnection POM_SCM_DEV_CONNECTION
+                    }
+
+                    licenses {
+                        license {
+                            name POM_LICENCE_NAME
+                            url POM_LICENCE_URL
+                            distribution POM_LICENCE_DIST
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id POM_DEVELOPER_ID
+                            name POM_DEVELOPER_NAME
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    signing {
+        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+        sign configurations.archives
+    }
+
+    task androidJavadocs(type: Javadoc) {
+        source = android.sourceSets.main.java.sourceFiles
+    }
+
+    task androidJavadocsJar(type: Jar) {
+        classifier = 'javadoc'
+        //basename = artifact_id
+        from androidJavadocs.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        //basename = artifact_id
+        from android.sourceSets.main.java.sourceFiles
+    }
+
+    artifacts {
+        //archives packageReleaseJar
+        archives androidSourcesJar
+        archives androidJavadocsJar
+    }
+}
\ No newline at end of file

From 01504511c5d657563b2da0817904cfa184f3fbe2 Mon Sep 17 00:00:00 2001
From: Satya Narayan <satya@satyanarayan.in>
Date: Mon, 6 Jul 2015 16:43:11 -0700
Subject: [PATCH 150/305] maven publish configuration

---
 example/build.gradle | 2 +-
 library/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/build.gradle b/example/build.gradle
index 33c718c8..dad72cd7 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -20,7 +20,7 @@ android {
 
 dependencies {
     compile project (':library')
-    compile 'com.android.support:support-v4:22.2.0'
+    compile 'com.android.support:support-v4:21.0.3'
     testCompile 'org.robolectric:robolectric:2.4'
     testCompile 'junit:junit:4.12'
 }
diff --git a/library/build.gradle b/library/build.gradle
index 7a94ca8d..9251b0d8 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:22.2.0'
+    compile 'com.android.support:support-v4:21.0.3'
     compile 'com.google.guava:guava:18.0'
     testCompile 'junit:junit:4.12'
 }

From 05051a2d9a3b4d3ed68e3795be4c29c867219dda Mon Sep 17 00:00:00 2001
From: Alex Mitchell <mail@alexmitchell.org.uk>
Date: Mon, 27 Jul 2015 17:40:33 +0100
Subject: [PATCH 151/305] Catching Throwable instead of ClassNotFoundException
 because Class.forName can also throw LinkageError and
 ExceptionInInitializerError. If we silently ignore a ClassNotFoundException, 
 I don't see why we wouldn't ignore the others. A NoClassDefFoundError coming
 out of this method was causing my application to crash, but it was actually
 fine that the class couldn't be loaded.

---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index a740b42d..255a1a4c 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -268,7 +268,7 @@ private static Class getDomainClass(String className, Context context) {
         Class<?> discoveredClass = null;
         try {
             discoveredClass = Class.forName(className, true, context.getClass().getClassLoader());
-        } catch (ClassNotFoundException e) {
+        } catch (Throwable e) {
             Log.e("Sugar", e.getMessage());
         }
 

From 19126d66ea37158a730913ac6712803a7bd2af94 Mon Sep 17 00:00:00 2001
From: salimkamboh <salimkamboh@yahoo.com>
Date: Thu, 6 Aug 2015 08:17:20 +0500
Subject: [PATCH 152/305] how to use existing database

Existing tables will be used if we use create if not exists syntax while creating table
---
 library/src/main/java/com/orm/SchemaGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 590e259e..c0510478 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -104,10 +104,10 @@ private void executeScript(SQLiteDatabase db, String file) {
     }
 
     private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
-        Log.i("Sugar", "Create table");
+        Log.i("Sugar", "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);
-        StringBuilder sb = new StringBuilder("CREATE TABLE ");
+        StringBuilder sb = new StringBuilder("CREATE TABLE IF NOT EXISTS ");
         sb.append(tableName).append(" ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
 
         for (Field column : fields) {

From d15dff56c8c80dd6994b15ee9ddb7f6fc50a73ea Mon Sep 17 00:00:00 2001
From: bendaniel10 <bendaniel20@gmail.com>
Date: Tue, 13 Oct 2015 08:15:34 +0100
Subject: [PATCH 153/305] Fixed issue with database upgrade when MultiDex
 support is enabled.

---
 .../java/com/orm/util/MultiDexHelper.java     | 106 ++++++++++++++++++
 .../java/com/orm/util/ReflectionUtil.java     |  12 +-
 2 files changed, 110 insertions(+), 8 deletions(-)
 create mode 100644 library/src/main/java/com/orm/util/MultiDexHelper.java

diff --git a/library/src/main/java/com/orm/util/MultiDexHelper.java b/library/src/main/java/com/orm/util/MultiDexHelper.java
new file mode 100644
index 00000000..37b57894
--- /dev/null
+++ b/library/src/main/java/com/orm/util/MultiDexHelper.java
@@ -0,0 +1,106 @@
+package com.orm.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import dalvik.system.DexFile;
+
+/**
+ * Created by xudshen@hotmail.com on 14/11/13.
+ */
+
+//http://stackoverflow.com/a/26892658
+public class MultiDexHelper {
+    private static final String EXTRACTED_NAME_EXT = ".classes";
+    private static final String EXTRACTED_SUFFIX = ".zip";
+
+    private static final String SECONDARY_FOLDER_NAME = "code_cache" + File.separator +
+            "secondary-dexes";
+
+    private static final String PREFS_FILE = "multidex.version";
+    private static final String KEY_DEX_NUMBER = "dex.number";
+
+    private static SharedPreferences getMultiDexPreferences(Context context) {
+        return context.getSharedPreferences(PREFS_FILE,
+                Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
+                        ? Context.MODE_PRIVATE
+                        : Context.MODE_PRIVATE | Context.MODE_MULTI_PROCESS);
+    }
+
+    /**
+     * get all the dex path
+     *
+     * @param context the application context
+     * @return all the dex path
+     * @throws PackageManager.NameNotFoundException
+     * @throws IOException
+     */
+    public static List<String> getSourcePaths(Context context) throws PackageManager.NameNotFoundException, IOException {
+        ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), 0);
+        File sourceApk = new File(applicationInfo.sourceDir);
+        File dexDir = new File(applicationInfo.dataDir, SECONDARY_FOLDER_NAME);
+
+        List<String> sourcePaths = new ArrayList<String>();
+        sourcePaths.add(applicationInfo.sourceDir); //add the default apk path
+
+        //the prefix of extracted file, ie: test.classes
+        String extractedFilePrefix = sourceApk.getName() + EXTRACTED_NAME_EXT;
+        //the total dex numbers
+        int totalDexNumber = getMultiDexPreferences(context).getInt(KEY_DEX_NUMBER, 1);
+
+        for (int secondaryNumber = 2; secondaryNumber <= totalDexNumber; secondaryNumber++) {
+            //for each dex file, ie: test.classes2.zip, test.classes3.zip...
+            String fileName = extractedFilePrefix + secondaryNumber + EXTRACTED_SUFFIX;
+            File extractedFile = new File(dexDir, fileName);
+            if (extractedFile.isFile()) {
+                sourcePaths.add(extractedFile.getAbsolutePath());
+                //we ignore the verify zip part
+            } else {
+                throw new IOException("Missing extracted secondary dex file '" +
+                        extractedFile.getPath() + "'");
+            }
+        }
+
+        return sourcePaths;
+    }
+
+    /**
+     * get all the classes name in "classes.dex", "classes2.dex", ....
+     *
+     * @param context the application context
+     * @return all the classes name
+     * @throws PackageManager.NameNotFoundException
+     * @throws IOException
+     */
+    public static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
+        List<String> classNames = new ArrayList<String>();
+        for (String path : getSourcePaths(context)) {
+            try {
+                DexFile dexfile = null;
+                if (path.endsWith(EXTRACTED_SUFFIX)) {
+                    //NOT use new DexFile(path), because it will throw "permission error in /data/dalvik-cache"
+                    dexfile = DexFile.loadDex(path, path + ".tmp", 0);
+                } else {
+                    dexfile = new DexFile(path);
+                }
+                Enumeration<String> dexEntries = dexfile.entries();
+                while (dexEntries.hasMoreElements()) {
+                    classNames.add(dexEntries.nextElement());
+                }
+            } catch (IOException e) {
+                throw new IOException("Error at loading dex file '" +
+                        path + "'");
+            }
+        }
+        return classNames;
+    }
+}
\ No newline at end of file
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index a740b42d..e6e2dd38 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -289,15 +289,11 @@ private static Class getDomainClass(String className, Context context) {
 
     private static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
         String packageName = ManifestHelper.getDomainPackageName(context);
-        String path = getSourcePath(context);
         List<String> classNames = new ArrayList<String>();
-        DexFile dexfile = null;
         try {
-            dexfile = new DexFile(path);
-            Enumeration<String> dexEntries = dexfile.entries();
-            while (dexEntries.hasMoreElements()) {
-                String className = dexEntries.nextElement();
-                if (className.startsWith(packageName)) classNames.add(className);
+            List<String> allClasses = MultiDexHelper.getAllClasses(context);
+            for (String classString : allClasses) {
+                if (classString.startsWith(packageName)) classNames.add(classString);
             }
         } catch (NullPointerException e) {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
@@ -316,7 +312,7 @@ private static List<String> getAllClasses(Context context) throws PackageManager
                 }
             }
         } finally {
-            if (null != dexfile) dexfile.close();
+//            if (null != dexfile) dexfile.close();
         }
         return classNames;
     }

From 8eeaebe2e59f597cc7229b3a54b4796c93b1d9b2 Mon Sep 17 00:00:00 2001
From: RoyMontoya <roy_a18@hotmail.com>
Date: Fri, 16 Oct 2015 14:15:20 -0700
Subject: [PATCH 154/305] cleaned Select from hardcoded Strings

---
 .../src/main/java/com/orm/query/Select.java   | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 9c52a9b4..1ec92bd3 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -17,6 +17,15 @@ public class Select<T> implements Iterable {
     private String limit;
     private String offset;
     private List<Object> args = new ArrayList<Object>();
+    private static final String SPACE =" ";
+    private static final String SINGLE_QUOTE ="'";
+    private static final String LEFT_PARENTHESIS="(";
+    private static final String RIGHT_PARENTHESIS=")";
+    private static final String SELECT_FROM="SELECT * FROM ";
+    private static final String WHERE="WHERE ";
+    private static final String ORDER_BY ="ORDER BY ";
+    private static final String LIMIT ="LIMIT ";
+    private static final String OFFSET ="OFFSET ";
 
     public Select(Class<T> record) {
         this.record = record;
@@ -54,10 +63,10 @@ public Select<T> where(Condition... condition) {
     }
 
     private void mergeConditions(Condition[] conditions, Condition.Type type) {
-        StringBuilder toAppend = new StringBuilder("");
+        StringBuilder toAppend = new StringBuilder();
         for (Condition condition : conditions) {
             if (toAppend.length() != 0) {
-                toAppend.append(" ").append(type.name()).append(" ");
+                toAppend.append(SPACE).append(type.name()).append(SPACE);
             }
 
             if (Condition.Check.LIKE.equals(condition.getCheck()) ||
@@ -65,9 +74,9 @@ private void mergeConditions(Condition[] conditions, Condition.Type type) {
                 toAppend
                     .append(condition.getProperty())
                     .append(condition.getCheckSymbol())
-                    .append("'")
+                    .append(SINGLE_QUOTE)
                     .append(condition.getValue().toString())
-                    .append("'");
+                    .append(SINGLE_QUOTE);
             } else if (Condition.Check.IS_NULL.equals(condition.getCheck()) ||
                     Condition.Check.IS_NOT_NULL.equals(condition.getCheck())) {
                 toAppend
@@ -82,11 +91,11 @@ private void mergeConditions(Condition[] conditions, Condition.Type type) {
             }
         }
         
-        if (!"".equals(whereClause)) {
-            whereClause += " " + type.name() + " ";
+        if (!whereClause.isEmpty()) {
+            whereClause += SPACE + type.name() + SPACE;
         }
 
-        whereClause += "(" + toAppend + ")";
+        whereClause += LEFT_PARENTHESIS + toAppend + RIGHT_PARENTHESIS;
     }
 
     public Select<T> whereOr(Condition... args) {
@@ -137,28 +146,28 @@ public T first() {
     
     String toSql() {
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT * FROM ").append(NamingHelper.toSQLName(this.record)).append(" ");
+        sql.append(SELECT_FROM).append(NamingHelper.toSQLName(this.record)).append(SPACE);
 
-        if (whereClause != null) {
-            sql.append("WHERE ").append(whereClause).append(" ");
+        if (!whereClause.isEmpty()) {
+            sql.append(WHERE).append(whereClause).append(SPACE);
         }
 
-        if (orderBy != null) {
-            sql.append("ORDER BY ").append(orderBy).append(" ");
+        if (!orderBy.isEmpty()) {
+            sql.append(ORDER_BY).append(orderBy).append(SPACE);
         }
 
-        if (limit != null) {
-            sql.append("LIMIT ").append(limit).append(" ");
+        if (!limit.isEmpty()) {
+            sql.append(LIMIT).append(limit).append(SPACE);
         }
 
-        if (offset != null) {
-            sql.append("OFFSET ").append(offset).append(" ");
+        if (!offset.isEmpty()) {
+            sql.append(OFFSET).append(offset).append(SPACE);
         }
 
         return sql.toString();
     }
 
-    String getWhereCond() {
+    String getWhereClause() {
         return whereClause;
     }
 

From d038f6c79f9c8ce736e6856bf5b90b8641ab5029 Mon Sep 17 00:00:00 2001
From: RoyMontoya <roy_a18@hotmail.com>
Date: Fri, 16 Oct 2015 14:26:40 -0700
Subject: [PATCH 155/305] revert change on whereCond name

---
 library/src/main/java/com/orm/query/Select.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 1ec92bd3..e13410fe 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -167,7 +167,7 @@ String toSql() {
         return sql.toString();
     }
 
-    String getWhereClause() {
+    String getWhereCond() {
         return whereClause;
     }
 

From da0a7a62a940a270b0bee2c70ba1c118d23bd001 Mon Sep 17 00:00:00 2001
From: RoyMontoya <roy_a18@hotmail.com>
Date: Mon, 19 Oct 2015 17:58:59 -0700
Subject: [PATCH 156/305] added test

---
 .../src/main/java/com/orm/query/Select.java   | 59 +++++++++++--------
 .../test/java/com/orm/query/SelectTest.java   | 30 +++++++++-
 2 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 9c52a9b4..3275c7bb 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -1,5 +1,7 @@
 package com.orm.query;
 
+import android.database.sqlite.SQLiteQueryBuilder;
+
 import com.orm.SugarRecord;
 import com.orm.util.NamingHelper;
 
@@ -12,10 +14,10 @@ public class Select<T> implements Iterable {
     private Class<T> record;
     private String[] arguments;
     private String whereClause = "";
-    private String orderBy;
-    private String groupBy;
-    private String limit;
-    private String offset;
+    private String orderBy = "";
+    private String groupBy = "";
+    private String limit = "";
+    private String offset = "";
     private List<Object> args = new ArrayList<Object>();
 
     public Select(Class<T> record) {
@@ -41,6 +43,11 @@ public Select<T> limit(String limit) {
         return this;
     }
 
+    public Select<T> offset(String offset) {
+        this.offset = offset;
+        return this;
+    }
+
     public Select<T> where(String whereClause) {
         this.whereClause = whereClause;
         return this;
@@ -63,25 +70,25 @@ private void mergeConditions(Condition[] conditions, Condition.Type type) {
             if (Condition.Check.LIKE.equals(condition.getCheck()) ||
                     Condition.Check.NOT_LIKE.equals(condition.getCheck())) {
                 toAppend
-                    .append(condition.getProperty())
-                    .append(condition.getCheckSymbol())
-                    .append("'")
-                    .append(condition.getValue().toString())
-                    .append("'");
+                        .append(condition.getProperty())
+                        .append(condition.getCheckSymbol())
+                        .append("'")
+                        .append(condition.getValue().toString())
+                        .append("'");
             } else if (Condition.Check.IS_NULL.equals(condition.getCheck()) ||
                     Condition.Check.IS_NOT_NULL.equals(condition.getCheck())) {
                 toAppend
-                    .append(condition.getProperty())
-                    .append(condition.getCheckSymbol());
+                        .append(condition.getProperty())
+                        .append(condition.getCheckSymbol());
             } else {
                 toAppend
-                    .append(condition.getProperty())
-                    .append(condition.getCheckSymbol())
-                    .append("? ");
+                        .append(condition.getProperty())
+                        .append(condition.getCheckSymbol())
+                        .append("? ");
                 args.add(condition.getValue());
             }
         }
-        
+
         if (!"".equals(whereClause)) {
             whereClause += " " + type.name() + " ";
         }
@@ -117,12 +124,12 @@ public List<T> list() {
 
         return SugarRecord.find(record, whereClause, arguments, groupBy, orderBy, limit);
     }
-    
+
     public long count() {
         if (arguments == null) {
             arguments = convertArgs(args);
         }
-    	
+
         return SugarRecord.count(record, whereClause, arguments, groupBy, orderBy, limit);
     }
 
@@ -134,24 +141,28 @@ public T first() {
         List<T> list = SugarRecord.find(record, whereClause, arguments, groupBy, orderBy, "1");
         return list.size() > 0 ? list.get(0) : null;
     }
-    
+
     String toSql() {
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT * FROM ").append(NamingHelper.toSQLName(this.record)).append(" ");
 
-        if (whereClause != null) {
+        if (!whereClause.isEmpty()) {
             sql.append("WHERE ").append(whereClause).append(" ");
         }
 
-        if (orderBy != null) {
+        if (!orderBy.isEmpty()) {
             sql.append("ORDER BY ").append(orderBy).append(" ");
         }
 
-        if (limit != null) {
+        if (!groupBy.isEmpty()) {
+            sql.append("GROUP BY ").append(groupBy).append(" ");
+        }
+
+        if (!limit.isEmpty()) {
             sql.append("LIMIT ").append(limit).append(" ");
         }
 
-        if (offset != null) {
+        if (!offset.isEmpty()) {
             sql.append("OFFSET ").append(offset).append(" ");
         }
 
@@ -170,7 +181,7 @@ private String[] convertArgs(List<Object> argsList) {
         String[] argsArray = new String[argsList.size()];
 
         for (int i = 0; i < argsList.size(); i++) {
-             argsArray[i] = argsList.get(i).toString();
+            argsArray[i] = argsList.get(i).toString();
         }
 
         return argsArray;
@@ -185,4 +196,4 @@ public Iterator<T> iterator() {
         return SugarRecord.findAsIterator(record, whereClause, arguments, groupBy, orderBy, limit);
     }
 
-}
+}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/query/SelectTest.java b/library/src/test/java/com/orm/query/SelectTest.java
index 3ab345ae..372f0a5d 100644
--- a/library/src/test/java/com/orm/query/SelectTest.java
+++ b/library/src/test/java/com/orm/query/SelectTest.java
@@ -35,6 +35,34 @@ public void testWhere(){
         assertEquals("2", where.getArgs()[1]);
     }
 
+    @Test
+    public void toSqlAllClauses(){
+        String toSql = Select.from(TestRecord.class)
+                .where("test")
+                .groupBy("test")
+                .orderBy("test")
+                .limit("test")
+                .offset("test")
+                .toSql();
+        assertEquals("SELECT * FROM TEST_RECORD WHERE test ORDER BY test GROUP BY test LIMIT test OFFSET test ", toSql);
+    }
+
+    @Test
+    public void toSqlNoClauses(){
+        String toSql = Select.from(TestRecord.class)
+                .toSql();
+        assertEquals("SELECT * FROM TEST_RECORD ", toSql);
+    }
+
+    @Test
+    public void toSqlWhereLimitClauses(){
+        String toSql = Select.from(TestRecord.class)
+                .where("test")
+                .limit("test")
+                .toSql();
+        assertEquals("SELECT * FROM TEST_RECORD WHERE test LIMIT test ", toSql);
+    }
+
 
     @Test
     public void testWhereOr(){
@@ -101,4 +129,4 @@ public void testIsNotNull() {
         assertEquals("(test IS NOT NULL )", where.getWhereCond());
         assertEquals(0, where.getArgs().length);
     }
-}
+}
\ No newline at end of file

From 3cc5cf1b240b3befdea9531495080fd7b0187ce2 Mon Sep 17 00:00:00 2001
From: RoyMontoya <roy_a18@hotmail.com>
Date: Mon, 19 Oct 2015 18:10:41 -0700
Subject: [PATCH 157/305] format fix

---
 .../src/main/java/com/orm/query/Select.java   | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 3275c7bb..40f1107b 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -1,7 +1,5 @@
 package com.orm.query;
 
-import android.database.sqlite.SQLiteQueryBuilder;
-
 import com.orm.SugarRecord;
 import com.orm.util.NamingHelper;
 
@@ -70,21 +68,21 @@ private void mergeConditions(Condition[] conditions, Condition.Type type) {
             if (Condition.Check.LIKE.equals(condition.getCheck()) ||
                     Condition.Check.NOT_LIKE.equals(condition.getCheck())) {
                 toAppend
-                        .append(condition.getProperty())
-                        .append(condition.getCheckSymbol())
-                        .append("'")
-                        .append(condition.getValue().toString())
-                        .append("'");
+                    .append(condition.getProperty())
+                    .append(condition.getCheckSymbol())
+                    .append("'")
+                    .append(condition.getValue().toString())
+                    .append("'");
             } else if (Condition.Check.IS_NULL.equals(condition.getCheck()) ||
                     Condition.Check.IS_NOT_NULL.equals(condition.getCheck())) {
                 toAppend
-                        .append(condition.getProperty())
-                        .append(condition.getCheckSymbol());
+                    .append(condition.getProperty())
+                    .append(condition.getCheckSymbol());
             } else {
                 toAppend
-                        .append(condition.getProperty())
-                        .append(condition.getCheckSymbol())
-                        .append("? ");
+                    .append(condition.getProperty())
+                    .append(condition.getCheckSymbol())
+                    .append("? ");
                 args.add(condition.getValue());
             }
         }
@@ -181,7 +179,7 @@ private String[] convertArgs(List<Object> argsList) {
         String[] argsArray = new String[argsList.size()];
 
         for (int i = 0; i < argsList.size(); i++) {
-            argsArray[i] = argsList.get(i).toString();
+             argsArray[i] = argsList.get(i).toString();
         }
 
         return argsArray;
@@ -196,4 +194,4 @@ public Iterator<T> iterator() {
         return SugarRecord.findAsIterator(record, whereClause, arguments, groupBy, orderBy, limit);
     }
 
-}
\ No newline at end of file
+}

From 547c816a2ed6ab0011ef33f07a5755e83ab0c9fb Mon Sep 17 00:00:00 2001
From: RoyMontoya <roy_a18@hotmail.com>
Date: Mon, 19 Oct 2015 18:28:46 -0700
Subject: [PATCH 158/305] added group_by to toSQL

---
 .../src/main/java/com/orm/query/Select.java    |  5 +++++
 .../test/java/com/orm/query/SelectTest.java    | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 8e536170..11652c1c 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -24,6 +24,7 @@ public class Select<T> implements Iterable {
     private static final String SELECT_FROM="SELECT * FROM ";
     private static final String WHERE="WHERE ";
     private static final String ORDER_BY ="ORDER BY ";
+    private static final String GROUP_BY ="GROUP BY ";
     private static final String LIMIT ="LIMIT ";
     private static final String OFFSET ="OFFSET ";
 
@@ -161,6 +162,10 @@ String toSql() {
             sql.append(ORDER_BY).append(orderBy).append(SPACE);
         }
 
+        if (!groupBy.isEmpty()) {
+            sql.append(GROUP_BY).append(groupBy).append(SPACE);
+        }
+
         if (!limit.isEmpty()) {
             sql.append(LIMIT).append(limit).append(SPACE);
         }
diff --git a/library/src/test/java/com/orm/query/SelectTest.java b/library/src/test/java/com/orm/query/SelectTest.java
index 372f0a5d..39508b77 100644
--- a/library/src/test/java/com/orm/query/SelectTest.java
+++ b/library/src/test/java/com/orm/query/SelectTest.java
@@ -38,13 +38,13 @@ public void testWhere(){
     @Test
     public void toSqlAllClauses(){
         String toSql = Select.from(TestRecord.class)
-                .where("test")
-                .groupBy("test")
-                .orderBy("test")
-                .limit("test")
-                .offset("test")
+                .where("foo")
+                .orderBy("doe")
+                .groupBy("john")
+                .limit("5")
+                .offset("10")
                 .toSql();
-        assertEquals("SELECT * FROM TEST_RECORD WHERE test ORDER BY test GROUP BY test LIMIT test OFFSET test ", toSql);
+        assertEquals("SELECT * FROM TEST_RECORD WHERE foo ORDER BY doe GROUP BY john LIMIT 5 OFFSET 10 ", toSql);
     }
 
     @Test
@@ -57,10 +57,10 @@ public void toSqlNoClauses(){
     @Test
     public void toSqlWhereLimitClauses(){
         String toSql = Select.from(TestRecord.class)
-                .where("test")
-                .limit("test")
+                .where("foo")
+                .limit("10")
                 .toSql();
-        assertEquals("SELECT * FROM TEST_RECORD WHERE test LIMIT test ", toSql);
+        assertEquals("SELECT * FROM TEST_RECORD WHERE foo LIMIT 10 ", toSql);
     }
 
 

From 30c390026ecad694c8b41fd624c8461bcc67093d Mon Sep 17 00:00:00 2001
From: RoyMontoya <roy_a18@hotmail.com>
Date: Mon, 26 Oct 2015 15:58:04 -0700
Subject: [PATCH 159/305] Schema cleanup

---
 .../main/java/com/orm/SchemaGenerator.java    | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 590e259e..d23ae5cf 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -29,6 +29,11 @@ public class SchemaGenerator {
 
     private Context context;
 
+    public static final String NULL = " NULL";
+    public static final String NOT_NULL = " NOT NULL";
+    public static final String UNIQUE = " UNIQUE";
+    public static final String SUGAR = "Sugar";
+
     public SchemaGenerator(Context context) {
         this.context = context;
     }
@@ -44,8 +49,8 @@ public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
         List<Class> domainClasses = getDomainClasses(context);
         String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
         for (Class domain : domainClasses) {
-            Cursor c = sqLiteDatabase.rawQuery(String.format(sql, NamingHelper.toSQLName(domain)), null);
-            if (c.moveToFirst() && c.getInt(0) == 0) {
+            Cursor cursor = sqLiteDatabase.rawQuery(String.format(sql, NamingHelper.toSQLName(domain)), null);
+            if (cursor.moveToFirst() && cursor.getInt(0) == 0) {
             	createTable(domain, sqLiteDatabase);
             }
         }
@@ -63,10 +68,10 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
         boolean isSuccess = false;
 
         try {
-            List<String> files = Arrays.asList(this.context.getAssets().list("sugar_upgrades"));
+            List<String> files = Arrays.asList(context.getAssets().list("sugar_upgrades"));
             Collections.sort(files, new NumberComparator());
             for (String file : files) {
-                Log.i("Sugar", "filename : " + file);
+                Log.i(SUGAR, "filename : " + file);
 
                 try {
                     int version = Integer.valueOf(file.replace(".sql", ""));
@@ -76,12 +81,12 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
                         isSuccess = true;
                     }
                 } catch (NumberFormatException e) {
-                    Log.i("Sugar", "not a sugar script. ignored." + file);
+                    Log.i(SUGAR, "not a sugar script. ignored." + file);
                 }
 
             }
         } catch (IOException e) {
-            Log.e("Sugar", e.getMessage());
+            Log.e(SUGAR, e.getMessage());
         }
 
         return isSuccess;
@@ -89,22 +94,22 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
 
     private void executeScript(SQLiteDatabase db, String file) {
         try {
-            InputStream is = this.context.getAssets().open("sugar_upgrades/" + file);
+            InputStream is = context.getAssets().open("sugar_upgrades/" + file);
             BufferedReader reader = new BufferedReader(new InputStreamReader(is));
             String line;
             while ((line = reader.readLine()) != null) {
                 Log.i("Sugar script", line);
-                db.execSQL(line.toString());
+                db.execSQL(line);
             }
         } catch (IOException e) {
-            Log.e("Sugar", e.getMessage());
+            Log.e(SUGAR, e.getMessage());
         }
 
-        Log.i("Sugar", "Script executed");
+        Log.i(SUGAR, "Script executed");
     }
 
     private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
-        Log.i("Sugar", "Create table");
+        Log.i(SUGAR, "Create table");
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);
         StringBuilder sb = new StringBuilder("CREATE TABLE ");
@@ -114,7 +119,7 @@ private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
             String columnName = NamingHelper.toSQLName(column);
             String columnType = QueryBuilder.getColumnType(column.getType());
 
-            if (columnType != null) {
+            if (!columnType.isEmpty()) {
                 if (columnName.equalsIgnoreCase("Id")) {
                     continue;
                 }
@@ -126,37 +131,37 @@ private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
                     sb.append(", ").append(columnName).append(" ").append(columnType);
 
                     if (columnAnnotation.notNull()) {
-                        if (columnType.endsWith(" NULL")) {
+                        if (columnType.endsWith(NULL)) {
                             sb.delete(sb.length() - 5, sb.length());
                         }
-                        sb.append(" NOT NULL");
+                        sb.append(NOT_NULL);
                     }
 
                     if (columnAnnotation.unique()) {
-                        sb.append(" UNIQUE");
+                        sb.append(UNIQUE);
                     }
 
                 } else {
                     sb.append(", ").append(columnName).append(" ").append(columnType);
 
                     if (column.isAnnotationPresent(NotNull.class)) {
-                        if (columnType.endsWith(" NULL")) {
+                        if (columnType.endsWith(NULL)) {
                             sb.delete(sb.length() - 5, sb.length());
                         }
-                        sb.append(" NOT NULL");
+                        sb.append(NOT_NULL);
                     }
 
                     if (column.isAnnotationPresent(Unique.class)) {
-                        sb.append(" UNIQUE");
+                        sb.append(UNIQUE);
                     }
                 }
             }
         }
 
         sb.append(" ) ");
-        Log.i("Sugar", "Creating table " + tableName);
+        Log.i(SUGAR, "Creating table " + tableName);
 
-        if (!"".equals(sb.toString())) {
+        if (!sb.toString().isEmpty()) {
             try {
                 sqLiteDatabase.execSQL(sb.toString());
             } catch (SQLException e) {

From 563738cacb96f295e519d61ff4e2dccc652a1331 Mon Sep 17 00:00:00 2001
From: tracytheron <theron.chu@gmail.com>
Date: Tue, 27 Oct 2015 15:51:04 +0800
Subject: [PATCH 160/305] fix merge

---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index ed2725f8..2c71d631 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -308,10 +308,10 @@ private static SharedPreferences getMultiDexPreferences(Context context) {
     private static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
         List<String> paths = getSourcePaths(context);
         List<String> classNames = new ArrayList<>();
+        DexFile dexfile = null;
         try {
             for (int i = 0; i <paths.size(); i++){
                 String path = paths.get(i);
-                DexFile dexfile = null;
                 if (path.endsWith(EXTRACTED_SUFFIX)) {
                     //NOT use new DexFile(path) here, because it will throw "permission error in /data/dalvik-cache"
                     dexfile = DexFile.loadDex(path, path + ".tmp", 0);

From 05857925f26a0271f0ca70167d67db7850515276 Mon Sep 17 00:00:00 2001
From: RoyMontoya <roy_a18@hotmail.com>
Date: Tue, 27 Oct 2015 16:52:33 -0700
Subject: [PATCH 161/305] added getSugarDatabase to simplify Database calls

---
 .../src/main/java/com/orm/SugarRecord.java    | 114 ++++++++----------
 1 file changed, 48 insertions(+), 66 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 0f76b766..b85160d6 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -27,16 +27,19 @@
 
 public class SugarRecord {
 
+    public static final String SUGAR = "Sugar";
     private Long id = null;
 
+    private static SQLiteDatabase getSugarDataBase() {
+        return getSugarContext().getSugarDb().getDB();
+    }
+
     public static <T> int deleteAll(Class<T> type) {
         return deleteAll(type, null);
     }
 
     public static <T> int deleteAll(Class<T> type, String whereClause, String... whereArgs) {
-        SugarDb db = getSugarContext().getSugarDb();
-        SQLiteDatabase sqLiteDatabase = db.getDB();
-        return sqLiteDatabase.delete(NamingHelper.toSQLName(type), whereClause, whereArgs);
+        return getSugarDataBase().delete(NamingHelper.toSQLName(type), whereClause, whereArgs);
     }
 
     @SuppressWarnings("deprecation")
@@ -46,7 +49,7 @@ public static <T> void saveInTx(T... objects) {
 
     @SuppressWarnings("deprecation")
     public static <T> void saveInTx(Collection<T> objects) {
-        SQLiteDatabase sqLiteDatabase = getSugarContext().getSugarDb().getDB();
+        SQLiteDatabase sqLiteDatabase = getSugarDataBase();
         try {
             sqLiteDatabase.beginTransaction();
             sqLiteDatabase.setLockingEnabled(false);
@@ -55,7 +58,7 @@ public static <T> void saveInTx(Collection<T> objects) {
             }
             sqLiteDatabase.setTransactionSuccessful();
         } catch (Exception e) {
-            Log.i("Sugar", "Error in saving in transaction " + e.getMessage());
+            Log.i(SUGAR, "Error in saving in transaction " + e.getMessage());
         } finally {
             sqLiteDatabase.endTransaction();
             sqLiteDatabase.setLockingEnabled(true);
@@ -69,7 +72,7 @@ public static <T> int deleteInTx(T... objects) {
 
     @SuppressWarnings("deprecation")
     public static <T> int deleteInTx(Collection<T> objects) {
-        SQLiteDatabase sqLiteDatabase = getSugarContext().getSugarDb().getDB();
+        SQLiteDatabase sqLiteDatabase = getSugarDataBase();
         int deletedRows = 0;
         try {
             sqLiteDatabase.beginTransaction();
@@ -82,7 +85,7 @@ public static <T> int deleteInTx(Collection<T> objects) {
             sqLiteDatabase.setTransactionSuccessful();
         } catch (Exception e) {
             deletedRows = 0;
-            Log.i("Sugar", "Error in deleting in transaction " + e.getMessage());
+            Log.i(SUGAR, "Error in deleting in transaction " + e.getMessage());
         } finally {
             sqLiteDatabase.endTransaction();
             sqLiteDatabase.setLockingEnabled(true);
@@ -140,18 +143,14 @@ public static <T> Iterator<T> findAsIterator(Class<T> type, String whereClause,
     }
 
     public static <T> Iterator<T> findWithQueryAsIterator(Class<T> type, String query, String... arguments) {
-        SugarDb db = getSugarContext().getSugarDb();
-        SQLiteDatabase sqLiteDatabase = db.getDB();
-        Cursor c = sqLiteDatabase.rawQuery(query, arguments);
-        return new CursorIterator<T>(type, c);
+        Cursor cursor = getSugarDataBase().rawQuery(query, arguments);
+        return new CursorIterator<T>(type, cursor);
     }
 
     public static <T> Iterator<T> findAsIterator(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
-        SugarDb db = getSugarContext().getSugarDb();
-        SQLiteDatabase sqLiteDatabase = db.getDB();
-        Cursor c = sqLiteDatabase.query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
+        Cursor cursor = getSugarDataBase().query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
                 groupBy, null, orderBy, limit);
-        return new CursorIterator<T>(type, c);
+        return new CursorIterator<T>(type, cursor);
     }
 
     public static <T> List<T> find(Class<T> type, String whereClause, String... whereArgs) {
@@ -159,50 +158,38 @@ public static <T> List<T> find(Class<T> type, String whereClause, String... wher
     }
 
     public static <T> List<T> findWithQuery(Class<T> type, String query, String... arguments) {
-        SugarDb db = getSugarContext().getSugarDb();
-        SQLiteDatabase sqLiteDatabase = db.getDB();
-        T entity;
-        List<T> toRet = new ArrayList<T>();
-        Cursor c = sqLiteDatabase.rawQuery(query, arguments);
+        Cursor cursor = getSugarDataBase().rawQuery(query, arguments);
 
-        try {
-            while (c.moveToNext()) {
-                entity = type.getDeclaredConstructor().newInstance();
-                inflate(c, entity, getSugarContext().getEntitiesMap());
-                toRet.add(entity);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            c.close();
-        }
-
-        return toRet;
+        return  getEntitiesFromCursor(cursor, type);
     }
 
     public static void executeQuery(String query, String... arguments) {
-        getSugarContext().getSugarDb().getDB().execSQL(query, arguments);
+        getSugarDataBase().execSQL(query, arguments);
     }
 
     public static <T> List<T> find(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
-        SugarDb db = getSugarContext().getSugarDb();
-        SQLiteDatabase sqLiteDatabase = db.getDB();
-        T entity;
-        List<T> toRet = new ArrayList<T>();
-        Cursor c = sqLiteDatabase.query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
+        Cursor cursor = getSugarDataBase().query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
                 groupBy, null, orderBy, limit);
+
+        return getEntitiesFromCursor(cursor, type);
+    }
+
+    public static <T> List<T> getEntitiesFromCursor(Cursor cursor, Class<T> type){
+        T entity;
+        List<T> result = new ArrayList<T>();
         try {
-            while (c.moveToNext()) {
+            while (cursor.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
-                inflate(c, entity, getSugarContext().getEntitiesMap());
-                toRet.add(entity);
+                inflate(cursor, entity, getSugarContext().getEntitiesMap());
+                result.add(entity);
             }
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            c.close();
+            cursor.close();
         }
-        return toRet;
+
+        return result;
     }
 
     public static <T> long count(Class<?> type) {
@@ -214,17 +201,14 @@ public static <T> long count(Class<?> type, String whereClause, String[] whereAr
     }
 
     public static <T> long count(Class<?> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
-        SugarDb db = getSugarContext().getSugarDb();
-        SQLiteDatabase sqLiteDatabase = db.getDB();
-
-        long toRet = -1;
+        long result = -1;
         String filter = (!TextUtils.isEmpty(whereClause)) ? " where "  + whereClause : "";
         SQLiteStatement sqliteStatement;
         try {
-            sqliteStatement = sqLiteDatabase.compileStatement("SELECT count(*) FROM " + NamingHelper.toSQLName(type) + filter);
+            sqliteStatement = getSugarDataBase().compileStatement("SELECT count(*) FROM " + NamingHelper.toSQLName(type) + filter);
         } catch (SQLiteException e) {
             e.printStackTrace();
-            return toRet;
+            return result;
         }
 
         if (whereArgs != null) {
@@ -234,16 +218,16 @@ public static <T> long count(Class<?> type, String whereClause, String[] whereAr
         }
 
         try {
-            toRet = sqliteStatement.simpleQueryForLong();
+            result = sqliteStatement.simpleQueryForLong();
         } finally {
             sqliteStatement.close();
         }
 
-        return toRet;
+        return result;
     }
 
     public static long save(Object object) {
-        return save(getSugarContext().getSugarDb().getDB(), object);
+        return save(getSugarDataBase(), object);
     }
 
     static long save(SQLiteDatabase db, Object object) {
@@ -281,7 +265,7 @@ static long save(SQLiteDatabase db, Object object) {
             ((SugarRecord) object).setId(id);
         }
 
-        Log.i("Sugar", object.getClass().getSimpleName() + " saved : " + id);
+        Log.i(SUGAR, object.getClass().getSimpleName() + " saved : " + id);
 
         return id;
     }
@@ -316,11 +300,10 @@ public boolean delete() {
         Long id = getId();
         Class<?> type = getClass();
         if (id != null && id > 0L) {
-            SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
-            Log.i("Sugar", type.getSimpleName() + " deleted : " + id);
-            return db.delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()}) == 1;
+            Log.i(SUGAR, type.getSimpleName() + " deleted : " + id);
+            return getSugarDataBase().delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()}) == 1;
         } else {
-            Log.i("Sugar", "Cannot delete object: " + type.getSimpleName() + " - object has not been saved");
+            Log.i(SUGAR, "Cannot delete object: " + type.getSimpleName() + " - object has not been saved");
             return false;
         }
     }
@@ -333,31 +316,30 @@ public static boolean delete(Object object) {
                 field.setAccessible(true);
                 Long id = (Long) field.get(object);
                 if (id != null && id > 0L) {
-                    SQLiteDatabase db = getSugarContext().getSugarDb().getDB();
-                    boolean deleted = db.delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()}) == 1;
-                    Log.i("Sugar", type.getSimpleName() + " deleted : " + id);
+                    boolean deleted = getSugarDataBase().delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()}) == 1;
+                    Log.i(SUGAR, type.getSimpleName() + " deleted : " + id);
                     return deleted;
                 } else {
-                    Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - object has not been saved");
+                    Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - object has not been saved");
                     return false;
                 }
             } catch (NoSuchFieldException e) {
-                Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - annotated object has no id");
+                Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - annotated object has no id");
                 return false;
             } catch (IllegalAccessException e) {
-                Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - can't access id");
+                Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - can't access id");
                 return false;
             }
         } else if (SugarRecord.class.isAssignableFrom(type)) {
             return ((SugarRecord) object).delete();
         } else {
-            Log.i("Sugar", "Cannot delete object: " + object.getClass().getSimpleName() + " - not persisted");
+            Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - not persisted");
             return false;
         }
     }
 
     public long save() {
-        return save(getSugarContext().getSugarDb().getDB(), this);
+        return save(getSugarDataBase(), this);
     }
 
     @SuppressWarnings("unchecked")

From f5ca5e3a7dca87ffdbc2ae09cb178880d1bf141e Mon Sep 17 00:00:00 2001
From: Alfredo Matos <alfmatos@gmail.com>
Date: Fri, 25 Sep 2015 16:30:39 +0100
Subject: [PATCH 162/305] Add MultiColumn Unique Table constraint support

---
 .../main/java/com/orm/SchemaGenerator.java    | 19 +++++++++++++++++++
 library/src/main/java/com/orm/dsl/Unique.java |  1 +
 2 files changed, 20 insertions(+)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index c0510478..4d897d58 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collections;
@@ -153,6 +154,24 @@ private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
             }
         }
 
+        if (table.isAnnotationPresent(Unique.class)) {
+            String constraint = table.getAnnotation(Unique.class).value();
+
+            sb.append(", UNIQUE(");
+
+            String[] constraintFields = constraint.split(",");
+            for(int i = 0; i < constraintFields.length; i++) {
+                String columnName = NamingHelper.toSQLNameDefault(constraintFields[i]);
+                sb.append(columnName);
+
+                if(i < (constraintFields.length -1)) {
+                    sb.append(",");
+                }
+            }
+
+            sb.append(") ON CONFLICT REPLACE");
+        }
+
         sb.append(" ) ");
         Log.i("Sugar", "Creating table " + tableName);
 
diff --git a/library/src/main/java/com/orm/dsl/Unique.java b/library/src/main/java/com/orm/dsl/Unique.java
index 7384b749..76d82559 100644
--- a/library/src/main/java/com/orm/dsl/Unique.java
+++ b/library/src/main/java/com/orm/dsl/Unique.java
@@ -5,4 +5,5 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Unique {
+    String value();
 }

From 98f8df508cb23917b661ce9046695ce2d8f0c159 Mon Sep 17 00:00:00 2001
From: Ovadia Babayev <ovadia@zollo.co.il>
Date: Wed, 28 Oct 2015 12:11:00 +0200
Subject: [PATCH 163/305] Filtered classes by DOMAIN_PACKAGE_NAME

---
 .../main/java/com/orm/util/ReflectionUtil.java  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 2c71d631..1f4c6404 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -306,11 +306,12 @@ private static SharedPreferences getMultiDexPreferences(Context context) {
     }
 
     private static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
+        String packageName = ManifestHelper.getDomainPackageName(context);
         List<String> paths = getSourcePaths(context);
         List<String> classNames = new ArrayList<>();
         DexFile dexfile = null;
         try {
-            for (int i = 0; i <paths.size(); i++){
+            for (int i = 0; i < paths.size(); i++) {
                 String path = paths.get(i);
                 if (path.endsWith(EXTRACTED_SUFFIX)) {
                     //NOT use new DexFile(path) here, because it will throw "permission error in /data/dalvik-cache"
@@ -321,7 +322,10 @@ private static List<String> getAllClasses(Context context) throws PackageManager
 
                 Enumeration<String> dexEntries = dexfile.entries();
                 while (dexEntries.hasMoreElements()) {
-                    classNames.add(dexEntries.nextElement());
+                    String className = dexEntries.nextElement();
+                    if (className.startsWith(packageName)) {
+                        classNames.add(className);
+                    }
                 }
             }
         } catch (NullPointerException e) {
@@ -335,12 +339,18 @@ private static List<String> getAllClasses(Context context) throws PackageManager
                     for (File filePath : classDirectory.listFiles()) {
                         populateFiles(filePath, fileNames, "");
                     }
-                    classNames.addAll(fileNames);
+
+                    for (String className : fileNames) {
+                        if (className.startsWith(packageName)) {
+                            classNames.add(className);
+                        }
+                    }
                 }
             }
         } finally {
             if (null != dexfile) dexfile.close();
         }
+
         return classNames;
     }
 
@@ -372,6 +382,7 @@ public static List<String> getSourcePaths(Context context) throws PackageManager
 
         return sourcePaths;
     }
+
     private static void populateFiles(File path, List<String> fileNames, String parent) {
         if (path.isDirectory()) {
             for (File newPath : path.listFiles()) {

From c58fcf54a154ed1d77abe5e2734d33068b41f936 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Wed, 4 Nov 2015 14:58:06 -0200
Subject: [PATCH 164/305] upgrading to roboeletric 3.0

---
 build.gradle                                  |  3 +-
 example/build.gradle                          | 49 +++++++++----------
 .../sugartest/BigDecimalFieldTests.java       |  2 +-
 .../example/sugartest/BooleanFieldTests.java  |  2 +-
 .../sugartest/ByteArrayFieldTests.java        |  2 +-
 .../example/sugartest/DoubleFieldTests.java   |  2 +-
 .../com/example/sugartest/EnumFieldTests.java |  2 +-
 .../example/sugartest/FirstAndLastTests.java  |  2 +-
 .../example/sugartest/FloatFieldTests.java    |  2 +-
 .../IncompleteAnnotatedModelTests.java        |  2 +-
 .../example/sugartest/IntegerFieldTests.java  |  2 +-
 .../sugartest/ListAllOrderByTests.java        |  2 +-
 .../com/example/sugartest/LongFieldTests.java |  2 +-
 .../example/sugartest/MultipleSaveTests.java  |  2 +-
 .../sugartest/NestedAnnotatedTests.java       |  2 +-
 .../sugartest/NestedExtendedTests.java        |  2 +-
 .../example/sugartest/NestedMixedAATests.java |  2 +-
 .../example/sugartest/NestedMixedABTests.java |  2 +-
 .../example/sugartest/NestedMixedBATests.java |  2 +-
 .../example/sugartest/NestedMixedBBTests.java |  2 +-
 .../example/sugartest/NoSugarModelTests.java  |  2 +-
 .../sugartest/RelationshipAnnotatedTests.java |  2 +-
 .../sugartest/RelationshipExtendedTests.java  |  2 +-
 .../sugartest/RelationshipMixedATests.java    |  2 +-
 .../sugartest/RelationshipMixedBTests.java    |  2 +-
 .../RobolectricGradleTestRunner.java          |  5 +-
 .../example/sugartest/ShortFieldTests.java    |  2 +-
 .../sugartest/SimpleAnnotatedModelTests.java  |  2 +-
 .../sugartest/SimpleExtendedModelTests.java   |  2 +-
 .../example/sugartest/StringFieldTests.java   |  2 +-
 library/build.gradle                          |  8 +--
 .../test/java/com/orm/query/DummyContext.java | 16 ++++--
 32 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1d899395..c6970775 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.1'
-        classpath 'org.robolectric:robolectric-gradle-plugin:1.0.1'
+        classpath 'com.android.tools.build:gradle:1.3.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }
diff --git a/example/build.gradle b/example/build.gradle
index dad72cd7..5700a16b 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.robolectric'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "com.example"
         minSdkVersion 9
-        targetSdkVersion 21
+        targetSdkVersion 23
     }
 
     buildTypes {
@@ -20,27 +19,27 @@ android {
 
 dependencies {
     compile project (':library')
-    compile 'com.android.support:support-v4:21.0.3'
-    testCompile 'org.robolectric:robolectric:2.4'
+    compile 'com.android.support:appcompat-v7:23.1.0'
+    testCompile 'org.robolectric:robolectric:3.0'
     testCompile 'junit:junit:4.12'
 }
 
-robolectric {
-    // Configure includes / excludes
-    include '**/*Tests.class'
-    exclude '**/espresso/**/*.class'
-
-    // Configure max heap size of the test JVM
-    maxHeapSize = '2048m'
-
-    // Configure the test JVM arguments - Does not apply to Java 8
-    jvmArgs '-XX:MaxPermSize=512m', '-XX:-UseSplitVerifier'
-
-    // configure whether failing tests should fail the build
-    ignoreFailures true
-
-    // use afterTest to listen to the test execution results
-    afterTest { descriptor, result ->
-        println "Executing test for ${descriptor.name} with result: ${result.resultType}"
-    }
-}
+//robolectric {
+//    // Configure includes / excludes
+//    include '**/*Tests.class'
+//    exclude '**/espresso/**/*.class'
+//
+//    // Configure max heap size of the test JVM
+//    maxHeapSize = '2048m'
+//
+//    // Configure the test JVM arguments - Does not apply to Java 8
+//    jvmArgs '-XX:MaxPermSize=512m', '-XX:-UseSplitVerifier'
+//
+//    // configure whether failing tests should fail the build
+//    ignoreFailures true
+//
+//    // use afterTest to listen to the test execution results
+//    afterTest { descriptor, result ->
+//        println "Executing test for ${descriptor.name} with result: ${result.resultType}"
+//    }
+//}
diff --git a/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java b/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java
index f50550ab..9e4b36bb 100644
--- a/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java
@@ -16,7 +16,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class BigDecimalFieldTests {
     @Test
     public void nullBigDecimalExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/BooleanFieldTests.java b/example/src/test/java/com/example/sugartest/BooleanFieldTests.java
index 849f5520..a117af6c 100644
--- a/example/src/test/java/com/example/sugartest/BooleanFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/BooleanFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class BooleanFieldTests {
     @Test
     public void nullBooleanExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java b/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java
index b8ae0cfd..6f830960 100644
--- a/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class ByteArrayFieldTests {
     @Test
     public void nullByteArrayExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/DoubleFieldTests.java b/example/src/test/java/com/example/sugartest/DoubleFieldTests.java
index 86f5bfde..89dbd00a 100644
--- a/example/src/test/java/com/example/sugartest/DoubleFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/DoubleFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class DoubleFieldTests {
     @Test
     public void nullDoubleExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/EnumFieldTests.java b/example/src/test/java/com/example/sugartest/EnumFieldTests.java
index 7ce17380..4eeaed71 100644
--- a/example/src/test/java/com/example/sugartest/EnumFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/EnumFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk = 18)
+@Config(sdk = 18)
 public class EnumFieldTests {
     @Test
     public void nullDefaultEnumExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/FirstAndLastTests.java b/example/src/test/java/com/example/sugartest/FirstAndLastTests.java
index 75108b83..d095578f 100644
--- a/example/src/test/java/com/example/sugartest/FirstAndLastTests.java
+++ b/example/src/test/java/com/example/sugartest/FirstAndLastTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class FirstAndLastTests {
     @Test
     public void firstExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/FloatFieldTests.java b/example/src/test/java/com/example/sugartest/FloatFieldTests.java
index 669f2703..16f52bbc 100644
--- a/example/src/test/java/com/example/sugartest/FloatFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/FloatFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class FloatFieldTests {
     @Test
     public void nullFloatExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
index 4959f757..25f544ae 100644
--- a/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertFalse;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class IncompleteAnnotatedModelTests {
     @Test(expected=SQLiteException.class)
     public void saveNoIdFieldTest() {
diff --git a/example/src/test/java/com/example/sugartest/IntegerFieldTests.java b/example/src/test/java/com/example/sugartest/IntegerFieldTests.java
index badb29dd..25dbd0bd 100644
--- a/example/src/test/java/com/example/sugartest/IntegerFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/IntegerFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class IntegerFieldTests {
     @Test
     public void nullIntegerExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java b/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java
index e6dfb8e3..014c989d 100644
--- a/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java
+++ b/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java
@@ -16,7 +16,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class ListAllOrderByTests {
     @Test
     public void listAllOrderByEmptyTest() {
diff --git a/example/src/test/java/com/example/sugartest/LongFieldTests.java b/example/src/test/java/com/example/sugartest/LongFieldTests.java
index 5f3f8998..b99e7537 100644
--- a/example/src/test/java/com/example/sugartest/LongFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/LongFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class LongFieldTests {
     @Test
     public void nullLongExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/MultipleSaveTests.java b/example/src/test/java/com/example/sugartest/MultipleSaveTests.java
index 05dc4939..58c669c5 100644
--- a/example/src/test/java/com/example/sugartest/MultipleSaveTests.java
+++ b/example/src/test/java/com/example/sugartest/MultipleSaveTests.java
@@ -15,7 +15,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class MultipleSaveTests {
     @Test
     public void stringMultipleSaveOriginalExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java b/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
index 267441ad..bf3f0e46 100644
--- a/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
+++ b/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
@@ -16,7 +16,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class NestedAnnotatedTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/NestedExtendedTests.java b/example/src/test/java/com/example/sugartest/NestedExtendedTests.java
index 1c4171f6..f403784b 100644
--- a/example/src/test/java/com/example/sugartest/NestedExtendedTests.java
+++ b/example/src/test/java/com/example/sugartest/NestedExtendedTests.java
@@ -16,7 +16,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class NestedExtendedTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedAATests.java b/example/src/test/java/com/example/sugartest/NestedMixedAATests.java
index 7d25a88c..daf19272 100644
--- a/example/src/test/java/com/example/sugartest/NestedMixedAATests.java
+++ b/example/src/test/java/com/example/sugartest/NestedMixedAATests.java
@@ -16,7 +16,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class NestedMixedAATests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedABTests.java b/example/src/test/java/com/example/sugartest/NestedMixedABTests.java
index 78de85ef..5b9a70dc 100644
--- a/example/src/test/java/com/example/sugartest/NestedMixedABTests.java
+++ b/example/src/test/java/com/example/sugartest/NestedMixedABTests.java
@@ -16,7 +16,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class NestedMixedABTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedBATests.java b/example/src/test/java/com/example/sugartest/NestedMixedBATests.java
index 23d2d14b..7d6e4886 100644
--- a/example/src/test/java/com/example/sugartest/NestedMixedBATests.java
+++ b/example/src/test/java/com/example/sugartest/NestedMixedBATests.java
@@ -16,7 +16,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class NestedMixedBATests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java b/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java
index dc325a90..c9e32182 100644
--- a/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java
+++ b/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java
@@ -16,7 +16,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class NestedMixedBBTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/NoSugarModelTests.java b/example/src/test/java/com/example/sugartest/NoSugarModelTests.java
index f638d56b..dbab8103 100644
--- a/example/src/test/java/com/example/sugartest/NoSugarModelTests.java
+++ b/example/src/test/java/com/example/sugartest/NoSugarModelTests.java
@@ -12,7 +12,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class NoSugarModelTests {
     @Test
     public void deleteTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java b/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java
index 83326c0c..503926e1 100644
--- a/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java
+++ b/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java
@@ -15,7 +15,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class RelationshipAnnotatedTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java b/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java
index f3ba1355..3c3e04c7 100644
--- a/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java
+++ b/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java
@@ -15,7 +15,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class RelationshipExtendedTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java b/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java
index 2793d247..7ecb6751 100644
--- a/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java
+++ b/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java
@@ -15,7 +15,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class RelationshipMixedATests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java b/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java
index 408ffefe..1d31ecd2 100644
--- a/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java
+++ b/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java
@@ -15,7 +15,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class RelationshipMixedBTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java b/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
index 765df649..4f7bc39d 100644
--- a/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
+++ b/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
@@ -3,9 +3,9 @@
 import com.example.ClientApp;
 
 import org.junit.runners.model.InitializationError;
-import org.robolectric.AndroidManifest;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.manifest.AndroidManifest;
 import org.robolectric.res.Fs;
 
 public class RobolectricGradleTestRunner extends RobolectricTestRunner {
@@ -18,6 +18,7 @@ public RobolectricGradleTestRunner(Class<?> testClass) throws InitializationErro
         String manifestPath = myAppPath + "../../../../src/main/AndroidManifest.xml";
         String resPath = myAppPath + "../../../../src/main/res";
         String assetPath = myAppPath + "../../../../src/main/assets";
-        return createAppManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resPath), Fs.fileFromPath(assetPath));
+        String packageName = "com.example";
+        return createAppManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resPath), Fs.fileFromPath(assetPath), packageName);
     }
 }
\ No newline at end of file
diff --git a/example/src/test/java/com/example/sugartest/ShortFieldTests.java b/example/src/test/java/com/example/sugartest/ShortFieldTests.java
index dd22b662..3c428752 100644
--- a/example/src/test/java/com/example/sugartest/ShortFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/ShortFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class ShortFieldTests {
     @Test
     public void nullShortExtendedTest() {
diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
index 77a14677..7bfe0108 100644
--- a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
@@ -23,7 +23,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class SimpleAnnotatedModelTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
index 704ea5c3..aa860270 100644
--- a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
@@ -23,7 +23,7 @@
 
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class SimpleExtendedModelTests {
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/example/src/test/java/com/example/sugartest/StringFieldTests.java b/example/src/test/java/com/example/sugartest/StringFieldTests.java
index c37446e4..afecdf3d 100644
--- a/example/src/test/java/com/example/sugartest/StringFieldTests.java
+++ b/example/src/test/java/com/example/sugartest/StringFieldTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(emulateSdk=18)
+@Config(sdk=18)
 public class StringFieldTests {
     @Test
     public void nullStringExtendedTest() {
diff --git a/library/build.gradle b/library/build.gradle
index 9251b0d8..fe30db14 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply from: '../maven_push.gradle'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 21
+        targetSdkVersion 23
     }
 
     buildTypes {
@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:appcompat-v7:23.1.0'
     compile 'com.google.guava:guava:18.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/library/src/test/java/com/orm/query/DummyContext.java b/library/src/test/java/com/orm/query/DummyContext.java
index 5505b37f..77a897ff 100644
--- a/library/src/test/java/com/orm/query/DummyContext.java
+++ b/library/src/test/java/com/orm/query/DummyContext.java
@@ -377,19 +377,29 @@ public Object getSystemService(String s) {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
+    public String getSystemServiceName(Class<?> serviceClass) {
+        return null;
+    }
+
     @Override
     public int checkPermission(String s, int i, int i1) {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
+        return PackageManager.PERMISSION_GRANTED;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
     @Override
     public int checkCallingPermission(String s) {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
+        return PackageManager.PERMISSION_GRANTED;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
     @Override
     public int checkCallingOrSelfPermission(String s) {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
+        return PackageManager.PERMISSION_GRANTED;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public int checkSelfPermission(String permission) {
+        return PackageManager.PERMISSION_GRANTED;
     }
 
     @Override

From d77bc114ca3f10a44ef9f2eeb8634907e3b6a900 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Wed, 4 Nov 2015 15:04:08 -0200
Subject: [PATCH 165/305] update travis to android 23

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6784c11..df1b94f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ language: android
 
 android:
   components:
-    - sys-img-armeabi-v7a-android-21
-    - build-tools-21.1.2
-    - android-21
+    - sys-img-armeabi-v7a-android-23
+    - build-tools-23.0.1
+    - android-23
 
 script:
   - gradle clean build connectedCheck coveralls

From bed0975df95e5ab0f82a44a6c20f871e080d9384 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Thu, 12 Nov 2015 16:01:32 -0200
Subject: [PATCH 166/305] moving changelog from README to CHANGELOG.md

---
 CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 README.md    | 40 ++--------------------------------------
 2 files changed, 51 insertions(+), 38 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..61c308ee
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,49 @@
+# Sugar Releases
+
+## [Unreleased]
+
+## v1.4 Beta [[jar](https://github.com/satyan/sugar/releases/download/v1.4_beta/sugar-1.4_beta.jar)]
+### Added
+* [#78](https://github.com/satyan/sugar/pull/78) @HiddenCleverde capability to specify primary key
+
+### Fixed
+* [#113](https://github.com/satyan/sugar/pull/113) @whoshuu override findById to support int
+* [#106](https://github.com/satyan/sugar/issues/106) @whoshuu add documentation to onTerminate
+* [#54](https://github.com/satyan/sugar/issues/54) @whoshuu simplify count interface
+* [#43](https://github.com/satyan/sugar/issues/43) @whoshuu return id on save
+* [#72](https://github.com/satyan/sugar/issues/72) @whoshuu allow null values to Date and Calendar objects
+* [#96](https://github.com/satyan/sugar/issues/96) @whoshuu roboeletric fallback
+
+## v1.3 [[jar](https://github.com/satyan/sugar/releases/download/v1.3/sugar-1.3.jar)]
+
+- Transaction Support
+- Bulk Insert of records 
+- Encrypted datastore (branch : sugar-cipher using sqlcipher)
+- Removed Constructor with context parameter. Needs default constructor now.
+- Enhancements to QueryBuilder
+- Bug fixes and other improvements.
+
+## v1.2 [[jar](https://github.com/satyan/sugar/releases/download/v1.2/sugar-1.2.jar)]
+
+- package restriction for domain classes.
+- metadata caching
+- QueryBuilder v1
+- Database Migrations
+- Provision for Raw queries
+- Better and more organized api guide and usage instructions.
+
+## v1.1 [[jar](https://github.com/satyan/sugar/releases/download/v1.1/sugar-1.1.jar)]
+
+- Static api doesn't take context anymore. Hence
+
+```java
+Book.findById(context, Book.class, 1);
+```
+
+becomes
+
+```java
+Book.findById(Book.class, 1);
+```
+
+- Some cleanup in the code.
diff --git a/README.md b/README.md
index 98db9394..54635c36 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ There are four ways to install Sugar:
 This is the preferred way. Simply add:
 
 ```groovy
-compile 'com.github.satyan:sugar:1.3.1'
+compile 'com.github.satyan:sugar:1.4.0'
 ```
 
 to your project dependencies and run `gradle build` or `gradle assemble`.
@@ -34,7 +34,7 @@ Declare the dependency in Maven:
 <dependency>
     <groupId>com.github.satyan</groupId>
     <artifactId>sugar</artifactId>
-    <version>1.3</version>
+    <version>1.4</version>
 </dependency>
 ```
 
@@ -53,39 +53,3 @@ After installing, check out how to set up your first database and models [here](
 ## Contributing
 
 Please fork this repository and contribute back using [pull requests](https://github.com/satyan/sugar/pulls). Features can be requested using [issues](https://github.com/satyan/sugar/issues). All code, comments, and critiques are greatly appreciated.
-
-## Changelog
-
-#### v1.3 [[jar](https://github.com/satyan/sugar/releases/download/v1.3/sugar-1.3.jar)]
-
-- Transaction Support
-- Bulk Insert of records 
-- Encrypted datastore (branch : sugar-cipher using sqlcipher)
-- Removed Constructor with context parameter. Needs default constructor now.
-- Enhancements to QueryBuilder
-- Bug fixes and other improvements.
-
-#### v1.2 [[jar](https://github.com/satyan/sugar/releases/download/v1.2/sugar-1.2.jar)]
-
-- package restriction for domain classes.
-- metadata caching
-- QueryBuilder v1
-- Database Migrations
-- Provision for Raw queries
-- Better and more organized api guide and usage instructions.
-
-#### v1.1 [[jar](https://github.com/satyan/sugar/releases/download/v1.1/sugar-1.1.jar)]
-
-- Static api doesn't take context anymore. Hence
-
-```java
-Book.findById(context, Book.class, 1);
-```
-
-becomes
-
-```java
-Book.findById(Book.class, 1);
-```
-
-- Some cleanup in the code.

From a0baa82074f094cf882e268dbbe347768e929260 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Thu, 19 Nov 2015 15:04:07 -0200
Subject: [PATCH 167/305] updating to android-23, travis doesn't support it yet

---
 .travis.yml          | 2 +-
 example/build.gradle | 4 ++--
 library/build.gradle | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df1b94f5..9cd5cea5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: android
 android:
   components:
     - sys-img-armeabi-v7a-android-23
-    - build-tools-23.0.1
+    - build-tools-23.0.2
     - android-23
 
 script:
diff --git a/example/build.gradle b/example/build.gradle
index 5700a16b..129eb11e 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "com.example"
@@ -19,7 +19,7 @@ android {
 
 dependencies {
     compile project (':library')
-    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:appcompat-v7:23.1.1'
     testCompile 'org.robolectric:robolectric:3.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/library/build.gradle b/library/build.gradle
index fe30db14..b38dc8ee 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -3,7 +3,7 @@ apply from: '../maven_push.gradle'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         minSdkVersion 9
@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.google.guava:guava:18.0'
     testCompile 'junit:junit:4.12'
 }

From dea3017b91bb97e4fb9e782cbdab1c5b35c87080 Mon Sep 17 00:00:00 2001
From: Nikolay <gN1kolaykul@gmail.com>
Date: Sun, 22 Nov 2015 17:19:02 +0300
Subject: [PATCH 168/305] Update version

1.4.0 doesn't work.
1.4 does.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 54635c36..f4b40baa 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ There are four ways to install Sugar:
 This is the preferred way. Simply add:
 
 ```groovy
-compile 'com.github.satyan:sugar:1.4.0'
+compile 'com.github.satyan:sugar:1.4'
 ```
 
 to your project dependencies and run `gradle build` or `gradle assemble`.

From 0c2de5577c2ba6df0e96e82beda71f1bd680da56 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 23 Nov 2015 12:40:30 -0200
Subject: [PATCH 169/305] complete CHANGELOG for version 1.4

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcf3d232..27db662f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,31 @@
 
 
 ## v1.4
+### Added
+* [#306](https://github.com/satyan/sugar/pull/306) @Shyish return boolean/integer on delete methods
+* [#304](https://github.com/satyan/sugar/pull/304) @benohalloran add support to enum type
+* [#197](https://github.com/satyan/sugar/pull/197) @andresteves add suport for bytes[]
+* [#293](https://github.com/satyan/sugar/pull/293) @neilw4 support NULL in queries
+* [#273](https://github.com/satyan/sugar/pull/273) @dominicwong617 findById support an array of ids
+* [#246](https://github.com/satyan/sugar/pull/246) @kwf2030 use sqlite\_master to check whether table already exist
+* [#253](https://github.com/satyan/sugar/pull/202) @JeroenMols add bulk delete
+* [#285](https://github.com/satyan/sugar/pull/202) @Shyish add listAll with orderBy param
+* No need to extend SugarApp - just call SugarContext.init(Context) instead
+* [#129](https://github.com/satyan/sugar/pull/129) @satyan support sugar entities using @Table annotations
+
+### Fixed
+* [#314](https://github.com/satyan/sugar/pull/314) @abscondment fix StrictMode DexFile
+* [#303](https://github.com/satyan/sugar/pull/303) @RossinesP fixed saving row string bug
+* [#258](https://github.com/satyan/sugar/pull/258) @nosrak113 change SugarRecord ID to private to not conflit with other libraries
+* [#254](https://github.com/satyan/sugar/pull/254) @jivimberg use weak keys to keep track of annotated entities
+* [#215](https://github.com/satyan/sugar/issues/215) @jivimberg fix bug persisting relationship
+* [#185](https://github.com/satyan/sugar/issues/185) [#243](https://github.com/satyan/sugar/issues/243) @whoshuu fix save and update method
+* [#202](https://github.com/satyan/sugar/pull/202) @allieus improve getDomainsClass()
+* [#104](https://github.com/satyan/sugar/issues/104) @whoshuu fix nesting "and" and "or"
 
 ## v1.4 Beta [[jar](https://github.com/satyan/sugar/releases/download/v1.4_beta/sugar-1.4_beta.jar)]
 ### Added
+* [#112](https://github.com/satyan/sugar/pull/112) @androdevcafe added Unique and NotNull annotations
 * [#78](https://github.com/satyan/sugar/pull/78) @HiddenCleverde capability to specify primary key
 
 ### Fixed

From b2eb8db7550b3cc56206a699888888d53bf6bdda Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 23 Nov 2015 13:57:11 -0200
Subject: [PATCH 170/305] adding unreleased changes to changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27db662f..109b6b06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,15 @@
 ## [Unreleased]
 ### Added
 * [#155](https://github.com/satyan/sugar/issues/155) @benohalloran adding Cursors for Cursor Adapters [Pull 312](https://github.com/satyan/sugar/pull/312)
+* [#430](https://github.com/satyan/sugar/pull/430) @sibeliusseraphini update to roboelectric 3.0 and target android-32
 
+### Changed
+* [#423](https://github.com/satyan/sugar/pull/423) @sibeliusseraphini moving changelog of README.md to CHANGELOG.md
+
+### Fixed
+* [#410](https://github.com/satyan/sugar/pull/410) [#408](https://github.com/satyan/sugar/pull/408) @RoyMontoya simplify code
+* [#327](https://github.com/satyan/sugar/pull/327) @tracytheron support multi-dex
+* [#373](https://github.com/satyan/sugar/pull/373) @salimkamboh use existing tables
 
 ## v1.4
 ### Added

From 022f7d2359944311cd75ce39a122f7a6992bffe8 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 23 Nov 2015 17:50:33 -0200
Subject: [PATCH 171/305] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 109b6b06..85a61493 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * [#423](https://github.com/satyan/sugar/pull/423) @sibeliusseraphini moving changelog of README.md to CHANGELOG.md
 
 ### Fixed
+* [#434](https://github.com/satyan/sugar/pull/434) @bendaniel10 fix multi-dex
 * [#410](https://github.com/satyan/sugar/pull/410) [#408](https://github.com/satyan/sugar/pull/408) @RoyMontoya simplify code
 * [#327](https://github.com/satyan/sugar/pull/327) @tracytheron support multi-dex
 * [#373](https://github.com/satyan/sugar/pull/373) @salimkamboh use existing tables

From fa7e6e482d672768d1e88eb30b9833b1c95a4ec8 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Wed, 25 Nov 2015 11:24:26 -0200
Subject: [PATCH 172/305] removing appcompat library, fix satyan/sugar#276

---
 library/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/build.gradle b/library/build.gradle
index b38dc8ee..9766bd82 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -18,7 +18,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.google.guava:guava:18.0'
     testCompile 'junit:junit:4.12'
 }

From 7b98a7c4e87af88f255afdc520611efd3e7f66e8 Mon Sep 17 00:00:00 2001
From: Douglas Alves <dnalves3@gmail.com>
Date: Wed, 25 Nov 2015 09:39:21 -0200
Subject: [PATCH 173/305] Removing guava

---
 library/build.gradle                            |  1 -
 library/src/main/java/com/orm/SugarContext.java | 12 ++++++------
 sugar.iml                                       |  6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index 9766bd82..d9a42c18 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -18,7 +18,6 @@ android {
 }
 
 dependencies {
-    compile 'com.google.guava:guava:18.0'
     testCompile 'junit:junit:4.12'
 }
 
diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 61acf813..6190b1aa 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -2,21 +2,21 @@
 
 import android.content.Context;
 
-import com.google.common.collect.MapMaker;
-
-import java.util.concurrent.ConcurrentMap;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 public class SugarContext {
 
     private static SugarContext instance = null;
     private SugarDb sugarDb;
     private Context context;
-    private ConcurrentMap<Object, Long> entitiesMap;
+    private Map<Object, Long> entitiesMap;
 
     private SugarContext(Context context) {
         this.context = context;
         this.sugarDb = new SugarDb(context);
-        this.entitiesMap = new MapMaker().weakKeys().makeMap();
+        this.entitiesMap = Collections.synchronizedMap(new WeakHashMap<Object, Long>());
     }
     
     public static SugarContext getSugarContext() {
@@ -53,7 +53,7 @@ protected SugarDb getSugarDb() {
         return sugarDb;
     }
 
-    ConcurrentMap<Object, Long> getEntitiesMap() {
+    Map<Object, Long> getEntitiesMap() {
         return entitiesMap;
     }
 }
diff --git a/sugar.iml b/sugar.iml
index e19b5594..5e73d1d0 100644
--- a/sugar.iml
+++ b/sugar.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="sugar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="sugar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.satyan" external.system.module.version="1.4" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -8,12 +8,12 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file

From 3e9d453a83f2d1578bab90f9f31e5b12b0390c97 Mon Sep 17 00:00:00 2001
From: Douglas Alves <dalves@quintoandar.com.br>
Date: Wed, 25 Nov 2015 13:30:33 -0200
Subject: [PATCH 174/305] Reverting iml file.

---
 sugar.iml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sugar.iml b/sugar.iml
index 5e73d1d0..e19b5594 100644
--- a/sugar.iml
+++ b/sugar.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="sugar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.satyan" external.system.module.version="1.4" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="sugar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -8,12 +8,12 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file

From e4e13be5bfbeca130bda08d2a223e30d1c09ae98 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Wed, 25 Nov 2015 15:06:41 -0200
Subject: [PATCH 175/305] updating changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85a61493..6a13e477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * [#430](https://github.com/satyan/sugar/pull/430) @sibeliusseraphini update to roboelectric 3.0 and target android-32
 
 ### Changed
+* [#437](https://github.com/satyan/sugar/pull/437) @dnalves removing guava dependency, using synchronized WeakHashMap instead
 * [#423](https://github.com/satyan/sugar/pull/423) @sibeliusseraphini moving changelog of README.md to CHANGELOG.md
 
 ### Fixed

From 820f1ade2b54324c405745826f8372fb57f16752 Mon Sep 17 00:00:00 2001
From: Turdaliev Nursultan <nursultan2010@gmail.com>
Date: Sun, 29 Nov 2015 12:12:43 +0100
Subject: [PATCH 176/305] Version number invalid

With zero doesn't work. Gradle can't find the repository. Please look at [MavenRepository](http://mvnrepository.com/artifact/com.github.satyan/sugar/1.4)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 54635c36..f4b40baa 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ There are four ways to install Sugar:
 This is the preferred way. Simply add:
 
 ```groovy
-compile 'com.github.satyan:sugar:1.4.0'
+compile 'com.github.satyan:sugar:1.4'
 ```
 
 to your project dependencies and run `gradle build` or `gradle assemble`.

From 1d6f3ef84024dba050103e466f25bbf17c24fd62 Mon Sep 17 00:00:00 2001
From: Colorado Reed <colorado.j.reed@gmail.com>
Date: Sun, 29 Nov 2015 16:18:16 -0800
Subject: [PATCH 177/305] fix Travis CI build for Build Tools 23.0.2

travis-ci/travis-ci#5036
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9cd5cea5..dc4c9691 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: android
 android:
   components:
     - sys-img-armeabi-v7a-android-23
+    - tools
     - build-tools-23.0.2
     - android-23
 

From 09034cbcea9b7fa355cb5a962207539206ee5592 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Tue, 1 Dec 2015 16:59:01 -0200
Subject: [PATCH 178/305] add update based on unique values and improve readme

---
 CHANGELOG.md                                  |  1 +
 README.md                                     | 73 +++++++++++++++++++
 .../src/main/java/com/orm/SugarRecord.java    | 65 +++++++++++++++++
 3 files changed, 139 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a13e477..3507a180 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Added
+* @sibeliusseraphini update, updateInTx methods based on Unique values of SugarRecord
 * [#155](https://github.com/satyan/sugar/issues/155) @benohalloran adding Cursors for Cursor Adapters [Pull 312](https://github.com/satyan/sugar/pull/312)
 * [#430](https://github.com/satyan/sugar/pull/430) @sibeliusseraphini update to roboelectric 3.0 and target android-32
 
diff --git a/README.md b/README.md
index f4b40baa..f4d129a5 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,79 @@ Visit the [releases](https://github.com/satyan/sugar/releases) page to download
 
 After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html).
 
+## Examples
+### SugarRecord
+```
+public class Book extends SugarRecord {
+  @Unique
+  String isbn;
+  String title;
+  String edition;
+
+  // Default constructor is necessary for SugarRecord
+  public Book() {
+
+  }
+
+  public Book(String isbn, String title, String edition) {
+    this.isbn = isbn;
+    this.title = title;
+    this.edition = edition;
+  }
+}
+```
+or
+```
+@Table
+public class Book { ... }
+```
+
+### Save Entity
+```
+Book book = new Book("isbn123", "Title here", "2nd edition")
+book.save();
+```
+
+### Load Entity
+```
+Book book = Book.findById(Book.class, 1);
+```
+
+### Update Entity
+```
+Book book = Book.findById(Book.class, 1);
+book.title = "updated title here"; // modify the values
+book.edition = "3rd edition";
+book.save(); // updates the previous entry with new values.
+```
+
+### Delete Entity
+```
+Book book = Book.findById(Book.class, 1);
+book.delete();
+```
+
+### Update Entity based on Unique values
+```
+Book book = new Book("isbn123", "Title here", "2nd edition")
+book.save();
+
+// Update book with isbn123
+Book sameBook = new Book("isbn123", "New Title", "5th edition")
+sameBook.update();
+
+book.getId() == sameBook.getId(); // true
+```
+
+### Bulk Insert
+```
+List<Book> books = new ArrayList<>();
+books.add(new Book("isbn123", "Title here", "2nd edition"))
+books.add(new Book("isbn456", "Title here 2", "3nd edition"))
+books.add(new Book("isbn789", "Title here 3", "4nd edition"))
+SugarRecord.saveInTx(books);
+```
+
 ## Contributing
 
 Please fork this repository and contribute back using [pull requests](https://github.com/satyan/sugar/pulls). Features can be requested using [issues](https://github.com/satyan/sugar/issues). All code, comments, and critiques are greatly appreciated.
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index ce09527d..fcd61537 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -9,6 +9,7 @@
 import android.util.Log;
 
 import com.orm.dsl.Table;
+import com.orm.dsl.Unique;
 import com.orm.util.NamingHelper;
 import com.orm.util.QueryBuilder;
 import com.orm.util.ReflectionUtil;
@@ -71,6 +72,29 @@ public static <T> void saveInTx(Collection<T> objects) {
         }
     }
 
+    @SuppressWarnings("deprecation")
+    public static <T> void updateInTx(T... objects) {
+        updateInTx(Arrays.asList(objects));
+    }
+
+    @SuppressWarnings("deprecation")
+    public static <T> void updateInTx(Collection<T> objects) {
+        SQLiteDatabase sqLiteDatabase = getSugarDataBase();
+        try {
+            sqLiteDatabase.beginTransaction();
+            sqLiteDatabase.setLockingEnabled(false);
+            for (T object: objects) {
+                update(object);
+            }
+            sqLiteDatabase.setTransactionSuccessful();
+        } catch (Exception e) {
+            Log.i(SUGAR, "Error in saving in transaction " + e.getMessage());
+        } finally {
+            sqLiteDatabase.endTransaction();
+            sqLiteDatabase.setLockingEnabled(true);
+        }
+    }
+
     @SuppressWarnings("deprecation")
     public static <T> int deleteInTx(T... objects) {
         return deleteInTx(Arrays.asList(objects));
@@ -276,6 +300,47 @@ static long save(SQLiteDatabase db, Object object) {
         return id;
     }
 
+    public static long update(Object object) {
+        return update(getSugarDataBase(), object);
+    }
+
+    static long update(SQLiteDatabase db, Object object) {
+        Map<Object, Long> entitiesMap = getSugarContext().getEntitiesMap();
+        List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
+        ContentValues values = new ContentValues(columns.size());
+        Field idField = null;
+
+        StringBuilder whereClause = new StringBuilder();
+        List<String> whereArgs = new ArrayList<>();
+
+        for (Field column : columns) {
+            if(column.isAnnotationPresent(Unique.class)) {
+                try {
+                    column.setAccessible(true);
+                    String columnName = NamingHelper.toSQLName(column);
+                    Object columnValue = column.get(object);
+
+                    whereClause.append(columnName).append(" = ?");
+                    whereArgs.add(String.valueOf(columnValue));
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                if (!column.getName().equals("id")) {
+                    ReflectionUtil.addFieldValueToColumn(values, column, object, entitiesMap);
+                }
+            }
+        }
+
+        String[] whereArgsArray = whereArgs.toArray(new String[whereArgs.size()]);
+        // Get SugarRecord based on Unique values
+        long id = db.update(NamingHelper.toSQLName(object.getClass()), values, whereClause.toString(), whereArgsArray);
+
+        return id;
+    }
+
+
+
     public static boolean isSugarEntity(Class<?> objectClass) {
         return objectClass.isAnnotationPresent(Table.class) || SugarRecord.class.isAssignableFrom(objectClass);
     }

From 3e0ac29b377f3e01d2d4a047d9a69431691ba9c2 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Tue, 1 Dec 2015 17:00:35 -0200
Subject: [PATCH 179/305] enable update on instance

---
 library/src/main/java/com/orm/SugarRecord.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index fcd61537..a51b71c4 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -413,6 +413,10 @@ public long save() {
         return save(getSugarDataBase(), this);
     }
 
+    public long update() {
+        return update(getSugarDataBase(), this);
+    }
+
     @SuppressWarnings("unchecked")
     void inflate(Cursor cursor) {
         inflate(cursor, this, getSugarContext().getEntitiesMap());

From 3a507b2091dd266113e57e0779bdc3e50fa24cde Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Tue, 1 Dec 2015 18:26:30 -0200
Subject: [PATCH 180/305] save record when update fails

---
 library/src/main/java/com/orm/SugarRecord.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index a51b71c4..36979284 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -334,9 +334,13 @@ static long update(SQLiteDatabase db, Object object) {
 
         String[] whereArgsArray = whereArgs.toArray(new String[whereArgs.size()]);
         // Get SugarRecord based on Unique values
-        long id = db.update(NamingHelper.toSQLName(object.getClass()), values, whereClause.toString(), whereArgsArray);
+        long rowsEffected = db.update(NamingHelper.toSQLName(object.getClass()), values, whereClause.toString(), whereArgsArray);
 
-        return id;
+        if (rowsEffected == 0) {
+            return save(db, object);
+        } else {
+            return rowsEffected;
+        }
     }
 
 

From 3d7744932e07758e642dca0973baa7f3e8f59a04 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Wed, 2 Dec 2015 15:32:03 -0200
Subject: [PATCH 181/305] refactor SchemaGenerator and adding some tests

---
 .../main/java/com/orm/SchemaGenerator.java    | 12 +++-
 .../java/com/orm/SchemaGeneratorTest.java     | 64 +++++++++++++++++++
 .../test/java/com/orm/models/EmptyModel.java  | 12 ++++
 .../java/com/orm/models/IntUniqueModel.java   | 20 ++++++
 .../orm/models/StringFieldAnnotatedModel.java | 21 ++++++
 .../orm/models/StringFieldExtendedModel.java  | 18 ++++++
 ...ringFieldExtendedModelAnnotatedColumn.java | 20 ++++++
 7 files changed, 164 insertions(+), 3 deletions(-)
 create mode 100644 library/src/test/java/com/orm/SchemaGeneratorTest.java
 create mode 100644 library/src/test/java/com/orm/models/EmptyModel.java
 create mode 100644 library/src/test/java/com/orm/models/IntUniqueModel.java
 create mode 100644 library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/StringFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 91f80e1b..bce45da0 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -108,7 +108,7 @@ private void executeScript(SQLiteDatabase db, String file) {
         Log.i(SUGAR, "Script executed");
     }
 
-    private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
+    protected String createTableSQL(Class<?> table) {
         Log.i(SUGAR, "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);
@@ -161,9 +161,15 @@ private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
         sb.append(" ) ");
         Log.i(SUGAR, "Creating table " + tableName);
 
-        if (!sb.toString().isEmpty()) {
+        return sb.toString();
+    }
+
+    private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
+        String createSQL = createTableSQL(table);
+
+        if (!createSQL.isEmpty()) {
             try {
-                sqLiteDatabase.execSQL(sb.toString());
+                sqLiteDatabase.execSQL(createSQL);
             } catch (SQLException e) {
                 e.printStackTrace();
             }
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
new file mode 100644
index 00000000..1caab6f6
--- /dev/null
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -0,0 +1,64 @@
+package com.orm;
+
+import com.orm.dsl.Table;
+import com.orm.models.EmptyModel;
+import com.orm.models.IntUniqueModel;
+import com.orm.models.StringFieldAnnotatedModel;
+import com.orm.models.StringFieldExtendedModel;
+import com.orm.models.StringFieldExtendedModelAnnotatedColumn;
+import com.orm.query.DummyContext;
+import com.orm.util.NamingHelper;
+
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+public class SchemaGeneratorTest {
+    @Test
+    public void testEmptyTableCreation() throws Exception {
+        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext());
+        String createSQL = schemaGenerator.createTableSQL(EmptyModel.class);
+        assertEquals(
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(EmptyModel.class) +
+                    " ( ID INTEGER PRIMARY KEY AUTOINCREMENT  ) ",
+                createSQL);
+    }
+
+    @Test
+    public void testSimpleColumnTableCreation() throws Exception {
+        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext());
+        String createSQL = schemaGenerator.createTableSQL(StringFieldExtendedModel.class);
+        assertEquals(
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldExtendedModel.class) +
+                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
+                        "NAME TEXT ) ",
+                createSQL);
+
+        String createSQL2 = schemaGenerator.createTableSQL(StringFieldAnnotatedModel.class);
+
+        assertEquals(
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldAnnotatedModel.class) +
+                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
+                        "NAME TEXT ) ",
+                createSQL2);
+
+        String createSQL3 = schemaGenerator.createTableSQL(StringFieldExtendedModelAnnotatedColumn.class);
+
+        assertEquals(
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldExtendedModelAnnotatedColumn.class) +
+                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
+                        "anyName TEXT ) ",
+                createSQL3);
+    }
+
+    @Test
+    public void testUniqueTableCreation() {
+        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext());
+        String createSQL = schemaGenerator.createTableSQL(IntUniqueModel.class);
+        assertEquals(
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(IntUniqueModel.class) +
+                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
+                        "VALUE INTEGER UNIQUE ) ",
+                createSQL);
+    }
+}
diff --git a/library/src/test/java/com/orm/models/EmptyModel.java b/library/src/test/java/com/orm/models/EmptyModel.java
new file mode 100644
index 00000000..8efb9dd4
--- /dev/null
+++ b/library/src/test/java/com/orm/models/EmptyModel.java
@@ -0,0 +1,12 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+/**
+ * Created by sibelius on 02/12/15.
+ */
+public class EmptyModel extends SugarRecord {
+    public EmptyModel() {
+
+    }
+}
diff --git a/library/src/test/java/com/orm/models/IntUniqueModel.java b/library/src/test/java/com/orm/models/IntUniqueModel.java
new file mode 100644
index 00000000..e73e8968
--- /dev/null
+++ b/library/src/test/java/com/orm/models/IntUniqueModel.java
@@ -0,0 +1,20 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+import com.orm.dsl.Unique;
+
+/**
+ * Created by sibelius on 02/12/15.
+ */
+public class IntUniqueModel extends SugarRecord {
+    @Unique
+    private int value;
+
+    public IntUniqueModel() {
+
+    }
+
+    public IntUniqueModel(int value) {
+        this.value = value;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
new file mode 100644
index 00000000..1203db01
--- /dev/null
+++ b/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
@@ -0,0 +1,21 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+import com.orm.dsl.Column;
+import com.orm.dsl.Table;
+
+/**
+ * Created by sibelius on 02/12/15.
+ */
+@Table
+public class StringFieldAnnotatedModel extends SugarRecord {
+    public String name;
+
+    public StringFieldAnnotatedModel() {
+
+    }
+
+    public StringFieldAnnotatedModel(String name) {
+        this.name = name;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/StringFieldExtendedModel.java b/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
new file mode 100644
index 00000000..ee781632
--- /dev/null
+++ b/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
@@ -0,0 +1,18 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+/**
+ * Created by sibelius on 02/12/15.
+ */
+public class StringFieldExtendedModel extends SugarRecord {
+    public String name;
+
+    public StringFieldExtendedModel() {
+
+    }
+
+    public StringFieldExtendedModel(String name) {
+        this.name = name;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java b/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
new file mode 100644
index 00000000..9f2b43cd
--- /dev/null
+++ b/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
@@ -0,0 +1,20 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+import com.orm.dsl.Column;
+
+/**
+ * Created by sibelius on 02/12/15.
+ */
+public class StringFieldExtendedModelAnnotatedColumn extends SugarRecord {
+    @Column(name="anyName")
+    public String name;
+
+    public StringFieldExtendedModelAnnotatedColumn() {
+
+    }
+
+    public StringFieldExtendedModelAnnotatedColumn(String name) {
+        this.name = name;
+    }
+}

From b8ad30907671ce17d781a10128938746dd790ef2 Mon Sep 17 00:00:00 2001
From: The Gitter Badger <badger@gitter.im>
Date: Wed, 2 Dec 2015 20:38:35 +0000
Subject: [PATCH 182/305] Add Gitter badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f4d129a5..024f77f5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg?branch=master)](https://coveralls.io/r/satyan/sugar?branch=master)
 
+[![Join the chat at https://gitter.im/satyan/sugar](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/satyan/sugar?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Insanely easy way to work with Android databases.
 
 Official documentation can be found [here](http://satyan.github.io/sugar). The example application is provided in the **example** folder in the source.

From 74016793ae960dbccf2f3070ee504db6ab3cb368 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Thu, 3 Dec 2015 10:57:37 -0200
Subject: [PATCH 183/305] update README.md

---
 README.md | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f4d129a5..4cc090e2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Insanely easy way to work with Android databases.
 
-Official documentation can be found [here](http://satyan.github.io/sugar). The example application is provided in the **example** folder in the source.
+Official documentation can be found [here](http://satyan.github.io/sugar) **Outdated** - Check some examples below. The example application is provided in the **example** folder in the source.
 
 ## Features
 
@@ -46,9 +46,43 @@ Download the source code and import it as a library project in Eclipse. The proj
 
 Visit the [releases](https://github.com/satyan/sugar/releases) page to download jars directly. You can drop them into your `libs` folder and configure the Java build path to include the library. See this [tutorial](http://www.vogella.com/tutorials/AndroidLibraryProjects/article.html) for an excellent guide on how to do this.
 
+
+### How to use master version
+First, download sugar repository
+```
+git clone git@github.com:satyan/sugar.git
+```
+
+include this in your **settings.gradle**
+```
+include ':app' // your module app
+include ':sugar'
+
+def getLocalProperty(prop) {
+	Properties properties = new Properties()
+	properties.load(new File(rootDir.absolutePath + '/local.properties').newDataInputStream())
+	return properties.getProperty(prop, '')
+}
+
+project(':sugar').projectDir = new File(getLocalProperty('sugar.dir'))
+
+```
+
+include this in your **local.properties**
+```
+sugar.dir=/path/to/sugar/library
+```
+
+add sugar project to the dependencies of your main project (build.gradle)
+```
+dependencies {
+    compile project(':sugar')
+}
+```
+
 ===================
 
-After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html).
+After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html) **Outdated**. Check examples of 1.4 and master below: 
 
 ## Examples
 ### SugarRecord
@@ -123,6 +157,8 @@ books.add(new Book("isbn789", "Title here 3", "4nd edition"))
 SugarRecord.saveInTx(books);
 ```
 
+## [CHANGELOG](https://github.com/satyan/sugar/blob/master/CHANGELOG.md)
+
 ## Contributing
 
 Please fork this repository and contribute back using [pull requests](https://github.com/satyan/sugar/pulls). Features can be requested using [issues](https://github.com/satyan/sugar/issues). All code, comments, and critiques are greatly appreciated.

From 93c216118488ce9fdc6e7fcf47072096eb80e32d Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Thu, 3 Dec 2015 11:58:54 -0200
Subject: [PATCH 184/305] warn developer to upgrade database on missing colName

---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 87b42f63..a5d9a58f 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -154,6 +154,12 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
 
             int columnIndex = cursor.getColumnIndex(colName);
 
+            //TODO auto upgrade to add new columns
+            if (columnIndex < 0) {
+                Log.e("SUGAR", "Invalid colName, you should upgrade database");
+                return;
+            }
+
             if (cursor.isNull(columnIndex)) {
                 return;
             }

From 243ee4f20c4cd497eaf146d10175a0efc624f7a4 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan@Nursultans-MacBook-Pro.local>
Date: Thu, 3 Dec 2015 19:53:29 +0100
Subject: [PATCH 185/305] Travis

---
 .travis.yml          | 1 +
 example/build.gradle | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index dc4c9691..72ccfc19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ android:
   components:
     - sys-img-armeabi-v7a-android-23
     - tools
+    - platform-tools
     - build-tools-23.0.2
     - android-23
 
diff --git a/example/build.gradle b/example/build.gradle
index 129eb11e..7e3052aa 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -20,6 +20,7 @@ android {
 dependencies {
     compile project (':library')
     compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:support-v4:23.1.1'
     testCompile 'org.robolectric:robolectric:3.0'
     testCompile 'junit:junit:4.12'
 }

From 80baa64f76c4d14644f7edfd85f0142dde28c600 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 20:06:20 +0100
Subject: [PATCH 186/305] travis error

---
 .travis.yml          | 7 +++++--
 example/build.gradle | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 72ccfc19..8f971250 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,15 @@
 language: android
+jdk: oracle
 
 android:
   components:
     - sys-img-armeabi-v7a-android-23
-    - tools
-    - platform-tools
+    - tool
     - build-tools-23.0.2
     - android-23
+    - platform-tool
+    - extra-android-m2repository
+    - extra-google-m2repository
 
 script:
   - gradle clean build connectedCheck coveralls
diff --git a/example/build.gradle b/example/build.gradle
index 7e3052aa..129eb11e 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -20,7 +20,6 @@ android {
 dependencies {
     compile project (':library')
     compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
     testCompile 'org.robolectric:robolectric:3.0'
     testCompile 'junit:junit:4.12'
 }

From 9e5d001e4ffedd55b0eef9894bfa94c3f60d345f Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 20:29:26 +0100
Subject: [PATCH 187/305] Jacoco

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c6970775..6e6c2136 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }

From a6f9bfc3122e5b41fd9044c4ad28ceef7b856767 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 20:34:34 +0100
Subject: [PATCH 188/305] Jacoco

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6e6c2136..6b089a64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ subprojects { proj ->
         version "0.7.1.201405082137"
     }
 
-    task jacocoTestReport(type: JacocoReport, dependsOn: "testDebug") {
+    task jacocoTestReport(type: JacocoReport) {
         group = "Reporting"
         description = "Generate Jacoco coverage reports after running tests."
         reports {

From 2a014a58582c5c095ecca352379c1b199ce145e7 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 21:12:08 +0100
Subject: [PATCH 189/305] Travis Build fix

---
 example/build.gradle | 4 ++++
 library/build.gradle | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/example/build.gradle b/example/build.gradle
index 129eb11e..d79dd899 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -15,6 +15,10 @@ android {
             minifyEnabled false
         }
     }
+
+    testOptions{
+        unitTests.returnDefaultValues = true
+    }
 }
 
 dependencies {
diff --git a/library/build.gradle b/library/build.gradle
index d9a42c18..3652b458 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -15,6 +15,10 @@ android {
             minifyEnabled false
         }
     }
+
+    testOptions{
+        unitTests.returnDefaultValues = true
+    }
 }
 
 dependencies {

From 1624af3cd0205b2ceaf5e543ee0ed13ab252d392 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 21:49:56 +0100
Subject: [PATCH 190/305] Travis Build fix

---
 .travis.yml          | 3 +--
 build.gradle         | 8 +++++++-
 example/build.gradle | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f971250..8c73cf42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,9 @@ jdk: oracle
 android:
   components:
     - sys-img-armeabi-v7a-android-23
-    - tool
+    - tools
     - build-tools-23.0.2
     - android-23
-    - platform-tool
     - extra-android-m2repository
     - extra-google-m2repository
 
diff --git a/build.gradle b/build.gradle
index 6b089a64..9b9e75df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
+apply plugin: 'java'
 
 buildscript {
     repositories {
@@ -14,7 +15,11 @@ buildscript {
 def isReleaseBuild() {
     return version.contains("SNAPSHOT") == false
 }
-
+test{
+    testLogging{
+        events "passed", "skipped", "standardOut"
+    }
+}
 allprojects {
     version = VERSION_NAME
     group = GROUP
@@ -92,3 +97,4 @@ tasks.coveralls {
     dependsOn jacocoRootReport
     onlyIf { System.env.'CI' }
 }
+apply plugin: 'java'
\ No newline at end of file
diff --git a/example/build.gradle b/example/build.gradle
index d79dd899..fe05a8f0 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"

From 27539474bb27007dd950e5b240cf48315ca3ebc5 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 21:58:10 +0100
Subject: [PATCH 191/305] Travis Build fix

---
 build.gradle         | 2 +-
 example/build.gradle | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9b9e75df..439861fd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ def isReleaseBuild() {
 }
 test{
     testLogging{
-        events "passed", "skipped", "standardOut"
+        exceptionFormat = 'full'
     }
 }
 allprojects {
diff --git a/example/build.gradle b/example/build.gradle
index fe05a8f0..084b9d2d 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -18,6 +18,9 @@ android {
     testOptions{
         unitTests.returnDefaultValues = true
     }
+    lintOptions{
+        abortOnError false
+    }
 }
 
 dependencies {

From f64b71b921e607444f40f5c4178a162a728fe36b Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 22:14:30 +0100
Subject: [PATCH 192/305] Travis Build fix

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8c73cf42..c9280d04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ android:
     - extra-google-m2repository
 
 script:
-  - gradle clean build connectedCheck coveralls
+  - gradle clean build connectedCheck coveralls --info
 
 cache:
   directories:

From 32613715b540dfe4cb867b8957f740d745367a00 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 22:24:48 +0100
Subject: [PATCH 193/305] Travis Build fix

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c9280d04..c3730259 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,9 @@ android:
     - build-tools-23.0.2
     - android-23
     - extra-android-m2repository
-    - extra-google-m2repository
 
 script:
-  - gradle clean build connectedCheck coveralls --info
+  - gradle clean build connectedCheck coveralls --stacktrace
 
 cache:
   directories:

From 75db4fb024be114a57a437c9635a154321d6364d Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 22:32:41 +0100
Subject: [PATCH 194/305] Travis Build fix

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c3730259..8d4c6efb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ android:
     - extra-android-m2repository
 
 script:
-  - gradle clean build connectedCheck coveralls --stacktrace
+  - gradle clean build connectedCheck coveralls --stacktrace --debug
 
 cache:
   directories:

From f476390107ee538200132f8119ad43135693dbae Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 22:40:01 +0100
Subject: [PATCH 195/305] Travis Build fix

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8d4c6efb..d401372e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ android:
     - tools
     - build-tools-23.0.2
     - android-23
-    - extra-android-m2repository
 
 script:
   - gradle clean build connectedCheck coveralls --stacktrace --debug

From e7983f546244579ed1270300620f4b56fba3b36a Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 22:45:59 +0100
Subject: [PATCH 196/305] Travis Build fix

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d401372e..892a3f13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ android:
     - android-23
 
 script:
-  - gradle clean build connectedCheck coveralls --stacktrace --debug
+  - gradle clean build connectedCheck coveralls --stacktrace --info
 
 cache:
   directories:

From 1c9ca0d09091c2b8aeb8944bdd8f4f5617d8872e Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 22:50:06 +0100
Subject: [PATCH 197/305] Travis Build fix

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 892a3f13..21a24c49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,19 @@
 language: android
 jdk: oracle
 
+env:
+  global:
+    - TERM=dumb
 android:
   components:
     - sys-img-armeabi-v7a-android-23
     - tools
     - build-tools-23.0.2
     - android-23
+    - extra-android-m2repository
 
 script:
-  - gradle clean build connectedCheck coveralls --stacktrace --info
+  - gradle clean build connectedCheck coveralls --debug
 
 cache:
   directories:

From 5761057f16507841414253dccea57b6d03148388 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 23:15:13 +0100
Subject: [PATCH 198/305] Travis Build fix

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 21a24c49..c7e8af28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ android:
     - extra-android-m2repository
 
 script:
-  - gradle clean build connectedCheck coveralls --debug
+  - ./gradlew clean build connectedCheck coveralls --debug
 
 cache:
   directories:

From d007a2f3fef9c50e7241954f1e1a2e44d9b438f3 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 23:25:10 +0100
Subject: [PATCH 199/305] Travis Build fix

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c7e8af28..08c2ee82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ android:
     - extra-android-m2repository
 
 script:
-  - ./gradlew clean build connectedCheck coveralls --debug
+  - ./gradlew clean build connectedCheck coveralls
 
 cache:
   directories:

From fdae8e7839d5dd524f3c7fb3a83f279ce20c0092 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 23:35:27 +0100
Subject: [PATCH 200/305] Travis Build fix

---
 .travis.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08c2ee82..80ca1ced 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: android
-jdk: oracle
+jdk: oraclejdk7
 
 env:
   global:
@@ -11,9 +11,20 @@ android:
     - build-tools-23.0.2
     - android-23
     - extra-android-m2repository
-
+before_script:
+  - sudo service postgresql stop || true
+  - sudo service mysql stop || true
+  - sudo service memcached stop || true
+  - sudo service bootlogd stop || true
+  - sudo service elasticsearch stop || true
+  - sudo service mongodb stop || true
+  - sudo service neo4j stop || true
+  - sudo service cassandra stop || true
+  - sudo service riak stop || true
+  - sudo service rsync stop || true
+  - sudo service x11-common stop || true
 script:
-  - ./gradlew clean build connectedCheck coveralls
+  - gradle clean build connectedCheck coveralls
 
 cache:
   directories:

From b087e0cb0721aacd29130152f0936bff236ef062 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Thu, 3 Dec 2015 23:42:17 +0100
Subject: [PATCH 201/305] Travis Build fix

---
 library/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/build.gradle b/library/build.gradle
index 3652b458..ac7ffb66 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -19,6 +19,10 @@ android {
     testOptions{
         unitTests.returnDefaultValues = true
     }
+
+    lintOptions{
+        abortOnError false
+    }
 }
 
 dependencies {

From 9489846e25cdc37034052f22a10dc2fbe6bc1c9c Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Fri, 4 Dec 2015 19:19:51 +0100
Subject: [PATCH 202/305] JacocoReportTest

---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 439861fd..952f49e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,7 @@ subprojects { proj ->
             excludes: ['**/R*.class',
                        '**/BuildConfig*'])
         sourceDirectories = files('src/main/java')
-        executionData = files('build/jacoco/testDebug.exec')
+        executionData = files('build/jacoco/testDebugUnitTest.exec')
         doFirst {
             files('build/intermediates/classes/debug').getFiles().each { file ->
                 if (file.name.contains('$$')) {
@@ -96,5 +96,4 @@ tasks.coveralls {
 
     dependsOn jacocoRootReport
     onlyIf { System.env.'CI' }
-}
-apply plugin: 'java'
\ No newline at end of file
+}
\ No newline at end of file

From 4d2df142993c7822421bba81a334e9e31010c428 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Sat, 5 Dec 2015 00:16:13 +0100
Subject: [PATCH 203/305] Multiline and single line comments on sql migration
 files.

---
 .../main/java/com/orm/SchemaGenerator.java    | 10 +++-
 .../src/main/java/com/orm/SugarContext.java   |  2 -
 .../com/orm/util/MigrationFileParser.java     | 21 ++++++++
 .../com/orm/util/MigrationFileParserTest.java | 48 +++++++++++++++++++
 4 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 library/src/main/java/com/orm/util/MigrationFileParser.java
 create mode 100644 library/src/test/java/com/orm/util/MigrationFileParserTest.java

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 449126db..87643cbf 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -10,6 +10,7 @@
 import com.orm.dsl.MultiUnique;
 import com.orm.dsl.NotNull;
 import com.orm.dsl.Unique;
+import com.orm.util.MigrationFileParser;
 import com.orm.util.NamingHelper;
 import com.orm.util.NumberComparator;
 import com.orm.util.QueryBuilder;
@@ -98,11 +99,16 @@ private void executeScript(SQLiteDatabase db, String file) {
         try {
             InputStream is = this.context.getAssets().open("sugar_upgrades/" + file);
             BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+            StringBuilder sb = new StringBuilder();
             String line;
             while ((line = reader.readLine()) != null) {
-                Log.i("Sugar script", line);
-                db.execSQL(line);
+                sb.append(line);
             }
+            MigrationFileParser migrationFileParser = new MigrationFileParser(sb.toString());
+            for(String statement: migrationFileParser.getStatements()){
+                db.execSQL(statement);
+            }
+
         } catch (IOException e) {
             Log.e(SUGAR, e.getMessage());
         }
diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 6190b1aa..2f653f5e 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -10,11 +10,9 @@ public class SugarContext {
 
     private static SugarContext instance = null;
     private SugarDb sugarDb;
-    private Context context;
     private Map<Object, Long> entitiesMap;
 
     private SugarContext(Context context) {
-        this.context = context;
         this.sugarDb = new SugarDb(context);
         this.entitiesMap = Collections.synchronizedMap(new WeakHashMap<Object, Long>());
     }
diff --git a/library/src/main/java/com/orm/util/MigrationFileParser.java b/library/src/main/java/com/orm/util/MigrationFileParser.java
new file mode 100644
index 00000000..1691a1eb
--- /dev/null
+++ b/library/src/main/java/com/orm/util/MigrationFileParser.java
@@ -0,0 +1,21 @@
+package com.orm.util;
+
+/**
+ * Created by Nursultan Turdaliev on 12/4/15.
+ */
+public class MigrationFileParser {
+
+    private String content;
+
+    /**
+     * @param content
+     */
+    public MigrationFileParser(String content){
+        this.content = content.replaceAll("(\\/\\*([\\s\\S]*?)\\*\\/)|(--(.)*)|(\n)","");
+    }
+
+    public String[] getStatements(){
+        return this.content.split(";");
+    }
+
+}
diff --git a/library/src/test/java/com/orm/util/MigrationFileParserTest.java b/library/src/test/java/com/orm/util/MigrationFileParserTest.java
new file mode 100644
index 00000000..536af4cb
--- /dev/null
+++ b/library/src/test/java/com/orm/util/MigrationFileParserTest.java
@@ -0,0 +1,48 @@
+package com.orm.util;
+
+import com.orm.util.MigrationFileParser;
+
+import org.junit.Test;
+import org.junit.Before;
+
+import java.lang.String;
+
+import static junit.framework.Assert.assertEquals;
+
+public class MigrationFileParserTest{
+    MigrationFileParser emptyFile;
+
+    @Test
+    public void testSingleLineStatement()
+    {
+        MigrationFileParser singleLineComment = new MigrationFileParser("insert into table--comment");
+
+        String statements[] = singleLineComment.getStatements();
+        assertEquals("Testing single line statement size",1,statements.length);
+        assertEquals("Testing single line statement content","insert into table",statements[0]);
+
+        singleLineComment = new MigrationFileParser("insert into table--comment\n");
+
+        singleLineComment.getStatements();
+        assertEquals("Testing single line statement size",1,statements.length);
+        assertEquals("Testing single line statement content","insert into table",statements[0]);
+    }
+    @Test
+    public void testMultiLineComment(){
+        MigrationFileParser multiLineComment = new MigrationFileParser("insert into table /**comment \n new line 2 \n new line 3 */hello");
+
+        String statements[] = multiLineComment.getStatements();
+        assertEquals("Testing multiline statement size",1,statements.length);
+        assertEquals("Testing multiline comment","insert into table hello",statements[0]);
+    }
+
+    @Test
+    public void testMixedComment(){
+        MigrationFileParser mixedComment = new MigrationFileParser("insert into/*multiline\n **comment*/--comment");
+
+        String statements[] = mixedComment.getStatements();
+
+        assertEquals("Testing mixed comment statement size",1,statements.length);
+        assertEquals("Testing mixed comment statments", "insert into", statements[0]);
+    }
+}

From 79bd0406df589356bd265013f3305aafd8a5fa58 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Sat, 5 Dec 2015 00:32:34 +0100
Subject: [PATCH 204/305] Logging

---
 library/src/main/java/com/orm/SchemaGenerator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 87643cbf..f95e6ef1 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -106,6 +106,7 @@ private void executeScript(SQLiteDatabase db, String file) {
             }
             MigrationFileParser migrationFileParser = new MigrationFileParser(sb.toString());
             for(String statement: migrationFileParser.getStatements()){
+                Log.i("Sugar script", statement);
                 db.execSQL(statement);
             }
 

From d06aafce60db2989f136be674e620533730e3468 Mon Sep 17 00:00:00 2001
From: Nursultan Turdaliev <nursultan2010@gmail.com>
Date: Sat, 5 Dec 2015 22:18:40 +0100
Subject: [PATCH 205/305] Removed unused imports and redundant variable value
 assignments.

---
 .../src/main/java/com/example/activities/SugarActivity.java  | 1 -
 library/src/main/java/com/orm/SchemaGenerator.java           | 1 -
 library/src/main/java/com/orm/SugarRecord.java               | 1 -
 library/src/main/java/com/orm/util/MultiDexHelper.java       | 2 +-
 library/src/main/java/com/orm/util/NamingHelper.java         | 5 -----
 library/src/main/java/com/orm/util/NumberComparator.java     | 4 ++--
 library/src/main/java/com/orm/util/ReflectionUtil.java       | 5 +----
 library/src/main/java/com/orm/util/SugarConfig.java          | 5 -----
 8 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/example/src/main/java/com/example/activities/SugarActivity.java b/example/src/main/java/com/example/activities/SugarActivity.java
index 197314a0..81044546 100644
--- a/example/src/main/java/com/example/activities/SugarActivity.java
+++ b/example/src/main/java/com/example/activities/SugarActivity.java
@@ -1,7 +1,6 @@
 package com.example.activities;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 
 import com.example.R;
diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index f95e6ef1..b35e061a 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 36979284..4b9e04ef 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -308,7 +308,6 @@ static long update(SQLiteDatabase db, Object object) {
         Map<Object, Long> entitiesMap = getSugarContext().getEntitiesMap();
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
         ContentValues values = new ContentValues(columns.size());
-        Field idField = null;
 
         StringBuilder whereClause = new StringBuilder();
         List<String> whereArgs = new ArrayList<>();
diff --git a/library/src/main/java/com/orm/util/MultiDexHelper.java b/library/src/main/java/com/orm/util/MultiDexHelper.java
index 37b57894..970cd3b7 100644
--- a/library/src/main/java/com/orm/util/MultiDexHelper.java
+++ b/library/src/main/java/com/orm/util/MultiDexHelper.java
@@ -85,7 +85,7 @@ public static List<String> getAllClasses(Context context) throws PackageManager.
         List<String> classNames = new ArrayList<String>();
         for (String path : getSourcePaths(context)) {
             try {
-                DexFile dexfile = null;
+                DexFile dexfile;
                 if (path.endsWith(EXTRACTED_SUFFIX)) {
                     //NOT use new DexFile(path), because it will throw "permission error in /data/dalvik-cache"
                     dexfile = DexFile.loadDex(path, path + ".tmp", 0);
diff --git a/library/src/main/java/com/orm/util/NamingHelper.java b/library/src/main/java/com/orm/util/NamingHelper.java
index 734b4a56..b7237c09 100644
--- a/library/src/main/java/com/orm/util/NamingHelper.java
+++ b/library/src/main/java/com/orm/util/NamingHelper.java
@@ -1,14 +1,9 @@
 package com.orm.util;
 
-import android.text.TextUtils;
-
 import com.orm.dsl.Column;
 import com.orm.dsl.Table;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
 
 public class NamingHelper {
 
diff --git a/library/src/main/java/com/orm/util/NumberComparator.java b/library/src/main/java/com/orm/util/NumberComparator.java
index b39ca9c9..08a9f0b4 100644
--- a/library/src/main/java/com/orm/util/NumberComparator.java
+++ b/library/src/main/java/com/orm/util/NumberComparator.java
@@ -49,8 +49,8 @@ public int compare(Object o1, Object o2) {
 
         int ia = 0;
         int ib = 0;
-        int nza = 0;
-        int nzb = 0;
+        int nza;
+        int nzb;
         while (true) {
             nza = nzb = 0;
 
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index a5d9a58f..67a5d8d3 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -17,7 +17,6 @@
 import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.Ref;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -27,8 +26,6 @@
 import java.util.List;
 import java.util.Map;
 
-import dalvik.system.DexFile;
-
 public class ReflectionUtil {
 
     public static List<Field> getTableFields(Class table) {
@@ -70,7 +67,7 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
             Object columnValue = column.get(object);
 
             if (columnType.isAnnotationPresent(Table.class)) {
-                Field field = null;
+                Field field;
                 try {
                     field = columnType.getDeclaredField("id");
                     field.setAccessible(true);
diff --git a/library/src/main/java/com/orm/util/SugarConfig.java b/library/src/main/java/com/orm/util/SugarConfig.java
index b93da25e..c8cf3868 100644
--- a/library/src/main/java/com/orm/util/SugarConfig.java
+++ b/library/src/main/java/com/orm/util/SugarConfig.java
@@ -1,10 +1,5 @@
 package com.orm.util;
 
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.util.Log;
-
 import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.HashMap;

From 297a8381e8a7c4bef9a1875ea6c1a2d6786053b7 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Fri, 11 Dec 2015 15:09:25 -0200
Subject: [PATCH 206/305] removing static from callback interface

---
 library/src/main/java/com/orm/SugarTransactionHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SugarTransactionHelper.java b/library/src/main/java/com/orm/SugarTransactionHelper.java
index 73440635..7c00812c 100644
--- a/library/src/main/java/com/orm/SugarTransactionHelper.java
+++ b/library/src/main/java/com/orm/SugarTransactionHelper.java
@@ -24,7 +24,7 @@ public static void doInTransaction(SugarTransactionHelper.Callback callback) {
         }
     }
 
-    public static interface Callback {
+    public interface Callback {
         void manipulateInTransaction();
     }
 }

From def9904938893b65a3a96cea9c8c22bbbf337eae Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Fri, 11 Dec 2015 16:21:19 -0200
Subject: [PATCH 207/305] removing unique for auto generated add columns
 migrations

---
 CHANGELOG.md                                  |  3 +
 .../main/java/com/orm/SchemaGenerator.java    | 64 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f216161f..5c3f700b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Added
+* [#328](https://github.com/satyan/sugar/pull/328) @jedid auto add new columns during database upgrade, fix [#299](https://github.com/satyan/sugar/issues/299) and [#151](https://github.com/satyan/sugar/issues/151)
 * [#389](https://github.com/satyan/sugar/pull/389) @alfmatos MultiUnique DSL to handle MultiColumn Unique Table constraint
 * @sibeliusseraphini update, updateInTx methods based on Unique values of SugarRecord
 * [#155](https://github.com/satyan/sugar/issues/155) @benohalloran adding Cursors for Cursor Adapters [Pull 312](https://github.com/satyan/sugar/pull/312)
@@ -12,6 +13,8 @@
 * [#423](https://github.com/satyan/sugar/pull/423) @sibeliusseraphini moving changelog of README.md to CHANGELOG.md
 
 ### Fixed
+* [#362](https://github.com/satyan/sugar/pull/362) @mitchyboy9 fixed NoClassDefFoundError
+* [#455](https://github.com/satyan/sugar/pull/455) @nurolopher fixed travis and coveralls config 
 * [#434](https://github.com/satyan/sugar/pull/434) @bendaniel10 fix multi-dex
 * [#410](https://github.com/satyan/sugar/pull/410) [#408](https://github.com/satyan/sugar/pull/408) @RoyMontoya simplify code
 * [#327](https://github.com/satyan/sugar/pull/327) @tracytheron support multi-dex
diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index b35e061a..9e6601c9 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -21,6 +21,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -50,15 +51,32 @@ public void createDatabase(SQLiteDatabase sqLiteDatabase) {
     public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
         List<Class> domainClasses = getDomainClasses(context);
         String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
+
         for (Class domain : domainClasses) {
-            Cursor cursor = sqLiteDatabase.rawQuery(String.format(sql, NamingHelper.toSQLName(domain)), null);
-            if (cursor.moveToFirst() && cursor.getInt(0) == 0) {
-            	createTable(domain, sqLiteDatabase);
+            String tableName = NamingHelper.toSQLName(domain);
+            Cursor c = sqLiteDatabase.rawQuery(String.format(sql, tableName), null);
+            if (c.moveToFirst() && c.getInt(0) == 0) {
+                createTable(domain, sqLiteDatabase);
+            } else {
+                addColumns(domain, sqLiteDatabase);
             }
         }
         executeSugarUpgrade(sqLiteDatabase, oldVersion, newVersion);
     }
 
+    private ArrayList<String> getColumnNames(SQLiteDatabase sqLiteDatabase, String tableName) {
+        Cursor resultsQuery = sqLiteDatabase.query(tableName, null, null, null, null, null, null);
+        //Check if columns match vs the one on the domain class
+        ArrayList<String> columnNames = new ArrayList<>();
+        for (int i = 0; i < resultsQuery.getColumnCount(); i++) {
+            String columnName = resultsQuery.getColumnName(i);
+            columnNames.add(columnName);
+        }
+        resultsQuery.close();
+        return columnNames;
+    }
+
+
     public void deleteTables(SQLiteDatabase sqLiteDatabase) {
         List<Class> tables = getDomainClasses(context);
         for (Class table : tables) {
@@ -116,6 +134,46 @@ private void executeScript(SQLiteDatabase db, String file) {
         Log.i(SUGAR, "Script executed");
     }
 
+    private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
+
+        List<Field> fields = ReflectionUtil.getTableFields(table);
+        String tableName = NamingHelper.toSQLName(table);
+        ArrayList<String> presentColumns = getColumnNames(sqLiteDatabase, tableName);
+        ArrayList<String> alterCommands = new ArrayList<>();
+
+        for (Field column : fields) {
+            String columnName = NamingHelper.toSQLName(column);
+            String columnType = QueryBuilder.getColumnType(column.getType());
+
+            if (column.isAnnotationPresent(Column.class)) {
+                Column columnAnnotation = column.getAnnotation(Column.class);
+                columnName = columnAnnotation.name();
+            }
+
+            if (!presentColumns.contains(columnName)) {
+                StringBuilder sb = new StringBuilder("ALTER TABLE ");
+                sb.append(tableName).append(" ADD COLUMN ").append(columnName).append(" ").append(columnType);
+                if (column.isAnnotationPresent(NotNull.class)) {
+                    if (columnType.endsWith(" NULL")) {
+                        sb.delete(sb.length() - 5, sb.length());
+                    }
+                    sb.append(" NOT NULL");
+                }
+
+                // Unique is not working on ALTER TABLE
+//                if (column.isAnnotationPresent(Unique.class)) {
+//                    sb.append(" UNIQUE");
+//                }
+                alterCommands.add(sb.toString());
+            }
+        }
+
+        for (String command : alterCommands) {
+            Log.i("Sugar", command);
+            sqLiteDatabase.execSQL(command);
+        }
+    }
+
     protected String createTableSQL(Class<?> table) {
         Log.i(SUGAR, "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);

From 8156895bce9b56364b28baa34d2c1689779423d1 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 14 Dec 2015 11:22:49 -0200
Subject: [PATCH 208/305] fix satyan/sugar#467

Sometimes Throwable doesn't have a message,
so e.getMessage is NULL and generate a NullPointerException
---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 9b27abdd..dd249817 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -273,7 +273,8 @@ private static Class getDomainClass(String className, Context context) {
         try {
             discoveredClass = Class.forName(className, true, context.getClass().getClassLoader());
         } catch (Throwable e) {
-            Log.e("Sugar", e.getMessage());
+            String error = (e.getMessage() == null) ? "getDomainClass " + className + " error" : e.getMessage();
+            Log.e("Sugar", error);
         }
 
         if ((discoveredClass != null) &&

From fff7ae0fb7e130926b0550657afb8ad9894bf80f Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 14 Dec 2015 11:25:42 -0200
Subject: [PATCH 209/305] fix executeScript on SchemaGenerator

When a migration script is empty, it will try to execute an empty SQL statement
that will generate a RuntimeException
Now, it only executes SQL statements that is not empty
---
 .../src/main/java/com/orm/SchemaGenerator.java |  4 +++-
 library/src/main/java/com/orm/SugarDb.java     | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 9e6601c9..f5fd4f2a 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -124,7 +124,9 @@ private void executeScript(SQLiteDatabase db, String file) {
             MigrationFileParser migrationFileParser = new MigrationFileParser(sb.toString());
             for(String statement: migrationFileParser.getStatements()){
                 Log.i("Sugar script", statement);
-                db.execSQL(statement);
+                if (!statement.isEmpty()) {
+                    db.execSQL(statement);
+                }
             }
 
         } catch (IOException e) {
diff --git a/library/src/main/java/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
index a15110a3..56528f96 100644
--- a/library/src/main/java/com/orm/SugarDb.java
+++ b/library/src/main/java/com/orm/SugarDb.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
 
 import com.orm.util.ManifestHelper;
 import com.orm.util.SugarCursorFactory;
@@ -14,6 +15,7 @@ public class SugarDb extends SQLiteOpenHelper {
 
     private final SchemaGenerator schemaGenerator;
     private SQLiteDatabase sqLiteDatabase;
+    private int openedConnections = 0;
 
     public SugarDb(Context context) {
         super(context, ManifestHelper.getDatabaseName(context),
@@ -39,4 +41,20 @@ public synchronized SQLiteDatabase getDB() {
         return this.sqLiteDatabase;
     }
 
+    @Override
+    public synchronized SQLiteDatabase getReadableDatabase() {
+        Log.d("SUGAR", "getReadableDatabase");
+        openedConnections++;
+        return super.getReadableDatabase();
+    }
+
+    @Override
+    public synchronized void close() {
+        Log.d("SUGAR", "getReadableDatabase");
+        openedConnections--;
+        if(openedConnections == 0) {
+            Log.d("SUGAR", "closing");
+            super.close();
+        }
+    }
 }

From 9f371b378975367a0e59b6c92a00a2de6fc44dbe Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 14 Dec 2015 12:45:16 -0200
Subject: [PATCH 210/305] update README, documentation is updated

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 62d5e8e0..aa4b2a99 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Insanely easy way to work with Android databases.
 
-Official documentation can be found [here](http://satyan.github.io/sugar) **Outdated** - Check some examples below. The example application is provided in the **example** folder in the source.
+Official documentation can be found [here](http://satyan.github.io/sugar) - Check some examples below. The example application is provided in the **example** folder in the source.
 
 ## Features
 

From 7b210e1a98c242dc6c65ce415faca004c02bb5d9 Mon Sep 17 00:00:00 2001
From: Filip Lindqvist <buggfille@gmail.com>
Date: Fri, 1 Jan 2016 21:04:30 +0100
Subject: [PATCH 211/305] Added retrolambda in classloader class lookup in
 ReflectionUtil.java

---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index dd249817..1458a308 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -306,7 +306,8 @@ private static List<String> getAllClasses(Context context) throws PackageManager
             while (urls.hasMoreElements()) {
                 List<String> fileNames = new ArrayList<String>();
                 String classDirectoryName = urls.nextElement().getFile();
-                if (classDirectoryName.contains("bin") || classDirectoryName.contains("classes")) {
+                if (classDirectoryName.contains("bin") || classDirectoryName.contains("classes")
+                        || classDirectoryName.contains("retrolambda")) {
                     File classDirectory = new File(classDirectoryName);
                     for (File filePath : classDirectory.listFiles()) {
                         populateFiles(filePath, fileNames, "");

From 416df047dc8af185fc0b859a77e3ee506be7b0a0 Mon Sep 17 00:00:00 2001
From: Douglas Alves <dalves@quintoandar.com.br>
Date: Thu, 7 Jan 2016 11:03:44 -0200
Subject: [PATCH 212/305] Fixing migration to single dex after multidex.

---
 library/src/main/java/com/orm/util/MultiDexHelper.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/library/src/main/java/com/orm/util/MultiDexHelper.java b/library/src/main/java/com/orm/util/MultiDexHelper.java
index 970cd3b7..87f7fb3a 100644
--- a/library/src/main/java/com/orm/util/MultiDexHelper.java
+++ b/library/src/main/java/com/orm/util/MultiDexHelper.java
@@ -64,9 +64,6 @@ public static List<String> getSourcePaths(Context context) throws PackageManager
             if (extractedFile.isFile()) {
                 sourcePaths.add(extractedFile.getAbsolutePath());
                 //we ignore the verify zip part
-            } else {
-                throw new IOException("Missing extracted secondary dex file '" +
-                        extractedFile.getPath() + "'");
             }
         }
 

From 5690f92320980674389cac4669fec553f321dec5 Mon Sep 17 00:00:00 2001
From: Tevin Jeffrey <mastermindtj94@gmail.com>
Date: Tue, 12 Jan 2016 11:06:43 -0500
Subject: [PATCH 213/305] Added the @Target annotation for compile-time error
 checking.

- The compiler will generate an error when used on the improper element
type.
---
 library/src/main/java/com/orm/dsl/Column.java      | 3 +++
 library/src/main/java/com/orm/dsl/Ignore.java      | 3 +++
 library/src/main/java/com/orm/dsl/MultiUnique.java | 3 +++
 library/src/main/java/com/orm/dsl/NotNull.java     | 3 +++
 library/src/main/java/com/orm/dsl/Table.java       | 3 +++
 library/src/main/java/com/orm/dsl/Unique.java      | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/library/src/main/java/com/orm/dsl/Column.java b/library/src/main/java/com/orm/dsl/Column.java
index 2c47e3c0..58e66529 100644
--- a/library/src/main/java/com/orm/dsl/Column.java
+++ b/library/src/main/java/com/orm/dsl/Column.java
@@ -1,9 +1,12 @@
 package com.orm.dsl;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
 public @interface Column {
     String name();
     boolean unique() default false;
diff --git a/library/src/main/java/com/orm/dsl/Ignore.java b/library/src/main/java/com/orm/dsl/Ignore.java
index 9678d33a..e4d748f1 100644
--- a/library/src/main/java/com/orm/dsl/Ignore.java
+++ b/library/src/main/java/com/orm/dsl/Ignore.java
@@ -1,8 +1,11 @@
 package com.orm.dsl;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
 public @interface Ignore {
 }
diff --git a/library/src/main/java/com/orm/dsl/MultiUnique.java b/library/src/main/java/com/orm/dsl/MultiUnique.java
index 55f754a5..86c6e323 100644
--- a/library/src/main/java/com/orm/dsl/MultiUnique.java
+++ b/library/src/main/java/com/orm/dsl/MultiUnique.java
@@ -1,9 +1,12 @@
 package com.orm.dsl;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
 public @interface MultiUnique {
     String value();
 }
diff --git a/library/src/main/java/com/orm/dsl/NotNull.java b/library/src/main/java/com/orm/dsl/NotNull.java
index b2361851..f71ebf54 100644
--- a/library/src/main/java/com/orm/dsl/NotNull.java
+++ b/library/src/main/java/com/orm/dsl/NotNull.java
@@ -1,8 +1,11 @@
 package com.orm.dsl;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
 public @interface NotNull {
 }
diff --git a/library/src/main/java/com/orm/dsl/Table.java b/library/src/main/java/com/orm/dsl/Table.java
index 0dfaa18b..9c64fa74 100644
--- a/library/src/main/java/com/orm/dsl/Table.java
+++ b/library/src/main/java/com/orm/dsl/Table.java
@@ -1,9 +1,12 @@
 package com.orm.dsl;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
 public @interface Table {
     String name() default "";
 }
diff --git a/library/src/main/java/com/orm/dsl/Unique.java b/library/src/main/java/com/orm/dsl/Unique.java
index 7384b749..c05960ed 100644
--- a/library/src/main/java/com/orm/dsl/Unique.java
+++ b/library/src/main/java/com/orm/dsl/Unique.java
@@ -1,8 +1,11 @@
 package com.orm.dsl;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
 public @interface Unique {
 }

From 5924594552d286dc550446c1c0fade4a63b85232 Mon Sep 17 00:00:00 2001
From: hellerve <veit.heller@student.htw-berlin.de>
Date: Thu, 21 Jan 2016 17:14:44 +0100
Subject: [PATCH 214/305] added syntax highlighting in readme

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index aa4b2a99..9d7082cc 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ git clone git@github.com:satyan/sugar.git
 ```
 
 include this in your **settings.gradle**
-```
+```gradle
 include ':app' // your module app
 include ':sugar'
 
@@ -76,7 +76,7 @@ sugar.dir=/path/to/sugar/library
 ```
 
 add sugar project to the dependencies of your main project (build.gradle)
-```
+```gradle
 dependencies {
     compile project(':sugar')
 }
@@ -88,7 +88,7 @@ After installing, check out how to set up your first database and models [here](
 
 ## Examples
 ### SugarRecord
-```
+```java
 public class Book extends SugarRecord {
   @Unique
   String isbn;
@@ -108,24 +108,24 @@ public class Book extends SugarRecord {
 }
 ```
 or
-```
+```java
 @Table
 public class Book { ... }
 ```
 
 ### Save Entity
-```
+```java
 Book book = new Book("isbn123", "Title here", "2nd edition")
 book.save();
 ```
 
 ### Load Entity
-```
+```java
 Book book = Book.findById(Book.class, 1);
 ```
 
 ### Update Entity
-```
+```java
 Book book = Book.findById(Book.class, 1);
 book.title = "updated title here"; // modify the values
 book.edition = "3rd edition";
@@ -133,13 +133,13 @@ book.save(); // updates the previous entry with new values.
 ```
 
 ### Delete Entity
-```
+```java
 Book book = Book.findById(Book.class, 1);
 book.delete();
 ```
 
 ### Update Entity based on Unique values
-```
+```java
 Book book = new Book("isbn123", "Title here", "2nd edition")
 book.save();
 
@@ -151,7 +151,7 @@ book.getId() == sameBook.getId(); // true
 ```
 
 ### Bulk Insert
-```
+```java
 List<Book> books = new ArrayList<>();
 books.add(new Book("isbn123", "Title here", "2nd edition"))
 books.add(new Book("isbn456", "Title here 2", "3nd edition"))

From fafe384bcf4cb47236fd561ba3a810e3c32a7327 Mon Sep 17 00:00:00 2001
From: enyciaa <ian.andrew.alexander@gmail.com>
Date: Fri, 12 Feb 2016 14:53:15 +0000
Subject: [PATCH 215/305] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 9d7082cc..d6e56242 100644
--- a/README.md
+++ b/README.md
@@ -159,6 +159,12 @@ books.add(new Book("isbn789", "Title here 3", "4nd edition"))
 SugarRecord.saveInTx(books);
 ```
 
+### When using ProGuard
+```java
+# Ensures entities remain un-obfuscated so table and columns are named correctly
+-keep class com.yourpackage.yourapp.domainclasspackage.** { *; }
+```
+
 ## [CHANGELOG](https://github.com/satyan/sugar/blob/master/CHANGELOG.md)
 
 ## Contributing

From 473820ea5558c283062ef11038bbb59f20b2c031 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 7 Mar 2016 16:33:31 -0300
Subject: [PATCH 216/305] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c3f700b..7015053d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Sugar Releases
 
 ## [Unreleased]
+
+
+## v1.5
 ### Added
 * [#328](https://github.com/satyan/sugar/pull/328) @jedid auto add new columns during database upgrade, fix [#299](https://github.com/satyan/sugar/issues/299) and [#151](https://github.com/satyan/sugar/issues/151)
 * [#389](https://github.com/satyan/sugar/pull/389) @alfmatos MultiUnique DSL to handle MultiColumn Unique Table constraint

From 1ca7267e17887b60f9e8218dfaa2609eaf6f4d1e Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 7 Mar 2016 16:35:34 -0300
Subject: [PATCH 217/305] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d6e56242..f9ae8521 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ There are four ways to install Sugar:
 This is the preferred way. Simply add:
 
 ```groovy
-compile 'com.github.satyan:sugar:1.4'
+compile 'com.github.satyan:sugar:1.5'
 ```
 
 to your project dependencies and run `gradle build` or `gradle assemble`.
@@ -36,7 +36,7 @@ Declare the dependency in Maven:
 <dependency>
     <groupId>com.github.satyan</groupId>
     <artifactId>sugar</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
 </dependency>
 ```
 

From 784b3da6b7bc7f2a8692780e58c9166f2ac0c865 Mon Sep 17 00:00:00 2001
From: Reginald Tan <redge.tan@gmail.com>
Date: Fri, 18 Mar 2016 19:31:36 -0400
Subject: [PATCH 218/305] add save/update/delete usage for @Table annotations

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index f9ae8521..867fc7f8 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,11 @@ Book book = new Book("isbn123", "Title here", "2nd edition")
 book.save();
 ```
 
+or
+```java
+SugarRecord.save(book); // if using the @Table annotation 
+```
+
 ### Load Entity
 ```java
 Book book = Book.findById(Book.class, 1);
@@ -132,12 +137,18 @@ book.edition = "3rd edition";
 book.save(); // updates the previous entry with new values.
 ```
 
+
 ### Delete Entity
 ```java
 Book book = Book.findById(Book.class, 1);
 book.delete();
 ```
 
+or
+```java
+SugarRecord.delete(book); // if using the @Table annotation 
+```
+
 ### Update Entity based on Unique values
 ```java
 Book book = new Book("isbn123", "Title here", "2nd edition")
@@ -150,6 +161,11 @@ sameBook.update();
 book.getId() == sameBook.getId(); // true
 ```
 
+or
+```java
+SugarRecord.update(sameBook); // if using the @Table annotation 
+```
+
 ### Bulk Insert
 ```java
 List<Book> books = new ArrayList<>();

From fc285aca1e9bac4d7bc137daaa9bbd5ef5d5f6e6 Mon Sep 17 00:00:00 2001
From: frankweb <fhernandez@nearsoft.com>
Date: Wed, 23 Mar 2016 19:28:50 -0700
Subject: [PATCH 219/305] change the type of the args list to String

---
 library/src/main/java/com/orm/query/Select.java | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 69d9fc80..6b2b962c 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -6,6 +6,7 @@
 import com.orm.util.NamingHelper;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -18,7 +19,7 @@ public class Select<T> implements Iterable {
     private String groupBy = "";
     private String limit = "";
     private String offset = "";
-    private List<Object> args = new ArrayList<Object>();
+    private List<String> args = new ArrayList<String>();
     private static final String SPACE =" ";
     private static final String SINGLE_QUOTE ="'";
     private static final String LEFT_PARENTHESIS="(";
@@ -95,7 +96,7 @@ private void mergeConditions(Condition[] conditions, Condition.Type type) {
                     .append(condition.getProperty())
                     .append(condition.getCheckSymbol())
                     .append("? ");
-                args.add(condition.getValue());
+                args.add(condition.getValue().toString());
             }
         }
         
@@ -190,14 +191,8 @@ String[] getArgs() {
         return convertArgs(args);
     }
 
-    private String[] convertArgs(List<Object> argsList) {
-        String[] argsArray = new String[argsList.size()];
-
-        for (int i = 0; i < argsList.size(); i++) {
-             argsArray[i] = argsList.get(i).toString();
-        }
-
-        return argsArray;
+    private String[] convertArgs(List<String> argsList) {
+        return argsList.toArray(new String[argsList.size()]);
     }
 
     @Override

From 619b5dbcfc3dfdf91bfdb140636477d137cd4bf1 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 28 Mar 2016 18:11:23 -0300
Subject: [PATCH 220/305] adding codetriage to sugar

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 867fc7f8..fa8a2c14 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg?branch=master)](https://coveralls.io/r/satyan/sugar?branch=master)
+# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg?branch=master)](https://coveralls.io/r/satyan/sugar?branch=master) [![Code Triagers Badge](http://www.codetriage.com/satyan/sugar/badges/users.svg)](http://www.codetriage.com/satyan/sugar)
 
 [![Join the chat at https://gitter.im/satyan/sugar](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/satyan/sugar?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

From 941bd36666ae677ee1dbb5c5a39b407d83f12197 Mon Sep 17 00:00:00 2001
From: DALYKA <geranio36@hotmail.com>
Date: Tue, 29 Mar 2016 08:35:52 -0700
Subject: [PATCH 221/305] find works with true/false

---
 .../src/main/java/com/orm/SugarRecord.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 4b9e04ef..957e15fa 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -198,7 +198,11 @@ public static void executeQuery(String query, String... arguments) {
     }
 
     public static <T> List<T> find(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
-        Cursor cursor = getSugarDataBase().query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
+
+        String args[];
+        args = (whereArgs == null) ? null : replaceArgs(whereArgs);
+
+        Cursor cursor = getSugarDataBase().query(NamingHelper.toSQLName(type), null, whereClause, args,
                 groupBy, null, orderBy, limit);
 
         return getEntitiesFromCursor(cursor, type);
@@ -479,4 +483,17 @@ public void remove() {
         }
     }
 
+    public static String[] replaceArgs(String[] args){
+
+        String [] replace = new String[args.length];
+        for (int i=0; i<args.length; i++){
+
+            replace[i]= (args[i].equals("true")) ? replace[i]="1" : (args[i].equals("false")) ? replace[i]="0" : args[i];
+
+        }
+
+        return replace;
+
+    }
+
 }

From 2358dae45b36a9e19e58a66566727ccd71792604 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Thu, 31 Mar 2016 11:11:30 -0300
Subject: [PATCH 222/305] removing iml from repo

---
 sugar.iml | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 sugar.iml

diff --git a/sugar.iml b/sugar.iml
deleted file mode 100644
index e19b5594..00000000
--- a/sugar.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="sugar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

From ed4c8173301e61da6ab93a944892e319e6046f7e Mon Sep 17 00:00:00 2001
From: geracervantes <gcervantes@nearsoft.com>
Date: Thu, 31 Mar 2016 16:20:42 -0700
Subject: [PATCH 223/305] add sqlite keywords support

---
 library/src/main/java/com/orm/KeyWords.java   | 142 ++++++++++++++++++
 .../main/java/com/orm/SchemaGenerator.java    |   6 +
 .../java/com/orm/SchemaGeneratorTest.java     |   8 +
 .../test/java/com/orm/models/TRANSACTION.java |  12 ++
 4 files changed, 168 insertions(+)
 create mode 100644 library/src/main/java/com/orm/KeyWords.java
 create mode 100644 library/src/test/java/com/orm/models/TRANSACTION.java

diff --git a/library/src/main/java/com/orm/KeyWords.java b/library/src/main/java/com/orm/KeyWords.java
new file mode 100644
index 00000000..14ea5fbc
--- /dev/null
+++ b/library/src/main/java/com/orm/KeyWords.java
@@ -0,0 +1,142 @@
+package com.orm;
+
+import java.util.ArrayList;
+
+/**
+ * Created by root on 29/03/16.
+ */
+public class KeyWords {
+    public ArrayList<String> rWords = new ArrayList<String>();
+    public boolean ReserverWords(String word){
+        rWords.add("");
+        rWords.add("ABORT");
+        rWords.add("ACTION");
+        rWords.add("ADD");
+        rWords.add("AFTER");
+        rWords.add("ALTER");
+        rWords.add("ANALYZE");
+        rWords.add("AND");
+        rWords.add("AS");
+        rWords.add("ASC");
+        rWords.add("ATTACH");
+        rWords.add("AUTOINCREMENT");
+        rWords.add("BEFORE");
+        rWords.add("BEGIN");
+        rWords.add("BETWEEN");
+        rWords.add("BY");
+        rWords.add("CASCADE");
+        rWords.add("CASE");
+        rWords.add("CAST");
+        rWords.add("CHECK");
+        rWords.add("COLLATE");
+        rWords.add("COLUMN");
+        rWords.add("COMMIT");
+        rWords.add("CONFLICT");
+        rWords.add("CONSTRAINT");
+        rWords.add("CREATE");
+        rWords.add("CROSS");
+        rWords.add("CURRENT_DATE");
+        rWords.add("CURRENT_TIME");
+        rWords.add("CURRENT_TIMESTAMP");
+        rWords.add("DATABASE");
+        rWords.add("DEFAULT");
+        rWords.add("DEFERRABLE");
+        rWords.add("DEFERRED");
+        rWords.add("DELETE");
+        rWords.add("DESC");
+        rWords.add("DETACH");
+        rWords.add("DISTINCT");
+        rWords.add("DROP");
+        rWords.add("EACH");
+        rWords.add("ELSE");
+        rWords.add("END");
+        rWords.add("ESCAPE");
+        rWords.add("EXCEPT");
+        rWords.add("EXCLUSIVE");
+        rWords.add("EXISTS");
+        rWords.add("EXPLAIN");
+        rWords.add("FAIL");
+        rWords.add("FOR");
+        rWords.add("FOREIGN");
+        rWords.add("FROM");
+        rWords.add("FULL");
+        rWords.add("GLOB");
+        rWords.add("GROUP");
+        rWords.add("HAVING");
+        rWords.add("IF");
+        rWords.add("IGNORE");
+        rWords.add("IMMEDIATE");
+        rWords.add("IN");
+        rWords.add("INDEX");
+        rWords.add("INDEXED");
+        rWords.add("INITIALLY");
+        rWords.add("INNER");
+        rWords.add("INSERT");
+        rWords.add("INSTEAD");
+        rWords.add("INTERSECT");
+        rWords.add("INTO");
+        rWords.add("IS");
+        rWords.add("ISNULL");
+        rWords.add("JOIN");
+        rWords.add("KEY");
+        rWords.add("LEFT");
+        rWords.add("LIKE");
+        rWords.add("LIMIT");
+        rWords.add("MATCH");
+        rWords.add("NATURAL");
+        rWords.add("NO");
+        rWords.add("NOT");
+        rWords.add("NOTNULL");
+        rWords.add("NULL");
+        rWords.add("OF");
+        rWords.add("OFFSET");
+        rWords.add("ON");
+        rWords.add("OR");
+        rWords.add("ORDER");
+        rWords.add("OUTER");
+        rWords.add("PLAN");
+        rWords.add("PRAGMA");
+        rWords.add("PRIMARY");
+        rWords.add("QUERY");
+        rWords.add("RAISE");
+        rWords.add("RECURSIVE");
+        rWords.add("REFERENCES");
+        rWords.add("REGEXP");
+        rWords.add("REINDEX");
+        rWords.add("RELEASE");
+        rWords.add("RENAME");
+        rWords.add("REPLACE");
+        rWords.add("RESTRICT");
+        rWords.add("RIGHT");
+        rWords.add("ROLLBACK");
+        rWords.add("ROW");
+        rWords.add("SAVEPOINT");
+        rWords.add("SELECT");
+        rWords.add("SET");
+        rWords.add("TABLE");
+        rWords.add("TEMP");
+        rWords.add("TEMPORARY");
+        rWords.add("THEN");
+        rWords.add("TO");
+        rWords.add("TRANSACTION");
+        rWords.add("TRIGGER");
+        rWords.add("UNION");
+        rWords.add("UNIQUE");
+        rWords.add("UPDATE");
+        rWords.add("USING");
+        rWords.add("VACUUM");
+        rWords.add("VALUES");
+        rWords.add("VIEW");
+        rWords.add("VIRTUAL");
+        rWords.add("WHEN");
+        rWords.add("WHERE");
+        rWords.add("WITH");
+        rWords.add("WITHOUT");
+        if(rWords.contains(word))
+            return true;
+        else
+            return false;
+    }
+}
+
+
diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index f5fd4f2a..2e4bfdc6 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -177,9 +177,15 @@ private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
     }
 
     protected String createTableSQL(Class<?> table) {
+        KeyWord link = new KeyWord;
         Log.i(SUGAR, "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);
+        if(link.ReservedWords(tableName))
+        {
+            return "ERROR, SQLITE KEYWORD USED IN " +tableName;
+
+        }
         StringBuilder sb = new StringBuilder("CREATE TABLE IF NOT EXISTS ");
         sb.append(tableName).append(" ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
 
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index ddef0e3f..80a8c413 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -2,6 +2,7 @@
 
 import com.orm.dsl.Table;
 import com.orm.models.EmptyModel;
+import com.orm.models.TRANSACTION;
 import com.orm.models.IntUniqueModel;
 import com.orm.models.MultiColumnUniqueModel;
 import com.orm.models.StringFieldAnnotatedModel;
@@ -74,4 +75,11 @@ public void testMultiColumnUniqueTableCreation() {
                         "UNIQUE(A, B) ON CONFLICT REPLACE ) ",
                 createSQL);
     }
+    @Test
+    public void testKeyWordModel(){
+        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext() );
+        String createSQL = schemaGenerator.createTableSQL(TRANSACTION.class);
+        assertEquals("ERROR, SQLITE KEYWORD USED IN "+NamingHelper.toSQLName(TRANSACTION.class),createSQL);
+
+    }
 }
diff --git a/library/src/test/java/com/orm/models/TRANSACTION.java b/library/src/test/java/com/orm/models/TRANSACTION.java
new file mode 100644
index 00000000..1fc87eec
--- /dev/null
+++ b/library/src/test/java/com/orm/models/TRANSACTION.java
@@ -0,0 +1,12 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+/**
+ * Created by sibelius on 02/12/15.
+ */
+public class TRANSACTION extends SugarRecord {
+    public TRANSACTION() {
+
+    }
+}

From 8b8005718a43bd242802f954649fe87cc5f3ebf1 Mon Sep 17 00:00:00 2001
From: geracervantes <gcervantes@nearsoft.com>
Date: Thu, 31 Mar 2016 17:37:50 -0700
Subject: [PATCH 224/305] fix error

---
 library/src/main/java/com/orm/SchemaGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 2e4bfdc6..06a901a4 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -177,7 +177,7 @@ private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
     }
 
     protected String createTableSQL(Class<?> table) {
-        KeyWord link = new KeyWord;
+        KeyWord link = new KeyWord();
         Log.i(SUGAR, "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);

From 37bef8ff46b87d4e74bc1bbe1742f84b8dcef24c Mon Sep 17 00:00:00 2001
From: geracervantes <gcervantes@nearsoft.com>
Date: Thu, 31 Mar 2016 18:05:56 -0700
Subject: [PATCH 225/305] fix error

---
 library/src/main/java/com/orm/SchemaGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 06a901a4..730b24bc 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -177,7 +177,7 @@ private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
     }
 
     protected String createTableSQL(Class<?> table) {
-        KeyWord link = new KeyWord();
+        KeyWords link = new KeyWords();
         Log.i(SUGAR, "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);

From a0dc1cc1d6a92555b14f2beecf7565735f1368b8 Mon Sep 17 00:00:00 2001
From: geracervantes <gcervantes@nearsoft.com>
Date: Sat, 2 Apr 2016 12:16:06 -0700
Subject: [PATCH 226/305] change list and output

---
 library/src/main/java/com/orm/KeyWords.java   | 265 +++++++++---------
 .../main/java/com/orm/SchemaGenerator.java    |   5 +-
 .../java/com/orm/SchemaGeneratorTest.java     |   9 -
 .../test/java/com/orm/models/TRANSACTION.java |  12 -
 4 files changed, 135 insertions(+), 156 deletions(-)
 delete mode 100644 library/src/test/java/com/orm/models/TRANSACTION.java

diff --git a/library/src/main/java/com/orm/KeyWords.java b/library/src/main/java/com/orm/KeyWords.java
index 14ea5fbc..14ab2398 100644
--- a/library/src/main/java/com/orm/KeyWords.java
+++ b/library/src/main/java/com/orm/KeyWords.java
@@ -1,142 +1,143 @@
 package com.orm;
 
-import java.util.ArrayList;
+
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Created by root on 29/03/16.
  */
 public class KeyWords {
-    public ArrayList<String> rWords = new ArrayList<String>();
-    public boolean ReserverWords(String word){
-        rWords.add("");
-        rWords.add("ABORT");
-        rWords.add("ACTION");
-        rWords.add("ADD");
-        rWords.add("AFTER");
-        rWords.add("ALTER");
-        rWords.add("ANALYZE");
-        rWords.add("AND");
-        rWords.add("AS");
-        rWords.add("ASC");
-        rWords.add("ATTACH");
-        rWords.add("AUTOINCREMENT");
-        rWords.add("BEFORE");
-        rWords.add("BEGIN");
-        rWords.add("BETWEEN");
-        rWords.add("BY");
-        rWords.add("CASCADE");
-        rWords.add("CASE");
-        rWords.add("CAST");
-        rWords.add("CHECK");
-        rWords.add("COLLATE");
-        rWords.add("COLUMN");
-        rWords.add("COMMIT");
-        rWords.add("CONFLICT");
-        rWords.add("CONSTRAINT");
-        rWords.add("CREATE");
-        rWords.add("CROSS");
-        rWords.add("CURRENT_DATE");
-        rWords.add("CURRENT_TIME");
-        rWords.add("CURRENT_TIMESTAMP");
-        rWords.add("DATABASE");
-        rWords.add("DEFAULT");
-        rWords.add("DEFERRABLE");
-        rWords.add("DEFERRED");
-        rWords.add("DELETE");
-        rWords.add("DESC");
-        rWords.add("DETACH");
-        rWords.add("DISTINCT");
-        rWords.add("DROP");
-        rWords.add("EACH");
-        rWords.add("ELSE");
-        rWords.add("END");
-        rWords.add("ESCAPE");
-        rWords.add("EXCEPT");
-        rWords.add("EXCLUSIVE");
-        rWords.add("EXISTS");
-        rWords.add("EXPLAIN");
-        rWords.add("FAIL");
-        rWords.add("FOR");
-        rWords.add("FOREIGN");
-        rWords.add("FROM");
-        rWords.add("FULL");
-        rWords.add("GLOB");
-        rWords.add("GROUP");
-        rWords.add("HAVING");
-        rWords.add("IF");
-        rWords.add("IGNORE");
-        rWords.add("IMMEDIATE");
-        rWords.add("IN");
-        rWords.add("INDEX");
-        rWords.add("INDEXED");
-        rWords.add("INITIALLY");
-        rWords.add("INNER");
-        rWords.add("INSERT");
-        rWords.add("INSTEAD");
-        rWords.add("INTERSECT");
-        rWords.add("INTO");
-        rWords.add("IS");
-        rWords.add("ISNULL");
-        rWords.add("JOIN");
-        rWords.add("KEY");
-        rWords.add("LEFT");
-        rWords.add("LIKE");
-        rWords.add("LIMIT");
-        rWords.add("MATCH");
-        rWords.add("NATURAL");
-        rWords.add("NO");
-        rWords.add("NOT");
-        rWords.add("NOTNULL");
-        rWords.add("NULL");
-        rWords.add("OF");
-        rWords.add("OFFSET");
-        rWords.add("ON");
-        rWords.add("OR");
-        rWords.add("ORDER");
-        rWords.add("OUTER");
-        rWords.add("PLAN");
-        rWords.add("PRAGMA");
-        rWords.add("PRIMARY");
-        rWords.add("QUERY");
-        rWords.add("RAISE");
-        rWords.add("RECURSIVE");
-        rWords.add("REFERENCES");
-        rWords.add("REGEXP");
-        rWords.add("REINDEX");
-        rWords.add("RELEASE");
-        rWords.add("RENAME");
-        rWords.add("REPLACE");
-        rWords.add("RESTRICT");
-        rWords.add("RIGHT");
-        rWords.add("ROLLBACK");
-        rWords.add("ROW");
-        rWords.add("SAVEPOINT");
-        rWords.add("SELECT");
-        rWords.add("SET");
-        rWords.add("TABLE");
-        rWords.add("TEMP");
-        rWords.add("TEMPORARY");
-        rWords.add("THEN");
-        rWords.add("TO");
-        rWords.add("TRANSACTION");
-        rWords.add("TRIGGER");
-        rWords.add("UNION");
-        rWords.add("UNIQUE");
-        rWords.add("UPDATE");
-        rWords.add("USING");
-        rWords.add("VACUUM");
-        rWords.add("VALUES");
-        rWords.add("VIEW");
-        rWords.add("VIRTUAL");
-        rWords.add("WHEN");
-        rWords.add("WHERE");
-        rWords.add("WITH");
-        rWords.add("WITHOUT");
-        if(rWords.contains(word))
-            return true;
-        else
-            return false;
+    private static Set<String> reservedWords;
+    static{
+        reservedWords = new HashSet<>();
+        reservedWords.add("");
+        reservedWords.add("ABORT");
+        reservedWords.add("ACTION");
+        reservedWords.add("ADD");
+        reservedWords.add("AFTER");
+        reservedWords.add("ALTER");
+        reservedWords.add("ANALYZE");
+        reservedWords.add("AND");
+        reservedWords.add("AS");
+        reservedWords.add("ASC");
+        reservedWords.add("ATTACH");
+        reservedWords.add("AUTOINCREMENT");
+        reservedWords.add("BEFORE");
+        reservedWords.add("BEGIN");
+        reservedWords.add("BETWEEN");
+        reservedWords.add("BY");
+        reservedWords.add("CASCADE");
+        reservedWords.add("CASE");
+        reservedWords.add("CAST");
+        reservedWords.add("CHECK");
+        reservedWords.add("COLLATE");
+        reservedWords.add("COLUMN");
+        reservedWords.add("COMMIT");
+        reservedWords.add("CONFLICT");
+        reservedWords.add("CONSTRAINT");
+        reservedWords.add("CREATE");
+        reservedWords.add("CROSS");
+        reservedWords.add("CURRENT_DATE");
+        reservedWords.add("CURRENT_TIME");
+        reservedWords.add("CURRENT_TIMESTAMP");
+        reservedWords.add("DATABASE");
+        reservedWords.add("DEFAULT");
+        reservedWords.add("DEFERRABLE");
+        reservedWords.add("DEFERRED");
+        reservedWords.add("DELETE");
+        reservedWords.add("DESC");
+        reservedWords.add("DETACH");
+        reservedWords.add("DISTINCT");
+        reservedWords.add("DROP");
+        reservedWords.add("EACH");
+        reservedWords.add("ELSE");
+        reservedWords.add("END");
+        reservedWords.add("ESCAPE");
+        reservedWords.add("EXCEPT");
+        reservedWords.add("EXCLUSIVE");
+        reservedWords.add("EXISTS");
+        reservedWords.add("EXPLAIN");
+        reservedWords.add("FAIL");
+        reservedWords.add("FOR");
+        reservedWords.add("FOREIGN");
+        reservedWords.add("FROM");
+        reservedWords.add("FULL");
+        reservedWords.add("GLOB");
+        reservedWords.add("GROUP");
+        reservedWords.add("HAVING");
+        reservedWords.add("IF");
+        reservedWords.add("IGNORE");
+        reservedWords.add("IMMEDIATE");
+        reservedWords.add("IN");
+        reservedWords.add("INDEX");
+        reservedWords.add("INDEXED");
+        reservedWords.add("INITIALLY");
+        reservedWords.add("INNER");
+        reservedWords.add("INSERT");
+        reservedWords.add("INSTEAD");
+        reservedWords.add("INTERSECT");
+        reservedWords.add("INTO");
+        reservedWords.add("IS");
+        reservedWords.add("ISNULL");
+        reservedWords.add("JOIN");
+        reservedWords.add("KEY");
+        reservedWords.add("LEFT");
+        reservedWords.add("LIKE");
+        reservedWords.add("LIMIT");
+        reservedWords.add("MATCH");
+        reservedWords.add("NATURAL");
+        reservedWords.add("NO");
+        reservedWords.add("NOT");
+        reservedWords.add("NOTNULL");
+        reservedWords.add("NULL");
+        reservedWords.add("OF");
+        reservedWords.add("OFFSET");
+        reservedWords.add("ON");
+        reservedWords.add("OR");
+        reservedWords.add("ORDER");
+        reservedWords.add("OUTER");
+        reservedWords.add("PLAN");
+        reservedWords.add("PRAGMA");
+        reservedWords.add("PRIMARY");
+        reservedWords.add("QUERY");
+        reservedWords.add("RAISE");
+        reservedWords.add("RECURSIVE");
+        reservedWords.add("REFERENCES");
+        reservedWords.add("REGEXP");
+        reservedWords.add("REINDEX");
+        reservedWords.add("RELEASE");
+        reservedWords.add("RENAME");
+        reservedWords.add("REPLACE");
+        reservedWords.add("RESTRICT");
+        reservedWords.add("RIGHT");
+        reservedWords.add("ROLLBACK");
+        reservedWords.add("ROW");
+        reservedWords.add("SAVEPOINT");
+        reservedWords.add("SELECT");
+        reservedWords.add("SET");
+        reservedWords.add("TABLE");
+        reservedWords.add("TEMP");
+        reservedWords.add("TEMPORARY");
+        reservedWords.add("THEN");
+        reservedWords.add("TO");
+        reservedWords.add("TRANSACTION");
+        reservedWords.add("TRIGGER");
+        reservedWords.add("UNION");
+        reservedWords.add("UNIQUE");
+        reservedWords.add("UPDATE");
+        reservedWords.add("USING");
+        reservedWords.add("VACUUM");
+        reservedWords.add("VALUES");
+        reservedWords.add("VIEW");
+        reservedWords.add("VIRTUAL");
+        reservedWords.add("WHEN");
+        reservedWords.add("WHERE");
+        reservedWords.add("WITH");
+        reservedWords.add("WITHOUT");}
+
+    public boolean isaReservedWords(String word){
+        return reservedWords.contains(word);
     }
 }
 
-
diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 730b24bc..628ef169 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -181,10 +181,9 @@ protected String createTableSQL(Class<?> table) {
         Log.i(SUGAR, "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);
-        if(link.ReservedWords(tableName))
+        if(link.isaReservedWords(tableName))
         {
-            return "ERROR, SQLITE KEYWORD USED IN " +tableName;
-
+            Log.i(SUGAR,"ERROR, SQLITE RESERVED WORD USED IN " + tableName);
         }
         StringBuilder sb = new StringBuilder("CREATE TABLE IF NOT EXISTS ");
         sb.append(tableName).append(" ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 80a8c413..24bae7bc 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -1,8 +1,6 @@
 package com.orm;
 
-import com.orm.dsl.Table;
 import com.orm.models.EmptyModel;
-import com.orm.models.TRANSACTION;
 import com.orm.models.IntUniqueModel;
 import com.orm.models.MultiColumnUniqueModel;
 import com.orm.models.StringFieldAnnotatedModel;
@@ -75,11 +73,4 @@ public void testMultiColumnUniqueTableCreation() {
                         "UNIQUE(A, B) ON CONFLICT REPLACE ) ",
                 createSQL);
     }
-    @Test
-    public void testKeyWordModel(){
-        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext() );
-        String createSQL = schemaGenerator.createTableSQL(TRANSACTION.class);
-        assertEquals("ERROR, SQLITE KEYWORD USED IN "+NamingHelper.toSQLName(TRANSACTION.class),createSQL);
-
-    }
 }
diff --git a/library/src/test/java/com/orm/models/TRANSACTION.java b/library/src/test/java/com/orm/models/TRANSACTION.java
deleted file mode 100644
index 1fc87eec..00000000
--- a/library/src/test/java/com/orm/models/TRANSACTION.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.orm.models;
-
-import com.orm.SugarRecord;
-
-/**
- * Created by sibelius on 02/12/15.
- */
-public class TRANSACTION extends SugarRecord {
-    public TRANSACTION() {
-
-    }
-}

From b9d826cd95a9fae99176e8bd305032de679224ed Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 2 Apr 2016 17:32:05 -0300
Subject: [PATCH 227/305] Make SugarContext getSugarDb public Add className as
 String to improve code readability

---
 library/src/main/java/com/orm/SugarContext.java      |  2 +-
 .../main/java/com/orm/SugarTransactionHelper.java    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 2f653f5e..66bf4df0 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -47,7 +47,7 @@ private void doTerminate() {
         }
     }
 
-    protected SugarDb getSugarDb() {
+    public SugarDb getSugarDb() {
         return sugarDb;
     }
 
diff --git a/library/src/main/java/com/orm/SugarTransactionHelper.java b/library/src/main/java/com/orm/SugarTransactionHelper.java
index 7c00812c..74054cb3 100644
--- a/library/src/main/java/com/orm/SugarTransactionHelper.java
+++ b/library/src/main/java/com/orm/SugarTransactionHelper.java
@@ -4,21 +4,21 @@
 import android.util.Log;
 
 public class SugarTransactionHelper {
+    private static final String LOG_TAG = SugarTransactionHelper.class.getSimpleName();
 
     public static void doInTransaction(SugarTransactionHelper.Callback callback) {
         SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
         database.beginTransaction();
 
         try {
-            Log.d(SugarTransactionHelper.class.getSimpleName(),
-                    "Callback executing within transaction");
+            Log.d(LOG_TAG, "Callback executing within transaction");
+
             callback.manipulateInTransaction();
             database.setTransactionSuccessful();
-            Log.d(SugarTransactionHelper.class.getSimpleName(),
-                    "Callback successfully executed within transaction");
+
+            Log.d(LOG_TAG, "Callback successfully executed within transaction");
         } catch (Throwable e) {
-            Log.d(SugarTransactionHelper.class.getSimpleName(),
-                    "Could execute callback within transaction", e);
+            Log.d(LOG_TAG, "Could execute callback within transaction", e);
         } finally {
             database.endTransaction();
         }

From ea76217cee094aaaed8d91a6e4ee6b1089882721 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 2 Apr 2016 17:38:46 -0300
Subject: [PATCH 228/305] Changes in Select.java:  - private static final
 fields goes on top of class  - Delete unused import  - Delete arguments that
 can be inferred from Generic class

---
 .../src/main/java/com/orm/query/Select.java   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 6b2b962c..83f7102b 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -6,11 +6,20 @@
 import com.orm.util.NamingHelper;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
 public class Select<T> implements Iterable {
+    private static final String SPACE = " ";
+    private static final String SINGLE_QUOTE = "'";
+    private static final String LEFT_PARENTHESIS = "(";
+    private static final String RIGHT_PARENTHESIS = ")";
+    private static final String SELECT_FROM = "SELECT * FROM ";
+    private static final String WHERE = "WHERE ";
+    private static final String ORDER_BY = "ORDER BY ";
+    private static final String GROUP_BY = "GROUP BY ";
+    private static final String LIMIT = "LIMIT ";
+    private static final String OFFSET = "OFFSET ";
 
     private Class<T> record;
     private String[] arguments;
@@ -19,24 +28,14 @@ public class Select<T> implements Iterable {
     private String groupBy = "";
     private String limit = "";
     private String offset = "";
-    private List<String> args = new ArrayList<String>();
-    private static final String SPACE =" ";
-    private static final String SINGLE_QUOTE ="'";
-    private static final String LEFT_PARENTHESIS="(";
-    private static final String RIGHT_PARENTHESIS=")";
-    private static final String SELECT_FROM="SELECT * FROM ";
-    private static final String WHERE="WHERE ";
-    private static final String ORDER_BY ="ORDER BY ";
-    private static final String GROUP_BY ="GROUP BY ";
-    private static final String LIMIT ="LIMIT ";
-    private static final String OFFSET ="OFFSET ";
+    private List<String> args = new ArrayList<>();
 
     public Select(Class<T> record) {
         this.record = record;
     }
 
     public static <T> Select<T> from(Class<T> record) {
-        return new Select<T>(record);
+        return new Select<>(record);
     }
 
     public Select<T> orderBy(String prop) {

From 4a5cbb5e5d2bf65ba3cc33580249ba187362c71e Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 3 Apr 2016 22:16:39 -0300
Subject: [PATCH 229/305] General project update:  - Updated build.gradle
 files, buildTools from version 23.0.2 to 23.0.3  - Updated gradle.properties
 file to add gradle daemon support for faster builds  - Deleted Collection
 class because it was unused in the project  - Added ContextUtil class which
 handles everything Context related  - Updated code in KeyWords class, now
 it's called KeyWordUtil and it's located in util package  - Updated
 ManifestHelper methods in order to use the ContextUtil class to get the
 Context and not as method param.  - Updated MultiDexHelper methods in order
 to use the ContextUtil class to get the Context and not as method param.  -
 Minimal change in NamingHelper class  - Updated ReflectionUtil class in order
 to use the ContextUtil, deleted some arguments that can be inferred from
 Generic class  - Updated SugarConfig in order to delete some arguments that
 can be inferred from Generic class  - Updated SchemaGenerator in oder to use
 the ContextUtil class to get the context, the constructor is now private, and
 you can call getInstance method  - Updated SugarApp, deleted unused import  -
 Updated SugarContext, add ContextUtil.init to set the Context  - Updated
 SugarDb added getInstance method, SugarDb constructor is private, Added
 ContextUtil calls  - Updated SugarRecord, deleted className that can be
 inferred from Generic class  - Modify test to support
 SchemaGenerator.getInstance and another minimal modifications

---
 example/build.gradle                          |   2 +-
 .../src/main/java/com/example/ClientApp.java  |   1 +
 gradle.properties                             |   1 +
 library/build.gradle                          |   2 +-
 library/src/main/java/com/orm/KeyWords.java   | 143 ------------------
 .../main/java/com/orm/SchemaGenerator.java    |  30 ++--
 library/src/main/java/com/orm/SugarApp.java   |   2 -
 .../src/main/java/com/orm/SugarContext.java   |  10 +-
 library/src/main/java/com/orm/SugarDb.java    |  24 +--
 .../src/main/java/com/orm/SugarRecord.java    |  16 +-
 .../main/java/com/orm/util/Collection.java    |  40 -----
 .../main/java/com/orm/util/ContextUtil.java   |  48 ++++++
 .../main/java/com/orm/util/KeyWordUtil.java   |  37 +++++
 .../java/com/orm/util/ManifestHelper.java     |  60 ++++----
 .../java/com/orm/util/MultiDexHelper.java     |  39 +++--
 .../main/java/com/orm/util/NamingHelper.java  |   2 +-
 .../java/com/orm/util/ReflectionUtil.java     |  53 +++----
 .../main/java/com/orm/util/SugarConfig.java   |   5 +-
 .../main/java/com/orm/util/SugarCursor.java   |   1 +
 .../java/com/orm/util/SugarCursorFactory.java |   1 -
 .../java/com/orm/SchemaGeneratorTest.java     |  14 +-
 .../test/java/com/orm/models/EmptyModel.java  |   4 +-
 .../java/com/orm/models/IntUniqueModel.java   |   5 +-
 .../orm/models/MultiColumnUniqueModel.java    |   3 +-
 .../orm/models/StringFieldAnnotatedModel.java |   4 +-
 .../orm/models/StringFieldExtendedModel.java  |   4 +-
 ...ringFieldExtendedModelAnnotatedColumn.java |   4 +-
 .../java/com/orm/query/QueryBuilderTests.java |   1 +
 .../test/java/com/orm/query/TestRecord.java   |   3 +-
 .../com/orm/util/MigrationFileParserTest.java |  14 +-
 30 files changed, 235 insertions(+), 338 deletions(-)
 delete mode 100644 library/src/main/java/com/orm/KeyWords.java
 delete mode 100644 library/src/main/java/com/orm/util/Collection.java
 create mode 100644 library/src/main/java/com/orm/util/ContextUtil.java
 create mode 100644 library/src/main/java/com/orm/util/KeyWordUtil.java

diff --git a/example/build.gradle b/example/build.gradle
index 084b9d2d..15ba8d9c 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "com.example"
diff --git a/example/src/main/java/com/example/ClientApp.java b/example/src/main/java/com/example/ClientApp.java
index e546e11d..6637ea26 100644
--- a/example/src/main/java/com/example/ClientApp.java
+++ b/example/src/main/java/com/example/ClientApp.java
@@ -5,6 +5,7 @@
 import com.orm.SugarContext;
 
 public class ClientApp extends Application {
+
     @Override
     public void onCreate() {
         super.onCreate();
diff --git a/gradle.properties b/gradle.properties
index b1d9b965..35b4c26f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,7 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+org.gradle.daemon=true
 
 VERSION_NAME=2
 VERSION_CODE=2
diff --git a/library/build.gradle b/library/build.gradle
index ac7ffb66..5c523c6f 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -3,7 +3,7 @@ apply from: '../maven_push.gradle'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 9
diff --git a/library/src/main/java/com/orm/KeyWords.java b/library/src/main/java/com/orm/KeyWords.java
deleted file mode 100644
index 14ab2398..00000000
--- a/library/src/main/java/com/orm/KeyWords.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.orm;
-
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Created by root on 29/03/16.
- */
-public class KeyWords {
-    private static Set<String> reservedWords;
-    static{
-        reservedWords = new HashSet<>();
-        reservedWords.add("");
-        reservedWords.add("ABORT");
-        reservedWords.add("ACTION");
-        reservedWords.add("ADD");
-        reservedWords.add("AFTER");
-        reservedWords.add("ALTER");
-        reservedWords.add("ANALYZE");
-        reservedWords.add("AND");
-        reservedWords.add("AS");
-        reservedWords.add("ASC");
-        reservedWords.add("ATTACH");
-        reservedWords.add("AUTOINCREMENT");
-        reservedWords.add("BEFORE");
-        reservedWords.add("BEGIN");
-        reservedWords.add("BETWEEN");
-        reservedWords.add("BY");
-        reservedWords.add("CASCADE");
-        reservedWords.add("CASE");
-        reservedWords.add("CAST");
-        reservedWords.add("CHECK");
-        reservedWords.add("COLLATE");
-        reservedWords.add("COLUMN");
-        reservedWords.add("COMMIT");
-        reservedWords.add("CONFLICT");
-        reservedWords.add("CONSTRAINT");
-        reservedWords.add("CREATE");
-        reservedWords.add("CROSS");
-        reservedWords.add("CURRENT_DATE");
-        reservedWords.add("CURRENT_TIME");
-        reservedWords.add("CURRENT_TIMESTAMP");
-        reservedWords.add("DATABASE");
-        reservedWords.add("DEFAULT");
-        reservedWords.add("DEFERRABLE");
-        reservedWords.add("DEFERRED");
-        reservedWords.add("DELETE");
-        reservedWords.add("DESC");
-        reservedWords.add("DETACH");
-        reservedWords.add("DISTINCT");
-        reservedWords.add("DROP");
-        reservedWords.add("EACH");
-        reservedWords.add("ELSE");
-        reservedWords.add("END");
-        reservedWords.add("ESCAPE");
-        reservedWords.add("EXCEPT");
-        reservedWords.add("EXCLUSIVE");
-        reservedWords.add("EXISTS");
-        reservedWords.add("EXPLAIN");
-        reservedWords.add("FAIL");
-        reservedWords.add("FOR");
-        reservedWords.add("FOREIGN");
-        reservedWords.add("FROM");
-        reservedWords.add("FULL");
-        reservedWords.add("GLOB");
-        reservedWords.add("GROUP");
-        reservedWords.add("HAVING");
-        reservedWords.add("IF");
-        reservedWords.add("IGNORE");
-        reservedWords.add("IMMEDIATE");
-        reservedWords.add("IN");
-        reservedWords.add("INDEX");
-        reservedWords.add("INDEXED");
-        reservedWords.add("INITIALLY");
-        reservedWords.add("INNER");
-        reservedWords.add("INSERT");
-        reservedWords.add("INSTEAD");
-        reservedWords.add("INTERSECT");
-        reservedWords.add("INTO");
-        reservedWords.add("IS");
-        reservedWords.add("ISNULL");
-        reservedWords.add("JOIN");
-        reservedWords.add("KEY");
-        reservedWords.add("LEFT");
-        reservedWords.add("LIKE");
-        reservedWords.add("LIMIT");
-        reservedWords.add("MATCH");
-        reservedWords.add("NATURAL");
-        reservedWords.add("NO");
-        reservedWords.add("NOT");
-        reservedWords.add("NOTNULL");
-        reservedWords.add("NULL");
-        reservedWords.add("OF");
-        reservedWords.add("OFFSET");
-        reservedWords.add("ON");
-        reservedWords.add("OR");
-        reservedWords.add("ORDER");
-        reservedWords.add("OUTER");
-        reservedWords.add("PLAN");
-        reservedWords.add("PRAGMA");
-        reservedWords.add("PRIMARY");
-        reservedWords.add("QUERY");
-        reservedWords.add("RAISE");
-        reservedWords.add("RECURSIVE");
-        reservedWords.add("REFERENCES");
-        reservedWords.add("REGEXP");
-        reservedWords.add("REINDEX");
-        reservedWords.add("RELEASE");
-        reservedWords.add("RENAME");
-        reservedWords.add("REPLACE");
-        reservedWords.add("RESTRICT");
-        reservedWords.add("RIGHT");
-        reservedWords.add("ROLLBACK");
-        reservedWords.add("ROW");
-        reservedWords.add("SAVEPOINT");
-        reservedWords.add("SELECT");
-        reservedWords.add("SET");
-        reservedWords.add("TABLE");
-        reservedWords.add("TEMP");
-        reservedWords.add("TEMPORARY");
-        reservedWords.add("THEN");
-        reservedWords.add("TO");
-        reservedWords.add("TRANSACTION");
-        reservedWords.add("TRIGGER");
-        reservedWords.add("UNION");
-        reservedWords.add("UNIQUE");
-        reservedWords.add("UPDATE");
-        reservedWords.add("USING");
-        reservedWords.add("VACUUM");
-        reservedWords.add("VALUES");
-        reservedWords.add("VIEW");
-        reservedWords.add("VIRTUAL");
-        reservedWords.add("WHEN");
-        reservedWords.add("WHERE");
-        reservedWords.add("WITH");
-        reservedWords.add("WITHOUT");}
-
-    public boolean isaReservedWords(String word){
-        return reservedWords.contains(word);
-    }
-}
-
diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 628ef169..b2da4d86 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -1,6 +1,5 @@
 package com.orm;
 
-import android.content.Context;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
@@ -10,6 +9,7 @@
 import com.orm.dsl.MultiUnique;
 import com.orm.dsl.NotNull;
 import com.orm.dsl.Unique;
+import com.orm.util.KeyWordUtil;
 import com.orm.util.MigrationFileParser;
 import com.orm.util.NamingHelper;
 import com.orm.util.NumberComparator;
@@ -27,29 +27,30 @@
 import java.util.List;
 
 import static com.orm.util.ReflectionUtil.getDomainClasses;
+import static com.orm.util.ContextUtil.getAssets;
 
 public class SchemaGenerator {
-
-    private Context context;
-
     public static final String NULL = " NULL";
     public static final String NOT_NULL = " NOT NULL";
     public static final String UNIQUE = " UNIQUE";
     public static final String SUGAR = "Sugar";
 
-    public SchemaGenerator(Context context) {
-        this.context = context;
+    //Prevent instantiation
+    private SchemaGenerator() { }
+
+    public static SchemaGenerator getInstance() {
+        return new SchemaGenerator();
     }
 
     public void createDatabase(SQLiteDatabase sqLiteDatabase) {
-        List<Class> domainClasses = getDomainClasses(context);
+        List<Class> domainClasses = getDomainClasses();
         for (Class domain : domainClasses) {
             createTable(domain, sqLiteDatabase);
         }
     }
 
     public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
-        List<Class> domainClasses = getDomainClasses(context);
+        List<Class> domainClasses = getDomainClasses();
         String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
 
         for (Class domain : domainClasses) {
@@ -78,7 +79,7 @@ private ArrayList<String> getColumnNames(SQLiteDatabase sqLiteDatabase, String t
 
 
     public void deleteTables(SQLiteDatabase sqLiteDatabase) {
-        List<Class> tables = getDomainClasses(context);
+        List<Class> tables = getDomainClasses();
         for (Class table : tables) {
             sqLiteDatabase.execSQL("DROP TABLE IF EXISTS " + NamingHelper.toSQLName(table));
         }
@@ -88,7 +89,7 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
         boolean isSuccess = false;
 
         try {
-            List<String> files = Arrays.asList(this.context.getAssets().list("sugar_upgrades"));
+            List<String> files = Arrays.asList(getAssets().list("sugar_upgrades"));
             Collections.sort(files, new NumberComparator());
             for (String file : files) {
                 Log.i(SUGAR, "filename : " + file);
@@ -114,7 +115,7 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
 
     private void executeScript(SQLiteDatabase db, String file) {
         try {
-            InputStream is = this.context.getAssets().open("sugar_upgrades/" + file);
+            InputStream is = getAssets().open("sugar_upgrades/" + file);
             BufferedReader reader = new BufferedReader(new InputStreamReader(is));
             StringBuilder sb = new StringBuilder();
             String line;
@@ -137,7 +138,6 @@ private void executeScript(SQLiteDatabase db, String file) {
     }
 
     private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
-
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);
         ArrayList<String> presentColumns = getColumnNames(sqLiteDatabase, tableName);
@@ -177,14 +177,14 @@ private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
     }
 
     protected String createTableSQL(Class<?> table) {
-        KeyWords link = new KeyWords();
         Log.i(SUGAR, "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toSQLName(table);
-        if(link.isaReservedWords(tableName))
-        {
+
+        if(KeyWordUtil.isKeyword(tableName)) {
             Log.i(SUGAR,"ERROR, SQLITE RESERVED WORD USED IN " + tableName);
         }
+
         StringBuilder sb = new StringBuilder("CREATE TABLE IF NOT EXISTS ");
         sb.append(tableName).append(" ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
 
diff --git a/library/src/main/java/com/orm/SugarApp.java b/library/src/main/java/com/orm/SugarApp.java
index 5140e1ee..cab35ca7 100644
--- a/library/src/main/java/com/orm/SugarApp.java
+++ b/library/src/main/java/com/orm/SugarApp.java
@@ -1,7 +1,5 @@
 package com.orm;
 
-import com.orm.SugarContext;
-
 import android.app.Application;
 
 public class SugarApp extends Application {
diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 66bf4df0..511126f5 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 
+import com.orm.util.ContextUtil;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
@@ -12,8 +14,8 @@ public class SugarContext {
     private SugarDb sugarDb;
     private Map<Object, Long> entitiesMap;
 
-    private SugarContext(Context context) {
-        this.sugarDb = new SugarDb(context);
+    private SugarContext() {
+        this.sugarDb = SugarDb.getInstance();
         this.entitiesMap = Collections.synchronizedMap(new WeakHashMap<Object, Long>());
     }
     
@@ -25,7 +27,8 @@ public static SugarContext getSugarContext() {
     }
 
     public static void init(Context context) {
-        instance = new SugarContext(context);
+        ContextUtil.init(context);
+        instance = new SugarContext();
     }
 
     public static void terminate() {
@@ -33,6 +36,7 @@ public static void terminate() {
             return;
         }
         instance.doTerminate();
+        ContextUtil.terminate();
     }
 
     /*
diff --git a/library/src/main/java/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
index 56528f96..2b653ee7 100644
--- a/library/src/main/java/com/orm/SugarDb.java
+++ b/library/src/main/java/com/orm/SugarDb.java
@@ -1,26 +1,32 @@
 package com.orm;
 
-import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
-import com.orm.util.ManifestHelper;
 import com.orm.util.SugarCursorFactory;
 
 import static com.orm.util.ManifestHelper.getDatabaseVersion;
 import static com.orm.util.ManifestHelper.getDebugEnabled;
+import static com.orm.util.ManifestHelper.getDbName;
+
+import static com.orm.util.ContextUtil.*;
 
 public class SugarDb extends SQLiteOpenHelper {
+    private static final String LOG_TAG = "Sugar";
 
     private final SchemaGenerator schemaGenerator;
     private SQLiteDatabase sqLiteDatabase;
     private int openedConnections = 0;
 
-    public SugarDb(Context context) {
-        super(context, ManifestHelper.getDatabaseName(context),
-                new SugarCursorFactory(getDebugEnabled(context)), getDatabaseVersion(context));
-        schemaGenerator = new SchemaGenerator(context);
+    //Prevent instantiation
+    private SugarDb() {
+        super(getContext(), getDbName(), new SugarCursorFactory(getDebugEnabled()), getDatabaseVersion());
+        schemaGenerator = SchemaGenerator.getInstance();
+    }
+
+    public static SugarDb getInstance() {
+        return new SugarDb();
     }
 
     @Override
@@ -43,17 +49,17 @@ public synchronized SQLiteDatabase getDB() {
 
     @Override
     public synchronized SQLiteDatabase getReadableDatabase() {
-        Log.d("SUGAR", "getReadableDatabase");
+        Log.d(LOG_TAG, "getReadableDatabase");
         openedConnections++;
         return super.getReadableDatabase();
     }
 
     @Override
     public synchronized void close() {
-        Log.d("SUGAR", "getReadableDatabase");
+        Log.d(LOG_TAG, "getReadableDatabase");
         openedConnections--;
         if(openedConnections == 0) {
-            Log.d("SUGAR", "closing");
+            Log.d(LOG_TAG, "closing");
             super.close();
         }
     }
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 4b9e04ef..9d61443e 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -27,8 +27,8 @@
 import static com.orm.SugarContext.getSugarContext;
 
 public class SugarRecord {
-
     public static final String SUGAR = "Sugar";
+
     private Long id = null;
 
     private static SQLiteDatabase getSugarDataBase() {
@@ -174,13 +174,13 @@ public static <T> Iterator<T> findAsIterator(Class<T> type, String whereClause,
 
     public static <T> Iterator<T> findWithQueryAsIterator(Class<T> type, String query, String... arguments) {
         Cursor cursor = getSugarDataBase().rawQuery(query, arguments);
-        return new CursorIterator<T>(type, cursor);
+        return new CursorIterator<>(type, cursor);
     }
 
     public static <T> Iterator<T> findAsIterator(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
         Cursor cursor = getSugarDataBase().query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
                 groupBy, null, orderBy, limit);
-        return new CursorIterator<T>(type, cursor);
+        return new CursorIterator<>(type, cursor);
     }
 
     public static <T> List<T> find(Class<T> type, String whereClause, String... whereArgs) {
@@ -206,7 +206,7 @@ public static <T> List<T> find(Class<T> type, String whereClause, String[] where
 
     public static <T> List<T> getEntitiesFromCursor(Cursor cursor, Class<T> type){
         T entity;
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
         try {
             while (cursor.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
@@ -222,15 +222,15 @@ public static <T> List<T> getEntitiesFromCursor(Cursor cursor, Class<T> type){
         return result;
     }
 
-    public static <T> long count(Class<?> type) {
+    public static <T> long count(Class<T> type) {
         return count(type, null, null, null, null, null);
     }
 
-    public static <T> long count(Class<?> type, String whereClause, String[] whereArgs) {
+    public static <T> long count(Class<T> type, String whereClause, String[] whereArgs) {
     	return count(type, whereClause, whereArgs, null, null, null);
     }
 
-    public static <T> long count(Class<?> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
+    public static <T> long count(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
         long result = -1;
         String filter = (!TextUtils.isEmpty(whereClause)) ? " where "  + whereClause : "";
         SQLiteStatement sqliteStatement;
@@ -284,7 +284,7 @@ static long save(SQLiteDatabase db, Object object) {
             if (idField != null) {
                 idField.setAccessible(true);
                 try {
-                    idField.set(object, new Long(id));
+                    idField.set(object, id);
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }
diff --git a/library/src/main/java/com/orm/util/Collection.java b/library/src/main/java/com/orm/util/Collection.java
deleted file mode 100644
index fe7a7e63..00000000
--- a/library/src/main/java/com/orm/util/Collection.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.orm.util;
-import java.util.*;
-
-public class Collection {
-
-    public static <T> List<T> list(T... args) {
-        return Arrays.asList(args);
-    }
-
-    public static <T> Set<T> set(T... args) {
-        Set<T> result = new HashSet<T>(args.length);
-        result.addAll(Arrays.asList(args));
-        return result;
-    }
-
-    public static <K, V> Map<K, V> map(Entry<? extends K, ? extends V>... entries) {
-        Map<K, V> result = new HashMap<K, V>(entries.length);
-
-        for (Entry<? extends K, ? extends V> entry : entries)
-            if (entry.value != null)
-                result.put(entry.key, entry.value);
-
-        return result;
-    }
-
-    public static <K, V> Entry<K, V> entry(K key, V value) {
-        return new Entry<K, V>(key, value);
-    }
-
-    public static class Entry<K, V> {
-        K key;
-        V value;
-
-        public Entry(K key, V value) {
-            this.key = key;
-            this.value = value;
-        }
-    }
-
-}
diff --git a/library/src/main/java/com/orm/util/ContextUtil.java b/library/src/main/java/com/orm/util/ContextUtil.java
new file mode 100644
index 00000000..3e6eff58
--- /dev/null
+++ b/library/src/main/java/com/orm/util/ContextUtil.java
@@ -0,0 +1,48 @@
+package com.orm.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
+
+/**
+ * @author jonatan.salas
+ */
+public final class ContextUtil {
+    private static Context ctx;
+
+    //Prevent instantiation
+    private ContextUtil() { }
+
+    public static void init(Context context) {
+        if (null == context) {
+            throw new IllegalArgumentException("context shouldn't be null!");
+        }
+
+        ctx = context;
+    }
+
+    public static void terminate() {
+        ctx = null;
+    }
+
+    public static Context getContext() {
+        return ctx;
+    }
+
+    public static AssetManager getAssets() {
+        return getContext().getAssets();
+    }
+
+    public static PackageManager getPackageManager() {
+        return getContext().getPackageManager();
+    }
+
+    public static String getPackageName() {
+        return getContext().getPackageName();
+    }
+
+    public static SharedPreferences getSharedPreferences(String name, int mode) {
+        return getContext().getSharedPreferences(name, mode);
+    }
+}
diff --git a/library/src/main/java/com/orm/util/KeyWordUtil.java b/library/src/main/java/com/orm/util/KeyWordUtil.java
new file mode 100644
index 00000000..d3b65cf2
--- /dev/null
+++ b/library/src/main/java/com/orm/util/KeyWordUtil.java
@@ -0,0 +1,37 @@
+package com.orm.util;
+
+/**
+ * @author jonatan.salas
+ */
+public final class KeyWordUtil {
+
+    private static final String[] KEY_WORDS = new String[] {
+            "", "ABORT", "ACTION", "ADD", "AFTER", "ALTER", "ANALYZE", "AND", "AS", "ASC", "ATTACH",
+            "AUTOINCREMENT", "BEFORE", "BEGIN", "BETWEEN", "BY", "CASCADE", "CASE", "CAST", "CHECK",
+            "COLLATE", "COLUMN", "COMMIT", "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT_DATE",
+            "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DELETE",
+            "DESC", "DETACH", "DISTINCT", "DROP", "EACH", "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUSIVE",
+            "EXISTS", "EXPLAIN", "FAIL", "FOR", "FOREIGN", "FROM", "FULL", "GLOB", "GROUP", "HAVING",
+            "IF", "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER", "INSERT", "INSTEAD",
+            "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY", "LEFT", "LIKE", "LIMIT", "MATCH", "NATURAL",
+            "NO", "NOT", "NOTNULL", "NULL", "OF", "OFFSET", "ON", "OR", "ORDER", "OUTER", "PLAN", "PRAGMA",
+            "PRIMARY", "QUERY", "RAISE", "RECURSIVE", "REFERENCES", "REGEXP", "REINDEX", "RELEASE", "RENAME",
+            "REPLACE", "RESTRICT", "RIGHT", "ROLLBACK", "ROW", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP",
+            "TEMPORARY", "THEN", "TO", "TRANSACTION", "TRIGGER", "UNION", "UNIQUE", "UPDATE", "USING", "VACUUM",
+            "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE", "WITH", "WITHOUT"
+    };
+
+    //Prevent instantiation
+    private KeyWordUtil() { }
+
+    public static boolean isKeyword(String word) {
+        for (String keyWord: KEY_WORDS) {
+            if (keyWord.equals(word)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
+
diff --git a/library/src/main/java/com/orm/util/ManifestHelper.java b/library/src/main/java/com/orm/util/ManifestHelper.java
index fb65724c..beacfc53 100644
--- a/library/src/main/java/com/orm/util/ManifestHelper.java
+++ b/library/src/main/java/com/orm/util/ManifestHelper.java
@@ -1,25 +1,29 @@
 package com.orm.util;
 
-import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.util.Log;
 
+import static com.orm.util.ContextUtil.*;
+
 /**
  * Helper class for accessing properties in the AndroidManifest
  */
 public class ManifestHelper {
+    private static final String LOG_TAG = "Sugar";
 
     /**
      * Key for the database name meta data.
      */
     public final static String METADATA_DATABASE = "DATABASE";
+
     /**
-     * Key for the database verison meta data.
+     * Key for the database version meta data.
      */
     public final static String METADATA_VERSION = "VERSION";
     public final static String METADATA_DOMAIN_PACKAGE_NAME = "DOMAIN_PACKAGE_NAME";
     public final static String METADATA_QUERY_LOG = "QUERY_LOG";
+
     /**
      * The default name for the database unless specified in the AndroidManifest.
      */
@@ -28,12 +32,11 @@ public class ManifestHelper {
     /**
      * Grabs the database version from the manifest.
      *
-     * @param context  the {@link android.content.Context} of the Android application
      * @return the database version as specified by the {@link #METADATA_VERSION} version or 1 of
      *         not present
      */
-    public static int getDatabaseVersion(Context context) {
-        Integer databaseVersion = getMetaDataInteger(context, METADATA_VERSION);
+    public static int getDatabaseVersion() {
+        Integer databaseVersion = getMetaDataInteger(METADATA_VERSION);
 
         if ((databaseVersion == null) || (databaseVersion == 0)) {
             databaseVersion = 1;
@@ -45,11 +48,10 @@ public static int getDatabaseVersion(Context context) {
     /**
      * Grabs the domain name of the model classes from the manifest. 
      *
-     * @param context  the {@link android.content.Context} of the Android application
      * @return the package String that Sugar uses to search for model classes
      */
-    public static String getDomainPackageName(Context context){
-        String domainPackageName = getMetaDataString(context, METADATA_DOMAIN_PACKAGE_NAME);
+    public static String getDomainPackageName() {
+        String domainPackageName = getMetaDataString(METADATA_DOMAIN_PACKAGE_NAME);
 
         if (domainPackageName == null) {
             domainPackageName = "";
@@ -61,12 +63,11 @@ public static String getDomainPackageName(Context context){
     /**
      * Grabs the name of the database file specified in the manifest.
      *
-     * @param context  the {@link android.content.Context} of the Android application
      * @return the value for the {@value #METADATA_DATABASE} meta data in the AndroidManifest or
      *         {@link #DATABASE_DEFAULT_NAME} if not present
      */
-    public static String getDatabaseName(Context context) {
-        String databaseName = getMetaDataString(context, METADATA_DATABASE);
+    public static String getDatabaseName() {
+        String databaseName = getMetaDataString(METADATA_DATABASE);
 
         if (databaseName == null) {
             databaseName = DATABASE_DEFAULT_NAME;
@@ -75,59 +76,58 @@ public static String getDatabaseName(Context context) {
         return databaseName;
     }
 
+    public static String getDbName() {
+        return getDatabaseName();
+    }
+
     /**
      * Grabs the debug flag from the manifest.
      *
-     * @param context  the {@link android.content.Context} of the Android application
      * @return true if the debug flag is enabled
      */
-    public static boolean getDebugEnabled(Context context) {
-        return getMetaDataBoolean(context, METADATA_QUERY_LOG);
+    public static boolean getDebugEnabled() {
+        return getMetaDataBoolean(METADATA_QUERY_LOG);
     }
 
-    private static String getMetaDataString(Context context, String name) {
+    private static String getMetaDataString(String name) {
+        PackageManager pm = getPackageManager();
         String value = null;
 
-        PackageManager pm = context.getPackageManager();
         try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(),
-                    PackageManager.GET_META_DATA);
+            ApplicationInfo ai = pm.getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
             value = ai.metaData.getString(name);
         } catch (Exception e) {
-            Log.d("sugar", "Couldn't find config value: " + name);
+            Log.d(LOG_TAG, "Couldn't find config value: " + name);
         }
 
         return value;
     }
 
-    private static Integer getMetaDataInteger(Context context, String name) {
+    private static Integer getMetaDataInteger(String name) {
+        PackageManager pm = getPackageManager();
         Integer value = null;
 
-        PackageManager pm = context.getPackageManager();
         try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(),
-                    PackageManager.GET_META_DATA);
+            ApplicationInfo ai = pm.getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
             value = ai.metaData.getInt(name);
         } catch (Exception e) {
-            Log.d("sugar", "Couldn't find config value: " + name);
+            Log.d(LOG_TAG, "Couldn't find config value: " + name);
         }
 
         return value;
     }
 
-    private static Boolean getMetaDataBoolean(Context context, String name) {
+    private static Boolean getMetaDataBoolean(String name) {
+        PackageManager pm = getPackageManager();
         Boolean value = false;
 
-        PackageManager pm = context.getPackageManager();
         try {
-            ApplicationInfo ai = pm.getApplicationInfo(context.getPackageName(),
-                    PackageManager.GET_META_DATA);
+            ApplicationInfo ai = pm.getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
             value = ai.metaData.getBoolean(name);
         } catch (Exception e) {
-            Log.d("sugar", "Couldn't find config value: " + name);
+            Log.d(LOG_TAG, "Couldn't find config value: " + name);
         }
 
         return value;
     }
-
 }
diff --git a/library/src/main/java/com/orm/util/MultiDexHelper.java b/library/src/main/java/com/orm/util/MultiDexHelper.java
index 87f7fb3a..7d8c2642 100644
--- a/library/src/main/java/com/orm/util/MultiDexHelper.java
+++ b/library/src/main/java/com/orm/util/MultiDexHelper.java
@@ -14,48 +14,49 @@
 
 import dalvik.system.DexFile;
 
+import static com.orm.util.ContextUtil.getSharedPreferences;
+import static com.orm.util.ContextUtil.getPackageManager;
+import static com.orm.util.ContextUtil.getPackageName;
+
 /**
  * Created by xudshen@hotmail.com on 14/11/13.
  */
-
 //http://stackoverflow.com/a/26892658
 public class MultiDexHelper {
     private static final String EXTRACTED_NAME_EXT = ".classes";
     private static final String EXTRACTED_SUFFIX = ".zip";
 
-    private static final String SECONDARY_FOLDER_NAME = "code_cache" + File.separator +
-            "secondary-dexes";
-
+    private static final String SECONDARY_FOLDER_NAME = "code_cache" + File.separator + "secondary-dexes";
     private static final String PREFS_FILE = "multidex.version";
     private static final String KEY_DEX_NUMBER = "dex.number";
 
-    private static SharedPreferences getMultiDexPreferences(Context context) {
-        return context.getSharedPreferences(PREFS_FILE,
-                Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
-                        ? Context.MODE_PRIVATE
-                        : Context.MODE_PRIVATE | Context.MODE_MULTI_PROCESS);
+    private static SharedPreferences getMultiDexPreferences() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+            return getSharedPreferences(PREFS_FILE, Context.MODE_PRIVATE);
+        } else {
+            return getSharedPreferences(PREFS_FILE, Context.MODE_MULTI_PROCESS);
+        }
     }
 
     /**
      * get all the dex path
      *
-     * @param context the application context
      * @return all the dex path
      * @throws PackageManager.NameNotFoundException
      * @throws IOException
      */
-    public static List<String> getSourcePaths(Context context) throws PackageManager.NameNotFoundException, IOException {
-        ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), 0);
+    public static List<String> getSourcePaths() throws PackageManager.NameNotFoundException, IOException {
+        ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(getPackageName(), 0);
         File sourceApk = new File(applicationInfo.sourceDir);
         File dexDir = new File(applicationInfo.dataDir, SECONDARY_FOLDER_NAME);
 
-        List<String> sourcePaths = new ArrayList<String>();
+        List<String> sourcePaths = new ArrayList<>();
         sourcePaths.add(applicationInfo.sourceDir); //add the default apk path
 
         //the prefix of extracted file, ie: test.classes
         String extractedFilePrefix = sourceApk.getName() + EXTRACTED_NAME_EXT;
         //the total dex numbers
-        int totalDexNumber = getMultiDexPreferences(context).getInt(KEY_DEX_NUMBER, 1);
+        int totalDexNumber = getMultiDexPreferences().getInt(KEY_DEX_NUMBER, 1);
 
         for (int secondaryNumber = 2; secondaryNumber <= totalDexNumber; secondaryNumber++) {
             //for each dex file, ie: test.classes2.zip, test.classes3.zip...
@@ -73,14 +74,13 @@ public static List<String> getSourcePaths(Context context) throws PackageManager
     /**
      * get all the classes name in "classes.dex", "classes2.dex", ....
      *
-     * @param context the application context
      * @return all the classes name
      * @throws PackageManager.NameNotFoundException
      * @throws IOException
      */
-    public static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
-        List<String> classNames = new ArrayList<String>();
-        for (String path : getSourcePaths(context)) {
+    public static List<String> getAllClasses() throws PackageManager.NameNotFoundException, IOException {
+        List<String> classNames = new ArrayList<>();
+        for (String path : getSourcePaths()) {
             try {
                 DexFile dexfile;
                 if (path.endsWith(EXTRACTED_SUFFIX)) {
@@ -94,8 +94,7 @@ public static List<String> getAllClasses(Context context) throws PackageManager.
                     classNames.add(dexEntries.nextElement());
                 }
             } catch (IOException e) {
-                throw new IOException("Error at loading dex file '" +
-                        path + "'");
+                throw new IOException("Error at loading dex file '" + path + "'");
             }
         }
         return classNames;
diff --git a/library/src/main/java/com/orm/util/NamingHelper.java b/library/src/main/java/com/orm/util/NamingHelper.java
index b7237c09..55253ebd 100644
--- a/library/src/main/java/com/orm/util/NamingHelper.java
+++ b/library/src/main/java/com/orm/util/NamingHelper.java
@@ -69,7 +69,7 @@ public static String toSQLName(Field field) {
     /**
      * Maps a Java Class to the name of the class.
      *
-     * @param table  the generic {@link java.lang.Class<T>} that defines a database table
+     * @param table  the generic {@link java.lang.Class} that defines a database table
      * @return if the given class is annotated with {@link com.orm.dsl.Table} then the value for
      *         {@link com.orm.dsl.Table#name()} will be returned. Else, the class' simple name will 
      *         be converted from CamelCase to UNDER_SCORE notation
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 1458a308..84285cac 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -26,6 +26,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.orm.util.ContextUtil.getContext;
+
 public class ReflectionUtil {
 
     public static List<Field> getTableFields(Class table) {
@@ -33,11 +35,11 @@ public static List<Field> getTableFields(Class table) {
         if (fieldList != null) return fieldList;
 
         Log.d("Sugar", "Fetching properties");
-        List<Field> typeFields = new ArrayList<Field>();
+        List<Field> typeFields = new ArrayList<>();
 
         getAllFields(typeFields, table);
 
-        List<Field> toStore = new ArrayList<Field>();
+        List<Field> toStore = new ArrayList<>();
         for (Field field : typeFields) {
             if (!field.isAnnotationPresent(Ignore.class) && !Modifier.isStatic(field.getModifiers()) && !Modifier.isTransient(field.getModifiers())) {
                 toStore.add(field);
@@ -163,7 +165,7 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
 
             if (colName.equalsIgnoreCase("id")) {
                 long cid = cursor.getLong(columnIndex);
-                field.set(object, Long.valueOf(cid));
+                field.set(object, cid);
             } else if (fieldType.equals(long.class) || fieldType.equals(Long.class)) {
                 field.set(object,
                         cursor.getLong(columnIndex));
@@ -217,22 +219,18 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
                 }
             } else
                 Log.e("Sugar", "Class cannot be read from Sqlite3 database. Please check the type of field " + field.getName() + "(" + field.getType().getName() + ")");
-        } catch (IllegalArgumentException e) {
-            Log.e("field set error", e.getMessage());
-        } catch (IllegalAccessException e) {
+        } catch (IllegalArgumentException | IllegalAccessException e) {
             Log.e("field set error", e.getMessage());
         }
     }
 
     private static Field getDeepField(String fieldName, Class<?> type) throws NoSuchFieldException {
         try {
-            Field field = type.getDeclaredField(fieldName);
-            return field;
+            return type.getDeclaredField(fieldName);
         } catch (NoSuchFieldException e) {
             Class superclass = type.getSuperclass();
             if (superclass != null) {
-                Field field = getDeepField(fieldName, superclass);
-                return field;
+                return getDeepField(fieldName, superclass);
             } else {
                 throw e;
             }
@@ -244,23 +242,19 @@ public static void setFieldValueForId(Object object, Long value) {
             Field field = getDeepField("id", object.getClass());
             field.setAccessible(true);
             field.set(object, value);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (NoSuchFieldException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public static List<Class> getDomainClasses(Context context) {
-        List<Class> domainClasses = new ArrayList<Class>();
+    public static List<Class> getDomainClasses() {
+        List<Class> domainClasses = new ArrayList<>();
         try {
-            for (String className : getAllClasses(context)) {
-                Class domainClass = getDomainClass(className, context);
+            for (String className : getAllClasses()) {
+                Class domainClass = getDomainClass(className);
                 if (domainClass != null) domainClasses.add(domainClass);
             }
-        } catch (IOException e) {
-            Log.e("Sugar", e.getMessage());
-        } catch (PackageManager.NameNotFoundException e) {
+        } catch (IOException | PackageManager.NameNotFoundException  e) {
             Log.e("Sugar", e.getMessage());
         }
 
@@ -268,10 +262,10 @@ public static List<Class> getDomainClasses(Context context) {
     }
 
 
-    private static Class getDomainClass(String className, Context context) {
+    private static Class getDomainClass(String className) {
         Class<?> discoveredClass = null;
         try {
-            discoveredClass = Class.forName(className, true, context.getClass().getClassLoader());
+            discoveredClass = Class.forName(className, true, getContext().getClass().getClassLoader());
         } catch (Throwable e) {
             String error = (e.getMessage() == null) ? "getDomainClass " + className + " error" : e.getMessage();
             Log.e("Sugar", error);
@@ -292,11 +286,11 @@ private static Class getDomainClass(String className, Context context) {
     }
 
 
-    private static List<String> getAllClasses(Context context) throws PackageManager.NameNotFoundException, IOException {
-        String packageName = ManifestHelper.getDomainPackageName(context);
-        List<String> classNames = new ArrayList<String>();
+    private static List<String> getAllClasses() throws PackageManager.NameNotFoundException, IOException {
+        String packageName = ManifestHelper.getDomainPackageName();
+        List<String> classNames = new ArrayList<>();
         try {
-            List<String> allClasses = MultiDexHelper.getAllClasses(context);
+            List<String> allClasses = MultiDexHelper.getAllClasses();
             for (String classString : allClasses) {
                 if (classString.startsWith(packageName)) classNames.add(classString);
             }
@@ -304,7 +298,7 @@ private static List<String> getAllClasses(Context context) throws PackageManager
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             Enumeration<URL> urls = classLoader.getResources("");
             while (urls.hasMoreElements()) {
-                List<String> fileNames = new ArrayList<String>();
+                List<String> fileNames = new ArrayList<>();
                 String classDirectoryName = urls.nextElement().getFile();
                 if (classDirectoryName.contains("bin") || classDirectoryName.contains("classes")
                         || classDirectoryName.contains("retrolambda")) {
@@ -317,9 +311,10 @@ private static List<String> getAllClasses(Context context) throws PackageManager
                     }
                 }
             }
-        } finally {
-//            if (null != dexfile) dexfile.close();
         }
+//        } finally {
+//            if (null != dexfile) dexfile.close();
+//        }
 
         return classNames;
     }
diff --git a/library/src/main/java/com/orm/util/SugarConfig.java b/library/src/main/java/com/orm/util/SugarConfig.java
index c8cf3868..9328c82f 100644
--- a/library/src/main/java/com/orm/util/SugarConfig.java
+++ b/library/src/main/java/com/orm/util/SugarConfig.java
@@ -6,10 +6,9 @@
 import java.util.List;
 import java.util.Map;
 
-
 public class SugarConfig {
 
-    static Map<Class<?>, List<Field>> fields = new HashMap<Class<?>, List<Field>>();
+    static Map<Class<?>, List<Field>> fields = new HashMap<>();
 
     public static void setFields(Class<?> clazz, List<Field> fieldz) {
          fields.put(clazz, fieldz);
@@ -26,7 +25,7 @@ public static List<Field> getFields(Class<?> clazz) {
 
     public static void clearCache() {
         fields.clear();
-        fields = new HashMap<Class<?>, List<Field>>();
+        fields = new HashMap<>();
     }
 
 }
diff --git a/library/src/main/java/com/orm/util/SugarCursor.java b/library/src/main/java/com/orm/util/SugarCursor.java
index e326f49b..d058c5c1 100644
--- a/library/src/main/java/com/orm/util/SugarCursor.java
+++ b/library/src/main/java/com/orm/util/SugarCursor.java
@@ -4,6 +4,7 @@
 import android.database.CursorWrapper;
 
 public class SugarCursor extends CursorWrapper {
+
     public SugarCursor(Cursor cursor) {
         super(cursor);
     }
diff --git a/library/src/main/java/com/orm/util/SugarCursorFactory.java b/library/src/main/java/com/orm/util/SugarCursorFactory.java
index 12706516..3274fccc 100644
--- a/library/src/main/java/com/orm/util/SugarCursorFactory.java
+++ b/library/src/main/java/com/orm/util/SugarCursorFactory.java
@@ -16,7 +16,6 @@ public SugarCursorFactory() {
     }
 
     public SugarCursorFactory(boolean debugEnabled) {
-
         this.debugEnabled = debugEnabled;
     }
 
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 24bae7bc..00dea418 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -7,6 +7,7 @@
 import com.orm.models.StringFieldExtendedModel;
 import com.orm.models.StringFieldExtendedModelAnnotatedColumn;
 import com.orm.query.DummyContext;
+import com.orm.util.ContextUtil;
 import com.orm.util.NamingHelper;
 
 import org.junit.Test;
@@ -14,9 +15,11 @@
 import static junit.framework.Assert.assertEquals;
 
 public class SchemaGeneratorTest {
+
     @Test
     public void testEmptyTableCreation() throws Exception {
-        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext());
+        ContextUtil.init(new DummyContext());
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(EmptyModel.class);
         assertEquals(
                 "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(EmptyModel.class) +
@@ -26,7 +29,8 @@ public void testEmptyTableCreation() throws Exception {
 
     @Test
     public void testSimpleColumnTableCreation() throws Exception {
-        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext());
+        ContextUtil.init(new DummyContext());
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(StringFieldExtendedModel.class);
         assertEquals(
                 "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldExtendedModel.class) +
@@ -53,7 +57,8 @@ public void testSimpleColumnTableCreation() throws Exception {
 
     @Test
     public void testUniqueTableCreation() {
-        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext());
+        ContextUtil.init(new DummyContext());
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(IntUniqueModel.class);
         assertEquals(
                 "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(IntUniqueModel.class) +
@@ -64,7 +69,8 @@ public void testUniqueTableCreation() {
 
     @Test
     public void testMultiColumnUniqueTableCreation() {
-        SchemaGenerator schemaGenerator = new SchemaGenerator(new DummyContext());
+        ContextUtil.init(new DummyContext());
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(MultiColumnUniqueModel.class);
         assertEquals(
                 "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(MultiColumnUniqueModel.class) +
diff --git a/library/src/test/java/com/orm/models/EmptyModel.java b/library/src/test/java/com/orm/models/EmptyModel.java
index 8efb9dd4..73459b51 100644
--- a/library/src/test/java/com/orm/models/EmptyModel.java
+++ b/library/src/test/java/com/orm/models/EmptyModel.java
@@ -6,7 +6,5 @@
  * Created by sibelius on 02/12/15.
  */
 public class EmptyModel extends SugarRecord {
-    public EmptyModel() {
-
-    }
+    public EmptyModel() { }
 }
diff --git a/library/src/test/java/com/orm/models/IntUniqueModel.java b/library/src/test/java/com/orm/models/IntUniqueModel.java
index e73e8968..d7b88d3f 100644
--- a/library/src/test/java/com/orm/models/IntUniqueModel.java
+++ b/library/src/test/java/com/orm/models/IntUniqueModel.java
@@ -7,12 +7,11 @@
  * Created by sibelius on 02/12/15.
  */
 public class IntUniqueModel extends SugarRecord {
+
     @Unique
     private int value;
 
-    public IntUniqueModel() {
-
-    }
+    public IntUniqueModel() { }
 
     public IntUniqueModel(int value) {
         this.value = value;
diff --git a/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java b/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java
index 73ab5d8e..eea5ec55 100644
--- a/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java
+++ b/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java
@@ -13,8 +13,7 @@ public class MultiColumnUniqueModel extends SugarRecord {
     private int a;
     private int b;
 
-    public MultiColumnUniqueModel() {
-    }
+    public MultiColumnUniqueModel() { }
 
     public MultiColumnUniqueModel(int a, int b) {
         this.a = a;
diff --git a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
index 1203db01..2f732b42 100644
--- a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
@@ -11,9 +11,7 @@
 public class StringFieldAnnotatedModel extends SugarRecord {
     public String name;
 
-    public StringFieldAnnotatedModel() {
-
-    }
+    public StringFieldAnnotatedModel() { }
 
     public StringFieldAnnotatedModel(String name) {
         this.name = name;
diff --git a/library/src/test/java/com/orm/models/StringFieldExtendedModel.java b/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
index ee781632..2aff85d7 100644
--- a/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
@@ -8,9 +8,7 @@
 public class StringFieldExtendedModel extends SugarRecord {
     public String name;
 
-    public StringFieldExtendedModel() {
-
-    }
+    public StringFieldExtendedModel() { }
 
     public StringFieldExtendedModel(String name) {
         this.name = name;
diff --git a/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java b/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
index 9f2b43cd..b2117926 100644
--- a/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
+++ b/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
@@ -10,9 +10,7 @@ public class StringFieldExtendedModelAnnotatedColumn extends SugarRecord {
     @Column(name="anyName")
     public String name;
 
-    public StringFieldExtendedModelAnnotatedColumn() {
-
-    }
+    public StringFieldExtendedModelAnnotatedColumn() { }
 
     public StringFieldExtendedModelAnnotatedColumn(String name) {
         this.name = name;
diff --git a/library/src/test/java/com/orm/query/QueryBuilderTests.java b/library/src/test/java/com/orm/query/QueryBuilderTests.java
index 96e3c79f..d43ca5ee 100644
--- a/library/src/test/java/com/orm/query/QueryBuilderTests.java
+++ b/library/src/test/java/com/orm/query/QueryBuilderTests.java
@@ -7,6 +7,7 @@
 import static junit.framework.Assert.assertEquals;
 
 public class QueryBuilderTests {
+
     @Test(expected=RuntimeException.class)
     public void noArgumentsTest() {
         QueryBuilder.generatePlaceholders(0);
diff --git a/library/src/test/java/com/orm/query/TestRecord.java b/library/src/test/java/com/orm/query/TestRecord.java
index 50997205..383a5234 100644
--- a/library/src/test/java/com/orm/query/TestRecord.java
+++ b/library/src/test/java/com/orm/query/TestRecord.java
@@ -1,13 +1,12 @@
 package com.orm.query;
 
-import android.content.Context;
 import com.orm.SugarRecord;
 
 public class TestRecord extends SugarRecord {
 
     private String name;
 
-    public TestRecord(Context context) {
+    public TestRecord() {
         super();
     }
 }
diff --git a/library/src/test/java/com/orm/util/MigrationFileParserTest.java b/library/src/test/java/com/orm/util/MigrationFileParserTest.java
index 536af4cb..72b9f9ca 100644
--- a/library/src/test/java/com/orm/util/MigrationFileParserTest.java
+++ b/library/src/test/java/com/orm/util/MigrationFileParserTest.java
@@ -1,20 +1,15 @@
 package com.orm.util;
 
-import com.orm.util.MigrationFileParser;
-
 import org.junit.Test;
-import org.junit.Before;
 
 import java.lang.String;
 
 import static junit.framework.Assert.assertEquals;
 
-public class MigrationFileParserTest{
-    MigrationFileParser emptyFile;
+public class MigrationFileParserTest {
 
     @Test
-    public void testSingleLineStatement()
-    {
+    public void testSingleLineStatement() {
         MigrationFileParser singleLineComment = new MigrationFileParser("insert into table--comment");
 
         String statements[] = singleLineComment.getStatements();
@@ -27,8 +22,9 @@ public void testSingleLineStatement()
         assertEquals("Testing single line statement size",1,statements.length);
         assertEquals("Testing single line statement content","insert into table",statements[0]);
     }
+
     @Test
-    public void testMultiLineComment(){
+    public void testMultiLineComment() {
         MigrationFileParser multiLineComment = new MigrationFileParser("insert into table /**comment \n new line 2 \n new line 3 */hello");
 
         String statements[] = multiLineComment.getStatements();
@@ -37,7 +33,7 @@ public void testMultiLineComment(){
     }
 
     @Test
-    public void testMixedComment(){
+    public void testMixedComment() {
         MigrationFileParser mixedComment = new MigrationFileParser("insert into/*multiline\n **comment*/--comment");
 
         String statements[] = mixedComment.getStatements();

From 331f61c765d31009d1a0f8e5a8cef82264560de9 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 3 Apr 2016 22:26:13 -0300
Subject: [PATCH 230/305] Updated example app build.gradle file app-compat
 dependency

---
 example/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/build.gradle b/example/build.gradle
index 15ba8d9c..b9fe1be7 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -25,7 +25,7 @@ android {
 
 dependencies {
     compile project (':library')
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.2.1'
     testCompile 'org.robolectric:robolectric:3.0'
     testCompile 'junit:junit:4.12'
 }

From a814f31d844dc2e0d3d3b77edadeaa70c30723fa Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 3 Apr 2016 22:31:09 -0300
Subject: [PATCH 231/305] Updated travis.yml buildTools version to 23.0.3

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 80ca1ced..db407323 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ android:
   components:
     - sys-img-armeabi-v7a-android-23
     - tools
-    - build-tools-23.0.2
+    - build-tools-23.0.3
     - android-23
     - extra-android-m2repository
 before_script:

From e776a3e033170f9c517ab5ce7b491f7540e3d2e8 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 3 Apr 2016 23:08:31 -0300
Subject: [PATCH 232/305] Added two test to keep coverage

---
 .../java/com/orm/util/ContextUtilTest.java    | 59 +++++++++++++++++++
 .../java/com/orm/util/KeyWordUtilTest.java    | 24 ++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 library/src/test/java/com/orm/util/ContextUtilTest.java
 create mode 100644 library/src/test/java/com/orm/util/KeyWordUtilTest.java

diff --git a/library/src/test/java/com/orm/util/ContextUtilTest.java b/library/src/test/java/com/orm/util/ContextUtilTest.java
new file mode 100644
index 00000000..fc627076
--- /dev/null
+++ b/library/src/test/java/com/orm/util/ContextUtilTest.java
@@ -0,0 +1,59 @@
+package com.orm.util;
+
+import android.content.Context;
+
+import com.orm.query.DummyContext;
+
+import org.junit.Test;
+
+
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static com.orm.util.ContextUtil.*;
+
+/**
+ * @author jonatan.salas
+ */
+public class ContextUtilTest {
+
+    public void initContextUtil() {
+        init(new DummyContext());
+    }
+
+    @Test
+    public void testInitContext() {
+        initContextUtil();
+        assertNotNull(getContext());
+    }
+
+    @Test
+    public void testGetAssets() {
+        initContextUtil();
+        assertNull(getAssets());
+    }
+
+    @Test
+    public void testGetPackageManager() {
+        initContextUtil();
+        assertNull(getPackageManager());
+    }
+
+    @Test
+    public void testGetPackageName() {
+        initContextUtil();
+        assertNull(getPackageName());
+    }
+
+    @Test
+    public void testGetPreferences() {
+        initContextUtil();
+        assertNull(getSharedPreferences("lala", Context.MODE_PRIVATE));
+    }
+
+    @Test
+    public void testTerminateContext() {
+        initContextUtil();
+        terminate();
+        assertNull(getContext());
+    }
+}
diff --git a/library/src/test/java/com/orm/util/KeyWordUtilTest.java b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
new file mode 100644
index 00000000..511f0a1e
--- /dev/null
+++ b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
@@ -0,0 +1,24 @@
+package com.orm.util;
+
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+/**
+ * @author jonatan.salas
+ */
+public class KeyWordUtilTest {
+
+    @Test
+    public void testKeyWord() {
+        assertEquals(true, KeyWordUtil.isKeyword("SELECT"));
+        assertEquals(true, KeyWordUtil.isKeyword("TRANSACTION"));
+        assertEquals(true, KeyWordUtil.isKeyword("MATCH"));
+        assertEquals(true, KeyWordUtil.isKeyword("AS"));
+        assertEquals(true, KeyWordUtil.isKeyword("NOTNULL"));
+        assertEquals(true, KeyWordUtil.isKeyword("NOT"));
+        assertEquals(false, KeyWordUtil.isKeyword("PERSONS"));
+        assertEquals(false, KeyWordUtil.isKeyword("NAME"));
+        assertEquals(false, KeyWordUtil.isKeyword("LOCATION"));
+    }
+}

From 94f296f8bf5c32ef45a60e5998e98cefa75e9c70 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 3 Apr 2016 23:40:51 -0300
Subject: [PATCH 233/305] Minimal modifications in KeyWordUtil Added to
 ManifestHelper a private constructor in order to not instance by error Added
 ManifestHelperTest to test basic methods functionality Added testNullKeyWord
 in KeyWordUtilTest

---
 .../main/java/com/orm/util/KeyWordUtil.java   |  4 ++
 .../java/com/orm/util/ManifestHelper.java     |  5 +-
 .../java/com/orm/util/KeyWordUtilTest.java    |  5 ++
 .../java/com/orm/util/ManifestHelperTest.java | 49 +++++++++++++++++++
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 library/src/test/java/com/orm/util/ManifestHelperTest.java

diff --git a/library/src/main/java/com/orm/util/KeyWordUtil.java b/library/src/main/java/com/orm/util/KeyWordUtil.java
index d3b65cf2..8983e7cf 100644
--- a/library/src/main/java/com/orm/util/KeyWordUtil.java
+++ b/library/src/main/java/com/orm/util/KeyWordUtil.java
@@ -25,6 +25,10 @@ public final class KeyWordUtil {
     private KeyWordUtil() { }
 
     public static boolean isKeyword(String word) {
+        if (null == word) {
+            return false;
+        }
+
         for (String keyWord: KEY_WORDS) {
             if (keyWord.equals(word)) {
                 return true;
diff --git a/library/src/main/java/com/orm/util/ManifestHelper.java b/library/src/main/java/com/orm/util/ManifestHelper.java
index beacfc53..f986a58b 100644
--- a/library/src/main/java/com/orm/util/ManifestHelper.java
+++ b/library/src/main/java/com/orm/util/ManifestHelper.java
@@ -9,7 +9,7 @@
 /**
  * Helper class for accessing properties in the AndroidManifest
  */
-public class ManifestHelper {
+public final class ManifestHelper {
     private static final String LOG_TAG = "Sugar";
 
     /**
@@ -29,6 +29,9 @@ public class ManifestHelper {
      */
     public final static String DATABASE_DEFAULT_NAME = "Sugar.db";
 
+    //Prevent instantiation
+    private ManifestHelper() { }
+
     /**
      * Grabs the database version from the manifest.
      *
diff --git a/library/src/test/java/com/orm/util/KeyWordUtilTest.java b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
index 511f0a1e..0f132e3a 100644
--- a/library/src/test/java/com/orm/util/KeyWordUtilTest.java
+++ b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
@@ -21,4 +21,9 @@ public void testKeyWord() {
         assertEquals(false, KeyWordUtil.isKeyword("NAME"));
         assertEquals(false, KeyWordUtil.isKeyword("LOCATION"));
     }
+
+    @Test
+    public void testNullKeyword() {
+        assertEquals(false, KeyWordUtil.isKeyword(null));
+    }
 }
diff --git a/library/src/test/java/com/orm/util/ManifestHelperTest.java b/library/src/test/java/com/orm/util/ManifestHelperTest.java
new file mode 100644
index 00000000..01431634
--- /dev/null
+++ b/library/src/test/java/com/orm/util/ManifestHelperTest.java
@@ -0,0 +1,49 @@
+package com.orm.util;
+
+import com.orm.query.DummyContext;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+import static com.orm.util.ManifestHelper.*;
+import static com.orm.util.ContextUtil.init;
+
+/**
+ * @author jonatan.salas
+ */
+public class ManifestHelperTest {
+
+    public void initContext() {
+        init(new DummyContext());
+    }
+
+    @Test
+    public void testGetDbName() {
+        initContext();
+        assertEquals(DATABASE_DEFAULT_NAME, getDatabaseName());
+    }
+
+    @Test
+    public void testGetDatabaseName() {
+        initContext();
+        assertEquals(DATABASE_DEFAULT_NAME, getDatabaseName());
+    }
+
+    @Test
+    public void testGetDatabaseVersion() {
+        initContext();
+        assertEquals(1, getDatabaseVersion());
+    }
+
+    @Test
+    public void testGetDomainPackageName() {
+        initContext();
+        assertNotNull(getDomainPackageName());
+    }
+
+    @Test
+    public void testGetDebugEnabled() {
+        initContext();
+        assertEquals(false, getDebugEnabled());
+    }
+}

From 92301eadc1ee228155d5c8c1c0fde35bfc5e4469 Mon Sep 17 00:00:00 2001
From: imfhk <firas.alkafri@gmail.com>
Date: Tue, 5 Apr 2016 11:35:34 +0300
Subject: [PATCH 234/305] Add Instant Run support

---
 .../src/main/java/com/orm/util/MultiDexHelper.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/orm/util/MultiDexHelper.java b/library/src/main/java/com/orm/util/MultiDexHelper.java
index 7d8c2642..c074eeee 100644
--- a/library/src/main/java/com/orm/util/MultiDexHelper.java
+++ b/library/src/main/java/com/orm/util/MultiDexHelper.java
@@ -25,7 +25,7 @@
 public class MultiDexHelper {
     private static final String EXTRACTED_NAME_EXT = ".classes";
     private static final String EXTRACTED_SUFFIX = ".zip";
-
+    private static final String INSTANT_RUN_DEX_DIR_PATH = "files/instant-run/dex/";
     private static final String SECONDARY_FOLDER_NAME = "code_cache" + File.separator + "secondary-dexes";
     private static final String PREFS_FILE = "multidex.version";
     private static final String KEY_DEX_NUMBER = "dex.number";
@@ -41,7 +41,7 @@ private static SharedPreferences getMultiDexPreferences() {
     /**
      * get all the dex path
      *
-     * @return all the dex path
+     * @return all the dex path, including the ones in the newly added instant-run folder
      * @throws PackageManager.NameNotFoundException
      * @throws IOException
      */
@@ -49,10 +49,17 @@ public static List<String> getSourcePaths() throws PackageManager.NameNotFoundEx
         ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(getPackageName(), 0);
         File sourceApk = new File(applicationInfo.sourceDir);
         File dexDir = new File(applicationInfo.dataDir, SECONDARY_FOLDER_NAME);
+        File instantRunDir = new File(applicationInfo.dataDir, INSTANT_RUN_DEX_DIR_PATH); //default instant-run dir
 
         List<String> sourcePaths = new ArrayList<>();
         sourcePaths.add(applicationInfo.sourceDir); //add the default apk path
 
+        if (instantRunDir.exists()) { //check if app using instant run
+            for(final File dexFile : instantRunDir.listFiles()) { //add all sources from instan-run
+                sourcePaths.add(dexFile.getAbsolutePath());
+            }
+        }
+
         //the prefix of extracted file, ie: test.classes
         String extractedFilePrefix = sourceApk.getName() + EXTRACTED_NAME_EXT;
         //the total dex numbers
@@ -99,4 +106,4 @@ public static List<String> getAllClasses() throws PackageManager.NameNotFoundExc
         }
         return classNames;
     }
-}
\ No newline at end of file
+}

From 519c83db53422b452df293c742d4d6a6cac95022 Mon Sep 17 00:00:00 2001
From: Enrico Bruno Del Zotto <enrico.delzotto@smartfocus.com>
Date: Tue, 5 Apr 2016 14:25:54 +0100
Subject: [PATCH 235/305] Class not found in getDomainClass
 https://github.com/satyan/sugar/issues/519#issuecomment-205794898 problem

---
 library/src/main/java/com/orm/util/ReflectionUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 84285cac..2ff1162b 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -265,7 +265,7 @@ public static List<Class> getDomainClasses() {
     private static Class getDomainClass(String className) {
         Class<?> discoveredClass = null;
         try {
-            discoveredClass = Class.forName(className, true, getContext().getClass().getClassLoader());
+            discoveredClass = Class.forName(className, true, Thread.currentThread().getContextClassLoader());
         } catch (Throwable e) {
             String error = (e.getMessage() == null) ? "getDomainClass " + className + " error" : e.getMessage();
             Log.e("Sugar", error);

From 86cd849362a3df492f4a48dd494c0013e086c08f Mon Sep 17 00:00:00 2001
From: Admin <111>
Date: Wed, 6 Apr 2016 18:17:16 +0300
Subject: [PATCH 236/305] Remove unnecessary console spam, as result: speed up
 + 20-30%

Remove unnecessary console spam, as result: speed up + 20-30%
---
 library/src/main/java/com/orm/SugarContext.java |  9 ++++++++-
 library/src/main/java/com/orm/SugarDb.java      | 17 ++++++++++++-----
 library/src/main/java/com/orm/SugarRecord.java  |  7 +++++--
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 511126f5..4560dd2c 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 
 import com.orm.util.ContextUtil;
+import com.orm.util.ManifestHelper;
 
 import java.util.Collections;
 import java.util.Map;
@@ -13,9 +14,11 @@ public class SugarContext {
     private static SugarContext instance = null;
     private SugarDb sugarDb;
     private Map<Object, Long> entitiesMap;
+    private boolean debugEnabled;
 
     private SugarContext() {
-        this.sugarDb = SugarDb.getInstance();
+        this.debugEnabled = ManifestHelper.getDebugEnabled();
+        this.sugarDb = SugarDb.getInstance(debugEnabled);
         this.entitiesMap = Collections.synchronizedMap(new WeakHashMap<Object, Long>());
     }
     
@@ -58,4 +61,8 @@ public SugarDb getSugarDb() {
     Map<Object, Long> getEntitiesMap() {
         return entitiesMap;
     }
+
+    public boolean isDebugEnabled() {
+        return debugEnabled;
+    }
 }
diff --git a/library/src/main/java/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
index 2b653ee7..6f3341d9 100644
--- a/library/src/main/java/com/orm/SugarDb.java
+++ b/library/src/main/java/com/orm/SugarDb.java
@@ -4,14 +4,13 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
+import com.orm.util.ManifestHelper;
 import com.orm.util.SugarCursorFactory;
 
+import static com.orm.util.ContextUtil.getContext;
 import static com.orm.util.ManifestHelper.getDatabaseVersion;
-import static com.orm.util.ManifestHelper.getDebugEnabled;
 import static com.orm.util.ManifestHelper.getDbName;
 
-import static com.orm.util.ContextUtil.*;
-
 public class SugarDb extends SQLiteOpenHelper {
     private static final String LOG_TAG = "Sugar";
 
@@ -20,15 +19,23 @@ public class SugarDb extends SQLiteOpenHelper {
     private int openedConnections = 0;
 
     //Prevent instantiation
-    private SugarDb() {
-        super(getContext(), getDbName(), new SugarCursorFactory(getDebugEnabled()), getDatabaseVersion());
+    private SugarDb(boolean debugEnabled) {
+        super(getContext(), getDbName(), new SugarCursorFactory(debugEnabled), getDatabaseVersion());
         schemaGenerator = SchemaGenerator.getInstance();
     }
 
+    private SugarDb() {
+        this(ManifestHelper.getDebugEnabled());
+    }
+
     public static SugarDb getInstance() {
         return new SugarDb();
     }
 
+    public static SugarDb getInstance(boolean debugEnabled) {
+        return new SugarDb(debugEnabled);
+    }
+
     @Override
     public void onCreate(SQLiteDatabase sqLiteDatabase) {
         schemaGenerator.createDatabase(sqLiteDatabase);
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 44cee5ff..3baf3263 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -265,7 +265,8 @@ public static long save(Object object) {
     }
 
     static long save(SQLiteDatabase db, Object object) {
-        Map<Object, Long> entitiesMap = getSugarContext().getEntitiesMap();
+        SugarContext context = getSugarContext();
+        Map<Object, Long> entitiesMap = context.getEntitiesMap();
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
         ContentValues values = new ContentValues(columns.size());
         Field idField = null;
@@ -299,7 +300,9 @@ static long save(SQLiteDatabase db, Object object) {
             ((SugarRecord) object).setId(id);
         }
 
-        Log.i(SUGAR, object.getClass().getSimpleName() + " saved : " + id);
+        if (context.isDebugEnabled()) {
+            Log.i(SUGAR, object.getClass().getSimpleName() + " saved : " + id);
+        }
 
         return id;
     }

From 02e15ed7a3565098714177bed003c898ab08825d Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 20:58:54 +0300
Subject: [PATCH 237/305] Update SugarContext.java

move to ManifestHelper
---
 library/src/main/java/com/orm/SugarContext.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 4560dd2c..16e16913 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -14,11 +14,10 @@ public class SugarContext {
     private static SugarContext instance = null;
     private SugarDb sugarDb;
     private Map<Object, Long> entitiesMap;
-    private boolean debugEnabled;
 
     private SugarContext() {
-        this.debugEnabled = ManifestHelper.getDebugEnabled();
-        this.sugarDb = SugarDb.getInstance(debugEnabled);
+        ManifestHelper.loadDebugEnabled();
+        this.sugarDb = SugarDb.getInstance();
         this.entitiesMap = Collections.synchronizedMap(new WeakHashMap<Object, Long>());
     }
     

From 233a6f97d5747c2edbac423c0a7b9f3300b37af8 Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 20:59:39 +0300
Subject: [PATCH 238/305] moved to ManifestHelper

---
 library/src/main/java/com/orm/SugarDb.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
index 6f3341d9..57e8e89a 100644
--- a/library/src/main/java/com/orm/SugarDb.java
+++ b/library/src/main/java/com/orm/SugarDb.java
@@ -19,23 +19,15 @@ public class SugarDb extends SQLiteOpenHelper {
     private int openedConnections = 0;
 
     //Prevent instantiation
-    private SugarDb(boolean debugEnabled) {
-        super(getContext(), getDbName(), new SugarCursorFactory(debugEnabled), getDatabaseVersion());
-        schemaGenerator = SchemaGenerator.getInstance();
-    }
-
     private SugarDb() {
-        this(ManifestHelper.getDebugEnabled());
+        super(getContext(), getDbName(), new SugarCursorFactory(ManifestHelper.isDebugEnabled()), getDatabaseVersion());
+        schemaGenerator = SchemaGenerator.getInstance();
     }
 
     public static SugarDb getInstance() {
         return new SugarDb();
     }
 
-    public static SugarDb getInstance(boolean debugEnabled) {
-        return new SugarDb(debugEnabled);
-    }
-
     @Override
     public void onCreate(SQLiteDatabase sqLiteDatabase) {
         schemaGenerator.createDatabase(sqLiteDatabase);

From 488c6b0105c5b2bad6d421cc67b7f3ce34b2232e Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 21:00:36 +0300
Subject: [PATCH 239/305] Update SugarRecord.java

---
 library/src/main/java/com/orm/SugarRecord.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 3baf3263..78d34fa5 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -265,8 +265,7 @@ public static long save(Object object) {
     }
 
     static long save(SQLiteDatabase db, Object object) {
-        SugarContext context = getSugarContext();
-        Map<Object, Long> entitiesMap = context.getEntitiesMap();
+        Map<Object, Long> entitiesMap = getSugarContext().getEntitiesMap();
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
         ContentValues values = new ContentValues(columns.size());
         Field idField = null;
@@ -300,7 +299,7 @@ static long save(SQLiteDatabase db, Object object) {
             ((SugarRecord) object).setId(id);
         }
 
-        if (context.isDebugEnabled()) {
+        if (ManifestHelper.isDebugEnabled()) {
             Log.i(SUGAR, object.getClass().getSimpleName() + " saved : " + id);
         }
 

From e6752ac0375bf35ce98b512da05e4f4bc85c9b7d Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 21:02:03 +0300
Subject: [PATCH 240/305] Update SugarRecord.java

---
 library/src/main/java/com/orm/SugarRecord.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 78d34fa5..7f429c26 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -10,6 +10,7 @@
 
 import com.orm.dsl.Table;
 import com.orm.dsl.Unique;
+import com.orm.util.ManifestHelper;
 import com.orm.util.NamingHelper;
 import com.orm.util.QueryBuilder;
 import com.orm.util.ReflectionUtil;

From c81685ce36b23ccdade6ab323060cf65a3da65f5 Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 21:04:20 +0300
Subject: [PATCH 241/305] Update ManifestHelper.java

---
 library/src/main/java/com/orm/util/ManifestHelper.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/util/ManifestHelper.java b/library/src/main/java/com/orm/util/ManifestHelper.java
index f986a58b..ef539127 100644
--- a/library/src/main/java/com/orm/util/ManifestHelper.java
+++ b/library/src/main/java/com/orm/util/ManifestHelper.java
@@ -11,6 +11,7 @@
  */
 public final class ManifestHelper {
     private static final String LOG_TAG = "Sugar";
+    private static boolean debugEnabled;
 
     /**
      * Key for the database name meta data.
@@ -88,8 +89,12 @@ public static String getDbName() {
      *
      * @return true if the debug flag is enabled
      */
-    public static boolean getDebugEnabled() {
-        return getMetaDataBoolean(METADATA_QUERY_LOG);
+    public static boolean isDebugEnabled() {
+        return debugEnabled;
+    }
+
+    public static void loadDebugEnabled() {
+        debugEnabled = getMetaDataBoolean(METADATA_QUERY_LOG);
     }
 
     private static String getMetaDataString(String name) {

From a85264f42f0bcbef61cc059642d6a16b55f76d05 Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 21:05:47 +0300
Subject: [PATCH 242/305] Update ManifestHelperTest.java

---
 library/src/test/java/com/orm/util/ManifestHelperTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/test/java/com/orm/util/ManifestHelperTest.java b/library/src/test/java/com/orm/util/ManifestHelperTest.java
index 01431634..2ec32a47 100644
--- a/library/src/test/java/com/orm/util/ManifestHelperTest.java
+++ b/library/src/test/java/com/orm/util/ManifestHelperTest.java
@@ -44,6 +44,6 @@ public void testGetDomainPackageName() {
     @Test
     public void testGetDebugEnabled() {
         initContext();
-        assertEquals(false, getDebugEnabled());
+        assertEquals(false, isDebugEnabled());
     }
 }

From f025692fb08226144ad659185820f49f09767bd7 Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 21:09:09 +0300
Subject: [PATCH 243/305] Update SugarContext.java

---
 library/src/main/java/com/orm/SugarContext.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 16e16913..e6b7b06c 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -60,8 +60,4 @@ public SugarDb getSugarDb() {
     Map<Object, Long> getEntitiesMap() {
         return entitiesMap;
     }
-
-    public boolean isDebugEnabled() {
-        return debugEnabled;
-    }
 }

From d630e3977288b12a41ea3f72377f9e3d0c1f9886 Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 21:14:03 +0300
Subject: [PATCH 244/305] Update ManifestHelper.java

---
 library/src/main/java/com/orm/util/ManifestHelper.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/library/src/main/java/com/orm/util/ManifestHelper.java b/library/src/main/java/com/orm/util/ManifestHelper.java
index ef539127..b9c12c9a 100644
--- a/library/src/main/java/com/orm/util/ManifestHelper.java
+++ b/library/src/main/java/com/orm/util/ManifestHelper.java
@@ -11,7 +11,7 @@
  */
 public final class ManifestHelper {
     private static final String LOG_TAG = "Sugar";
-    private static boolean debugEnabled;
+    private static Boolean debugEnabled = null;
 
     /**
      * Key for the database name meta data.
@@ -90,11 +90,7 @@ public static String getDbName() {
      * @return true if the debug flag is enabled
      */
     public static boolean isDebugEnabled() {
-        return debugEnabled;
-    }
-
-    public static void loadDebugEnabled() {
-        debugEnabled = getMetaDataBoolean(METADATA_QUERY_LOG);
+        return (null == debugEnabled) ? debugEnabled = getMetaDataBoolean(METADATA_QUERY_LOG) : debugEnabled;
     }
 
     private static String getMetaDataString(String name) {

From 0d3bed9ffa85cfd53f3d07b25073e852ac3aab88 Mon Sep 17 00:00:00 2001
From: Rexee <Rexee@users.noreply.github.com>
Date: Wed, 6 Apr 2016 21:14:24 +0300
Subject: [PATCH 245/305] Update SugarContext.java

---
 library/src/main/java/com/orm/SugarContext.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index e6b7b06c..511126f5 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 
 import com.orm.util.ContextUtil;
-import com.orm.util.ManifestHelper;
 
 import java.util.Collections;
 import java.util.Map;
@@ -16,7 +15,6 @@ public class SugarContext {
     private Map<Object, Long> entitiesMap;
 
     private SugarContext() {
-        ManifestHelper.loadDebugEnabled();
         this.sugarDb = SugarDb.getInstance();
         this.entitiesMap = Collections.synchronizedMap(new WeakHashMap<Object, Long>());
     }

From a4c94ef284887803d232d7b2535584b055d6b4a6 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Wed, 6 Apr 2016 17:11:23 -0300
Subject: [PATCH 246/305] Project Update: Updated dsl package name to
 annotation to keep consistence. Created package helper where it goes all
 helper classes. Minimal changes in helper classes, all of them are final
 classes and have private constructor to prevent from generating instances.

---
 .../models/BigDecimalFieldAnnotatedModel.java   |  2 +-
 .../models/BooleanFieldAnnotatedModel.java      |  2 +-
 .../example/models/ByteArrayAnnotatedModel.java |  2 +-
 .../models/DoubleFieldAnnotatedModel.java       |  2 +-
 .../example/models/EnumFieldAnnotatedModel.java |  2 +-
 .../models/FloatFieldAnnotatedModel.java        |  2 +-
 .../models/IncompleteAnnotatedModel.java        |  2 +-
 .../models/IntegerFieldAnnotatedModel.java      |  2 +-
 .../example/models/LongFieldAnnotatedModel.java |  2 +-
 .../example/models/NestedAnnotatedModel.java    |  2 +-
 .../com/example/models/NestedMixedBAModel.java  |  2 +-
 .../com/example/models/NestedMixedBBModel.java  |  2 +-
 .../models/RelationshipAnnotatedModel.java      |  2 +-
 .../example/models/RelationshipMixedBModel.java |  2 +-
 .../models/ShortFieldAnnotatedModel.java        |  2 +-
 .../example/models/SimpleAnnotatedModel.java    |  2 +-
 .../models/StringFieldAnnotatedModel.java       |  2 +-
 .../models/StringFieldAnnotatedNoIdModel.java   |  2 +-
 .../sugartest/SimpleAnnotatedModelTests.java    |  2 +-
 .../sugartest/SimpleExtendedModelTests.java     |  2 +-
 .../src/main/java/com/orm/SchemaGenerator.java  | 10 +++++-----
 library/src/main/java/com/orm/SugarDb.java      |  6 +++---
 library/src/main/java/com/orm/SugarRecord.java  |  8 ++++----
 .../com/orm/{dsl => annotation}/Column.java     |  2 +-
 .../com/orm/{dsl => annotation}/Ignore.java     |  2 +-
 .../orm/{dsl => annotation}/MultiUnique.java    |  2 +-
 .../com/orm/{dsl => annotation}/NotNull.java    |  2 +-
 .../java/com/orm/{dsl => annotation}/Table.java |  2 +-
 .../com/orm/{dsl => annotation}/Unique.java     |  2 +-
 .../orm/{util => helper}/ManifestHelper.java    |  2 +-
 .../orm/{util => helper}/MultiDexHelper.java    |  7 +++++--
 .../com/orm/{util => helper}/NamingHelper.java  | 17 ++++++++++-------
 .../{ => helper}/SugarTransactionHelper.java    | 17 +++++++++++++----
 library/src/main/java/com/orm/query/Select.java |  2 +-
 .../main/java/com/orm/util/ReflectionUtil.java  |  9 +++++----
 .../src/test/java/com/orm/NamingHelperTest.java |  2 +-
 .../test/java/com/orm/SchemaGeneratorTest.java  |  2 +-
 .../java/com/orm/models/IntUniqueModel.java     |  2 +-
 .../com/orm/models/MultiColumnUniqueModel.java  |  3 +--
 .../orm/models/StringFieldAnnotatedModel.java   |  3 +--
 ...StringFieldExtendedModelAnnotatedColumn.java |  2 +-
 .../java/com/orm/util/ManifestHelperTest.java   |  2 +-
 42 files changed, 80 insertions(+), 66 deletions(-)
 rename library/src/main/java/com/orm/{dsl => annotation}/Column.java (92%)
 rename library/src/main/java/com/orm/{dsl => annotation}/Ignore.java (90%)
 rename library/src/main/java/com/orm/{dsl => annotation}/MultiUnique.java (90%)
 rename library/src/main/java/com/orm/{dsl => annotation}/NotNull.java (90%)
 rename library/src/main/java/com/orm/{dsl => annotation}/Table.java (90%)
 rename library/src/main/java/com/orm/{dsl => annotation}/Unique.java (90%)
 rename library/src/main/java/com/orm/{util => helper}/ManifestHelper.java (99%)
 rename library/src/main/java/com/orm/{util => helper}/MultiDexHelper.java (97%)
 rename library/src/main/java/com/orm/{util => helper}/NamingHelper.java (87%)
 rename library/src/main/java/com/orm/{ => helper}/SugarTransactionHelper.java (63%)

diff --git a/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java b/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
index b3b60e98..bd4fd846 100644
--- a/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 import java.math.BigDecimal;
 
diff --git a/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java b/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
index d3a63edc..d46455f4 100644
--- a/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class BooleanFieldAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java b/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
index da0b3ece..f92c277a 100644
--- a/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class ByteArrayAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java b/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
index 2f5fd428..1657d23e 100644
--- a/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class DoubleFieldAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java b/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
index 34bf2f7e..8303c787 100644
--- a/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class EnumFieldAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java b/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
index 6d7f5e42..6da3fcc5 100644
--- a/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class FloatFieldAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java b/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
index e524d22f..ccb47fa8 100644
--- a/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class IncompleteAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java b/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
index 1b860ce1..b4bcd03a 100644
--- a/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class IntegerFieldAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java b/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
index c3986576..9900bf8c 100644
--- a/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class LongFieldAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/NestedAnnotatedModel.java b/example/src/main/java/com/example/models/NestedAnnotatedModel.java
index 8e834486..c7ec80fd 100644
--- a/example/src/main/java/com/example/models/NestedAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/NestedAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class NestedAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/NestedMixedBAModel.java b/example/src/main/java/com/example/models/NestedMixedBAModel.java
index 55a1e63b..338f748e 100644
--- a/example/src/main/java/com/example/models/NestedMixedBAModel.java
+++ b/example/src/main/java/com/example/models/NestedMixedBAModel.java
@@ -1,7 +1,7 @@
 package com.example.models;
 
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class NestedMixedBAModel {
diff --git a/example/src/main/java/com/example/models/NestedMixedBBModel.java b/example/src/main/java/com/example/models/NestedMixedBBModel.java
index b784f407..439eb5d9 100644
--- a/example/src/main/java/com/example/models/NestedMixedBBModel.java
+++ b/example/src/main/java/com/example/models/NestedMixedBBModel.java
@@ -1,7 +1,7 @@
 package com.example.models;
 
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class NestedMixedBBModel {
diff --git a/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java b/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
index aa0fff9c..44faeed0 100644
--- a/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class RelationshipAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/RelationshipMixedBModel.java b/example/src/main/java/com/example/models/RelationshipMixedBModel.java
index 9c9d2771..525ad2e0 100644
--- a/example/src/main/java/com/example/models/RelationshipMixedBModel.java
+++ b/example/src/main/java/com/example/models/RelationshipMixedBModel.java
@@ -1,7 +1,7 @@
 package com.example.models;
 
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class RelationshipMixedBModel {
diff --git a/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java b/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
index 8393974b..0d732b7f 100644
--- a/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class ShortFieldAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/SimpleAnnotatedModel.java b/example/src/main/java/com/example/models/SimpleAnnotatedModel.java
index 08d3b0fd..7e9e7db4 100644
--- a/example/src/main/java/com/example/models/SimpleAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/SimpleAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 
 @Table
diff --git a/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java b/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
index 05420d44..d4e86aa4 100644
--- a/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
+++ b/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class StringFieldAnnotatedModel {
diff --git a/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java b/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
index 1c12d581..54737775 100644
--- a/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
+++ b/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
@@ -1,6 +1,6 @@
 package com.example.models;
 
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 @Table
 public class StringFieldAnnotatedNoIdModel {
diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
index 7bfe0108..bce99ffe 100644
--- a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
@@ -2,7 +2,7 @@
 
 import com.example.models.SimpleAnnotatedModel;
 import com.orm.SugarRecord;
-import com.orm.util.NamingHelper;
+import com.orm.helper.NamingHelper;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
index aa860270..e8645fb4 100644
--- a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
@@ -2,7 +2,7 @@
 
 import com.example.models.SimpleExtendedModel;
 import com.orm.SugarRecord;
-import com.orm.util.NamingHelper;
+import com.orm.helper.NamingHelper;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index b2da4d86..2f95b568 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -5,13 +5,13 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
-import com.orm.dsl.Column;
-import com.orm.dsl.MultiUnique;
-import com.orm.dsl.NotNull;
-import com.orm.dsl.Unique;
+import com.orm.annotation.Column;
+import com.orm.annotation.MultiUnique;
+import com.orm.annotation.NotNull;
+import com.orm.annotation.Unique;
 import com.orm.util.KeyWordUtil;
 import com.orm.util.MigrationFileParser;
-import com.orm.util.NamingHelper;
+import com.orm.helper.NamingHelper;
 import com.orm.util.NumberComparator;
 import com.orm.util.QueryBuilder;
 import com.orm.util.ReflectionUtil;
diff --git a/library/src/main/java/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
index 57e8e89a..a95a7055 100644
--- a/library/src/main/java/com/orm/SugarDb.java
+++ b/library/src/main/java/com/orm/SugarDb.java
@@ -4,12 +4,12 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
-import com.orm.util.ManifestHelper;
+import com.orm.helper.ManifestHelper;
 import com.orm.util.SugarCursorFactory;
 
 import static com.orm.util.ContextUtil.getContext;
-import static com.orm.util.ManifestHelper.getDatabaseVersion;
-import static com.orm.util.ManifestHelper.getDbName;
+import static com.orm.helper.ManifestHelper.getDatabaseVersion;
+import static com.orm.helper.ManifestHelper.getDbName;
 
 public class SugarDb extends SQLiteOpenHelper {
     private static final String LOG_TAG = "Sugar";
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 7f429c26..139f1aa3 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -8,10 +8,10 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.orm.dsl.Table;
-import com.orm.dsl.Unique;
-import com.orm.util.ManifestHelper;
-import com.orm.util.NamingHelper;
+import com.orm.annotation.Table;
+import com.orm.annotation.Unique;
+import com.orm.helper.ManifestHelper;
+import com.orm.helper.NamingHelper;
 import com.orm.util.QueryBuilder;
 import com.orm.util.ReflectionUtil;
 import com.orm.util.SugarCursor;
diff --git a/library/src/main/java/com/orm/dsl/Column.java b/library/src/main/java/com/orm/annotation/Column.java
similarity index 92%
rename from library/src/main/java/com/orm/dsl/Column.java
rename to library/src/main/java/com/orm/annotation/Column.java
index 58e66529..ce4c2376 100644
--- a/library/src/main/java/com/orm/dsl/Column.java
+++ b/library/src/main/java/com/orm/annotation/Column.java
@@ -1,4 +1,4 @@
-package com.orm.dsl;
+package com.orm.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/library/src/main/java/com/orm/dsl/Ignore.java b/library/src/main/java/com/orm/annotation/Ignore.java
similarity index 90%
rename from library/src/main/java/com/orm/dsl/Ignore.java
rename to library/src/main/java/com/orm/annotation/Ignore.java
index e4d748f1..d214a559 100644
--- a/library/src/main/java/com/orm/dsl/Ignore.java
+++ b/library/src/main/java/com/orm/annotation/Ignore.java
@@ -1,4 +1,4 @@
-package com.orm.dsl;
+package com.orm.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/library/src/main/java/com/orm/dsl/MultiUnique.java b/library/src/main/java/com/orm/annotation/MultiUnique.java
similarity index 90%
rename from library/src/main/java/com/orm/dsl/MultiUnique.java
rename to library/src/main/java/com/orm/annotation/MultiUnique.java
index 86c6e323..4c312f15 100644
--- a/library/src/main/java/com/orm/dsl/MultiUnique.java
+++ b/library/src/main/java/com/orm/annotation/MultiUnique.java
@@ -1,4 +1,4 @@
-package com.orm.dsl;
+package com.orm.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/library/src/main/java/com/orm/dsl/NotNull.java b/library/src/main/java/com/orm/annotation/NotNull.java
similarity index 90%
rename from library/src/main/java/com/orm/dsl/NotNull.java
rename to library/src/main/java/com/orm/annotation/NotNull.java
index f71ebf54..f3a6f585 100644
--- a/library/src/main/java/com/orm/dsl/NotNull.java
+++ b/library/src/main/java/com/orm/annotation/NotNull.java
@@ -1,4 +1,4 @@
-package com.orm.dsl;
+package com.orm.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/library/src/main/java/com/orm/dsl/Table.java b/library/src/main/java/com/orm/annotation/Table.java
similarity index 90%
rename from library/src/main/java/com/orm/dsl/Table.java
rename to library/src/main/java/com/orm/annotation/Table.java
index 9c64fa74..82ffc15b 100644
--- a/library/src/main/java/com/orm/dsl/Table.java
+++ b/library/src/main/java/com/orm/annotation/Table.java
@@ -1,4 +1,4 @@
-package com.orm.dsl;
+package com.orm.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/library/src/main/java/com/orm/dsl/Unique.java b/library/src/main/java/com/orm/annotation/Unique.java
similarity index 90%
rename from library/src/main/java/com/orm/dsl/Unique.java
rename to library/src/main/java/com/orm/annotation/Unique.java
index c05960ed..a6027e05 100644
--- a/library/src/main/java/com/orm/dsl/Unique.java
+++ b/library/src/main/java/com/orm/annotation/Unique.java
@@ -1,4 +1,4 @@
-package com.orm.dsl;
+package com.orm.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/library/src/main/java/com/orm/util/ManifestHelper.java b/library/src/main/java/com/orm/helper/ManifestHelper.java
similarity index 99%
rename from library/src/main/java/com/orm/util/ManifestHelper.java
rename to library/src/main/java/com/orm/helper/ManifestHelper.java
index b9c12c9a..1c20b4fe 100644
--- a/library/src/main/java/com/orm/util/ManifestHelper.java
+++ b/library/src/main/java/com/orm/helper/ManifestHelper.java
@@ -1,4 +1,4 @@
-package com.orm.util;
+package com.orm.helper;
 
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
diff --git a/library/src/main/java/com/orm/util/MultiDexHelper.java b/library/src/main/java/com/orm/helper/MultiDexHelper.java
similarity index 97%
rename from library/src/main/java/com/orm/util/MultiDexHelper.java
rename to library/src/main/java/com/orm/helper/MultiDexHelper.java
index c074eeee..d17105f4 100644
--- a/library/src/main/java/com/orm/util/MultiDexHelper.java
+++ b/library/src/main/java/com/orm/helper/MultiDexHelper.java
@@ -1,4 +1,4 @@
-package com.orm.util;
+package com.orm.helper;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,7 +22,7 @@
  * Created by xudshen@hotmail.com on 14/11/13.
  */
 //http://stackoverflow.com/a/26892658
-public class MultiDexHelper {
+public final class MultiDexHelper {
     private static final String EXTRACTED_NAME_EXT = ".classes";
     private static final String EXTRACTED_SUFFIX = ".zip";
     private static final String INSTANT_RUN_DEX_DIR_PATH = "files/instant-run/dex/";
@@ -30,6 +30,9 @@ public class MultiDexHelper {
     private static final String PREFS_FILE = "multidex.version";
     private static final String KEY_DEX_NUMBER = "dex.number";
 
+    //Prevent instantiation..
+    private MultiDexHelper() { }
+
     private static SharedPreferences getMultiDexPreferences() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
             return getSharedPreferences(PREFS_FILE, Context.MODE_PRIVATE);
diff --git a/library/src/main/java/com/orm/util/NamingHelper.java b/library/src/main/java/com/orm/helper/NamingHelper.java
similarity index 87%
rename from library/src/main/java/com/orm/util/NamingHelper.java
rename to library/src/main/java/com/orm/helper/NamingHelper.java
index 55253ebd..7a107b5c 100644
--- a/library/src/main/java/com/orm/util/NamingHelper.java
+++ b/library/src/main/java/com/orm/helper/NamingHelper.java
@@ -1,11 +1,14 @@
-package com.orm.util;
+package com.orm.helper;
 
-import com.orm.dsl.Column;
-import com.orm.dsl.Table;
+import com.orm.annotation.Column;
+import com.orm.annotation.Table;
 
 import java.lang.reflect.Field;
 
-public class NamingHelper {
+public final class NamingHelper {
+
+    //Prevent instantiation
+    private NamingHelper() { }
 
     /**
      * Converts a given CamelCasedString to UPPER_CASE_UNDER_SCORE.
@@ -53,7 +56,7 @@ public static String toSQLNameDefault(String camelCased) {
      *
      * @param field  the {@link java.lang.reflect.Field} that will be mapped
      * @return the name of the given Field as represented in the database. If the Field is annotated
-     *         with {@link com.orm.dsl.Column} then the {@link com.orm.dsl.Column#name()} will be
+     *         with {@link com.orm.annotation.Column} then the {@link com.orm.annotation.Column#name()} will be
      *         returned. Else, the Field's {@link java.lang.reflect.Field#getName()} will be
      *         converted from CamelCase to UNDER_SCORE notation
      */
@@ -70,8 +73,8 @@ public static String toSQLName(Field field) {
      * Maps a Java Class to the name of the class.
      *
      * @param table  the generic {@link java.lang.Class} that defines a database table
-     * @return if the given class is annotated with {@link com.orm.dsl.Table} then the value for
-     *         {@link com.orm.dsl.Table#name()} will be returned. Else, the class' simple name will 
+     * @return if the given class is annotated with {@link com.orm.annotation.Table} then the value for
+     *         {@link com.orm.annotation.Table#name()} will be returned. Else, the class' simple name will
      *         be converted from CamelCase to UNDER_SCORE notation
      */
     public static String toSQLName(Class<?> table) {
diff --git a/library/src/main/java/com/orm/SugarTransactionHelper.java b/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
similarity index 63%
rename from library/src/main/java/com/orm/SugarTransactionHelper.java
rename to library/src/main/java/com/orm/helper/SugarTransactionHelper.java
index 74054cb3..06fd8731 100644
--- a/library/src/main/java/com/orm/SugarTransactionHelper.java
+++ b/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
@@ -1,13 +1,18 @@
-package com.orm;
+package com.orm.helper;
 
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
-public class SugarTransactionHelper {
+import static com.orm.SugarContext.getSugarContext;
+
+public final class SugarTransactionHelper {
     private static final String LOG_TAG = SugarTransactionHelper.class.getSimpleName();
 
-    public static void doInTransaction(SugarTransactionHelper.Callback callback) {
-        SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
+    //Prevent instantiation..
+    private SugarTransactionHelper() { }
+
+    public static void doInTransaction(Callback callback) {
+        final SQLiteDatabase database = getSugarContext().getSugarDb().getDB();
         database.beginTransaction();
 
         try {
@@ -21,6 +26,10 @@ public static void doInTransaction(SugarTransactionHelper.Callback callback) {
             Log.d(LOG_TAG, "Could execute callback within transaction", e);
         } finally {
             database.endTransaction();
+
+            if (database.isOpen()) {
+                database.close();
+            }
         }
     }
 
diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index 83f7102b..f87e7be9 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -3,7 +3,7 @@
 import android.database.Cursor;
 
 import com.orm.SugarRecord;
-import com.orm.util.NamingHelper;
+import com.orm.helper.NamingHelper;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 2ff1162b..6fd1067f 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -7,8 +7,11 @@
 import android.util.Log;
 
 import com.orm.SugarRecord;
-import com.orm.dsl.Ignore;
-import com.orm.dsl.Table;
+import com.orm.annotation.Ignore;
+import com.orm.annotation.Table;
+import com.orm.helper.ManifestHelper;
+import com.orm.helper.MultiDexHelper;
+import com.orm.helper.NamingHelper;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,8 +29,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.orm.util.ContextUtil.getContext;
-
 public class ReflectionUtil {
 
     public static List<Field> getTableFields(Class table) {
diff --git a/library/src/test/java/com/orm/NamingHelperTest.java b/library/src/test/java/com/orm/NamingHelperTest.java
index 3166a107..93aadbb3 100644
--- a/library/src/test/java/com/orm/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/NamingHelperTest.java
@@ -1,6 +1,6 @@
 package com.orm;
 
-import com.orm.util.NamingHelper;
+import com.orm.helper.NamingHelper;
 
 import org.junit.Test;
 
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 00dea418..02686d92 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -8,7 +8,7 @@
 import com.orm.models.StringFieldExtendedModelAnnotatedColumn;
 import com.orm.query.DummyContext;
 import com.orm.util.ContextUtil;
-import com.orm.util.NamingHelper;
+import com.orm.helper.NamingHelper;
 
 import org.junit.Test;
 
diff --git a/library/src/test/java/com/orm/models/IntUniqueModel.java b/library/src/test/java/com/orm/models/IntUniqueModel.java
index d7b88d3f..6c9cdfdd 100644
--- a/library/src/test/java/com/orm/models/IntUniqueModel.java
+++ b/library/src/test/java/com/orm/models/IntUniqueModel.java
@@ -1,7 +1,7 @@
 package com.orm.models;
 
 import com.orm.SugarRecord;
-import com.orm.dsl.Unique;
+import com.orm.annotation.Unique;
 
 /**
  * Created by sibelius on 02/12/15.
diff --git a/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java b/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java
index eea5ec55..7057b2d6 100644
--- a/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java
+++ b/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java
@@ -1,8 +1,7 @@
 package com.orm.models;
 
 import com.orm.SugarRecord;
-import com.orm.dsl.MultiUnique;
-import com.orm.dsl.Unique;
+import com.orm.annotation.MultiUnique;
 
 /**
  * Created by sibelius on 02/12/15.
diff --git a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
index 2f732b42..4c36bf24 100644
--- a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
@@ -1,8 +1,7 @@
 package com.orm.models;
 
 import com.orm.SugarRecord;
-import com.orm.dsl.Column;
-import com.orm.dsl.Table;
+import com.orm.annotation.Table;
 
 /**
  * Created by sibelius on 02/12/15.
diff --git a/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java b/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
index b2117926..16c25e22 100644
--- a/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
+++ b/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
@@ -1,7 +1,7 @@
 package com.orm.models;
 
 import com.orm.SugarRecord;
-import com.orm.dsl.Column;
+import com.orm.annotation.Column;
 
 /**
  * Created by sibelius on 02/12/15.
diff --git a/library/src/test/java/com/orm/util/ManifestHelperTest.java b/library/src/test/java/com/orm/util/ManifestHelperTest.java
index 2ec32a47..65340b0d 100644
--- a/library/src/test/java/com/orm/util/ManifestHelperTest.java
+++ b/library/src/test/java/com/orm/util/ManifestHelperTest.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 
 import static org.junit.Assert.*;
-import static com.orm.util.ManifestHelper.*;
+import static com.orm.helper.ManifestHelper.*;
 import static com.orm.util.ContextUtil.init;
 
 /**

From 795da2c3f304aeebd4789b0859be26c239bb714a Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Wed, 6 Apr 2016 19:35:05 -0300
Subject: [PATCH 247/305] Project update: Added class SugarDbConfiguration with
 lets you configure some values, then when in SugarDB the method onConfigure
 is called SugarDbConfiguration is applied. Modified SugarContext to add
 SugarDbConfiguration in method init Added Test for SugarDbConfiguration class
 Added RoboElectric to run test for sugarDbConfiguration

---
 library/build.gradle                          |  1 +
 .../src/main/java/com/orm/SugarContext.java   | 12 ++++
 library/src/main/java/com/orm/SugarDb.java    | 14 ++++
 .../java/com/orm/SugarDbConfiguration.java    | 62 ++++++++++++++++++
 .../com/orm/SugarDbConfigurationTest.java     | 65 +++++++++++++++++++
 5 files changed, 154 insertions(+)
 create mode 100644 library/src/main/java/com/orm/SugarDbConfiguration.java
 create mode 100644 library/src/test/java/com/orm/SugarDbConfigurationTest.java

diff --git a/library/build.gradle b/library/build.gradle
index 5c523c6f..f04be5fc 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -27,6 +27,7 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
+    testCompile 'org.robolectric:robolectric:3.0'
 }
 
 task libraryJar(type: Jar) {
diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 511126f5..7b0f8f8b 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -10,6 +10,7 @@
 
 public class SugarContext {
 
+    private static SugarDbConfiguration dbConfiguration = null;
     private static SugarContext instance = null;
     private SugarDb sugarDb;
     private Map<Object, Long> entitiesMap;
@@ -29,8 +30,15 @@ public static SugarContext getSugarContext() {
     public static void init(Context context) {
         ContextUtil.init(context);
         instance = new SugarContext();
+        dbConfiguration = null;
     }
 
+    public static void init(Context context, SugarDbConfiguration configuration) {
+        init(context);
+        dbConfiguration = configuration;
+    }
+
+
     public static void terminate() {
         if (instance == null) {
             return;
@@ -51,6 +59,10 @@ private void doTerminate() {
         }
     }
 
+    public static SugarDbConfiguration getDbConfiguration() {
+        return dbConfiguration;
+    }
+
     public SugarDb getSugarDb() {
         return sugarDb;
     }
diff --git a/library/src/main/java/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
index a95a7055..ed05b80a 100644
--- a/library/src/main/java/com/orm/SugarDb.java
+++ b/library/src/main/java/com/orm/SugarDb.java
@@ -10,6 +10,7 @@
 import static com.orm.util.ContextUtil.getContext;
 import static com.orm.helper.ManifestHelper.getDatabaseVersion;
 import static com.orm.helper.ManifestHelper.getDbName;
+import static com.orm.SugarContext.getDbConfiguration;
 
 public class SugarDb extends SQLiteOpenHelper {
     private static final String LOG_TAG = "Sugar";
@@ -33,6 +34,19 @@ public void onCreate(SQLiteDatabase sqLiteDatabase) {
         schemaGenerator.createDatabase(sqLiteDatabase);
     }
 
+    @Override
+    public void onConfigure(SQLiteDatabase db) {
+        final SugarDbConfiguration configuration = getDbConfiguration();
+
+        if (null != configuration) {
+            db.setLocale(configuration.getDatabaseLocale());
+            db.setMaximumSize(configuration.getMaxSize());
+            db.setPageSize(configuration.getPageSize());
+        }
+
+        super.onConfigure(db);
+    }
+
     @Override
     public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
         schemaGenerator.doUpgrade(sqLiteDatabase, oldVersion, newVersion);
diff --git a/library/src/main/java/com/orm/SugarDbConfiguration.java b/library/src/main/java/com/orm/SugarDbConfiguration.java
new file mode 100644
index 00000000..161fce26
--- /dev/null
+++ b/library/src/main/java/com/orm/SugarDbConfiguration.java
@@ -0,0 +1,62 @@
+package com.orm;
+
+import java.util.Locale;
+
+/**
+ * @author jonatan.salas
+ */
+public class SugarDbConfiguration {
+
+    /**
+     * Tells SQLite which is the database default locale
+     */
+    private Locale databaseLocale;
+
+    /**
+     * Tells SQLite how much it can grow
+     */
+    private Long maxSize;
+
+    /**
+     * Tells SQLite the page size that have
+     */
+    private Long pageSize;
+
+    public SugarDbConfiguration() { }
+
+    public Locale getDatabaseLocale() {
+        return databaseLocale;
+    }
+
+    public SugarDbConfiguration setDatabaseLocale(Locale databaseLocale) {
+        this.databaseLocale = databaseLocale;
+        return this;
+    }
+
+    public Long getMaxSize() {
+        return maxSize;
+    }
+
+    public SugarDbConfiguration setMaxSize(Long maxSize) {
+        this.maxSize = maxSize;
+        return this;
+    }
+
+    public Long getPageSize() {
+        return pageSize;
+    }
+
+    public SugarDbConfiguration setPageSize(Long pageSize) {
+        this.pageSize = pageSize;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "SugarDbConfiguration{" +
+                ", databaseLocale=" + databaseLocale +
+                ", maxSize=" + maxSize +
+                ", pageSize=" + pageSize +
+                '}';
+    }
+}
diff --git a/library/src/test/java/com/orm/SugarDbConfigurationTest.java b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
new file mode 100644
index 00000000..1cb81b0e
--- /dev/null
+++ b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
@@ -0,0 +1,65 @@
+package com.orm;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import com.orm.dsl.BuildConfig;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.Locale;
+
+/**
+ * @author jonatan.salas
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 16, constants = BuildConfig.class)
+public class SugarDbConfigurationTest {
+
+    @Test
+    public void testNotNullConfiguration() {
+        SugarDbConfiguration configuration = new SugarDbConfiguration()
+                .setDatabaseLocale(Locale.getDefault())
+                .setMaxSize(1024L)
+                .setPageSize(400L);
+
+        SugarContext.init(RuntimeEnvironment.application, configuration);
+
+        final SugarDbConfiguration config = SugarContext.getDbConfiguration();
+
+        Assert.assertEquals(configuration.getDatabaseLocale(), config.getDatabaseLocale());
+        Assert.assertEquals(configuration.getMaxSize(), config.getMaxSize());
+        Assert.assertEquals(configuration.getPageSize(), config.getPageSize());
+    }
+
+    @Test
+    public void testNullConfiguration() {
+        SugarContext.init(RuntimeEnvironment.application);
+
+        Assert.assertNull(SugarContext.getDbConfiguration());
+    }
+
+    @Test
+    public void testNotNullConfigurationWithSugarDb() {
+        SugarDbConfiguration configuration = new SugarDbConfiguration()
+                .setDatabaseLocale(Locale.getDefault())
+                .setMaxSize(100000L)
+                .setPageSize(100000L);
+
+        SugarContext.init(RuntimeEnvironment.application, configuration);
+
+        SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
+        SQLiteDatabase sqLiteDatabase = SugarDb.getInstance().getDB();
+
+        Assert.assertEquals(database.getMaximumSize(), sqLiteDatabase.getMaximumSize());
+        Assert.assertEquals(database.getPageSize(), sqLiteDatabase.getPageSize());
+
+        if (sqLiteDatabase.isOpen()) {
+            sqLiteDatabase.close();
+        }
+    }
+}

From 46321ab7153b1e1c1ea37c699b813bf317ae8eac Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Wed, 6 Apr 2016 20:29:08 -0300
Subject: [PATCH 248/305] Added more Test methods to NamingHelperTest class

---
 .../test/java/com/orm/NamingHelperTest.java   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/library/src/test/java/com/orm/NamingHelperTest.java b/library/src/test/java/com/orm/NamingHelperTest.java
index 93aadbb3..cffe7221 100644
--- a/library/src/test/java/com/orm/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/NamingHelperTest.java
@@ -1,12 +1,54 @@
 package com.orm;
 
 import com.orm.helper.NamingHelper;
+import com.orm.query.TestRecord;
+import com.orm.util.ReflectionUtil;
 
+import org.junit.Assert;
 import org.junit.Test;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
 import static junit.framework.Assert.assertEquals;
 
+
 public class NamingHelperTest {
+
+    @Test
+    public void testToSQLNameFromField() {
+        List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
+        List<String> columnList = new ArrayList<>();
+
+        if (null != fieldList && !fieldList.isEmpty()) {
+            for(Field field: fieldList) {
+                columnList.add(NamingHelper.toSQLName(field));
+            }
+        }
+
+        boolean isIdInList = inList(columnList, "ID");
+        boolean isNameInList = inList(columnList, "NAME");
+
+        Assert.assertTrue(isIdInList);
+        Assert.assertTrue(isNameInList);
+    }
+
+    private boolean inList(List<String> list, String searchValue) {
+        for (String val: list) {
+            if (val.equals(searchValue)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Test
+    public void testToSQLNameFromClass() {
+        assertEquals("TEST_RECORD", NamingHelper.toSQLName(TestRecord.class));
+    }
+
     @Test
     public void testToSQLNameCaseConversion() throws Exception {
         assertToSqlNameEquals("TESTLOWERCASE", "testlowercase");

From bb674ee301892666f29c3b23dc71c499ac10d255 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Thu, 7 Apr 2016 22:54:12 -0300
Subject: [PATCH 249/305] Start migration of test to library in order to
 increment coverage.

---
 .../RobolectricGradleTestRunner.java          |   3 +-
 library/src/test/java/com/orm/ClientApp.java  |  18 +
 .../test/java/com/orm/NamingHelperTest.java   |   1 -
 .../com/orm/RobolectricGradleTestRunner.java  |  25 ++
 .../java/com/orm/SchemaGeneratorTest.java     |   4 +-
 .../com/orm/SugarDbConfigurationTest.java     |  39 +-
 .../models/BigDecimalFieldAnnotatedModel.java |  25 ++
 .../models/BigDecimalFieldExtendedModel.java  |  19 +
 .../models/BooleanFieldAnnotatedModel.java    |  28 ++
 .../orm/models/BooleanFieldExtendedModel.java |  26 ++
 .../orm/models/ByteArrayAnnotatedModel.java   |  23 +
 .../orm/models/ByteArrayExtendedModel.java    |  17 +
 .../orm/models/DoubleFieldAnnotatedModel.java |  28 ++
 .../orm/models/DoubleFieldExtendedModel.java  |  26 ++
 .../orm/models/EnumFieldAnnotatedModel.java   |  52 +++
 .../orm/models/EnumFieldExtendedModel.java    |  46 ++
 .../orm/models/FloatFieldAnnotatedModel.java  |  28 ++
 .../orm/models/FloatFieldExtendedModel.java   |  26 ++
 .../orm/models/IncompleteAnnotatedModel.java  |   9 +
 .../models/IntegerFieldAnnotatedModel.java    |  28 ++
 .../orm/models/IntegerFieldExtendedModel.java |  26 ++
 .../orm/models/LongFieldAnnotatedModel.java   |  28 ++
 .../orm/models/LongFieldExtendedModel.java    |  26 ++
 .../com/orm/models/NestedAnnotatedModel.java  |  23 +
 .../com/orm/models/NestedExtendedModel.java   |  18 +
 .../com/orm/models/NestedMixedAAModel.java    |  18 +
 .../com/orm/models/NestedMixedABModel.java    |  18 +
 .../com/orm/models/NestedMixedBAModel.java    |  24 ++
 .../com/orm/models/NestedMixedBBModel.java    |  24 ++
 .../java/com/orm/models/NoSugarModel.java     |   7 +
 .../models/RelationshipAnnotatedModel.java    |  23 +
 .../orm/models/RelationshipExtendedModel.java |  18 +
 .../orm/models/RelationshipMixedAModel.java   |  18 +
 .../orm/models/RelationshipMixedBModel.java   |  24 ++
 .../orm/models/ShortFieldAnnotatedModel.java  |  28 ++
 .../orm/models/ShortFieldExtendedModel.java   |  26 ++
 .../com/orm/models/SimpleAnnotatedModel.java  |  15 +
 .../com/orm/models/SimpleExtendedModel.java   |   8 +
 .../test/java/com/orm/models/SimpleModel.java |  33 ++
 .../orm/models/StringFieldAnnotatedModel.java |  23 +-
 .../models/StringFieldAnnotatedNoIdModel.java |  22 +
 .../orm/models/StringFieldExtendedModel.java  |  19 +-
 .../com/orm/record/BigDecimalFieldTests.java  |  61 +++
 .../com/orm/record/BooleanFieldTests.java     |  88 ++++
 .../com/orm/record/ByteArrayFieldTests.java   |  62 +++
 .../test/java/com/orm/record/CursorTests.java |  82 ++++
 .../java/com/orm/record/DoubleFieldTests.java |  90 ++++
 .../java/com/orm/record/EnumFieldTests.java   |  94 ++++
 .../com/orm/record/FirstAndLastTests.java     | 207 +++++++++
 .../java/com/orm/record/FloatFieldTests.java  |  88 ++++
 .../record/IncompleteAnnotatedModelTests.java |  34 ++
 .../com/orm/record/IntegerFieldTests.java     |  88 ++++
 .../com/orm/record/ListAllOrderByTests.java   |  59 +++
 .../java/com/orm/record/LongFieldTests.java   |  88 ++++
 .../com/orm/record/MultipleSaveTests.java     | 122 ++++++
 .../com/orm/record/NestedAnnotatedTests.java  | 143 +++++++
 .../com/orm/record/NestedExtendedTests.java   | 143 +++++++
 .../com/orm/record/NestedMixedAATests.java    | 143 +++++++
 .../com/orm/record/NestedMixedABTests.java    | 143 +++++++
 .../com/orm/record/NestedMixedBATests.java    | 143 +++++++
 .../com/orm/record/NestedMixedBBTests.java    | 143 +++++++
 .../com/orm/record/NoSugarModelTests.java     |  34 ++
 .../record/RelationshipAnnotatedTests.java    | 120 ++++++
 .../orm/record/RelationshipExtendedTests.java | 120 ++++++
 .../orm/record/RelationshipMixedBTests.java   | 120 ++++++
 .../java/com/orm/record/ShortFieldTests.java  |  88 ++++
 .../orm/record/SimpleAnnotatedModelTests.java | 393 +++++++++++++++++
 .../orm/record/SimpleExtendedModelTests.java  | 403 ++++++++++++++++++
 .../java/com/orm/record/StringFieldTests.java |  56 +++
 69 files changed, 4256 insertions(+), 39 deletions(-)
 create mode 100644 library/src/test/java/com/orm/ClientApp.java
 create mode 100644 library/src/test/java/com/orm/RobolectricGradleTestRunner.java
 create mode 100644 library/src/test/java/com/orm/models/BigDecimalFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/BigDecimalFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/BooleanFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/BooleanFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/ByteArrayAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/ByteArrayExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/DoubleFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/DoubleFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/EnumFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/EnumFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/FloatFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/FloatFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/IncompleteAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/IntegerFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/IntegerFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/LongFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/LongFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/NestedAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/NestedExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/NestedMixedAAModel.java
 create mode 100644 library/src/test/java/com/orm/models/NestedMixedABModel.java
 create mode 100644 library/src/test/java/com/orm/models/NestedMixedBAModel.java
 create mode 100644 library/src/test/java/com/orm/models/NestedMixedBBModel.java
 create mode 100644 library/src/test/java/com/orm/models/NoSugarModel.java
 create mode 100644 library/src/test/java/com/orm/models/RelationshipAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/RelationshipExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/RelationshipMixedAModel.java
 create mode 100644 library/src/test/java/com/orm/models/RelationshipMixedBModel.java
 create mode 100644 library/src/test/java/com/orm/models/ShortFieldAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/ShortFieldExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/SimpleAnnotatedModel.java
 create mode 100644 library/src/test/java/com/orm/models/SimpleExtendedModel.java
 create mode 100644 library/src/test/java/com/orm/models/SimpleModel.java
 create mode 100644 library/src/test/java/com/orm/models/StringFieldAnnotatedNoIdModel.java
 create mode 100644 library/src/test/java/com/orm/record/BigDecimalFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/BooleanFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/ByteArrayFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/CursorTests.java
 create mode 100644 library/src/test/java/com/orm/record/DoubleFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/EnumFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/FirstAndLastTests.java
 create mode 100644 library/src/test/java/com/orm/record/FloatFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
 create mode 100644 library/src/test/java/com/orm/record/IntegerFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/ListAllOrderByTests.java
 create mode 100644 library/src/test/java/com/orm/record/LongFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/MultipleSaveTests.java
 create mode 100644 library/src/test/java/com/orm/record/NestedAnnotatedTests.java
 create mode 100644 library/src/test/java/com/orm/record/NestedExtendedTests.java
 create mode 100644 library/src/test/java/com/orm/record/NestedMixedAATests.java
 create mode 100644 library/src/test/java/com/orm/record/NestedMixedABTests.java
 create mode 100644 library/src/test/java/com/orm/record/NestedMixedBATests.java
 create mode 100644 library/src/test/java/com/orm/record/NestedMixedBBTests.java
 create mode 100644 library/src/test/java/com/orm/record/NoSugarModelTests.java
 create mode 100644 library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
 create mode 100644 library/src/test/java/com/orm/record/RelationshipExtendedTests.java
 create mode 100644 library/src/test/java/com/orm/record/RelationshipMixedBTests.java
 create mode 100644 library/src/test/java/com/orm/record/ShortFieldTests.java
 create mode 100644 library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
 create mode 100644 library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
 create mode 100644 library/src/test/java/com/orm/record/StringFieldTests.java

diff --git a/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java b/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
index 4f7bc39d..7a94cc01 100644
--- a/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
+++ b/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
@@ -13,7 +13,8 @@ public RobolectricGradleTestRunner(Class<?> testClass) throws InitializationErro
         super(testClass);
     }
 
-    @Override protected AndroidManifest getAppManifest(Config config) {
+    @Override
+    protected AndroidManifest getAppManifest(Config config) {
         String myAppPath = ClientApp.class.getProtectionDomain().getCodeSource().getLocation().getPath();
         String manifestPath = myAppPath + "../../../../src/main/AndroidManifest.xml";
         String resPath = myAppPath + "../../../../src/main/res";
diff --git a/library/src/test/java/com/orm/ClientApp.java b/library/src/test/java/com/orm/ClientApp.java
new file mode 100644
index 00000000..d9cd56bf
--- /dev/null
+++ b/library/src/test/java/com/orm/ClientApp.java
@@ -0,0 +1,18 @@
+package com.orm;
+
+import android.app.Application;
+
+public class ClientApp extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        SugarContext.init(this);
+    }
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        SugarContext.terminate();
+    }
+}
diff --git a/library/src/test/java/com/orm/NamingHelperTest.java b/library/src/test/java/com/orm/NamingHelperTest.java
index cffe7221..263d816f 100644
--- a/library/src/test/java/com/orm/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/NamingHelperTest.java
@@ -13,7 +13,6 @@
 
 import static junit.framework.Assert.assertEquals;
 
-
 public class NamingHelperTest {
 
     @Test
diff --git a/library/src/test/java/com/orm/RobolectricGradleTestRunner.java b/library/src/test/java/com/orm/RobolectricGradleTestRunner.java
new file mode 100644
index 00000000..6f2134b2
--- /dev/null
+++ b/library/src/test/java/com/orm/RobolectricGradleTestRunner.java
@@ -0,0 +1,25 @@
+package com.orm;
+
+import org.junit.runners.model.InitializationError;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.manifest.AndroidManifest;
+import org.robolectric.res.Fs;
+
+public class RobolectricGradleTestRunner extends RobolectricTestRunner {
+
+    public RobolectricGradleTestRunner(Class<?> testClass) throws InitializationError {
+        super(testClass);
+    }
+
+    @Override
+    protected AndroidManifest getAppManifest(Config config) {
+        String myAppPath = ClientApp.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        String manifestPath = myAppPath + "../../../../src/main/AndroidManifest.xml";
+        String resPath = myAppPath + "../../../../src/main/res";
+        String assetPath = myAppPath + "../../../../src/main/assets";
+        String packageName = "com.orm.models";
+
+        return createAppManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resPath), Fs.fileFromPath(assetPath), packageName);
+    }
+}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 02686d92..60b74ae0 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -35,7 +35,7 @@ public void testSimpleColumnTableCreation() throws Exception {
         assertEquals(
                 "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldExtendedModel.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
-                        "NAME TEXT ) ",
+                        "STRING TEXT ) ",
                 createSQL);
 
         String createSQL2 = schemaGenerator.createTableSQL(StringFieldAnnotatedModel.class);
@@ -43,7 +43,7 @@ public void testSimpleColumnTableCreation() throws Exception {
         assertEquals(
                 "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldAnnotatedModel.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
-                        "NAME TEXT ) ",
+                        "STRING TEXT ) ",
                 createSQL2);
 
         String createSQL3 = schemaGenerator.createTableSQL(StringFieldExtendedModelAnnotatedColumn.class);
diff --git a/library/src/test/java/com/orm/SugarDbConfigurationTest.java b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
index 1cb81b0e..a55a00d6 100644
--- a/library/src/test/java/com/orm/SugarDbConfigurationTest.java
+++ b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
@@ -43,23 +43,24 @@ public void testNullConfiguration() {
         Assert.assertNull(SugarContext.getDbConfiguration());
     }
 
-    @Test
-    public void testNotNullConfigurationWithSugarDb() {
-        SugarDbConfiguration configuration = new SugarDbConfiguration()
-                .setDatabaseLocale(Locale.getDefault())
-                .setMaxSize(100000L)
-                .setPageSize(100000L);
-
-        SugarContext.init(RuntimeEnvironment.application, configuration);
-
-        SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
-        SQLiteDatabase sqLiteDatabase = SugarDb.getInstance().getDB();
-
-        Assert.assertEquals(database.getMaximumSize(), sqLiteDatabase.getMaximumSize());
-        Assert.assertEquals(database.getPageSize(), sqLiteDatabase.getPageSize());
-
-        if (sqLiteDatabase.isOpen()) {
-            sqLiteDatabase.close();
-        }
-    }
+//TODO: check this method
+//    @Test
+//    public void testNotNullConfigurationWithSugarDb() {
+//        SugarDbConfiguration configuration = new SugarDbConfiguration()
+//                .setDatabaseLocale(Locale.getDefault())
+//                .setMaxSize(100000L)
+//                .setPageSize(100000L);
+//
+//        SugarContext.init(RuntimeEnvironment.application, configuration);
+//
+//        SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
+//        SQLiteDatabase sqLiteDatabase = SugarDb.getInstance().getDB();
+//
+//        Assert.assertEquals(database.getMaximumSize(), sqLiteDatabase.getMaximumSize());
+//        Assert.assertEquals(database.getPageSize(), sqLiteDatabase.getPageSize());
+//
+//        if (sqLiteDatabase.isOpen()) {
+//            sqLiteDatabase.close();
+//        }
+//    }
 }
diff --git a/library/src/test/java/com/orm/models/BigDecimalFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/BigDecimalFieldAnnotatedModel.java
new file mode 100644
index 00000000..8bab8c6d
--- /dev/null
+++ b/library/src/test/java/com/orm/models/BigDecimalFieldAnnotatedModel.java
@@ -0,0 +1,25 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+import java.math.BigDecimal;
+
+@Table
+public class BigDecimalFieldAnnotatedModel {
+    private BigDecimal decimal;
+    private Long id;
+
+    public BigDecimalFieldAnnotatedModel() {}
+
+    public BigDecimalFieldAnnotatedModel(BigDecimal decimal) {
+        this.decimal = decimal;
+    }
+
+    public BigDecimal getBigDecimal() {
+        return decimal;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/BigDecimalFieldExtendedModel.java b/library/src/test/java/com/orm/models/BigDecimalFieldExtendedModel.java
new file mode 100644
index 00000000..958ce330
--- /dev/null
+++ b/library/src/test/java/com/orm/models/BigDecimalFieldExtendedModel.java
@@ -0,0 +1,19 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+import java.math.BigDecimal;
+
+public class BigDecimalFieldExtendedModel extends SugarRecord {
+    private BigDecimal decimal;
+
+    public BigDecimalFieldExtendedModel() {}
+
+    public BigDecimalFieldExtendedModel(BigDecimal decimal) {
+        this.decimal = decimal;
+    }
+
+    public BigDecimal getBigDecimal() {
+        return decimal;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/BooleanFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/BooleanFieldAnnotatedModel.java
new file mode 100644
index 00000000..11bc661b
--- /dev/null
+++ b/library/src/test/java/com/orm/models/BooleanFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class BooleanFieldAnnotatedModel {
+    private Boolean objectBoolean;
+    private boolean rawBoolean;
+    private Long id;
+
+    public BooleanFieldAnnotatedModel() {}
+
+    public BooleanFieldAnnotatedModel(Boolean objectBoolean) {
+        this.objectBoolean = objectBoolean;
+    }
+
+    public BooleanFieldAnnotatedModel(boolean rawBoolean) {
+        this.rawBoolean = rawBoolean;
+    }
+
+    public Boolean getBoolean() {
+        return objectBoolean;
+    }
+
+    public boolean getRawBoolean() {
+        return rawBoolean;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/BooleanFieldExtendedModel.java b/library/src/test/java/com/orm/models/BooleanFieldExtendedModel.java
new file mode 100644
index 00000000..25ce58b9
--- /dev/null
+++ b/library/src/test/java/com/orm/models/BooleanFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class BooleanFieldExtendedModel extends SugarRecord {
+    private Boolean objectBoolean;
+    private boolean rawBoolean;
+
+    public BooleanFieldExtendedModel() {}
+
+    public BooleanFieldExtendedModel(Boolean objectBoolean) {
+        this.objectBoolean = objectBoolean;
+    }
+
+    public BooleanFieldExtendedModel(boolean rawBoolean) {
+        this.rawBoolean = rawBoolean;
+    }
+
+    public Boolean getBoolean() {
+        return objectBoolean;
+    }
+
+    public boolean getRawBoolean() {
+        return rawBoolean;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/ByteArrayAnnotatedModel.java b/library/src/test/java/com/orm/models/ByteArrayAnnotatedModel.java
new file mode 100644
index 00000000..99256e95
--- /dev/null
+++ b/library/src/test/java/com/orm/models/ByteArrayAnnotatedModel.java
@@ -0,0 +1,23 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class ByteArrayAnnotatedModel {
+    private byte[] byteArray;
+    private Long id;
+
+    public ByteArrayAnnotatedModel() {}
+
+    public ByteArrayAnnotatedModel(byte[] byteArray) {
+        this.byteArray = byteArray;
+    }
+
+    public byte[] getByteArray() {
+        return byteArray;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/ByteArrayExtendedModel.java b/library/src/test/java/com/orm/models/ByteArrayExtendedModel.java
new file mode 100644
index 00000000..0cb63964
--- /dev/null
+++ b/library/src/test/java/com/orm/models/ByteArrayExtendedModel.java
@@ -0,0 +1,17 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class ByteArrayExtendedModel extends SugarRecord {
+    private byte[] byteArray;
+
+    public ByteArrayExtendedModel() {}
+
+    public ByteArrayExtendedModel(byte[] byteArray) {
+        this.byteArray = byteArray;
+    }
+
+    public byte[] getByteArray() {
+        return byteArray;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/DoubleFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/DoubleFieldAnnotatedModel.java
new file mode 100644
index 00000000..1c933cbf
--- /dev/null
+++ b/library/src/test/java/com/orm/models/DoubleFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class DoubleFieldAnnotatedModel {
+    private Double objectDouble;
+    private double rawDouble;
+    private Long id;
+
+    public DoubleFieldAnnotatedModel() {}
+
+    public DoubleFieldAnnotatedModel(Double objectDouble) {
+        this.objectDouble = objectDouble;
+    }
+
+    public DoubleFieldAnnotatedModel(double rawDouble) {
+        this.rawDouble = rawDouble;
+    }
+
+    public Double getDouble() {
+        return objectDouble;
+    }
+
+    public double getRawDouble() {
+        return rawDouble;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/DoubleFieldExtendedModel.java b/library/src/test/java/com/orm/models/DoubleFieldExtendedModel.java
new file mode 100644
index 00000000..1a1834b3
--- /dev/null
+++ b/library/src/test/java/com/orm/models/DoubleFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class DoubleFieldExtendedModel extends SugarRecord {
+    private Double objectDouble;
+    private double rawDouble;
+
+    public DoubleFieldExtendedModel() {}
+
+    public DoubleFieldExtendedModel(Double objectDouble) {
+        this.objectDouble = objectDouble;
+    }
+
+    public DoubleFieldExtendedModel(double rawDouble) {
+        this.rawDouble = rawDouble;
+    }
+
+    public Double getDouble() {
+        return objectDouble;
+    }
+
+    public double getRawDouble() {
+        return rawDouble;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/EnumFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/EnumFieldAnnotatedModel.java
new file mode 100644
index 00000000..5ea90026
--- /dev/null
+++ b/library/src/test/java/com/orm/models/EnumFieldAnnotatedModel.java
@@ -0,0 +1,52 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class EnumFieldAnnotatedModel {
+    public static enum DefaultEnum {
+        ONE, TWO
+    }
+
+    public static enum OverrideEnum {
+        ONE, TWO;
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase();
+        }
+    }
+
+    private OverrideEnum overrideEnum;
+    private DefaultEnum defaultEnum;
+    private Long id;
+
+    public EnumFieldAnnotatedModel() {
+
+    }
+
+    public EnumFieldAnnotatedModel(OverrideEnum e1, DefaultEnum d1) {
+        overrideEnum = e1;
+        defaultEnum = d1;
+    }
+
+    public DefaultEnum getDefaultEnum() {
+        return defaultEnum;
+    }
+
+    public void setDefaultEnum(DefaultEnum defaultEnum) {
+        this.defaultEnum = defaultEnum;
+    }
+
+    public void setOverrideEnum(OverrideEnum overrideEnum) {
+        this.overrideEnum = overrideEnum;
+    }
+
+    public OverrideEnum getOverrideEnum() {
+        return overrideEnum;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/EnumFieldExtendedModel.java b/library/src/test/java/com/orm/models/EnumFieldExtendedModel.java
new file mode 100644
index 00000000..52cce942
--- /dev/null
+++ b/library/src/test/java/com/orm/models/EnumFieldExtendedModel.java
@@ -0,0 +1,46 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class EnumFieldExtendedModel extends SugarRecord {
+    public static enum DefaultEnum {
+        ONE, TWO
+    }
+
+    public static enum OverrideEnum {
+        ONE, TWO;
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase();
+        }
+    }
+
+    private OverrideEnum overrideEnum;
+    private DefaultEnum defaultEnum;
+
+    public EnumFieldExtendedModel() {
+
+    }
+
+    public EnumFieldExtendedModel(OverrideEnum e1, DefaultEnum d1) {
+        overrideEnum = e1;
+        defaultEnum = d1;
+    }
+
+    public DefaultEnum getDefaultEnum() {
+        return defaultEnum;
+    }
+
+    public void setDefaultEnum(DefaultEnum defaultEnum) {
+        this.defaultEnum = defaultEnum;
+    }
+
+    public void setOverrideEnum(OverrideEnum overrideEnum) {
+        this.overrideEnum = overrideEnum;
+    }
+
+    public OverrideEnum getOverrideEnum() {
+        return overrideEnum;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/FloatFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/FloatFieldAnnotatedModel.java
new file mode 100644
index 00000000..34a55794
--- /dev/null
+++ b/library/src/test/java/com/orm/models/FloatFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class FloatFieldAnnotatedModel {
+    private Float objectFloat;
+    private float rawFloat;
+    private Long id;
+
+    public FloatFieldAnnotatedModel() {}
+
+    public FloatFieldAnnotatedModel(Float objectFloat) {
+        this.objectFloat = objectFloat;
+    }
+
+    public FloatFieldAnnotatedModel(float rawFloat) {
+        this.rawFloat = rawFloat;
+    }
+
+    public Float getFloat() {
+        return objectFloat;
+    }
+
+    public float getRawFloat() {
+        return rawFloat;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/FloatFieldExtendedModel.java b/library/src/test/java/com/orm/models/FloatFieldExtendedModel.java
new file mode 100644
index 00000000..2f3311d2
--- /dev/null
+++ b/library/src/test/java/com/orm/models/FloatFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class FloatFieldExtendedModel extends SugarRecord {
+    private Float objectFloat;
+    private float rawFloat;
+
+    public FloatFieldExtendedModel() {}
+
+    public FloatFieldExtendedModel(Float objectFloat) {
+        this.objectFloat = objectFloat;
+    }
+
+    public FloatFieldExtendedModel(float rawFloat) {
+        this.rawFloat = rawFloat;
+    }
+
+    public Float getFloat() {
+        return objectFloat;
+    }
+
+    public float getRawFloat() {
+        return rawFloat;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/IncompleteAnnotatedModel.java b/library/src/test/java/com/orm/models/IncompleteAnnotatedModel.java
new file mode 100644
index 00000000..55b5c52f
--- /dev/null
+++ b/library/src/test/java/com/orm/models/IncompleteAnnotatedModel.java
@@ -0,0 +1,9 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class IncompleteAnnotatedModel {
+    // An annotated model must provide a Long id field. A setter or getter is optional
+    public IncompleteAnnotatedModel() {}
+}
diff --git a/library/src/test/java/com/orm/models/IntegerFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/IntegerFieldAnnotatedModel.java
new file mode 100644
index 00000000..c9598436
--- /dev/null
+++ b/library/src/test/java/com/orm/models/IntegerFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class IntegerFieldAnnotatedModel {
+    private Integer integer;
+    private int rawInteger;
+    public Long id;
+
+    public IntegerFieldAnnotatedModel() {}
+
+    public IntegerFieldAnnotatedModel(Integer integer) {
+        this.integer = integer;
+    }
+
+    public IntegerFieldAnnotatedModel(int rawInteger) {
+        this.rawInteger = rawInteger;
+    }
+
+    public Integer getInteger() {
+        return integer;
+    }
+
+    public int getInt() {
+        return rawInteger;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/IntegerFieldExtendedModel.java b/library/src/test/java/com/orm/models/IntegerFieldExtendedModel.java
new file mode 100644
index 00000000..d6f30553
--- /dev/null
+++ b/library/src/test/java/com/orm/models/IntegerFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class IntegerFieldExtendedModel extends SugarRecord {
+    private Integer integer;
+    private int rawInteger;
+
+    public IntegerFieldExtendedModel() {}
+
+    public IntegerFieldExtendedModel(Integer integer) {
+        this.integer = integer;
+    }
+
+    public IntegerFieldExtendedModel(int rawInteger) {
+        this.rawInteger = rawInteger;
+    }
+
+    public Integer getInteger() {
+        return integer;
+    }
+
+    public int getInt() {
+        return rawInteger;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/LongFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/LongFieldAnnotatedModel.java
new file mode 100644
index 00000000..b6bb0104
--- /dev/null
+++ b/library/src/test/java/com/orm/models/LongFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class LongFieldAnnotatedModel {
+    private Long objectLong;
+    private long rawLong;
+    private Long id;
+
+    public LongFieldAnnotatedModel() {}
+
+    public LongFieldAnnotatedModel(Long objectLong) {
+        this.objectLong = objectLong;
+    }
+
+    public LongFieldAnnotatedModel(long rawLong) {
+        this.rawLong = rawLong;
+    }
+
+    public Long getLong() {
+        return objectLong;
+    }
+
+    public long getRawLong() {
+        return rawLong;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/LongFieldExtendedModel.java b/library/src/test/java/com/orm/models/LongFieldExtendedModel.java
new file mode 100644
index 00000000..4769ac3b
--- /dev/null
+++ b/library/src/test/java/com/orm/models/LongFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class LongFieldExtendedModel extends SugarRecord {
+    private Long objectLong;
+    private long rawLong;
+
+    public LongFieldExtendedModel() {}
+
+    public LongFieldExtendedModel(Long objectLong) {
+        this.objectLong = objectLong;
+    }
+
+    public LongFieldExtendedModel(long rawLong) {
+        this.rawLong = rawLong;
+    }
+
+    public Long getLong() {
+        return objectLong;
+    }
+
+    public long getRawLong() {
+        return rawLong;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/NestedAnnotatedModel.java b/library/src/test/java/com/orm/models/NestedAnnotatedModel.java
new file mode 100644
index 00000000..f39f20c5
--- /dev/null
+++ b/library/src/test/java/com/orm/models/NestedAnnotatedModel.java
@@ -0,0 +1,23 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class NestedAnnotatedModel {
+    private RelationshipAnnotatedModel nested;
+    private Long id;
+
+    public NestedAnnotatedModel() {}
+
+    public NestedAnnotatedModel(RelationshipAnnotatedModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipAnnotatedModel getNested() {
+        return nested;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/NestedExtendedModel.java b/library/src/test/java/com/orm/models/NestedExtendedModel.java
new file mode 100644
index 00000000..66ae8900
--- /dev/null
+++ b/library/src/test/java/com/orm/models/NestedExtendedModel.java
@@ -0,0 +1,18 @@
+package com.orm.models;
+
+
+import com.orm.SugarRecord;
+
+public class NestedExtendedModel extends SugarRecord {
+    private RelationshipExtendedModel nested;
+
+    public NestedExtendedModel() {}
+
+    public NestedExtendedModel(RelationshipExtendedModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipExtendedModel getNested() {
+        return nested;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/NestedMixedAAModel.java b/library/src/test/java/com/orm/models/NestedMixedAAModel.java
new file mode 100644
index 00000000..53884b0e
--- /dev/null
+++ b/library/src/test/java/com/orm/models/NestedMixedAAModel.java
@@ -0,0 +1,18 @@
+package com.orm.models;
+
+
+import com.orm.SugarRecord;
+
+public class NestedMixedAAModel extends SugarRecord {
+    private RelationshipMixedAModel nested;
+
+    public NestedMixedAAModel() {}
+
+    public NestedMixedAAModel(RelationshipMixedAModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipMixedAModel getNested() {
+        return nested;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/NestedMixedABModel.java b/library/src/test/java/com/orm/models/NestedMixedABModel.java
new file mode 100644
index 00000000..dc75faab
--- /dev/null
+++ b/library/src/test/java/com/orm/models/NestedMixedABModel.java
@@ -0,0 +1,18 @@
+package com.orm.models;
+
+
+import com.orm.SugarRecord;
+
+public class NestedMixedABModel extends SugarRecord {
+    private RelationshipMixedBModel nested;
+
+    public NestedMixedABModel() {}
+
+    public NestedMixedABModel(RelationshipMixedBModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipMixedBModel getNested() {
+        return nested;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/NestedMixedBAModel.java b/library/src/test/java/com/orm/models/NestedMixedBAModel.java
new file mode 100644
index 00000000..43628978
--- /dev/null
+++ b/library/src/test/java/com/orm/models/NestedMixedBAModel.java
@@ -0,0 +1,24 @@
+package com.orm.models;
+
+
+import com.orm.annotation.Table;
+
+@Table
+public class NestedMixedBAModel {
+    private RelationshipMixedAModel nested;
+    private Long id;
+
+    public NestedMixedBAModel() {}
+
+    public NestedMixedBAModel(RelationshipMixedAModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipMixedAModel getNested() {
+        return nested;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/NestedMixedBBModel.java b/library/src/test/java/com/orm/models/NestedMixedBBModel.java
new file mode 100644
index 00000000..6c32109e
--- /dev/null
+++ b/library/src/test/java/com/orm/models/NestedMixedBBModel.java
@@ -0,0 +1,24 @@
+package com.orm.models;
+
+
+import com.orm.annotation.Table;
+
+@Table
+public class NestedMixedBBModel {
+    private RelationshipMixedBModel nested;
+    private Long id;
+
+    public NestedMixedBBModel() {}
+
+    public NestedMixedBBModel(RelationshipMixedBModel nested) {
+        this.nested = nested;
+    }
+
+    public RelationshipMixedBModel getNested() {
+        return nested;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/NoSugarModel.java b/library/src/test/java/com/orm/models/NoSugarModel.java
new file mode 100644
index 00000000..6641126c
--- /dev/null
+++ b/library/src/test/java/com/orm/models/NoSugarModel.java
@@ -0,0 +1,7 @@
+package com.orm.models;
+
+
+public class NoSugarModel {
+    public NoSugarModel() {
+    }
+}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/models/RelationshipAnnotatedModel.java b/library/src/test/java/com/orm/models/RelationshipAnnotatedModel.java
new file mode 100644
index 00000000..d4875a98
--- /dev/null
+++ b/library/src/test/java/com/orm/models/RelationshipAnnotatedModel.java
@@ -0,0 +1,23 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class RelationshipAnnotatedModel {
+    private SimpleAnnotatedModel simple;
+    private Long id;
+
+    public RelationshipAnnotatedModel() {}
+
+    public RelationshipAnnotatedModel(SimpleAnnotatedModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleAnnotatedModel getSimple() {
+        return simple;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/RelationshipExtendedModel.java b/library/src/test/java/com/orm/models/RelationshipExtendedModel.java
new file mode 100644
index 00000000..491dd823
--- /dev/null
+++ b/library/src/test/java/com/orm/models/RelationshipExtendedModel.java
@@ -0,0 +1,18 @@
+package com.orm.models;
+
+
+import com.orm.SugarRecord;
+
+public class RelationshipExtendedModel extends SugarRecord {
+    private SimpleExtendedModel simple;
+
+    public RelationshipExtendedModel() {}
+
+    public RelationshipExtendedModel(SimpleExtendedModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleExtendedModel getSimple() {
+        return simple;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/RelationshipMixedAModel.java b/library/src/test/java/com/orm/models/RelationshipMixedAModel.java
new file mode 100644
index 00000000..fbbbc103
--- /dev/null
+++ b/library/src/test/java/com/orm/models/RelationshipMixedAModel.java
@@ -0,0 +1,18 @@
+package com.orm.models;
+
+
+import com.orm.SugarRecord;
+
+public class RelationshipMixedAModel extends SugarRecord {
+    private SimpleAnnotatedModel simple;
+
+    public RelationshipMixedAModel() {}
+
+    public RelationshipMixedAModel(SimpleAnnotatedModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleAnnotatedModel getSimple() {
+        return simple;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/RelationshipMixedBModel.java b/library/src/test/java/com/orm/models/RelationshipMixedBModel.java
new file mode 100644
index 00000000..c302f85a
--- /dev/null
+++ b/library/src/test/java/com/orm/models/RelationshipMixedBModel.java
@@ -0,0 +1,24 @@
+package com.orm.models;
+
+
+import com.orm.annotation.Table;
+
+@Table
+public class RelationshipMixedBModel {
+    private SimpleExtendedModel simple;
+    private Long id;
+
+    public RelationshipMixedBModel() {}
+
+    public RelationshipMixedBModel(SimpleExtendedModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleExtendedModel getSimple() {
+        return simple;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/ShortFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/ShortFieldAnnotatedModel.java
new file mode 100644
index 00000000..f6a0cc45
--- /dev/null
+++ b/library/src/test/java/com/orm/models/ShortFieldAnnotatedModel.java
@@ -0,0 +1,28 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class ShortFieldAnnotatedModel {
+    private Short objectShort;
+    private short rawShort;
+    private Long id;
+
+    public ShortFieldAnnotatedModel() {}
+
+    public ShortFieldAnnotatedModel(Short objectShort) {
+        this.objectShort = objectShort;
+    }
+
+    public ShortFieldAnnotatedModel(short rawShort) {
+        this.rawShort = rawShort;
+    }
+
+    public Short getShort() {
+        return objectShort;
+    }
+
+    public short getRawShort() {
+        return rawShort;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/ShortFieldExtendedModel.java b/library/src/test/java/com/orm/models/ShortFieldExtendedModel.java
new file mode 100644
index 00000000..c7df3a59
--- /dev/null
+++ b/library/src/test/java/com/orm/models/ShortFieldExtendedModel.java
@@ -0,0 +1,26 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class ShortFieldExtendedModel extends SugarRecord {
+    private Short objectShort;
+    private short rawShort;
+
+    public ShortFieldExtendedModel() {}
+
+    public ShortFieldExtendedModel(Short objectShort) {
+        this.objectShort = objectShort;
+    }
+
+    public ShortFieldExtendedModel(short rawShort) {
+        this.rawShort = rawShort;
+    }
+
+    public Short getShort() {
+        return objectShort;
+    }
+
+    public short getRawShort() {
+        return rawShort;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/SimpleAnnotatedModel.java b/library/src/test/java/com/orm/models/SimpleAnnotatedModel.java
new file mode 100644
index 00000000..8a55e0bb
--- /dev/null
+++ b/library/src/test/java/com/orm/models/SimpleAnnotatedModel.java
@@ -0,0 +1,15 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+
+@Table
+public class SimpleAnnotatedModel {
+    private Long id;
+
+    public SimpleAnnotatedModel() {}
+
+    public Long getId() {
+        return id;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/SimpleExtendedModel.java b/library/src/test/java/com/orm/models/SimpleExtendedModel.java
new file mode 100644
index 00000000..65edf2c5
--- /dev/null
+++ b/library/src/test/java/com/orm/models/SimpleExtendedModel.java
@@ -0,0 +1,8 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+
+public class SimpleExtendedModel extends SugarRecord {
+    public SimpleExtendedModel() {}
+}
diff --git a/library/src/test/java/com/orm/models/SimpleModel.java b/library/src/test/java/com/orm/models/SimpleModel.java
new file mode 100644
index 00000000..bdf26167
--- /dev/null
+++ b/library/src/test/java/com/orm/models/SimpleModel.java
@@ -0,0 +1,33 @@
+package com.orm.models;
+
+import com.orm.SugarRecord;
+
+public class SimpleModel extends SugarRecord {
+    private String str;
+    private int integer;
+    private boolean bool;
+
+    public String getStr() {
+        return str;
+    }
+
+    public void setStr(String str) {
+        this.str = str;
+    }
+
+    public int getInteger() {
+        return integer;
+    }
+
+    public void setInteger(int integer) {
+        this.integer = integer;
+    }
+
+    public boolean isBool() {
+        return bool;
+    }
+
+    public void setBool(boolean bool) {
+        this.bool = bool;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java b/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
index 4c36bf24..9526a515 100644
--- a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
@@ -1,18 +1,23 @@
 package com.orm.models;
 
-import com.orm.SugarRecord;
 import com.orm.annotation.Table;
 
-/**
- * Created by sibelius on 02/12/15.
- */
 @Table
-public class StringFieldAnnotatedModel extends SugarRecord {
-    public String name;
+public class StringFieldAnnotatedModel {
+    private String string;
+    private Long id;
 
-    public StringFieldAnnotatedModel() { }
+    public StringFieldAnnotatedModel() {}
 
-    public StringFieldAnnotatedModel(String name) {
-        this.name = name;
+    public StringFieldAnnotatedModel(String string) {
+        this.string = string;
+    }
+
+    public String getString() {
+        return string;
+    }
+
+    public void setString(String string) {
+        this.string = string;
     }
 }
diff --git a/library/src/test/java/com/orm/models/StringFieldAnnotatedNoIdModel.java b/library/src/test/java/com/orm/models/StringFieldAnnotatedNoIdModel.java
new file mode 100644
index 00000000..feb91920
--- /dev/null
+++ b/library/src/test/java/com/orm/models/StringFieldAnnotatedNoIdModel.java
@@ -0,0 +1,22 @@
+package com.orm.models;
+
+import com.orm.annotation.Table;
+
+@Table
+public class StringFieldAnnotatedNoIdModel {
+    private String string;
+
+    public StringFieldAnnotatedNoIdModel() {}
+
+    public StringFieldAnnotatedNoIdModel(String string) {
+        this.string = string;
+    }
+
+    public String getString() {
+        return string;
+    }
+
+    public void setString(String string) {
+        this.string = string;
+    }
+}
diff --git a/library/src/test/java/com/orm/models/StringFieldExtendedModel.java b/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
index 2aff85d7..309c67b9 100644
--- a/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
@@ -2,15 +2,20 @@
 
 import com.orm.SugarRecord;
 
-/**
- * Created by sibelius on 02/12/15.
- */
 public class StringFieldExtendedModel extends SugarRecord {
-    public String name;
+    private String string;
 
-    public StringFieldExtendedModel() { }
+    public StringFieldExtendedModel() {}
 
-    public StringFieldExtendedModel(String name) {
-        this.name = name;
+    public StringFieldExtendedModel(String string) {
+        this.string = string;
+    }
+
+    public String getString() {
+        return string;
+    }
+
+    public void setString(String string) {
+        this.string = string;
     }
 }
diff --git a/library/src/test/java/com/orm/record/BigDecimalFieldTests.java b/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
new file mode 100644
index 00000000..38f8e595
--- /dev/null
+++ b/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
@@ -0,0 +1,61 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.BigDecimalFieldAnnotatedModel;
+import com.orm.models.BigDecimalFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.math.BigDecimal;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class BigDecimalFieldTests {
+
+    @Test
+    public void nullBigDecimalExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new BigDecimalFieldExtendedModel());
+        BigDecimalFieldExtendedModel model =
+                SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
+        assertNull(model.getBigDecimal());
+    }
+
+    @Test
+    public void nullBigDecimalAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new BigDecimalFieldAnnotatedModel());
+        BigDecimalFieldAnnotatedModel model =
+                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
+        assertNull(model.getBigDecimal());
+    }
+
+    @Test
+    public void bigDecimalExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
+        save(new BigDecimalFieldExtendedModel(decimal));
+        BigDecimalFieldExtendedModel model = SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
+        assertEquals(decimal, model.getBigDecimal());
+    }
+
+    @Test
+    public void bigDecimalAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
+        save(new BigDecimalFieldAnnotatedModel(decimal));
+        BigDecimalFieldAnnotatedModel model =
+                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
+        assertEquals(decimal, model.getBigDecimal());
+    }
+}
diff --git a/library/src/test/java/com/orm/record/BooleanFieldTests.java b/library/src/test/java/com/orm/record/BooleanFieldTests.java
new file mode 100644
index 00000000..146a0481
--- /dev/null
+++ b/library/src/test/java/com/orm/record/BooleanFieldTests.java
@@ -0,0 +1,88 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.BooleanFieldAnnotatedModel;
+import com.orm.models.BooleanFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class BooleanFieldTests {
+
+    @Test
+    public void nullBooleanExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new BooleanFieldExtendedModel());
+        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        assertNull(model.getBoolean());
+    }
+
+    @Test
+    public void nullRawBooleanExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new BooleanFieldExtendedModel());
+        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        assertEquals(false, model.getRawBoolean());
+    }
+
+    @Test
+    public void nullBooleanAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new BooleanFieldAnnotatedModel());
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        assertNull(model.getBoolean());
+    }
+
+    @Test
+    public void nullRawBooleanAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new BooleanFieldAnnotatedModel());
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        assertEquals(false, model.getRawBoolean());
+    }
+
+//TODO check this method
+//    @Test
+//    public void objectBooleanExtendedTest() {
+//        SugarContext.init(RuntimeEnvironment.application);
+//        save(new BooleanFieldExtendedModel(true));
+//        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+//        assertEquals(true, model.getBoolean());
+//    }
+
+    @Test
+    public void rawBooleanExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new BooleanFieldExtendedModel(true));
+        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        assertEquals(true, model.getRawBoolean());
+    }
+
+//TODO check this
+//    @Test
+//    public void objectBooleanAnnotatedTest() {
+//        SugarContext.init(RuntimeEnvironment.application);
+//        save(new BooleanFieldAnnotatedModel(true));
+//        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+//        assertEquals(true, model.getBoolean());
+//    }
+
+    @Test
+    public void rawBooleanAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new BooleanFieldAnnotatedModel(true));
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        assertEquals(true, model.getRawBoolean());
+    }
+}
diff --git a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
new file mode 100644
index 00000000..50ef7662
--- /dev/null
+++ b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
@@ -0,0 +1,62 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.ByteArrayAnnotatedModel;
+import com.orm.models.ByteArrayExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class ByteArrayFieldTests {
+
+    @Test
+    public void nullByteArrayExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        byte[] array = "".getBytes();
+        save(new ByteArrayExtendedModel());
+        ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
+        assertEquals(new String(array), new String(model.getByteArray()));
+        assertArrayEquals(array, model.getByteArray());
+    }
+
+    @Test
+    public void nullByteArrayAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        byte[] array = "".getBytes();
+        save(new ByteArrayAnnotatedModel());
+        ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
+        assertEquals(new String(array), new String(model.getByteArray()));
+        assertArrayEquals(array, model.getByteArray());
+    }
+
+    @Test
+    public void byteArrayExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        byte[] array = "hello".getBytes();
+        save(new ByteArrayExtendedModel(array));
+        ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
+        assertEquals(new String(array), new String(model.getByteArray()));
+        assertArrayEquals(array, model.getByteArray());
+    }
+
+    @Test
+    public void byteArrayAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        byte[] array = "hello".getBytes();
+        save(new ByteArrayAnnotatedModel(array));
+        ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
+        assertEquals(new String(array), new String(model.getByteArray()));
+        assertArrayEquals(array, model.getByteArray());
+    }
+}
diff --git a/library/src/test/java/com/orm/record/CursorTests.java b/library/src/test/java/com/orm/record/CursorTests.java
new file mode 100644
index 00000000..ef9ef849
--- /dev/null
+++ b/library/src/test/java/com/orm/record/CursorTests.java
@@ -0,0 +1,82 @@
+package com.orm.record;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.database.Cursor;
+import android.os.Build;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorAdapter;
+import android.widget.TextView;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.models.SimpleModel;
+import com.orm.query.Select;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static junit.framework.Assert.assertNotSame;
+import static junit.framework.Assert.assertSame;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class CursorTests {
+
+    @Test
+    public void testColumnNames() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleModel());
+        Cursor c = Select.from(SimpleModel.class).getCursor();
+        for (String col : new String[]{"STR", "INTEGER", "BOOL", "ID"}) {
+            assertNotSame("Missing column for field: " + col, -1, c.getColumnIndex(col));
+        }
+    }
+    @Test
+    public void testSugarCursor() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleModel());
+        Cursor cursor = Select.from(SimpleModel.class).getCursor();
+        assertNotSame("No _id", -1, cursor.getColumnIndex("_id"));
+        assertSame("_id != ID", cursor.getColumnIndex("_id"), cursor.getColumnIndex("ID"));
+    }
+
+    @Test
+    public void testNoColumn() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleModel());
+        Cursor cursor = Select.from(SimpleModel.class).getCursor();
+        assertSame(-1, cursor.getColumnIndex("nonexistent"));
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    @Test
+    public void testMakeAdapter() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleModel());
+        Cursor c = Select.from(SimpleModel.class).getCursor();
+        CursorAdapter adapter = new CursorAdapter(RuntimeEnvironment.application, c, true) {
+            @Override
+            public View newView(Context context, Cursor cursor, ViewGroup parent) {
+                TextView tv = new TextView(context);
+                String s = cursor.getString(cursor.getColumnIndex("STR"));
+                tv.setText(s);
+                return null;
+            }
+
+            @Override
+            public void bindView(View view, Context context, Cursor cursor) {
+                String s = cursor.getString(cursor.getColumnIndex("STR"));
+                ((TextView) view).setText(s);
+            }
+        };
+
+        Assert.assertNotNull(adapter);
+    }
+}
diff --git a/library/src/test/java/com/orm/record/DoubleFieldTests.java b/library/src/test/java/com/orm/record/DoubleFieldTests.java
new file mode 100644
index 00000000..e9418938
--- /dev/null
+++ b/library/src/test/java/com/orm/record/DoubleFieldTests.java
@@ -0,0 +1,90 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.DoubleFieldAnnotatedModel;
+import com.orm.models.DoubleFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class, manifest = Config.NONE)
+public class DoubleFieldTests {
+
+    @Test
+    public void nullDoubleExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new DoubleFieldExtendedModel());
+        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        assertNull(model.getDouble());
+    }
+
+    @Test
+    public void nullRawDoubleExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new DoubleFieldExtendedModel());
+        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        assertEquals(0.0, model.getRawDouble(), 0.0000000001);
+    }
+
+    @Test
+    public void nullDoubleAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new DoubleFieldAnnotatedModel());
+        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        assertNull(model.getDouble());
+    }
+
+    @Test
+    public void nullRawDoubleAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new DoubleFieldAnnotatedModel());
+        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        assertEquals(0.0, model.getRawDouble(), 0.0000000001);
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void objectDoubleExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Double objectDouble = Double.valueOf(25.0);
+        save(new DoubleFieldExtendedModel(objectDouble));
+        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        assertEquals(objectDouble, model.getDouble());
+    }
+
+    @Test
+    public void rawDoubleExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new DoubleFieldExtendedModel(25.0));
+        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        assertEquals(25.0, model.getRawDouble(), 0.0000000001);
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void objectDoubleAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Double objectDouble = Double.valueOf(25.0);
+        save(new DoubleFieldAnnotatedModel(objectDouble));
+        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        assertEquals(objectDouble, model.getDouble());
+    }
+
+    @Test
+    public void rawDoubleAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new DoubleFieldAnnotatedModel(25.0));
+        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        assertEquals(25.0, model.getRawDouble(), 0.0000000001);
+    }
+}
diff --git a/library/src/test/java/com/orm/record/EnumFieldTests.java b/library/src/test/java/com/orm/record/EnumFieldTests.java
new file mode 100644
index 00000000..a11f52a4
--- /dev/null
+++ b/library/src/test/java/com/orm/record/EnumFieldTests.java
@@ -0,0 +1,94 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.EnumFieldAnnotatedModel;
+import com.orm.models.EnumFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, application = ClientApp.class)
+public class EnumFieldTests {
+
+    @Test
+    public void nullDefaultEnumExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new EnumFieldExtendedModel());
+        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        assertNull(model.getDefaultEnum());
+    }
+
+    @Test
+    public void nullOverriddenEnumExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new EnumFieldExtendedModel());
+        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        assertNull(model.getOverrideEnum());
+    }
+    @Test
+    public void nullDefaultEnumAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new EnumFieldAnnotatedModel());
+        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        assertNull(model.getDefaultEnum());
+    }
+
+    @Test
+    public void nullOverriddenEnumAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new EnumFieldAnnotatedModel());
+        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        assertNull(model.getOverrideEnum());
+    }
+
+    @Test
+    public void defaultEnumExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
+                EnumFieldExtendedModel.DefaultEnum.TWO));
+        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        assertNotNull(model);
+        assertEquals(model.getDefaultEnum(), EnumFieldExtendedModel.DefaultEnum.TWO);
+    }
+
+    @Test
+    public void overriddenEnumExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
+                EnumFieldExtendedModel.DefaultEnum.TWO));
+        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        assertNotNull(model);
+        assertEquals(model.getOverrideEnum(), EnumFieldExtendedModel.OverrideEnum.ONE);
+    }
+
+    @Test
+    public void defaultEnumAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
+                EnumFieldAnnotatedModel.DefaultEnum.TWO));
+        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        assertNotNull(model);
+        assertEquals(model.getDefaultEnum(), EnumFieldAnnotatedModel.DefaultEnum.TWO);
+    }
+
+    @Test
+    public void overriddenEnumAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
+                EnumFieldAnnotatedModel.DefaultEnum.TWO));
+        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        assertNotNull(model);
+        assertEquals(model.getOverrideEnum(), EnumFieldAnnotatedModel.OverrideEnum.ONE);
+    }
+}
diff --git a/library/src/test/java/com/orm/record/FirstAndLastTests.java b/library/src/test/java/com/orm/record/FirstAndLastTests.java
new file mode 100644
index 00000000..61ec1d98
--- /dev/null
+++ b/library/src/test/java/com/orm/record/FirstAndLastTests.java
@@ -0,0 +1,207 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.FloatFieldAnnotatedModel;
+import com.orm.models.FloatFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class FirstAndLastTests {
+
+    @Test
+    @SuppressWarnings("all")
+    public void firstExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float firstObjectFloat = 25F;
+        Float lastObjectFloat = 50F;
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(lastObjectFloat));
+        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+
+        if (null != model) {
+            assertEquals(firstObjectFloat, model.getFloat());
+        }
+    }
+
+    @Test
+    public void firstDeletedRecordExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float firstObjectFloat = 15F;
+        Float secondObjectFloat = 25F;
+        Float thirdObjectFloat = 35F;
+        Float fourthObjectFloat = 45F;
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(secondObjectFloat));
+        save(new FloatFieldExtendedModel(thirdObjectFloat));
+        save(new FloatFieldExtendedModel(fourthObjectFloat));
+        FloatFieldExtendedModel firstRecord = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        firstRecord.delete();
+        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+
+        if (null != model) {
+            assertEquals(secondObjectFloat, model.getFloat());
+        }
+    }
+
+    @Test
+    public void lastExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float firstObjectFloat = 25F;
+        Float lastObjectFloat = 50F;
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(lastObjectFloat));
+        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+
+        if (null != model) {
+            assertEquals(lastObjectFloat, model.getFloat());
+        }
+    }
+
+    @Test
+    public void lastDeletedRecordExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float firstObjectFloat = 15F;
+        Float secondObjectFloat = 25F;
+        Float thirdObjectFloat = 35F;
+        Float fourthObjectFloat = 45F;
+        save(new FloatFieldExtendedModel(firstObjectFloat));
+        save(new FloatFieldExtendedModel(secondObjectFloat));
+        save(new FloatFieldExtendedModel(thirdObjectFloat));
+        save(new FloatFieldExtendedModel(fourthObjectFloat));
+        FloatFieldExtendedModel lastRecord = SugarRecord.findById(FloatFieldExtendedModel.class, 4);
+        lastRecord.delete();
+        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+
+        if (null != model) {
+            assertEquals(thirdObjectFloat, model.getFloat());
+        }
+    }
+
+    @Test
+    public void nullFirstExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertNull(SugarRecord.first(FloatFieldExtendedModel.class));
+    }
+
+    @Test
+    public void nullLastExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertNull(SugarRecord.last(FloatFieldExtendedModel.class));
+    }
+
+    @Test
+    public void oneItemExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new FloatFieldExtendedModel(25F));
+        FloatFieldExtendedModel firstModel = SugarRecord.first(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel lastModel = SugarRecord.last(FloatFieldExtendedModel.class);
+
+        if (null != firstModel && null != lastModel) {
+            assertEquals(firstModel.getFloat(), lastModel.getFloat());
+        }
+    }
+
+    @Test
+    public void firstAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float firstObjectFloat = 25F;
+        Float lastObjectFloat = 50F;
+        save(new FloatFieldAnnotatedModel(firstObjectFloat));
+        save(new FloatFieldAnnotatedModel(lastObjectFloat));
+        FloatFieldAnnotatedModel model = SugarRecord.first(FloatFieldAnnotatedModel.class);
+
+        if (null != model) {
+            assertEquals(firstObjectFloat, model.getFloat());
+        }
+    }
+
+    @Test
+    public void firstDeletedRecordAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float firstObjectFloat = 15F;
+        Float secondObjectFloat = 25F;
+        Float thirdObjectFloat = 35F;
+        Float fourthObjectFloat = 45F;
+        save(new FloatFieldAnnotatedModel(firstObjectFloat));
+        save(new FloatFieldAnnotatedModel(secondObjectFloat));
+        save(new FloatFieldAnnotatedModel(thirdObjectFloat));
+        save(new FloatFieldAnnotatedModel(fourthObjectFloat));
+        FloatFieldAnnotatedModel firstRecord = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        SugarRecord.delete(firstRecord);
+        FloatFieldAnnotatedModel model = SugarRecord.first(FloatFieldAnnotatedModel.class);
+
+        if (null != model) {
+            assertEquals(secondObjectFloat, model.getFloat());
+        }
+    }
+
+    @Test
+    public void lastAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float firstObjectFloat = 25F;
+        Float lastObjectFloat = 50F;
+        save(new FloatFieldAnnotatedModel(firstObjectFloat));
+        save(new FloatFieldAnnotatedModel(lastObjectFloat));
+        FloatFieldAnnotatedModel model = SugarRecord.last(FloatFieldAnnotatedModel.class);
+
+        if (null != model) {
+            assertEquals(lastObjectFloat, model.getFloat());
+        }
+    }
+
+    @Test
+    public void lastDeletedRecordAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float firstObjectFloat = 15F;
+        Float secondObjectFloat = 25F;
+        Float thirdObjectFloat = 35F;
+        Float fourthObjectFloat = 45F;
+        save(new FloatFieldAnnotatedModel(firstObjectFloat));
+        save(new FloatFieldAnnotatedModel(secondObjectFloat));
+        save(new FloatFieldAnnotatedModel(thirdObjectFloat));
+        save(new FloatFieldAnnotatedModel(fourthObjectFloat));
+        FloatFieldAnnotatedModel lastRecord = SugarRecord.findById(FloatFieldAnnotatedModel.class, 4);
+        SugarRecord.delete(lastRecord);
+        FloatFieldAnnotatedModel model = SugarRecord.last(FloatFieldAnnotatedModel.class);
+
+        if (null != model) {
+            assertEquals(thirdObjectFloat, model.getFloat());
+        }
+    }
+
+    @Test
+    public void nullFirstAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertNull(SugarRecord.first(FloatFieldAnnotatedModel.class));
+    }
+
+    @Test
+    public void nullLastAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertNull(SugarRecord.last(FloatFieldAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneItemAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new FloatFieldAnnotatedModel(25F));
+        FloatFieldAnnotatedModel firstModel = SugarRecord.first(FloatFieldAnnotatedModel.class);
+        FloatFieldAnnotatedModel lastModel = SugarRecord.last(FloatFieldAnnotatedModel.class);
+
+        if (null != firstModel && null != lastModel) {
+            assertEquals(firstModel.getFloat(), lastModel.getFloat());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/FloatFieldTests.java b/library/src/test/java/com/orm/record/FloatFieldTests.java
new file mode 100644
index 00000000..58c8dc80
--- /dev/null
+++ b/library/src/test/java/com/orm/record/FloatFieldTests.java
@@ -0,0 +1,88 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.FloatFieldAnnotatedModel;
+import com.orm.models.FloatFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class FloatFieldTests {
+
+    @Test
+    public void nullFloatExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new FloatFieldExtendedModel());
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        assertNull(model.getFloat());
+    }
+
+    @Test
+    public void nullRawFloatExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new FloatFieldExtendedModel());
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        assertEquals(0F, model.getRawFloat(), 0.0000000001F);
+    }
+
+    @Test
+    public void nullFloatAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new FloatFieldAnnotatedModel());
+        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        assertNull(model.getFloat());
+    }
+
+    @Test
+    public void nullRawFloatAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new FloatFieldAnnotatedModel());
+        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        assertEquals(0F, model.getRawFloat(), 0.0000000001F);
+    }
+
+    @Test
+    public void objectFloatExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float objectFloat = 25F;
+        save(new FloatFieldExtendedModel(objectFloat));
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        assertEquals(objectFloat, model.getFloat());
+    }
+
+    @Test
+    public void rawFloatExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new FloatFieldExtendedModel(25F));
+        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        assertEquals(25F, model.getRawFloat(), 0.0000000001F);
+    }
+
+    @Test
+    public void objectFloatAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Float objectFloat = 25F;
+        save(new FloatFieldAnnotatedModel(objectFloat));
+        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        assertEquals(objectFloat, model.getFloat());
+    }
+
+    @Test
+    public void rawFloatAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new FloatFieldAnnotatedModel(25F));
+        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        assertEquals(25F, model.getRawFloat(), 0.0000000001F);
+    }
+}
diff --git a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
new file mode 100644
index 00000000..21898584
--- /dev/null
+++ b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
@@ -0,0 +1,34 @@
+package com.orm.record;
+
+import android.database.sqlite.SQLiteException;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.models.IncompleteAnnotatedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.delete;
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertFalse;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class IncompleteAnnotatedModelTests {
+
+    @Test(expected=SQLiteException.class)
+    public void saveNoIdFieldTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new IncompleteAnnotatedModel());
+    }
+
+    @Test
+    public void deleteNoIdFieldTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertFalse(delete(new IncompleteAnnotatedModel()));
+    }
+}
diff --git a/library/src/test/java/com/orm/record/IntegerFieldTests.java b/library/src/test/java/com/orm/record/IntegerFieldTests.java
new file mode 100644
index 00000000..b666e6b6
--- /dev/null
+++ b/library/src/test/java/com/orm/record/IntegerFieldTests.java
@@ -0,0 +1,88 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.IntegerFieldAnnotatedModel;
+import com.orm.models.IntegerFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class IntegerFieldTests {
+
+    @Test
+    public void nullIntegerExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new IntegerFieldExtendedModel());
+        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        assertNull(model.getInteger());
+    }
+
+    @Test
+    public void nullIntExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new IntegerFieldExtendedModel());
+        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        assertEquals(0, model.getInt());
+    }
+
+    @Test
+    public void nullIntegerAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new IntegerFieldAnnotatedModel());
+        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        assertNull(model.getInteger());
+    }
+
+    @Test
+    public void nullIntAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new IntegerFieldAnnotatedModel());
+        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        assertEquals(0, model.getInt());
+    }
+
+    @Test
+    public void integerExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Integer integer = 25;
+        save(new IntegerFieldExtendedModel(integer));
+        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        assertEquals(integer, model.getInteger());
+    }
+
+    @Test
+    public void intExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new IntegerFieldExtendedModel(25));
+        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        assertEquals(25, model.getInt());
+    }
+
+    @Test
+    public void integerAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Integer integer = 25;
+        save(new IntegerFieldAnnotatedModel(integer));
+        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        assertEquals(integer, model.getInteger());
+    }
+
+    @Test
+    public void intAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new IntegerFieldAnnotatedModel(25));
+        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        assertEquals(25, model.getInt());
+    }
+}
diff --git a/library/src/test/java/com/orm/record/ListAllOrderByTests.java b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
new file mode 100644
index 00000000..46a07a91
--- /dev/null
+++ b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
@@ -0,0 +1,59 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.IntegerFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class ListAllOrderByTests {
+
+    @Test
+    public void listAllOrderByEmptyTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.listAll(IntegerFieldExtendedModel.class, "id").size());
+    }
+
+    @Test
+    public void listAllOrderByIdTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        for(int i = 1; i <= 100; i++) {
+            save(new IntegerFieldExtendedModel(i));
+        }
+        List<IntegerFieldExtendedModel> models =
+                SugarRecord.listAll(IntegerFieldExtendedModel.class, "id");
+        assertEquals(100L, models.size());
+        Long id = models.get(0).getId();
+        for(int i = 1; i < 100; i++) {
+            assertTrue(id <models.get(i).getId());
+        }
+    }
+
+    @Test
+    public void listAllOrderByFieldTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        for(int i = 1; i <= 100; i++) {
+            save(new IntegerFieldExtendedModel(i));
+        }
+        List<IntegerFieldExtendedModel> models =
+                SugarRecord.listAll(IntegerFieldExtendedModel.class, "raw_integer");
+        assertEquals(100L, models.size());
+        int raw = models.get(0).getInt();
+        for(int i = 1; i < 100; i++) {
+            assertTrue(raw < models.get(i).getInt());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/LongFieldTests.java b/library/src/test/java/com/orm/record/LongFieldTests.java
new file mode 100644
index 00000000..78307436
--- /dev/null
+++ b/library/src/test/java/com/orm/record/LongFieldTests.java
@@ -0,0 +1,88 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.LongFieldAnnotatedModel;
+import com.orm.models.LongFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class LongFieldTests {
+
+    @Test
+    public void nullLongExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new LongFieldExtendedModel());
+        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        assertNull(model.getLong());
+    }
+
+    @Test
+    public void nullRawLongExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new LongFieldExtendedModel());
+        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        assertEquals(0L, model.getRawLong());
+    }
+
+    @Test
+    public void nullLongAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new LongFieldAnnotatedModel());
+        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        assertNull(model.getLong());
+    }
+
+    @Test
+    public void nullRawLongAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new LongFieldAnnotatedModel());
+        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        assertEquals(0L, model.getRawLong());
+    }
+
+    @Test
+    public void objectLongExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Long objectLong = 25L;
+        save(new LongFieldExtendedModel(objectLong));
+        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        assertEquals(objectLong, model.getLong());
+    }
+
+    @Test
+    public void rawLongExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new LongFieldExtendedModel(25L));
+        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        assertEquals(25L, model.getRawLong());
+    }
+
+    @Test
+    public void objectLongAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Long objectLong = 25L;
+        save(new LongFieldAnnotatedModel(objectLong));
+        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        assertEquals(objectLong, model.getLong());
+    }
+
+    @Test
+    public void rawLongAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new LongFieldAnnotatedModel(25L));
+        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        assertEquals(25L, model.getRawLong());
+    }
+}
diff --git a/library/src/test/java/com/orm/record/MultipleSaveTests.java b/library/src/test/java/com/orm/record/MultipleSaveTests.java
new file mode 100644
index 00000000..7ffc0855
--- /dev/null
+++ b/library/src/test/java/com/orm/record/MultipleSaveTests.java
@@ -0,0 +1,122 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.StringFieldAnnotatedModel;
+import com.orm.models.StringFieldAnnotatedNoIdModel;
+import com.orm.models.StringFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class MultipleSaveTests {
+
+    @Test
+    public void stringMultipleSaveOriginalExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        String string = "Test String";
+        StringFieldExtendedModel model = new StringFieldExtendedModel(string);
+        long id = save(model);
+        StringFieldExtendedModel query = SugarRecord.findById(StringFieldExtendedModel.class, id);
+
+        if (null != query) {
+            assertEquals(string, query.getString());
+        }
+
+        model.setString("Another test");
+        assertEquals(id, save(model));
+        assertNull(SugarRecord.findById(StringFieldExtendedModel.class, 2));
+    }
+
+    @Test
+    public void stringMultipleSaveQueriedExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        String string = "Test String";
+        StringFieldExtendedModel model = new StringFieldExtendedModel(string);
+        long id = save(model);
+        StringFieldExtendedModel query = SugarRecord.findById(StringFieldExtendedModel.class, id);
+
+        if (null != query) {
+            assertEquals(string, query.getString());
+            query.setString("Another test");
+            assertEquals(id, save(query));
+            assertNull(SugarRecord.findById(StringFieldExtendedModel.class, 2));
+        }
+    }
+
+    @Test
+    public void stringMultipleSaveOriginalAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        String string = "Test String";
+        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
+        long id = save(model);
+        StringFieldAnnotatedModel query = SugarRecord.findById(StringFieldAnnotatedModel.class, id);
+
+        if (null != query) {
+            assertEquals(string, query.getString());
+            model.setString("Another test");
+            assertEquals(id, save(model));
+            assertNull(SugarRecord.findById(StringFieldAnnotatedModel.class, 2));
+        }
+    }
+
+    @Test
+    public void stringMultipleSaveQueriedAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        String string = "Test String";
+        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
+        long id = save(model);
+        StringFieldAnnotatedModel query = SugarRecord.findById(StringFieldAnnotatedModel.class, id);
+
+        if (null != query) {
+            assertEquals(string, query.getString());
+            query.setString("Another test");
+            assertEquals(id, save(query));
+            assertNull(SugarRecord.findById(StringFieldAnnotatedModel.class, 2));
+        }
+    }
+
+    @Test
+    public void stringMultipleSaveOriginalAnnotatedNoIdTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        String string = "Test String";
+        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
+        long id = save(model);
+        StringFieldAnnotatedNoIdModel query =
+                SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, id);
+
+        if (null != query) {
+            assertEquals(string, query.getString());
+            model.setString("Another test");
+            assertEquals(id, save(model));
+            assertNull(SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, 2));
+        }
+    }
+
+    @Test
+    public void stringMultipleSaveQueriedAnnotatedNoIdTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        String string = "Test String";
+        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
+        long id = save(model);
+        StringFieldAnnotatedNoIdModel query =
+                SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, id);
+
+        if (null != query) {
+            assertEquals(string, query.getString());
+            query.setString("Another test");
+            assertEquals(id, save(query));
+            assertNull(SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, 2));
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
new file mode 100644
index 00000000..a777f6de
--- /dev/null
+++ b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
@@ -0,0 +1,143 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.NestedAnnotatedModel;
+import com.orm.models.RelationshipAnnotatedModel;
+import com.orm.models.SimpleAnnotatedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class NestedAnnotatedTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(NestedAnnotatedModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        save(new NestedAnnotatedModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        save(new NestedAnnotatedModel(nested));
+        save(new NestedAnnotatedModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        RelationshipAnnotatedModel another_nested = new RelationshipAnnotatedModel(another_simple);
+        save(another_nested);
+        save(new NestedAnnotatedModel(nested));
+        save(new NestedAnnotatedModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedAnnotatedModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+            save(nested);
+            save(new NestedAnnotatedModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(NestedAnnotatedModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedAnnotatedModel(nested));
+        }
+        List<NestedAnnotatedModel> models = SugarRecord.listAll(NestedAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (NestedAnnotatedModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
+            save(nested);
+            save(new NestedAnnotatedModel(nested));
+        }
+        List<NestedAnnotatedModel> models = SugarRecord.listAll(NestedAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (NestedAnnotatedModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/NestedExtendedTests.java b/library/src/test/java/com/orm/record/NestedExtendedTests.java
new file mode 100644
index 00000000..803aa8d1
--- /dev/null
+++ b/library/src/test/java/com/orm/record/NestedExtendedTests.java
@@ -0,0 +1,143 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.NestedExtendedModel;
+import com.orm.models.RelationshipExtendedModel;
+import com.orm.models.SimpleExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class NestedExtendedTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(NestedExtendedModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        save(new NestedExtendedModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        save(new NestedExtendedModel(nested));
+        save(new NestedExtendedModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        RelationshipExtendedModel another_nested = new RelationshipExtendedModel(another_simple);
+        save(another_nested);
+        save(new NestedExtendedModel(nested));
+        save(new NestedExtendedModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedExtendedModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+            save(nested);
+            save(new NestedExtendedModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(NestedExtendedModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedExtendedModel(nested));
+        }
+        List<NestedExtendedModel> models = SugarRecord.listAll(NestedExtendedModel.class);
+        assertEquals(100, models.size());
+        for (NestedExtendedModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
+            save(nested);
+            save(new NestedExtendedModel(nested));
+        }
+        List<NestedExtendedModel> models = SugarRecord.listAll(NestedExtendedModel.class);
+        assertEquals(100, models.size());
+        for (NestedExtendedModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/NestedMixedAATests.java b/library/src/test/java/com/orm/record/NestedMixedAATests.java
new file mode 100644
index 00000000..f3acacd2
--- /dev/null
+++ b/library/src/test/java/com/orm/record/NestedMixedAATests.java
@@ -0,0 +1,143 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.NestedMixedAAModel;
+import com.orm.models.RelationshipMixedAModel;
+import com.orm.models.SimpleAnnotatedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class NestedMixedAATests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(NestedMixedAAModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        save(new NestedMixedAAModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(1L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        save(new NestedMixedAAModel(nested));
+        save(new NestedMixedAAModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        RelationshipMixedAModel another_nested = new RelationshipMixedAModel(another_simple);
+        save(another_nested);
+        save(new NestedMixedAAModel(nested));
+        save(new NestedMixedAAModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedAAModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+            save(nested);
+            save(new NestedMixedAAModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedAAModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedAAModel(nested));
+        }
+        List<NestedMixedAAModel> models = SugarRecord.listAll(NestedMixedAAModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedAAModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+            save(nested);
+            save(new NestedMixedAAModel(nested));
+        }
+        List<NestedMixedAAModel> models = SugarRecord.listAll(NestedMixedAAModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedAAModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/NestedMixedABTests.java b/library/src/test/java/com/orm/record/NestedMixedABTests.java
new file mode 100644
index 00000000..5d4799d5
--- /dev/null
+++ b/library/src/test/java/com/orm/record/NestedMixedABTests.java
@@ -0,0 +1,143 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.NestedMixedABModel;
+import com.orm.models.RelationshipMixedBModel;
+import com.orm.models.SimpleExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class NestedMixedABTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(NestedMixedABModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        save(new NestedMixedABModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(1L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        save(new NestedMixedABModel(nested));
+        save(new NestedMixedABModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        RelationshipMixedBModel another_nested = new RelationshipMixedBModel(another_simple);
+        save(another_nested);
+        save(new NestedMixedABModel(nested));
+        save(new NestedMixedABModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedABModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+            save(nested);
+            save(new NestedMixedABModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedABModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedABModel(nested));
+        }
+        List<NestedMixedABModel> models = SugarRecord.listAll(NestedMixedABModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedABModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+            save(nested);
+            save(new NestedMixedABModel(nested));
+        }
+        List<NestedMixedABModel> models = SugarRecord.listAll(NestedMixedABModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedABModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/NestedMixedBATests.java b/library/src/test/java/com/orm/record/NestedMixedBATests.java
new file mode 100644
index 00000000..f7575770
--- /dev/null
+++ b/library/src/test/java/com/orm/record/NestedMixedBATests.java
@@ -0,0 +1,143 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.NestedMixedBAModel;
+import com.orm.models.RelationshipMixedAModel;
+import com.orm.models.SimpleAnnotatedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class NestedMixedBATests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(NestedMixedBAModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        save(new NestedMixedBAModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(1L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        save(new NestedMixedBAModel(nested));
+        save(new NestedMixedBAModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        RelationshipMixedAModel another_nested = new RelationshipMixedAModel(another_simple);
+        save(another_nested);
+        save(new NestedMixedBAModel(nested));
+        save(new NestedMixedBAModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedBAModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+            save(nested);
+            save(new NestedMixedBAModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedBAModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedBAModel(nested));
+        }
+        List<NestedMixedBAModel> models = SugarRecord.listAll(NestedMixedBAModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedBAModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+            save(nested);
+            save(new NestedMixedBAModel(nested));
+        }
+        List<NestedMixedBAModel> models = SugarRecord.listAll(NestedMixedBAModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedBAModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/NestedMixedBBTests.java b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
new file mode 100644
index 00000000..af88af23
--- /dev/null
+++ b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
@@ -0,0 +1,143 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.NestedMixedBBModel;
+import com.orm.models.RelationshipMixedBModel;
+import com.orm.models.SimpleExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class NestedMixedBBTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(NestedMixedBBModel.class));
+        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+         SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        save(new NestedMixedBBModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(1L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        save(new NestedMixedBBModel(nested));
+        save(new NestedMixedBBModel(nested));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        RelationshipMixedBModel another_nested = new RelationshipMixedBModel(another_simple);
+        save(another_nested);
+        save(new NestedMixedBBModel(nested));
+        save(new NestedMixedBBModel(another_nested));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(2L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedBBModel(nested));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+            save(nested);
+            save(new NestedMixedBBModel(nested));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(100L, SugarRecord.count(NestedMixedBBModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+        save(nested);
+        for (int i = 1; i <= 100; i++) {
+            save(new NestedMixedBBModel(nested));
+        }
+        List<NestedMixedBBModel> models = SugarRecord.listAll(NestedMixedBBModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedBBModel model : models) {
+            assertEquals(nested.getId(), model.getNested().getId());
+            assertEquals(simple.getId(), model.getNested().getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+            save(nested);
+            save(new NestedMixedBBModel(nested));
+        }
+        List<NestedMixedBBModel> models = SugarRecord.listAll(NestedMixedBBModel.class);
+        assertEquals(100, models.size());
+        for (NestedMixedBBModel model : models) {
+            assertEquals(model.getId(), model.getNested().getId());
+            assertEquals(model.getId(), model.getNested().getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/NoSugarModelTests.java b/library/src/test/java/com/orm/record/NoSugarModelTests.java
new file mode 100644
index 00000000..5ebc40ca
--- /dev/null
+++ b/library/src/test/java/com/orm/record/NoSugarModelTests.java
@@ -0,0 +1,34 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.NoSugarModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class NoSugarModelTests {
+
+    @Test
+    public void deleteTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        NoSugarModel model = new NoSugarModel();
+        assertFalse(SugarRecord.delete(model));
+    }
+
+    @Test
+    public void saveInTransactionTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SugarRecord.saveInTx(new NoSugarModel(), new NoSugarModel());
+        assertEquals(-1L, SugarRecord.count(NoSugarModel.class));
+    }
+}
diff --git a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
new file mode 100644
index 00000000..0719bcd0
--- /dev/null
+++ b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
@@ -0,0 +1,120 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.RelationshipAnnotatedModel;
+import com.orm.models.SimpleAnnotatedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class RelationshipAnnotatedTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        save(new RelationshipAnnotatedModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        save(new RelationshipAnnotatedModel(simple));
+        save(new RelationshipAnnotatedModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
+        save(another_simple);
+        save(new RelationshipAnnotatedModel(simple));
+        save(new RelationshipAnnotatedModel(another_simple));
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipAnnotatedModel(simple));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            save(new RelationshipAnnotatedModel(simple));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipAnnotatedModel(simple));
+        }
+        List<RelationshipAnnotatedModel> models =
+                SugarRecord.listAll(RelationshipAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipAnnotatedModel model : models) {
+            assertEquals(simple.getId(), model.getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+            save(simple);
+            save(new RelationshipAnnotatedModel(simple));
+        }
+        List<RelationshipAnnotatedModel> models =
+                SugarRecord.listAll(RelationshipAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipAnnotatedModel model : models) {
+            assertEquals(model.getId(), model.getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
new file mode 100644
index 00000000..dbd17fe6
--- /dev/null
+++ b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
@@ -0,0 +1,120 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.RelationshipExtendedModel;
+import com.orm.models.SimpleExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class RelationshipExtendedTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        save(new RelationshipExtendedModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        save(new RelationshipExtendedModel(simple));
+        save(new RelationshipExtendedModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        save(new RelationshipExtendedModel(simple));
+        save(new RelationshipExtendedModel(another_simple));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipExtendedModel(simple));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            save(new RelationshipExtendedModel(simple));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipExtendedModel(simple));
+        }
+        List<RelationshipExtendedModel> models =
+                SugarRecord.listAll(RelationshipExtendedModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipExtendedModel model : models) {
+            assertEquals(simple.getId(), model.getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            save(new RelationshipExtendedModel(simple));
+        }
+        List<RelationshipExtendedModel> models =
+                SugarRecord.listAll(RelationshipExtendedModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipExtendedModel model : models) {
+            assertEquals(model.getId(), model.getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
new file mode 100644
index 00000000..190c030f
--- /dev/null
+++ b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
@@ -0,0 +1,120 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.RelationshipMixedBModel;
+import com.orm.models.SimpleExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class RelationshipMixedBTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        save(new RelationshipMixedBModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        save(new RelationshipMixedBModel(simple));
+        save(new RelationshipMixedBModel(simple));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        SimpleExtendedModel another_simple = new SimpleExtendedModel();
+        save(another_simple);
+        save(new RelationshipMixedBModel(simple));
+        save(new RelationshipMixedBModel(another_simple));
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipMixedBModel(simple));
+        }
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            save(new RelationshipMixedBModel(simple));
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel simple = new SimpleExtendedModel();
+        save(simple);
+        for (int i = 1; i <= 100; i++) {
+            save(new RelationshipMixedBModel(simple));
+        }
+        List<RelationshipMixedBModel> models =
+                SugarRecord.listAll(RelationshipMixedBModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipMixedBModel model : models) {
+            assertEquals(simple.getId(), model.getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            SimpleExtendedModel simple = new SimpleExtendedModel();
+            save(simple);
+            save(new RelationshipMixedBModel(simple));
+        }
+        List<RelationshipMixedBModel> models =
+                SugarRecord.listAll(RelationshipMixedBModel.class);
+        assertEquals(100, models.size());
+        for (RelationshipMixedBModel model : models) {
+            assertEquals(model.getId(), model.getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/ShortFieldTests.java b/library/src/test/java/com/orm/record/ShortFieldTests.java
new file mode 100644
index 00000000..0de32144
--- /dev/null
+++ b/library/src/test/java/com/orm/record/ShortFieldTests.java
@@ -0,0 +1,88 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.ShortFieldAnnotatedModel;
+import com.orm.models.ShortFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class ShortFieldTests {
+
+    @Test
+    public void nullShortExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new ShortFieldExtendedModel());
+        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        assertNull(model.getShort());
+    }
+
+    @Test
+    public void nullRawShortExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new ShortFieldExtendedModel());
+        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        assertEquals((short) 0, model.getRawShort());
+    }
+
+    @Test
+    public void nullShortAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new ShortFieldAnnotatedModel());
+        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        assertNull(model.getShort());
+    }
+
+    @Test
+    public void nullRawShortAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new ShortFieldAnnotatedModel());
+        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        assertEquals((short) 0, model.getRawShort());
+    }
+
+    @Test
+    public void objectShortExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Short objectShort = 25;
+        save(new ShortFieldExtendedModel(objectShort));
+        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        assertEquals(objectShort, model.getShort());
+    }
+
+    @Test
+    public void rawShortExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new ShortFieldExtendedModel((short) 25));
+        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        assertEquals((short) 25, model.getRawShort());
+    }
+
+    @Test
+    public void objectShortAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        Short objectShort = 25;
+        save(new ShortFieldAnnotatedModel(objectShort));
+        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        assertEquals(objectShort, model.getShort());
+    }
+
+    @Test
+    public void rawShortAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new ShortFieldAnnotatedModel((short) 25));
+        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        assertEquals((short) 25, model.getRawShort());
+    }
+}
diff --git a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
new file mode 100644
index 00000000..d2f8508e
--- /dev/null
+++ b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
@@ -0,0 +1,393 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.helper.NamingHelper;
+import com.orm.models.SimpleAnnotatedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class SimpleAnnotatedModelTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void twoSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void manySaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void defaultIdTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(1L, save(new SimpleAnnotatedModel()));
+    }
+
+    @Test
+    public void whereCountTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void whereNoCountTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"3"}));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"a"}));
+    }
+
+    @Test
+    public void whereBrokenCountTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        assertEquals(-1L, SugarRecord.count(SimpleAnnotatedModel.class, "di = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void deleteTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
+        save(model);
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertTrue(SugarRecord.delete(model));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void deleteUnsavedTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertFalse(SugarRecord.delete(model));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void deleteWrongTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
+        save(model);
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        Field idField = model.getClass().getDeclaredField("id");
+        idField.setAccessible(true);
+        idField.set(model, Long.MAX_VALUE);
+        assertFalse(SugarRecord.delete(model));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void deleteAllTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        int elementNumber = 100;
+        for (int i = 1; i <= elementNumber; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        assertEquals(elementNumber, SugarRecord.deleteAll(SimpleAnnotatedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void deleteAllWhereTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        int elementNumber = 100;
+        for (int i = 1; i <= elementNumber; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        assertEquals(elementNumber - 1, SugarRecord.deleteAll(SimpleAnnotatedModel.class, "id > ?", new String[]{"1"}));
+        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void deleteInTransactionFewTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleAnnotatedModel first = new SimpleAnnotatedModel();
+        SimpleAnnotatedModel second = new SimpleAnnotatedModel();
+        SimpleAnnotatedModel third = new SimpleAnnotatedModel();
+        save(first);
+        save(second);
+        // Not saving last model
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2, SugarRecord.deleteInTx(first, second, third));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void deleteInTransactionManyTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        long elementNumber = 100;
+        List<SimpleAnnotatedModel> models = new ArrayList<>();
+        for (int i = 1; i <= elementNumber; i++) {
+            SimpleAnnotatedModel model = new SimpleAnnotatedModel();
+            models.add(model);
+            // Not saving last model
+            if (i < elementNumber) {
+                save(model);
+            }
+        }
+        assertEquals(elementNumber - 1, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(elementNumber - 1, SugarRecord.deleteInTx(models));
+        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void saveInTransactionTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SugarRecord.saveInTx(new SimpleAnnotatedModel(), new SimpleAnnotatedModel());
+        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void listAllTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        List<SimpleAnnotatedModel> models = SugarRecord.listAll(SimpleAnnotatedModel.class);
+        assertEquals(100, models.size());
+        for (long i = 1; i <= 100; i++) {
+            assertEquals(Long.valueOf(i), models.get((int) i - 1).getId());
+        }
+    }
+
+    @Test
+    public void findTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.find(SimpleAnnotatedModel.class, "id = ?", "2");
+        assertEquals(1, models.size());
+        assertEquals(2L, models.get(0).getId().longValue());
+    }
+
+    @Test
+    public void findWithQueryTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findWithQuery(SimpleAnnotatedModel.class, "Select * from " +
+                        NamingHelper.toSQLName(SimpleAnnotatedModel.class) +
+                        " where id >= ? ", "50");
+        for (SimpleAnnotatedModel model : models) {
+            assertEquals(75L, model.getId(), 25L);
+        }
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void findByIdTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        assertEquals(1L, SugarRecord.findById(SimpleAnnotatedModel.class, 1L).getId().longValue());
+    }
+
+    @Test
+    public void findByIdIntegerTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        assertEquals(1L, SugarRecord.findById(SimpleAnnotatedModel.class, 1).getId().longValue());
+    }
+
+    @Test
+    public void findByIdStringsNullTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        assertEquals(0, SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{""}).size());
+    }
+
+    @Test
+    public void findByIdStringsOneTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1"});
+        assertEquals(1, models.size());
+        assertEquals(1L, models.get(0).getId().longValue());
+    }
+
+    @Test
+    public void findByIdStringsTwoTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        save(new SimpleAnnotatedModel());
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1", "3"});
+        assertEquals(2, models.size());
+        assertEquals(Long.valueOf(1L), models.get(0).getId());
+        assertEquals(Long.valueOf(3L), models.get(1).getId());
+    }
+
+    @Test
+    public void findByIdStringsManyTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 10; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1", "3", "6", "10"});
+        assertEquals(4, models.size());
+        assertEquals(Long.valueOf(1L), models.get(0).getId());
+        assertEquals(Long.valueOf(3L), models.get(1).getId());
+        assertEquals(Long.valueOf(6L), models.get(2).getId());
+        assertEquals(Long.valueOf(10L), models.get(3).getId());
+    }
+
+    @Test
+    public void findByIdStringsOrderTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 10; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        List<SimpleAnnotatedModel> models =
+                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"10", "6", "3", "1"});
+        assertEquals(4, models.size());
+        // The order of the query doesn't matter
+        assertEquals(Long.valueOf(1L), models.get(0).getId());
+        assertEquals(Long.valueOf(3L), models.get(1).getId());
+        assertEquals(Long.valueOf(6L), models.get(2).getId());
+        assertEquals(Long.valueOf(10L), models.get(3).getId());
+    }
+
+    @Test
+    public void findByIdNullTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        assertNull(SugarRecord.findById(SimpleAnnotatedModel.class, 2L));
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAll(SimpleAnnotatedModel.class);
+        for (int i = 1; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleAnnotatedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(Long.valueOf(i), model.getId());
+        }
+    }
+
+    @Test
+    public void findAsIteratorTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
+                "id >= ?", "50");
+        for (int i = 50; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleAnnotatedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(Long.valueOf(i), model.getId());
+        }
+    }
+
+    @Test
+    public void findWithQueryAsIteratorTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleAnnotatedModel());
+        }
+        Iterator<SimpleAnnotatedModel> cursor =
+                SugarRecord.findWithQueryAsIterator(SimpleAnnotatedModel.class,
+                        "Select * from " +
+                                NamingHelper.toSQLName(SimpleAnnotatedModel.class) +
+                                " where id >= ? ", "50");
+        for (int i = 50; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleAnnotatedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(Long.valueOf(i), model.getId());
+        }
+    }
+
+    @Test(expected=NoSuchElementException.class)
+    public void findAsIteratorOutOfBoundsTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
+                "id = ?", "1");
+        assertTrue(cursor.hasNext());
+        SimpleAnnotatedModel model = cursor.next();
+        assertNotNull(model);
+        assertEquals(Long.valueOf(1), model.getId());
+        // This should throw a NoSuchElementException
+        cursor.next();
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void disallowRemoveCursorTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleAnnotatedModel());
+        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
+                "id = ?", "1");
+        assertTrue(cursor.hasNext());
+        SimpleAnnotatedModel model = cursor.next();
+        assertNotNull(model);
+        assertEquals(Long.valueOf(1), model.getId());
+        // This should throw a UnsupportedOperationException
+        cursor.remove();
+    }
+
+    @Test
+    public void vacuumTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SugarRecord.executeQuery("Vacuum");
+    }
+}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
new file mode 100644
index 00000000..c6f4d37f
--- /dev/null
+++ b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
@@ -0,0 +1,403 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.helper.NamingHelper;
+import com.orm.models.SimpleExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class SimpleExtendedModelTests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void twoSaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void manySaveTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void defaultIdTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(1L, save(new SimpleExtendedModel()));
+    }
+
+    @Test
+    public void whereCountTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void whereNoCountTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"3"}));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"a"}));
+    }
+
+    @Test
+    public void whereBrokenCountTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void saveMethodTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel model = new SimpleExtendedModel();
+        model.save();
+        assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void deleteTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel model = new SimpleExtendedModel();
+        save(model);
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertTrue(SugarRecord.delete(model));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void deleteUnsavedTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel model = new SimpleExtendedModel();
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertFalse(SugarRecord.delete(model));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void deleteWrongTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel model = new SimpleExtendedModel();
+        save(model);
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        Field idField = model.getClass().getSuperclass().getDeclaredField("id");
+        idField.setAccessible(true);
+        idField.set(model, Long.MAX_VALUE);
+        assertFalse(SugarRecord.delete(model));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void deleteAllTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        int elementNumber = 100;
+        for (int i = 1; i <= elementNumber; i++) {
+            save(new SimpleExtendedModel());
+        }
+        assertEquals(elementNumber, SugarRecord.deleteAll(SimpleExtendedModel.class));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void deleteAllWhereTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        int elementNumber = 100;
+        for (int i = 1; i <= elementNumber; i++) {
+            save(new SimpleExtendedModel());
+        }
+        assertEquals(elementNumber - 1, SugarRecord.deleteAll(SimpleExtendedModel.class,
+                                                              "id > ?",
+                                                              new String[]{"1"}));
+        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void deleteInTransactionFewTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SimpleExtendedModel first = new SimpleExtendedModel();
+        SimpleExtendedModel second = new SimpleExtendedModel();
+        SimpleExtendedModel third = new SimpleExtendedModel();
+        save(first);
+        save(second);
+        // Not saving last model
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2, SugarRecord.deleteInTx(first, second, third));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void deleteInTransactionManyTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        long elementNumber = 100;
+        List<SimpleExtendedModel> models = new ArrayList<>();
+        for (int i = 1; i <= elementNumber; i++) {
+            SimpleExtendedModel model = new SimpleExtendedModel();
+            models.add(model);
+            // Not saving last model
+            if (i < elementNumber) {
+                save(model);
+            }
+        }
+        assertEquals(elementNumber - 1, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(elementNumber - 1, SugarRecord.deleteInTx(models));
+        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void saveInTransactionTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SugarRecord.saveInTx(new SimpleExtendedModel(), new SimpleExtendedModel());
+        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+    }
+
+    @Test
+    public void listAllTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        List<SimpleExtendedModel> models = SugarRecord.listAll(SimpleExtendedModel.class);
+        assertEquals(100, models.size());
+        for (long i = 1; i <= 100; i++) {
+            assertEquals(Long.valueOf(i), models.get((int) i - 1).getId());
+        }
+    }
+
+    @Test
+    public void findTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        List<SimpleExtendedModel> models =
+                SugarRecord.find(SimpleExtendedModel.class, "id = ?", "2");
+        assertEquals(1, models.size());
+        assertEquals(Long.valueOf(2L), models.get(0).getId());
+    }
+
+    @Test
+    public void findWithQueryTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        List<SimpleExtendedModel> models =
+                SugarRecord.findWithQuery(SimpleExtendedModel.class, "Select * from " +
+                                          NamingHelper.toSQLName(SimpleExtendedModel.class) +
+                                          " where id >= ? ", "50");
+        for (SimpleExtendedModel model : models) {
+            assertEquals(75, model.getId(), 25L);
+        }
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void findByIdTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        assertEquals(Long.valueOf(1L), SugarRecord.findById(SimpleExtendedModel.class, 1L).getId());
+    }
+
+    @Test
+    public void findByIdIntegerTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        assertEquals(Long.valueOf(1L), SugarRecord.findById(SimpleExtendedModel.class, 1).getId());
+    }
+
+    @Test
+    public void findByIdStringsNullTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        assertEquals(0, SugarRecord.findById(SimpleExtendedModel.class, new String[]{""}).size());
+    }
+
+    @Test
+    public void findByIdStringsOneTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        List<SimpleExtendedModel> models =
+                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1"});
+        assertEquals(1, models.size());
+        assertEquals(Long.valueOf(1L), models.get(0).getId());
+    }
+
+    @Test
+    public void findByIdStringsTwoTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        save(new SimpleExtendedModel());
+        List<SimpleExtendedModel> models =
+                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1", "3"});
+        assertEquals(2, models.size());
+        assertEquals(Long.valueOf(1L), models.get(0).getId());
+        assertEquals(Long.valueOf(3L), models.get(1).getId());
+    }
+
+    @Test
+    public void findByIdStringsManyTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 10; i++) {
+            save(new SimpleExtendedModel());
+        }
+        List<SimpleExtendedModel> models =
+                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1", "3", "6", "10"});
+        assertEquals(4, models.size());
+        assertEquals(Long.valueOf(1L), models.get(0).getId());
+        assertEquals(Long.valueOf(3L), models.get(1).getId());
+        assertEquals(Long.valueOf(6L), models.get(2).getId());
+        assertEquals(Long.valueOf(10L), models.get(3).getId());
+    }
+
+    @Test
+    public void findByIdStringsOrderTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 10; i++) {
+            save(new SimpleExtendedModel());
+        }
+        List<SimpleExtendedModel> models =
+                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"10", "6", "3", "1"});
+        assertEquals(4, models.size());
+        // The order of the query doesn't matter
+        assertEquals(Long.valueOf(1L), models.get(0).getId());
+        assertEquals(Long.valueOf(3L), models.get(1).getId());
+        assertEquals(Long.valueOf(6L), models.get(2).getId());
+        assertEquals(Long.valueOf(10L), models.get(3).getId());
+    }
+
+    @Test
+    public void findByIdNullTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        assertNull(SugarRecord.findById(SimpleExtendedModel.class, 2L));
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAll(SimpleExtendedModel.class);
+        for (int i = 1; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleExtendedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(Long.valueOf(i), model.getId());
+        }
+    }
+
+    @Test
+    public void findAsIteratorTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
+                "id >= ?", "50");
+        for (int i = 50; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleExtendedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(Long.valueOf(i), model.getId());
+        }
+    }
+
+    @Test
+    public void findWithQueryAsIteratorTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        for (int i = 1; i <= 100; i++) {
+            save(new SimpleExtendedModel());
+        }
+        Iterator<SimpleExtendedModel> cursor =
+                SugarRecord.findWithQueryAsIterator(SimpleExtendedModel.class,
+                                                    "Select * from " +
+                                                    NamingHelper.toSQLName(SimpleExtendedModel.class) +
+                                                    " where id >= ? ", "50");
+        for (int i = 50; i <= 100; i++) {
+            assertTrue(cursor.hasNext());
+            SimpleExtendedModel model = cursor.next();
+            assertNotNull(model);
+            assertEquals(Long.valueOf(i), model.getId());
+        }
+    }
+
+    @Test(expected=NoSuchElementException.class)
+    public void findAsIteratorOutOfBoundsTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
+                "id = ?", "1");
+        assertTrue(cursor.hasNext());
+        SimpleExtendedModel model = cursor.next();
+        assertNotNull(model);
+        assertEquals(Long.valueOf(1), model.getId());
+        // This should throw a NoSuchElementException
+        cursor.next();
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void disallowRemoveCursorTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new SimpleExtendedModel());
+        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
+                "id = ?", "1");
+        assertTrue(cursor.hasNext());
+        SimpleExtendedModel model = cursor.next();
+        assertNotNull(model);
+        assertEquals(Long.valueOf(1), model.getId());
+        // This should throw a UnsupportedOperationException
+        cursor.remove();
+    }
+
+    @Test
+    public void vacuumTest() throws Exception {
+        SugarContext.init(RuntimeEnvironment.application);
+        SugarRecord.executeQuery("Vacuum");
+    }
+}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/StringFieldTests.java b/library/src/test/java/com/orm/record/StringFieldTests.java
new file mode 100644
index 00000000..9c69e062
--- /dev/null
+++ b/library/src/test/java/com/orm/record/StringFieldTests.java
@@ -0,0 +1,56 @@
+package com.orm.record;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.SugarRecord;
+import com.orm.models.StringFieldAnnotatedModel;
+import com.orm.models.StringFieldExtendedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk=18, application = ClientApp.class)
+public class StringFieldTests {
+
+    @Test
+    public void nullStringExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new StringFieldExtendedModel());
+        StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
+        assertNull(model.getString());
+    }
+
+    @Test
+    public void nullStringAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        save(new StringFieldAnnotatedModel());
+        StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
+        assertNull(model.getString());
+    }
+
+    @Test
+    public void stringExtendedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        String string = "Test String";
+        save(new StringFieldExtendedModel(string));
+        StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
+        assertEquals(string, model.getString());
+    }
+
+    @Test
+    public void stringAnnotatedTest() {
+        SugarContext.init(RuntimeEnvironment.application);
+        String string = "Test String";
+        save(new StringFieldAnnotatedModel(string));
+        StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
+        assertEquals(string, model.getString());
+    }
+}

From 602e61f5faaee89aa8f2739e52f25412479e4488 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Thu, 7 Apr 2016 23:09:48 -0300
Subject: [PATCH 250/305] Start migration of test to library in order to
 increment coverage.

---
 library/src/test/java/com/orm/SchemaGeneratorTest.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 60b74ae0..84720214 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -40,16 +40,14 @@ public void testSimpleColumnTableCreation() throws Exception {
 
         String createSQL2 = schemaGenerator.createTableSQL(StringFieldAnnotatedModel.class);
 
-        assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldAnnotatedModel.class) +
+        assertEquals("CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldAnnotatedModel.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
                         "STRING TEXT ) ",
                 createSQL2);
 
         String createSQL3 = schemaGenerator.createTableSQL(StringFieldExtendedModelAnnotatedColumn.class);
 
-        assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldExtendedModelAnnotatedColumn.class) +
+        assertEquals("CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldExtendedModelAnnotatedColumn.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
                         "anyName TEXT ) ",
                 createSQL3);

From dbcc2729889758d177153ba69ef7d7a84d64011e Mon Sep 17 00:00:00 2001
From: jonisaa <jonatansalas@live.com.ar>
Date: Fri, 8 Apr 2016 14:29:13 -0300
Subject: [PATCH 251/305] Deleted DummyContext class Extracted all call to
 SugarContext.init() to run in an @Before annotated method.

---
 .../test/java/com/orm/NamingHelperTest.java   |  17 +-
 .../java/com/orm/SchemaGeneratorTest.java     |  17 +-
 .../com/orm/SugarDbConfigurationTest.java     |  20 +-
 .../com/orm/{query => models}/TestRecord.java |   2 +-
 .../test/java/com/orm/query/DummyContext.java | 484 ------------------
 .../test/java/com/orm/query/SelectTest.java   |   2 +
 .../com/orm/record/BigDecimalFieldTests.java  |  10 +-
 .../com/orm/record/BooleanFieldTests.java     |  23 +-
 .../com/orm/record/ByteArrayFieldTests.java   |  11 +-
 .../test/java/com/orm/record/CursorTests.java |  10 +-
 .../java/com/orm/record/DoubleFieldTests.java |  14 +-
 .../java/com/orm/record/EnumFieldTests.java   |  14 +-
 .../com/orm/record/FirstAndLastTests.java     |  20 +-
 .../java/com/orm/record/FloatFieldTests.java  |  14 +-
 .../record/IncompleteAnnotatedModelTests.java |   8 +-
 .../com/orm/record/IntegerFieldTests.java     |  14 +-
 .../com/orm/record/ListAllOrderByTests.java   |  10 +-
 .../java/com/orm/record/LongFieldTests.java   |  14 +-
 .../com/orm/record/MultipleSaveTests.java     |  12 +-
 .../com/orm/record/NestedAnnotatedTests.java  |  14 +-
 .../com/orm/record/NestedExtendedTests.java   |  14 +-
 .../com/orm/record/NestedMixedAATests.java    |  14 +-
 .../com/orm/record/NestedMixedABTests.java    |  14 +-
 .../com/orm/record/NestedMixedBATests.java    |  14 +-
 .../com/orm/record/NestedMixedBBTests.java    |  14 +-
 .../com/orm/record/NoSugarModelTests.java     |   8 +-
 .../record/RelationshipAnnotatedTests.java    |  14 +-
 .../orm/record/RelationshipExtendedTests.java |  14 +-
 .../orm/record/RelationshipMixedBTests.java   |  13 +-
 .../java/com/orm/record/ShortFieldTests.java  |  14 +-
 .../orm/record/SimpleAnnotatedModelTests.java |  39 +-
 .../orm/record/SimpleExtendedModelTests.java  |  41 +-
 .../java/com/orm/record/StringFieldTests.java |  11 +-
 .../java/com/orm/util/ContextUtilTest.java    |  32 +-
 .../java/com/orm/util/ManifestHelperTest.java |  21 +-
 35 files changed, 233 insertions(+), 774 deletions(-)
 rename library/src/test/java/com/orm/{query => models}/TestRecord.java (86%)
 delete mode 100644 library/src/test/java/com/orm/query/DummyContext.java

diff --git a/library/src/test/java/com/orm/NamingHelperTest.java b/library/src/test/java/com/orm/NamingHelperTest.java
index 263d816f..f4873c81 100644
--- a/library/src/test/java/com/orm/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/NamingHelperTest.java
@@ -1,10 +1,9 @@
 package com.orm;
 
 import com.orm.helper.NamingHelper;
-import com.orm.query.TestRecord;
+import com.orm.models.TestRecord;
 import com.orm.util.ReflectionUtil;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.lang.reflect.Field;
@@ -12,25 +11,27 @@
 import java.util.List;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
 
 public class NamingHelperTest {
 
     @Test
     public void testToSQLNameFromField() {
         List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
-        List<String> columnList = new ArrayList<>();
 
         if (null != fieldList && !fieldList.isEmpty()) {
+            List<String> columnList = new ArrayList<>();
+
             for(Field field: fieldList) {
                 columnList.add(NamingHelper.toSQLName(field));
             }
-        }
 
-        boolean isIdInList = inList(columnList, "ID");
-        boolean isNameInList = inList(columnList, "NAME");
+            boolean isIdInList = inList(columnList, "ID");
+            boolean isNameInList = inList(columnList, "NAME");
 
-        Assert.assertTrue(isIdInList);
-        Assert.assertTrue(isNameInList);
+            assertTrue(isIdInList);
+            assertTrue(isNameInList);
+        }
     }
 
     private boolean inList(List<String> list, String searchValue) {
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 84720214..6e883caa 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -6,19 +6,27 @@
 import com.orm.models.StringFieldAnnotatedModel;
 import com.orm.models.StringFieldExtendedModel;
 import com.orm.models.StringFieldExtendedModelAnnotatedColumn;
-import com.orm.query.DummyContext;
-import com.orm.util.ContextUtil;
 import com.orm.helper.NamingHelper;
 
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 import static junit.framework.Assert.assertEquals;
 
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
 public class SchemaGeneratorTest {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void testEmptyTableCreation() throws Exception {
-        ContextUtil.init(new DummyContext());
         SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(EmptyModel.class);
         assertEquals(
@@ -29,7 +37,6 @@ public void testEmptyTableCreation() throws Exception {
 
     @Test
     public void testSimpleColumnTableCreation() throws Exception {
-        ContextUtil.init(new DummyContext());
         SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(StringFieldExtendedModel.class);
         assertEquals(
@@ -55,7 +62,6 @@ public void testSimpleColumnTableCreation() throws Exception {
 
     @Test
     public void testUniqueTableCreation() {
-        ContextUtil.init(new DummyContext());
         SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(IntUniqueModel.class);
         assertEquals(
@@ -67,7 +73,6 @@ public void testUniqueTableCreation() {
 
     @Test
     public void testMultiColumnUniqueTableCreation() {
-        ContextUtil.init(new DummyContext());
         SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(MultiColumnUniqueModel.class);
         assertEquals(
diff --git a/library/src/test/java/com/orm/SugarDbConfigurationTest.java b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
index a55a00d6..06ea6ae9 100644
--- a/library/src/test/java/com/orm/SugarDbConfigurationTest.java
+++ b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
@@ -1,10 +1,7 @@
 package com.orm;
 
-import android.database.sqlite.SQLiteDatabase;
-
 import com.orm.dsl.BuildConfig;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
@@ -13,6 +10,9 @@
 
 import java.util.Locale;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 /**
  * @author jonatan.salas
  */
@@ -31,19 +31,17 @@ public void testNotNullConfiguration() {
 
         final SugarDbConfiguration config = SugarContext.getDbConfiguration();
 
-        Assert.assertEquals(configuration.getDatabaseLocale(), config.getDatabaseLocale());
-        Assert.assertEquals(configuration.getMaxSize(), config.getMaxSize());
-        Assert.assertEquals(configuration.getPageSize(), config.getPageSize());
+        assertEquals(configuration.getDatabaseLocale(), config.getDatabaseLocale());
+        assertEquals(configuration.getMaxSize(), config.getMaxSize());
+        assertEquals(configuration.getPageSize(), config.getPageSize());
     }
 
     @Test
     public void testNullConfiguration() {
         SugarContext.init(RuntimeEnvironment.application);
-
-        Assert.assertNull(SugarContext.getDbConfiguration());
+        assertNull(SugarContext.getDbConfiguration());
     }
 
-//TODO: check this method
 //    @Test
 //    public void testNotNullConfigurationWithSugarDb() {
 //        SugarDbConfiguration configuration = new SugarDbConfiguration()
@@ -56,8 +54,8 @@ public void testNullConfiguration() {
 //        SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
 //        SQLiteDatabase sqLiteDatabase = SugarDb.getInstance().getDB();
 //
-//        Assert.assertEquals(database.getMaximumSize(), sqLiteDatabase.getMaximumSize());
-//        Assert.assertEquals(database.getPageSize(), sqLiteDatabase.getPageSize());
+//        assertEquals(database.getMaximumSize(), sqLiteDatabase.getMaximumSize());
+//        assertEquals(database.getPageSize(), sqLiteDatabase.getPageSize());
 //
 //        if (sqLiteDatabase.isOpen()) {
 //            sqLiteDatabase.close();
diff --git a/library/src/test/java/com/orm/query/TestRecord.java b/library/src/test/java/com/orm/models/TestRecord.java
similarity index 86%
rename from library/src/test/java/com/orm/query/TestRecord.java
rename to library/src/test/java/com/orm/models/TestRecord.java
index 383a5234..f537f501 100644
--- a/library/src/test/java/com/orm/query/TestRecord.java
+++ b/library/src/test/java/com/orm/models/TestRecord.java
@@ -1,4 +1,4 @@
-package com.orm.query;
+package com.orm.models;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/query/DummyContext.java b/library/src/test/java/com/orm/query/DummyContext.java
deleted file mode 100644
index 77a897ff..00000000
--- a/library/src/test/java/com/orm/query/DummyContext.java
+++ /dev/null
@@ -1,484 +0,0 @@
-package com.orm.query;
-
-import android.content.*;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.database.DatabaseErrorHandler;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.UserHandle;
-import android.view.Display;
-
-import java.io.*;
-
-public class DummyContext extends Context {
-    @Override
-    public File getCodeCacheDir() {
-        return null;
-    }
-
-    @Override
-    public File[] getExternalFilesDirs(String type) {
-        return null;
-    }
-
-    @Override
-    public File[] getExternalCacheDirs() {
-        return null;
-    }
-
-    @Override
-    public File getNoBackupFilesDir() {
-        return null;
-    }
-
-    @Override
-    public File[] getObbDirs() {
-        return null;
-    }
-
-    @Override
-    public File[] getExternalMediaDirs() {
-        return null;
-    }
-
-    @Override
-    public AssetManager getAssets() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Resources getResources() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public PackageManager getPackageManager() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public ContentResolver getContentResolver() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Looper getMainLooper() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Context getApplicationContext() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void setTheme(int i) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Resources.Theme getTheme() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public ClassLoader getClassLoader() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public String getPackageName() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public ApplicationInfo getApplicationInfo() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public String getPackageResourcePath() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public String getPackageCodePath() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public SharedPreferences getSharedPreferences(String s, int i) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public FileInputStream openFileInput(String s) throws FileNotFoundException {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public FileOutputStream openFileOutput(String s, int i) throws FileNotFoundException {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean deleteFile(String s) {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public File getFileStreamPath(String s) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public File getFilesDir() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public File getExternalFilesDir(String s) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public File getObbDir() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public File getCacheDir() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public File getExternalCacheDir() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public String[] fileList() {
-        return new String[0];  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public File getDir(String s, int i) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public SQLiteDatabase openOrCreateDatabase(String s, int i, SQLiteDatabase.CursorFactory cursorFactory) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public SQLiteDatabase openOrCreateDatabase(String s, int i, SQLiteDatabase.CursorFactory cursorFactory, DatabaseErrorHandler databaseErrorHandler) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean deleteDatabase(String s) {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public File getDatabasePath(String s) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public String[] databaseList() {
-        return new String[0];  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Drawable getWallpaper() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Drawable peekWallpaper() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int getWallpaperDesiredMinimumWidth() {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int getWallpaperDesiredMinimumHeight() {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void setWallpaper(Bitmap bitmap) throws IOException {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void setWallpaper(InputStream inputStream) throws IOException {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void clearWallpaper() throws IOException {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void startActivity(Intent intent) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void startActivity(Intent intent, Bundle options) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-
-    @Override
-    public void startActivities(Intent[] intents) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void startActivities(Intent[] intents, Bundle options) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-
-    @Override
-    public void startIntentSender(IntentSender intentSender, Intent intent, int i, int i1, int i2) throws IntentSender.SendIntentException {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void startIntentSender(IntentSender intent, Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags, Bundle options) throws IntentSender.SendIntentException {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendBroadcast(Intent intent) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendBroadcast(Intent intent, String s) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendOrderedBroadcast(Intent intent, String s) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendOrderedBroadcast(Intent intent, String s, BroadcastReceiver broadcastReceiver, Handler handler, int i, String s1, Bundle bundle) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendBroadcastAsUser(Intent intent, UserHandle user) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendBroadcastAsUser(Intent intent, UserHandle user, String receiverPermission) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user, String receiverPermission, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendStickyBroadcast(Intent intent) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendStickyOrderedBroadcast(Intent intent, BroadcastReceiver broadcastReceiver, Handler handler, int i, String s, Bundle bundle) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void removeStickyBroadcast(Intent intent) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendStickyBroadcastAsUser(Intent intent, UserHandle user) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void sendStickyOrderedBroadcastAsUser(Intent intent, UserHandle user, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void removeStickyBroadcastAsUser(Intent intent, UserHandle user) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Intent registerReceiver(BroadcastReceiver broadcastReceiver, IntentFilter intentFilter) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Intent registerReceiver(BroadcastReceiver broadcastReceiver, IntentFilter intentFilter, String s, Handler handler) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void unregisterReceiver(BroadcastReceiver broadcastReceiver) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public ComponentName startService(Intent intent) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean stopService(Intent intent) {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean bindService(Intent intent, ServiceConnection serviceConnection, int i) {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void unbindService(ServiceConnection serviceConnection) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public boolean startInstrumentation(ComponentName componentName, String s, Bundle bundle) {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Object getSystemService(String s) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public String getSystemServiceName(Class<?> serviceClass) {
-        return null;
-    }
-
-    @Override
-    public int checkPermission(String s, int i, int i1) {
-        return PackageManager.PERMISSION_GRANTED;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int checkCallingPermission(String s) {
-        return PackageManager.PERMISSION_GRANTED;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int checkCallingOrSelfPermission(String s) {
-        return PackageManager.PERMISSION_GRANTED;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int checkSelfPermission(String permission) {
-        return PackageManager.PERMISSION_GRANTED;
-    }
-
-    @Override
-    public void enforcePermission(String s, int i, int i1, String s1) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void enforceCallingPermission(String s, String s1) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void enforceCallingOrSelfPermission(String s, String s1) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void grantUriPermission(String s, Uri uri, int i) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void revokeUriPermission(Uri uri, int i) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int checkUriPermission(Uri uri, int i, int i1, int i2) {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int checkCallingUriPermission(Uri uri, int i) {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int checkCallingOrSelfUriPermission(Uri uri, int i) {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public int checkUriPermission(Uri uri, String s, String s1, int i, int i1, int i2) {
-        return 0;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void enforceUriPermission(Uri uri, int i, int i1, int i2, String s) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void enforceCallingUriPermission(Uri uri, int i, String s) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void enforceCallingOrSelfUriPermission(Uri uri, int i, String s) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void enforceUriPermission(Uri uri, String s, String s1, int i, int i1, int i2, String s2) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Context createPackageContext(String s, int i) throws PackageManager.NameNotFoundException {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Context createConfigurationContext(Configuration overrideConfiguration) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public Context createDisplayContext(Display display) {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
diff --git a/library/src/test/java/com/orm/query/SelectTest.java b/library/src/test/java/com/orm/query/SelectTest.java
index 39508b77..734cca12 100644
--- a/library/src/test/java/com/orm/query/SelectTest.java
+++ b/library/src/test/java/com/orm/query/SelectTest.java
@@ -1,5 +1,7 @@
 package com.orm.query;
 
+import com.orm.models.TestRecord;
+
 import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/library/src/test/java/com/orm/record/BigDecimalFieldTests.java b/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
index 38f8e595..ed2bddc9 100644
--- a/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
+++ b/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.BigDecimalFieldAnnotatedModel;
 import com.orm.models.BigDecimalFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -22,9 +23,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class BigDecimalFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullBigDecimalExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new BigDecimalFieldExtendedModel());
         BigDecimalFieldExtendedModel model =
                 SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
@@ -33,7 +38,6 @@ public void nullBigDecimalExtendedTest() {
 
     @Test
     public void nullBigDecimalAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new BigDecimalFieldAnnotatedModel());
         BigDecimalFieldAnnotatedModel model =
                 SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
@@ -42,7 +46,6 @@ public void nullBigDecimalAnnotatedTest() {
 
     @Test
     public void bigDecimalExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
         save(new BigDecimalFieldExtendedModel(decimal));
         BigDecimalFieldExtendedModel model = SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
@@ -51,7 +54,6 @@ public void bigDecimalExtendedTest() {
 
     @Test
     public void bigDecimalAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
         save(new BigDecimalFieldAnnotatedModel(decimal));
         BigDecimalFieldAnnotatedModel model =
diff --git a/library/src/test/java/com/orm/record/BooleanFieldTests.java b/library/src/test/java/com/orm/record/BooleanFieldTests.java
index 146a0481..4038adf4 100644
--- a/library/src/test/java/com/orm/record/BooleanFieldTests.java
+++ b/library/src/test/java/com/orm/record/BooleanFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.BooleanFieldAnnotatedModel;
 import com.orm.models.BooleanFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,9 +21,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class BooleanFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullBooleanExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new BooleanFieldExtendedModel());
         BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
         assertNull(model.getBoolean());
@@ -30,7 +35,6 @@ public void nullBooleanExtendedTest() {
 
     @Test
     public void nullRawBooleanExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new BooleanFieldExtendedModel());
         BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
         assertEquals(false, model.getRawBoolean());
@@ -38,7 +42,6 @@ public void nullRawBooleanExtendedTest() {
 
     @Test
     public void nullBooleanAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new BooleanFieldAnnotatedModel());
         BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertNull(model.getBoolean());
@@ -46,16 +49,14 @@ public void nullBooleanAnnotatedTest() {
 
     @Test
     public void nullRawBooleanAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new BooleanFieldAnnotatedModel());
         BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(false, model.getRawBoolean());
     }
 
-//TODO check this method
+////TODO check this method
 //    @Test
 //    public void objectBooleanExtendedTest() {
-//        SugarContext.init(RuntimeEnvironment.application);
 //        save(new BooleanFieldExtendedModel(true));
 //        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
 //        assertEquals(true, model.getBoolean());
@@ -63,24 +64,24 @@ public void nullRawBooleanAnnotatedTest() {
 
     @Test
     public void rawBooleanExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new BooleanFieldExtendedModel(true));
         BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
         assertEquals(true, model.getRawBoolean());
     }
 
-//TODO check this
+//    //TODO check this
 //    @Test
 //    public void objectBooleanAnnotatedTest() {
-//        SugarContext.init(RuntimeEnvironment.application);
 //        save(new BooleanFieldAnnotatedModel(true));
 //        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
-//        assertEquals(true, model.getBoolean());
+//
+//        if (null != model) {
+//            assertEquals(true, model.getBoolean());
+//        }
 //    }
 
     @Test
     public void rawBooleanAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new BooleanFieldAnnotatedModel(true));
         BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(true, model.getRawBoolean());
diff --git a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
index 50ef7662..fe3e7e92 100644
--- a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
+++ b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.ByteArrayAnnotatedModel;
 import com.orm.models.ByteArrayExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,9 +21,14 @@
 @Config(sdk=18, application = ClientApp.class)
 public class ByteArrayFieldTests {
 
+
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullByteArrayExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         byte[] array = "".getBytes();
         save(new ByteArrayExtendedModel());
         ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
@@ -32,7 +38,6 @@ public void nullByteArrayExtendedTest() {
 
     @Test
     public void nullByteArrayAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         byte[] array = "".getBytes();
         save(new ByteArrayAnnotatedModel());
         ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
@@ -42,7 +47,6 @@ public void nullByteArrayAnnotatedTest() {
 
     @Test
     public void byteArrayExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         byte[] array = "hello".getBytes();
         save(new ByteArrayExtendedModel(array));
         ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
@@ -52,7 +56,6 @@ public void byteArrayExtendedTest() {
 
     @Test
     public void byteArrayAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         byte[] array = "hello".getBytes();
         save(new ByteArrayAnnotatedModel(array));
         ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
diff --git a/library/src/test/java/com/orm/record/CursorTests.java b/library/src/test/java/com/orm/record/CursorTests.java
index ef9ef849..a698b69b 100644
--- a/library/src/test/java/com/orm/record/CursorTests.java
+++ b/library/src/test/java/com/orm/record/CursorTests.java
@@ -16,6 +16,7 @@
 import com.orm.query.Select;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -29,9 +30,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class CursorTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void testColumnNames() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleModel());
         Cursor c = Select.from(SimpleModel.class).getCursor();
         for (String col : new String[]{"STR", "INTEGER", "BOOL", "ID"}) {
@@ -40,7 +45,6 @@ public void testColumnNames() {
     }
     @Test
     public void testSugarCursor() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleModel());
         Cursor cursor = Select.from(SimpleModel.class).getCursor();
         assertNotSame("No _id", -1, cursor.getColumnIndex("_id"));
@@ -49,7 +53,6 @@ public void testSugarCursor() {
 
     @Test
     public void testNoColumn() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleModel());
         Cursor cursor = Select.from(SimpleModel.class).getCursor();
         assertSame(-1, cursor.getColumnIndex("nonexistent"));
@@ -58,7 +61,6 @@ public void testNoColumn() {
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void testMakeAdapter() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleModel());
         Cursor c = Select.from(SimpleModel.class).getCursor();
         CursorAdapter adapter = new CursorAdapter(RuntimeEnvironment.application, c, true) {
diff --git a/library/src/test/java/com/orm/record/DoubleFieldTests.java b/library/src/test/java/com/orm/record/DoubleFieldTests.java
index e9418938..f5d9ce36 100644
--- a/library/src/test/java/com/orm/record/DoubleFieldTests.java
+++ b/library/src/test/java/com/orm/record/DoubleFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.DoubleFieldAnnotatedModel;
 import com.orm.models.DoubleFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,9 +21,13 @@
 @Config(sdk=18, application = ClientApp.class, manifest = Config.NONE)
 public class DoubleFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullDoubleExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new DoubleFieldExtendedModel());
         DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
         assertNull(model.getDouble());
@@ -30,7 +35,6 @@ public void nullDoubleExtendedTest() {
 
     @Test
     public void nullRawDoubleExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new DoubleFieldExtendedModel());
         DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
         assertEquals(0.0, model.getRawDouble(), 0.0000000001);
@@ -38,7 +42,6 @@ public void nullRawDoubleExtendedTest() {
 
     @Test
     public void nullDoubleAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new DoubleFieldAnnotatedModel());
         DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
         assertNull(model.getDouble());
@@ -46,7 +49,6 @@ public void nullDoubleAnnotatedTest() {
 
     @Test
     public void nullRawDoubleAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new DoubleFieldAnnotatedModel());
         DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
         assertEquals(0.0, model.getRawDouble(), 0.0000000001);
@@ -55,7 +57,6 @@ public void nullRawDoubleAnnotatedTest() {
     @Test
     @SuppressWarnings("all")
     public void objectDoubleExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Double objectDouble = Double.valueOf(25.0);
         save(new DoubleFieldExtendedModel(objectDouble));
         DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
@@ -64,7 +65,6 @@ public void objectDoubleExtendedTest() {
 
     @Test
     public void rawDoubleExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new DoubleFieldExtendedModel(25.0));
         DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
         assertEquals(25.0, model.getRawDouble(), 0.0000000001);
@@ -73,7 +73,6 @@ public void rawDoubleExtendedTest() {
     @Test
     @SuppressWarnings("all")
     public void objectDoubleAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Double objectDouble = Double.valueOf(25.0);
         save(new DoubleFieldAnnotatedModel(objectDouble));
         DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
@@ -82,7 +81,6 @@ public void objectDoubleAnnotatedTest() {
 
     @Test
     public void rawDoubleAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new DoubleFieldAnnotatedModel(25.0));
         DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
         assertEquals(25.0, model.getRawDouble(), 0.0000000001);
diff --git a/library/src/test/java/com/orm/record/EnumFieldTests.java b/library/src/test/java/com/orm/record/EnumFieldTests.java
index a11f52a4..bbceb2c7 100644
--- a/library/src/test/java/com/orm/record/EnumFieldTests.java
+++ b/library/src/test/java/com/orm/record/EnumFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.EnumFieldAnnotatedModel;
 import com.orm.models.EnumFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -21,9 +22,13 @@
 @Config(sdk = 18, application = ClientApp.class)
 public class EnumFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullDefaultEnumExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new EnumFieldExtendedModel());
         EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
         assertNull(model.getDefaultEnum());
@@ -31,14 +36,12 @@ public void nullDefaultEnumExtendedTest() {
 
     @Test
     public void nullOverriddenEnumExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new EnumFieldExtendedModel());
         EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
         assertNull(model.getOverrideEnum());
     }
     @Test
     public void nullDefaultEnumAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new EnumFieldAnnotatedModel());
         EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
         assertNull(model.getDefaultEnum());
@@ -46,7 +49,6 @@ public void nullDefaultEnumAnnotatedTest() {
 
     @Test
     public void nullOverriddenEnumAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new EnumFieldAnnotatedModel());
         EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
         assertNull(model.getOverrideEnum());
@@ -54,7 +56,6 @@ public void nullOverriddenEnumAnnotatedTest() {
 
     @Test
     public void defaultEnumExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
                 EnumFieldExtendedModel.DefaultEnum.TWO));
         EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
@@ -64,7 +65,6 @@ public void defaultEnumExtendedTest() {
 
     @Test
     public void overriddenEnumExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
                 EnumFieldExtendedModel.DefaultEnum.TWO));
         EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
@@ -74,7 +74,6 @@ public void overriddenEnumExtendedTest() {
 
     @Test
     public void defaultEnumAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
                 EnumFieldAnnotatedModel.DefaultEnum.TWO));
         EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
@@ -84,7 +83,6 @@ public void defaultEnumAnnotatedTest() {
 
     @Test
     public void overriddenEnumAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
                 EnumFieldAnnotatedModel.DefaultEnum.TWO));
         EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
diff --git a/library/src/test/java/com/orm/record/FirstAndLastTests.java b/library/src/test/java/com/orm/record/FirstAndLastTests.java
index 61ec1d98..8c8e2d8d 100644
--- a/library/src/test/java/com/orm/record/FirstAndLastTests.java
+++ b/library/src/test/java/com/orm/record/FirstAndLastTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.FloatFieldAnnotatedModel;
 import com.orm.models.FloatFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,10 +21,14 @@
 @Config(sdk=18, application = ClientApp.class)
 public class FirstAndLastTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     @SuppressWarnings("all")
     public void firstExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float firstObjectFloat = 25F;
         Float lastObjectFloat = 50F;
         save(new FloatFieldExtendedModel(firstObjectFloat));
@@ -37,7 +42,6 @@ public void firstExtendedTest() {
 
     @Test
     public void firstDeletedRecordExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float firstObjectFloat = 15F;
         Float secondObjectFloat = 25F;
         Float thirdObjectFloat = 35F;
@@ -57,7 +61,6 @@ public void firstDeletedRecordExtendedTest() {
 
     @Test
     public void lastExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float firstObjectFloat = 25F;
         Float lastObjectFloat = 50F;
         save(new FloatFieldExtendedModel(firstObjectFloat));
@@ -71,7 +74,6 @@ public void lastExtendedTest() {
 
     @Test
     public void lastDeletedRecordExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float firstObjectFloat = 15F;
         Float secondObjectFloat = 25F;
         Float thirdObjectFloat = 35F;
@@ -91,19 +93,16 @@ public void lastDeletedRecordExtendedTest() {
 
     @Test
     public void nullFirstExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         assertNull(SugarRecord.first(FloatFieldExtendedModel.class));
     }
 
     @Test
     public void nullLastExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         assertNull(SugarRecord.last(FloatFieldExtendedModel.class));
     }
 
     @Test
     public void oneItemExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new FloatFieldExtendedModel(25F));
         FloatFieldExtendedModel firstModel = SugarRecord.first(FloatFieldExtendedModel.class);
         FloatFieldExtendedModel lastModel = SugarRecord.last(FloatFieldExtendedModel.class);
@@ -115,7 +114,6 @@ public void oneItemExtendedTest() {
 
     @Test
     public void firstAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float firstObjectFloat = 25F;
         Float lastObjectFloat = 50F;
         save(new FloatFieldAnnotatedModel(firstObjectFloat));
@@ -129,7 +127,6 @@ public void firstAnnotatedTest() {
 
     @Test
     public void firstDeletedRecordAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float firstObjectFloat = 15F;
         Float secondObjectFloat = 25F;
         Float thirdObjectFloat = 35F;
@@ -149,7 +146,6 @@ public void firstDeletedRecordAnnotatedTest() {
 
     @Test
     public void lastAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float firstObjectFloat = 25F;
         Float lastObjectFloat = 50F;
         save(new FloatFieldAnnotatedModel(firstObjectFloat));
@@ -163,7 +159,6 @@ public void lastAnnotatedTest() {
 
     @Test
     public void lastDeletedRecordAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float firstObjectFloat = 15F;
         Float secondObjectFloat = 25F;
         Float thirdObjectFloat = 35F;
@@ -183,19 +178,16 @@ public void lastDeletedRecordAnnotatedTest() {
 
     @Test
     public void nullFirstAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         assertNull(SugarRecord.first(FloatFieldAnnotatedModel.class));
     }
 
     @Test
     public void nullLastAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         assertNull(SugarRecord.last(FloatFieldAnnotatedModel.class));
     }
 
     @Test
     public void oneItemAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new FloatFieldAnnotatedModel(25F));
         FloatFieldAnnotatedModel firstModel = SugarRecord.first(FloatFieldAnnotatedModel.class);
         FloatFieldAnnotatedModel lastModel = SugarRecord.last(FloatFieldAnnotatedModel.class);
diff --git a/library/src/test/java/com/orm/record/FloatFieldTests.java b/library/src/test/java/com/orm/record/FloatFieldTests.java
index 58c8dc80..f6016690 100644
--- a/library/src/test/java/com/orm/record/FloatFieldTests.java
+++ b/library/src/test/java/com/orm/record/FloatFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.FloatFieldAnnotatedModel;
 import com.orm.models.FloatFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,9 +21,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class FloatFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullFloatExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new FloatFieldExtendedModel());
         FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
         assertNull(model.getFloat());
@@ -30,7 +35,6 @@ public void nullFloatExtendedTest() {
 
     @Test
     public void nullRawFloatExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new FloatFieldExtendedModel());
         FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
         assertEquals(0F, model.getRawFloat(), 0.0000000001F);
@@ -38,7 +42,6 @@ public void nullRawFloatExtendedTest() {
 
     @Test
     public void nullFloatAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new FloatFieldAnnotatedModel());
         FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
         assertNull(model.getFloat());
@@ -46,7 +49,6 @@ public void nullFloatAnnotatedTest() {
 
     @Test
     public void nullRawFloatAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new FloatFieldAnnotatedModel());
         FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
         assertEquals(0F, model.getRawFloat(), 0.0000000001F);
@@ -54,7 +56,6 @@ public void nullRawFloatAnnotatedTest() {
 
     @Test
     public void objectFloatExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float objectFloat = 25F;
         save(new FloatFieldExtendedModel(objectFloat));
         FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
@@ -63,7 +64,6 @@ public void objectFloatExtendedTest() {
 
     @Test
     public void rawFloatExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new FloatFieldExtendedModel(25F));
         FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
         assertEquals(25F, model.getRawFloat(), 0.0000000001F);
@@ -71,7 +71,6 @@ public void rawFloatExtendedTest() {
 
     @Test
     public void objectFloatAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Float objectFloat = 25F;
         save(new FloatFieldAnnotatedModel(objectFloat));
         FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
@@ -80,7 +79,6 @@ public void objectFloatAnnotatedTest() {
 
     @Test
     public void rawFloatAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new FloatFieldAnnotatedModel(25F));
         FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
         assertEquals(25F, model.getRawFloat(), 0.0000000001F);
diff --git a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
index 21898584..d421f60a 100644
--- a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
+++ b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
@@ -7,6 +7,7 @@
 import com.orm.SugarContext;
 import com.orm.models.IncompleteAnnotatedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,15 +21,18 @@
 @Config(sdk=18, application = ClientApp.class)
 public class IncompleteAnnotatedModelTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test(expected=SQLiteException.class)
     public void saveNoIdFieldTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new IncompleteAnnotatedModel());
     }
 
     @Test
     public void deleteNoIdFieldTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         assertFalse(delete(new IncompleteAnnotatedModel()));
     }
 }
diff --git a/library/src/test/java/com/orm/record/IntegerFieldTests.java b/library/src/test/java/com/orm/record/IntegerFieldTests.java
index b666e6b6..fca422c0 100644
--- a/library/src/test/java/com/orm/record/IntegerFieldTests.java
+++ b/library/src/test/java/com/orm/record/IntegerFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.IntegerFieldAnnotatedModel;
 import com.orm.models.IntegerFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,9 +21,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class IntegerFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullIntegerExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new IntegerFieldExtendedModel());
         IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
         assertNull(model.getInteger());
@@ -30,7 +35,6 @@ public void nullIntegerExtendedTest() {
 
     @Test
     public void nullIntExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new IntegerFieldExtendedModel());
         IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
         assertEquals(0, model.getInt());
@@ -38,7 +42,6 @@ public void nullIntExtendedTest() {
 
     @Test
     public void nullIntegerAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new IntegerFieldAnnotatedModel());
         IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
         assertNull(model.getInteger());
@@ -46,7 +49,6 @@ public void nullIntegerAnnotatedTest() {
 
     @Test
     public void nullIntAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new IntegerFieldAnnotatedModel());
         IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
         assertEquals(0, model.getInt());
@@ -54,7 +56,6 @@ public void nullIntAnnotatedTest() {
 
     @Test
     public void integerExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Integer integer = 25;
         save(new IntegerFieldExtendedModel(integer));
         IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
@@ -63,7 +64,6 @@ public void integerExtendedTest() {
 
     @Test
     public void intExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new IntegerFieldExtendedModel(25));
         IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
         assertEquals(25, model.getInt());
@@ -71,7 +71,6 @@ public void intExtendedTest() {
 
     @Test
     public void integerAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Integer integer = 25;
         save(new IntegerFieldAnnotatedModel(integer));
         IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
@@ -80,7 +79,6 @@ public void integerAnnotatedTest() {
 
     @Test
     public void intAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new IntegerFieldAnnotatedModel(25));
         IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
         assertEquals(25, model.getInt());
diff --git a/library/src/test/java/com/orm/record/ListAllOrderByTests.java b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
index 46a07a91..e401bd6b 100644
--- a/library/src/test/java/com/orm/record/ListAllOrderByTests.java
+++ b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
@@ -6,6 +6,7 @@
 import com.orm.SugarRecord;
 import com.orm.models.IntegerFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -21,15 +22,19 @@
 @Config(sdk=18, application = ClientApp.class)
 public class ListAllOrderByTests {
 
+
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void listAllOrderByEmptyTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.listAll(IntegerFieldExtendedModel.class, "id").size());
     }
 
     @Test
     public void listAllOrderByIdTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         for(int i = 1; i <= 100; i++) {
             save(new IntegerFieldExtendedModel(i));
         }
@@ -44,7 +49,6 @@ public void listAllOrderByIdTest() {
 
     @Test
     public void listAllOrderByFieldTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         for(int i = 1; i <= 100; i++) {
             save(new IntegerFieldExtendedModel(i));
         }
diff --git a/library/src/test/java/com/orm/record/LongFieldTests.java b/library/src/test/java/com/orm/record/LongFieldTests.java
index 78307436..fe6001ea 100644
--- a/library/src/test/java/com/orm/record/LongFieldTests.java
+++ b/library/src/test/java/com/orm/record/LongFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.LongFieldAnnotatedModel;
 import com.orm.models.LongFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,9 +21,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class LongFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullLongExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new LongFieldExtendedModel());
         LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
         assertNull(model.getLong());
@@ -30,7 +35,6 @@ public void nullLongExtendedTest() {
 
     @Test
     public void nullRawLongExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new LongFieldExtendedModel());
         LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
         assertEquals(0L, model.getRawLong());
@@ -38,7 +42,6 @@ public void nullRawLongExtendedTest() {
 
     @Test
     public void nullLongAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new LongFieldAnnotatedModel());
         LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
         assertNull(model.getLong());
@@ -46,7 +49,6 @@ public void nullLongAnnotatedTest() {
 
     @Test
     public void nullRawLongAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new LongFieldAnnotatedModel());
         LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
         assertEquals(0L, model.getRawLong());
@@ -54,7 +56,6 @@ public void nullRawLongAnnotatedTest() {
 
     @Test
     public void objectLongExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Long objectLong = 25L;
         save(new LongFieldExtendedModel(objectLong));
         LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
@@ -63,7 +64,6 @@ public void objectLongExtendedTest() {
 
     @Test
     public void rawLongExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new LongFieldExtendedModel(25L));
         LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
         assertEquals(25L, model.getRawLong());
@@ -71,7 +71,6 @@ public void rawLongExtendedTest() {
 
     @Test
     public void objectLongAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Long objectLong = 25L;
         save(new LongFieldAnnotatedModel(objectLong));
         LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
@@ -80,7 +79,6 @@ public void objectLongAnnotatedTest() {
 
     @Test
     public void rawLongAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new LongFieldAnnotatedModel(25L));
         LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
         assertEquals(25L, model.getRawLong());
diff --git a/library/src/test/java/com/orm/record/MultipleSaveTests.java b/library/src/test/java/com/orm/record/MultipleSaveTests.java
index 7ffc0855..5c1ec96e 100644
--- a/library/src/test/java/com/orm/record/MultipleSaveTests.java
+++ b/library/src/test/java/com/orm/record/MultipleSaveTests.java
@@ -8,6 +8,7 @@
 import com.orm.models.StringFieldAnnotatedNoIdModel;
 import com.orm.models.StringFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -21,9 +22,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class MultipleSaveTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void stringMultipleSaveOriginalExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         String string = "Test String";
         StringFieldExtendedModel model = new StringFieldExtendedModel(string);
         long id = save(model);
@@ -40,7 +45,6 @@ public void stringMultipleSaveOriginalExtendedTest() {
 
     @Test
     public void stringMultipleSaveQueriedExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         String string = "Test String";
         StringFieldExtendedModel model = new StringFieldExtendedModel(string);
         long id = save(model);
@@ -56,7 +60,6 @@ public void stringMultipleSaveQueriedExtendedTest() {
 
     @Test
     public void stringMultipleSaveOriginalAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         String string = "Test String";
         StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
         long id = save(model);
@@ -72,7 +75,6 @@ public void stringMultipleSaveOriginalAnnotatedTest() {
 
     @Test
     public void stringMultipleSaveQueriedAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         String string = "Test String";
         StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
         long id = save(model);
@@ -88,7 +90,6 @@ public void stringMultipleSaveQueriedAnnotatedTest() {
 
     @Test
     public void stringMultipleSaveOriginalAnnotatedNoIdTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         String string = "Test String";
         StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
         long id = save(model);
@@ -105,7 +106,6 @@ public void stringMultipleSaveOriginalAnnotatedNoIdTest() {
 
     @Test
     public void stringMultipleSaveQueriedAnnotatedNoIdTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         String string = "Test String";
         StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
         long id = save(model);
diff --git a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
index a777f6de..ede95593 100644
--- a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
+++ b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
@@ -8,6 +8,7 @@
 import com.orm.models.RelationshipAnnotatedModel;
 import com.orm.models.SimpleAnnotatedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -22,9 +23,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class NestedAnnotatedTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(NestedAnnotatedModel.class));
         assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
@@ -32,7 +37,6 @@ public void emptyDatabaseTest() throws Exception {
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
@@ -45,7 +49,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
@@ -59,7 +62,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
@@ -77,7 +79,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
@@ -92,7 +93,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
             save(simple);
@@ -107,7 +107,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
@@ -125,7 +124,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/NestedExtendedTests.java b/library/src/test/java/com/orm/record/NestedExtendedTests.java
index 803aa8d1..5f737166 100644
--- a/library/src/test/java/com/orm/record/NestedExtendedTests.java
+++ b/library/src/test/java/com/orm/record/NestedExtendedTests.java
@@ -8,6 +8,7 @@
 import com.orm.models.RelationshipExtendedModel;
 import com.orm.models.SimpleExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -22,9 +23,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class NestedExtendedTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(NestedExtendedModel.class));
         assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
@@ -32,7 +37,6 @@ public void emptyDatabaseTest() throws Exception {
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
@@ -45,7 +49,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
@@ -59,7 +62,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         SimpleExtendedModel another_simple = new SimpleExtendedModel();
@@ -77,7 +79,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
@@ -92,7 +93,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
@@ -107,7 +107,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
@@ -125,7 +124,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/NestedMixedAATests.java b/library/src/test/java/com/orm/record/NestedMixedAATests.java
index f3acacd2..cb5335b4 100644
--- a/library/src/test/java/com/orm/record/NestedMixedAATests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedAATests.java
@@ -8,6 +8,7 @@
 import com.orm.models.RelationshipMixedAModel;
 import com.orm.models.SimpleAnnotatedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -22,9 +23,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class NestedMixedAATests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(NestedMixedAAModel.class));
         assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
@@ -32,7 +37,6 @@ public void emptyDatabaseTest() throws Exception {
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
@@ -45,7 +49,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
@@ -59,7 +62,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
@@ -77,7 +79,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
@@ -92,7 +93,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
             save(simple);
@@ -107,7 +107,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
@@ -125,7 +124,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/NestedMixedABTests.java b/library/src/test/java/com/orm/record/NestedMixedABTests.java
index 5d4799d5..3677a312 100644
--- a/library/src/test/java/com/orm/record/NestedMixedABTests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedABTests.java
@@ -8,6 +8,7 @@
 import com.orm.models.RelationshipMixedBModel;
 import com.orm.models.SimpleExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -22,9 +23,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class NestedMixedABTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(NestedMixedABModel.class));
         assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
@@ -32,7 +37,6 @@ public void emptyDatabaseTest() throws Exception {
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
@@ -45,7 +49,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
@@ -59,7 +62,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         SimpleExtendedModel another_simple = new SimpleExtendedModel();
@@ -77,7 +79,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
@@ -92,7 +93,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
@@ -107,7 +107,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
@@ -125,7 +124,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/NestedMixedBATests.java b/library/src/test/java/com/orm/record/NestedMixedBATests.java
index f7575770..5dfd0757 100644
--- a/library/src/test/java/com/orm/record/NestedMixedBATests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedBATests.java
@@ -8,6 +8,7 @@
 import com.orm.models.RelationshipMixedAModel;
 import com.orm.models.SimpleAnnotatedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -22,9 +23,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class NestedMixedBATests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(NestedMixedBAModel.class));
         assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
@@ -32,7 +37,6 @@ public void emptyDatabaseTest() throws Exception {
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
@@ -45,7 +49,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
@@ -59,7 +62,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
@@ -77,7 +79,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
@@ -92,7 +93,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
             save(simple);
@@ -107,7 +107,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
@@ -125,7 +124,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/NestedMixedBBTests.java b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
index af88af23..e2625eae 100644
--- a/library/src/test/java/com/orm/record/NestedMixedBBTests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
@@ -8,6 +8,7 @@
 import com.orm.models.RelationshipMixedBModel;
 import com.orm.models.SimpleExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -22,9 +23,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class NestedMixedBBTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(NestedMixedBBModel.class));
         assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
@@ -32,7 +37,6 @@ public void emptyDatabaseTest() throws Exception {
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
          SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
@@ -45,7 +49,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
@@ -59,7 +62,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         SimpleExtendedModel another_simple = new SimpleExtendedModel();
@@ -77,7 +79,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
@@ -92,7 +93,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
@@ -107,7 +107,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
@@ -125,7 +124,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/NoSugarModelTests.java b/library/src/test/java/com/orm/record/NoSugarModelTests.java
index 5ebc40ca..b77858f6 100644
--- a/library/src/test/java/com/orm/record/NoSugarModelTests.java
+++ b/library/src/test/java/com/orm/record/NoSugarModelTests.java
@@ -6,6 +6,7 @@
 import com.orm.SugarRecord;
 import com.orm.models.NoSugarModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -18,16 +19,19 @@
 @Config(sdk=18, application = ClientApp.class)
 public class NoSugarModelTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void deleteTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         NoSugarModel model = new NoSugarModel();
         assertFalse(SugarRecord.delete(model));
     }
 
     @Test
     public void saveInTransactionTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SugarRecord.saveInTx(new NoSugarModel(), new NoSugarModel());
         assertEquals(-1L, SugarRecord.count(NoSugarModel.class));
     }
diff --git a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
index 0719bcd0..df229b90 100644
--- a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.RelationshipAnnotatedModel;
 import com.orm.models.SimpleAnnotatedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -21,16 +22,19 @@
 @Config(sdk=18, application = ClientApp.class)
 public class RelationshipAnnotatedTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         save(new RelationshipAnnotatedModel(simple));
@@ -40,7 +44,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         save(new RelationshipAnnotatedModel(simple));
@@ -51,7 +54,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
@@ -64,7 +66,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         for (int i = 1; i <= 100; i++) {
@@ -76,7 +77,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
             save(simple);
@@ -88,7 +88,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         for (int i = 1; i <= 100; i++) {
@@ -104,7 +103,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
index dbd17fe6..6b3a7400 100644
--- a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.RelationshipExtendedModel;
 import com.orm.models.SimpleExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -21,16 +22,19 @@
 @Config(sdk=18, application = ClientApp.class)
 public class RelationshipExtendedTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         save(new RelationshipExtendedModel(simple));
@@ -40,7 +44,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         save(new RelationshipExtendedModel(simple));
@@ -51,7 +54,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         SimpleExtendedModel another_simple = new SimpleExtendedModel();
@@ -64,7 +66,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         for (int i = 1; i <= 100; i++) {
@@ -76,7 +77,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
@@ -88,7 +88,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         for (int i = 1; i <= 100; i++) {
@@ -104,7 +103,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
index 190c030f..419ba98b 100644
--- a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.RelationshipMixedBModel;
 import com.orm.models.SimpleExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -21,16 +22,19 @@
 @Config(sdk=18, application = ClientApp.class)
 public class RelationshipMixedBTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         save(new RelationshipMixedBModel(simple));
@@ -40,7 +44,6 @@ public void oneSaveTest() throws Exception {
 
     @Test
     public void twoSameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         save(new RelationshipMixedBModel(simple));
@@ -51,7 +54,6 @@ public void twoSameSaveTest() throws Exception {
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         SimpleExtendedModel another_simple = new SimpleExtendedModel();
@@ -64,7 +66,6 @@ public void twoDifferentSaveTest() throws Exception {
 
     @Test
     public void manySameSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         for (int i = 1; i <= 100; i++) {
@@ -76,7 +77,6 @@ public void manySameSaveTest() throws Exception {
 
     @Test
     public void manyDifferentSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
@@ -88,7 +88,6 @@ public void manyDifferentSaveTest() throws Exception {
 
     @Test
     public void listAllSameTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         for (int i = 1; i <= 100; i++) {
diff --git a/library/src/test/java/com/orm/record/ShortFieldTests.java b/library/src/test/java/com/orm/record/ShortFieldTests.java
index 0de32144..efe36cf0 100644
--- a/library/src/test/java/com/orm/record/ShortFieldTests.java
+++ b/library/src/test/java/com/orm/record/ShortFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.ShortFieldAnnotatedModel;
 import com.orm.models.ShortFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,9 +21,13 @@
 @Config(sdk=18, application = ClientApp.class)
 public class ShortFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void nullShortExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new ShortFieldExtendedModel());
         ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
         assertNull(model.getShort());
@@ -30,7 +35,6 @@ public void nullShortExtendedTest() {
 
     @Test
     public void nullRawShortExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new ShortFieldExtendedModel());
         ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
         assertEquals((short) 0, model.getRawShort());
@@ -38,7 +42,6 @@ public void nullRawShortExtendedTest() {
 
     @Test
     public void nullShortAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new ShortFieldAnnotatedModel());
         ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
         assertNull(model.getShort());
@@ -46,7 +49,6 @@ public void nullShortAnnotatedTest() {
 
     @Test
     public void nullRawShortAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new ShortFieldAnnotatedModel());
         ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
         assertEquals((short) 0, model.getRawShort());
@@ -54,7 +56,6 @@ public void nullRawShortAnnotatedTest() {
 
     @Test
     public void objectShortExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Short objectShort = 25;
         save(new ShortFieldExtendedModel(objectShort));
         ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
@@ -63,7 +64,6 @@ public void objectShortExtendedTest() {
 
     @Test
     public void rawShortExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new ShortFieldExtendedModel((short) 25));
         ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
         assertEquals((short) 25, model.getRawShort());
@@ -71,7 +71,6 @@ public void rawShortExtendedTest() {
 
     @Test
     public void objectShortAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         Short objectShort = 25;
         save(new ShortFieldAnnotatedModel(objectShort));
         ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
@@ -80,7 +79,6 @@ public void objectShortAnnotatedTest() {
 
     @Test
     public void rawShortAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new ShortFieldAnnotatedModel((short) 25));
         ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
         assertEquals((short) 25, model.getRawShort());
diff --git a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
index d2f8508e..f223a49c 100644
--- a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
+++ b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
@@ -7,6 +7,7 @@
 import com.orm.helper.NamingHelper;
 import com.orm.models.SimpleAnnotatedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -29,22 +30,24 @@
 @Config(sdk=18, application = ClientApp.class)
 public class SimpleAnnotatedModelTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void twoSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
         assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
@@ -52,7 +55,6 @@ public void twoSaveTest() throws Exception {
 
     @Test
     public void manySaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
@@ -61,13 +63,11 @@ public void manySaveTest() throws Exception {
 
     @Test
     public void defaultIdTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(1L, save(new SimpleAnnotatedModel()));
     }
 
     @Test
     public void whereCountTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
         assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
@@ -75,7 +75,6 @@ public void whereCountTest() throws Exception {
 
     @Test
     public void whereNoCountTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
@@ -85,7 +84,6 @@ public void whereNoCountTest() throws Exception {
 
     @Test
     public void whereBrokenCountTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
         assertEquals(-1L, SugarRecord.count(SimpleAnnotatedModel.class, "di = ?", new String[]{"1"}));
@@ -93,7 +91,6 @@ public void whereBrokenCountTest() throws Exception {
 
     @Test
     public void deleteTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel model = new SimpleAnnotatedModel();
         save(model);
         assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
@@ -103,7 +100,6 @@ public void deleteTest() throws Exception {
 
     @Test
     public void deleteUnsavedTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel model = new SimpleAnnotatedModel();
         assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
         assertFalse(SugarRecord.delete(model));
@@ -112,7 +108,6 @@ public void deleteUnsavedTest() throws Exception {
 
     @Test
     public void deleteWrongTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel model = new SimpleAnnotatedModel();
         save(model);
         assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
@@ -125,7 +120,6 @@ public void deleteWrongTest() throws Exception {
 
     @Test
     public void deleteAllTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         int elementNumber = 100;
         for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleAnnotatedModel());
@@ -137,7 +131,6 @@ public void deleteAllTest() throws Exception {
     @Test
     @SuppressWarnings("all")
     public void deleteAllWhereTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         int elementNumber = 100;
         for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleAnnotatedModel());
@@ -148,7 +141,6 @@ public void deleteAllWhereTest() throws Exception {
 
     @Test
     public void deleteInTransactionFewTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleAnnotatedModel first = new SimpleAnnotatedModel();
         SimpleAnnotatedModel second = new SimpleAnnotatedModel();
         SimpleAnnotatedModel third = new SimpleAnnotatedModel();
@@ -162,7 +154,6 @@ public void deleteInTransactionFewTest() throws Exception {
 
     @Test
     public void deleteInTransactionManyTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         long elementNumber = 100;
         List<SimpleAnnotatedModel> models = new ArrayList<>();
         for (int i = 1; i <= elementNumber; i++) {
@@ -180,14 +171,12 @@ public void deleteInTransactionManyTest() throws Exception {
 
     @Test
     public void saveInTransactionTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SugarRecord.saveInTx(new SimpleAnnotatedModel(), new SimpleAnnotatedModel());
         assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void listAllTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
@@ -200,7 +189,6 @@ public void listAllTest() throws Exception {
 
     @Test
     public void findTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
         List<SimpleAnnotatedModel> models =
@@ -211,7 +199,6 @@ public void findTest() throws Exception {
 
     @Test
     public void findWithQueryTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
@@ -227,28 +214,24 @@ public void findWithQueryTest() throws Exception {
     @Test
     @SuppressWarnings("all")
     public void findByIdTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         assertEquals(1L, SugarRecord.findById(SimpleAnnotatedModel.class, 1L).getId().longValue());
     }
 
     @Test
     public void findByIdIntegerTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         assertEquals(1L, SugarRecord.findById(SimpleAnnotatedModel.class, 1).getId().longValue());
     }
 
     @Test
     public void findByIdStringsNullTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         assertEquals(0, SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{""}).size());
     }
 
     @Test
     public void findByIdStringsOneTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         List<SimpleAnnotatedModel> models =
                 SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1"});
@@ -258,7 +241,6 @@ public void findByIdStringsOneTest() throws Exception {
 
     @Test
     public void findByIdStringsTwoTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
@@ -271,7 +253,6 @@ public void findByIdStringsTwoTest() throws Exception {
 
     @Test
     public void findByIdStringsManyTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 10; i++) {
             save(new SimpleAnnotatedModel());
         }
@@ -286,7 +267,6 @@ public void findByIdStringsManyTest() throws Exception {
 
     @Test
     public void findByIdStringsOrderTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 10; i++) {
             save(new SimpleAnnotatedModel());
         }
@@ -302,14 +282,12 @@ public void findByIdStringsOrderTest() throws Exception {
 
     @Test
     public void findByIdNullTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         assertNull(SugarRecord.findById(SimpleAnnotatedModel.class, 2L));
     }
 
     @Test
     public void findAllTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
@@ -324,7 +302,6 @@ public void findAllTest() throws Exception {
 
     @Test
     public void findAsIteratorTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
@@ -340,7 +317,6 @@ public void findAsIteratorTest() throws Exception {
 
     @Test
     public void findWithQueryAsIteratorTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
@@ -359,7 +335,6 @@ public void findWithQueryAsIteratorTest() throws Exception {
 
     @Test(expected=NoSuchElementException.class)
     public void findAsIteratorOutOfBoundsTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
                 "id = ?", "1");
@@ -373,7 +348,6 @@ public void findAsIteratorOutOfBoundsTest() throws Exception {
 
     @Test(expected=UnsupportedOperationException.class)
     public void disallowRemoveCursorTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleAnnotatedModel());
         Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
                 "id = ?", "1");
@@ -387,7 +361,6 @@ public void disallowRemoveCursorTest() throws Exception {
 
     @Test
     public void vacuumTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SugarRecord.executeQuery("Vacuum");
     }
 }
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
index c6f4d37f..9ac1d696 100644
--- a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
+++ b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
@@ -7,6 +7,7 @@
 import com.orm.helper.NamingHelper;
 import com.orm.models.SimpleExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -29,22 +30,24 @@
 @Config(sdk=18, application = ClientApp.class)
 public class SimpleExtendedModelTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
     @Test
     public void emptyDatabaseTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
     @Test
     public void twoSaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
         assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
@@ -52,7 +55,6 @@ public void twoSaveTest() throws Exception {
 
     @Test
     public void manySaveTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
@@ -61,13 +63,11 @@ public void manySaveTest() throws Exception {
 
     @Test
     public void defaultIdTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(1L, save(new SimpleExtendedModel()));
     }
 
     @Test
     public void whereCountTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
         assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
@@ -75,7 +75,6 @@ public void whereCountTest() throws Exception {
 
     @Test
     public void whereNoCountTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
@@ -85,7 +84,6 @@ public void whereNoCountTest() throws Exception {
 
     @Test
     public void whereBrokenCountTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
         assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
@@ -93,7 +91,6 @@ public void whereBrokenCountTest() throws Exception {
 
     @Test
     public void saveMethodTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel model = new SimpleExtendedModel();
         model.save();
         assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
@@ -101,7 +98,6 @@ public void saveMethodTest() throws Exception {
 
     @Test
     public void deleteTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel model = new SimpleExtendedModel();
         save(model);
         assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
@@ -111,7 +107,6 @@ public void deleteTest() throws Exception {
 
     @Test
     public void deleteUnsavedTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel model = new SimpleExtendedModel();
         assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
         assertFalse(SugarRecord.delete(model));
@@ -120,7 +115,6 @@ public void deleteUnsavedTest() throws Exception {
 
     @Test
     public void deleteWrongTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel model = new SimpleExtendedModel();
         save(model);
         assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
@@ -133,7 +127,6 @@ public void deleteWrongTest() throws Exception {
 
     @Test
     public void deleteAllTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         int elementNumber = 100;
         for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleExtendedModel());
@@ -145,7 +138,6 @@ public void deleteAllTest() throws Exception {
     @Test
     @SuppressWarnings("all")
     public void deleteAllWhereTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         int elementNumber = 100;
         for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleExtendedModel());
@@ -158,7 +150,6 @@ public void deleteAllWhereTest() throws Exception {
 
     @Test
     public void deleteInTransactionFewTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SimpleExtendedModel first = new SimpleExtendedModel();
         SimpleExtendedModel second = new SimpleExtendedModel();
         SimpleExtendedModel third = new SimpleExtendedModel();
@@ -172,7 +163,6 @@ public void deleteInTransactionFewTest() throws Exception {
 
     @Test
     public void deleteInTransactionManyTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         long elementNumber = 100;
         List<SimpleExtendedModel> models = new ArrayList<>();
         for (int i = 1; i <= elementNumber; i++) {
@@ -190,14 +180,12 @@ public void deleteInTransactionManyTest() throws Exception {
 
     @Test
     public void saveInTransactionTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SugarRecord.saveInTx(new SimpleExtendedModel(), new SimpleExtendedModel());
         assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
     }
 
     @Test
     public void listAllTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
@@ -210,7 +198,6 @@ public void listAllTest() throws Exception {
 
     @Test
     public void findTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
         List<SimpleExtendedModel> models =
@@ -221,7 +208,6 @@ public void findTest() throws Exception {
 
     @Test
     public void findWithQueryTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
@@ -237,28 +223,24 @@ public void findWithQueryTest() throws Exception {
     @Test
     @SuppressWarnings("all")
     public void findByIdTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         assertEquals(Long.valueOf(1L), SugarRecord.findById(SimpleExtendedModel.class, 1L).getId());
     }
 
     @Test
     public void findByIdIntegerTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         assertEquals(Long.valueOf(1L), SugarRecord.findById(SimpleExtendedModel.class, 1).getId());
     }
 
     @Test
     public void findByIdStringsNullTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         assertEquals(0, SugarRecord.findById(SimpleExtendedModel.class, new String[]{""}).size());
     }
 
     @Test
     public void findByIdStringsOneTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         List<SimpleExtendedModel> models =
                 SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1"});
@@ -268,7 +250,6 @@ public void findByIdStringsOneTest() throws Exception {
 
     @Test
     public void findByIdStringsTwoTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
@@ -281,7 +262,6 @@ public void findByIdStringsTwoTest() throws Exception {
 
     @Test
     public void findByIdStringsManyTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 10; i++) {
             save(new SimpleExtendedModel());
         }
@@ -296,7 +276,6 @@ public void findByIdStringsManyTest() throws Exception {
 
     @Test
     public void findByIdStringsOrderTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 10; i++) {
             save(new SimpleExtendedModel());
         }
@@ -312,14 +291,12 @@ public void findByIdStringsOrderTest() throws Exception {
 
     @Test
     public void findByIdNullTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         assertNull(SugarRecord.findById(SimpleExtendedModel.class, 2L));
     }
 
     @Test
     public void findAllTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
@@ -334,7 +311,6 @@ public void findAllTest() throws Exception {
 
     @Test
     public void findAsIteratorTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
@@ -350,7 +326,6 @@ public void findAsIteratorTest() throws Exception {
 
     @Test
     public void findWithQueryAsIteratorTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
@@ -359,6 +334,7 @@ public void findWithQueryAsIteratorTest() throws Exception {
                                                     "Select * from " +
                                                     NamingHelper.toSQLName(SimpleExtendedModel.class) +
                                                     " where id >= ? ", "50");
+        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 50; i <= 100; i++) {
             assertTrue(cursor.hasNext());
             SimpleExtendedModel model = cursor.next();
@@ -369,7 +345,6 @@ public void findWithQueryAsIteratorTest() throws Exception {
 
     @Test(expected=NoSuchElementException.class)
     public void findAsIteratorOutOfBoundsTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
                 "id = ?", "1");
@@ -383,7 +358,6 @@ public void findAsIteratorOutOfBoundsTest() throws Exception {
 
     @Test(expected=UnsupportedOperationException.class)
     public void disallowRemoveCursorTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new SimpleExtendedModel());
         Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
                 "id = ?", "1");
@@ -397,7 +371,6 @@ public void disallowRemoveCursorTest() throws Exception {
 
     @Test
     public void vacuumTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         SugarRecord.executeQuery("Vacuum");
     }
 }
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/StringFieldTests.java b/library/src/test/java/com/orm/record/StringFieldTests.java
index 9c69e062..6fd800cd 100644
--- a/library/src/test/java/com/orm/record/StringFieldTests.java
+++ b/library/src/test/java/com/orm/record/StringFieldTests.java
@@ -7,6 +7,7 @@
 import com.orm.models.StringFieldAnnotatedModel;
 import com.orm.models.StringFieldExtendedModel;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -20,9 +21,14 @@
 @Config(sdk=18, application = ClientApp.class)
 public class StringFieldTests {
 
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
+
     @Test
     public void nullStringExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new StringFieldExtendedModel());
         StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
         assertNull(model.getString());
@@ -30,7 +36,6 @@ public void nullStringExtendedTest() {
 
     @Test
     public void nullStringAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         save(new StringFieldAnnotatedModel());
         StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
         assertNull(model.getString());
@@ -38,7 +43,6 @@ public void nullStringAnnotatedTest() {
 
     @Test
     public void stringExtendedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         String string = "Test String";
         save(new StringFieldExtendedModel(string));
         StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
@@ -47,7 +51,6 @@ public void stringExtendedTest() {
 
     @Test
     public void stringAnnotatedTest() {
-        SugarContext.init(RuntimeEnvironment.application);
         String string = "Test String";
         save(new StringFieldAnnotatedModel(string));
         StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
diff --git a/library/src/test/java/com/orm/util/ContextUtilTest.java b/library/src/test/java/com/orm/util/ContextUtilTest.java
index fc627076..b4bd9042 100644
--- a/library/src/test/java/com/orm/util/ContextUtilTest.java
+++ b/library/src/test/java/com/orm/util/ContextUtilTest.java
@@ -2,10 +2,15 @@
 
 import android.content.Context;
 
-import com.orm.query.DummyContext;
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
 
+import org.junit.Before;
 import org.junit.Test;
-
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
@@ -14,46 +19,43 @@
 /**
  * @author jonatan.salas
  */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
 public class ContextUtilTest {
 
-    public void initContextUtil() {
-        init(new DummyContext());
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application.getApplicationContext());
     }
 
     @Test
     public void testInitContext() {
-        initContextUtil();
         assertNotNull(getContext());
     }
 
     @Test
     public void testGetAssets() {
-        initContextUtil();
-        assertNull(getAssets());
+        assertNotNull(getAssets());
     }
 
     @Test
     public void testGetPackageManager() {
-        initContextUtil();
-        assertNull(getPackageManager());
+        assertNotNull(getPackageManager());
     }
 
     @Test
     public void testGetPackageName() {
-        initContextUtil();
-        assertNull(getPackageName());
+        assertNotNull(getPackageName());
     }
 
     @Test
     public void testGetPreferences() {
-        initContextUtil();
-        assertNull(getSharedPreferences("lala", Context.MODE_PRIVATE));
+        assertNotNull(getSharedPreferences("lala", Context.MODE_PRIVATE));
     }
 
     @Test
     public void testTerminateContext() {
-        initContextUtil();
-        terminate();
+        SugarContext.terminate();
         assertNull(getContext());
     }
 }
diff --git a/library/src/test/java/com/orm/util/ManifestHelperTest.java b/library/src/test/java/com/orm/util/ManifestHelperTest.java
index 65340b0d..4340ac43 100644
--- a/library/src/test/java/com/orm/util/ManifestHelperTest.java
+++ b/library/src/test/java/com/orm/util/ManifestHelperTest.java
@@ -1,49 +1,52 @@
 package com.orm.util;
 
-import com.orm.query.DummyContext;
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
 
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.*;
 import static com.orm.helper.ManifestHelper.*;
-import static com.orm.util.ContextUtil.init;
+import static com.orm.SugarContext.init;
 
 /**
  * @author jonatan.salas
  */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
 public class ManifestHelperTest {
 
-    public void initContext() {
-        init(new DummyContext());
+    @Before
+    public void setUp() {
+        init(RuntimeEnvironment.application);
     }
 
     @Test
     public void testGetDbName() {
-        initContext();
         assertEquals(DATABASE_DEFAULT_NAME, getDatabaseName());
     }
 
     @Test
     public void testGetDatabaseName() {
-        initContext();
         assertEquals(DATABASE_DEFAULT_NAME, getDatabaseName());
     }
 
     @Test
     public void testGetDatabaseVersion() {
-        initContext();
         assertEquals(1, getDatabaseVersion());
     }
 
     @Test
     public void testGetDomainPackageName() {
-        initContext();
         assertNotNull(getDomainPackageName());
     }
 
     @Test
     public void testGetDebugEnabled() {
-        initContext();
         assertEquals(false, isDebugEnabled());
     }
 }

From ba572f93558856ea935ce6839f6cfee261600c38 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Fri, 8 Apr 2016 19:02:26 -0300
Subject: [PATCH 252/305] Added NumberComparatorTest Added ReflectionUtilTest
 Added SugarConfigTest Refactored SchemaGeneratorTest and NamingHelperTest
 Simplified NumberComparator Changed NamingHelper method to toTableName and
 toColumnName Reflection util is final and has a private constructor to
 prevent instantiation

---
 .../sugartest/SimpleAnnotatedModelTests.java  |  4 +-
 .../sugartest/SimpleExtendedModelTests.java   |  4 +-
 .../main/java/com/orm/SchemaGenerator.java    | 12 ++---
 .../src/main/java/com/orm/SugarRecord.java    | 26 ++++-----
 .../java/com/orm/helper/NamingHelper.java     |  4 +-
 .../src/main/java/com/orm/query/Select.java   |  2 +-
 .../java/com/orm/util/NumberComparator.java   | 19 ++++---
 .../java/com/orm/util/ReflectionUtil.java     | 14 ++---
 .../main/java/com/orm/util/SugarConfig.java   |  1 -
 .../test/java/com/orm/NamingHelperTest.java   |  4 +-
 .../java/com/orm/SchemaGeneratorTest.java     | 12 ++---
 .../orm/record/SimpleAnnotatedModelTests.java |  4 +-
 .../orm/record/SimpleExtendedModelTests.java  |  4 +-
 .../com/orm/util/NumberComparatorTest.java    | 54 +++++++++++++++++++
 .../java/com/orm/util/ReflectionUtilTest.java | 35 ++++++++++++
 .../java/com/orm/util/SugarConfigTest.java    | 15 ++++++
 16 files changed, 161 insertions(+), 53 deletions(-)
 create mode 100644 library/src/test/java/com/orm/util/NumberComparatorTest.java
 create mode 100644 library/src/test/java/com/orm/util/ReflectionUtilTest.java
 create mode 100644 library/src/test/java/com/orm/util/SugarConfigTest.java

diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
index bce99ffe..8436df41 100644
--- a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
@@ -195,7 +195,7 @@ public void findWithQueryTest() throws Exception {
         }
         List<SimpleAnnotatedModel> models =
                 SugarRecord.findWithQuery(SimpleAnnotatedModel.class, "Select * from " +
-                        NamingHelper.toSQLName(SimpleAnnotatedModel.class) +
+                        NamingHelper.toTableName(SimpleAnnotatedModel.class) +
                         " where id >= ? ", "50");
         for (SimpleAnnotatedModel model : models) {
             assertEquals(new Long(75), model.getId(), 25L);
@@ -313,7 +313,7 @@ public void findWithQueryAsIteratorTest() throws Exception {
         Iterator<SimpleAnnotatedModel> cursor =
                 SugarRecord.findWithQueryAsIterator(SimpleAnnotatedModel.class,
                         "Select * from " +
-                                NamingHelper.toSQLName(SimpleAnnotatedModel.class) +
+                                NamingHelper.toTableName(SimpleAnnotatedModel.class) +
                                 " where id >= ? ", "50");
         for (int i = 50; i <= 100; i++) {
             assertTrue(cursor.hasNext());
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
index e8645fb4..7abaf58a 100644
--- a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
+++ b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
@@ -202,7 +202,7 @@ public void findWithQueryTest() throws Exception {
         }
         List<SimpleExtendedModel> models =
                 SugarRecord.findWithQuery(SimpleExtendedModel.class, "Select * from " +
-                                          NamingHelper.toSQLName(SimpleExtendedModel.class) +
+                                          NamingHelper.toTableName(SimpleExtendedModel.class) +
                                           " where id >= ? ", "50");
         for (SimpleExtendedModel model : models) {
             assertEquals(new Long(75), model.getId(), 25L);
@@ -320,7 +320,7 @@ public void findWithQueryAsIteratorTest() throws Exception {
         Iterator<SimpleExtendedModel> cursor =
                 SugarRecord.findWithQueryAsIterator(SimpleExtendedModel.class,
                                                     "Select * from " +
-                                                    NamingHelper.toSQLName(SimpleExtendedModel.class) +
+                                                    NamingHelper.toTableName(SimpleExtendedModel.class) +
                                                     " where id >= ? ", "50");
         for (int i = 50; i <= 100; i++) {
             assertTrue(cursor.hasNext());
diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 2f95b568..2ad6529f 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -54,7 +54,7 @@ public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
         String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
 
         for (Class domain : domainClasses) {
-            String tableName = NamingHelper.toSQLName(domain);
+            String tableName = NamingHelper.toTableName(domain);
             Cursor c = sqLiteDatabase.rawQuery(String.format(sql, tableName), null);
             if (c.moveToFirst() && c.getInt(0) == 0) {
                 createTable(domain, sqLiteDatabase);
@@ -81,7 +81,7 @@ private ArrayList<String> getColumnNames(SQLiteDatabase sqLiteDatabase, String t
     public void deleteTables(SQLiteDatabase sqLiteDatabase) {
         List<Class> tables = getDomainClasses();
         for (Class table : tables) {
-            sqLiteDatabase.execSQL("DROP TABLE IF EXISTS " + NamingHelper.toSQLName(table));
+            sqLiteDatabase.execSQL("DROP TABLE IF EXISTS " + NamingHelper.toTableName(table));
         }
     }
 
@@ -139,12 +139,12 @@ private void executeScript(SQLiteDatabase db, String file) {
 
     private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
         List<Field> fields = ReflectionUtil.getTableFields(table);
-        String tableName = NamingHelper.toSQLName(table);
+        String tableName = NamingHelper.toTableName(table);
         ArrayList<String> presentColumns = getColumnNames(sqLiteDatabase, tableName);
         ArrayList<String> alterCommands = new ArrayList<>();
 
         for (Field column : fields) {
-            String columnName = NamingHelper.toSQLName(column);
+            String columnName = NamingHelper.toColumnName(column);
             String columnType = QueryBuilder.getColumnType(column.getType());
 
             if (column.isAnnotationPresent(Column.class)) {
@@ -179,7 +179,7 @@ private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
     protected String createTableSQL(Class<?> table) {
         Log.i(SUGAR, "Create table if not exists");
         List<Field> fields = ReflectionUtil.getTableFields(table);
-        String tableName = NamingHelper.toSQLName(table);
+        String tableName = NamingHelper.toTableName(table);
 
         if(KeyWordUtil.isKeyword(tableName)) {
             Log.i(SUGAR,"ERROR, SQLITE RESERVED WORD USED IN " + tableName);
@@ -189,7 +189,7 @@ protected String createTableSQL(Class<?> table) {
         sb.append(tableName).append(" ( ID INTEGER PRIMARY KEY AUTOINCREMENT ");
 
         for (Field column : fields) {
-            String columnName = NamingHelper.toSQLName(column);
+            String columnName = NamingHelper.toColumnName(column);
             String columnType = QueryBuilder.getColumnType(column.getType());
 
             if (columnType != null) {
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 139f1aa3..a6d22f04 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -41,11 +41,11 @@ public static <T> int deleteAll(Class<T> type) {
     }
 
     public static <T> int deleteAll(Class<T> type, String whereClause, String... whereArgs) {
-        return getSugarDataBase().delete(NamingHelper.toSQLName(type), whereClause, whereArgs);
+        return getSugarDataBase().delete(NamingHelper.toTableName(type), whereClause, whereArgs);
     }
 
     public static <T> Cursor getCursor(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
-        Cursor raw = getSugarDataBase().query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
+        Cursor raw = getSugarDataBase().query(NamingHelper.toTableName(type), null, whereClause, whereArgs,
                 groupBy, null, orderBy, limit);
         return new SugarCursor(raw);
     }
@@ -149,7 +149,7 @@ public static <T> List<T> findById(Class<T> type, String[] ids) {
 
     public static <T> T first(Class<T>type) {
         List<T> list = findWithQuery(type,
-                "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ID ASC LIMIT 1");
+                "SELECT * FROM " + NamingHelper.toTableName(type) + " ORDER BY ID ASC LIMIT 1");
         if (list.isEmpty()) {
             return null;
         }
@@ -158,7 +158,7 @@ public static <T> T first(Class<T>type) {
 
     public static <T> T last(Class<T>type) {
         List<T> list = findWithQuery(type,
-                "SELECT * FROM " + NamingHelper.toSQLName(type) + " ORDER BY ID DESC LIMIT 1");
+                "SELECT * FROM " + NamingHelper.toTableName(type) + " ORDER BY ID DESC LIMIT 1");
         if (list.isEmpty()) {
             return null;
         }
@@ -179,7 +179,7 @@ public static <T> Iterator<T> findWithQueryAsIterator(Class<T> type, String quer
     }
 
     public static <T> Iterator<T> findAsIterator(Class<T> type, String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit) {
-        Cursor cursor = getSugarDataBase().query(NamingHelper.toSQLName(type), null, whereClause, whereArgs,
+        Cursor cursor = getSugarDataBase().query(NamingHelper.toTableName(type), null, whereClause, whereArgs,
                 groupBy, null, orderBy, limit);
         return new CursorIterator<>(type, cursor);
     }
@@ -203,7 +203,7 @@ public static <T> List<T> find(Class<T> type, String whereClause, String[] where
         String args[];
         args = (whereArgs == null) ? null : replaceArgs(whereArgs);
 
-        Cursor cursor = getSugarDataBase().query(NamingHelper.toSQLName(type), null, whereClause, args,
+        Cursor cursor = getSugarDataBase().query(NamingHelper.toTableName(type), null, whereClause, args,
                 groupBy, null, orderBy, limit);
 
         return getEntitiesFromCursor(cursor, type);
@@ -240,7 +240,7 @@ public static <T> long count(Class<T> type, String whereClause, String[] whereAr
         String filter = (!TextUtils.isEmpty(whereClause)) ? " where "  + whereClause : "";
         SQLiteStatement sqliteStatement;
         try {
-            sqliteStatement = getSugarDataBase().compileStatement("SELECT count(*) FROM " + NamingHelper.toSQLName(type) + filter);
+            sqliteStatement = getSugarDataBase().compileStatement("SELECT count(*) FROM " + NamingHelper.toTableName(type) + filter);
         } catch (SQLiteException e) {
             e.printStackTrace();
             return result;
@@ -282,7 +282,7 @@ static long save(SQLiteDatabase db, Object object) {
                 values.put("id", entitiesMap.get(object));
         }
 
-        long id = db.insertWithOnConflict(NamingHelper.toSQLName(object.getClass()), null, values,
+        long id = db.insertWithOnConflict(NamingHelper.toTableName(object.getClass()), null, values,
                 SQLiteDatabase.CONFLICT_REPLACE);
 
         if (object.getClass().isAnnotationPresent(Table.class)) {
@@ -323,7 +323,7 @@ static long update(SQLiteDatabase db, Object object) {
             if(column.isAnnotationPresent(Unique.class)) {
                 try {
                     column.setAccessible(true);
-                    String columnName = NamingHelper.toSQLName(column);
+                    String columnName = NamingHelper.toColumnName(column);
                     Object columnValue = column.get(object);
 
                     whereClause.append(columnName).append(" = ?");
@@ -340,7 +340,7 @@ static long update(SQLiteDatabase db, Object object) {
 
         String[] whereArgsArray = whereArgs.toArray(new String[whereArgs.size()]);
         // Get SugarRecord based on Unique values
-        long rowsEffected = db.update(NamingHelper.toSQLName(object.getClass()), values, whereClause.toString(), whereArgsArray);
+        long rowsEffected = db.update(NamingHelper.toTableName(object.getClass()), values, whereClause.toString(), whereArgsArray);
 
         if (rowsEffected == 0) {
             return save(db, object);
@@ -366,7 +366,7 @@ private static void inflate(Cursor cursor, Object object, Map<Object, Long> enti
             Class<?> fieldType = field.getType();
             if (isSugarEntity(fieldType)) {
                 try {
-                    long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toSQLName(field)));
+                    long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toColumnName(field)));
                     field.set(object, (id > 0) ? findById(fieldType, id) : null);
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
@@ -382,7 +382,7 @@ public boolean delete() {
         Class<?> type = getClass();
         if (id != null && id > 0L) {
             Log.i(SUGAR, type.getSimpleName() + " deleted : " + id);
-            return getSugarDataBase().delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()}) == 1;
+            return getSugarDataBase().delete(NamingHelper.toTableName(type), "Id=?", new String[]{id.toString()}) == 1;
         } else {
             Log.i(SUGAR, "Cannot delete object: " + type.getSimpleName() + " - object has not been saved");
             return false;
@@ -397,7 +397,7 @@ public static boolean delete(Object object) {
                 field.setAccessible(true);
                 Long id = (Long) field.get(object);
                 if (id != null && id > 0L) {
-                    boolean deleted = getSugarDataBase().delete(NamingHelper.toSQLName(type), "Id=?", new String[]{id.toString()}) == 1;
+                    boolean deleted = getSugarDataBase().delete(NamingHelper.toTableName(type), "Id=?", new String[]{id.toString()}) == 1;
                     Log.i(SUGAR, type.getSimpleName() + " deleted : " + id);
                     return deleted;
                 } else {
diff --git a/library/src/main/java/com/orm/helper/NamingHelper.java b/library/src/main/java/com/orm/helper/NamingHelper.java
index 7a107b5c..0ae3128b 100644
--- a/library/src/main/java/com/orm/helper/NamingHelper.java
+++ b/library/src/main/java/com/orm/helper/NamingHelper.java
@@ -60,7 +60,7 @@ public static String toSQLNameDefault(String camelCased) {
      *         returned. Else, the Field's {@link java.lang.reflect.Field#getName()} will be
      *         converted from CamelCase to UNDER_SCORE notation
      */
-    public static String toSQLName(Field field) {
+    public static String toColumnName(Field field) {
         if (field.isAnnotationPresent(Column.class)) {
             Column annotation = field.getAnnotation(Column.class);
             return annotation.name();
@@ -77,7 +77,7 @@ public static String toSQLName(Field field) {
      *         {@link com.orm.annotation.Table#name()} will be returned. Else, the class' simple name will
      *         be converted from CamelCase to UNDER_SCORE notation
      */
-    public static String toSQLName(Class<?> table) {
+    public static String toTableName(Class<?> table) {
         if (table.isAnnotationPresent(Table.class)) {
             Table annotation = table.getAnnotation(Table.class);
             if ("".equals(annotation.name())) {
diff --git a/library/src/main/java/com/orm/query/Select.java b/library/src/main/java/com/orm/query/Select.java
index f87e7be9..cc57199d 100644
--- a/library/src/main/java/com/orm/query/Select.java
+++ b/library/src/main/java/com/orm/query/Select.java
@@ -157,7 +157,7 @@ public T first() {
     
     String toSql() {
         StringBuilder sql = new StringBuilder();
-        sql.append(SELECT_FROM).append(NamingHelper.toSQLName(this.record)).append(SPACE);
+        sql.append(SELECT_FROM).append(NamingHelper.toTableName(this.record)).append(SPACE);
 
         if (!whereClause.isEmpty()) {
             sql.append(WHERE).append(whereClause).append(SPACE);
diff --git a/library/src/main/java/com/orm/util/NumberComparator.java b/library/src/main/java/com/orm/util/NumberComparator.java
index 08a9f0b4..a6a08053 100644
--- a/library/src/main/java/com/orm/util/NumberComparator.java
+++ b/library/src/main/java/com/orm/util/NumberComparator.java
@@ -2,9 +2,12 @@
 
 import java.util.Comparator;
 
+import static java.lang.Character.isDigit;
+import static java.lang.Character.isSpaceChar;
+
 public class NumberComparator implements Comparator<Object> {
 
-    private static char charAt(String s, int i) {
+    protected static char charAt(String s, int i) {
         if (i >= s.length()) {
             return '\000';
         }
@@ -12,7 +15,7 @@ private static char charAt(String s, int i) {
         return s.charAt(i);
     }
 
-    private int compareRight(String a, String b) {
+    protected int compareRight(String a, String b) {
         int bias = 0;
         int ia = 0;
         int ib = 0;
@@ -20,13 +23,13 @@ private int compareRight(String a, String b) {
             char ca = charAt(a, ia);
             char cb = charAt(b, ib);
 
-            if ((!Character.isDigit(ca)) && (!Character.isDigit(cb))) {
+            if ((!isDigit(ca)) && (!isDigit(cb))) {
                 return bias;
             }
-            if (!Character.isDigit(ca)) {
+            if (!isDigit(ca)) {
                 return -1;
             }
-            if (!Character.isDigit(cb)) {
+            if (!isDigit(cb)) {
                 return 1;
             }
             if (ca < cb) {
@@ -57,7 +60,7 @@ public int compare(Object o1, Object o2) {
             char ca = charAt(a, ia);
             char cb = charAt(b, ib);
 
-            while ((Character.isSpaceChar(ca)) || (ca == '0')) {
+            while ((isSpaceChar(ca)) || (ca == '0')) {
                 if (ca == '0') {
                     nza++;
                 } else {
@@ -67,7 +70,7 @@ public int compare(Object o1, Object o2) {
                 ca = charAt(a, ++ia);
             }
 
-            while ((Character.isSpaceChar(cb)) || (cb == '0')) {
+            while ((isSpaceChar(cb)) || (cb == '0')) {
                 if (cb == '0') {
                     nzb++;
                 } else {
@@ -77,7 +80,7 @@ public int compare(Object o1, Object o2) {
                 cb = charAt(b, ++ib);
             }
             int result;
-            if ((Character.isDigit(ca)) && (Character.isDigit(cb)) &&
+            if ((isDigit(ca)) && (isDigit(cb)) &&
                     ((result = compareRight(a.substring(ia), b.substring(ib))) != 0)) {
                 return result;
             }
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 6fd1067f..05502bf6 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -1,7 +1,6 @@
 package com.orm.util;
 
 import android.content.ContentValues;
-import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.util.Log;
@@ -29,7 +28,10 @@
 import java.util.List;
 import java.util.Map;
 
-public class ReflectionUtil {
+public final class ReflectionUtil {
+
+    //Prevent instantiation..
+    private ReflectionUtil() { }
 
     public static List<Field> getTableFields(Class table) {
         List<Field> fieldList = SugarConfig.getFields(table);
@@ -66,7 +68,7 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
         column.setAccessible(true);
         Class<?> columnType = column.getType();
         try {
-            String columnName = NamingHelper.toSQLName(column);
+            String columnName = NamingHelper.toColumnName(column);
             Object columnValue = column.get(object);
 
             if (columnType.isAnnotationPresent(Table.class)) {
@@ -150,7 +152,7 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
         field.setAccessible(true);
         try {
             Class fieldType = field.getType();
-            String colName = NamingHelper.toSQLName(field);
+            String colName = NamingHelper.toColumnName(field);
 
             int columnIndex = cursor.getColumnIndex(colName);
 
@@ -342,7 +344,7 @@ private static void populateFiles(File path, List<String> fileNames, String pare
         }
     }
 
-    private static String getSourcePath(Context context) throws PackageManager.NameNotFoundException {
-        return context.getPackageManager().getApplicationInfo(context.getPackageName(), 0).sourceDir;
+    private static String getSourcePath() throws PackageManager.NameNotFoundException {
+        return ContextUtil.getPackageManager().getApplicationInfo(ContextUtil.getPackageName(), 0).sourceDir;
     }
 }
diff --git a/library/src/main/java/com/orm/util/SugarConfig.java b/library/src/main/java/com/orm/util/SugarConfig.java
index 9328c82f..46ebd8da 100644
--- a/library/src/main/java/com/orm/util/SugarConfig.java
+++ b/library/src/main/java/com/orm/util/SugarConfig.java
@@ -27,5 +27,4 @@ public static void clearCache() {
         fields.clear();
         fields = new HashMap<>();
     }
-
 }
diff --git a/library/src/test/java/com/orm/NamingHelperTest.java b/library/src/test/java/com/orm/NamingHelperTest.java
index f4873c81..550c9e31 100644
--- a/library/src/test/java/com/orm/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/NamingHelperTest.java
@@ -23,7 +23,7 @@ public void testToSQLNameFromField() {
             List<String> columnList = new ArrayList<>();
 
             for(Field field: fieldList) {
-                columnList.add(NamingHelper.toSQLName(field));
+                columnList.add(NamingHelper.toColumnName(field));
             }
 
             boolean isIdInList = inList(columnList, "ID");
@@ -46,7 +46,7 @@ private boolean inList(List<String> list, String searchValue) {
 
     @Test
     public void testToSQLNameFromClass() {
-        assertEquals("TEST_RECORD", NamingHelper.toSQLName(TestRecord.class));
+        assertEquals("TEST_RECORD", NamingHelper.toTableName(TestRecord.class));
     }
 
     @Test
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 6e883caa..289f132c 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -30,7 +30,7 @@ public void testEmptyTableCreation() throws Exception {
         SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(EmptyModel.class);
         assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(EmptyModel.class) +
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(EmptyModel.class) +
                     " ( ID INTEGER PRIMARY KEY AUTOINCREMENT  ) ",
                 createSQL);
     }
@@ -40,21 +40,21 @@ public void testSimpleColumnTableCreation() throws Exception {
         SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(StringFieldExtendedModel.class);
         assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldExtendedModel.class) +
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(StringFieldExtendedModel.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
                         "STRING TEXT ) ",
                 createSQL);
 
         String createSQL2 = schemaGenerator.createTableSQL(StringFieldAnnotatedModel.class);
 
-        assertEquals("CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldAnnotatedModel.class) +
+        assertEquals("CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(StringFieldAnnotatedModel.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
                         "STRING TEXT ) ",
                 createSQL2);
 
         String createSQL3 = schemaGenerator.createTableSQL(StringFieldExtendedModelAnnotatedColumn.class);
 
-        assertEquals("CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(StringFieldExtendedModelAnnotatedColumn.class) +
+        assertEquals("CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(StringFieldExtendedModelAnnotatedColumn.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
                         "anyName TEXT ) ",
                 createSQL3);
@@ -65,7 +65,7 @@ public void testUniqueTableCreation() {
         SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(IntUniqueModel.class);
         assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(IntUniqueModel.class) +
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(IntUniqueModel.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
                         "VALUE INTEGER UNIQUE ) ",
                 createSQL);
@@ -76,7 +76,7 @@ public void testMultiColumnUniqueTableCreation() {
         SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
         String createSQL = schemaGenerator.createTableSQL(MultiColumnUniqueModel.class);
         assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toSQLName(MultiColumnUniqueModel.class) +
+                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(MultiColumnUniqueModel.class) +
                         " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
                         "A INTEGER, B INTEGER, " +
                         "UNIQUE(A, B) ON CONFLICT REPLACE ) ",
diff --git a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
index f223a49c..837f4403 100644
--- a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
+++ b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
@@ -204,7 +204,7 @@ public void findWithQueryTest() throws Exception {
         }
         List<SimpleAnnotatedModel> models =
                 SugarRecord.findWithQuery(SimpleAnnotatedModel.class, "Select * from " +
-                        NamingHelper.toSQLName(SimpleAnnotatedModel.class) +
+                        NamingHelper.toTableName(SimpleAnnotatedModel.class) +
                         " where id >= ? ", "50");
         for (SimpleAnnotatedModel model : models) {
             assertEquals(75L, model.getId(), 25L);
@@ -323,7 +323,7 @@ public void findWithQueryAsIteratorTest() throws Exception {
         Iterator<SimpleAnnotatedModel> cursor =
                 SugarRecord.findWithQueryAsIterator(SimpleAnnotatedModel.class,
                         "Select * from " +
-                                NamingHelper.toSQLName(SimpleAnnotatedModel.class) +
+                                NamingHelper.toTableName(SimpleAnnotatedModel.class) +
                                 " where id >= ? ", "50");
         for (int i = 50; i <= 100; i++) {
             assertTrue(cursor.hasNext());
diff --git a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
index 9ac1d696..592a1511 100644
--- a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
+++ b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
@@ -213,7 +213,7 @@ public void findWithQueryTest() throws Exception {
         }
         List<SimpleExtendedModel> models =
                 SugarRecord.findWithQuery(SimpleExtendedModel.class, "Select * from " +
-                                          NamingHelper.toSQLName(SimpleExtendedModel.class) +
+                                          NamingHelper.toTableName(SimpleExtendedModel.class) +
                                           " where id >= ? ", "50");
         for (SimpleExtendedModel model : models) {
             assertEquals(75, model.getId(), 25L);
@@ -332,7 +332,7 @@ public void findWithQueryAsIteratorTest() throws Exception {
         Iterator<SimpleExtendedModel> cursor =
                 SugarRecord.findWithQueryAsIterator(SimpleExtendedModel.class,
                                                     "Select * from " +
-                                                    NamingHelper.toSQLName(SimpleExtendedModel.class) +
+                                                    NamingHelper.toTableName(SimpleExtendedModel.class) +
                                                     " where id >= ? ", "50");
         SugarContext.init(RuntimeEnvironment.application);
         for (int i = 50; i <= 100; i++) {
diff --git a/library/src/test/java/com/orm/util/NumberComparatorTest.java b/library/src/test/java/com/orm/util/NumberComparatorTest.java
new file mode 100644
index 00000000..2dd8458b
--- /dev/null
+++ b/library/src/test/java/com/orm/util/NumberComparatorTest.java
@@ -0,0 +1,54 @@
+package com.orm.util;
+
+import com.orm.RobolectricGradleTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author jonatan.salas
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18)
+public class NumberComparatorTest {
+    private NumberComparator comparator;
+
+    @Before
+    public void setUp() {
+        comparator = new NumberComparator();
+    }
+
+    @Test
+    public void testNumberComparatorWithoutNumbers() {
+        int result = comparator.compare("hola", "hola");
+        assertEquals(0, result);
+    }
+
+    @Test
+    public void testNumberComparatorWithNumbers() {
+        int result = comparator.compare("1", "2");
+        assertEquals(-1, result);
+    }
+
+    @Test
+    public void testComparatorWithNumbers() {
+        int result = comparator.compare("4", "2");
+        assertEquals(1, result);
+    }
+
+    @Test
+    public void testCompareRight() {
+        int result = comparator.compareRight("hola", "hola");
+        assertEquals(0, result);
+    }
+
+    @Test
+    public void testCharAt() {
+        Character c = NumberComparator.charAt("Hola", 0);
+        assertEquals("H", c.toString());
+    }
+}
diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
new file mode 100644
index 00000000..8efba281
--- /dev/null
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -0,0 +1,35 @@
+package com.orm.util;
+
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.models.TestRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author jonatan.salas
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18)
+public class ReflectionUtilTest {
+
+    @Test
+    public void testGetTableFields() {
+        List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
+        List<String> strings = new ArrayList<>();
+
+        for (Field field: fieldList) {
+            strings.add(field.getName());
+        }
+
+        assertEquals(true, strings.contains("id"));
+        assertEquals(true, strings.contains("name"));
+    }
+}
diff --git a/library/src/test/java/com/orm/util/SugarConfigTest.java b/library/src/test/java/com/orm/util/SugarConfigTest.java
new file mode 100644
index 00000000..c694dee0
--- /dev/null
+++ b/library/src/test/java/com/orm/util/SugarConfigTest.java
@@ -0,0 +1,15 @@
+package com.orm.util;
+
+import com.orm.models.TestRecord;
+
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+/**
+ * @author jonatan.salas
+ */
+public class SugarConfigTest {
+
+}

From 1a600cea601a5b09f7ecba0eaa5113ede759d4ce Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Fri, 8 Apr 2016 19:37:16 -0300
Subject: [PATCH 253/305] Solved bug with SugarTransactionHelper Modified
 TestRecord Added SugarTransactionHelperTest

---
 .../orm/helper/SugarTransactionHelper.java    |  4 -
 .../test/java/com/orm/models/TestRecord.java  |  9 +++
 .../orm/util/SugarTransactionHelperTest.java  | 76 +++++++++++++++++++
 3 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 library/src/test/java/com/orm/util/SugarTransactionHelperTest.java

diff --git a/library/src/main/java/com/orm/helper/SugarTransactionHelper.java b/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
index 06fd8731..82077a4a 100644
--- a/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
+++ b/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
@@ -26,10 +26,6 @@ public static void doInTransaction(Callback callback) {
             Log.d(LOG_TAG, "Could execute callback within transaction", e);
         } finally {
             database.endTransaction();
-
-            if (database.isOpen()) {
-                database.close();
-            }
         }
     }
 
diff --git a/library/src/test/java/com/orm/models/TestRecord.java b/library/src/test/java/com/orm/models/TestRecord.java
index f537f501..72ab8d24 100644
--- a/library/src/test/java/com/orm/models/TestRecord.java
+++ b/library/src/test/java/com/orm/models/TestRecord.java
@@ -9,4 +9,13 @@ public class TestRecord extends SugarRecord {
     public TestRecord() {
         super();
     }
+
+    public TestRecord setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
 }
diff --git a/library/src/test/java/com/orm/util/SugarTransactionHelperTest.java b/library/src/test/java/com/orm/util/SugarTransactionHelperTest.java
new file mode 100644
index 00000000..410be646
--- /dev/null
+++ b/library/src/test/java/com/orm/util/SugarTransactionHelperTest.java
@@ -0,0 +1,76 @@
+package com.orm.util;
+
+import com.orm.ClientApp;
+import com.orm.RobolectricGradleTestRunner;
+import com.orm.SugarContext;
+import com.orm.helper.SugarTransactionHelper;
+import com.orm.models.TestRecord;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static junit.framework.Assert.assertEquals;
+
+/**
+ * @author jonatan.salas
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
+public class SugarTransactionHelperTest {
+    private List<TestRecord> recordList = new ArrayList<>();
+    private TestRecord record1 = new TestRecord();
+    private TestRecord record2 = new TestRecord();
+    private TestRecord record3 = new TestRecord();
+
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+
+        record1.setId(1L);
+        record1.setName("lala");
+
+        record2.setId(2L);
+        record2.setName("fefe");
+
+        record3.setId(3L);
+        record3.setName("jaja");
+
+        recordList.add(record1);
+        recordList.add(record2);
+        recordList.add(record3);
+    }
+
+    @Test
+    public void testDoInTransaction() {
+        SugarTransactionHelper.doInTransaction(new SugarTransactionHelper.Callback() {
+            @Override
+            public void manipulateInTransaction() {
+                for (TestRecord record: recordList) {
+                    TestRecord.save(record);
+                }
+            }
+        });
+
+        final List<TestRecord> results = TestRecord.listAll(TestRecord.class);
+
+        assertEquals(true, inList(results, record1));
+        assertEquals(true, inList(results, record2));
+        assertEquals(true, inList(results, record3));
+    }
+
+    private boolean inList(List<TestRecord> list, TestRecord testRecord) {
+        for (TestRecord record: list) {
+            if (record.getId().equals(testRecord.getId()) &&
+                record.getName().equals(testRecord.getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

From b6fdb8e18b842c63a5e0ce3feec813a33a48bb76 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Fri, 8 Apr 2016 20:11:22 -0300
Subject: [PATCH 254/305] Added SugarDbTest

---
 .../src/test/java/com/orm/SugarDbTest.java    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 library/src/test/java/com/orm/SugarDbTest.java

diff --git a/library/src/test/java/com/orm/SugarDbTest.java b/library/src/test/java/com/orm/SugarDbTest.java
new file mode 100644
index 00000000..482410b5
--- /dev/null
+++ b/library/src/test/java/com/orm/SugarDbTest.java
@@ -0,0 +1,43 @@
+package com.orm;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+/**
+ * @author jonatan.salas
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
+public class SugarDbTest {
+    private final SugarDb sugarDb = SugarDb.getInstance();
+
+    @Before
+    public void setUp() {
+        SugarContext.init(RuntimeEnvironment.application);
+    }
+
+    @Test
+    //TODO check this better!
+    public void testGetReadableDatabase() {
+        final SQLiteDatabase db = sugarDb.getReadableDatabase();
+        Assert.assertEquals(false, db.isReadOnly());
+    }
+
+    @Test
+    public void testGetWritableDatabase() {
+        final SQLiteDatabase db = sugarDb.getWritableDatabase();
+        Assert.assertEquals(false, db.isReadOnly());
+    }
+
+    @Test
+    public void testGetDB() {
+        final SQLiteDatabase db = sugarDb.getDB();
+        Assert.assertEquals(false, db.isReadOnly());
+    }
+}

From e4a29d122fc8403e21319e5b7434c0bbab6fba34 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 9 Apr 2016 13:42:34 -0300
Subject: [PATCH 255/305] Deleted all test and classes from sample app Deleted
 unused classes in library test Generated helper package to add all helper
 classes test Generated app package to put ClientApp class Refactored class
 models in test to model

---
 .../models/BigDecimalFieldAnnotatedModel.java |  25 --
 .../models/BigDecimalFieldExtendedModel.java  |  19 -
 .../models/BooleanFieldAnnotatedModel.java    |  28 --
 .../models/BooleanFieldExtendedModel.java     |  26 --
 .../models/ByteArrayAnnotatedModel.java       |  23 --
 .../models/ByteArrayExtendedModel.java        |  17 -
 .../models/DoubleFieldAnnotatedModel.java     |  28 --
 .../models/DoubleFieldExtendedModel.java      |  26 --
 .../models/EnumFieldAnnotatedModel.java       |  52 ---
 .../models/EnumFieldExtendedModel.java        |  46 ---
 .../models/FloatFieldAnnotatedModel.java      |  28 --
 .../models/FloatFieldExtendedModel.java       |  26 --
 .../models/IncompleteAnnotatedModel.java      |   9 -
 .../models/IntegerFieldAnnotatedModel.java    |  28 --
 .../models/IntegerFieldExtendedModel.java     |  26 --
 .../models/LongFieldAnnotatedModel.java       |  28 --
 .../models/LongFieldExtendedModel.java        |  26 --
 .../example/models/NestedAnnotatedModel.java  |  23 --
 .../example/models/NestedExtendedModel.java   |  18 -
 .../example/models/NestedMixedAAModel.java    |  18 -
 .../example/models/NestedMixedABModel.java    |  18 -
 .../example/models/NestedMixedBAModel.java    |  24 --
 .../example/models/NestedMixedBBModel.java    |  24 --
 .../java/com/example/models/NoSugarModel.java |   7 -
 .../models/RelationshipAnnotatedModel.java    |  23 --
 .../models/RelationshipExtendedModel.java     |  18 -
 .../models/RelationshipMixedAModel.java       |  18 -
 .../models/RelationshipMixedBModel.java       |  24 --
 .../models/ShortFieldAnnotatedModel.java      |  28 --
 .../models/ShortFieldExtendedModel.java       |  26 --
 .../example/models/SimpleAnnotatedModel.java  |  15 -
 .../example/models/SimpleExtendedModel.java   |   8 -
 .../java/com/example/models/SimpleModel.java  |  33 --
 .../models/StringFieldAnnotatedModel.java     |  23 --
 .../models/StringFieldAnnotatedNoIdModel.java |  22 --
 .../models/StringFieldExtendedModel.java      |  21 -
 .../sugartest/BigDecimalFieldTests.java       |  53 ---
 .../example/sugartest/BooleanFieldTests.java  |  76 ----
 .../sugartest/ByteArrayFieldTests.java        |  54 ---
 .../com/example/sugartest/CursorTests.java    |  72 ----
 .../example/sugartest/DoubleFieldTests.java   |  76 ----
 .../com/example/sugartest/EnumFieldTests.java |  81 ----
 .../example/sugartest/FirstAndLastTests.java  | 158 --------
 .../example/sugartest/FloatFieldTests.java    |  76 ----
 .../IncompleteAnnotatedModelTests.java        |  28 --
 .../example/sugartest/IntegerFieldTests.java  |  76 ----
 .../sugartest/ListAllOrderByTests.java        |  53 ---
 .../com/example/sugartest/LongFieldTests.java |  76 ----
 .../example/sugartest/MultipleSaveTests.java  |  93 -----
 .../sugartest/NestedAnnotatedTests.java       | 131 -------
 .../sugartest/NestedExtendedTests.java        | 131 -------
 .../example/sugartest/NestedMixedAATests.java | 131 -------
 .../example/sugartest/NestedMixedABTests.java | 131 -------
 .../example/sugartest/NestedMixedBATests.java | 131 -------
 .../example/sugartest/NestedMixedBBTests.java | 131 -------
 .../example/sugartest/NoSugarModelTests.java  |  28 --
 .../sugartest/RelationshipAnnotatedTests.java | 108 ------
 .../sugartest/RelationshipExtendedTests.java  | 108 ------
 .../sugartest/RelationshipMixedATests.java    | 108 ------
 .../sugartest/RelationshipMixedBTests.java    | 108 ------
 .../RobolectricGradleTestRunner.java          |  25 --
 .../example/sugartest/ShortFieldTests.java    |  76 ----
 .../sugartest/SimpleAnnotatedModelTests.java  | 356 -----------------
 .../sugartest/SimpleExtendedModelTests.java   | 363 ------------------
 .../example/sugartest/StringFieldTests.java   |  48 ---
 library/src/test/java/com/orm/ClientApp.java  |  18 -
 .../com/orm/RobolectricGradleTestRunner.java  |  25 --
 .../java/com/orm/SchemaGeneratorTest.java     |  26 +-
 .../com/orm/SugarDbConfigurationTest.java     |   2 +-
 .../src/test/java/com/orm/SugarDbTest.java    |  24 +-
 .../src/test/java/com/orm/app}/ClientApp.java |   2 +-
 .../{util => helper}/ManifestHelperTest.java  |  29 +-
 .../orm/{ => helper}/NamingHelperTest.java    |  17 +-
 .../SugarTransactionHelperTest.java           |  13 +-
 .../BigDecimalFieldAnnotatedModel.java        |   2 +-
 .../BigDecimalFieldExtendedModel.java         |   2 +-
 .../BooleanFieldAnnotatedModel.java           |   2 +-
 .../BooleanFieldExtendedModel.java            |   2 +-
 .../ByteArrayAnnotatedModel.java              |   2 +-
 .../ByteArrayExtendedModel.java               |   2 +-
 .../DoubleFieldAnnotatedModel.java            |   2 +-
 .../DoubleFieldExtendedModel.java             |   2 +-
 .../com/orm/{models => model}/EmptyModel.java |   2 +-
 .../EnumFieldAnnotatedModel.java              |   2 +-
 .../EnumFieldExtendedModel.java               |   2 +-
 .../FloatFieldAnnotatedModel.java             |   2 +-
 .../FloatFieldExtendedModel.java              |   2 +-
 .../IncompleteAnnotatedModel.java             |   2 +-
 .../orm/{models => model}/IntUniqueModel.java |   2 +-
 .../IntegerFieldAnnotatedModel.java           |   2 +-
 .../IntegerFieldExtendedModel.java            |   2 +-
 .../LongFieldAnnotatedModel.java              |   2 +-
 .../LongFieldExtendedModel.java               |   2 +-
 .../MultiColumnUniqueModel.java               |   2 +-
 .../NestedAnnotatedModel.java                 |   2 +-
 .../NestedExtendedModel.java                  |   2 +-
 .../{models => model}/NestedMixedAAModel.java |   2 +-
 .../{models => model}/NestedMixedABModel.java |   2 +-
 .../{models => model}/NestedMixedBAModel.java |   2 +-
 .../{models => model}/NestedMixedBBModel.java |   2 +-
 .../orm/{models => model}/NoSugarModel.java   |   2 +-
 .../RelationshipAnnotatedModel.java           |   2 +-
 .../RelationshipExtendedModel.java            |   2 +-
 .../RelationshipMixedAModel.java              |   2 +-
 .../RelationshipMixedBModel.java              |   2 +-
 .../ShortFieldAnnotatedModel.java             |   2 +-
 .../ShortFieldExtendedModel.java              |   2 +-
 .../SimpleAnnotatedModel.java                 |   2 +-
 .../SimpleExtendedModel.java                  |   2 +-
 .../orm/{models => model}/SimpleModel.java    |   2 +-
 .../StringFieldAnnotatedModel.java            |   2 +-
 .../StringFieldAnnotatedNoIdModel.java        |   2 +-
 .../StringFieldExtendedModel.java             |   2 +-
 ...ringFieldExtendedModelAnnotatedColumn.java |   2 +-
 .../com/orm/{models => model}/TestRecord.java |   2 +-
 .../java/com/orm/query/QueryBuilderTests.java |   2 +-
 .../test/java/com/orm/query/SelectTest.java   |  12 +-
 .../com/orm/record/BigDecimalFieldTests.java  |  46 +--
 .../com/orm/record/BooleanFieldTests.java     |  21 +-
 .../com/orm/record/ByteArrayFieldTests.java   |  22 +-
 .../test/java/com/orm/record/CursorTests.java |  18 +-
 .../java/com/orm/record/DoubleFieldTests.java |  21 +-
 .../java/com/orm/record/EnumFieldTests.java   |  21 +-
 .../com/orm/record/FirstAndLastTests.java     |  19 +-
 .../java/com/orm/record/FloatFieldTests.java  |  21 +-
 .../record/IncompleteAnnotatedModelTests.java |  21 +-
 .../com/orm/record/IntegerFieldTests.java     |  19 +-
 .../com/orm/record/ListAllOrderByTests.java   |  20 +-
 .../java/com/orm/record/LongFieldTests.java   |  19 +-
 .../com/orm/record/MultipleSaveTests.java     |  21 +-
 .../com/orm/record/NestedAnnotatedTests.java  |  23 +-
 .../com/orm/record/NestedExtendedTests.java   |  23 +-
 .../com/orm/record/NestedMixedAATests.java    |  23 +-
 .../com/orm/record/NestedMixedABTests.java    |  21 +-
 .../com/orm/record/NestedMixedBATests.java    |  23 +-
 .../com/orm/record/NestedMixedBBTests.java    |  21 +-
 .../com/orm/record/NoSugarModelTests.java     |  19 +-
 .../record/RelationshipAnnotatedTests.java    |  21 +-
 .../orm/record/RelationshipExtendedTests.java |  19 +-
 .../orm/record/RelationshipMixedATests.java   | 141 +++++++
 .../orm/record/RelationshipMixedBTests.java   |  20 +-
 .../java/com/orm/record/ShortFieldTests.java  |  21 +-
 .../orm/record/SimpleAnnotatedModelTests.java |  19 +-
 .../orm/record/SimpleExtendedModelTests.java  |  20 +-
 .../java/com/orm/record/StringFieldTests.java |  22 +-
 .../java/com/orm/util/ContextUtilTest.java    |  16 +-
 .../java/com/orm/util/KeyWordUtilTest.java    |   2 +-
 .../com/orm/util/MigrationFileParserTest.java |   2 +-
 .../com/orm/util/NumberComparatorTest.java    |   8 +-
 .../java/com/orm/util/ReflectionUtilTest.java |  11 +-
 .../java/com/orm/util/SugarConfigTest.java    |   7 -
 151 files changed, 456 insertions(+), 4505 deletions(-)
 delete mode 100644 example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/BigDecimalFieldExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/BooleanFieldExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/ByteArrayExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/DoubleFieldExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/EnumFieldExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/FloatFieldExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/IntegerFieldExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/LongFieldExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/NestedAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/NestedExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/NestedMixedAAModel.java
 delete mode 100644 example/src/main/java/com/example/models/NestedMixedABModel.java
 delete mode 100644 example/src/main/java/com/example/models/NestedMixedBAModel.java
 delete mode 100644 example/src/main/java/com/example/models/NestedMixedBBModel.java
 delete mode 100644 example/src/main/java/com/example/models/NoSugarModel.java
 delete mode 100644 example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/RelationshipExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/RelationshipMixedAModel.java
 delete mode 100644 example/src/main/java/com/example/models/RelationshipMixedBModel.java
 delete mode 100644 example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/ShortFieldExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/SimpleAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/SimpleExtendedModel.java
 delete mode 100644 example/src/main/java/com/example/models/SimpleModel.java
 delete mode 100644 example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
 delete mode 100644 example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
 delete mode 100644 example/src/main/java/com/example/models/StringFieldExtendedModel.java
 delete mode 100644 example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/BooleanFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/CursorTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/DoubleFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/EnumFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/FirstAndLastTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/FloatFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/IntegerFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/ListAllOrderByTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/LongFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/MultipleSaveTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/NestedExtendedTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/NestedMixedAATests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/NestedMixedABTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/NestedMixedBATests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/NestedMixedBBTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/NoSugarModelTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/RelationshipMixedATests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
 delete mode 100644 example/src/test/java/com/example/sugartest/ShortFieldTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
 delete mode 100644 example/src/test/java/com/example/sugartest/StringFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/ClientApp.java
 delete mode 100644 library/src/test/java/com/orm/RobolectricGradleTestRunner.java
 rename {example/src/main/java/com/example => library/src/test/java/com/orm/app}/ClientApp.java (94%)
 rename library/src/test/java/com/orm/{util => helper}/ManifestHelperTest.java (50%)
 rename library/src/test/java/com/orm/{ => helper}/NamingHelperTest.java (81%)
 rename library/src/test/java/com/orm/{util => helper}/SugarTransactionHelperTest.java (84%)
 rename library/src/test/java/com/orm/{models => model}/BigDecimalFieldAnnotatedModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/BigDecimalFieldExtendedModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/BooleanFieldAnnotatedModel.java (96%)
 rename library/src/test/java/com/orm/{models => model}/BooleanFieldExtendedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/ByteArrayAnnotatedModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/ByteArrayExtendedModel.java (93%)
 rename library/src/test/java/com/orm/{models => model}/DoubleFieldAnnotatedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/DoubleFieldExtendedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/EmptyModel.java (86%)
 rename library/src/test/java/com/orm/{models => model}/EnumFieldAnnotatedModel.java (97%)
 rename library/src/test/java/com/orm/{models => model}/EnumFieldExtendedModel.java (97%)
 rename library/src/test/java/com/orm/{models => model}/FloatFieldAnnotatedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/FloatFieldExtendedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/IncompleteAnnotatedModel.java (89%)
 rename library/src/test/java/com/orm/{models => model}/IntUniqueModel.java (92%)
 rename library/src/test/java/com/orm/{models => model}/IntegerFieldAnnotatedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/IntegerFieldExtendedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/LongFieldAnnotatedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/LongFieldExtendedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/MultiColumnUniqueModel.java (93%)
 rename library/src/test/java/com/orm/{models => model}/NestedAnnotatedModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/NestedExtendedModel.java (93%)
 rename library/src/test/java/com/orm/{models => model}/NestedMixedAAModel.java (93%)
 rename library/src/test/java/com/orm/{models => model}/NestedMixedABModel.java (93%)
 rename library/src/test/java/com/orm/{models => model}/NestedMixedBAModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/NestedMixedBBModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/NoSugarModel.java (73%)
 rename library/src/test/java/com/orm/{models => model}/RelationshipAnnotatedModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/RelationshipExtendedModel.java (93%)
 rename library/src/test/java/com/orm/{models => model}/RelationshipMixedAModel.java (93%)
 rename library/src/test/java/com/orm/{models => model}/RelationshipMixedBModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/ShortFieldAnnotatedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/ShortFieldExtendedModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/SimpleAnnotatedModel.java (88%)
 rename library/src/test/java/com/orm/{models => model}/SimpleExtendedModel.java (83%)
 rename library/src/test/java/com/orm/{models => model}/SimpleModel.java (95%)
 rename library/src/test/java/com/orm/{models => model}/StringFieldAnnotatedModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/StringFieldAnnotatedNoIdModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/StringFieldExtendedModel.java (94%)
 rename library/src/test/java/com/orm/{models => model}/StringFieldExtendedModelAnnotatedColumn.java (94%)
 rename library/src/test/java/com/orm/{models => model}/TestRecord.java (92%)
 create mode 100644 library/src/test/java/com/orm/record/RelationshipMixedATests.java

diff --git a/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java b/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
deleted file mode 100644
index bd4fd846..00000000
--- a/example/src/main/java/com/example/models/BigDecimalFieldAnnotatedModel.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-import java.math.BigDecimal;
-
-@Table
-public class BigDecimalFieldAnnotatedModel {
-    private BigDecimal decimal;
-    private Long id;
-
-    public BigDecimalFieldAnnotatedModel() {}
-
-    public BigDecimalFieldAnnotatedModel(BigDecimal decimal) {
-        this.decimal = decimal;
-    }
-
-    public BigDecimal getBigDecimal() {
-        return decimal;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/BigDecimalFieldExtendedModel.java b/example/src/main/java/com/example/models/BigDecimalFieldExtendedModel.java
deleted file mode 100644
index e258cf32..00000000
--- a/example/src/main/java/com/example/models/BigDecimalFieldExtendedModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-import java.math.BigDecimal;
-
-public class BigDecimalFieldExtendedModel extends SugarRecord {
-    private BigDecimal decimal;
-
-    public BigDecimalFieldExtendedModel() {}
-
-    public BigDecimalFieldExtendedModel(BigDecimal decimal) {
-        this.decimal = decimal;
-    }
-
-    public BigDecimal getBigDecimal() {
-        return decimal;
-    }
-}
diff --git a/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java b/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
deleted file mode 100644
index d46455f4..00000000
--- a/example/src/main/java/com/example/models/BooleanFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class BooleanFieldAnnotatedModel {
-    private Boolean objectBoolean;
-    private boolean rawBoolean;
-    private Long id;
-
-    public BooleanFieldAnnotatedModel() {}
-
-    public BooleanFieldAnnotatedModel(Boolean objectBoolean) {
-        this.objectBoolean = objectBoolean;
-    }
-
-    public BooleanFieldAnnotatedModel(boolean rawBoolean) {
-        this.rawBoolean = rawBoolean;
-    }
-
-    public Boolean getBoolean() {
-        return objectBoolean;
-    }
-
-    public boolean getRawBoolean() {
-        return rawBoolean;
-    }
-}
diff --git a/example/src/main/java/com/example/models/BooleanFieldExtendedModel.java b/example/src/main/java/com/example/models/BooleanFieldExtendedModel.java
deleted file mode 100644
index 972855cd..00000000
--- a/example/src/main/java/com/example/models/BooleanFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class BooleanFieldExtendedModel extends SugarRecord {
-    private Boolean objectBoolean;
-    private boolean rawBoolean;
-
-    public BooleanFieldExtendedModel() {}
-
-    public BooleanFieldExtendedModel(Boolean objectBoolean) {
-        this.objectBoolean = objectBoolean;
-    }
-
-    public BooleanFieldExtendedModel(boolean rawBoolean) {
-        this.rawBoolean = rawBoolean;
-    }
-
-    public Boolean getBoolean() {
-        return objectBoolean;
-    }
-
-    public boolean getRawBoolean() {
-        return rawBoolean;
-    }
-}
diff --git a/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java b/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
deleted file mode 100644
index f92c277a..00000000
--- a/example/src/main/java/com/example/models/ByteArrayAnnotatedModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class ByteArrayAnnotatedModel {
-    private byte[] byteArray;
-    private Long id;
-
-    public ByteArrayAnnotatedModel() {}
-
-    public ByteArrayAnnotatedModel(byte[] byteArray) {
-        this.byteArray = byteArray;
-    }
-
-    public byte[] getByteArray() {
-        return byteArray;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/ByteArrayExtendedModel.java b/example/src/main/java/com/example/models/ByteArrayExtendedModel.java
deleted file mode 100644
index 7808c514..00000000
--- a/example/src/main/java/com/example/models/ByteArrayExtendedModel.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class ByteArrayExtendedModel extends SugarRecord {
-    private byte[] byteArray;
-
-    public ByteArrayExtendedModel() {}
-
-    public ByteArrayExtendedModel(byte[] byteArray) {
-        this.byteArray = byteArray;
-    }
-
-    public byte[] getByteArray() {
-        return byteArray;
-    }
-}
diff --git a/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java b/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
deleted file mode 100644
index 1657d23e..00000000
--- a/example/src/main/java/com/example/models/DoubleFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class DoubleFieldAnnotatedModel {
-    private Double objectDouble;
-    private double rawDouble;
-    private Long id;
-
-    public DoubleFieldAnnotatedModel() {}
-
-    public DoubleFieldAnnotatedModel(Double objectDouble) {
-        this.objectDouble = objectDouble;
-    }
-
-    public DoubleFieldAnnotatedModel(double rawDouble) {
-        this.rawDouble = rawDouble;
-    }
-
-    public Double getDouble() {
-        return objectDouble;
-    }
-
-    public double getRawDouble() {
-        return rawDouble;
-    }
-}
diff --git a/example/src/main/java/com/example/models/DoubleFieldExtendedModel.java b/example/src/main/java/com/example/models/DoubleFieldExtendedModel.java
deleted file mode 100644
index b0708b7c..00000000
--- a/example/src/main/java/com/example/models/DoubleFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class DoubleFieldExtendedModel extends SugarRecord {
-    private Double objectDouble;
-    private double rawDouble;
-
-    public DoubleFieldExtendedModel() {}
-
-    public DoubleFieldExtendedModel(Double objectDouble) {
-        this.objectDouble = objectDouble;
-    }
-
-    public DoubleFieldExtendedModel(double rawDouble) {
-        this.rawDouble = rawDouble;
-    }
-
-    public Double getDouble() {
-        return objectDouble;
-    }
-
-    public double getRawDouble() {
-        return rawDouble;
-    }
-}
diff --git a/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java b/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
deleted file mode 100644
index 8303c787..00000000
--- a/example/src/main/java/com/example/models/EnumFieldAnnotatedModel.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class EnumFieldAnnotatedModel {
-    public static enum DefaultEnum {
-        ONE, TWO
-    }
-
-    public static enum OverrideEnum {
-        ONE, TWO;
-
-        @Override
-        public String toString() {
-            return super.toString().toLowerCase();
-        }
-    }
-
-    private OverrideEnum overrideEnum;
-    private DefaultEnum defaultEnum;
-    private Long id;
-
-    public EnumFieldAnnotatedModel() {
-
-    }
-
-    public EnumFieldAnnotatedModel(OverrideEnum e1, DefaultEnum d1) {
-        overrideEnum = e1;
-        defaultEnum = d1;
-    }
-
-    public DefaultEnum getDefaultEnum() {
-        return defaultEnum;
-    }
-
-    public void setDefaultEnum(DefaultEnum defaultEnum) {
-        this.defaultEnum = defaultEnum;
-    }
-
-    public void setOverrideEnum(OverrideEnum overrideEnum) {
-        this.overrideEnum = overrideEnum;
-    }
-
-    public OverrideEnum getOverrideEnum() {
-        return overrideEnum;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/EnumFieldExtendedModel.java b/example/src/main/java/com/example/models/EnumFieldExtendedModel.java
deleted file mode 100644
index df3a093b..00000000
--- a/example/src/main/java/com/example/models/EnumFieldExtendedModel.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class EnumFieldExtendedModel extends SugarRecord {
-    public static enum DefaultEnum {
-        ONE, TWO
-    }
-
-    public static enum OverrideEnum {
-        ONE, TWO;
-
-        @Override
-        public String toString() {
-            return super.toString().toLowerCase();
-        }
-    }
-
-    private OverrideEnum overrideEnum;
-    private DefaultEnum defaultEnum;
-
-    public EnumFieldExtendedModel() {
-
-    }
-
-    public EnumFieldExtendedModel(OverrideEnum e1, DefaultEnum d1) {
-        overrideEnum = e1;
-        defaultEnum = d1;
-    }
-
-    public DefaultEnum getDefaultEnum() {
-        return defaultEnum;
-    }
-
-    public void setDefaultEnum(DefaultEnum defaultEnum) {
-        this.defaultEnum = defaultEnum;
-    }
-
-    public void setOverrideEnum(OverrideEnum overrideEnum) {
-        this.overrideEnum = overrideEnum;
-    }
-
-    public OverrideEnum getOverrideEnum() {
-        return overrideEnum;
-    }
-}
diff --git a/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java b/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
deleted file mode 100644
index 6da3fcc5..00000000
--- a/example/src/main/java/com/example/models/FloatFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class FloatFieldAnnotatedModel {
-    private Float objectFloat;
-    private float rawFloat;
-    private Long id;
-
-    public FloatFieldAnnotatedModel() {}
-
-    public FloatFieldAnnotatedModel(Float objectFloat) {
-        this.objectFloat = objectFloat;
-    }
-
-    public FloatFieldAnnotatedModel(float rawFloat) {
-        this.rawFloat = rawFloat;
-    }
-
-    public Float getFloat() {
-        return objectFloat;
-    }
-
-    public float getRawFloat() {
-        return rawFloat;
-    }
-}
diff --git a/example/src/main/java/com/example/models/FloatFieldExtendedModel.java b/example/src/main/java/com/example/models/FloatFieldExtendedModel.java
deleted file mode 100644
index 0abf904b..00000000
--- a/example/src/main/java/com/example/models/FloatFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class FloatFieldExtendedModel extends SugarRecord {
-    private Float objectFloat;
-    private float rawFloat;
-
-    public FloatFieldExtendedModel() {}
-
-    public FloatFieldExtendedModel(Float objectFloat) {
-        this.objectFloat = objectFloat;
-    }
-
-    public FloatFieldExtendedModel(float rawFloat) {
-        this.rawFloat = rawFloat;
-    }
-
-    public Float getFloat() {
-        return objectFloat;
-    }
-
-    public float getRawFloat() {
-        return rawFloat;
-    }
-}
diff --git a/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java b/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
deleted file mode 100644
index ccb47fa8..00000000
--- a/example/src/main/java/com/example/models/IncompleteAnnotatedModel.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class IncompleteAnnotatedModel {
-    // An annotated model must provide a Long id field. A setter or getter is optional
-    public IncompleteAnnotatedModel() {}
-}
diff --git a/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java b/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
deleted file mode 100644
index b4bcd03a..00000000
--- a/example/src/main/java/com/example/models/IntegerFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class IntegerFieldAnnotatedModel {
-    private Integer integer;
-    private int rawInteger;
-    public Long id;
-
-    public IntegerFieldAnnotatedModel() {}
-
-    public IntegerFieldAnnotatedModel(Integer integer) {
-        this.integer = integer;
-    }
-
-    public IntegerFieldAnnotatedModel(int rawInteger) {
-        this.rawInteger = rawInteger;
-    }
-
-    public Integer getInteger() {
-        return integer;
-    }
-
-    public int getInt() {
-        return rawInteger;
-    }
-}
diff --git a/example/src/main/java/com/example/models/IntegerFieldExtendedModel.java b/example/src/main/java/com/example/models/IntegerFieldExtendedModel.java
deleted file mode 100644
index b05df191..00000000
--- a/example/src/main/java/com/example/models/IntegerFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class IntegerFieldExtendedModel extends SugarRecord {
-    private Integer integer;
-    private int rawInteger;
-
-    public IntegerFieldExtendedModel() {}
-
-    public IntegerFieldExtendedModel(Integer integer) {
-        this.integer = integer;
-    }
-
-    public IntegerFieldExtendedModel(int rawInteger) {
-        this.rawInteger = rawInteger;
-    }
-
-    public Integer getInteger() {
-        return integer;
-    }
-
-    public int getInt() {
-        return rawInteger;
-    }
-}
diff --git a/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java b/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
deleted file mode 100644
index 9900bf8c..00000000
--- a/example/src/main/java/com/example/models/LongFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class LongFieldAnnotatedModel {
-    private Long objectLong;
-    private long rawLong;
-    private Long id;
-
-    public LongFieldAnnotatedModel() {}
-
-    public LongFieldAnnotatedModel(Long objectLong) {
-        this.objectLong = objectLong;
-    }
-
-    public LongFieldAnnotatedModel(long rawLong) {
-        this.rawLong = rawLong;
-    }
-
-    public Long getLong() {
-        return objectLong;
-    }
-
-    public long getRawLong() {
-        return rawLong;
-    }
-}
diff --git a/example/src/main/java/com/example/models/LongFieldExtendedModel.java b/example/src/main/java/com/example/models/LongFieldExtendedModel.java
deleted file mode 100644
index 19ccdaa5..00000000
--- a/example/src/main/java/com/example/models/LongFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class LongFieldExtendedModel extends SugarRecord {
-    private Long objectLong;
-    private long rawLong;
-
-    public LongFieldExtendedModel() {}
-
-    public LongFieldExtendedModel(Long objectLong) {
-        this.objectLong = objectLong;
-    }
-
-    public LongFieldExtendedModel(long rawLong) {
-        this.rawLong = rawLong;
-    }
-
-    public Long getLong() {
-        return objectLong;
-    }
-
-    public long getRawLong() {
-        return rawLong;
-    }
-}
diff --git a/example/src/main/java/com/example/models/NestedAnnotatedModel.java b/example/src/main/java/com/example/models/NestedAnnotatedModel.java
deleted file mode 100644
index c7ec80fd..00000000
--- a/example/src/main/java/com/example/models/NestedAnnotatedModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class NestedAnnotatedModel {
-    private RelationshipAnnotatedModel nested;
-    private Long id;
-
-    public NestedAnnotatedModel() {}
-
-    public NestedAnnotatedModel(RelationshipAnnotatedModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipAnnotatedModel getNested() {
-        return nested;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/NestedExtendedModel.java b/example/src/main/java/com/example/models/NestedExtendedModel.java
deleted file mode 100644
index 369107c5..00000000
--- a/example/src/main/java/com/example/models/NestedExtendedModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.example.models;
-
-
-import com.orm.SugarRecord;
-
-public class NestedExtendedModel extends SugarRecord {
-    private RelationshipExtendedModel nested;
-
-    public NestedExtendedModel() {}
-
-    public NestedExtendedModel(RelationshipExtendedModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipExtendedModel getNested() {
-        return nested;
-    }
-}
diff --git a/example/src/main/java/com/example/models/NestedMixedAAModel.java b/example/src/main/java/com/example/models/NestedMixedAAModel.java
deleted file mode 100644
index f5f70753..00000000
--- a/example/src/main/java/com/example/models/NestedMixedAAModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.example.models;
-
-
-import com.orm.SugarRecord;
-
-public class NestedMixedAAModel extends SugarRecord {
-    private RelationshipMixedAModel nested;
-
-    public NestedMixedAAModel() {}
-
-    public NestedMixedAAModel(RelationshipMixedAModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipMixedAModel getNested() {
-        return nested;
-    }
-}
diff --git a/example/src/main/java/com/example/models/NestedMixedABModel.java b/example/src/main/java/com/example/models/NestedMixedABModel.java
deleted file mode 100644
index 045de69f..00000000
--- a/example/src/main/java/com/example/models/NestedMixedABModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.example.models;
-
-
-import com.orm.SugarRecord;
-
-public class NestedMixedABModel extends SugarRecord {
-    private RelationshipMixedBModel nested;
-
-    public NestedMixedABModel() {}
-
-    public NestedMixedABModel(RelationshipMixedBModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipMixedBModel getNested() {
-        return nested;
-    }
-}
diff --git a/example/src/main/java/com/example/models/NestedMixedBAModel.java b/example/src/main/java/com/example/models/NestedMixedBAModel.java
deleted file mode 100644
index 338f748e..00000000
--- a/example/src/main/java/com/example/models/NestedMixedBAModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.models;
-
-
-import com.orm.annotation.Table;
-
-@Table
-public class NestedMixedBAModel {
-    private RelationshipMixedAModel nested;
-    private Long id;
-
-    public NestedMixedBAModel() {}
-
-    public NestedMixedBAModel(RelationshipMixedAModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipMixedAModel getNested() {
-        return nested;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/NestedMixedBBModel.java b/example/src/main/java/com/example/models/NestedMixedBBModel.java
deleted file mode 100644
index 439eb5d9..00000000
--- a/example/src/main/java/com/example/models/NestedMixedBBModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.models;
-
-
-import com.orm.annotation.Table;
-
-@Table
-public class NestedMixedBBModel {
-    private RelationshipMixedBModel nested;
-    private Long id;
-
-    public NestedMixedBBModel() {}
-
-    public NestedMixedBBModel(RelationshipMixedBModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipMixedBModel getNested() {
-        return nested;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/NoSugarModel.java b/example/src/main/java/com/example/models/NoSugarModel.java
deleted file mode 100644
index 0e2d55e8..00000000
--- a/example/src/main/java/com/example/models/NoSugarModel.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.example.models;
-
-
-public class NoSugarModel {
-    public NoSugarModel() {
-    }
-}
\ No newline at end of file
diff --git a/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java b/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
deleted file mode 100644
index 44faeed0..00000000
--- a/example/src/main/java/com/example/models/RelationshipAnnotatedModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class RelationshipAnnotatedModel {
-    private SimpleAnnotatedModel simple;
-    private Long id;
-
-    public RelationshipAnnotatedModel() {}
-
-    public RelationshipAnnotatedModel(SimpleAnnotatedModel simple) {
-        this.simple = simple;
-    }
-
-    public SimpleAnnotatedModel getSimple() {
-        return simple;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/RelationshipExtendedModel.java b/example/src/main/java/com/example/models/RelationshipExtendedModel.java
deleted file mode 100644
index afa2d105..00000000
--- a/example/src/main/java/com/example/models/RelationshipExtendedModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.example.models;
-
-
-import com.orm.SugarRecord;
-
-public class RelationshipExtendedModel extends SugarRecord {
-    private SimpleExtendedModel simple;
-
-    public RelationshipExtendedModel() {}
-
-    public RelationshipExtendedModel(SimpleExtendedModel simple) {
-        this.simple = simple;
-    }
-
-    public SimpleExtendedModel getSimple() {
-        return simple;
-    }
-}
diff --git a/example/src/main/java/com/example/models/RelationshipMixedAModel.java b/example/src/main/java/com/example/models/RelationshipMixedAModel.java
deleted file mode 100644
index f09dd5c0..00000000
--- a/example/src/main/java/com/example/models/RelationshipMixedAModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.example.models;
-
-
-import com.orm.SugarRecord;
-
-public class RelationshipMixedAModel extends SugarRecord {
-    private SimpleAnnotatedModel simple;
-
-    public RelationshipMixedAModel() {}
-
-    public RelationshipMixedAModel(SimpleAnnotatedModel simple) {
-        this.simple = simple;
-    }
-
-    public SimpleAnnotatedModel getSimple() {
-        return simple;
-    }
-}
diff --git a/example/src/main/java/com/example/models/RelationshipMixedBModel.java b/example/src/main/java/com/example/models/RelationshipMixedBModel.java
deleted file mode 100644
index 525ad2e0..00000000
--- a/example/src/main/java/com/example/models/RelationshipMixedBModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.models;
-
-
-import com.orm.annotation.Table;
-
-@Table
-public class RelationshipMixedBModel {
-    private SimpleExtendedModel simple;
-    private Long id;
-
-    public RelationshipMixedBModel() {}
-
-    public RelationshipMixedBModel(SimpleExtendedModel simple) {
-        this.simple = simple;
-    }
-
-    public SimpleExtendedModel getSimple() {
-        return simple;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java b/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
deleted file mode 100644
index 0d732b7f..00000000
--- a/example/src/main/java/com/example/models/ShortFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class ShortFieldAnnotatedModel {
-    private Short objectShort;
-    private short rawShort;
-    private Long id;
-
-    public ShortFieldAnnotatedModel() {}
-
-    public ShortFieldAnnotatedModel(Short objectShort) {
-        this.objectShort = objectShort;
-    }
-
-    public ShortFieldAnnotatedModel(short rawShort) {
-        this.rawShort = rawShort;
-    }
-
-    public Short getShort() {
-        return objectShort;
-    }
-
-    public short getRawShort() {
-        return rawShort;
-    }
-}
diff --git a/example/src/main/java/com/example/models/ShortFieldExtendedModel.java b/example/src/main/java/com/example/models/ShortFieldExtendedModel.java
deleted file mode 100644
index 5373bb23..00000000
--- a/example/src/main/java/com/example/models/ShortFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class ShortFieldExtendedModel extends SugarRecord {
-    private Short objectShort;
-    private short rawShort;
-
-    public ShortFieldExtendedModel() {}
-
-    public ShortFieldExtendedModel(Short objectShort) {
-        this.objectShort = objectShort;
-    }
-
-    public ShortFieldExtendedModel(short rawShort) {
-        this.rawShort = rawShort;
-    }
-
-    public Short getShort() {
-        return objectShort;
-    }
-
-    public short getRawShort() {
-        return rawShort;
-    }
-}
diff --git a/example/src/main/java/com/example/models/SimpleAnnotatedModel.java b/example/src/main/java/com/example/models/SimpleAnnotatedModel.java
deleted file mode 100644
index 7e9e7db4..00000000
--- a/example/src/main/java/com/example/models/SimpleAnnotatedModel.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-
-@Table
-public class SimpleAnnotatedModel {
-    private Long id;
-
-    public SimpleAnnotatedModel() {}
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/example/src/main/java/com/example/models/SimpleExtendedModel.java b/example/src/main/java/com/example/models/SimpleExtendedModel.java
deleted file mode 100644
index 77f75b63..00000000
--- a/example/src/main/java/com/example/models/SimpleExtendedModel.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-
-public class SimpleExtendedModel extends SugarRecord {
-    public SimpleExtendedModel() {}
-}
diff --git a/example/src/main/java/com/example/models/SimpleModel.java b/example/src/main/java/com/example/models/SimpleModel.java
deleted file mode 100644
index dd482ee5..00000000
--- a/example/src/main/java/com/example/models/SimpleModel.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class SimpleModel extends SugarRecord {
-    private String str;
-    private int integer;
-    private boolean bool;
-
-    public String getStr() {
-        return str;
-    }
-
-    public void setStr(String str) {
-        this.str = str;
-    }
-
-    public int getInteger() {
-        return integer;
-    }
-
-    public void setInteger(int integer) {
-        this.integer = integer;
-    }
-
-    public boolean isBool() {
-        return bool;
-    }
-
-    public void setBool(boolean bool) {
-        this.bool = bool;
-    }
-}
diff --git a/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java b/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
deleted file mode 100644
index d4e86aa4..00000000
--- a/example/src/main/java/com/example/models/StringFieldAnnotatedModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class StringFieldAnnotatedModel {
-    private String string;
-    private Long id;
-
-    public StringFieldAnnotatedModel() {}
-
-    public StringFieldAnnotatedModel(String string) {
-        this.string = string;
-    }
-
-    public String getString() {
-        return string;
-    }
-
-    public void setString(String string) {
-        this.string = string;
-    }
-}
diff --git a/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java b/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
deleted file mode 100644
index 54737775..00000000
--- a/example/src/main/java/com/example/models/StringFieldAnnotatedNoIdModel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.example.models;
-
-import com.orm.annotation.Table;
-
-@Table
-public class StringFieldAnnotatedNoIdModel {
-    private String string;
-
-    public StringFieldAnnotatedNoIdModel() {}
-
-    public StringFieldAnnotatedNoIdModel(String string) {
-        this.string = string;
-    }
-
-    public String getString() {
-        return string;
-    }
-
-    public void setString(String string) {
-        this.string = string;
-    }
-}
diff --git a/example/src/main/java/com/example/models/StringFieldExtendedModel.java b/example/src/main/java/com/example/models/StringFieldExtendedModel.java
deleted file mode 100644
index 33bab4e9..00000000
--- a/example/src/main/java/com/example/models/StringFieldExtendedModel.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.models;
-
-import com.orm.SugarRecord;
-
-public class StringFieldExtendedModel extends SugarRecord {
-    private String string;
-
-    public StringFieldExtendedModel() {}
-
-    public StringFieldExtendedModel(String string) {
-        this.string = string;
-    }
-
-    public String getString() {
-        return string;
-    }
-
-    public void setString(String string) {
-        this.string = string;
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java b/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java
deleted file mode 100644
index 9e4b36bb..00000000
--- a/example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.BigDecimalFieldAnnotatedModel;
-import com.example.models.BigDecimalFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.math.BigDecimal;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class BigDecimalFieldTests {
-    @Test
-    public void nullBigDecimalExtendedTest() {
-        save(new BigDecimalFieldExtendedModel());
-        BigDecimalFieldExtendedModel model =
-                SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
-        assertNull(model.getBigDecimal());
-    }
-
-    @Test
-    public void nullBigDecimalAnnotatedTest() {
-        save(new BigDecimalFieldAnnotatedModel());
-        BigDecimalFieldAnnotatedModel model =
-                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
-        assertNull(model.getBigDecimal());
-    }
-
-    @Test
-    public void bigDecimalExtendedTest() {
-        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
-        save(new BigDecimalFieldExtendedModel(decimal));
-        BigDecimalFieldExtendedModel model = SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
-        assertEquals(decimal, model.getBigDecimal());
-    }
-
-    @Test
-    public void bigDecimalAnnotatedTest() {
-        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
-        save(new BigDecimalFieldAnnotatedModel(decimal));
-        BigDecimalFieldAnnotatedModel model =
-                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
-        assertEquals(decimal, model.getBigDecimal());
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/BooleanFieldTests.java b/example/src/test/java/com/example/sugartest/BooleanFieldTests.java
deleted file mode 100644
index a117af6c..00000000
--- a/example/src/test/java/com/example/sugartest/BooleanFieldTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.BooleanFieldAnnotatedModel;
-import com.example.models.BooleanFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class BooleanFieldTests {
-    @Test
-    public void nullBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel());
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
-        assertNull(model.getBoolean());
-    }
-
-    @Test
-    public void nullRawBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel());
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
-        assertEquals(false, model.getRawBoolean());
-    }
-
-    @Test
-    public void nullBooleanAnnotatedTest() {
-        save(new BooleanFieldAnnotatedModel());
-        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
-        assertNull(model.getBoolean());
-    }
-
-    @Test
-    public void nullRawBooleanAnnotatedTest() {
-        save(new BooleanFieldAnnotatedModel());
-        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
-        assertEquals(false, model.getRawBoolean());
-    }
-
-    @Test
-    public void objectBooleanExtendedTest() {
-        Boolean objectBoolean = new Boolean(true);
-        save(new BooleanFieldExtendedModel(objectBoolean));
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
-        assertEquals(objectBoolean, model.getBoolean());
-    }
-
-    @Test
-    public void rawBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel(true));
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
-        assertEquals(true, model.getRawBoolean());
-    }
-
-    @Test
-    public void objectBooleanAnnotatedTest() {
-        Boolean objectBoolean = new Boolean(true);
-        save(new BooleanFieldAnnotatedModel(objectBoolean));
-        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
-        assertEquals(objectBoolean, model.getBoolean());
-    }
-
-    @Test
-    public void rawBooleanAnnotatedTest() {
-        save(new BooleanFieldAnnotatedModel(true));
-        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
-        assertEquals(true, model.getRawBoolean());
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java b/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java
deleted file mode 100644
index 6f830960..00000000
--- a/example/src/test/java/com/example/sugartest/ByteArrayFieldTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.ByteArrayAnnotatedModel;
-import com.example.models.ByteArrayExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class ByteArrayFieldTests {
-    @Test
-    public void nullByteArrayExtendedTest() {
-        byte[] array = "".getBytes();
-        save(new ByteArrayExtendedModel());
-        ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
-        assertEquals(new String(array), new String(model.getByteArray()));
-        assertArrayEquals(array, model.getByteArray());
-    }
-
-    @Test
-    public void nullByteArrayAnnotatedTest() {
-        byte[] array = "".getBytes();
-        save(new ByteArrayAnnotatedModel());
-        ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
-        assertEquals(new String(array), new String(model.getByteArray()));
-        assertArrayEquals(array, model.getByteArray());
-    }
-
-    @Test
-    public void byteArrayExtendedTest() {
-        byte[] array = "hello".getBytes();
-        save(new ByteArrayExtendedModel(array));
-        ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
-        assertEquals(new String(array), new String(model.getByteArray()));
-        assertArrayEquals(array, model.getByteArray());
-    }
-
-    @Test
-    public void byteArrayAnnotatedTest() {
-        byte[] array = "hello".getBytes();
-        save(new ByteArrayAnnotatedModel(array));
-        ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
-        assertEquals(new String(array), new String(model.getByteArray()));
-        assertArrayEquals(array, model.getByteArray());
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/CursorTests.java b/example/src/test/java/com/example/sugartest/CursorTests.java
deleted file mode 100644
index 78c3d71b..00000000
--- a/example/src/test/java/com/example/sugartest/CursorTests.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.example.sugartest;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Build;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.TextView;
-
-import com.example.models.SimpleModel;
-import com.orm.query.Select;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertSame;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class CursorTests {
-    @Test
-    public void testColumnNames() {
-        save(new SimpleModel());
-        Cursor c = Select.from(SimpleModel.class).getCursor();
-        for (String col : new String[]{"STR", "INTEGER", "BOOL", "ID"}) {
-            assertNotSame("Missing column for field: " + col, -1, c.getColumnIndex(col));
-        }
-    }
-    @Test
-    public void testSugarCursor(){
-        save(new SimpleModel());
-        Cursor cursor = Select.from(SimpleModel.class).getCursor();
-        assertNotSame("No _id", -1, cursor.getColumnIndex("_id"));
-        assertSame("_id != ID", cursor.getColumnIndex("_id"), cursor.getColumnIndex("ID"));
-    }
-
-    @Test
-    public void testNoColumn(){
-        save(new SimpleModel());
-        Cursor cursor = Select.from(SimpleModel.class).getCursor();
-        assertSame(-1, cursor.getColumnIndex("nonexistent"));
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    @Test
-    public void testMakeAdapter() {
-        save(new SimpleModel());
-        Cursor c = Select.from(SimpleModel.class).getCursor();
-        CursorAdapter adapter = new CursorAdapter(RuntimeEnvironment.application, c, true) {
-            @Override
-            public View newView(Context context, Cursor cursor, ViewGroup parent) {
-                TextView tv = new TextView(context);
-                String s = cursor.getString(cursor.getColumnIndex("STR"));
-                tv.setText(s);
-                return null;
-            }
-
-            @Override
-            public void bindView(View view, Context context, Cursor cursor) {
-                String s = cursor.getString(cursor.getColumnIndex("STR"));
-                ((TextView) view).setText(s);
-            }
-        };
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/DoubleFieldTests.java b/example/src/test/java/com/example/sugartest/DoubleFieldTests.java
deleted file mode 100644
index 89dbd00a..00000000
--- a/example/src/test/java/com/example/sugartest/DoubleFieldTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.DoubleFieldAnnotatedModel;
-import com.example.models.DoubleFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class DoubleFieldTests {
-    @Test
-    public void nullDoubleExtendedTest() {
-        save(new DoubleFieldExtendedModel());
-        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
-        assertNull(model.getDouble());
-    }
-
-    @Test
-    public void nullRawDoubleExtendedTest() {
-        save(new DoubleFieldExtendedModel());
-        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
-        assertEquals(0.0, model.getRawDouble(), 0.0000000001);
-    }
-
-    @Test
-    public void nullDoubleAnnotatedTest() {
-        save(new DoubleFieldAnnotatedModel());
-        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
-        assertNull(model.getDouble());
-    }
-
-    @Test
-    public void nullRawDoubleAnnotatedTest() {
-        save(new DoubleFieldAnnotatedModel());
-        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
-        assertEquals(0.0, model.getRawDouble(), 0.0000000001);
-    }
-
-    @Test
-    public void objectDoubleExtendedTest() {
-        Double objectDouble = new Double(25.0);
-        save(new DoubleFieldExtendedModel(objectDouble));
-        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
-        assertEquals(objectDouble, model.getDouble());
-    }
-
-    @Test
-    public void rawDoubleExtendedTest() {
-        save(new DoubleFieldExtendedModel(25.0));
-        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
-        assertEquals(25.0, model.getRawDouble(), 0.0000000001);
-    }
-
-    @Test
-    public void objectDoubleAnnotatedTest() {
-        Double objectDouble = new Double(25.0);
-        save(new DoubleFieldAnnotatedModel(objectDouble));
-        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
-        assertEquals(objectDouble, model.getDouble());
-    }
-
-    @Test
-    public void rawDoubleAnnotatedTest() {
-        save(new DoubleFieldAnnotatedModel(25.0));
-        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
-        assertEquals(25.0, model.getRawDouble(), 0.0000000001);
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/EnumFieldTests.java b/example/src/test/java/com/example/sugartest/EnumFieldTests.java
deleted file mode 100644
index 4eeaed71..00000000
--- a/example/src/test/java/com/example/sugartest/EnumFieldTests.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.EnumFieldAnnotatedModel;
-import com.example.models.EnumFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18)
-public class EnumFieldTests {
-    @Test
-    public void nullDefaultEnumExtendedTest() {
-        save(new EnumFieldExtendedModel());
-        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
-        assertNull(model.getDefaultEnum());
-    }
-
-    @Test
-    public void nullOverriddenEnumExtendedTest() {
-        save(new EnumFieldExtendedModel());
-        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
-        assertNull(model.getOverrideEnum());
-    }
-    @Test
-    public void nullDefaultEnumAnnotatedTest() {
-        save(new EnumFieldAnnotatedModel());
-        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
-        assertNull(model.getDefaultEnum());
-    }
-
-    @Test
-    public void nullOverriddenEnumAnnotatedTest() {
-        save(new EnumFieldAnnotatedModel());
-        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
-        assertNull(model.getOverrideEnum());
-    }
-
-    @Test
-    public void defaultEnumExtendedTest() {
-        save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
-                EnumFieldExtendedModel.DefaultEnum.TWO));
-        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
-        assertNotNull(model);
-        assertEquals(model.getDefaultEnum(), EnumFieldExtendedModel.DefaultEnum.TWO);
-    }
-
-    @Test
-    public void overriddenEnumExtendedTest() {
-        save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
-                EnumFieldExtendedModel.DefaultEnum.TWO));
-        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
-        assertNotNull(model);
-        assertEquals(model.getOverrideEnum(), EnumFieldExtendedModel.OverrideEnum.ONE);
-    }
-
-    @Test
-    public void defaultEnumAnnotatedTest() {
-        save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
-                EnumFieldAnnotatedModel.DefaultEnum.TWO));
-        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
-        assertNotNull(model);
-        assertEquals(model.getDefaultEnum(), EnumFieldAnnotatedModel.DefaultEnum.TWO);
-    }
-
-    @Test
-    public void overriddenEnumAnnotatedTest() {
-        save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
-                EnumFieldAnnotatedModel.DefaultEnum.TWO));
-        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
-        assertNotNull(model);
-        assertEquals(model.getOverrideEnum(), EnumFieldAnnotatedModel.OverrideEnum.ONE);
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/FirstAndLastTests.java b/example/src/test/java/com/example/sugartest/FirstAndLastTests.java
deleted file mode 100644
index d095578f..00000000
--- a/example/src/test/java/com/example/sugartest/FirstAndLastTests.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.FloatFieldAnnotatedModel;
-import com.example.models.FloatFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class FirstAndLastTests {
-    @Test
-    public void firstExtendedTest() {
-        Float firstObjectFloat = new Float(25F);
-        Float lastObjectFloat = new Float(50F);
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
-        assertEquals(firstObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void firstDeletedRecordExtendedTest() {
-        Float firstObjectFloat = new Float(15F);
-        Float secondObjectFloat = new Float(25F);
-        Float thirdObjectFloat = new Float(35F);
-        Float fourthObjectFloat = new Float(45F);
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(secondObjectFloat));
-        save(new FloatFieldExtendedModel(thirdObjectFloat));
-        save(new FloatFieldExtendedModel(fourthObjectFloat));
-        FloatFieldExtendedModel firstRecord = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
-        firstRecord.delete();
-        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
-        assertEquals(secondObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void lastExtendedTest() {
-        Float firstObjectFloat = new Float(25F);
-        Float lastObjectFloat = new Float(50F);
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
-        assertEquals(lastObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void lastDeletedRecordExtendedTest() {
-        Float firstObjectFloat = new Float(15F);
-        Float secondObjectFloat = new Float(25F);
-        Float thirdObjectFloat = new Float(35F);
-        Float fourthObjectFloat = new Float(45F);
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(secondObjectFloat));
-        save(new FloatFieldExtendedModel(thirdObjectFloat));
-        save(new FloatFieldExtendedModel(fourthObjectFloat));
-        FloatFieldExtendedModel lastRecord = SugarRecord.findById(FloatFieldExtendedModel.class, 4);
-        lastRecord.delete();
-        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
-        assertEquals(thirdObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void nullFirstExtendedTest() {
-        assertNull(SugarRecord.first(FloatFieldExtendedModel.class));
-    }
-
-    @Test
-    public void nullLastExtendedTest() {
-        assertNull(SugarRecord.last(FloatFieldExtendedModel.class));
-    }
-
-    @Test
-    public void oneItemExtendedTest() {
-        save(new FloatFieldExtendedModel(new Float(25F)));
-        FloatFieldExtendedModel firstModel = SugarRecord.first(FloatFieldExtendedModel.class);
-        FloatFieldExtendedModel lastModel = SugarRecord.last(FloatFieldExtendedModel.class);
-        assertEquals(firstModel.getFloat(), lastModel.getFloat());
-    }
-
-    @Test
-    public void firstAnnotatedTest() {
-        Float firstObjectFloat = new Float(25F);
-        Float lastObjectFloat = new Float(50F);
-        save(new FloatFieldAnnotatedModel(firstObjectFloat));
-        save(new FloatFieldAnnotatedModel(lastObjectFloat));
-        FloatFieldAnnotatedModel model = SugarRecord.first(FloatFieldAnnotatedModel.class);
-        assertEquals(firstObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void firstDeletedRecordAnnotatedTest() {
-        Float firstObjectFloat = new Float(15F);
-        Float secondObjectFloat = new Float(25F);
-        Float thirdObjectFloat = new Float(35F);
-        Float fourthObjectFloat = new Float(45F);
-        save(new FloatFieldAnnotatedModel(firstObjectFloat));
-        save(new FloatFieldAnnotatedModel(secondObjectFloat));
-        save(new FloatFieldAnnotatedModel(thirdObjectFloat));
-        save(new FloatFieldAnnotatedModel(fourthObjectFloat));
-        FloatFieldAnnotatedModel firstRecord = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
-        SugarRecord.delete(firstRecord);
-        FloatFieldAnnotatedModel model = SugarRecord.first(FloatFieldAnnotatedModel.class);
-        assertEquals(secondObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void lastAnnotatedTest() {
-        Float firstObjectFloat = new Float(25F);
-        Float lastObjectFloat = new Float(50F);
-        save(new FloatFieldAnnotatedModel(firstObjectFloat));
-        save(new FloatFieldAnnotatedModel(lastObjectFloat));
-        FloatFieldAnnotatedModel model = SugarRecord.last(FloatFieldAnnotatedModel.class);
-        assertEquals(lastObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void lastDeletedRecordAnnotatedTest() {
-        Float firstObjectFloat = new Float(15F);
-        Float secondObjectFloat = new Float(25F);
-        Float thirdObjectFloat = new Float(35F);
-        Float fourthObjectFloat = new Float(45F);
-        save(new FloatFieldAnnotatedModel(firstObjectFloat));
-        save(new FloatFieldAnnotatedModel(secondObjectFloat));
-        save(new FloatFieldAnnotatedModel(thirdObjectFloat));
-        save(new FloatFieldAnnotatedModel(fourthObjectFloat));
-        FloatFieldAnnotatedModel lastRecord = SugarRecord.findById(FloatFieldAnnotatedModel.class, 4);
-        SugarRecord.delete(lastRecord);
-        FloatFieldAnnotatedModel model = SugarRecord.last(FloatFieldAnnotatedModel.class);
-        assertEquals(thirdObjectFloat, model.getFloat());
-    }
-
-    @Test
-    public void nullFirstAnnotatedTest() {
-        assertNull(SugarRecord.first(FloatFieldAnnotatedModel.class));
-    }
-
-    @Test
-    public void nullLastAnnotatedTest() {
-        assertNull(SugarRecord.last(FloatFieldAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneItemAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel(new Float(25F)));
-        FloatFieldAnnotatedModel firstModel = SugarRecord.first(FloatFieldAnnotatedModel.class);
-        FloatFieldAnnotatedModel lastModel = SugarRecord.last(FloatFieldAnnotatedModel.class);
-        assertEquals(firstModel.getFloat(), lastModel.getFloat());
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/FloatFieldTests.java b/example/src/test/java/com/example/sugartest/FloatFieldTests.java
deleted file mode 100644
index 16f52bbc..00000000
--- a/example/src/test/java/com/example/sugartest/FloatFieldTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.FloatFieldAnnotatedModel;
-import com.example.models.FloatFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class FloatFieldTests {
-    @Test
-    public void nullFloatExtendedTest() {
-        save(new FloatFieldExtendedModel());
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
-        assertNull(model.getFloat());
-    }
-
-    @Test
-    public void nullRawFloatExtendedTest() {
-        save(new FloatFieldExtendedModel());
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
-        assertEquals(0F, model.getRawFloat(), 0.0000000001F);
-    }
-
-    @Test
-    public void nullFloatAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel());
-        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
-        assertNull(model.getFloat());
-    }
-
-    @Test
-    public void nullRawFloatAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel());
-        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
-        assertEquals(0F, model.getRawFloat(), 0.0000000001F);
-    }
-
-    @Test
-    public void objectFloatExtendedTest() {
-        Float objectFloat = new Float(25F);
-        save(new FloatFieldExtendedModel(objectFloat));
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
-        assertEquals(objectFloat, model.getFloat());
-    }
-
-    @Test
-    public void rawFloatExtendedTest() {
-        save(new FloatFieldExtendedModel(25F));
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
-        assertEquals(25F, model.getRawFloat(), 0.0000000001F);
-    }
-
-    @Test
-    public void objectFloatAnnotatedTest() {
-        Float objectFloat = new Float(25F);
-        save(new FloatFieldAnnotatedModel(objectFloat));
-        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
-        assertEquals(objectFloat, model.getFloat());
-    }
-
-    @Test
-    public void rawFloatAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel(25F));
-        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
-        assertEquals(25F, model.getRawFloat(), 0.0000000001F);
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
deleted file mode 100644
index 25f544ae..00000000
--- a/example/src/test/java/com/example/sugartest/IncompleteAnnotatedModelTests.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.sugartest;
-
-
-import android.database.sqlite.SQLiteException;
-
-import com.example.models.IncompleteAnnotatedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.delete;
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertFalse;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class IncompleteAnnotatedModelTests {
-    @Test(expected=SQLiteException.class)
-    public void saveNoIdFieldTest() {
-        save(new IncompleteAnnotatedModel());
-    }
-
-    @Test
-    public void deleteNoIdFieldTest() {
-        assertFalse(delete(new IncompleteAnnotatedModel()));
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/IntegerFieldTests.java b/example/src/test/java/com/example/sugartest/IntegerFieldTests.java
deleted file mode 100644
index 25dbd0bd..00000000
--- a/example/src/test/java/com/example/sugartest/IntegerFieldTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.IntegerFieldAnnotatedModel;
-import com.example.models.IntegerFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class IntegerFieldTests {
-    @Test
-    public void nullIntegerExtendedTest() {
-        save(new IntegerFieldExtendedModel());
-        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
-        assertNull(model.getInteger());
-    }
-
-    @Test
-    public void nullIntExtendedTest() {
-        save(new IntegerFieldExtendedModel());
-        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
-        assertEquals(0, model.getInt());
-    }
-
-    @Test
-    public void nullIntegerAnnotatedTest() {
-        save(new IntegerFieldAnnotatedModel());
-        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
-        assertNull(model.getInteger());
-    }
-
-    @Test
-    public void nullIntAnnotatedTest() {
-        save(new IntegerFieldAnnotatedModel());
-        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
-        assertEquals(0, model.getInt());
-    }
-
-    @Test
-    public void integerExtendedTest() {
-        Integer integer = new Integer(25);
-        save(new IntegerFieldExtendedModel(integer));
-        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
-        assertEquals(integer, model.getInteger());
-    }
-
-    @Test
-    public void intExtendedTest() {
-        save(new IntegerFieldExtendedModel(25));
-        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
-        assertEquals(25, model.getInt());
-    }
-
-    @Test
-    public void integerAnnotatedTest() {
-        Integer integer = new Integer(25);
-        save(new IntegerFieldAnnotatedModel(integer));
-        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
-        assertEquals(integer, model.getInteger());
-    }
-
-    @Test
-    public void intAnnotatedTest() {
-        save(new IntegerFieldAnnotatedModel(25));
-        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
-        assertEquals(25, model.getInt());
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java b/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java
deleted file mode 100644
index 014c989d..00000000
--- a/example/src/test/java/com/example/sugartest/ListAllOrderByTests.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.IntegerFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class ListAllOrderByTests {
-    @Test
-    public void listAllOrderByEmptyTest() {
-        assertEquals(0L, SugarRecord.listAll(IntegerFieldExtendedModel.class, "id").size());
-    }
-
-    @Test
-    public void listAllOrderByIdTest() {
-        for(int i = 1; i <= 100; i++) {
-            save(new IntegerFieldExtendedModel(i));
-        }
-        List<IntegerFieldExtendedModel> models =
-                SugarRecord.listAll(IntegerFieldExtendedModel.class, "id");
-        assertEquals(100L, models.size());
-        Long id = models.get(0).getId();
-        for(int i = 1; i < 100; i++) {
-            assertTrue(id <models.get(i).getId());
-        }
-    }
-
-    @Test
-    public void listAllOrderByFieldTest() {
-        for(int i = 1; i <= 100; i++) {
-            save(new IntegerFieldExtendedModel(i));
-        }
-        List<IntegerFieldExtendedModel> models =
-                SugarRecord.listAll(IntegerFieldExtendedModel.class, "raw_integer");
-        assertEquals(100L, models.size());
-        int raw = models.get(0).getInt();
-        for(int i = 1; i < 100; i++) {
-            assertTrue(raw < models.get(i).getInt());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/LongFieldTests.java b/example/src/test/java/com/example/sugartest/LongFieldTests.java
deleted file mode 100644
index b99e7537..00000000
--- a/example/src/test/java/com/example/sugartest/LongFieldTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.LongFieldAnnotatedModel;
-import com.example.models.LongFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class LongFieldTests {
-    @Test
-    public void nullLongExtendedTest() {
-        save(new LongFieldExtendedModel());
-        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
-        assertNull(model.getLong());
-    }
-
-    @Test
-    public void nullRawLongExtendedTest() {
-        save(new LongFieldExtendedModel());
-        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
-        assertEquals(0L, model.getRawLong());
-    }
-
-    @Test
-    public void nullLongAnnotatedTest() {
-        save(new LongFieldAnnotatedModel());
-        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
-        assertNull(model.getLong());
-    }
-
-    @Test
-    public void nullRawLongAnnotatedTest() {
-        save(new LongFieldAnnotatedModel());
-        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
-        assertEquals(0L, model.getRawLong());
-    }
-
-    @Test
-    public void objectLongExtendedTest() {
-        Long objectLong = new Long(25L);
-        save(new LongFieldExtendedModel(objectLong));
-        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
-        assertEquals(objectLong, model.getLong());
-    }
-
-    @Test
-    public void rawLongExtendedTest() {
-        save(new LongFieldExtendedModel(25L));
-        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
-        assertEquals(25L, model.getRawLong());
-    }
-
-    @Test
-    public void objectLongAnnotatedTest() {
-        Long objectLong = new Long(25L);
-        save(new LongFieldAnnotatedModel(objectLong));
-        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
-        assertEquals(objectLong, model.getLong());
-    }
-
-    @Test
-    public void rawLongAnnotatedTest() {
-        save(new LongFieldAnnotatedModel(25L));
-        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
-        assertEquals(25L, model.getRawLong());
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/MultipleSaveTests.java b/example/src/test/java/com/example/sugartest/MultipleSaveTests.java
deleted file mode 100644
index 58c669c5..00000000
--- a/example/src/test/java/com/example/sugartest/MultipleSaveTests.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.StringFieldAnnotatedModel;
-import com.example.models.StringFieldAnnotatedNoIdModel;
-import com.example.models.StringFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class MultipleSaveTests {
-    @Test
-    public void stringMultipleSaveOriginalExtendedTest() {
-        String string = "Test String";
-        StringFieldExtendedModel model = new StringFieldExtendedModel(string);
-        long id = save(model);
-        StringFieldExtendedModel query = SugarRecord.findById(StringFieldExtendedModel.class, id);
-        assertEquals(string, query.getString());
-        model.setString("Another test");
-        assertEquals(id, save(model));
-        assertNull(SugarRecord.findById(StringFieldExtendedModel.class, 2));
-    }
-
-    @Test
-    public void stringMultipleSaveQueriedExtendedTest() {
-        String string = "Test String";
-        StringFieldExtendedModel model = new StringFieldExtendedModel(string);
-        long id = save(model);
-        StringFieldExtendedModel query = SugarRecord.findById(StringFieldExtendedModel.class, id);
-        assertEquals(string, query.getString());
-        query.setString("Another test");
-        assertEquals(id, save(query));
-        assertNull(SugarRecord.findById(StringFieldExtendedModel.class, 2));
-    }
-
-    @Test
-    public void stringMultipleSaveOriginalAnnotatedTest() {
-        String string = "Test String";
-        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
-        long id = save(model);
-        StringFieldAnnotatedModel query = SugarRecord.findById(StringFieldAnnotatedModel.class, id);
-        assertEquals(string, query.getString());
-        model.setString("Another test");
-        assertEquals(id, save(model));
-        assertNull(SugarRecord.findById(StringFieldAnnotatedModel.class, 2));
-    }
-
-    @Test
-    public void stringMultipleSaveQueriedAnnotatedTest() {
-        String string = "Test String";
-        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
-        long id = save(model);
-        StringFieldAnnotatedModel query = SugarRecord.findById(StringFieldAnnotatedModel.class, id);
-        assertEquals(string, query.getString());
-        query.setString("Another test");
-        assertEquals(id, save(query));
-        assertNull(SugarRecord.findById(StringFieldAnnotatedModel.class, 2));
-    }
-
-    @Test
-    public void stringMultipleSaveOriginalAnnotatedNoIdTest() {
-        String string = "Test String";
-        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
-        long id = save(model);
-        StringFieldAnnotatedNoIdModel query =
-                SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, id);
-        assertEquals(string, query.getString());
-        model.setString("Another test");
-        assertEquals(id, save(model));
-        assertNull(SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, 2));
-    }
-
-    @Test
-    public void stringMultipleSaveQueriedAnnotatedNoIdTest() {
-        String string = "Test String";
-        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
-        long id = save(model);
-        StringFieldAnnotatedNoIdModel query =
-                SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, id);
-        assertEquals(string, query.getString());
-        query.setString("Another test");
-        assertEquals(id, save(query));
-        assertNull(SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, 2));
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java b/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
deleted file mode 100644
index bf3f0e46..00000000
--- a/example/src/test/java/com/example/sugartest/NestedAnnotatedTests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.NestedAnnotatedModel;
-import com.example.models.RelationshipAnnotatedModel;
-import com.example.models.SimpleAnnotatedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class NestedAnnotatedTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedAnnotatedModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        save(new NestedAnnotatedModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        save(new NestedAnnotatedModel(nested));
-        save(new NestedAnnotatedModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        RelationshipAnnotatedModel another_nested = new RelationshipAnnotatedModel(another_simple);
-        save(another_nested);
-        save(new NestedAnnotatedModel(nested));
-        save(new NestedAnnotatedModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedAnnotatedModel(nested));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-            save(nested);
-            save(new NestedAnnotatedModel(nested));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedAnnotatedModel(nested));
-        }
-        List<NestedAnnotatedModel> models = SugarRecord.listAll(NestedAnnotatedModel.class);
-        assertEquals(100, models.size());
-        for (NestedAnnotatedModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-            save(nested);
-            save(new NestedAnnotatedModel(nested));
-        }
-        List<NestedAnnotatedModel> models = SugarRecord.listAll(NestedAnnotatedModel.class);
-        assertEquals(100, models.size());
-        for (NestedAnnotatedModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/NestedExtendedTests.java b/example/src/test/java/com/example/sugartest/NestedExtendedTests.java
deleted file mode 100644
index f403784b..00000000
--- a/example/src/test/java/com/example/sugartest/NestedExtendedTests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.NestedExtendedModel;
-import com.example.models.RelationshipExtendedModel;
-import com.example.models.SimpleExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class NestedExtendedTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedExtendedModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        save(new NestedExtendedModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        save(new NestedExtendedModel(nested));
-        save(new NestedExtendedModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        RelationshipExtendedModel another_nested = new RelationshipExtendedModel(another_simple);
-        save(another_nested);
-        save(new NestedExtendedModel(nested));
-        save(new NestedExtendedModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedExtendedModel(nested));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-            save(nested);
-            save(new NestedExtendedModel(nested));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedExtendedModel(nested));
-        }
-        List<NestedExtendedModel> models = SugarRecord.listAll(NestedExtendedModel.class);
-        assertEquals(100, models.size());
-        for (NestedExtendedModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-            save(nested);
-            save(new NestedExtendedModel(nested));
-        }
-        List<NestedExtendedModel> models = SugarRecord.listAll(NestedExtendedModel.class);
-        assertEquals(100, models.size());
-        for (NestedExtendedModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedAATests.java b/example/src/test/java/com/example/sugartest/NestedMixedAATests.java
deleted file mode 100644
index daf19272..00000000
--- a/example/src/test/java/com/example/sugartest/NestedMixedAATests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.NestedMixedAAModel;
-import com.example.models.RelationshipMixedAModel;
-import com.example.models.SimpleAnnotatedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class NestedMixedAATests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedMixedAAModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        save(new NestedMixedAAModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(1L, SugarRecord.count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        save(new NestedMixedAAModel(nested));
-        save(new NestedMixedAAModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        RelationshipMixedAModel another_nested = new RelationshipMixedAModel(another_simple);
-        save(another_nested);
-        save(new NestedMixedAAModel(nested));
-        save(new NestedMixedAAModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedAAModel(nested));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-            save(nested);
-            save(new NestedMixedAAModel(nested));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedAAModel(nested));
-        }
-        List<NestedMixedAAModel> models = SugarRecord.listAll(NestedMixedAAModel.class);
-        assertEquals(100, models.size());
-        for (NestedMixedAAModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-            save(nested);
-            save(new NestedMixedAAModel(nested));
-        }
-        List<NestedMixedAAModel> models = SugarRecord.listAll(NestedMixedAAModel.class);
-        assertEquals(100, models.size());
-        for (NestedMixedAAModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedABTests.java b/example/src/test/java/com/example/sugartest/NestedMixedABTests.java
deleted file mode 100644
index 5b9a70dc..00000000
--- a/example/src/test/java/com/example/sugartest/NestedMixedABTests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.NestedMixedABModel;
-import com.example.models.RelationshipMixedBModel;
-import com.example.models.SimpleExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class NestedMixedABTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedMixedABModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        save(new NestedMixedABModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(1L, SugarRecord.count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        save(new NestedMixedABModel(nested));
-        save(new NestedMixedABModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        RelationshipMixedBModel another_nested = new RelationshipMixedBModel(another_simple);
-        save(another_nested);
-        save(new NestedMixedABModel(nested));
-        save(new NestedMixedABModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedABModel(nested));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-            save(nested);
-            save(new NestedMixedABModel(nested));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedABModel(nested));
-        }
-        List<NestedMixedABModel> models = SugarRecord.listAll(NestedMixedABModel.class);
-        assertEquals(100, models.size());
-        for (NestedMixedABModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-            save(nested);
-            save(new NestedMixedABModel(nested));
-        }
-        List<NestedMixedABModel> models = SugarRecord.listAll(NestedMixedABModel.class);
-        assertEquals(100, models.size());
-        for (NestedMixedABModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedBATests.java b/example/src/test/java/com/example/sugartest/NestedMixedBATests.java
deleted file mode 100644
index 7d6e4886..00000000
--- a/example/src/test/java/com/example/sugartest/NestedMixedBATests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.NestedMixedBAModel;
-import com.example.models.RelationshipMixedAModel;
-import com.example.models.SimpleAnnotatedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class NestedMixedBATests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedMixedBAModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        save(new NestedMixedBAModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(1L, SugarRecord.count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        save(new NestedMixedBAModel(nested));
-        save(new NestedMixedBAModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        RelationshipMixedAModel another_nested = new RelationshipMixedAModel(another_simple);
-        save(another_nested);
-        save(new NestedMixedBAModel(nested));
-        save(new NestedMixedBAModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedBAModel(nested));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-            save(nested);
-            save(new NestedMixedBAModel(nested));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedBAModel(nested));
-        }
-        List<NestedMixedBAModel> models = SugarRecord.listAll(NestedMixedBAModel.class);
-        assertEquals(100, models.size());
-        for (NestedMixedBAModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-            save(nested);
-            save(new NestedMixedBAModel(nested));
-        }
-        List<NestedMixedBAModel> models = SugarRecord.listAll(NestedMixedBAModel.class);
-        assertEquals(100, models.size());
-        for (NestedMixedBAModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java b/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java
deleted file mode 100644
index c9e32182..00000000
--- a/example/src/test/java/com/example/sugartest/NestedMixedBBTests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.NestedMixedBBModel;
-import com.example.models.RelationshipMixedBModel;
-import com.example.models.SimpleExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class NestedMixedBBTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedMixedBBModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        save(new NestedMixedBBModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(1L, SugarRecord.count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        save(new NestedMixedBBModel(nested));
-        save(new NestedMixedBBModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        RelationshipMixedBModel another_nested = new RelationshipMixedBModel(another_simple);
-        save(another_nested);
-        save(new NestedMixedBBModel(nested));
-        save(new NestedMixedBBModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedBBModel(nested));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-            save(nested);
-            save(new NestedMixedBBModel(nested));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedBBModel(nested));
-        }
-        List<NestedMixedBBModel> models = SugarRecord.listAll(NestedMixedBBModel.class);
-        assertEquals(100, models.size());
-        for (NestedMixedBBModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-            save(nested);
-            save(new NestedMixedBBModel(nested));
-        }
-        List<NestedMixedBBModel> models = SugarRecord.listAll(NestedMixedBBModel.class);
-        assertEquals(100, models.size());
-        for (NestedMixedBBModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/NoSugarModelTests.java b/example/src/test/java/com/example/sugartest/NoSugarModelTests.java
deleted file mode 100644
index dbab8103..00000000
--- a/example/src/test/java/com/example/sugartest/NoSugarModelTests.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.NoSugarModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class NoSugarModelTests {
-    @Test
-    public void deleteTest() throws Exception {
-        NoSugarModel model = new NoSugarModel();
-        assertFalse(SugarRecord.delete(model));
-    }
-
-    @Test
-    public void saveInTransactionTest() throws Exception {
-        SugarRecord.saveInTx(new NoSugarModel(), new NoSugarModel());
-        assertEquals(-1L, SugarRecord.count(NoSugarModel.class));
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java b/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java
deleted file mode 100644
index 503926e1..00000000
--- a/example/src/test/java/com/example/sugartest/RelationshipAnnotatedTests.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.RelationshipAnnotatedModel;
-import com.example.models.SimpleAnnotatedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class RelationshipAnnotatedTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        save(new RelationshipAnnotatedModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        save(new RelationshipAnnotatedModel(simple));
-        save(new RelationshipAnnotatedModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
-        save(new RelationshipAnnotatedModel(simple));
-        save(new RelationshipAnnotatedModel(another_simple));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipAnnotatedModel(simple));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            save(new RelationshipAnnotatedModel(simple));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipAnnotatedModel(simple));
-        }
-        List<RelationshipAnnotatedModel> models =
-                SugarRecord.listAll(RelationshipAnnotatedModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipAnnotatedModel model : models) {
-            assertEquals(simple.getId(), model.getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            save(new RelationshipAnnotatedModel(simple));
-        }
-        List<RelationshipAnnotatedModel> models =
-                SugarRecord.listAll(RelationshipAnnotatedModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipAnnotatedModel model : models) {
-            assertEquals(model.getId(), model.getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java b/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java
deleted file mode 100644
index 3c3e04c7..00000000
--- a/example/src/test/java/com/example/sugartest/RelationshipExtendedTests.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.RelationshipExtendedModel;
-import com.example.models.SimpleExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class RelationshipExtendedTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        save(new RelationshipExtendedModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        save(new RelationshipExtendedModel(simple));
-        save(new RelationshipExtendedModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
-        save(new RelationshipExtendedModel(simple));
-        save(new RelationshipExtendedModel(another_simple));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipExtendedModel(simple));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            save(new RelationshipExtendedModel(simple));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipExtendedModel(simple));
-        }
-        List<RelationshipExtendedModel> models =
-                SugarRecord.listAll(RelationshipExtendedModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipExtendedModel model : models) {
-            assertEquals(simple.getId(), model.getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            save(new RelationshipExtendedModel(simple));
-        }
-        List<RelationshipExtendedModel> models =
-                SugarRecord.listAll(RelationshipExtendedModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipExtendedModel model : models) {
-            assertEquals(model.getId(), model.getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java b/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java
deleted file mode 100644
index 7ecb6751..00000000
--- a/example/src/test/java/com/example/sugartest/RelationshipMixedATests.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.RelationshipMixedAModel;
-import com.example.models.SimpleAnnotatedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class RelationshipMixedATests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        save(new RelationshipMixedAModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        save(new RelationshipMixedAModel(simple));
-        save(new RelationshipMixedAModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
-        save(new RelationshipMixedAModel(simple));
-        save(new RelationshipMixedAModel(another_simple));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipMixedAModel(simple));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            save(new RelationshipMixedAModel(simple));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipMixedAModel(simple));
-        }
-        List<RelationshipMixedAModel> models =
-                SugarRecord.listAll(RelationshipMixedAModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipMixedAModel model : models) {
-            assertEquals(simple.getId(), model.getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            save(new RelationshipMixedAModel(simple));
-        }
-        List<RelationshipMixedAModel> models =
-                SugarRecord.listAll(RelationshipMixedAModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipMixedAModel model : models) {
-            assertEquals(model.getId(), model.getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java b/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java
deleted file mode 100644
index 1d31ecd2..00000000
--- a/example/src/test/java/com/example/sugartest/RelationshipMixedBTests.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.RelationshipMixedBModel;
-import com.example.models.SimpleExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class RelationshipMixedBTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        save(new RelationshipMixedBModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        save(new RelationshipMixedBModel(simple));
-        save(new RelationshipMixedBModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
-        save(new RelationshipMixedBModel(simple));
-        save(new RelationshipMixedBModel(another_simple));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipMixedBModel(simple));
-        }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            save(new RelationshipMixedBModel(simple));
-        }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipMixedBModel(simple));
-        }
-        List<RelationshipMixedBModel> models =
-                SugarRecord.listAll(RelationshipMixedBModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipMixedBModel model : models) {
-            assertEquals(simple.getId(), model.getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            save(new RelationshipMixedBModel(simple));
-        }
-        List<RelationshipMixedBModel> models =
-                SugarRecord.listAll(RelationshipMixedBModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipMixedBModel model : models) {
-            assertEquals(model.getId(), model.getSimple().getId());
-        }
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java b/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
deleted file mode 100644
index 7a94cc01..00000000
--- a/example/src/test/java/com/example/sugartest/RobolectricGradleTestRunner.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.example.sugartest;
-
-import com.example.ClientApp;
-
-import org.junit.runners.model.InitializationError;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.manifest.AndroidManifest;
-import org.robolectric.res.Fs;
-
-public class RobolectricGradleTestRunner extends RobolectricTestRunner {
-    public RobolectricGradleTestRunner(Class<?> testClass) throws InitializationError {
-        super(testClass);
-    }
-
-    @Override
-    protected AndroidManifest getAppManifest(Config config) {
-        String myAppPath = ClientApp.class.getProtectionDomain().getCodeSource().getLocation().getPath();
-        String manifestPath = myAppPath + "../../../../src/main/AndroidManifest.xml";
-        String resPath = myAppPath + "../../../../src/main/res";
-        String assetPath = myAppPath + "../../../../src/main/assets";
-        String packageName = "com.example";
-        return createAppManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resPath), Fs.fileFromPath(assetPath), packageName);
-    }
-}
\ No newline at end of file
diff --git a/example/src/test/java/com/example/sugartest/ShortFieldTests.java b/example/src/test/java/com/example/sugartest/ShortFieldTests.java
deleted file mode 100644
index 3c428752..00000000
--- a/example/src/test/java/com/example/sugartest/ShortFieldTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.ShortFieldAnnotatedModel;
-import com.example.models.ShortFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class ShortFieldTests {
-    @Test
-    public void nullShortExtendedTest() {
-        save(new ShortFieldExtendedModel());
-        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
-        assertNull(model.getShort());
-    }
-
-    @Test
-    public void nullRawShortExtendedTest() {
-        save(new ShortFieldExtendedModel());
-        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
-        assertEquals((short) 0, model.getRawShort());
-    }
-
-    @Test
-    public void nullShortAnnotatedTest() {
-        save(new ShortFieldAnnotatedModel());
-        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
-        assertNull(model.getShort());
-    }
-
-    @Test
-    public void nullRawShortAnnotatedTest() {
-        save(new ShortFieldAnnotatedModel());
-        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
-        assertEquals((short) 0, model.getRawShort());
-    }
-
-    @Test
-    public void objectShortExtendedTest() {
-        Short objectShort = new Short((short) 25);
-        save(new ShortFieldExtendedModel(objectShort));
-        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
-        assertEquals(objectShort, model.getShort());
-    }
-
-    @Test
-    public void rawShortExtendedTest() {
-        save(new ShortFieldExtendedModel((short) 25));
-        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
-        assertEquals((short) 25, model.getRawShort());
-    }
-
-    @Test
-    public void objectShortAnnotatedTest() {
-        Short objectShort = new Short((short) 25);
-        save(new ShortFieldAnnotatedModel(objectShort));
-        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
-        assertEquals(objectShort, model.getShort());
-    }
-
-    @Test
-    public void rawShortAnnotatedTest() {
-        save(new ShortFieldAnnotatedModel((short) 25));
-        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
-        assertEquals((short) 25, model.getRawShort());
-    }
-}
diff --git a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
deleted file mode 100644
index 8436df41..00000000
--- a/example/src/test/java/com/example/sugartest/SimpleAnnotatedModelTests.java
+++ /dev/null
@@ -1,356 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.SimpleAnnotatedModel;
-import com.orm.SugarRecord;
-import com.orm.helper.NamingHelper;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class SimpleAnnotatedModelTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoSaveTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void manySaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void defaultIdTest() throws Exception {
-        assertEquals(1L, save(new SimpleAnnotatedModel()));
-    }
-
-    @Test
-    public void whereCountTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void whereNoCountTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"3"}));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"a"}));
-    }
-
-    @Test
-    public void whereBrokenCountTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        assertEquals(-1L, SugarRecord.count(SimpleAnnotatedModel.class, "di = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void deleteTest() throws Exception {
-        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-        save(model);
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertTrue(SugarRecord.delete(model));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteUnsavedTest() throws Exception {
-        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertFalse(SugarRecord.delete(model));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteWrongTest() throws Exception {
-        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-        save(model);
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        Field idField = model.getClass().getDeclaredField("id");
-        idField.setAccessible(true);
-        idField.set(model, Long.MAX_VALUE);
-        assertFalse(SugarRecord.delete(model));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteAllTest() throws Exception {
-        int elementNumber = 100;
-        for (int i = 1; i <= elementNumber; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        assertEquals(elementNumber, SugarRecord.deleteAll(SimpleAnnotatedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteAllWhereTest() throws Exception {
-        int elementNumber = 100;
-        for (int i = 1; i <= elementNumber; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        assertEquals(elementNumber - 1, SugarRecord.deleteAll(SimpleAnnotatedModel.class,
-                                                              "id > ?",
-                                                              new String[]{"1"}));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteInTransactionFewTest() throws Exception {
-        SimpleAnnotatedModel first = new SimpleAnnotatedModel();
-        SimpleAnnotatedModel second = new SimpleAnnotatedModel();
-        SimpleAnnotatedModel third = new SimpleAnnotatedModel();
-        save(first);
-        save(second);
-        // Not saving last model
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2, SugarRecord.deleteInTx(first, second, third));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteInTransactionManyTest() throws Exception {
-        long elementNumber = 100;
-        List<SimpleAnnotatedModel> models = new ArrayList<>();
-        for (int i = 1; i <= elementNumber; i++) {
-            SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-            models.add(model);
-            // Not saving last model
-            if (i < elementNumber) {
-                save(model);
-            }
-        }
-        assertEquals(elementNumber - 1, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(elementNumber - 1, SugarRecord.deleteInTx(models));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void saveInTransactionTest() throws Exception {
-        SugarRecord.saveInTx(new SimpleAnnotatedModel(), new SimpleAnnotatedModel());
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void listAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        List<SimpleAnnotatedModel> models = SugarRecord.listAll(SimpleAnnotatedModel.class);
-        assertEquals(100, models.size());
-        for (long i = 1; i <= 100; i++) {
-            assertEquals(new Long(i), models.get((int) i - 1).getId());
-        }
-    }
-
-    @Test
-    public void findTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.find(SimpleAnnotatedModel.class, "id = ?", "2");
-        assertEquals(1, models.size());
-        assertEquals(new Long(2L), models.get(0).getId());
-    }
-
-    @Test
-    public void findWithQueryTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findWithQuery(SimpleAnnotatedModel.class, "Select * from " +
-                        NamingHelper.toTableName(SimpleAnnotatedModel.class) +
-                        " where id >= ? ", "50");
-        for (SimpleAnnotatedModel model : models) {
-            assertEquals(new Long(75), model.getId(), 25L);
-        }
-    }
-
-    @Test
-    public void findByIdTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertEquals(new Long(1L), SugarRecord.findById(SimpleAnnotatedModel.class, 1L).getId());
-    }
-
-    @Test
-    public void findByIdIntegerTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertEquals(new Long(1L), SugarRecord.findById(SimpleAnnotatedModel.class, 1).getId());
-    }
-
-    @Test
-    public void findByIdStringsNullTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertEquals(0, SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{""}).size());
-    }
-
-    @Test
-    public void findByIdStringsOneTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1"});
-        assertEquals(1, models.size());
-        assertEquals(new Long(1L), models.get(0).getId());
-    }
-
-    @Test
-    public void findByIdStringsTwoTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1", "3"});
-        assertEquals(2, models.size());
-        assertEquals(new Long(1L), models.get(0).getId());
-        assertEquals(new Long(3L), models.get(1).getId());
-    }
-
-    @Test
-    public void findByIdStringsManyTest() throws Exception {
-        for (int i = 1; i <= 10; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1", "3", "6", "10"});
-        assertEquals(4, models.size());
-        assertEquals(new Long(1L), models.get(0).getId());
-        assertEquals(new Long(3L), models.get(1).getId());
-        assertEquals(new Long(6L), models.get(2).getId());
-        assertEquals(new Long(10L), models.get(3).getId());
-    }
-
-    @Test
-    public void findByIdStringsOrderTest() throws Exception {
-        for (int i = 1; i <= 10; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"10", "6", "3", "1"});
-        assertEquals(4, models.size());
-        // The order of the query doesn't matter
-        assertEquals(new Long(1L), models.get(0).getId());
-        assertEquals(new Long(3L), models.get(1).getId());
-        assertEquals(new Long(6L), models.get(2).getId());
-        assertEquals(new Long(10L), models.get(3).getId());
-    }
-
-    @Test
-    public void findByIdNullTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertNull(SugarRecord.findById(SimpleAnnotatedModel.class, 2L));
-    }
-
-    @Test
-    public void findAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAll(SimpleAnnotatedModel.class);
-        for (int i = 1; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleAnnotatedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(new Long(i), model.getId());
-        }
-    }
-
-    @Test
-    public void findAsIteratorTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
-                "id >= ?", "50");
-        for (int i = 50; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleAnnotatedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(new Long(i), model.getId());
-        }
-    }
-
-    @Test
-    public void findWithQueryAsIteratorTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        Iterator<SimpleAnnotatedModel> cursor =
-                SugarRecord.findWithQueryAsIterator(SimpleAnnotatedModel.class,
-                        "Select * from " +
-                                NamingHelper.toTableName(SimpleAnnotatedModel.class) +
-                                " where id >= ? ", "50");
-        for (int i = 50; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleAnnotatedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(new Long(i), model.getId());
-        }
-    }
-
-    @Test(expected=NoSuchElementException.class)
-    public void findAsIteratorOutOfBoundsTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
-                "id = ?", "1");
-        assertTrue(cursor.hasNext());
-        SimpleAnnotatedModel model = cursor.next();
-        assertNotNull(model);
-        assertEquals(new Long(1), model.getId());
-        // This should throw a NoSuchElementException
-        cursor.next();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void disallowRemoveCursorTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
-                "id = ?", "1");
-        assertTrue(cursor.hasNext());
-        SimpleAnnotatedModel model = cursor.next();
-        assertNotNull(model);
-        assertEquals(new Long(1), model.getId());
-        // This should throw a UnsupportedOperationException
-        cursor.remove();
-    }
-
-    @Test
-    public void vacuumTest() throws Exception {
-        SugarRecord.executeQuery("Vacuum");
-    }
-}
\ No newline at end of file
diff --git a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java b/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
deleted file mode 100644
index 7abaf58a..00000000
--- a/example/src/test/java/com/example/sugartest/SimpleExtendedModelTests.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package com.example.sugartest;
-
-import com.example.models.SimpleExtendedModel;
-import com.orm.SugarRecord;
-import com.orm.helper.NamingHelper;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class SimpleExtendedModelTests {
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void twoSaveTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void manySaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void defaultIdTest() throws Exception {
-        assertEquals(1L, save(new SimpleExtendedModel()));
-    }
-
-    @Test
-    public void whereCountTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void whereNoCountTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"3"}));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"a"}));
-    }
-
-    @Test
-    public void whereBrokenCountTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void saveMethodTest() throws Exception {
-        SimpleExtendedModel model = new SimpleExtendedModel();
-        model.save();
-        assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void deleteTest() throws Exception {
-        SimpleExtendedModel model = new SimpleExtendedModel();
-        save(model);
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertTrue(SugarRecord.delete(model));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteUnsavedTest() throws Exception {
-        SimpleExtendedModel model = new SimpleExtendedModel();
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-        assertFalse(SugarRecord.delete(model));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteWrongTest() throws Exception {
-        SimpleExtendedModel model = new SimpleExtendedModel();
-        save(model);
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        Field idField = model.getClass().getSuperclass().getDeclaredField("id");
-        idField.setAccessible(true);
-        idField.set(model, Long.MAX_VALUE);
-        assertFalse(SugarRecord.delete(model));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteAllTest() throws Exception {
-        int elementNumber = 100;
-        for (int i = 1; i <= elementNumber; i++) {
-            save(new SimpleExtendedModel());
-        }
-        assertEquals(elementNumber, SugarRecord.deleteAll(SimpleExtendedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteAllWhereTest() throws Exception {
-        int elementNumber = 100;
-        for (int i = 1; i <= elementNumber; i++) {
-            save(new SimpleExtendedModel());
-        }
-        assertEquals(elementNumber - 1, SugarRecord.deleteAll(SimpleExtendedModel.class,
-                                                              "id > ?",
-                                                              new String[]{"1"}));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteInTransactionFewTest() throws Exception {
-        SimpleExtendedModel first = new SimpleExtendedModel();
-        SimpleExtendedModel second = new SimpleExtendedModel();
-        SimpleExtendedModel third = new SimpleExtendedModel();
-        save(first);
-        save(second);
-        // Not saving last model
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2, SugarRecord.deleteInTx(first, second, third));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteInTransactionManyTest() throws Exception {
-        long elementNumber = 100;
-        List<SimpleExtendedModel> models = new ArrayList<>();
-        for (int i = 1; i <= elementNumber; i++) {
-            SimpleExtendedModel model = new SimpleExtendedModel();
-            models.add(model);
-            // Not saving last model
-            if (i < elementNumber) {
-                save(model);
-            }
-        }
-        assertEquals(elementNumber - 1, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(elementNumber - 1, SugarRecord.deleteInTx(models));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void saveInTransactionTest() throws Exception {
-        SugarRecord.saveInTx(new SimpleExtendedModel(), new SimpleExtendedModel());
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void listAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-        List<SimpleExtendedModel> models = SugarRecord.listAll(SimpleExtendedModel.class);
-        assertEquals(100, models.size());
-        for (long i = 1; i <= 100; i++) {
-            assertEquals(new Long(i), models.get((int) i - 1).getId());
-        }
-    }
-
-    @Test
-    public void findTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        List<SimpleExtendedModel> models =
-                SugarRecord.find(SimpleExtendedModel.class, "id = ?", "2");
-        assertEquals(1, models.size());
-        assertEquals(new Long(2L), models.get(0).getId());
-    }
-
-    @Test
-    public void findWithQueryTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-        List<SimpleExtendedModel> models =
-                SugarRecord.findWithQuery(SimpleExtendedModel.class, "Select * from " +
-                                          NamingHelper.toTableName(SimpleExtendedModel.class) +
-                                          " where id >= ? ", "50");
-        for (SimpleExtendedModel model : models) {
-            assertEquals(new Long(75), model.getId(), 25L);
-        }
-    }
-
-    @Test
-    public void findByIdTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertEquals(new Long(1L), SugarRecord.findById(SimpleExtendedModel.class, 1L).getId());
-    }
-
-    @Test
-    public void findByIdIntegerTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertEquals(new Long(1L), SugarRecord.findById(SimpleExtendedModel.class, 1).getId());
-    }
-
-    @Test
-    public void findByIdStringsNullTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertEquals(0, SugarRecord.findById(SimpleExtendedModel.class, new String[]{""}).size());
-    }
-
-    @Test
-    public void findByIdStringsOneTest() throws Exception {
-        save(new SimpleExtendedModel());
-        List<SimpleExtendedModel> models =
-                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1"});
-        assertEquals(1, models.size());
-        assertEquals(new Long(1L), models.get(0).getId());
-    }
-
-    @Test
-    public void findByIdStringsTwoTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        List<SimpleExtendedModel> models =
-                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1", "3"});
-        assertEquals(2, models.size());
-        assertEquals(new Long(1L), models.get(0).getId());
-        assertEquals(new Long(3L), models.get(1).getId());
-    }
-
-    @Test
-    public void findByIdStringsManyTest() throws Exception {
-        for (int i = 1; i <= 10; i++) {
-            save(new SimpleExtendedModel());
-        }
-        List<SimpleExtendedModel> models =
-                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1", "3", "6", "10"});
-        assertEquals(4, models.size());
-        assertEquals(new Long(1L), models.get(0).getId());
-        assertEquals(new Long(3L), models.get(1).getId());
-        assertEquals(new Long(6L), models.get(2).getId());
-        assertEquals(new Long(10L), models.get(3).getId());
-    }
-
-    @Test
-    public void findByIdStringsOrderTest() throws Exception {
-        for (int i = 1; i <= 10; i++) {
-            save(new SimpleExtendedModel());
-        }
-        List<SimpleExtendedModel> models =
-                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"10", "6", "3", "1"});
-        assertEquals(4, models.size());
-        // The order of the query doesn't matter
-        assertEquals(new Long(1L), models.get(0).getId());
-        assertEquals(new Long(3L), models.get(1).getId());
-        assertEquals(new Long(6L), models.get(2).getId());
-        assertEquals(new Long(10L), models.get(3).getId());
-    }
-
-    @Test
-    public void findByIdNullTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertNull(SugarRecord.findById(SimpleExtendedModel.class, 2L));
-    }
-
-    @Test
-    public void findAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAll(SimpleExtendedModel.class);
-        for (int i = 1; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleExtendedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(new Long(i), model.getId());
-        }
-    }
-
-    @Test
-    public void findAsIteratorTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
-                "id >= ?", "50");
-        for (int i = 50; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleExtendedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(new Long(i), model.getId());
-        }
-    }
-
-    @Test
-    public void findWithQueryAsIteratorTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-        Iterator<SimpleExtendedModel> cursor =
-                SugarRecord.findWithQueryAsIterator(SimpleExtendedModel.class,
-                                                    "Select * from " +
-                                                    NamingHelper.toTableName(SimpleExtendedModel.class) +
-                                                    " where id >= ? ", "50");
-        for (int i = 50; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleExtendedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(new Long(i), model.getId());
-        }
-    }
-
-    @Test(expected=NoSuchElementException.class)
-    public void findAsIteratorOutOfBoundsTest() throws Exception {
-        save(new SimpleExtendedModel());
-        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
-                "id = ?", "1");
-        assertTrue(cursor.hasNext());
-        SimpleExtendedModel model = cursor.next();
-        assertNotNull(model);
-        assertEquals(new Long(1), model.getId());
-        // This should throw a NoSuchElementException
-        cursor.next();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void disallowRemoveCursorTest() throws Exception {
-        save(new SimpleExtendedModel());
-        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
-                "id = ?", "1");
-        assertTrue(cursor.hasNext());
-        SimpleExtendedModel model = cursor.next();
-        assertNotNull(model);
-        assertEquals(new Long(1), model.getId());
-        // This should throw a UnsupportedOperationException
-        cursor.remove();
-    }
-
-    @Test
-    public void vacuumTest() throws Exception {
-        SugarRecord.executeQuery("Vacuum");
-    }
-}
\ No newline at end of file
diff --git a/example/src/test/java/com/example/sugartest/StringFieldTests.java b/example/src/test/java/com/example/sugartest/StringFieldTests.java
deleted file mode 100644
index afecdf3d..00000000
--- a/example/src/test/java/com/example/sugartest/StringFieldTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.example.sugartest;
-
-
-import com.example.models.StringFieldAnnotatedModel;
-import com.example.models.StringFieldExtendedModel;
-import com.orm.SugarRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class StringFieldTests {
-    @Test
-    public void nullStringExtendedTest() {
-        save(new StringFieldExtendedModel());
-        StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
-        assertNull(model.getString());
-    }
-
-    @Test
-    public void nullStringAnnotatedTest() {
-        save(new StringFieldAnnotatedModel());
-        StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
-        assertNull(model.getString());
-    }
-
-    @Test
-    public void stringExtendedTest() {
-        String string = "Test String";
-        save(new StringFieldExtendedModel(string));
-        StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
-        assertEquals(string, model.getString());
-    }
-
-    @Test
-    public void stringAnnotatedTest() {
-        String string = "Test String";
-        save(new StringFieldAnnotatedModel(string));
-        StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
-        assertEquals(string, model.getString());
-    }
-}
diff --git a/library/src/test/java/com/orm/ClientApp.java b/library/src/test/java/com/orm/ClientApp.java
deleted file mode 100644
index d9cd56bf..00000000
--- a/library/src/test/java/com/orm/ClientApp.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.orm;
-
-import android.app.Application;
-
-public class ClientApp extends Application {
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        SugarContext.init(this);
-    }
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-        SugarContext.terminate();
-    }
-}
diff --git a/library/src/test/java/com/orm/RobolectricGradleTestRunner.java b/library/src/test/java/com/orm/RobolectricGradleTestRunner.java
deleted file mode 100644
index 6f2134b2..00000000
--- a/library/src/test/java/com/orm/RobolectricGradleTestRunner.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.orm;
-
-import org.junit.runners.model.InitializationError;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.manifest.AndroidManifest;
-import org.robolectric.res.Fs;
-
-public class RobolectricGradleTestRunner extends RobolectricTestRunner {
-
-    public RobolectricGradleTestRunner(Class<?> testClass) throws InitializationError {
-        super(testClass);
-    }
-
-    @Override
-    protected AndroidManifest getAppManifest(Config config) {
-        String myAppPath = ClientApp.class.getProtectionDomain().getCodeSource().getLocation().getPath();
-        String manifestPath = myAppPath + "../../../../src/main/AndroidManifest.xml";
-        String resPath = myAppPath + "../../../../src/main/res";
-        String assetPath = myAppPath + "../../../../src/main/assets";
-        String packageName = "com.orm.models";
-
-        return createAppManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resPath), Fs.fileFromPath(assetPath), packageName);
-    }
-}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 289f132c..9ef72cbc 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -1,29 +1,25 @@
 package com.orm;
 
-import com.orm.models.EmptyModel;
-import com.orm.models.IntUniqueModel;
-import com.orm.models.MultiColumnUniqueModel;
-import com.orm.models.StringFieldAnnotatedModel;
-import com.orm.models.StringFieldExtendedModel;
-import com.orm.models.StringFieldExtendedModelAnnotatedColumn;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.EmptyModel;
+import com.orm.model.IntUniqueModel;
+import com.orm.model.MultiColumnUniqueModel;
+import com.orm.model.StringFieldAnnotatedModel;
+import com.orm.model.StringFieldExtendedModel;
+import com.orm.model.StringFieldExtendedModelAnnotatedColumn;
 import com.orm.helper.NamingHelper;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static junit.framework.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
-public class SchemaGeneratorTest {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class SchemaGeneratorTest {
 
     @Test
     public void testEmptyTableCreation() throws Exception {
diff --git a/library/src/test/java/com/orm/SugarDbConfigurationTest.java b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
index 06ea6ae9..64d50df6 100644
--- a/library/src/test/java/com/orm/SugarDbConfigurationTest.java
+++ b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
@@ -18,7 +18,7 @@
  */
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(sdk = 16, constants = BuildConfig.class)
-public class SugarDbConfigurationTest {
+public final class SugarDbConfigurationTest {
 
     @Test
     public void testNotNullConfiguration() {
diff --git a/library/src/test/java/com/orm/SugarDbTest.java b/library/src/test/java/com/orm/SugarDbTest.java
index 482410b5..7ff5914a 100644
--- a/library/src/test/java/com/orm/SugarDbTest.java
+++ b/library/src/test/java/com/orm/SugarDbTest.java
@@ -2,42 +2,40 @@
 
 import android.database.sqlite.SQLiteDatabase;
 
-import org.junit.Assert;
-import org.junit.Before;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author jonatan.salas
  */
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
-public class SugarDbTest {
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class SugarDbTest {
     private final SugarDb sugarDb = SugarDb.getInstance();
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     //TODO check this better!
     public void testGetReadableDatabase() {
         final SQLiteDatabase db = sugarDb.getReadableDatabase();
-        Assert.assertEquals(false, db.isReadOnly());
+        assertEquals(false, db.isReadOnly());
     }
 
     @Test
     public void testGetWritableDatabase() {
         final SQLiteDatabase db = sugarDb.getWritableDatabase();
-        Assert.assertEquals(false, db.isReadOnly());
+        assertEquals(false, db.isReadOnly());
     }
 
     @Test
     public void testGetDB() {
         final SQLiteDatabase db = sugarDb.getDB();
-        Assert.assertEquals(false, db.isReadOnly());
+        assertEquals(false, db.isReadOnly());
     }
 }
diff --git a/example/src/main/java/com/example/ClientApp.java b/library/src/test/java/com/orm/app/ClientApp.java
similarity index 94%
rename from example/src/main/java/com/example/ClientApp.java
rename to library/src/test/java/com/orm/app/ClientApp.java
index 6637ea26..e9943aea 100644
--- a/example/src/main/java/com/example/ClientApp.java
+++ b/library/src/test/java/com/orm/app/ClientApp.java
@@ -1,4 +1,4 @@
-package com.example;
+package com.orm.app;
 
 import android.app.Application;
 
diff --git a/library/src/test/java/com/orm/util/ManifestHelperTest.java b/library/src/test/java/com/orm/helper/ManifestHelperTest.java
similarity index 50%
rename from library/src/test/java/com/orm/util/ManifestHelperTest.java
rename to library/src/test/java/com/orm/helper/ManifestHelperTest.java
index 4340ac43..b8bfbbf9 100644
--- a/library/src/test/java/com/orm/util/ManifestHelperTest.java
+++ b/library/src/test/java/com/orm/helper/ManifestHelperTest.java
@@ -1,29 +1,28 @@
-package com.orm.util;
+package com.orm.helper;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
-import static org.junit.Assert.*;
-import static com.orm.helper.ManifestHelper.*;
-import static com.orm.SugarContext.init;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import static com.orm.helper.ManifestHelper.getDatabaseName;
+import static com.orm.helper.ManifestHelper.getDatabaseVersion;
+import static com.orm.helper.ManifestHelper.getDomainPackageName;
+import static com.orm.helper.ManifestHelper.isDebugEnabled;
+import static com.orm.helper.ManifestHelper.DATABASE_DEFAULT_NAME;
 
 /**
  * @author jonatan.salas
  */
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
-public class ManifestHelperTest {
-
-    @Before
-    public void setUp() {
-        init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class ManifestHelperTest {
 
     @Test
     public void testGetDbName() {
diff --git a/library/src/test/java/com/orm/NamingHelperTest.java b/library/src/test/java/com/orm/helper/NamingHelperTest.java
similarity index 81%
rename from library/src/test/java/com/orm/NamingHelperTest.java
rename to library/src/test/java/com/orm/helper/NamingHelperTest.java
index 550c9e31..54c3684c 100644
--- a/library/src/test/java/com/orm/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/helper/NamingHelperTest.java
@@ -1,7 +1,6 @@
-package com.orm;
+package com.orm.helper;
 
-import com.orm.helper.NamingHelper;
-import com.orm.models.TestRecord;
+import com.orm.model.TestRecord;
 import com.orm.util.ReflectionUtil;
 
 import org.junit.Test;
@@ -13,7 +12,11 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 
-public class NamingHelperTest {
+import static com.orm.helper.NamingHelper.toColumnName;
+import static com.orm.helper.NamingHelper.toTableName;
+import static com.orm.helper.NamingHelper.toSQLNameDefault;
+
+public final class NamingHelperTest {
 
     @Test
     public void testToSQLNameFromField() {
@@ -23,7 +26,7 @@ public void testToSQLNameFromField() {
             List<String> columnList = new ArrayList<>();
 
             for(Field field: fieldList) {
-                columnList.add(NamingHelper.toColumnName(field));
+                columnList.add(toColumnName(field));
             }
 
             boolean isIdInList = inList(columnList, "ID");
@@ -46,7 +49,7 @@ private boolean inList(List<String> list, String searchValue) {
 
     @Test
     public void testToSQLNameFromClass() {
-        assertEquals("TEST_RECORD", NamingHelper.toTableName(TestRecord.class));
+        assertEquals("TEST_RECORD", toTableName(TestRecord.class));
     }
 
     @Test
@@ -73,7 +76,7 @@ public void testToSQLNameUnderscore() {
      * @param actual    the expected UPPER_CASE_UNDER_SCORE string
      */
     private static void assertToSqlNameEquals(String expected, String actual) {
-        assertEquals(expected, NamingHelper.toSQLNameDefault(actual));
+        assertEquals(expected, toSQLNameDefault(actual));
     }
 
 }
diff --git a/library/src/test/java/com/orm/util/SugarTransactionHelperTest.java b/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
similarity index 84%
rename from library/src/test/java/com/orm/util/SugarTransactionHelperTest.java
rename to library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
index 410be646..396b3887 100644
--- a/library/src/test/java/com/orm/util/SugarTransactionHelperTest.java
+++ b/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
@@ -1,14 +1,15 @@
-package com.orm.util;
+package com.orm.helper;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
+import com.orm.app.ClientApp;
 import com.orm.SugarContext;
+import com.orm.dsl.BuildConfig;
 import com.orm.helper.SugarTransactionHelper;
-import com.orm.models.TestRecord;
+import com.orm.model.TestRecord;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -21,8 +22,8 @@
  * @author jonatan.salas
  */
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
-public class SugarTransactionHelperTest {
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class SugarTransactionHelperTest {
     private List<TestRecord> recordList = new ArrayList<>();
     private TestRecord record1 = new TestRecord();
     private TestRecord record2 = new TestRecord();
diff --git a/library/src/test/java/com/orm/models/BigDecimalFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/BigDecimalFieldAnnotatedModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/BigDecimalFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/BigDecimalFieldAnnotatedModel.java
index 8bab8c6d..f5529512 100644
--- a/library/src/test/java/com/orm/models/BigDecimalFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/BigDecimalFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/BigDecimalFieldExtendedModel.java b/library/src/test/java/com/orm/model/BigDecimalFieldExtendedModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/BigDecimalFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/BigDecimalFieldExtendedModel.java
index 958ce330..cbcdc3c9 100644
--- a/library/src/test/java/com/orm/models/BigDecimalFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/BigDecimalFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/BooleanFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/BooleanFieldAnnotatedModel.java
similarity index 96%
rename from library/src/test/java/com/orm/models/BooleanFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/BooleanFieldAnnotatedModel.java
index 11bc661b..31a8668b 100644
--- a/library/src/test/java/com/orm/models/BooleanFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/BooleanFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/BooleanFieldExtendedModel.java b/library/src/test/java/com/orm/model/BooleanFieldExtendedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/BooleanFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/BooleanFieldExtendedModel.java
index 25ce58b9..0c78c82a 100644
--- a/library/src/test/java/com/orm/models/BooleanFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/BooleanFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/ByteArrayAnnotatedModel.java b/library/src/test/java/com/orm/model/ByteArrayAnnotatedModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/ByteArrayAnnotatedModel.java
rename to library/src/test/java/com/orm/model/ByteArrayAnnotatedModel.java
index 99256e95..4a9f809c 100644
--- a/library/src/test/java/com/orm/models/ByteArrayAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/ByteArrayAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/ByteArrayExtendedModel.java b/library/src/test/java/com/orm/model/ByteArrayExtendedModel.java
similarity index 93%
rename from library/src/test/java/com/orm/models/ByteArrayExtendedModel.java
rename to library/src/test/java/com/orm/model/ByteArrayExtendedModel.java
index 0cb63964..7e40208d 100644
--- a/library/src/test/java/com/orm/models/ByteArrayExtendedModel.java
+++ b/library/src/test/java/com/orm/model/ByteArrayExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/DoubleFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/DoubleFieldAnnotatedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/DoubleFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/DoubleFieldAnnotatedModel.java
index 1c933cbf..2c13e075 100644
--- a/library/src/test/java/com/orm/models/DoubleFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/DoubleFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/DoubleFieldExtendedModel.java b/library/src/test/java/com/orm/model/DoubleFieldExtendedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/DoubleFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/DoubleFieldExtendedModel.java
index 1a1834b3..1a000c3c 100644
--- a/library/src/test/java/com/orm/models/DoubleFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/DoubleFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/EmptyModel.java b/library/src/test/java/com/orm/model/EmptyModel.java
similarity index 86%
rename from library/src/test/java/com/orm/models/EmptyModel.java
rename to library/src/test/java/com/orm/model/EmptyModel.java
index 73459b51..a98ab5e2 100644
--- a/library/src/test/java/com/orm/models/EmptyModel.java
+++ b/library/src/test/java/com/orm/model/EmptyModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/EnumFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/EnumFieldAnnotatedModel.java
similarity index 97%
rename from library/src/test/java/com/orm/models/EnumFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/EnumFieldAnnotatedModel.java
index 5ea90026..abb3a63f 100644
--- a/library/src/test/java/com/orm/models/EnumFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/EnumFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/EnumFieldExtendedModel.java b/library/src/test/java/com/orm/model/EnumFieldExtendedModel.java
similarity index 97%
rename from library/src/test/java/com/orm/models/EnumFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/EnumFieldExtendedModel.java
index 52cce942..24ec7725 100644
--- a/library/src/test/java/com/orm/models/EnumFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/EnumFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/FloatFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/FloatFieldAnnotatedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/FloatFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/FloatFieldAnnotatedModel.java
index 34a55794..be2f01f5 100644
--- a/library/src/test/java/com/orm/models/FloatFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/FloatFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/FloatFieldExtendedModel.java b/library/src/test/java/com/orm/model/FloatFieldExtendedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/FloatFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/FloatFieldExtendedModel.java
index 2f3311d2..e79f1a4b 100644
--- a/library/src/test/java/com/orm/models/FloatFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/FloatFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/IncompleteAnnotatedModel.java b/library/src/test/java/com/orm/model/IncompleteAnnotatedModel.java
similarity index 89%
rename from library/src/test/java/com/orm/models/IncompleteAnnotatedModel.java
rename to library/src/test/java/com/orm/model/IncompleteAnnotatedModel.java
index 55b5c52f..64f8436b 100644
--- a/library/src/test/java/com/orm/models/IncompleteAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/IncompleteAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/IntUniqueModel.java b/library/src/test/java/com/orm/model/IntUniqueModel.java
similarity index 92%
rename from library/src/test/java/com/orm/models/IntUniqueModel.java
rename to library/src/test/java/com/orm/model/IntUniqueModel.java
index 6c9cdfdd..7a03e3d0 100644
--- a/library/src/test/java/com/orm/models/IntUniqueModel.java
+++ b/library/src/test/java/com/orm/model/IntUniqueModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 import com.orm.annotation.Unique;
diff --git a/library/src/test/java/com/orm/models/IntegerFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/IntegerFieldAnnotatedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/IntegerFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/IntegerFieldAnnotatedModel.java
index c9598436..e486d5db 100644
--- a/library/src/test/java/com/orm/models/IntegerFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/IntegerFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/IntegerFieldExtendedModel.java b/library/src/test/java/com/orm/model/IntegerFieldExtendedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/IntegerFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/IntegerFieldExtendedModel.java
index d6f30553..407979a3 100644
--- a/library/src/test/java/com/orm/models/IntegerFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/IntegerFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/LongFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/LongFieldAnnotatedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/LongFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/LongFieldAnnotatedModel.java
index b6bb0104..7f2cd539 100644
--- a/library/src/test/java/com/orm/models/LongFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/LongFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/LongFieldExtendedModel.java b/library/src/test/java/com/orm/model/LongFieldExtendedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/LongFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/LongFieldExtendedModel.java
index 4769ac3b..66bc7d6d 100644
--- a/library/src/test/java/com/orm/models/LongFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/LongFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java b/library/src/test/java/com/orm/model/MultiColumnUniqueModel.java
similarity index 93%
rename from library/src/test/java/com/orm/models/MultiColumnUniqueModel.java
rename to library/src/test/java/com/orm/model/MultiColumnUniqueModel.java
index 7057b2d6..cea9cd92 100644
--- a/library/src/test/java/com/orm/models/MultiColumnUniqueModel.java
+++ b/library/src/test/java/com/orm/model/MultiColumnUniqueModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 import com.orm.annotation.MultiUnique;
diff --git a/library/src/test/java/com/orm/models/NestedAnnotatedModel.java b/library/src/test/java/com/orm/model/NestedAnnotatedModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/NestedAnnotatedModel.java
rename to library/src/test/java/com/orm/model/NestedAnnotatedModel.java
index f39f20c5..f57b2d7a 100644
--- a/library/src/test/java/com/orm/models/NestedAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/NestedAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/NestedExtendedModel.java b/library/src/test/java/com/orm/model/NestedExtendedModel.java
similarity index 93%
rename from library/src/test/java/com/orm/models/NestedExtendedModel.java
rename to library/src/test/java/com/orm/model/NestedExtendedModel.java
index 66ae8900..0b583d95 100644
--- a/library/src/test/java/com/orm/models/NestedExtendedModel.java
+++ b/library/src/test/java/com/orm/model/NestedExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 import com.orm.SugarRecord;
diff --git a/library/src/test/java/com/orm/models/NestedMixedAAModel.java b/library/src/test/java/com/orm/model/NestedMixedAAModel.java
similarity index 93%
rename from library/src/test/java/com/orm/models/NestedMixedAAModel.java
rename to library/src/test/java/com/orm/model/NestedMixedAAModel.java
index 53884b0e..a96500f5 100644
--- a/library/src/test/java/com/orm/models/NestedMixedAAModel.java
+++ b/library/src/test/java/com/orm/model/NestedMixedAAModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 import com.orm.SugarRecord;
diff --git a/library/src/test/java/com/orm/models/NestedMixedABModel.java b/library/src/test/java/com/orm/model/NestedMixedABModel.java
similarity index 93%
rename from library/src/test/java/com/orm/models/NestedMixedABModel.java
rename to library/src/test/java/com/orm/model/NestedMixedABModel.java
index dc75faab..2cbae3db 100644
--- a/library/src/test/java/com/orm/models/NestedMixedABModel.java
+++ b/library/src/test/java/com/orm/model/NestedMixedABModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 import com.orm.SugarRecord;
diff --git a/library/src/test/java/com/orm/models/NestedMixedBAModel.java b/library/src/test/java/com/orm/model/NestedMixedBAModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/NestedMixedBAModel.java
rename to library/src/test/java/com/orm/model/NestedMixedBAModel.java
index 43628978..82de9717 100644
--- a/library/src/test/java/com/orm/models/NestedMixedBAModel.java
+++ b/library/src/test/java/com/orm/model/NestedMixedBAModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 import com.orm.annotation.Table;
diff --git a/library/src/test/java/com/orm/models/NestedMixedBBModel.java b/library/src/test/java/com/orm/model/NestedMixedBBModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/NestedMixedBBModel.java
rename to library/src/test/java/com/orm/model/NestedMixedBBModel.java
index 6c32109e..6a208b5b 100644
--- a/library/src/test/java/com/orm/models/NestedMixedBBModel.java
+++ b/library/src/test/java/com/orm/model/NestedMixedBBModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 import com.orm.annotation.Table;
diff --git a/library/src/test/java/com/orm/models/NoSugarModel.java b/library/src/test/java/com/orm/model/NoSugarModel.java
similarity index 73%
rename from library/src/test/java/com/orm/models/NoSugarModel.java
rename to library/src/test/java/com/orm/model/NoSugarModel.java
index 6641126c..617a99c4 100644
--- a/library/src/test/java/com/orm/models/NoSugarModel.java
+++ b/library/src/test/java/com/orm/model/NoSugarModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 public class NoSugarModel {
diff --git a/library/src/test/java/com/orm/models/RelationshipAnnotatedModel.java b/library/src/test/java/com/orm/model/RelationshipAnnotatedModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/RelationshipAnnotatedModel.java
rename to library/src/test/java/com/orm/model/RelationshipAnnotatedModel.java
index d4875a98..42b9a4d9 100644
--- a/library/src/test/java/com/orm/models/RelationshipAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/RelationshipAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/RelationshipExtendedModel.java b/library/src/test/java/com/orm/model/RelationshipExtendedModel.java
similarity index 93%
rename from library/src/test/java/com/orm/models/RelationshipExtendedModel.java
rename to library/src/test/java/com/orm/model/RelationshipExtendedModel.java
index 491dd823..1e4e99bc 100644
--- a/library/src/test/java/com/orm/models/RelationshipExtendedModel.java
+++ b/library/src/test/java/com/orm/model/RelationshipExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 import com.orm.SugarRecord;
diff --git a/library/src/test/java/com/orm/models/RelationshipMixedAModel.java b/library/src/test/java/com/orm/model/RelationshipMixedAModel.java
similarity index 93%
rename from library/src/test/java/com/orm/models/RelationshipMixedAModel.java
rename to library/src/test/java/com/orm/model/RelationshipMixedAModel.java
index fbbbc103..1afa4a82 100644
--- a/library/src/test/java/com/orm/models/RelationshipMixedAModel.java
+++ b/library/src/test/java/com/orm/model/RelationshipMixedAModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 import com.orm.SugarRecord;
diff --git a/library/src/test/java/com/orm/models/RelationshipMixedBModel.java b/library/src/test/java/com/orm/model/RelationshipMixedBModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/RelationshipMixedBModel.java
rename to library/src/test/java/com/orm/model/RelationshipMixedBModel.java
index c302f85a..2197e62f 100644
--- a/library/src/test/java/com/orm/models/RelationshipMixedBModel.java
+++ b/library/src/test/java/com/orm/model/RelationshipMixedBModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 
 import com.orm.annotation.Table;
diff --git a/library/src/test/java/com/orm/models/ShortFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/ShortFieldAnnotatedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/ShortFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/ShortFieldAnnotatedModel.java
index f6a0cc45..fea8e58e 100644
--- a/library/src/test/java/com/orm/models/ShortFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/ShortFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/ShortFieldExtendedModel.java b/library/src/test/java/com/orm/model/ShortFieldExtendedModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/ShortFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/ShortFieldExtendedModel.java
index c7df3a59..5e90b9f6 100644
--- a/library/src/test/java/com/orm/models/ShortFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/ShortFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/SimpleAnnotatedModel.java b/library/src/test/java/com/orm/model/SimpleAnnotatedModel.java
similarity index 88%
rename from library/src/test/java/com/orm/models/SimpleAnnotatedModel.java
rename to library/src/test/java/com/orm/model/SimpleAnnotatedModel.java
index 8a55e0bb..918840ed 100644
--- a/library/src/test/java/com/orm/models/SimpleAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/SimpleAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/SimpleExtendedModel.java b/library/src/test/java/com/orm/model/SimpleExtendedModel.java
similarity index 83%
rename from library/src/test/java/com/orm/models/SimpleExtendedModel.java
rename to library/src/test/java/com/orm/model/SimpleExtendedModel.java
index 65edf2c5..9040145d 100644
--- a/library/src/test/java/com/orm/models/SimpleExtendedModel.java
+++ b/library/src/test/java/com/orm/model/SimpleExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/SimpleModel.java b/library/src/test/java/com/orm/model/SimpleModel.java
similarity index 95%
rename from library/src/test/java/com/orm/models/SimpleModel.java
rename to library/src/test/java/com/orm/model/SimpleModel.java
index bdf26167..b2659084 100644
--- a/library/src/test/java/com/orm/models/SimpleModel.java
+++ b/library/src/test/java/com/orm/model/SimpleModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/StringFieldAnnotatedModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
rename to library/src/test/java/com/orm/model/StringFieldAnnotatedModel.java
index 9526a515..e3220278 100644
--- a/library/src/test/java/com/orm/models/StringFieldAnnotatedModel.java
+++ b/library/src/test/java/com/orm/model/StringFieldAnnotatedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/StringFieldAnnotatedNoIdModel.java b/library/src/test/java/com/orm/model/StringFieldAnnotatedNoIdModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/StringFieldAnnotatedNoIdModel.java
rename to library/src/test/java/com/orm/model/StringFieldAnnotatedNoIdModel.java
index feb91920..4b458960 100644
--- a/library/src/test/java/com/orm/models/StringFieldAnnotatedNoIdModel.java
+++ b/library/src/test/java/com/orm/model/StringFieldAnnotatedNoIdModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.annotation.Table;
 
diff --git a/library/src/test/java/com/orm/models/StringFieldExtendedModel.java b/library/src/test/java/com/orm/model/StringFieldExtendedModel.java
similarity index 94%
rename from library/src/test/java/com/orm/models/StringFieldExtendedModel.java
rename to library/src/test/java/com/orm/model/StringFieldExtendedModel.java
index 309c67b9..9b79bc61 100644
--- a/library/src/test/java/com/orm/models/StringFieldExtendedModel.java
+++ b/library/src/test/java/com/orm/model/StringFieldExtendedModel.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java b/library/src/test/java/com/orm/model/StringFieldExtendedModelAnnotatedColumn.java
similarity index 94%
rename from library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
rename to library/src/test/java/com/orm/model/StringFieldExtendedModelAnnotatedColumn.java
index 16c25e22..674d53ba 100644
--- a/library/src/test/java/com/orm/models/StringFieldExtendedModelAnnotatedColumn.java
+++ b/library/src/test/java/com/orm/model/StringFieldExtendedModelAnnotatedColumn.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 import com.orm.annotation.Column;
diff --git a/library/src/test/java/com/orm/models/TestRecord.java b/library/src/test/java/com/orm/model/TestRecord.java
similarity index 92%
rename from library/src/test/java/com/orm/models/TestRecord.java
rename to library/src/test/java/com/orm/model/TestRecord.java
index 72ab8d24..64fe7dba 100644
--- a/library/src/test/java/com/orm/models/TestRecord.java
+++ b/library/src/test/java/com/orm/model/TestRecord.java
@@ -1,4 +1,4 @@
-package com.orm.models;
+package com.orm.model;
 
 import com.orm.SugarRecord;
 
diff --git a/library/src/test/java/com/orm/query/QueryBuilderTests.java b/library/src/test/java/com/orm/query/QueryBuilderTests.java
index d43ca5ee..30b220df 100644
--- a/library/src/test/java/com/orm/query/QueryBuilderTests.java
+++ b/library/src/test/java/com/orm/query/QueryBuilderTests.java
@@ -6,7 +6,7 @@
 
 import static junit.framework.Assert.assertEquals;
 
-public class QueryBuilderTests {
+public final class QueryBuilderTests {
 
     @Test(expected=RuntimeException.class)
     public void noArgumentsTest() {
diff --git a/library/src/test/java/com/orm/query/SelectTest.java b/library/src/test/java/com/orm/query/SelectTest.java
index 734cca12..ad0393bd 100644
--- a/library/src/test/java/com/orm/query/SelectTest.java
+++ b/library/src/test/java/com/orm/query/SelectTest.java
@@ -1,12 +1,19 @@
 package com.orm.query;
 
-import com.orm.models.TestRecord;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.TestRecord;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
 
 import static junit.framework.Assert.assertEquals;
 
-public class SelectTest {
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class SelectTest {
 
     @Test
     public void testMergeCondition(){
@@ -22,7 +29,6 @@ public void testMergeCondition(){
         assertEquals("2", where.getArgs()[1]);
     }
 
-
     @Test
     public void testWhere(){
         Select where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"));
diff --git a/library/src/test/java/com/orm/record/BigDecimalFieldTests.java b/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
index ed2bddc9..a877a6af 100644
--- a/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
+++ b/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
@@ -1,63 +1,59 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
-import com.orm.SugarRecord;
-import com.orm.models.BigDecimalFieldAnnotatedModel;
-import com.orm.models.BigDecimalFieldExtendedModel;
-
-import org.junit.Before;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.BigDecimalFieldAnnotatedModel;
+import com.orm.model.BigDecimalFieldExtendedModel;
+
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.math.BigDecimal;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class BigDecimalFieldTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class BigDecimalFieldTests {
+    private BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
 
     @Test
     public void nullBigDecimalExtendedTest() {
         save(new BigDecimalFieldExtendedModel());
-        BigDecimalFieldExtendedModel model =
-                SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
+        BigDecimalFieldExtendedModel model = findById(BigDecimalFieldExtendedModel.class, 1);
         assertNull(model.getBigDecimal());
     }
 
     @Test
     public void nullBigDecimalAnnotatedTest() {
         save(new BigDecimalFieldAnnotatedModel());
-        BigDecimalFieldAnnotatedModel model =
-                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
+        BigDecimalFieldAnnotatedModel model = findById(BigDecimalFieldAnnotatedModel.class, 1);
         assertNull(model.getBigDecimal());
     }
 
     @Test
     public void bigDecimalExtendedTest() {
-        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
         save(new BigDecimalFieldExtendedModel(decimal));
-        BigDecimalFieldExtendedModel model = SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
+        BigDecimalFieldExtendedModel model = findById(BigDecimalFieldExtendedModel.class, 1);
         assertEquals(decimal, model.getBigDecimal());
     }
 
     @Test
     public void bigDecimalAnnotatedTest() {
-        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
         save(new BigDecimalFieldAnnotatedModel(decimal));
-        BigDecimalFieldAnnotatedModel model =
-                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
+        BigDecimalFieldAnnotatedModel model = findById(BigDecimalFieldAnnotatedModel.class, 1);
         assertEquals(decimal, model.getBigDecimal());
     }
+
+    @After
+    public void after() {
+        decimal = null;
+    }
 }
diff --git a/library/src/test/java/com/orm/record/BooleanFieldTests.java b/library/src/test/java/com/orm/record/BooleanFieldTests.java
index 4038adf4..2966aedd 100644
--- a/library/src/test/java/com/orm/record/BooleanFieldTests.java
+++ b/library/src/test/java/com/orm/record/BooleanFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.BooleanFieldAnnotatedModel;
-import com.orm.models.BooleanFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.BooleanFieldAnnotatedModel;
+import com.orm.model.BooleanFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,13 +16,8 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class BooleanFieldTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class BooleanFieldTests {
 
     @Test
     public void nullBooleanExtendedTest() {
diff --git a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
index fe3e7e92..73fdd6da 100644
--- a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
+++ b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.ByteArrayAnnotatedModel;
-import com.orm.models.ByteArrayExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.ByteArrayAnnotatedModel;
+import com.orm.model.ByteArrayExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,14 +16,8 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class ByteArrayFieldTests {
-
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class ByteArrayFieldTests {
 
     @Test
     public void nullByteArrayExtendedTest() {
diff --git a/library/src/test/java/com/orm/record/CursorTests.java b/library/src/test/java/com/orm/record/CursorTests.java
index a698b69b..a6036a15 100644
--- a/library/src/test/java/com/orm/record/CursorTests.java
+++ b/library/src/test/java/com/orm/record/CursorTests.java
@@ -9,16 +9,15 @@
 import android.widget.CursorAdapter;
 import android.widget.TextView;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
-import com.orm.models.SimpleModel;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.SimpleModel;
 import com.orm.query.Select;
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -27,13 +26,8 @@
 import static junit.framework.Assert.assertSame;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class CursorTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class CursorTests {
 
     @Test
     public void testColumnNames() {
diff --git a/library/src/test/java/com/orm/record/DoubleFieldTests.java b/library/src/test/java/com/orm/record/DoubleFieldTests.java
index f5d9ce36..96ea7f48 100644
--- a/library/src/test/java/com/orm/record/DoubleFieldTests.java
+++ b/library/src/test/java/com/orm/record/DoubleFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.DoubleFieldAnnotatedModel;
-import com.orm.models.DoubleFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.DoubleFieldAnnotatedModel;
+import com.orm.model.DoubleFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,13 +16,8 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class, manifest = Config.NONE)
-public class DoubleFieldTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class DoubleFieldTests {
 
     @Test
     public void nullDoubleExtendedTest() {
diff --git a/library/src/test/java/com/orm/record/EnumFieldTests.java b/library/src/test/java/com/orm/record/EnumFieldTests.java
index bbceb2c7..d41d4025 100644
--- a/library/src/test/java/com/orm/record/EnumFieldTests.java
+++ b/library/src/test/java/com/orm/record/EnumFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.EnumFieldAnnotatedModel;
-import com.orm.models.EnumFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.EnumFieldAnnotatedModel;
+import com.orm.model.EnumFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -19,13 +17,8 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, application = ClientApp.class)
-public class EnumFieldTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class EnumFieldTests {
 
     @Test
     public void nullDefaultEnumExtendedTest() {
diff --git a/library/src/test/java/com/orm/record/FirstAndLastTests.java b/library/src/test/java/com/orm/record/FirstAndLastTests.java
index 8c8e2d8d..278b82f0 100644
--- a/library/src/test/java/com/orm/record/FirstAndLastTests.java
+++ b/library/src/test/java/com/orm/record/FirstAndLastTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.FloatFieldAnnotatedModel;
-import com.orm.models.FloatFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.FloatFieldAnnotatedModel;
+import com.orm.model.FloatFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,14 +16,9 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class FirstAndLastTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     @SuppressWarnings("all")
     public void firstExtendedTest() {
diff --git a/library/src/test/java/com/orm/record/FloatFieldTests.java b/library/src/test/java/com/orm/record/FloatFieldTests.java
index f6016690..48317fcf 100644
--- a/library/src/test/java/com/orm/record/FloatFieldTests.java
+++ b/library/src/test/java/com/orm/record/FloatFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.FloatFieldAnnotatedModel;
-import com.orm.models.FloatFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.FloatFieldAnnotatedModel;
+import com.orm.model.FloatFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,13 +16,8 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class FloatFieldTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class FloatFieldTests {
 
     @Test
     public void nullFloatExtendedTest() {
diff --git a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
index d421f60a..9834829f 100644
--- a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
+++ b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
@@ -2,15 +2,13 @@
 
 import android.database.sqlite.SQLiteException;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
-import com.orm.models.IncompleteAnnotatedModel;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.IncompleteAnnotatedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.delete;
@@ -18,15 +16,10 @@
 import static org.junit.Assert.assertFalse;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class IncompleteAnnotatedModelTests {
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class IncompleteAnnotatedModelTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
-    @Test(expected=SQLiteException.class)
+    @Test(expected = SQLiteException.class)
     public void saveNoIdFieldTest() {
         save(new IncompleteAnnotatedModel());
     }
diff --git a/library/src/test/java/com/orm/record/IntegerFieldTests.java b/library/src/test/java/com/orm/record/IntegerFieldTests.java
index fca422c0..b9ebf11d 100644
--- a/library/src/test/java/com/orm/record/IntegerFieldTests.java
+++ b/library/src/test/java/com/orm/record/IntegerFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.IntegerFieldAnnotatedModel;
-import com.orm.models.IntegerFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.IntegerFieldAnnotatedModel;
+import com.orm.model.IntegerFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,14 +16,9 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class IntegerFieldTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     public void nullIntegerExtendedTest() {
         save(new IntegerFieldExtendedModel());
diff --git a/library/src/test/java/com/orm/record/ListAllOrderByTests.java b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
index e401bd6b..c5f34916 100644
--- a/library/src/test/java/com/orm/record/ListAllOrderByTests.java
+++ b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
@@ -1,15 +1,13 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.IntegerFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.IntegerFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -19,14 +17,8 @@
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class ListAllOrderByTests {
-
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class ListAllOrderByTests {
 
     @Test
     public void listAllOrderByEmptyTest() {
diff --git a/library/src/test/java/com/orm/record/LongFieldTests.java b/library/src/test/java/com/orm/record/LongFieldTests.java
index fe6001ea..bcb95c24 100644
--- a/library/src/test/java/com/orm/record/LongFieldTests.java
+++ b/library/src/test/java/com/orm/record/LongFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.LongFieldAnnotatedModel;
-import com.orm.models.LongFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.LongFieldAnnotatedModel;
+import com.orm.model.LongFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,14 +16,9 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class LongFieldTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     public void nullLongExtendedTest() {
         save(new LongFieldExtendedModel());
diff --git a/library/src/test/java/com/orm/record/MultipleSaveTests.java b/library/src/test/java/com/orm/record/MultipleSaveTests.java
index 5c1ec96e..78406380 100644
--- a/library/src/test/java/com/orm/record/MultipleSaveTests.java
+++ b/library/src/test/java/com/orm/record/MultipleSaveTests.java
@@ -1,17 +1,15 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.StringFieldAnnotatedModel;
-import com.orm.models.StringFieldAnnotatedNoIdModel;
-import com.orm.models.StringFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.StringFieldAnnotatedModel;
+import com.orm.model.StringFieldAnnotatedNoIdModel;
+import com.orm.model.StringFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -19,14 +17,9 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class MultipleSaveTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     public void stringMultipleSaveOriginalExtendedTest() {
         String string = "Test String";
diff --git a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
index ede95593..66fc2c79 100644
--- a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
+++ b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
@@ -1,17 +1,15 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.NestedAnnotatedModel;
-import com.orm.models.RelationshipAnnotatedModel;
-import com.orm.models.SimpleAnnotatedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.NestedAnnotatedModel;
+import com.orm.model.RelationshipAnnotatedModel;
+import com.orm.model.SimpleAnnotatedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -20,13 +18,8 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class NestedAnnotatedTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class NestedAnnotatedTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/library/src/test/java/com/orm/record/NestedExtendedTests.java b/library/src/test/java/com/orm/record/NestedExtendedTests.java
index 5f737166..33823754 100644
--- a/library/src/test/java/com/orm/record/NestedExtendedTests.java
+++ b/library/src/test/java/com/orm/record/NestedExtendedTests.java
@@ -1,17 +1,15 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.NestedExtendedModel;
-import com.orm.models.RelationshipExtendedModel;
-import com.orm.models.SimpleExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.NestedExtendedModel;
+import com.orm.model.RelationshipExtendedModel;
+import com.orm.model.SimpleExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -20,13 +18,8 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class NestedExtendedTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class NestedExtendedTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/library/src/test/java/com/orm/record/NestedMixedAATests.java b/library/src/test/java/com/orm/record/NestedMixedAATests.java
index cb5335b4..1a8f1b43 100644
--- a/library/src/test/java/com/orm/record/NestedMixedAATests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedAATests.java
@@ -1,17 +1,15 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.NestedMixedAAModel;
-import com.orm.models.RelationshipMixedAModel;
-import com.orm.models.SimpleAnnotatedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.NestedMixedAAModel;
+import com.orm.model.RelationshipMixedAModel;
+import com.orm.model.SimpleAnnotatedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -20,13 +18,8 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class NestedMixedAATests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class NestedMixedAATests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/library/src/test/java/com/orm/record/NestedMixedABTests.java b/library/src/test/java/com/orm/record/NestedMixedABTests.java
index 3677a312..110d82c0 100644
--- a/library/src/test/java/com/orm/record/NestedMixedABTests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedABTests.java
@@ -1,17 +1,15 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.NestedMixedABModel;
-import com.orm.models.RelationshipMixedBModel;
-import com.orm.models.SimpleExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.NestedMixedABModel;
+import com.orm.model.RelationshipMixedBModel;
+import com.orm.model.SimpleExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -20,14 +18,9 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class NestedMixedABTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     public void emptyDatabaseTest() throws Exception {
         assertEquals(0L, SugarRecord.count(NestedMixedABModel.class));
diff --git a/library/src/test/java/com/orm/record/NestedMixedBATests.java b/library/src/test/java/com/orm/record/NestedMixedBATests.java
index 5dfd0757..edc1c575 100644
--- a/library/src/test/java/com/orm/record/NestedMixedBATests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedBATests.java
@@ -1,17 +1,15 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.NestedMixedBAModel;
-import com.orm.models.RelationshipMixedAModel;
-import com.orm.models.SimpleAnnotatedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.NestedMixedBAModel;
+import com.orm.model.RelationshipMixedAModel;
+import com.orm.model.SimpleAnnotatedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -20,13 +18,8 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class NestedMixedBATests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class NestedMixedBATests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/library/src/test/java/com/orm/record/NestedMixedBBTests.java b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
index e2625eae..c5ebd4ca 100644
--- a/library/src/test/java/com/orm/record/NestedMixedBBTests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
@@ -1,17 +1,15 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.NestedMixedBBModel;
-import com.orm.models.RelationshipMixedBModel;
-import com.orm.models.SimpleExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.NestedMixedBBModel;
+import com.orm.model.RelationshipMixedBModel;
+import com.orm.model.SimpleExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -20,14 +18,9 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class NestedMixedBBTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     public void emptyDatabaseTest() throws Exception {
         assertEquals(0L, SugarRecord.count(NestedMixedBBModel.class));
diff --git a/library/src/test/java/com/orm/record/NoSugarModelTests.java b/library/src/test/java/com/orm/record/NoSugarModelTests.java
index b77858f6..14b16493 100644
--- a/library/src/test/java/com/orm/record/NoSugarModelTests.java
+++ b/library/src/test/java/com/orm/record/NoSugarModelTests.java
@@ -1,28 +1,21 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.NoSugarModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.NoSugarModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class NoSugarModelTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class NoSugarModelTests {
 
     @Test
     public void deleteTest() throws Exception {
diff --git a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
index df229b90..fec134db 100644
--- a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.RelationshipAnnotatedModel;
-import com.orm.models.SimpleAnnotatedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.RelationshipAnnotatedModel;
+import com.orm.model.SimpleAnnotatedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -19,13 +17,8 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class RelationshipAnnotatedTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class RelationshipAnnotatedTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
index 6b3a7400..1ff689ee 100644
--- a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.RelationshipExtendedModel;
-import com.orm.models.SimpleExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.RelationshipExtendedModel;
+import com.orm.model.SimpleExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -19,14 +17,9 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class RelationshipExtendedTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     public void emptyDatabaseTest() throws Exception {
         assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
diff --git a/library/src/test/java/com/orm/record/RelationshipMixedATests.java b/library/src/test/java/com/orm/record/RelationshipMixedATests.java
new file mode 100644
index 00000000..35aaa16d
--- /dev/null
+++ b/library/src/test/java/com/orm/record/RelationshipMixedATests.java
@@ -0,0 +1,141 @@
+package com.orm.record;
+
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.RelationshipMixedAModel;
+import com.orm.model.SimpleAnnotatedModel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class RelationshipMixedATests {
+
+    @Test
+    public void emptyDatabaseTest() throws Exception {
+        assertEquals(0L, count(RelationshipMixedAModel.class));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
+    }
+
+    @Test
+    public void oneSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        RelationshipMixedAModel mixedAModel = new RelationshipMixedAModel(simple);
+
+        save(simple);
+        save(mixedAModel);
+
+        assertEquals(1L, count(simple.getClass()));
+        assertEquals(1L, count(mixedAModel.getClass()));
+    }
+
+    @Test
+    public void twoSameSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        RelationshipMixedAModel mixedAModel1 = new RelationshipMixedAModel(simple);
+        RelationshipMixedAModel mixedAModel2 = new RelationshipMixedAModel(simple);
+
+
+        save(simple);
+        save(mixedAModel1);
+        save(mixedAModel2);
+
+        assertEquals(1L, count(simple.getClass()));
+        assertEquals(2L, count(mixedAModel1.getClass()));
+    }
+
+    @Test
+    public void twoDifferentSaveTest() throws Exception {
+        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        RelationshipMixedAModel mixedAModel = new RelationshipMixedAModel(simple);
+        RelationshipMixedAModel anotherMixedAModel = new RelationshipMixedAModel(anotherSimple);
+
+        save(simple);
+        save(anotherSimple);
+        save(mixedAModel);
+        save(anotherMixedAModel);
+
+        assertEquals(2L, count(simple.getClass()));
+        assertEquals(2L, count(mixedAModel.getClass()));
+    }
+
+    @Test
+    public void manySameSaveTest() throws Exception {
+        final SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+        RelationshipMixedAModel mixedAModel = null;
+        save(simple);
+
+        for (int i = 1; i <= 100; i++) {
+            mixedAModel = new RelationshipMixedAModel(simple);
+            save(mixedAModel);
+        }
+
+        assertEquals(1L, count(simple.getClass()));
+        assertEquals(100L, count(mixedAModel.getClass()));
+    }
+
+    @Test
+    public void manyDifferentSaveTest() throws Exception {
+        SimpleAnnotatedModel simple = null;
+        RelationshipMixedAModel mixedAModel = null;
+
+        for (int i = 1; i <= 100; i++) {
+            simple = new SimpleAnnotatedModel();
+            mixedAModel = new RelationshipMixedAModel(simple);
+
+            save(simple);
+            save(mixedAModel);
+        }
+
+        assertEquals(100L, count(simple.getClass()));
+        assertEquals(100L, count(mixedAModel.getClass()));
+    }
+
+    @Test
+    public void listAllSameTest() throws Exception {
+        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+
+        for (int i = 1; i <= 100; i++) {
+            RelationshipMixedAModel mixedAModel = new RelationshipMixedAModel(simple);
+
+            save(simple);
+            save(mixedAModel);
+        }
+
+        List<RelationshipMixedAModel> models = listAll(RelationshipMixedAModel.class);
+        assertEquals(100, models.size());
+
+        for (RelationshipMixedAModel model : models) {
+            assertEquals(simple.getId(), model.getSimple().getId());
+        }
+    }
+
+    @Test
+    public void listAllDifferentTest() throws Exception {
+        for (int i = 1; i <= 100; i++) {
+            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+
+            save(simple);
+            save(new RelationshipMixedAModel(simple));
+        }
+
+        List<RelationshipMixedAModel> models = listAll(RelationshipMixedAModel.class);
+        assertEquals(100, models.size());
+
+        for (RelationshipMixedAModel model : models) {
+            assertEquals(model.getId(), model.getSimple().getId());
+        }
+    }
+}
diff --git a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
index 419ba98b..112cdd50 100644
--- a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.RelationshipMixedBModel;
-import com.orm.models.SimpleExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.RelationshipMixedBModel;
+import com.orm.model.SimpleExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
@@ -19,14 +17,9 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class RelationshipMixedBTests {
 
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
     @Test
     public void emptyDatabaseTest() throws Exception {
         assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
@@ -103,7 +96,6 @@ public void listAllSameTest() throws Exception {
 
     @Test
     public void listAllDifferentTest() throws Exception {
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 1; i <= 100; i++) {
             SimpleExtendedModel simple = new SimpleExtendedModel();
             save(simple);
diff --git a/library/src/test/java/com/orm/record/ShortFieldTests.java b/library/src/test/java/com/orm/record/ShortFieldTests.java
index efe36cf0..489325fc 100644
--- a/library/src/test/java/com/orm/record/ShortFieldTests.java
+++ b/library/src/test/java/com/orm/record/ShortFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.ShortFieldAnnotatedModel;
-import com.orm.models.ShortFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.ShortFieldAnnotatedModel;
+import com.orm.model.ShortFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,13 +16,8 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class ShortFieldTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class ShortFieldTests {
 
     @Test
     public void nullShortExtendedTest() {
diff --git a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
index 837f4403..6e4b9a7a 100644
--- a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
+++ b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
+import com.orm.dsl.BuildConfig;
 import com.orm.helper.NamingHelper;
-import com.orm.models.SimpleAnnotatedModel;
+import com.orm.model.SimpleAnnotatedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.lang.reflect.Field;
@@ -27,13 +25,8 @@
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class SimpleAnnotatedModelTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class SimpleAnnotatedModelTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
diff --git a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
index 592a1511..4cd7bdbe 100644
--- a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
+++ b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
+import com.orm.dsl.BuildConfig;
 import com.orm.helper.NamingHelper;
-import com.orm.models.SimpleExtendedModel;
+import com.orm.model.SimpleExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.lang.reflect.Field;
@@ -27,13 +25,8 @@
 import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class SimpleExtendedModelTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class SimpleExtendedModelTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
@@ -334,7 +327,6 @@ public void findWithQueryAsIteratorTest() throws Exception {
                                                     "Select * from " +
                                                     NamingHelper.toTableName(SimpleExtendedModel.class) +
                                                     " where id >= ? ", "50");
-        SugarContext.init(RuntimeEnvironment.application);
         for (int i = 50; i <= 100; i++) {
             assertTrue(cursor.hasNext());
             SimpleExtendedModel model = cursor.next();
diff --git a/library/src/test/java/com/orm/record/StringFieldTests.java b/library/src/test/java/com/orm/record/StringFieldTests.java
index 6fd800cd..8b6af73a 100644
--- a/library/src/test/java/com/orm/record/StringFieldTests.java
+++ b/library/src/test/java/com/orm/record/StringFieldTests.java
@@ -1,16 +1,14 @@
 package com.orm.record;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.SugarContext;
+import com.orm.app.ClientApp;
 import com.orm.SugarRecord;
-import com.orm.models.StringFieldAnnotatedModel;
-import com.orm.models.StringFieldExtendedModel;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.StringFieldAnnotatedModel;
+import com.orm.model.StringFieldExtendedModel;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
@@ -18,14 +16,8 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18, application = ClientApp.class)
-public class StringFieldTests {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-    }
-
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class StringFieldTests {
 
     @Test
     public void nullStringExtendedTest() {
diff --git a/library/src/test/java/com/orm/util/ContextUtilTest.java b/library/src/test/java/com/orm/util/ContextUtilTest.java
index b4bd9042..46372db9 100644
--- a/library/src/test/java/com/orm/util/ContextUtilTest.java
+++ b/library/src/test/java/com/orm/util/ContextUtilTest.java
@@ -2,14 +2,13 @@
 
 import android.content.Context;
 
-import com.orm.ClientApp;
-import com.orm.RobolectricGradleTestRunner;
+import com.orm.app.ClientApp;
 import com.orm.SugarContext;
+import com.orm.dsl.BuildConfig;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static junit.framework.Assert.assertNotNull;
@@ -20,13 +19,8 @@
  * @author jonatan.salas
  */
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, application = ClientApp.class, manifest = Config.NONE)
-public class ContextUtilTest {
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application.getApplicationContext());
-    }
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class ContextUtilTest {
 
     @Test
     public void testInitContext() {
diff --git a/library/src/test/java/com/orm/util/KeyWordUtilTest.java b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
index 0f132e3a..d2d44b09 100644
--- a/library/src/test/java/com/orm/util/KeyWordUtilTest.java
+++ b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
@@ -7,7 +7,7 @@
 /**
  * @author jonatan.salas
  */
-public class KeyWordUtilTest {
+public final class KeyWordUtilTest {
 
     @Test
     public void testKeyWord() {
diff --git a/library/src/test/java/com/orm/util/MigrationFileParserTest.java b/library/src/test/java/com/orm/util/MigrationFileParserTest.java
index 72b9f9ca..9b2d87ce 100644
--- a/library/src/test/java/com/orm/util/MigrationFileParserTest.java
+++ b/library/src/test/java/com/orm/util/MigrationFileParserTest.java
@@ -6,7 +6,7 @@
 
 import static junit.framework.Assert.assertEquals;
 
-public class MigrationFileParserTest {
+public final class MigrationFileParserTest {
 
     @Test
     public void testSingleLineStatement() {
diff --git a/library/src/test/java/com/orm/util/NumberComparatorTest.java b/library/src/test/java/com/orm/util/NumberComparatorTest.java
index 2dd8458b..aaabf453 100644
--- a/library/src/test/java/com/orm/util/NumberComparatorTest.java
+++ b/library/src/test/java/com/orm/util/NumberComparatorTest.java
@@ -1,20 +1,14 @@
 package com.orm.util;
 
-import com.orm.RobolectricGradleTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 
 /**
  * @author jonatan.salas
  */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18)
-public class NumberComparatorTest {
+public final class NumberComparatorTest {
     private NumberComparator comparator;
 
     @Before
diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index 8efba281..eac94abc 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -1,11 +1,10 @@
 package com.orm.util;
 
-import com.orm.RobolectricGradleTestRunner;
-import com.orm.models.TestRecord;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.TestRecord;
 
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -16,9 +15,7 @@
 /**
  * @author jonatan.salas
  */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18)
-public class ReflectionUtilTest {
+public final class ReflectionUtilTest {
 
     @Test
     public void testGetTableFields() {
diff --git a/library/src/test/java/com/orm/util/SugarConfigTest.java b/library/src/test/java/com/orm/util/SugarConfigTest.java
index c694dee0..d27eb85d 100644
--- a/library/src/test/java/com/orm/util/SugarConfigTest.java
+++ b/library/src/test/java/com/orm/util/SugarConfigTest.java
@@ -1,12 +1,5 @@
 package com.orm.util;
 
-import com.orm.models.TestRecord;
-
-import org.junit.Test;
-
-import java.lang.reflect.Field;
-import java.util.List;
-
 /**
  * @author jonatan.salas
  */

From 445c63b19504f080ab761247e590d803756e1c28 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 9 Apr 2016 17:01:26 -0300
Subject: [PATCH 256/305] Added static import to replace SugarRecord class
 import

---
 .../com/orm/record/BooleanFieldTests.java     |  15 +-
 .../com/orm/record/ByteArrayFieldTests.java   |  11 +-
 .../java/com/orm/record/DoubleFieldTests.java |  18 +-
 .../java/com/orm/record/EnumFieldTests.java   |  31 ++--
 .../com/orm/record/FirstAndLastTests.java     | 163 +++++++++---------
 .../java/com/orm/record/FloatFieldTests.java  |  39 +++--
 .../record/IncompleteAnnotatedModelTests.java |   1 +
 .../com/orm/record/IntegerFieldTests.java     |  32 ++--
 .../com/orm/record/ListAllOrderByTests.java   |  29 ++--
 .../java/com/orm/record/LongFieldTests.java   |  41 ++---
 .../com/orm/record/MultipleSaveTests.java     |  76 ++++----
 .../com/orm/record/NestedAnnotatedTests.java  |  60 ++++---
 .../com/orm/record/NestedExtendedTests.java   |  58 ++++---
 .../com/orm/record/NestedMixedAATests.java    |  59 ++++---
 .../com/orm/record/NestedMixedABTests.java    |  68 +++++---
 .../com/orm/record/NestedMixedBATests.java    |  67 ++++---
 .../com/orm/record/NestedMixedBBTests.java    |  70 +++++---
 .../com/orm/record/NoSugarModelTests.java     |  11 +-
 .../record/RelationshipAnnotatedTests.java    |  54 +++---
 .../orm/record/RelationshipExtendedTests.java |  54 +++---
 .../orm/record/RelationshipMixedBTests.java   |  49 +++---
 .../java/com/orm/record/ShortFieldTests.java  |  39 +++--
 .../orm/record/SimpleAnnotatedModelTests.java | 140 ++++++++-------
 .../orm/record/SimpleExtendedModelTests.java  | 136 ++++++++-------
 .../java/com/orm/record/StringFieldTests.java |  14 +-
 25 files changed, 746 insertions(+), 589 deletions(-)

diff --git a/library/src/test/java/com/orm/record/BooleanFieldTests.java b/library/src/test/java/com/orm/record/BooleanFieldTests.java
index 2966aedd..3a026a48 100644
--- a/library/src/test/java/com/orm/record/BooleanFieldTests.java
+++ b/library/src/test/java/com/orm/record/BooleanFieldTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.BooleanFieldAnnotatedModel;
 import com.orm.model.BooleanFieldExtendedModel;
@@ -12,6 +11,8 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -22,28 +23,28 @@ public final class BooleanFieldTests {
     @Test
     public void nullBooleanExtendedTest() {
         save(new BooleanFieldExtendedModel());
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        BooleanFieldExtendedModel model = findById(BooleanFieldExtendedModel.class, 1);
         assertNull(model.getBoolean());
     }
 
     @Test
     public void nullRawBooleanExtendedTest() {
         save(new BooleanFieldExtendedModel());
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        BooleanFieldExtendedModel model = findById(BooleanFieldExtendedModel.class, 1);
         assertEquals(false, model.getRawBoolean());
     }
 
     @Test
     public void nullBooleanAnnotatedTest() {
         save(new BooleanFieldAnnotatedModel());
-        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        BooleanFieldAnnotatedModel model = findById(BooleanFieldAnnotatedModel.class, 1);
         assertNull(model.getBoolean());
     }
 
     @Test
     public void nullRawBooleanAnnotatedTest() {
         save(new BooleanFieldAnnotatedModel());
-        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        BooleanFieldAnnotatedModel model = findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(false, model.getRawBoolean());
     }
 
@@ -58,7 +59,7 @@ public void nullRawBooleanAnnotatedTest() {
     @Test
     public void rawBooleanExtendedTest() {
         save(new BooleanFieldExtendedModel(true));
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        BooleanFieldExtendedModel model = findById(BooleanFieldExtendedModel.class, 1);
         assertEquals(true, model.getRawBoolean());
     }
 
@@ -76,7 +77,7 @@ public void rawBooleanExtendedTest() {
     @Test
     public void rawBooleanAnnotatedTest() {
         save(new BooleanFieldAnnotatedModel(true));
-        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
+        BooleanFieldAnnotatedModel model = findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(true, model.getRawBoolean());
     }
 }
diff --git a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
index 73fdd6da..450823f2 100644
--- a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
+++ b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.ByteArrayAnnotatedModel;
 import com.orm.model.ByteArrayExtendedModel;
@@ -12,6 +11,8 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
@@ -23,7 +24,7 @@ public final class ByteArrayFieldTests {
     public void nullByteArrayExtendedTest() {
         byte[] array = "".getBytes();
         save(new ByteArrayExtendedModel());
-        ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
+        ByteArrayExtendedModel model = findById(ByteArrayExtendedModel.class, 1);
         assertEquals(new String(array), new String(model.getByteArray()));
         assertArrayEquals(array, model.getByteArray());
     }
@@ -32,7 +33,7 @@ public void nullByteArrayExtendedTest() {
     public void nullByteArrayAnnotatedTest() {
         byte[] array = "".getBytes();
         save(new ByteArrayAnnotatedModel());
-        ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
+        ByteArrayAnnotatedModel model = findById(ByteArrayAnnotatedModel.class, 1);
         assertEquals(new String(array), new String(model.getByteArray()));
         assertArrayEquals(array, model.getByteArray());
     }
@@ -41,7 +42,7 @@ public void nullByteArrayAnnotatedTest() {
     public void byteArrayExtendedTest() {
         byte[] array = "hello".getBytes();
         save(new ByteArrayExtendedModel(array));
-        ByteArrayExtendedModel model = SugarRecord.findById(ByteArrayExtendedModel.class, 1);
+        ByteArrayExtendedModel model = findById(ByteArrayExtendedModel.class, 1);
         assertEquals(new String(array), new String(model.getByteArray()));
         assertArrayEquals(array, model.getByteArray());
     }
@@ -50,7 +51,7 @@ public void byteArrayExtendedTest() {
     public void byteArrayAnnotatedTest() {
         byte[] array = "hello".getBytes();
         save(new ByteArrayAnnotatedModel(array));
-        ByteArrayAnnotatedModel model = SugarRecord.findById(ByteArrayAnnotatedModel.class, 1);
+        ByteArrayAnnotatedModel model = findById(ByteArrayAnnotatedModel.class, 1);
         assertEquals(new String(array), new String(model.getByteArray()));
         assertArrayEquals(array, model.getByteArray());
     }
diff --git a/library/src/test/java/com/orm/record/DoubleFieldTests.java b/library/src/test/java/com/orm/record/DoubleFieldTests.java
index 96ea7f48..a05fa3e0 100644
--- a/library/src/test/java/com/orm/record/DoubleFieldTests.java
+++ b/library/src/test/java/com/orm/record/DoubleFieldTests.java
@@ -12,6 +12,8 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -22,28 +24,28 @@ public final class DoubleFieldTests {
     @Test
     public void nullDoubleExtendedTest() {
         save(new DoubleFieldExtendedModel());
-        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        DoubleFieldExtendedModel model = findById(DoubleFieldExtendedModel.class, 1);
         assertNull(model.getDouble());
     }
 
     @Test
     public void nullRawDoubleExtendedTest() {
         save(new DoubleFieldExtendedModel());
-        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        DoubleFieldExtendedModel model = findById(DoubleFieldExtendedModel.class, 1);
         assertEquals(0.0, model.getRawDouble(), 0.0000000001);
     }
 
     @Test
     public void nullDoubleAnnotatedTest() {
         save(new DoubleFieldAnnotatedModel());
-        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        DoubleFieldAnnotatedModel model = findById(DoubleFieldAnnotatedModel.class, 1);
         assertNull(model.getDouble());
     }
 
     @Test
     public void nullRawDoubleAnnotatedTest() {
         save(new DoubleFieldAnnotatedModel());
-        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        DoubleFieldAnnotatedModel model = findById(DoubleFieldAnnotatedModel.class, 1);
         assertEquals(0.0, model.getRawDouble(), 0.0000000001);
     }
 
@@ -52,14 +54,14 @@ public void nullRawDoubleAnnotatedTest() {
     public void objectDoubleExtendedTest() {
         Double objectDouble = Double.valueOf(25.0);
         save(new DoubleFieldExtendedModel(objectDouble));
-        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        DoubleFieldExtendedModel model = findById(DoubleFieldExtendedModel.class, 1);
         assertEquals(objectDouble, model.getDouble());
     }
 
     @Test
     public void rawDoubleExtendedTest() {
         save(new DoubleFieldExtendedModel(25.0));
-        DoubleFieldExtendedModel model = SugarRecord.findById(DoubleFieldExtendedModel.class, 1);
+        DoubleFieldExtendedModel model = findById(DoubleFieldExtendedModel.class, 1);
         assertEquals(25.0, model.getRawDouble(), 0.0000000001);
     }
 
@@ -68,14 +70,14 @@ public void rawDoubleExtendedTest() {
     public void objectDoubleAnnotatedTest() {
         Double objectDouble = Double.valueOf(25.0);
         save(new DoubleFieldAnnotatedModel(objectDouble));
-        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        DoubleFieldAnnotatedModel model = findById(DoubleFieldAnnotatedModel.class, 1);
         assertEquals(objectDouble, model.getDouble());
     }
 
     @Test
     public void rawDoubleAnnotatedTest() {
         save(new DoubleFieldAnnotatedModel(25.0));
-        DoubleFieldAnnotatedModel model = SugarRecord.findById(DoubleFieldAnnotatedModel.class, 1);
+        DoubleFieldAnnotatedModel model = findById(DoubleFieldAnnotatedModel.class, 1);
         assertEquals(25.0, model.getRawDouble(), 0.0000000001);
     }
 }
diff --git a/library/src/test/java/com/orm/record/EnumFieldTests.java b/library/src/test/java/com/orm/record/EnumFieldTests.java
index d41d4025..42647b00 100644
--- a/library/src/test/java/com/orm/record/EnumFieldTests.java
+++ b/library/src/test/java/com/orm/record/EnumFieldTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.EnumFieldAnnotatedModel;
 import com.orm.model.EnumFieldExtendedModel;
@@ -12,6 +11,10 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+import static com.orm.model.EnumFieldExtendedModel.DefaultEnum;
+import static com.orm.model.EnumFieldExtendedModel.OverrideEnum;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -23,53 +26,51 @@ public final class EnumFieldTests {
     @Test
     public void nullDefaultEnumExtendedTest() {
         save(new EnumFieldExtendedModel());
-        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        EnumFieldExtendedModel model = findById(EnumFieldExtendedModel.class, 1);
         assertNull(model.getDefaultEnum());
     }
 
     @Test
     public void nullOverriddenEnumExtendedTest() {
         save(new EnumFieldExtendedModel());
-        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        EnumFieldExtendedModel model = findById(EnumFieldExtendedModel.class, 1);
         assertNull(model.getOverrideEnum());
     }
     @Test
     public void nullDefaultEnumAnnotatedTest() {
         save(new EnumFieldAnnotatedModel());
-        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        EnumFieldAnnotatedModel model = findById(EnumFieldAnnotatedModel.class, 1);
         assertNull(model.getDefaultEnum());
     }
 
     @Test
     public void nullOverriddenEnumAnnotatedTest() {
         save(new EnumFieldAnnotatedModel());
-        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        EnumFieldAnnotatedModel model = findById(EnumFieldAnnotatedModel.class, 1);
         assertNull(model.getOverrideEnum());
     }
 
     @Test
     public void defaultEnumExtendedTest() {
-        save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
-                EnumFieldExtendedModel.DefaultEnum.TWO));
-        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        save(new EnumFieldExtendedModel(OverrideEnum.ONE, DefaultEnum.TWO));
+        EnumFieldExtendedModel model = findById(EnumFieldExtendedModel.class, 1);
         assertNotNull(model);
-        assertEquals(model.getDefaultEnum(), EnumFieldExtendedModel.DefaultEnum.TWO);
+        assertEquals(model.getDefaultEnum(), DefaultEnum.TWO);
     }
 
     @Test
     public void overriddenEnumExtendedTest() {
-        save(new EnumFieldExtendedModel(EnumFieldExtendedModel.OverrideEnum.ONE,
-                EnumFieldExtendedModel.DefaultEnum.TWO));
-        EnumFieldExtendedModel model = SugarRecord.findById(EnumFieldExtendedModel.class, 1);
+        save(new EnumFieldExtendedModel(OverrideEnum.ONE, DefaultEnum.TWO));
+        EnumFieldExtendedModel model = findById(EnumFieldExtendedModel.class, 1);
         assertNotNull(model);
-        assertEquals(model.getOverrideEnum(), EnumFieldExtendedModel.OverrideEnum.ONE);
+        assertEquals(model.getOverrideEnum(), OverrideEnum.ONE);
     }
 
     @Test
     public void defaultEnumAnnotatedTest() {
         save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
                 EnumFieldAnnotatedModel.DefaultEnum.TWO));
-        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        EnumFieldAnnotatedModel model = findById(EnumFieldAnnotatedModel.class, 1);
         assertNotNull(model);
         assertEquals(model.getDefaultEnum(), EnumFieldAnnotatedModel.DefaultEnum.TWO);
     }
@@ -78,7 +79,7 @@ public void defaultEnumAnnotatedTest() {
     public void overriddenEnumAnnotatedTest() {
         save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
                 EnumFieldAnnotatedModel.DefaultEnum.TWO));
-        EnumFieldAnnotatedModel model = SugarRecord.findById(EnumFieldAnnotatedModel.class, 1);
+        EnumFieldAnnotatedModel model = findById(EnumFieldAnnotatedModel.class, 1);
         assertNotNull(model);
         assertEquals(model.getOverrideEnum(), EnumFieldAnnotatedModel.OverrideEnum.ONE);
     }
diff --git a/library/src/test/java/com/orm/record/FirstAndLastTests.java b/library/src/test/java/com/orm/record/FirstAndLastTests.java
index 278b82f0..1b6db799 100644
--- a/library/src/test/java/com/orm/record/FirstAndLastTests.java
+++ b/library/src/test/java/com/orm/record/FirstAndLastTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.FloatFieldAnnotatedModel;
 import com.orm.model.FloatFieldExtendedModel;
@@ -12,6 +11,11 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.first;
+import static com.orm.SugarRecord.delete;
+import static com.orm.SugarRecord.findById;
+import static com.orm.SugarRecord.last;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -26,7 +30,7 @@ public void firstExtendedTest() {
         Float lastObjectFloat = 50F;
         save(new FloatFieldExtendedModel(firstObjectFloat));
         save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel model = first(FloatFieldExtendedModel.class);
 
         if (null != model) {
             assertEquals(firstObjectFloat, model.getFloat());
@@ -35,70 +39,70 @@ public void firstExtendedTest() {
 
     @Test
     public void firstDeletedRecordExtendedTest() {
-        Float firstObjectFloat = 15F;
-        Float secondObjectFloat = 25F;
-        Float thirdObjectFloat = 35F;
-        Float fourthObjectFloat = 45F;
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(secondObjectFloat));
-        save(new FloatFieldExtendedModel(thirdObjectFloat));
-        save(new FloatFieldExtendedModel(fourthObjectFloat));
-        FloatFieldExtendedModel firstRecord = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
-        firstRecord.delete();
-        FloatFieldExtendedModel model = SugarRecord.first(FloatFieldExtendedModel.class);
+        Float second = 25F;
+
+        save(new FloatFieldExtendedModel(15F));
+        save(new FloatFieldExtendedModel(second));
+        save(new FloatFieldExtendedModel(35F));
+        save(new FloatFieldExtendedModel(45F));
+
+        FloatFieldExtendedModel firstRecord = findById(FloatFieldExtendedModel.class, 1);
+        delete(firstRecord);
+        FloatFieldExtendedModel model = first(FloatFieldExtendedModel.class);
 
         if (null != model) {
-            assertEquals(secondObjectFloat, model.getFloat());
+            assertEquals(second, model.getFloat());
         }
     }
 
     @Test
     public void lastExtendedTest() {
-        Float firstObjectFloat = 25F;
-        Float lastObjectFloat = 50F;
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+        Float last = 50F;
+
+        save(new FloatFieldExtendedModel(25F));
+        save(new FloatFieldExtendedModel(last));
+
+        FloatFieldExtendedModel model = last(FloatFieldExtendedModel.class);
 
         if (null != model) {
-            assertEquals(lastObjectFloat, model.getFloat());
+            assertEquals(last, model.getFloat());
         }
     }
 
     @Test
     public void lastDeletedRecordExtendedTest() {
-        Float firstObjectFloat = 15F;
-        Float secondObjectFloat = 25F;
-        Float thirdObjectFloat = 35F;
-        Float fourthObjectFloat = 45F;
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(secondObjectFloat));
-        save(new FloatFieldExtendedModel(thirdObjectFloat));
-        save(new FloatFieldExtendedModel(fourthObjectFloat));
-        FloatFieldExtendedModel lastRecord = SugarRecord.findById(FloatFieldExtendedModel.class, 4);
-        lastRecord.delete();
-        FloatFieldExtendedModel model = SugarRecord.last(FloatFieldExtendedModel.class);
+        Float third = 35F;
+
+        save(new FloatFieldExtendedModel(15F));
+        save(new FloatFieldExtendedModel(25F));
+        save(new FloatFieldExtendedModel(third));
+        save(new FloatFieldExtendedModel(45F));
+
+        FloatFieldExtendedModel lastRecord = findById(FloatFieldExtendedModel.class, 4);
+        delete(lastRecord);
+        FloatFieldExtendedModel model = last(FloatFieldExtendedModel.class);
 
         if (null != model) {
-            assertEquals(thirdObjectFloat, model.getFloat());
+            assertEquals(third, model.getFloat());
         }
     }
 
     @Test
     public void nullFirstExtendedTest() {
-        assertNull(SugarRecord.first(FloatFieldExtendedModel.class));
+        assertNull(first(FloatFieldExtendedModel.class));
     }
 
     @Test
     public void nullLastExtendedTest() {
-        assertNull(SugarRecord.last(FloatFieldExtendedModel.class));
+        assertNull(last(FloatFieldExtendedModel.class));
     }
 
     @Test
     public void oneItemExtendedTest() {
         save(new FloatFieldExtendedModel(25F));
-        FloatFieldExtendedModel firstModel = SugarRecord.first(FloatFieldExtendedModel.class);
-        FloatFieldExtendedModel lastModel = SugarRecord.last(FloatFieldExtendedModel.class);
+
+        FloatFieldExtendedModel firstModel = first(FloatFieldExtendedModel.class);
+        FloatFieldExtendedModel lastModel = last(FloatFieldExtendedModel.class);
 
         if (null != firstModel && null != lastModel) {
             assertEquals(firstModel.getFloat(), lastModel.getFloat());
@@ -107,86 +111,89 @@ public void oneItemExtendedTest() {
 
     @Test
     public void firstAnnotatedTest() {
-        Float firstObjectFloat = 25F;
-        Float lastObjectFloat = 50F;
-        save(new FloatFieldAnnotatedModel(firstObjectFloat));
-        save(new FloatFieldAnnotatedModel(lastObjectFloat));
-        FloatFieldAnnotatedModel model = SugarRecord.first(FloatFieldAnnotatedModel.class);
+        Float first = 25F;
+
+        save(new FloatFieldAnnotatedModel(first));
+        save(new FloatFieldAnnotatedModel(50F));
+
+        FloatFieldAnnotatedModel model = first(FloatFieldAnnotatedModel.class);
 
         if (null != model) {
-            assertEquals(firstObjectFloat, model.getFloat());
+            assertEquals(first, model.getFloat());
         }
     }
 
     @Test
     public void firstDeletedRecordAnnotatedTest() {
-        Float firstObjectFloat = 15F;
-        Float secondObjectFloat = 25F;
-        Float thirdObjectFloat = 35F;
-        Float fourthObjectFloat = 45F;
-        save(new FloatFieldAnnotatedModel(firstObjectFloat));
-        save(new FloatFieldAnnotatedModel(secondObjectFloat));
-        save(new FloatFieldAnnotatedModel(thirdObjectFloat));
-        save(new FloatFieldAnnotatedModel(fourthObjectFloat));
-        FloatFieldAnnotatedModel firstRecord = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
-        SugarRecord.delete(firstRecord);
-        FloatFieldAnnotatedModel model = SugarRecord.first(FloatFieldAnnotatedModel.class);
+        Float second = 25F;
+
+        save(new FloatFieldAnnotatedModel(15F));
+        save(new FloatFieldAnnotatedModel(second));
+        save(new FloatFieldAnnotatedModel(35F));
+        save(new FloatFieldAnnotatedModel(45F));
+
+        FloatFieldAnnotatedModel firstRecord = findById(FloatFieldAnnotatedModel.class, 1);
+
+        delete(firstRecord);
+
+        FloatFieldAnnotatedModel model = first(FloatFieldAnnotatedModel.class);
 
         if (null != model) {
-            assertEquals(secondObjectFloat, model.getFloat());
+            assertEquals(second, model.getFloat());
         }
     }
 
     @Test
     public void lastAnnotatedTest() {
-        Float firstObjectFloat = 25F;
-        Float lastObjectFloat = 50F;
-        save(new FloatFieldAnnotatedModel(firstObjectFloat));
-        save(new FloatFieldAnnotatedModel(lastObjectFloat));
-        FloatFieldAnnotatedModel model = SugarRecord.last(FloatFieldAnnotatedModel.class);
+        Float last = 50F;
+
+        save(new FloatFieldAnnotatedModel(25F));
+        save(new FloatFieldAnnotatedModel(last));
+
+        FloatFieldAnnotatedModel model = last(FloatFieldAnnotatedModel.class);
 
         if (null != model) {
-            assertEquals(lastObjectFloat, model.getFloat());
+            assertEquals(last, model.getFloat());
         }
     }
 
     @Test
     public void lastDeletedRecordAnnotatedTest() {
-        Float firstObjectFloat = 15F;
-        Float secondObjectFloat = 25F;
-        Float thirdObjectFloat = 35F;
-        Float fourthObjectFloat = 45F;
-        save(new FloatFieldAnnotatedModel(firstObjectFloat));
-        save(new FloatFieldAnnotatedModel(secondObjectFloat));
-        save(new FloatFieldAnnotatedModel(thirdObjectFloat));
-        save(new FloatFieldAnnotatedModel(fourthObjectFloat));
-        FloatFieldAnnotatedModel lastRecord = SugarRecord.findById(FloatFieldAnnotatedModel.class, 4);
-        SugarRecord.delete(lastRecord);
-        FloatFieldAnnotatedModel model = SugarRecord.last(FloatFieldAnnotatedModel.class);
+        Float third = 35F;
+
+        save(new FloatFieldAnnotatedModel(15F));
+        save(new FloatFieldAnnotatedModel(25F));
+        save(new FloatFieldAnnotatedModel(third));
+        save(new FloatFieldAnnotatedModel(45F));
+
+        FloatFieldAnnotatedModel lastRecord = findById(FloatFieldAnnotatedModel.class, 4);
+        delete(lastRecord);
+        FloatFieldAnnotatedModel model = last(FloatFieldAnnotatedModel.class);
 
         if (null != model) {
-            assertEquals(thirdObjectFloat, model.getFloat());
+            assertEquals(third, model.getFloat());
         }
     }
 
     @Test
     public void nullFirstAnnotatedTest() {
-        assertNull(SugarRecord.first(FloatFieldAnnotatedModel.class));
+        assertNull(first(FloatFieldAnnotatedModel.class));
     }
 
     @Test
     public void nullLastAnnotatedTest() {
-        assertNull(SugarRecord.last(FloatFieldAnnotatedModel.class));
+        assertNull(last(FloatFieldAnnotatedModel.class));
     }
 
     @Test
     public void oneItemAnnotatedTest() {
         save(new FloatFieldAnnotatedModel(25F));
-        FloatFieldAnnotatedModel firstModel = SugarRecord.first(FloatFieldAnnotatedModel.class);
-        FloatFieldAnnotatedModel lastModel = SugarRecord.last(FloatFieldAnnotatedModel.class);
 
-        if (null != firstModel && null != lastModel) {
-            assertEquals(firstModel.getFloat(), lastModel.getFloat());
+        FloatFieldAnnotatedModel first = first(FloatFieldAnnotatedModel.class);
+        FloatFieldAnnotatedModel last = last(FloatFieldAnnotatedModel.class);
+
+        if (null != first && null != last) {
+            assertEquals(first.getFloat(), last.getFloat());
         }
     }
 }
diff --git a/library/src/test/java/com/orm/record/FloatFieldTests.java b/library/src/test/java/com/orm/record/FloatFieldTests.java
index 48317fcf..d76516b9 100644
--- a/library/src/test/java/com/orm/record/FloatFieldTests.java
+++ b/library/src/test/java/com/orm/record/FloatFieldTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.FloatFieldAnnotatedModel;
 import com.orm.model.FloatFieldExtendedModel;
@@ -12,68 +11,70 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+@SuppressWarnings("all")
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class FloatFieldTests {
+    Float aFloat = Float.valueOf(25F);
 
     @Test
     public void nullFloatExtendedTest() {
         save(new FloatFieldExtendedModel());
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        FloatFieldExtendedModel model = findById(FloatFieldExtendedModel.class, 1);
         assertNull(model.getFloat());
     }
 
     @Test
     public void nullRawFloatExtendedTest() {
         save(new FloatFieldExtendedModel());
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
+        FloatFieldExtendedModel model = findById(FloatFieldExtendedModel.class, 1);
         assertEquals(0F, model.getRawFloat(), 0.0000000001F);
     }
 
     @Test
     public void nullFloatAnnotatedTest() {
         save(new FloatFieldAnnotatedModel());
-        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        FloatFieldAnnotatedModel model = findById(FloatFieldAnnotatedModel.class, 1);
         assertNull(model.getFloat());
     }
 
     @Test
     public void nullRawFloatAnnotatedTest() {
         save(new FloatFieldAnnotatedModel());
-        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
+        FloatFieldAnnotatedModel model = findById(FloatFieldAnnotatedModel.class, 1);
         assertEquals(0F, model.getRawFloat(), 0.0000000001F);
     }
 
     @Test
     public void objectFloatExtendedTest() {
-        Float objectFloat = 25F;
-        save(new FloatFieldExtendedModel(objectFloat));
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
-        assertEquals(objectFloat, model.getFloat());
+        save(new FloatFieldExtendedModel(aFloat));
+        FloatFieldExtendedModel model = findById(FloatFieldExtendedModel.class, 1);
+        assertEquals(aFloat, model.getFloat());
     }
 
     @Test
     public void rawFloatExtendedTest() {
-        save(new FloatFieldExtendedModel(25F));
-        FloatFieldExtendedModel model = SugarRecord.findById(FloatFieldExtendedModel.class, 1);
-        assertEquals(25F, model.getRawFloat(), 0.0000000001F);
+        save(new FloatFieldExtendedModel(aFloat.floatValue()));
+        FloatFieldExtendedModel model = findById(FloatFieldExtendedModel.class, 1);
+        assertEquals(aFloat.floatValue(), model.getRawFloat(), 0.0000000001F);
     }
 
     @Test
     public void objectFloatAnnotatedTest() {
-        Float objectFloat = 25F;
-        save(new FloatFieldAnnotatedModel(objectFloat));
-        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
-        assertEquals(objectFloat, model.getFloat());
+        save(new FloatFieldAnnotatedModel(aFloat));
+        FloatFieldAnnotatedModel model = findById(FloatFieldAnnotatedModel.class, 1);
+        assertEquals(aFloat, model.getFloat());
     }
 
     @Test
     public void rawFloatAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel(25F));
-        FloatFieldAnnotatedModel model = SugarRecord.findById(FloatFieldAnnotatedModel.class, 1);
-        assertEquals(25F, model.getRawFloat(), 0.0000000001F);
+        save(new FloatFieldAnnotatedModel(aFloat.floatValue()));
+        FloatFieldAnnotatedModel model = findById(FloatFieldAnnotatedModel.class, 1);
+        assertEquals(aFloat.floatValue(), model.getRawFloat(), 0.0000000001F);
     }
 }
diff --git a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
index 9834829f..0053ed96 100644
--- a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
+++ b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
@@ -13,6 +13,7 @@
 
 import static com.orm.SugarRecord.delete;
 import static com.orm.SugarRecord.save;
+
 import static org.junit.Assert.assertFalse;
 
 @RunWith(RobolectricGradleTestRunner.class)
diff --git a/library/src/test/java/com/orm/record/IntegerFieldTests.java b/library/src/test/java/com/orm/record/IntegerFieldTests.java
index b9ebf11d..5bb78a47 100644
--- a/library/src/test/java/com/orm/record/IntegerFieldTests.java
+++ b/library/src/test/java/com/orm/record/IntegerFieldTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.IntegerFieldAnnotatedModel;
 import com.orm.model.IntegerFieldExtendedModel;
@@ -12,68 +11,69 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class IntegerFieldTests {
+public final class IntegerFieldTests {
+    private Integer integer = 25;
 
     @Test
     public void nullIntegerExtendedTest() {
         save(new IntegerFieldExtendedModel());
-        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        IntegerFieldExtendedModel model = findById(IntegerFieldExtendedModel.class, 1);
         assertNull(model.getInteger());
     }
 
     @Test
     public void nullIntExtendedTest() {
         save(new IntegerFieldExtendedModel());
-        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        IntegerFieldExtendedModel model = findById(IntegerFieldExtendedModel.class, 1);
         assertEquals(0, model.getInt());
     }
 
     @Test
     public void nullIntegerAnnotatedTest() {
         save(new IntegerFieldAnnotatedModel());
-        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
         assertNull(model.getInteger());
     }
 
     @Test
     public void nullIntAnnotatedTest() {
         save(new IntegerFieldAnnotatedModel());
-        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
         assertEquals(0, model.getInt());
     }
 
     @Test
     public void integerExtendedTest() {
-        Integer integer = 25;
         save(new IntegerFieldExtendedModel(integer));
-        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
+        IntegerFieldExtendedModel model = findById(IntegerFieldExtendedModel.class, 1);
         assertEquals(integer, model.getInteger());
     }
 
     @Test
     public void intExtendedTest() {
-        save(new IntegerFieldExtendedModel(25));
-        IntegerFieldExtendedModel model = SugarRecord.findById(IntegerFieldExtendedModel.class, 1);
-        assertEquals(25, model.getInt());
+        save(new IntegerFieldExtendedModel(integer.intValue()));
+        IntegerFieldExtendedModel model = findById(IntegerFieldExtendedModel.class, 1);
+        assertEquals(integer.intValue(), model.getInt());
     }
 
     @Test
     public void integerAnnotatedTest() {
-        Integer integer = 25;
         save(new IntegerFieldAnnotatedModel(integer));
-        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
+        IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
         assertEquals(integer, model.getInteger());
     }
 
     @Test
     public void intAnnotatedTest() {
-        save(new IntegerFieldAnnotatedModel(25));
-        IntegerFieldAnnotatedModel model = SugarRecord.findById(IntegerFieldAnnotatedModel.class, 1);
-        assertEquals(25, model.getInt());
+        save(new IntegerFieldAnnotatedModel(integer.intValue()));
+        IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
+        assertEquals(integer.intValue(), model.getInt());
     }
 }
diff --git a/library/src/test/java/com/orm/record/ListAllOrderByTests.java b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
index c5f34916..548ead23 100644
--- a/library/src/test/java/com/orm/record/ListAllOrderByTests.java
+++ b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.IntegerFieldExtendedModel;
 
@@ -13,6 +12,8 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -22,33 +23,39 @@ public final class ListAllOrderByTests {
 
     @Test
     public void listAllOrderByEmptyTest() {
-        assertEquals(0L, SugarRecord.listAll(IntegerFieldExtendedModel.class, "id").size());
+        final List<IntegerFieldExtendedModel> list = listAll(IntegerFieldExtendedModel.class, "id");
+        assertEquals(0L, list.size());
     }
 
     @Test
     public void listAllOrderByIdTest() {
-        for(int i = 1; i <= 100; i++) {
+        for (int i = 1; i <= 100; i++) {
             save(new IntegerFieldExtendedModel(i));
         }
-        List<IntegerFieldExtendedModel> models =
-                SugarRecord.listAll(IntegerFieldExtendedModel.class, "id");
+
+        List<IntegerFieldExtendedModel> models = listAll(IntegerFieldExtendedModel.class, "id");
         assertEquals(100L, models.size());
+
         Long id = models.get(0).getId();
-        for(int i = 1; i < 100; i++) {
-            assertTrue(id <models.get(i).getId());
+
+        for (int i = 1; i < 100; i++) {
+            assertTrue(id < models.get(i).getId());
         }
     }
 
     @Test
     public void listAllOrderByFieldTest() {
-        for(int i = 1; i <= 100; i++) {
+        for (int i = 1; i <= 100; i++) {
             save(new IntegerFieldExtendedModel(i));
         }
-        List<IntegerFieldExtendedModel> models =
-                SugarRecord.listAll(IntegerFieldExtendedModel.class, "raw_integer");
+
+        List<IntegerFieldExtendedModel> models = listAll(IntegerFieldExtendedModel.class, "raw_integer");
+
         assertEquals(100L, models.size());
+
         int raw = models.get(0).getInt();
-        for(int i = 1; i < 100; i++) {
+
+        for (int i = 1; i < 100; i++) {
             assertTrue(raw < models.get(i).getInt());
         }
     }
diff --git a/library/src/test/java/com/orm/record/LongFieldTests.java b/library/src/test/java/com/orm/record/LongFieldTests.java
index bcb95c24..d1516a42 100644
--- a/library/src/test/java/com/orm/record/LongFieldTests.java
+++ b/library/src/test/java/com/orm/record/LongFieldTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.LongFieldAnnotatedModel;
 import com.orm.model.LongFieldExtendedModel;
@@ -12,68 +11,70 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+@SuppressWarnings("all")
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class LongFieldTests {
+public final class LongFieldTests {
+    private Long aLong = Long.valueOf(25L);
 
     @Test
     public void nullLongExtendedTest() {
         save(new LongFieldExtendedModel());
-        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        LongFieldExtendedModel model = findById(LongFieldExtendedModel.class, 1);
         assertNull(model.getLong());
     }
 
     @Test
     public void nullRawLongExtendedTest() {
         save(new LongFieldExtendedModel());
-        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
+        LongFieldExtendedModel model = findById(LongFieldExtendedModel.class, 1);
         assertEquals(0L, model.getRawLong());
     }
 
     @Test
     public void nullLongAnnotatedTest() {
         save(new LongFieldAnnotatedModel());
-        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        LongFieldAnnotatedModel model = findById(LongFieldAnnotatedModel.class, 1);
         assertNull(model.getLong());
     }
 
     @Test
     public void nullRawLongAnnotatedTest() {
         save(new LongFieldAnnotatedModel());
-        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
+        LongFieldAnnotatedModel model = findById(LongFieldAnnotatedModel.class, 1);
         assertEquals(0L, model.getRawLong());
     }
 
     @Test
     public void objectLongExtendedTest() {
-        Long objectLong = 25L;
-        save(new LongFieldExtendedModel(objectLong));
-        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
-        assertEquals(objectLong, model.getLong());
+        save(new LongFieldExtendedModel(aLong));
+        LongFieldExtendedModel model = findById(LongFieldExtendedModel.class, 1);
+        assertEquals(aLong, model.getLong());
     }
 
     @Test
     public void rawLongExtendedTest() {
-        save(new LongFieldExtendedModel(25L));
-        LongFieldExtendedModel model = SugarRecord.findById(LongFieldExtendedModel.class, 1);
-        assertEquals(25L, model.getRawLong());
+        save(new LongFieldExtendedModel(aLong.longValue()));
+        LongFieldExtendedModel model = findById(LongFieldExtendedModel.class, 1);
+        assertEquals(aLong.longValue(), model.getRawLong());
     }
 
     @Test
     public void objectLongAnnotatedTest() {
-        Long objectLong = 25L;
-        save(new LongFieldAnnotatedModel(objectLong));
-        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
-        assertEquals(objectLong, model.getLong());
+        save(new LongFieldAnnotatedModel(aLong));
+        LongFieldAnnotatedModel model = findById(LongFieldAnnotatedModel.class, 1);
+        assertEquals(aLong, model.getLong());
     }
 
     @Test
     public void rawLongAnnotatedTest() {
-        save(new LongFieldAnnotatedModel(25L));
-        LongFieldAnnotatedModel model = SugarRecord.findById(LongFieldAnnotatedModel.class, 1);
-        assertEquals(25L, model.getRawLong());
+        save(new LongFieldAnnotatedModel(aLong.longValue()));
+        LongFieldAnnotatedModel model = findById(LongFieldAnnotatedModel.class, 1);
+        assertEquals(aLong.longValue(), model.getRawLong());
     }
 }
diff --git a/library/src/test/java/com/orm/record/MultipleSaveTests.java b/library/src/test/java/com/orm/record/MultipleSaveTests.java
index 78406380..73b353ad 100644
--- a/library/src/test/java/com/orm/record/MultipleSaveTests.java
+++ b/library/src/test/java/com/orm/record/MultipleSaveTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.StringFieldAnnotatedModel;
 import com.orm.model.StringFieldAnnotatedNoIdModel;
@@ -13,103 +12,100 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class MultipleSaveTests {
+public final class MultipleSaveTests {
+    private String testString = "Test String";
+    private String anotherString = "Another test";
 
     @Test
     public void stringMultipleSaveOriginalExtendedTest() {
-        String string = "Test String";
-        StringFieldExtendedModel model = new StringFieldExtendedModel(string);
+        StringFieldExtendedModel model = new StringFieldExtendedModel(testString);
         long id = save(model);
-        StringFieldExtendedModel query = SugarRecord.findById(StringFieldExtendedModel.class, id);
+        StringFieldExtendedModel query = findById(StringFieldExtendedModel.class, id);
 
         if (null != query) {
-            assertEquals(string, query.getString());
+            assertEquals(testString, query.getString());
         }
 
-        model.setString("Another test");
+        model.setString(anotherString);
+
         assertEquals(id, save(model));
-        assertNull(SugarRecord.findById(StringFieldExtendedModel.class, 2));
+        assertNull(findById(StringFieldExtendedModel.class, 2));
     }
 
     @Test
     public void stringMultipleSaveQueriedExtendedTest() {
-        String string = "Test String";
-        StringFieldExtendedModel model = new StringFieldExtendedModel(string);
+        StringFieldExtendedModel model = new StringFieldExtendedModel(testString);
         long id = save(model);
-        StringFieldExtendedModel query = SugarRecord.findById(StringFieldExtendedModel.class, id);
+        StringFieldExtendedModel query = findById(StringFieldExtendedModel.class, id);
 
         if (null != query) {
-            assertEquals(string, query.getString());
-            query.setString("Another test");
+            assertEquals(testString, query.getString());
+            query.setString(anotherString);
             assertEquals(id, save(query));
-            assertNull(SugarRecord.findById(StringFieldExtendedModel.class, 2));
+            assertNull(findById(StringFieldExtendedModel.class, 2));
         }
     }
 
     @Test
     public void stringMultipleSaveOriginalAnnotatedTest() {
-        String string = "Test String";
-        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
+        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(testString);
         long id = save(model);
-        StringFieldAnnotatedModel query = SugarRecord.findById(StringFieldAnnotatedModel.class, id);
+        StringFieldAnnotatedModel query = findById(StringFieldAnnotatedModel.class, id);
 
         if (null != query) {
-            assertEquals(string, query.getString());
-            model.setString("Another test");
+            assertEquals(testString, query.getString());
+            model.setString(anotherString);
             assertEquals(id, save(model));
-            assertNull(SugarRecord.findById(StringFieldAnnotatedModel.class, 2));
+            assertNull(findById(StringFieldAnnotatedModel.class, 2));
         }
     }
 
     @Test
     public void stringMultipleSaveQueriedAnnotatedTest() {
-        String string = "Test String";
-        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(string);
+        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(testString);
         long id = save(model);
-        StringFieldAnnotatedModel query = SugarRecord.findById(StringFieldAnnotatedModel.class, id);
+        StringFieldAnnotatedModel query = findById(StringFieldAnnotatedModel.class, id);
 
         if (null != query) {
-            assertEquals(string, query.getString());
-            query.setString("Another test");
+            assertEquals(testString, query.getString());
+            query.setString(anotherString);
             assertEquals(id, save(query));
-            assertNull(SugarRecord.findById(StringFieldAnnotatedModel.class, 2));
+            assertNull(findById(StringFieldAnnotatedModel.class, 2));
         }
     }
 
     @Test
     public void stringMultipleSaveOriginalAnnotatedNoIdTest() {
-        String string = "Test String";
-        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
+        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(testString);
         long id = save(model);
-        StringFieldAnnotatedNoIdModel query =
-                SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, id);
+        StringFieldAnnotatedNoIdModel query = findById(StringFieldAnnotatedNoIdModel.class, id);
 
         if (null != query) {
-            assertEquals(string, query.getString());
-            model.setString("Another test");
+            assertEquals(testString, query.getString());
+            model.setString(anotherString);
             assertEquals(id, save(model));
-            assertNull(SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, 2));
+            assertNull(findById(StringFieldAnnotatedNoIdModel.class, 2));
         }
     }
 
     @Test
     public void stringMultipleSaveQueriedAnnotatedNoIdTest() {
-        String string = "Test String";
-        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(string);
+        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(testString);
         long id = save(model);
-        StringFieldAnnotatedNoIdModel query =
-                SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, id);
+        StringFieldAnnotatedNoIdModel query = findById(StringFieldAnnotatedNoIdModel.class, id);
 
         if (null != query) {
-            assertEquals(string, query.getString());
-            query.setString("Another test");
+            assertEquals(testString, query.getString());
+            query.setString(anotherString);
             assertEquals(id, save(query));
-            assertNull(SugarRecord.findById(StringFieldAnnotatedNoIdModel.class, 2));
+            assertNull(findById(StringFieldAnnotatedNoIdModel.class, 2));
         }
     }
 }
diff --git a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
index 66fc2c79..d7c8ef43 100644
--- a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
+++ b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.NestedAnnotatedModel;
 import com.orm.model.RelationshipAnnotatedModel;
@@ -15,6 +14,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -23,9 +25,9 @@ public final class NestedAnnotatedTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedAnnotatedModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(0L, count(NestedAnnotatedModel.class));
+        assertEquals(0L, count(RelationshipAnnotatedModel.class));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
@@ -35,9 +37,9 @@ public void oneSaveTest() throws Exception {
         RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
         save(nested);
         save(new NestedAnnotatedModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(NestedAnnotatedModel.class));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipAnnotatedModel.class));
+        assertEquals(1L, count(NestedAnnotatedModel.class));
     }
 
     @Test
@@ -48,26 +50,27 @@ public void twoSameSaveTest() throws Exception {
         save(nested);
         save(new NestedAnnotatedModel(nested));
         save(new NestedAnnotatedModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(NestedAnnotatedModel.class));
+
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipAnnotatedModel.class));
+        assertEquals(2L, count(NestedAnnotatedModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
+        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
+        save(anotherSimple);
         RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
         save(nested);
-        RelationshipAnnotatedModel another_nested = new RelationshipAnnotatedModel(another_simple);
-        save(another_nested);
+        RelationshipAnnotatedModel anotherNested = new RelationshipAnnotatedModel(anotherSimple);
+        save(anotherNested);
         save(new NestedAnnotatedModel(nested));
-        save(new NestedAnnotatedModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(NestedAnnotatedModel.class));
+        save(new NestedAnnotatedModel(anotherNested));
+        assertEquals(2L, count(SimpleAnnotatedModel.class));
+        assertEquals(2L, count(RelationshipAnnotatedModel.class));
+        assertEquals(2L, count(NestedAnnotatedModel.class));
     }
 
     @Test
@@ -79,9 +82,9 @@ public void manySameSaveTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new NestedAnnotatedModel(nested));
         }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(NestedAnnotatedModel.class));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipAnnotatedModel.class));
+        assertEquals(100L, count(NestedAnnotatedModel.class));
     }
 
     @Test
@@ -93,9 +96,9 @@ public void manyDifferentSaveTest() throws Exception {
             save(nested);
             save(new NestedAnnotatedModel(nested));
         }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(NestedAnnotatedModel.class));
+        assertEquals(100L, count(SimpleAnnotatedModel.class));
+        assertEquals(100L, count(RelationshipAnnotatedModel.class));
+        assertEquals(100L, count(NestedAnnotatedModel.class));
     }
 
     @Test
@@ -104,11 +107,14 @@ public void listAllSameTest() throws Exception {
         save(simple);
         RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
         save(nested);
+
         for (int i = 1; i <= 100; i++) {
             save(new NestedAnnotatedModel(nested));
         }
-        List<NestedAnnotatedModel> models = SugarRecord.listAll(NestedAnnotatedModel.class);
+
+        List<NestedAnnotatedModel> models = listAll(NestedAnnotatedModel.class);
         assertEquals(100, models.size());
+
         for (NestedAnnotatedModel model : models) {
             assertEquals(nested.getId(), model.getNested().getId());
             assertEquals(simple.getId(), model.getNested().getSimple().getId());
@@ -124,8 +130,10 @@ public void listAllDifferentTest() throws Exception {
             save(nested);
             save(new NestedAnnotatedModel(nested));
         }
-        List<NestedAnnotatedModel> models = SugarRecord.listAll(NestedAnnotatedModel.class);
+
+        List<NestedAnnotatedModel> models = listAll(NestedAnnotatedModel.class);
         assertEquals(100, models.size());
+
         for (NestedAnnotatedModel model : models) {
             assertEquals(model.getId(), model.getNested().getId());
             assertEquals(model.getId(), model.getNested().getSimple().getId());
diff --git a/library/src/test/java/com/orm/record/NestedExtendedTests.java b/library/src/test/java/com/orm/record/NestedExtendedTests.java
index 33823754..eaf8c120 100644
--- a/library/src/test/java/com/orm/record/NestedExtendedTests.java
+++ b/library/src/test/java/com/orm/record/NestedExtendedTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.NestedExtendedModel;
 import com.orm.model.RelationshipExtendedModel;
@@ -15,6 +14,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -23,9 +25,9 @@ public final class NestedExtendedTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedExtendedModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(0L, count(NestedExtendedModel.class));
+        assertEquals(0L, count(RelationshipExtendedModel.class));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -35,9 +37,9 @@ public void oneSaveTest() throws Exception {
         RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
         save(nested);
         save(new NestedExtendedModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(NestedExtendedModel.class));
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipExtendedModel.class));
+        assertEquals(1L, count(NestedExtendedModel.class));
     }
 
     @Test
@@ -48,26 +50,26 @@ public void twoSameSaveTest() throws Exception {
         save(nested);
         save(new NestedExtendedModel(nested));
         save(new NestedExtendedModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(NestedExtendedModel.class));
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipExtendedModel.class));
+        assertEquals(2L, count(NestedExtendedModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
+        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
+        save(anotherSimple);
         RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
         save(nested);
-        RelationshipExtendedModel another_nested = new RelationshipExtendedModel(another_simple);
-        save(another_nested);
+        RelationshipExtendedModel anotherNested = new RelationshipExtendedModel(anotherSimple);
+        save(anotherNested);
         save(new NestedExtendedModel(nested));
-        save(new NestedExtendedModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(NestedExtendedModel.class));
+        save(new NestedExtendedModel(anotherNested));
+        assertEquals(2L, count(SimpleExtendedModel.class));
+        assertEquals(2L, count(RelationshipExtendedModel.class));
+        assertEquals(2L, count(NestedExtendedModel.class));
     }
 
     @Test
@@ -79,9 +81,9 @@ public void manySameSaveTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new NestedExtendedModel(nested));
         }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(NestedExtendedModel.class));
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipExtendedModel.class));
+        assertEquals(100L, count(NestedExtendedModel.class));
     }
 
     @Test
@@ -93,9 +95,9 @@ public void manyDifferentSaveTest() throws Exception {
             save(nested);
             save(new NestedExtendedModel(nested));
         }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(NestedExtendedModel.class));
+        assertEquals(100L, count(SimpleExtendedModel.class));
+        assertEquals(100L, count(RelationshipExtendedModel.class));
+        assertEquals(100L, count(NestedExtendedModel.class));
     }
 
     @Test
@@ -107,8 +109,10 @@ public void listAllSameTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new NestedExtendedModel(nested));
         }
-        List<NestedExtendedModel> models = SugarRecord.listAll(NestedExtendedModel.class);
+
+        List<NestedExtendedModel> models = listAll(NestedExtendedModel.class);
         assertEquals(100, models.size());
+
         for (NestedExtendedModel model : models) {
             assertEquals(nested.getId(), model.getNested().getId());
             assertEquals(simple.getId(), model.getNested().getSimple().getId());
@@ -124,8 +128,10 @@ public void listAllDifferentTest() throws Exception {
             save(nested);
             save(new NestedExtendedModel(nested));
         }
-        List<NestedExtendedModel> models = SugarRecord.listAll(NestedExtendedModel.class);
+
+        List<NestedExtendedModel> models = listAll(NestedExtendedModel.class);
         assertEquals(100, models.size());
+
         for (NestedExtendedModel model : models) {
             assertEquals(model.getId(), model.getNested().getId());
             assertEquals(model.getId(), model.getNested().getSimple().getId());
diff --git a/library/src/test/java/com/orm/record/NestedMixedAATests.java b/library/src/test/java/com/orm/record/NestedMixedAATests.java
index 1a8f1b43..9daf3fa9 100644
--- a/library/src/test/java/com/orm/record/NestedMixedAATests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedAATests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.NestedMixedAAModel;
 import com.orm.model.RelationshipMixedAModel;
@@ -15,6 +14,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -23,9 +25,9 @@ public final class NestedMixedAATests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedMixedAAModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(0L, count(NestedMixedAAModel.class));
+        assertEquals(0L, count(RelationshipMixedAModel.class));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
@@ -35,9 +37,9 @@ public void oneSaveTest() throws Exception {
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
         save(nested);
         save(new NestedMixedAAModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(1L, SugarRecord.count(NestedMixedAAModel.class));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipMixedAModel.class));
+        assertEquals(1L, count(NestedMixedAAModel.class));
     }
 
     @Test
@@ -48,26 +50,26 @@ public void twoSameSaveTest() throws Exception {
         save(nested);
         save(new NestedMixedAAModel(nested));
         save(new NestedMixedAAModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedAAModel.class));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipMixedAModel.class));
+        assertEquals(2L, count(NestedMixedAAModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
+        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
+        save(anotherSimple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
         save(nested);
-        RelationshipMixedAModel another_nested = new RelationshipMixedAModel(another_simple);
-        save(another_nested);
+        RelationshipMixedAModel anotherNested = new RelationshipMixedAModel(anotherSimple);
+        save(anotherNested);
         save(new NestedMixedAAModel(nested));
-        save(new NestedMixedAAModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedAAModel.class));
+        save(new NestedMixedAAModel(anotherNested));
+        assertEquals(2L, count(SimpleAnnotatedModel.class));
+        assertEquals(2L, count(RelationshipMixedAModel.class));
+        assertEquals(2L, count(NestedMixedAAModel.class));
     }
 
     @Test
@@ -79,9 +81,9 @@ public void manySameSaveTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new NestedMixedAAModel(nested));
         }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedAAModel.class));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipMixedAModel.class));
+        assertEquals(100L, count(NestedMixedAAModel.class));
     }
 
     @Test
@@ -93,9 +95,9 @@ public void manyDifferentSaveTest() throws Exception {
             save(nested);
             save(new NestedMixedAAModel(nested));
         }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedAAModel.class));
+        assertEquals(100L, count(SimpleAnnotatedModel.class));
+        assertEquals(100L, count(RelationshipMixedAModel.class));
+        assertEquals(100L, count(NestedMixedAAModel.class));
     }
 
     @Test
@@ -104,11 +106,14 @@ public void listAllSameTest() throws Exception {
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
         save(nested);
+
         for (int i = 1; i <= 100; i++) {
             save(new NestedMixedAAModel(nested));
         }
-        List<NestedMixedAAModel> models = SugarRecord.listAll(NestedMixedAAModel.class);
+
+        List<NestedMixedAAModel> models = listAll(NestedMixedAAModel.class);
         assertEquals(100, models.size());
+
         for (NestedMixedAAModel model : models) {
             assertEquals(nested.getId(), model.getNested().getId());
             assertEquals(simple.getId(), model.getNested().getSimple().getId());
@@ -124,8 +129,10 @@ public void listAllDifferentTest() throws Exception {
             save(nested);
             save(new NestedMixedAAModel(nested));
         }
-        List<NestedMixedAAModel> models = SugarRecord.listAll(NestedMixedAAModel.class);
+
+        List<NestedMixedAAModel> models = listAll(NestedMixedAAModel.class);
         assertEquals(100, models.size());
+
         for (NestedMixedAAModel model : models) {
             assertEquals(model.getId(), model.getNested().getId());
             assertEquals(model.getId(), model.getNested().getSimple().getId());
diff --git a/library/src/test/java/com/orm/record/NestedMixedABTests.java b/library/src/test/java/com/orm/record/NestedMixedABTests.java
index 110d82c0..fa16b506 100644
--- a/library/src/test/java/com/orm/record/NestedMixedABTests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedABTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.NestedMixedABModel;
 import com.orm.model.RelationshipMixedBModel;
@@ -15,6 +14,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -23,9 +25,9 @@ public class NestedMixedABTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedMixedABModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(0L, count(NestedMixedABModel.class));
+        assertEquals(0L, count(RelationshipMixedBModel.class));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -33,11 +35,13 @@ public void oneSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+
         save(nested);
         save(new NestedMixedABModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(1L, SugarRecord.count(NestedMixedABModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipMixedBModel.class));
+        assertEquals(1L, count(NestedMixedABModel.class));
     }
 
     @Test
@@ -45,29 +49,33 @@ public void twoSameSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+
         save(nested);
         save(new NestedMixedABModel(nested));
         save(new NestedMixedABModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedABModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipMixedBModel.class));
+        assertEquals(2L, count(NestedMixedABModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
+        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
+        save(anotherSimple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
         save(nested);
-        RelationshipMixedBModel another_nested = new RelationshipMixedBModel(another_simple);
-        save(another_nested);
+        RelationshipMixedBModel anotherNested = new RelationshipMixedBModel(anotherSimple);
+
+        save(anotherNested);
         save(new NestedMixedABModel(nested));
-        save(new NestedMixedABModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedABModel.class));
+        save(new NestedMixedABModel(anotherNested));
+
+        assertEquals(2L, count(SimpleExtendedModel.class));
+        assertEquals(2L, count(RelationshipMixedBModel.class));
+        assertEquals(2L, count(NestedMixedABModel.class));
     }
 
     @Test
@@ -76,12 +84,14 @@ public void manySameSaveTest() throws Exception {
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
         save(nested);
+
         for (int i = 1; i <= 100; i++) {
             save(new NestedMixedABModel(nested));
         }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedABModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipMixedBModel.class));
+        assertEquals(100L, count(NestedMixedABModel.class));
     }
 
     @Test
@@ -93,9 +103,10 @@ public void manyDifferentSaveTest() throws Exception {
             save(nested);
             save(new NestedMixedABModel(nested));
         }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedABModel.class));
+
+        assertEquals(100L, count(SimpleExtendedModel.class));
+        assertEquals(100L, count(RelationshipMixedBModel.class));
+        assertEquals(100L, count(NestedMixedABModel.class));
     }
 
     @Test
@@ -104,11 +115,14 @@ public void listAllSameTest() throws Exception {
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
         save(nested);
+
         for (int i = 1; i <= 100; i++) {
             save(new NestedMixedABModel(nested));
         }
-        List<NestedMixedABModel> models = SugarRecord.listAll(NestedMixedABModel.class);
+
+        List<NestedMixedABModel> models = listAll(NestedMixedABModel.class);
         assertEquals(100, models.size());
+
         for (NestedMixedABModel model : models) {
             assertEquals(nested.getId(), model.getNested().getId());
             assertEquals(simple.getId(), model.getNested().getSimple().getId());
@@ -124,8 +138,10 @@ public void listAllDifferentTest() throws Exception {
             save(nested);
             save(new NestedMixedABModel(nested));
         }
-        List<NestedMixedABModel> models = SugarRecord.listAll(NestedMixedABModel.class);
+
+        List<NestedMixedABModel> models = listAll(NestedMixedABModel.class);
         assertEquals(100, models.size());
+
         for (NestedMixedABModel model : models) {
             assertEquals(model.getId(), model.getNested().getId());
             assertEquals(model.getId(), model.getNested().getSimple().getId());
diff --git a/library/src/test/java/com/orm/record/NestedMixedBATests.java b/library/src/test/java/com/orm/record/NestedMixedBATests.java
index edc1c575..c6f07da5 100644
--- a/library/src/test/java/com/orm/record/NestedMixedBATests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedBATests.java
@@ -15,6 +15,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -23,9 +26,9 @@ public final class NestedMixedBATests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedMixedBAModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(0L, count(NestedMixedBAModel.class));
+        assertEquals(0L, count(RelationshipMixedAModel.class));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
@@ -33,11 +36,13 @@ public void oneSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+
         save(nested);
         save(new NestedMixedBAModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(1L, SugarRecord.count(NestedMixedBAModel.class));
+
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipMixedAModel.class));
+        assertEquals(1L, count(NestedMixedBAModel.class));
     }
 
     @Test
@@ -45,29 +50,33 @@ public void twoSameSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
+
         save(nested);
         save(new NestedMixedBAModel(nested));
         save(new NestedMixedBAModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedBAModel.class));
+
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipMixedAModel.class));
+        assertEquals(2L, count(NestedMixedBAModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
+        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
+        save(anotherSimple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
         save(nested);
-        RelationshipMixedAModel another_nested = new RelationshipMixedAModel(another_simple);
-        save(another_nested);
+        RelationshipMixedAModel anotherNested = new RelationshipMixedAModel(anotherSimple);
+
+        save(anotherNested);
         save(new NestedMixedBAModel(nested));
-        save(new NestedMixedBAModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedBAModel.class));
+        save(new NestedMixedBAModel(anotherNested));
+
+        assertEquals(2L, count(SimpleAnnotatedModel.class));
+        assertEquals(2L, count(RelationshipMixedAModel.class));
+        assertEquals(2L, count(NestedMixedBAModel.class));
     }
 
     @Test
@@ -76,12 +85,14 @@ public void manySameSaveTest() throws Exception {
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
         save(nested);
+
         for (int i = 1; i <= 100; i++) {
             save(new NestedMixedBAModel(nested));
         }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedBAModel.class));
+
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipMixedAModel.class));
+        assertEquals(100L, count(NestedMixedBAModel.class));
     }
 
     @Test
@@ -93,9 +104,10 @@ public void manyDifferentSaveTest() throws Exception {
             save(nested);
             save(new NestedMixedBAModel(nested));
         }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedAModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedBAModel.class));
+
+        assertEquals(100L, count(SimpleAnnotatedModel.class));
+        assertEquals(100L, count(RelationshipMixedAModel.class));
+        assertEquals(100L, count(NestedMixedBAModel.class));
     }
 
     @Test
@@ -104,11 +116,14 @@ public void listAllSameTest() throws Exception {
         save(simple);
         RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
         save(nested);
+
         for (int i = 1; i <= 100; i++) {
             save(new NestedMixedBAModel(nested));
         }
-        List<NestedMixedBAModel> models = SugarRecord.listAll(NestedMixedBAModel.class);
+
+        List<NestedMixedBAModel> models = listAll(NestedMixedBAModel.class);
         assertEquals(100, models.size());
+
         for (NestedMixedBAModel model : models) {
             assertEquals(nested.getId(), model.getNested().getId());
             assertEquals(simple.getId(), model.getNested().getSimple().getId());
@@ -124,8 +139,10 @@ public void listAllDifferentTest() throws Exception {
             save(nested);
             save(new NestedMixedBAModel(nested));
         }
-        List<NestedMixedBAModel> models = SugarRecord.listAll(NestedMixedBAModel.class);
+
+        List<NestedMixedBAModel> models = listAll(NestedMixedBAModel.class);
         assertEquals(100, models.size());
+
         for (NestedMixedBAModel model : models) {
             assertEquals(model.getId(), model.getNested().getId());
             assertEquals(model.getId(), model.getNested().getSimple().getId());
diff --git a/library/src/test/java/com/orm/record/NestedMixedBBTests.java b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
index c5ebd4ca..1eeb2a7d 100644
--- a/library/src/test/java/com/orm/record/NestedMixedBBTests.java
+++ b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.NestedMixedBBModel;
 import com.orm.model.RelationshipMixedBModel;
@@ -15,6 +14,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -23,21 +25,23 @@ public class NestedMixedBBTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(NestedMixedBBModel.class));
-        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(0L, count(NestedMixedBBModel.class));
+        assertEquals(0L, count(RelationshipMixedBModel.class));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
-         SimpleExtendedModel simple = new SimpleExtendedModel();
+        SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+
         save(nested);
         save(new NestedMixedBBModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(1L, SugarRecord.count(NestedMixedBBModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipMixedBModel.class));
+        assertEquals(1L, count(NestedMixedBBModel.class));
     }
 
     @Test
@@ -45,29 +49,33 @@ public void twoSameSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
+
         save(nested);
         save(new NestedMixedBBModel(nested));
         save(new NestedMixedBBModel(nested));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedBBModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipMixedBModel.class));
+        assertEquals(2L, count(NestedMixedBBModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
+        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
+        save(anotherSimple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
         save(nested);
-        RelationshipMixedBModel another_nested = new RelationshipMixedBModel(another_simple);
-        save(another_nested);
+        RelationshipMixedBModel anotherNested = new RelationshipMixedBModel(anotherSimple);
+
+        save(anotherNested);
         save(new NestedMixedBBModel(nested));
-        save(new NestedMixedBBModel(another_nested));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(2L, SugarRecord.count(NestedMixedBBModel.class));
+        save(new NestedMixedBBModel(anotherNested));
+
+        assertEquals(2L, count(SimpleExtendedModel.class));
+        assertEquals(2L, count(RelationshipMixedBModel.class));
+        assertEquals(2L, count(NestedMixedBBModel.class));
     }
 
     @Test
@@ -76,12 +84,14 @@ public void manySameSaveTest() throws Exception {
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
         save(nested);
+
         for (int i = 1; i <= 100; i++) {
             save(new NestedMixedBBModel(nested));
         }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedBBModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipMixedBModel.class));
+        assertEquals(100L, count(NestedMixedBBModel.class));
     }
 
     @Test
@@ -93,9 +103,10 @@ public void manyDifferentSaveTest() throws Exception {
             save(nested);
             save(new NestedMixedBBModel(nested));
         }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(100L, SugarRecord.count(NestedMixedBBModel.class));
+
+        assertEquals(100L, count(SimpleExtendedModel.class));
+        assertEquals(100L, count(RelationshipMixedBModel.class));
+        assertEquals(100L, count(NestedMixedBBModel.class));
     }
 
     @Test
@@ -104,11 +115,14 @@ public void listAllSameTest() throws Exception {
         save(simple);
         RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
         save(nested);
+
         for (int i = 1; i <= 100; i++) {
             save(new NestedMixedBBModel(nested));
         }
-        List<NestedMixedBBModel> models = SugarRecord.listAll(NestedMixedBBModel.class);
+
+        List<NestedMixedBBModel> models = listAll(NestedMixedBBModel.class);
         assertEquals(100, models.size());
+
         for (NestedMixedBBModel model : models) {
             assertEquals(nested.getId(), model.getNested().getId());
             assertEquals(simple.getId(), model.getNested().getSimple().getId());
@@ -124,8 +138,10 @@ public void listAllDifferentTest() throws Exception {
             save(nested);
             save(new NestedMixedBBModel(nested));
         }
-        List<NestedMixedBBModel> models = SugarRecord.listAll(NestedMixedBBModel.class);
+
+        List<NestedMixedBBModel> models = listAll(NestedMixedBBModel.class);
         assertEquals(100, models.size());
+
         for (NestedMixedBBModel model : models) {
             assertEquals(model.getId(), model.getNested().getId());
             assertEquals(model.getId(), model.getNested().getSimple().getId());
diff --git a/library/src/test/java/com/orm/record/NoSugarModelTests.java b/library/src/test/java/com/orm/record/NoSugarModelTests.java
index 14b16493..08f43154 100644
--- a/library/src/test/java/com/orm/record/NoSugarModelTests.java
+++ b/library/src/test/java/com/orm/record/NoSugarModelTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.NoSugarModel;
 
@@ -10,6 +9,10 @@
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import static com.orm.SugarRecord.delete;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.saveInTx;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -20,12 +23,12 @@ public final class NoSugarModelTests {
     @Test
     public void deleteTest() throws Exception {
         NoSugarModel model = new NoSugarModel();
-        assertFalse(SugarRecord.delete(model));
+        assertFalse(delete(model));
     }
 
     @Test
     public void saveInTransactionTest() throws Exception {
-        SugarRecord.saveInTx(new NoSugarModel(), new NoSugarModel());
-        assertEquals(-1L, SugarRecord.count(NoSugarModel.class));
+        saveInTx(new NoSugarModel(), new NoSugarModel());
+        assertEquals(-1L, count(NoSugarModel.class));
     }
 }
diff --git a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
index fec134db..506e0264 100644
--- a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.RelationshipAnnotatedModel;
 import com.orm.model.SimpleAnnotatedModel;
@@ -14,6 +13,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -22,50 +24,58 @@ public final class RelationshipAnnotatedTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(RelationshipAnnotatedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(0L, count(RelationshipAnnotatedModel.class));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+
         save(simple);
         save(new RelationshipAnnotatedModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipAnnotatedModel.class));
+
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(RelationshipAnnotatedModel.class));
     }
 
     @Test
     public void twoSameSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
+
         save(simple);
         save(new RelationshipAnnotatedModel(simple));
         save(new RelationshipAnnotatedModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
+
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(2L, count(RelationshipAnnotatedModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
-        SimpleAnnotatedModel another_simple = new SimpleAnnotatedModel();
-        save(another_simple);
+        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
+
+        save(anotherSimple);
         save(new RelationshipAnnotatedModel(simple));
-        save(new RelationshipAnnotatedModel(another_simple));
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipAnnotatedModel.class));
+        save(new RelationshipAnnotatedModel(anotherSimple));
+
+        assertEquals(2L, count(SimpleAnnotatedModel.class));
+        assertEquals(2L, count(RelationshipAnnotatedModel.class));
     }
 
     @Test
     public void manySameSaveTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
+
         for (int i = 1; i <= 100; i++) {
             save(new RelationshipAnnotatedModel(simple));
         }
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
+
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertEquals(100L, count(RelationshipAnnotatedModel.class));
     }
 
     @Test
@@ -75,20 +85,23 @@ public void manyDifferentSaveTest() throws Exception {
             save(simple);
             save(new RelationshipAnnotatedModel(simple));
         }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipAnnotatedModel.class));
+
+        assertEquals(100L, count(SimpleAnnotatedModel.class));
+        assertEquals(100L, count(RelationshipAnnotatedModel.class));
     }
 
     @Test
     public void listAllSameTest() throws Exception {
         SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
         save(simple);
+
         for (int i = 1; i <= 100; i++) {
             save(new RelationshipAnnotatedModel(simple));
         }
-        List<RelationshipAnnotatedModel> models =
-                SugarRecord.listAll(RelationshipAnnotatedModel.class);
+
+        List<RelationshipAnnotatedModel> models = listAll(RelationshipAnnotatedModel.class);
         assertEquals(100, models.size());
+
         for (RelationshipAnnotatedModel model : models) {
             assertEquals(simple.getId(), model.getSimple().getId());
         }
@@ -101,9 +114,10 @@ public void listAllDifferentTest() throws Exception {
             save(simple);
             save(new RelationshipAnnotatedModel(simple));
         }
-        List<RelationshipAnnotatedModel> models =
-                SugarRecord.listAll(RelationshipAnnotatedModel.class);
+
+        List<RelationshipAnnotatedModel> models = listAll(RelationshipAnnotatedModel.class);
         assertEquals(100, models.size());
+
         for (RelationshipAnnotatedModel model : models) {
             assertEquals(model.getId(), model.getSimple().getId());
         }
diff --git a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
index 1ff689ee..f9faeedd 100644
--- a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.RelationshipExtendedModel;
 import com.orm.model.SimpleExtendedModel;
@@ -14,6 +13,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -22,50 +24,58 @@ public class RelationshipExtendedTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(RelationshipExtendedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(0L, count(RelationshipExtendedModel.class));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
+
         save(simple);
         save(new RelationshipExtendedModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipExtendedModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipExtendedModel.class));
     }
 
     @Test
     public void twoSameSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
+
         save(simple);
         save(new RelationshipExtendedModel(simple));
         save(new RelationshipExtendedModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(2L, count(RelationshipExtendedModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
+        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
+
+        save(anotherSimple);
         save(new RelationshipExtendedModel(simple));
-        save(new RelationshipExtendedModel(another_simple));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipExtendedModel.class));
+        save(new RelationshipExtendedModel(anotherSimple));
+
+        assertEquals(2L, count(SimpleExtendedModel.class));
+        assertEquals(2L, count(RelationshipExtendedModel.class));
     }
 
     @Test
     public void manySameSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
+
         for (int i = 1; i <= 100; i++) {
             save(new RelationshipExtendedModel(simple));
         }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(100L, count(RelationshipExtendedModel.class));
     }
 
     @Test
@@ -75,20 +85,23 @@ public void manyDifferentSaveTest() throws Exception {
             save(simple);
             save(new RelationshipExtendedModel(simple));
         }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipExtendedModel.class));
+
+        assertEquals(100L, count(SimpleExtendedModel.class));
+        assertEquals(100L, count(RelationshipExtendedModel.class));
     }
 
     @Test
     public void listAllSameTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
+
         for (int i = 1; i <= 100; i++) {
             save(new RelationshipExtendedModel(simple));
         }
-        List<RelationshipExtendedModel> models =
-                SugarRecord.listAll(RelationshipExtendedModel.class);
+
+        List<RelationshipExtendedModel> models = listAll(RelationshipExtendedModel.class);
         assertEquals(100, models.size());
+
         for (RelationshipExtendedModel model : models) {
             assertEquals(simple.getId(), model.getSimple().getId());
         }
@@ -101,9 +114,10 @@ public void listAllDifferentTest() throws Exception {
             save(simple);
             save(new RelationshipExtendedModel(simple));
         }
-        List<RelationshipExtendedModel> models =
-                SugarRecord.listAll(RelationshipExtendedModel.class);
+
+        List<RelationshipExtendedModel> models = listAll(RelationshipExtendedModel.class);
         assertEquals(100, models.size());
+
         for (RelationshipExtendedModel model : models) {
             assertEquals(model.getId(), model.getSimple().getId());
         }
diff --git a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
index 112cdd50..7792fce8 100644
--- a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
+++ b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.RelationshipMixedBModel;
 import com.orm.model.SimpleExtendedModel;
@@ -14,6 +13,9 @@
 import java.util.List;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -22,50 +24,58 @@ public class RelationshipMixedBTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(RelationshipMixedBModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(0L, count(RelationshipMixedBModel.class));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
+
         save(simple);
         save(new RelationshipMixedBModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(1L, SugarRecord.count(RelationshipMixedBModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(1L, count(RelationshipMixedBModel.class));
     }
 
     @Test
     public void twoSameSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
+
         save(simple);
         save(new RelationshipMixedBModel(simple));
         save(new RelationshipMixedBModel(simple));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(2L, count(RelationshipMixedBModel.class));
     }
 
     @Test
     public void twoDifferentSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
-        SimpleExtendedModel another_simple = new SimpleExtendedModel();
-        save(another_simple);
+        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
+
+        save(anotherSimple);
         save(new RelationshipMixedBModel(simple));
-        save(new RelationshipMixedBModel(another_simple));
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2L, SugarRecord.count(RelationshipMixedBModel.class));
+        save(new RelationshipMixedBModel(anotherSimple));
+
+        assertEquals(2L, count(SimpleExtendedModel.class));
+        assertEquals(2L, count(RelationshipMixedBModel.class));
     }
 
     @Test
     public void manySameSaveTest() throws Exception {
         SimpleExtendedModel simple = new SimpleExtendedModel();
         save(simple);
+
         for (int i = 1; i <= 100; i++) {
             save(new RelationshipMixedBModel(simple));
         }
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertEquals(100L, count(RelationshipMixedBModel.class));
     }
 
     @Test
@@ -75,8 +85,9 @@ public void manyDifferentSaveTest() throws Exception {
             save(simple);
             save(new RelationshipMixedBModel(simple));
         }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(100L, SugarRecord.count(RelationshipMixedBModel.class));
+
+        assertEquals(100L, count(SimpleExtendedModel.class));
+        assertEquals(100L, count(RelationshipMixedBModel.class));
     }
 
     @Test
@@ -86,8 +97,7 @@ public void listAllSameTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new RelationshipMixedBModel(simple));
         }
-        List<RelationshipMixedBModel> models =
-                SugarRecord.listAll(RelationshipMixedBModel.class);
+        List<RelationshipMixedBModel> models = listAll(RelationshipMixedBModel.class);
         assertEquals(100, models.size());
         for (RelationshipMixedBModel model : models) {
             assertEquals(simple.getId(), model.getSimple().getId());
@@ -101,8 +111,7 @@ public void listAllDifferentTest() throws Exception {
             save(simple);
             save(new RelationshipMixedBModel(simple));
         }
-        List<RelationshipMixedBModel> models =
-                SugarRecord.listAll(RelationshipMixedBModel.class);
+        List<RelationshipMixedBModel> models = listAll(RelationshipMixedBModel.class);
         assertEquals(100, models.size());
         for (RelationshipMixedBModel model : models) {
             assertEquals(model.getId(), model.getSimple().getId());
diff --git a/library/src/test/java/com/orm/record/ShortFieldTests.java b/library/src/test/java/com/orm/record/ShortFieldTests.java
index 489325fc..1a65f676 100644
--- a/library/src/test/java/com/orm/record/ShortFieldTests.java
+++ b/library/src/test/java/com/orm/record/ShortFieldTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.ShortFieldAnnotatedModel;
 import com.orm.model.ShortFieldExtendedModel;
@@ -12,68 +11,70 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+@SuppressWarnings("all")
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class ShortFieldTests {
+    private Short aShort = Short.valueOf((short) 25);
 
     @Test
     public void nullShortExtendedTest() {
         save(new ShortFieldExtendedModel());
-        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        ShortFieldExtendedModel model = findById(ShortFieldExtendedModel.class, 1);
         assertNull(model.getShort());
     }
 
     @Test
     public void nullRawShortExtendedTest() {
         save(new ShortFieldExtendedModel());
-        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
+        ShortFieldExtendedModel model = findById(ShortFieldExtendedModel.class, 1);
         assertEquals((short) 0, model.getRawShort());
     }
 
     @Test
     public void nullShortAnnotatedTest() {
         save(new ShortFieldAnnotatedModel());
-        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        ShortFieldAnnotatedModel model = findById(ShortFieldAnnotatedModel.class, 1);
         assertNull(model.getShort());
     }
 
     @Test
     public void nullRawShortAnnotatedTest() {
         save(new ShortFieldAnnotatedModel());
-        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
+        ShortFieldAnnotatedModel model = findById(ShortFieldAnnotatedModel.class, 1);
         assertEquals((short) 0, model.getRawShort());
     }
 
     @Test
     public void objectShortExtendedTest() {
-        Short objectShort = 25;
-        save(new ShortFieldExtendedModel(objectShort));
-        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
-        assertEquals(objectShort, model.getShort());
+        save(new ShortFieldExtendedModel(aShort));
+        ShortFieldExtendedModel model = findById(ShortFieldExtendedModel.class, 1);
+        assertEquals(aShort, model.getShort());
     }
 
     @Test
     public void rawShortExtendedTest() {
-        save(new ShortFieldExtendedModel((short) 25));
-        ShortFieldExtendedModel model = SugarRecord.findById(ShortFieldExtendedModel.class, 1);
-        assertEquals((short) 25, model.getRawShort());
+        save(new ShortFieldExtendedModel(aShort.shortValue()));
+        ShortFieldExtendedModel model = findById(ShortFieldExtendedModel.class, 1);
+        assertEquals(aShort.shortValue(), model.getRawShort());
     }
 
     @Test
     public void objectShortAnnotatedTest() {
-        Short objectShort = 25;
-        save(new ShortFieldAnnotatedModel(objectShort));
-        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
-        assertEquals(objectShort, model.getShort());
+        save(new ShortFieldAnnotatedModel(aShort));
+        ShortFieldAnnotatedModel model = findById(ShortFieldAnnotatedModel.class, 1);
+        assertEquals(aShort, model.getShort());
     }
 
     @Test
     public void rawShortAnnotatedTest() {
-        save(new ShortFieldAnnotatedModel((short) 25));
-        ShortFieldAnnotatedModel model = SugarRecord.findById(ShortFieldAnnotatedModel.class, 1);
-        assertEquals((short) 25, model.getRawShort());
+        save(new ShortFieldAnnotatedModel(aShort.shortValue()));
+        ShortFieldAnnotatedModel model = findById(ShortFieldAnnotatedModel.class, 1);
+        assertEquals(aShort.shortValue(), model.getRawShort());
     }
 }
diff --git a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
index 6e4b9a7a..a201a9eb 100644
--- a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
+++ b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.helper.NamingHelper;
 import com.orm.model.SimpleAnnotatedModel;
@@ -18,6 +17,20 @@
 import java.util.NoSuchElementException;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.deleteAll;
+import static com.orm.SugarRecord.delete;
+import static com.orm.SugarRecord.deleteInTx;
+import static com.orm.SugarRecord.listAll;
+import static com.orm.SugarRecord.findById;
+import static com.orm.SugarRecord.saveInTx;
+import static com.orm.SugarRecord.find;
+import static com.orm.SugarRecord.findAsIterator;
+import static com.orm.SugarRecord.findWithQuery;
+import static com.orm.SugarRecord.findAll;
+import static com.orm.SugarRecord.findWithQueryAsIterator;
+import static com.orm.SugarRecord.executeQuery;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -30,20 +43,20 @@ public final class SimpleAnnotatedModelTests {
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
         save(new SimpleAnnotatedModel());
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void twoSaveTest() throws Exception {
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
@@ -51,7 +64,7 @@ public void manySaveTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
-        assertEquals(100L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(100L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
@@ -63,73 +76,75 @@ public void defaultIdTest() throws Exception {
     public void whereCountTest() throws Exception {
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
+        assertEquals(1L, count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
     }
 
     @Test
     public void whereNoCountTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
+        assertEquals(0L, count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"3"}));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class, "id = ?", new String[]{"a"}));
+        assertEquals(0L, count(SimpleAnnotatedModel.class, "id = ?", new String[]{"3"}));
+        assertEquals(0L, count(SimpleAnnotatedModel.class, "id = ?", new String[]{"a"}));
     }
 
     @Test
     public void whereBrokenCountTest() throws Exception {
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
-        assertEquals(-1L, SugarRecord.count(SimpleAnnotatedModel.class, "di = ?", new String[]{"1"}));
+        assertEquals(-1L, count(SimpleAnnotatedModel.class, "di = ?", new String[]{"1"}));
     }
 
     @Test
     public void deleteTest() throws Exception {
         SimpleAnnotatedModel model = new SimpleAnnotatedModel();
         save(model);
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertTrue(SugarRecord.delete(model));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+        assertTrue(delete(model));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void deleteUnsavedTest() throws Exception {
         SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertFalse(SugarRecord.delete(model));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
+        assertFalse(delete(model));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void deleteWrongTest() throws Exception {
         SimpleAnnotatedModel model = new SimpleAnnotatedModel();
         save(model);
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
+
         Field idField = model.getClass().getDeclaredField("id");
         idField.setAccessible(true);
         idField.set(model, Long.MAX_VALUE);
-        assertFalse(SugarRecord.delete(model));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+
+        assertFalse(delete(model));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void deleteAllTest() throws Exception {
-        int elementNumber = 100;
-        for (int i = 1; i <= elementNumber; i++) {
+        for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
-        assertEquals(elementNumber, SugarRecord.deleteAll(SimpleAnnotatedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+
+        assertEquals(100, deleteAll(SimpleAnnotatedModel.class));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     @SuppressWarnings("all")
     public void deleteAllWhereTest() throws Exception {
-        int elementNumber = 100;
-        for (int i = 1; i <= elementNumber; i++) {
+        for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
-        assertEquals(elementNumber - 1, SugarRecord.deleteAll(SimpleAnnotatedModel.class, "id > ?", new String[]{"1"}));
-        assertEquals(1L, SugarRecord.count(SimpleAnnotatedModel.class));
+
+        assertEquals(99, deleteAll(SimpleAnnotatedModel.class, "id > ?", new String[]{"1"}));
+        assertEquals(1L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
@@ -140,32 +155,33 @@ public void deleteInTransactionFewTest() throws Exception {
         save(first);
         save(second);
         // Not saving last model
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(2, SugarRecord.deleteInTx(first, second, third));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+        assertEquals(2L, count(SimpleAnnotatedModel.class));
+        assertEquals(2, deleteInTx(first, second, third));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void deleteInTransactionManyTest() throws Exception {
-        long elementNumber = 100;
         List<SimpleAnnotatedModel> models = new ArrayList<>();
-        for (int i = 1; i <= elementNumber; i++) {
+
+        for (int i = 1; i <= 100; i++) {
             SimpleAnnotatedModel model = new SimpleAnnotatedModel();
             models.add(model);
             // Not saving last model
-            if (i < elementNumber) {
+            if (i < 100) {
                 save(model);
             }
         }
-        assertEquals(elementNumber - 1, SugarRecord.count(SimpleAnnotatedModel.class));
-        assertEquals(elementNumber - 1, SugarRecord.deleteInTx(models));
-        assertEquals(0L, SugarRecord.count(SimpleAnnotatedModel.class));
+
+        assertEquals(99, count(SimpleAnnotatedModel.class));
+        assertEquals(99, deleteInTx(models));
+        assertEquals(0L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
     public void saveInTransactionTest() throws Exception {
-        SugarRecord.saveInTx(new SimpleAnnotatedModel(), new SimpleAnnotatedModel());
-        assertEquals(2L, SugarRecord.count(SimpleAnnotatedModel.class));
+        saveInTx(new SimpleAnnotatedModel(), new SimpleAnnotatedModel());
+        assertEquals(2L, count(SimpleAnnotatedModel.class));
     }
 
     @Test
@@ -173,8 +189,10 @@ public void listAllTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
-        List<SimpleAnnotatedModel> models = SugarRecord.listAll(SimpleAnnotatedModel.class);
+
+        List<SimpleAnnotatedModel> models = listAll(SimpleAnnotatedModel.class);
         assertEquals(100, models.size());
+
         for (long i = 1; i <= 100; i++) {
             assertEquals(Long.valueOf(i), models.get((int) i - 1).getId());
         }
@@ -184,8 +202,9 @@ public void listAllTest() throws Exception {
     public void findTest() throws Exception {
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.find(SimpleAnnotatedModel.class, "id = ?", "2");
+
+        List<SimpleAnnotatedModel> models = find(SimpleAnnotatedModel.class, "id = ?", "2");
+
         assertEquals(1, models.size());
         assertEquals(2L, models.get(0).getId().longValue());
     }
@@ -195,10 +214,11 @@ public void findWithQueryTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findWithQuery(SimpleAnnotatedModel.class, "Select * from " +
+
+        List<SimpleAnnotatedModel> models = findWithQuery(SimpleAnnotatedModel.class, "Select * from " +
                         NamingHelper.toTableName(SimpleAnnotatedModel.class) +
                         " where id >= ? ", "50");
+
         for (SimpleAnnotatedModel model : models) {
             assertEquals(75L, model.getId(), 25L);
         }
@@ -208,26 +228,25 @@ public void findWithQueryTest() throws Exception {
     @SuppressWarnings("all")
     public void findByIdTest() throws Exception {
         save(new SimpleAnnotatedModel());
-        assertEquals(1L, SugarRecord.findById(SimpleAnnotatedModel.class, 1L).getId().longValue());
+        assertEquals(1L, findById(SimpleAnnotatedModel.class, 1L).getId().longValue());
     }
 
     @Test
     public void findByIdIntegerTest() throws Exception {
         save(new SimpleAnnotatedModel());
-        assertEquals(1L, SugarRecord.findById(SimpleAnnotatedModel.class, 1).getId().longValue());
+        assertEquals(1L, findById(SimpleAnnotatedModel.class, 1).getId().longValue());
     }
 
     @Test
     public void findByIdStringsNullTest() throws Exception {
         save(new SimpleAnnotatedModel());
-        assertEquals(0, SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{""}).size());
+        assertEquals(0, findById(SimpleAnnotatedModel.class, new String[]{""}).size());
     }
 
     @Test
     public void findByIdStringsOneTest() throws Exception {
         save(new SimpleAnnotatedModel());
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1"});
+        List<SimpleAnnotatedModel> models = findById(SimpleAnnotatedModel.class, new String[]{"1"});
         assertEquals(1, models.size());
         assertEquals(1L, models.get(0).getId().longValue());
     }
@@ -237,8 +256,7 @@ public void findByIdStringsTwoTest() throws Exception {
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
         save(new SimpleAnnotatedModel());
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1", "3"});
+        List<SimpleAnnotatedModel> models = findById(SimpleAnnotatedModel.class, new String[]{"1", "3"});
         assertEquals(2, models.size());
         assertEquals(Long.valueOf(1L), models.get(0).getId());
         assertEquals(Long.valueOf(3L), models.get(1).getId());
@@ -249,8 +267,7 @@ public void findByIdStringsManyTest() throws Exception {
         for (int i = 1; i <= 10; i++) {
             save(new SimpleAnnotatedModel());
         }
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"1", "3", "6", "10"});
+        List<SimpleAnnotatedModel> models = findById(SimpleAnnotatedModel.class, new String[]{"1", "3", "6", "10"});
         assertEquals(4, models.size());
         assertEquals(Long.valueOf(1L), models.get(0).getId());
         assertEquals(Long.valueOf(3L), models.get(1).getId());
@@ -263,8 +280,7 @@ public void findByIdStringsOrderTest() throws Exception {
         for (int i = 1; i <= 10; i++) {
             save(new SimpleAnnotatedModel());
         }
-        List<SimpleAnnotatedModel> models =
-                SugarRecord.findById(SimpleAnnotatedModel.class, new String[]{"10", "6", "3", "1"});
+        List<SimpleAnnotatedModel> models = findById(SimpleAnnotatedModel.class, new String[]{"10", "6", "3", "1"});
         assertEquals(4, models.size());
         // The order of the query doesn't matter
         assertEquals(Long.valueOf(1L), models.get(0).getId());
@@ -276,7 +292,7 @@ public void findByIdStringsOrderTest() throws Exception {
     @Test
     public void findByIdNullTest() throws Exception {
         save(new SimpleAnnotatedModel());
-        assertNull(SugarRecord.findById(SimpleAnnotatedModel.class, 2L));
+        assertNull(findById(SimpleAnnotatedModel.class, 2L));
     }
 
     @Test
@@ -284,7 +300,7 @@ public void findAllTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
-        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAll(SimpleAnnotatedModel.class);
+        Iterator<SimpleAnnotatedModel> cursor = findAll(SimpleAnnotatedModel.class);
         for (int i = 1; i <= 100; i++) {
             assertTrue(cursor.hasNext());
             SimpleAnnotatedModel model = cursor.next();
@@ -298,7 +314,7 @@ public void findAsIteratorTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
-        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
+        Iterator<SimpleAnnotatedModel> cursor = findAsIterator(SimpleAnnotatedModel.class,
                 "id >= ?", "50");
         for (int i = 50; i <= 100; i++) {
             assertTrue(cursor.hasNext());
@@ -313,8 +329,7 @@ public void findWithQueryAsIteratorTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleAnnotatedModel());
         }
-        Iterator<SimpleAnnotatedModel> cursor =
-                SugarRecord.findWithQueryAsIterator(SimpleAnnotatedModel.class,
+        Iterator<SimpleAnnotatedModel> cursor = findWithQueryAsIterator(SimpleAnnotatedModel.class,
                         "Select * from " +
                                 NamingHelper.toTableName(SimpleAnnotatedModel.class) +
                                 " where id >= ? ", "50");
@@ -329,7 +344,7 @@ public void findWithQueryAsIteratorTest() throws Exception {
     @Test(expected=NoSuchElementException.class)
     public void findAsIteratorOutOfBoundsTest() throws Exception {
         save(new SimpleAnnotatedModel());
-        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
+        Iterator<SimpleAnnotatedModel> cursor = findAsIterator(SimpleAnnotatedModel.class,
                 "id = ?", "1");
         assertTrue(cursor.hasNext());
         SimpleAnnotatedModel model = cursor.next();
@@ -342,8 +357,7 @@ public void findAsIteratorOutOfBoundsTest() throws Exception {
     @Test(expected=UnsupportedOperationException.class)
     public void disallowRemoveCursorTest() throws Exception {
         save(new SimpleAnnotatedModel());
-        Iterator<SimpleAnnotatedModel> cursor = SugarRecord.findAsIterator(SimpleAnnotatedModel.class,
-                "id = ?", "1");
+        Iterator<SimpleAnnotatedModel> cursor = findAsIterator(SimpleAnnotatedModel.class, "id = ?", "1");
         assertTrue(cursor.hasNext());
         SimpleAnnotatedModel model = cursor.next();
         assertNotNull(model);
@@ -354,6 +368,6 @@ public void disallowRemoveCursorTest() throws Exception {
 
     @Test
     public void vacuumTest() throws Exception {
-        SugarRecord.executeQuery("Vacuum");
+        executeQuery("Vacuum");
     }
 }
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
index 4cd7bdbe..e809405d 100644
--- a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
+++ b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.helper.NamingHelper;
 import com.orm.model.SimpleExtendedModel;
@@ -18,6 +17,20 @@
 import java.util.NoSuchElementException;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.count;
+import static com.orm.SugarRecord.delete;
+import static com.orm.SugarRecord.deleteAll;
+import static com.orm.SugarRecord.executeQuery;
+import static com.orm.SugarRecord.find;
+import static com.orm.SugarRecord.findAll;
+import static com.orm.SugarRecord.findById;
+import static com.orm.SugarRecord.findWithQuery;
+import static com.orm.SugarRecord.findAsIterator;
+import static com.orm.SugarRecord.findWithQueryAsIterator;
+import static com.orm.SugarRecord.deleteInTx;
+import static com.orm.SugarRecord.saveInTx;
+import static com.orm.SugarRecord.listAll;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -27,23 +40,24 @@
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class SimpleExtendedModelTests {
+    private String id = "id = ?";
 
     @Test
     public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
     public void oneSaveTest() throws Exception {
         save(new SimpleExtendedModel());
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, count(SimpleExtendedModel.class));
     }
 
     @Test
     public void twoSaveTest() throws Exception {
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -51,7 +65,8 @@ public void manySaveTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
-        assertEquals(100L, SugarRecord.count(SimpleExtendedModel.class));
+
+        assertEquals(100L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -63,59 +78,59 @@ public void defaultIdTest() throws Exception {
     public void whereCountTest() throws Exception {
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
+        assertEquals(1L, count(SimpleExtendedModel.class, id, new String[]{"1"}));
     }
 
     @Test
     public void whereNoCountTest() throws Exception {
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"1"}));
+        assertEquals(0L, count(SimpleExtendedModel.class, id, new String[]{"1"}));
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"3"}));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class, "id = ?", new String[]{"a"}));
+        assertEquals(0L, count(SimpleExtendedModel.class, id, new String[]{"3"}));
+        assertEquals(0L, count(SimpleExtendedModel.class, id, new String[]{"a"}));
     }
 
     @Test
     public void whereBrokenCountTest() throws Exception {
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
-        assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
+        assertEquals(-1L, count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
     }
 
     @Test
     public void saveMethodTest() throws Exception {
         SimpleExtendedModel model = new SimpleExtendedModel();
         model.save();
-        assertEquals(-1L, SugarRecord.count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
+        assertEquals(-1L, count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
     }
 
     @Test
     public void deleteTest() throws Exception {
         SimpleExtendedModel model = new SimpleExtendedModel();
         save(model);
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
-        assertTrue(SugarRecord.delete(model));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, count(SimpleExtendedModel.class));
+        assertTrue(delete(model));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
     public void deleteUnsavedTest() throws Exception {
         SimpleExtendedModel model = new SimpleExtendedModel();
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
-        assertFalse(SugarRecord.delete(model));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(0L, count(SimpleExtendedModel.class));
+        assertFalse(delete(model));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
     public void deleteWrongTest() throws Exception {
         SimpleExtendedModel model = new SimpleExtendedModel();
         save(model);
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(1L, count(SimpleExtendedModel.class));
         Field idField = model.getClass().getSuperclass().getDeclaredField("id");
         idField.setAccessible(true);
         idField.set(model, Long.MAX_VALUE);
-        assertFalse(SugarRecord.delete(model));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertFalse(delete(model));
+        assertEquals(1L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -124,8 +139,8 @@ public void deleteAllTest() throws Exception {
         for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleExtendedModel());
         }
-        assertEquals(elementNumber, SugarRecord.deleteAll(SimpleExtendedModel.class));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(elementNumber, deleteAll(SimpleExtendedModel.class));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -135,10 +150,8 @@ public void deleteAllWhereTest() throws Exception {
         for (int i = 1; i <= elementNumber; i++) {
             save(new SimpleExtendedModel());
         }
-        assertEquals(elementNumber - 1, SugarRecord.deleteAll(SimpleExtendedModel.class,
-                                                              "id > ?",
-                                                              new String[]{"1"}));
-        assertEquals(1L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(elementNumber - 1, deleteAll(SimpleExtendedModel.class, "id > ?", new String[]{"1"}));
+        assertEquals(1L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -149,9 +162,9 @@ public void deleteInTransactionFewTest() throws Exception {
         save(first);
         save(second);
         // Not saving last model
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(2, SugarRecord.deleteInTx(first, second, third));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(2L, count(SimpleExtendedModel.class));
+        assertEquals(2, deleteInTx(first, second, third));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -166,15 +179,15 @@ public void deleteInTransactionManyTest() throws Exception {
                 save(model);
             }
         }
-        assertEquals(elementNumber - 1, SugarRecord.count(SimpleExtendedModel.class));
-        assertEquals(elementNumber - 1, SugarRecord.deleteInTx(models));
-        assertEquals(0L, SugarRecord.count(SimpleExtendedModel.class));
+        assertEquals(elementNumber - 1, count(SimpleExtendedModel.class));
+        assertEquals(elementNumber - 1, deleteInTx(models));
+        assertEquals(0L, count(SimpleExtendedModel.class));
     }
 
     @Test
     public void saveInTransactionTest() throws Exception {
-        SugarRecord.saveInTx(new SimpleExtendedModel(), new SimpleExtendedModel());
-        assertEquals(2L, SugarRecord.count(SimpleExtendedModel.class));
+        saveInTx(new SimpleExtendedModel(), new SimpleExtendedModel());
+        assertEquals(2L, count(SimpleExtendedModel.class));
     }
 
     @Test
@@ -182,7 +195,7 @@ public void listAllTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
-        List<SimpleExtendedModel> models = SugarRecord.listAll(SimpleExtendedModel.class);
+        List<SimpleExtendedModel> models = listAll(SimpleExtendedModel.class);
         assertEquals(100, models.size());
         for (long i = 1; i <= 100; i++) {
             assertEquals(Long.valueOf(i), models.get((int) i - 1).getId());
@@ -193,8 +206,7 @@ public void listAllTest() throws Exception {
     public void findTest() throws Exception {
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
-        List<SimpleExtendedModel> models =
-                SugarRecord.find(SimpleExtendedModel.class, "id = ?", "2");
+        List<SimpleExtendedModel> models = find(SimpleExtendedModel.class, "id = ?", "2");
         assertEquals(1, models.size());
         assertEquals(Long.valueOf(2L), models.get(0).getId());
     }
@@ -204,8 +216,7 @@ public void findWithQueryTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
-        List<SimpleExtendedModel> models =
-                SugarRecord.findWithQuery(SimpleExtendedModel.class, "Select * from " +
+        List<SimpleExtendedModel> models = findWithQuery(SimpleExtendedModel.class, "Select * from " +
                                           NamingHelper.toTableName(SimpleExtendedModel.class) +
                                           " where id >= ? ", "50");
         for (SimpleExtendedModel model : models) {
@@ -217,26 +228,25 @@ public void findWithQueryTest() throws Exception {
     @SuppressWarnings("all")
     public void findByIdTest() throws Exception {
         save(new SimpleExtendedModel());
-        assertEquals(Long.valueOf(1L), SugarRecord.findById(SimpleExtendedModel.class, 1L).getId());
+        assertEquals(Long.valueOf(1L), findById(SimpleExtendedModel.class, 1L).getId());
     }
 
     @Test
     public void findByIdIntegerTest() throws Exception {
         save(new SimpleExtendedModel());
-        assertEquals(Long.valueOf(1L), SugarRecord.findById(SimpleExtendedModel.class, 1).getId());
+        assertEquals(Long.valueOf(1L), findById(SimpleExtendedModel.class, 1).getId());
     }
 
     @Test
     public void findByIdStringsNullTest() throws Exception {
         save(new SimpleExtendedModel());
-        assertEquals(0, SugarRecord.findById(SimpleExtendedModel.class, new String[]{""}).size());
+        assertEquals(0, findById(SimpleExtendedModel.class, new String[]{""}).size());
     }
 
     @Test
     public void findByIdStringsOneTest() throws Exception {
         save(new SimpleExtendedModel());
-        List<SimpleExtendedModel> models =
-                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1"});
+        List<SimpleExtendedModel> models = findById(SimpleExtendedModel.class, new String[]{"1"});
         assertEquals(1, models.size());
         assertEquals(Long.valueOf(1L), models.get(0).getId());
     }
@@ -246,8 +256,9 @@ public void findByIdStringsTwoTest() throws Exception {
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
         save(new SimpleExtendedModel());
-        List<SimpleExtendedModel> models =
-                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1", "3"});
+
+        List<SimpleExtendedModel> models = findById(SimpleExtendedModel.class, new String[]{"1", "3"});
+
         assertEquals(2, models.size());
         assertEquals(Long.valueOf(1L), models.get(0).getId());
         assertEquals(Long.valueOf(3L), models.get(1).getId());
@@ -258,8 +269,9 @@ public void findByIdStringsManyTest() throws Exception {
         for (int i = 1; i <= 10; i++) {
             save(new SimpleExtendedModel());
         }
-        List<SimpleExtendedModel> models =
-                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"1", "3", "6", "10"});
+
+        List<SimpleExtendedModel> models = findById(SimpleExtendedModel.class, new String[]{"1", "3", "6", "10"});
+
         assertEquals(4, models.size());
         assertEquals(Long.valueOf(1L), models.get(0).getId());
         assertEquals(Long.valueOf(3L), models.get(1).getId());
@@ -272,8 +284,9 @@ public void findByIdStringsOrderTest() throws Exception {
         for (int i = 1; i <= 10; i++) {
             save(new SimpleExtendedModel());
         }
-        List<SimpleExtendedModel> models =
-                SugarRecord.findById(SimpleExtendedModel.class, new String[]{"10", "6", "3", "1"});
+
+        List<SimpleExtendedModel> models = findById(SimpleExtendedModel.class, new String[]{"10", "6", "3", "1"});
+
         assertEquals(4, models.size());
         // The order of the query doesn't matter
         assertEquals(Long.valueOf(1L), models.get(0).getId());
@@ -285,7 +298,7 @@ public void findByIdStringsOrderTest() throws Exception {
     @Test
     public void findByIdNullTest() throws Exception {
         save(new SimpleExtendedModel());
-        assertNull(SugarRecord.findById(SimpleExtendedModel.class, 2L));
+        assertNull(findById(SimpleExtendedModel.class, 2L));
     }
 
     @Test
@@ -293,7 +306,9 @@ public void findAllTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
-        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAll(SimpleExtendedModel.class);
+
+        Iterator<SimpleExtendedModel> cursor = findAll(SimpleExtendedModel.class);
+
         for (int i = 1; i <= 100; i++) {
             assertTrue(cursor.hasNext());
             SimpleExtendedModel model = cursor.next();
@@ -307,8 +322,9 @@ public void findAsIteratorTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
-        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
-                "id >= ?", "50");
+
+        Iterator<SimpleExtendedModel> cursor = findAsIterator(SimpleExtendedModel.class, "id >= ?", "50");
+
         for (int i = 50; i <= 100; i++) {
             assertTrue(cursor.hasNext());
             SimpleExtendedModel model = cursor.next();
@@ -322,8 +338,8 @@ public void findWithQueryAsIteratorTest() throws Exception {
         for (int i = 1; i <= 100; i++) {
             save(new SimpleExtendedModel());
         }
-        Iterator<SimpleExtendedModel> cursor =
-                SugarRecord.findWithQueryAsIterator(SimpleExtendedModel.class,
+
+        Iterator<SimpleExtendedModel> cursor = findWithQueryAsIterator(SimpleExtendedModel.class,
                                                     "Select * from " +
                                                     NamingHelper.toTableName(SimpleExtendedModel.class) +
                                                     " where id >= ? ", "50");
@@ -338,8 +354,7 @@ public void findWithQueryAsIteratorTest() throws Exception {
     @Test(expected=NoSuchElementException.class)
     public void findAsIteratorOutOfBoundsTest() throws Exception {
         save(new SimpleExtendedModel());
-        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
-                "id = ?", "1");
+        Iterator<SimpleExtendedModel> cursor = findAsIterator(SimpleExtendedModel.class, id, "1");
         assertTrue(cursor.hasNext());
         SimpleExtendedModel model = cursor.next();
         assertNotNull(model);
@@ -351,8 +366,7 @@ public void findAsIteratorOutOfBoundsTest() throws Exception {
     @Test(expected=UnsupportedOperationException.class)
     public void disallowRemoveCursorTest() throws Exception {
         save(new SimpleExtendedModel());
-        Iterator<SimpleExtendedModel> cursor = SugarRecord.findAsIterator(SimpleExtendedModel.class,
-                "id = ?", "1");
+        Iterator<SimpleExtendedModel> cursor = findAsIterator(SimpleExtendedModel.class, id, "1");
         assertTrue(cursor.hasNext());
         SimpleExtendedModel model = cursor.next();
         assertNotNull(model);
@@ -363,6 +377,6 @@ public void disallowRemoveCursorTest() throws Exception {
 
     @Test
     public void vacuumTest() throws Exception {
-        SugarRecord.executeQuery("Vacuum");
+        executeQuery("Vacuum");
     }
 }
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/StringFieldTests.java b/library/src/test/java/com/orm/record/StringFieldTests.java
index 8b6af73a..d9641ad7 100644
--- a/library/src/test/java/com/orm/record/StringFieldTests.java
+++ b/library/src/test/java/com/orm/record/StringFieldTests.java
@@ -1,7 +1,6 @@
 package com.orm.record;
 
 import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.StringFieldAnnotatedModel;
 import com.orm.model.StringFieldExtendedModel;
@@ -12,40 +11,41 @@
 import org.robolectric.annotation.Config;
 
 import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class StringFieldTests {
+    private String string = "Test String";
 
     @Test
     public void nullStringExtendedTest() {
         save(new StringFieldExtendedModel());
-        StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
+        StringFieldExtendedModel model = findById(StringFieldExtendedModel.class, 1);
         assertNull(model.getString());
     }
 
     @Test
     public void nullStringAnnotatedTest() {
         save(new StringFieldAnnotatedModel());
-        StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
+        StringFieldAnnotatedModel model = findById(StringFieldAnnotatedModel.class, 1);
         assertNull(model.getString());
     }
 
     @Test
     public void stringExtendedTest() {
-        String string = "Test String";
         save(new StringFieldExtendedModel(string));
-        StringFieldExtendedModel model = SugarRecord.findById(StringFieldExtendedModel.class, 1);
+        StringFieldExtendedModel model = findById(StringFieldExtendedModel.class, 1);
         assertEquals(string, model.getString());
     }
 
     @Test
     public void stringAnnotatedTest() {
-        String string = "Test String";
         save(new StringFieldAnnotatedModel(string));
-        StringFieldAnnotatedModel model = SugarRecord.findById(StringFieldAnnotatedModel.class, 1);
+        StringFieldAnnotatedModel model = findById(StringFieldAnnotatedModel.class, 1);
         assertEquals(string, model.getString());
     }
 }

From 2786aaa337c4a11aa24281553a0dec226ced093f Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 9 Apr 2016 17:22:43 -0300
Subject: [PATCH 257/305] try to fix error with Coverrals

---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 952f49e1..b4e791fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,6 +80,10 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
         xml.enabled = true
     }
 
+    onlyIf = {
+        true
+    }
+
     doFirst {
         executionData = files(executionData.findAll { it.exists() })
     }

From e083fd45d0f735d86e4e433e298352c8170f5631 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 9 Apr 2016 17:49:57 -0300
Subject: [PATCH 258/305] only checks in library, not in example

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b4e791fa..394430fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -90,7 +90,7 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
 }
 
 coveralls {
-    sourceDirs = files('example/src/main/java').flatten() + files('library/src/main/java').flatten()
+    sourceDirs = files('library/src/main/java').flatten()
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
 }
 

From 584e9de8fe513ea2fa4f71f138a5ba554850173e Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 9 Apr 2016 17:54:00 -0300
Subject: [PATCH 259/305] Updated gradle plugin to version 2.0.0 Updated
 gradle-wrapper to version 2.10 Extracted example project from Jacoco Reports

---
 build.gradle                             | 8 ++++----
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 394430fe..030e1cb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }
@@ -70,9 +70,9 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
     description = 'Generates an aggregate report from all subprojects'
     dependsOn(subprojects.jacocoTestReport)
 
-    additionalSourceDirs = files('example/src/main/java') + files('library/src/main/java')
-    sourceDirectories = files('example/src/main/java') + files('library/src/main/java')
-    classDirectories = files('example/build/intermediates/classes/debug') + files('library/build/intermediates/classes/debug')
+    additionalSourceDirs = files('library/src/main/java')
+    sourceDirectories = files('library/src/main/java')
+    classDirectories = files('library/build/intermediates/classes/debug')
     executionData = files(subprojects.jacocoTestReport.executionData)
 
     reports {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e760..b0bb3ffb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Sat Apr 09 17:51:14 ART 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

From 9828d5184eeb261a10cba77a266b57b11261a48d Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 9 Apr 2016 18:05:26 -0300
Subject: [PATCH 260/305] call to gradle wrapper in travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index db407323..1c0ca090 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_script:
   - sudo service rsync stop || true
   - sudo service x11-common stop || true
 script:
-  - gradle clean build connectedCheck coveralls
+  - gradlew clean build connectedCheck coveralls
 
 cache:
   directories:

From 914ca1925228f08b7c99bf7a0f5c484d64b79985 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 9 Apr 2016 18:06:06 -0300
Subject: [PATCH 261/305] call to gradle wrapper in travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1c0ca090..6e0beddd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_script:
   - sudo service rsync stop || true
   - sudo service x11-common stop || true
 script:
-  - gradlew clean build connectedCheck coveralls
+  - ./gradlew clean build connectedCheck coveralls
 
 cache:
   directories:

From 7743c6c19cc849a7c7789bb9f8525e6d9cc91181 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 9 Apr 2016 19:02:36 -0300
Subject: [PATCH 262/305] Updated build.gradle files Added @SuppressWarnings
 annotation to avoid deprecated api errors

---
 example/build.gradle                          | 32 ++-----------------
 library/build.gradle                          |  3 --
 .../java/com/orm/helper/MultiDexHelper.java   |  1 +
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/example/build.gradle b/example/build.gradle
index b9fe1be7..a8b90f05 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.3"
@@ -8,44 +9,17 @@ android {
         minSdkVersion 9
         targetSdkVersion 23
     }
-
     buildTypes {
         release {
             minifyEnabled false
         }
     }
-
-    testOptions{
-        unitTests.returnDefaultValues = true
-    }
-    lintOptions{
+    lintOptions {
         abortOnError false
     }
 }
 
 dependencies {
     compile project (':library')
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    testCompile 'org.robolectric:robolectric:3.0'
-    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:23.3.0'
 }
-
-//robolectric {
-//    // Configure includes / excludes
-//    include '**/*Tests.class'
-//    exclude '**/espresso/**/*.class'
-//
-//    // Configure max heap size of the test JVM
-//    maxHeapSize = '2048m'
-//
-//    // Configure the test JVM arguments - Does not apply to Java 8
-//    jvmArgs '-XX:MaxPermSize=512m', '-XX:-UseSplitVerifier'
-//
-//    // configure whether failing tests should fail the build
-//    ignoreFailures true
-//
-//    // use afterTest to listen to the test execution results
-//    afterTest { descriptor, result ->
-//        println "Executing test for ${descriptor.name} with result: ${result.resultType}"
-//    }
-//}
diff --git a/library/build.gradle b/library/build.gradle
index f04be5fc..bc32d26a 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -9,17 +9,14 @@ android {
         minSdkVersion 9
         targetSdkVersion 23
     }
-
     buildTypes {
         release {
             minifyEnabled false
         }
     }
-
     testOptions{
         unitTests.returnDefaultValues = true
     }
-
     lintOptions{
         abortOnError false
     }
diff --git a/library/src/main/java/com/orm/helper/MultiDexHelper.java b/library/src/main/java/com/orm/helper/MultiDexHelper.java
index d17105f4..588908cd 100644
--- a/library/src/main/java/com/orm/helper/MultiDexHelper.java
+++ b/library/src/main/java/com/orm/helper/MultiDexHelper.java
@@ -33,6 +33,7 @@ public final class MultiDexHelper {
     //Prevent instantiation..
     private MultiDexHelper() { }
 
+    @SuppressWarnings("all")
     private static SharedPreferences getMultiDexPreferences() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
             return getSharedPreferences(PREFS_FILE, Context.MODE_PRIVATE);

From 6b3182c859040a4034a138a7c9686f657a26e6cc Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 18:31:19 -0300
Subject: [PATCH 263/305] Added Test for SugarConfig

---
 .../java/com/orm/util/SugarConfigTest.java    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/library/src/test/java/com/orm/util/SugarConfigTest.java b/library/src/test/java/com/orm/util/SugarConfigTest.java
index d27eb85d..5f73aaef 100644
--- a/library/src/test/java/com/orm/util/SugarConfigTest.java
+++ b/library/src/test/java/com/orm/util/SugarConfigTest.java
@@ -1,8 +1,27 @@
 package com.orm.util;
 
+import com.orm.model.TestRecord;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @author jonatan.salas
  */
-public class SugarConfigTest {
+public final class SugarConfigTest {
+
+    @Test
+    public void testSetGetFields() {
+        Field[] fields = TestRecord.class.getFields();
+
+        List<Field> fieldList = Arrays.asList(fields);
+        SugarConfig.setFields(TestRecord.class, fieldList);
 
+        Assert.assertEquals(fieldList, SugarConfig.getFields(TestRecord.class));
+    }
 }

From c9f21a54b55124c6db7a42cf26f7c05eb5d4e534 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 18:43:00 -0300
Subject: [PATCH 264/305] Added test for private constructor in KeyWordUtil

---
 library/src/test/java/com/orm/util/KeyWordUtilTest.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/library/src/test/java/com/orm/util/KeyWordUtilTest.java b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
index d2d44b09..8c1e70fc 100644
--- a/library/src/test/java/com/orm/util/KeyWordUtilTest.java
+++ b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
@@ -3,12 +3,19 @@
 import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
 
 /**
  * @author jonatan.salas
  */
 public final class KeyWordUtilTest {
 
+    @Test(expected = IllegalAccessException.class)
+    public void testPrivateConstructor() throws Exception {
+        KeyWordUtil keyWordUtil = (KeyWordUtil) Class.forName(KeyWordUtil.class.getName()).getDeclaredConstructor().newInstance();
+        assertNull(keyWordUtil);
+    }
+
     @Test
     public void testKeyWord() {
         assertEquals(true, KeyWordUtil.isKeyword("SELECT"));

From a8e28b2a16ef7a1d06cf0e972ec9db92f7f719b0 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 18:51:20 -0300
Subject: [PATCH 265/305] Commented test in ReflectionUtil

---
 .../java/com/orm/util/ReflectionUtilTest.java | 26 +++++++++----------
 .../java/com/orm/util/SugarConfigTest.java    |  6 +++++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index eac94abc..099dcc01 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -1,7 +1,5 @@
 package com.orm.util;
 
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
 import com.orm.model.TestRecord;
 
 import org.junit.Test;
@@ -17,16 +15,16 @@
  */
 public final class ReflectionUtilTest {
 
-    @Test
-    public void testGetTableFields() {
-        List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
-        List<String> strings = new ArrayList<>();
-
-        for (Field field: fieldList) {
-            strings.add(field.getName());
-        }
-
-        assertEquals(true, strings.contains("id"));
-        assertEquals(true, strings.contains("name"));
-    }
+//    @Test
+//    public void testGetTableFields() {
+//        List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
+//        List<String> strings = new ArrayList<>();
+//
+//        for (Field field: fieldList) {
+//            strings.add(field.getName());
+//        }
+//
+//        assertEquals(true, strings.contains("id"));
+//        assertEquals(true, strings.contains("name"));
+//    }
 }
diff --git a/library/src/test/java/com/orm/util/SugarConfigTest.java b/library/src/test/java/com/orm/util/SugarConfigTest.java
index 5f73aaef..82943e9e 100644
--- a/library/src/test/java/com/orm/util/SugarConfigTest.java
+++ b/library/src/test/java/com/orm/util/SugarConfigTest.java
@@ -24,4 +24,10 @@ public void testSetGetFields() {
 
         Assert.assertEquals(fieldList, SugarConfig.getFields(TestRecord.class));
     }
+
+    @Test
+    public void testClearCache() {
+        SugarConfig.clearCache();
+        Assert.assertEquals(true, SugarConfig.fields.isEmpty());
+    }
 }

From cb51e01302be7390a9768dee05202612c42cf277 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 19:22:59 -0300
Subject: [PATCH 266/305] Added test in ReflectionUtil

---
 .../java/com/orm/util/ReflectionUtilTest.java  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index 099dcc01..ae9e07e9 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -2,13 +2,9 @@
 
 import com.orm.model.TestRecord;
 
-import org.junit.Test;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
+import junit.framework.Assert;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
 
 /**
  * @author jonatan.salas
@@ -27,4 +23,14 @@ public final class ReflectionUtilTest {
 //        assertEquals(true, strings.contains("id"));
 //        assertEquals(true, strings.contains("name"));
 //    }
+
+    @Test
+    public void testSetFieldValueForId() {
+        TestRecord record = new TestRecord();
+        record.setName("Bla bla");
+
+        ReflectionUtil.setFieldValueForId(record, 1L);
+        Assert.assertEquals(1L, record.getId().longValue());
+    }
+
 }

From 6557f58a6a46c8ac8da412d55b235401ca083c26 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 19:43:27 -0300
Subject: [PATCH 267/305] Added more test in ReflectionUtil

---
 .../java/com/orm/util/ReflectionUtilTest.java | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index ae9e07e9..61aae9ae 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -1,28 +1,39 @@
 package com.orm.util;
 
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
 import com.orm.model.TestRecord;
 
 import junit.framework.Assert;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author jonatan.salas
  */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class ReflectionUtilTest {
 
-//    @Test
-//    public void testGetTableFields() {
-//        List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
-//        List<String> strings = new ArrayList<>();
-//
-//        for (Field field: fieldList) {
-//            strings.add(field.getName());
-//        }
-//
-//        assertEquals(true, strings.contains("id"));
-//        assertEquals(true, strings.contains("name"));
-//    }
+    @Test
+    public void testGetTableFields() {
+        List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
+        List<String> strings = new ArrayList<>();
+
+        for (Field field: fieldList) {
+            strings.add(field.getName());
+        }
+
+        Assert.assertEquals(true, strings.contains("id"));
+        Assert.assertEquals(true, strings.contains("name"));
+    }
 
     @Test
     public void testSetFieldValueForId() {
@@ -33,4 +44,9 @@ public void testSetFieldValueForId() {
         Assert.assertEquals(1L, record.getId().longValue());
     }
 
+    @Test
+    public void testGetAllClasses() {
+        List<Class> classes = ReflectionUtil.getDomainClasses();
+        Assert.assertEquals(40, classes.size());
+    }
 }

From 29fe48c9a8b989629316065d07d2b5eb2070b5cc Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 20:12:26 -0300
Subject: [PATCH 268/305] Added more test to ReflectionUtil

---
 library/src/main/java/com/orm/SugarContext.java |  2 +-
 .../java/com/orm/util/ReflectionUtilTest.java   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SugarContext.java b/library/src/main/java/com/orm/SugarContext.java
index 7b0f8f8b..61609986 100644
--- a/library/src/main/java/com/orm/SugarContext.java
+++ b/library/src/main/java/com/orm/SugarContext.java
@@ -67,7 +67,7 @@ public SugarDb getSugarDb() {
         return sugarDb;
     }
 
-    Map<Object, Long> getEntitiesMap() {
+    public Map<Object, Long> getEntitiesMap() {
         return entitiesMap;
     }
 }
diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index 61aae9ae..f76c8797 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -1,5 +1,8 @@
 package com.orm.util;
 
+import android.content.ContentValues;
+
+import com.orm.SugarContext;
 import com.orm.app.ClientApp;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.TestRecord;
@@ -35,6 +38,20 @@ public void testGetTableFields() {
         Assert.assertEquals(true, strings.contains("name"));
     }
 
+    @Test(expected = NoSuchFieldException.class)
+    public void testAddFieldValueToColumn() throws NoSuchFieldException {
+        SugarContext context = SugarContext.getSugarContext();
+        TestRecord record = new TestRecord();
+        record.setName("lala");
+
+        Field column = TestRecord.class.getField("name");
+        ContentValues values = new ContentValues();
+
+        ReflectionUtil.addFieldValueToColumn(values, column, record, context.getEntitiesMap());
+
+        Assert.assertEquals(record.getName(), values.getAsString("NAME"));
+    }
+
     @Test
     public void testSetFieldValueForId() {
         TestRecord record = new TestRecord();

From de7c38b62358a0873877bd241bb555d1817f5c78 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 20:59:12 -0300
Subject: [PATCH 269/305] Added more tests to com.orm test package

---
 .../main/java/com/orm/SchemaGenerator.java    |  2 +-
 .../java/com/orm/SchemaGeneratorTest.java     | 66 +++++++++++++++++++
 .../src/test/java/com/orm/SugarAppTest.java   | 31 +++++++++
 .../com/orm/helper/ManifestHelperTest.java    |  9 +++
 .../java/com/orm/helper/NamingHelperTest.java |  7 ++
 .../helper/SugarTransactionHelperTest.java    |  7 ++
 .../java/com/orm/util/ContextUtilTest.java    |  7 ++
 .../java/com/orm/util/KeyWordUtilTest.java    |  2 +-
 .../java/com/orm/util/ReflectionUtilTest.java | 22 +++++++
 9 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 library/src/test/java/com/orm/SugarAppTest.java

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 2ad6529f..c2b1a4b9 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -255,7 +255,7 @@ protected String createTableSQL(Class<?> table) {
         return sb.toString();
     }
 
-    private void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
+    protected void createTable(Class<?> table, SQLiteDatabase sqLiteDatabase) {
         String createSQL = createTableSQL(table);
 
         if (!createSQL.isEmpty()) {
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 9ef72cbc..c93a3634 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -1,5 +1,8 @@
 package com.orm;
 
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
 import com.orm.app.ClientApp;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.EmptyModel;
@@ -9,6 +12,9 @@
 import com.orm.model.StringFieldExtendedModel;
 import com.orm.model.StringFieldExtendedModelAnnotatedColumn;
 import com.orm.helper.NamingHelper;
+import com.orm.model.TestRecord;
+
+import junit.framework.Assert;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -78,4 +84,64 @@ public void testMultiColumnUniqueTableCreation() {
                         "UNIQUE(A, B) ON CONFLICT REPLACE ) ",
                 createSQL);
     }
+
+    @Test
+    public void testTableCreation() {
+        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
+        schemaGenerator.createTable(TestRecord.class, sqLiteDatabase);
+        String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
+
+        String tableName = NamingHelper.toTableName(TestRecord.class);
+        Cursor c = sqLiteDatabase.rawQuery(String.format(sql, tableName), null);
+
+        if (c.moveToFirst()) {
+            Assert.assertEquals(1, c.getInt(0));
+        }
+
+        if (!c.isClosed()) {
+            c.close();
+        }
+    }
+
+    @Test
+    public void testAllTableCreation() {
+        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
+
+        schemaGenerator.createDatabase(sqLiteDatabase);
+        String sql = "select count(*) from sqlite_master where type='table';";
+
+        Cursor c = sqLiteDatabase.rawQuery(sql, null);
+
+        if (c.moveToFirst()) {
+            Assert.assertEquals(42, c.getInt(0));
+        }
+
+        if (!c.isClosed()) {
+            c.close();
+        }
+    }
+
+    @Test
+    public void testDeleteAllTables() {
+        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
+
+        schemaGenerator.createDatabase(sqLiteDatabase);
+        schemaGenerator.deleteTables(sqLiteDatabase);
+
+        String sql = "select count(*) from sqlite_master where type='table';";
+
+        Cursor c = sqLiteDatabase.rawQuery(sql, null);
+
+        if (c.moveToFirst()) {
+            //Two tables are by default created by SQLite
+            Assert.assertEquals(2, c.getInt(0));
+        }
+
+        if (!c.isClosed()) {
+            c.close();
+        }
+    }
 }
diff --git a/library/src/test/java/com/orm/SugarAppTest.java b/library/src/test/java/com/orm/SugarAppTest.java
new file mode 100644
index 00000000..0f247ae8
--- /dev/null
+++ b/library/src/test/java/com/orm/SugarAppTest.java
@@ -0,0 +1,31 @@
+package com.orm;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+/**
+ * @author jonatan.salas
+ */
+public final class SugarAppTest {
+
+    @Test
+    public void testOnCreate() {
+        SugarApp app = new SugarApp();
+        app.onCreate();
+
+        SugarContext context = SugarContext.getSugarContext();
+        Assert.assertNotNull(context);
+    }
+
+
+    @Test(expected = NullPointerException.class)
+    public void testOnTerminate() {
+        SugarApp app = new SugarApp();
+        app.onCreate();
+        app.onTerminate();
+
+        SugarContext context = SugarContext.getSugarContext();
+        Assert.assertNull(context);
+    }
+}
diff --git a/library/src/test/java/com/orm/helper/ManifestHelperTest.java b/library/src/test/java/com/orm/helper/ManifestHelperTest.java
index b8bfbbf9..2fad344c 100644
--- a/library/src/test/java/com/orm/helper/ManifestHelperTest.java
+++ b/library/src/test/java/com/orm/helper/ManifestHelperTest.java
@@ -2,12 +2,14 @@
 
 import com.orm.app.ClientApp;
 import com.orm.dsl.BuildConfig;
+import com.orm.util.KeyWordUtil;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import static junit.framework.Assert.assertNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -24,6 +26,13 @@
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class ManifestHelperTest {
 
+    @Test(expected = IllegalAccessException.class)
+    public void testPrivateConstructor() throws Exception {
+        ManifestHelper helper = ManifestHelper.class.getDeclaredConstructor().newInstance();
+        assertNull(helper);
+    }
+
+
     @Test
     public void testGetDbName() {
         assertEquals(DATABASE_DEFAULT_NAME, getDatabaseName());
diff --git a/library/src/test/java/com/orm/helper/NamingHelperTest.java b/library/src/test/java/com/orm/helper/NamingHelperTest.java
index 54c3684c..0cc8a9d6 100644
--- a/library/src/test/java/com/orm/helper/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/helper/NamingHelperTest.java
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 
 import static com.orm.helper.NamingHelper.toColumnName;
@@ -18,6 +19,12 @@
 
 public final class NamingHelperTest {
 
+    @Test(expected = IllegalAccessException.class)
+    public void testPrivateConstructor() throws Exception {
+        NamingHelper helper = NamingHelper.class.getDeclaredConstructor().newInstance();
+        assertNull(helper);
+    }
+
     @Test
     public void testToSQLNameFromField() {
         List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
diff --git a/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java b/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
index 396b3887..1fe73708 100644
--- a/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
+++ b/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
@@ -17,6 +17,7 @@
 import java.util.List;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
 
 /**
  * @author jonatan.salas
@@ -47,6 +48,12 @@ public void setUp() {
         recordList.add(record3);
     }
 
+    @Test(expected = IllegalAccessException.class)
+    public void testPrivateConstructor() throws Exception {
+        SugarTransactionHelper helper = SugarTransactionHelper.class.getDeclaredConstructor().newInstance();
+        assertNull(helper);
+    }
+
     @Test
     public void testDoInTransaction() {
         SugarTransactionHelper.doInTransaction(new SugarTransactionHelper.Callback() {
diff --git a/library/src/test/java/com/orm/util/ContextUtilTest.java b/library/src/test/java/com/orm/util/ContextUtilTest.java
index 46372db9..9ce16c7d 100644
--- a/library/src/test/java/com/orm/util/ContextUtilTest.java
+++ b/library/src/test/java/com/orm/util/ContextUtilTest.java
@@ -22,6 +22,13 @@
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class ContextUtilTest {
 
+    @Test(expected = IllegalAccessException.class)
+    public void testPrivateConstructor() throws Exception {
+        ContextUtil contextUtil = ContextUtil.class.getDeclaredConstructor().newInstance();
+        assertNull(contextUtil);
+    }
+
+
     @Test
     public void testInitContext() {
         assertNotNull(getContext());
diff --git a/library/src/test/java/com/orm/util/KeyWordUtilTest.java b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
index 8c1e70fc..417f1b21 100644
--- a/library/src/test/java/com/orm/util/KeyWordUtilTest.java
+++ b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
@@ -12,7 +12,7 @@ public final class KeyWordUtilTest {
 
     @Test(expected = IllegalAccessException.class)
     public void testPrivateConstructor() throws Exception {
-        KeyWordUtil keyWordUtil = (KeyWordUtil) Class.forName(KeyWordUtil.class.getName()).getDeclaredConstructor().newInstance();
+        KeyWordUtil keyWordUtil = KeyWordUtil.class.getDeclaredConstructor().newInstance();
         assertNull(keyWordUtil);
     }
 
diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index f76c8797..18123b8c 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -1,11 +1,13 @@
 package com.orm.util;
 
 import android.content.ContentValues;
+import android.database.Cursor;
 
 import com.orm.SugarContext;
 import com.orm.app.ClientApp;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.TestRecord;
+import com.orm.query.Select;
 
 import junit.framework.Assert;
 
@@ -25,6 +27,12 @@
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class ReflectionUtilTest {
 
+    @Test(expected = IllegalAccessException.class)
+    public void testPrivateConstructor() throws Exception {
+        ReflectionUtil reflectionUtil = ReflectionUtil.class.getDeclaredConstructor().newInstance();
+        Assert.assertNull(reflectionUtil);
+    }
+
     @Test
     public void testGetTableFields() {
         List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
@@ -66,4 +74,18 @@ public void testGetAllClasses() {
         List<Class> classes = ReflectionUtil.getDomainClasses();
         Assert.assertEquals(40, classes.size());
     }
+
+    @Test(expected = NoSuchFieldException.class)
+    public void testSetFieldValueFromCursor() throws NoSuchFieldException {
+        final TestRecord record = new TestRecord().setName("bla bla");
+        Long id = record.save();
+        record.setId(id);
+
+        Cursor cursor = Select.from(TestRecord.class).getCursor();
+
+        TestRecord testRecord = new TestRecord();
+        Field field = TestRecord.class.getField("name");
+
+        ReflectionUtil.setFieldValueFromCursor(cursor, field, testRecord);
+    }
 }

From 3831f3f8a12725efc9437e4a4e6bfdc6c3f5c8b4 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 21:23:34 -0300
Subject: [PATCH 270/305] Added more test to SchemaGeneratorTest Added new
 model class to use in SchemaGeneratorTest

---
 .../main/java/com/orm/SchemaGenerator.java    |  2 +-
 .../java/com/orm/SchemaGeneratorTest.java     | 34 ++++++++++++++++++-
 .../java/com/orm/model/AllAnotatedModel.java  | 25 ++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 library/src/test/java/com/orm/model/AllAnotatedModel.java

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index c2b1a4b9..579e22b8 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -65,7 +65,7 @@ public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
         executeSugarUpgrade(sqLiteDatabase, oldVersion, newVersion);
     }
 
-    private ArrayList<String> getColumnNames(SQLiteDatabase sqLiteDatabase, String tableName) {
+    protected ArrayList<String> getColumnNames(SQLiteDatabase sqLiteDatabase, String tableName) {
         Cursor resultsQuery = sqLiteDatabase.query(tableName, null, null, null, null, null, null);
         //Check if columns match vs the one on the domain class
         ArrayList<String> columnNames = new ArrayList<>();
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index c93a3634..fa75cdea 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -5,6 +5,7 @@
 
 import com.orm.app.ClientApp;
 import com.orm.dsl.BuildConfig;
+import com.orm.model.AllAnotatedModel;
 import com.orm.model.EmptyModel;
 import com.orm.model.IntUniqueModel;
 import com.orm.model.MultiColumnUniqueModel;
@@ -21,6 +22,8 @@
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.List;
+
 import static junit.framework.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
@@ -104,6 +107,25 @@ public void testTableCreation() {
         }
     }
 
+    @Test
+    public void testAnnotatedModelTableCreation() {
+        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
+        schemaGenerator.createTable(AllAnotatedModel.class, sqLiteDatabase);
+        String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
+
+        String tableName = NamingHelper.toTableName(AllAnotatedModel.class);
+        Cursor c = sqLiteDatabase.rawQuery(String.format(sql, tableName), null);
+
+        if (c.moveToFirst()) {
+            Assert.assertEquals(1, c.getInt(0));
+        }
+
+        if (!c.isClosed()) {
+            c.close();
+        }
+    }
+
     @Test
     public void testAllTableCreation() {
         SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
@@ -115,7 +137,7 @@ public void testAllTableCreation() {
         Cursor c = sqLiteDatabase.rawQuery(sql, null);
 
         if (c.moveToFirst()) {
-            Assert.assertEquals(42, c.getInt(0));
+            Assert.assertEquals(43, c.getInt(0));
         }
 
         if (!c.isClosed()) {
@@ -144,4 +166,14 @@ public void testDeleteAllTables() {
             c.close();
         }
     }
+
+    @Test
+    public void testGetColumnNames() {
+        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
+        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
+        schemaGenerator.createTable(TestRecord.class, sqLiteDatabase);
+
+        List<String> columnNames = schemaGenerator.getColumnNames(sqLiteDatabase, NamingHelper.toTableName(TestRecord.class));
+        Assert.assertEquals(2, columnNames.size());
+    }
 }
diff --git a/library/src/test/java/com/orm/model/AllAnotatedModel.java b/library/src/test/java/com/orm/model/AllAnotatedModel.java
new file mode 100644
index 00000000..c2fb888d
--- /dev/null
+++ b/library/src/test/java/com/orm/model/AllAnotatedModel.java
@@ -0,0 +1,25 @@
+package com.orm.model;
+
+import com.orm.annotation.Column;
+import com.orm.annotation.Ignore;
+import com.orm.annotation.NotNull;
+import com.orm.annotation.Table;
+import com.orm.annotation.Unique;
+
+/**
+ * @author jonatan.salas
+ */
+@Table
+public class AllAnotatedModel {
+
+    @NotNull @Unique
+    private Long id;
+
+    @Column(notNull = true, name = "name", unique = true)
+    private String name;
+
+    @Ignore
+    private String surname;
+
+    public AllAnotatedModel() { }
+}

From eede8a52bb2a02f273ba229365a9b4955ed80a46 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 10 Apr 2016 21:44:46 -0300
Subject: [PATCH 271/305] Solved error in ReflectionUtilTest

---
 library/src/test/java/com/orm/util/ReflectionUtilTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index 18123b8c..5d0dd12b 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -72,7 +72,7 @@ public void testSetFieldValueForId() {
     @Test
     public void testGetAllClasses() {
         List<Class> classes = ReflectionUtil.getDomainClasses();
-        Assert.assertEquals(40, classes.size());
+        Assert.assertEquals(41, classes.size());
     }
 
     @Test(expected = NoSuchFieldException.class)

From e2396b0ae12e7dcb4b30983f265637c1a86b0b66 Mon Sep 17 00:00:00 2001
From: Marcus Balbi <marcus@rgsistemas.com.br>
Date: Wed, 13 Apr 2016 16:16:15 -0300
Subject: [PATCH 272/305] add method afterTableCreated that executes a sql file
 with the name of the domain class.

---
 library/src/main/java/com/orm/SchemaGenerator.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 579e22b8..e3a1c6b1 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -46,7 +46,13 @@ public void createDatabase(SQLiteDatabase sqLiteDatabase) {
         List<Class> domainClasses = getDomainClasses();
         for (Class domain : domainClasses) {
             createTable(domain, sqLiteDatabase);
+            afterTableCreated(domain,sqLiteDatabase);
         }
+
+    }
+
+    public void afterTableCreated(Class<?> table, SQLiteDatabase sqLiteDatabase) {
+        executeScript(sqLiteDatabase, table.getSimpleName() + ".sql");
     }
 
     public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {

From f2ff6274f3acc240f4daf2bb75f3d0b9060d4a7f Mon Sep 17 00:00:00 2001
From: Marcus Balbi <marcus@rgsistemas.com.br>
Date: Wed, 13 Apr 2016 17:36:28 -0300
Subject: [PATCH 273/305] refactoting executeScriptFile to receive a path that
 could be sugar_upgrades or sugar_afeter_create

---
 library/src/main/java/com/orm/SchemaGenerator.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index e3a1c6b1..5aa090cd 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -52,7 +52,9 @@ public void createDatabase(SQLiteDatabase sqLiteDatabase) {
     }
 
     public void afterTableCreated(Class<?> table, SQLiteDatabase sqLiteDatabase) {
-        executeScript(sqLiteDatabase, table.getSimpleName() + ".sql");
+        String fileName = table.getSimpleName() + ".sql";
+        executeScript(sqLiteDatabase,"sugar_after_create/" ,fileName);
+
     }
 
     public void doUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
@@ -104,7 +106,7 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
                     int version = Integer.valueOf(file.replace(".sql", ""));
 
                     if ((version > oldVersion) && (version <= newVersion)) {
-                        executeScript(db, file);
+                        executeScript(db,"sugar_upgrades/" ,file);
                         isSuccess = true;
                     }
                 } catch (NumberFormatException e) {
@@ -119,9 +121,9 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
         return isSuccess;
     }
 
-    private void executeScript(SQLiteDatabase db, String file) {
+    private void executeScript(SQLiteDatabase db,String path ,String file) {
         try {
-            InputStream is = getAssets().open("sugar_upgrades/" + file);
+            InputStream is = getAssets().open(path + file);
             BufferedReader reader = new BufferedReader(new InputStreamReader(is));
             StringBuilder sb = new StringBuilder();
             String line;

From 4eb17aa1a6a807117b3a4ad592e1f04130b4e8f1 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 16 Apr 2016 19:30:39 -0300
Subject: [PATCH 274/305] Updated build.gradle files to add support for
 RetroLambda Added ThreadUtil class which provides a methoc to perform a
 generic async execution of a callable Added SugarDataSource class which
 provides async execution of SugarRecord and result via callbacks.

---
 build.gradle                                  |   1 +
 library/build.gradle                          |   9 +-
 .../main/java/com/orm/SugarDataSource.java    | 243 ++++++++++++++++++
 .../main/java/com/orm/util/ThreadUtil.java    |  26 ++
 4 files changed, 277 insertions(+), 2 deletions(-)
 create mode 100644 library/src/main/java/com/orm/SugarDataSource.java
 create mode 100644 library/src/main/java/com/orm/util/ThreadUtil.java

diff --git a/build.gradle b/build.gradle
index 030e1cb3..ba428694 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'me.tatarka:gradle-retrolambda:3.2.3'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }
diff --git a/library/build.gradle b/library/build.gradle
index bc32d26a..a9b12441 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'me.tatarka.retrolambda'
 apply from: '../maven_push.gradle'
 
 android {
@@ -14,10 +15,14 @@ android {
             minifyEnabled false
         }
     }
-    testOptions{
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    testOptions {
         unitTests.returnDefaultValues = true
     }
-    lintOptions{
+    lintOptions {
         abortOnError false
     }
 }
diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
new file mode 100644
index 00000000..678866c5
--- /dev/null
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -0,0 +1,243 @@
+package com.orm;
+
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+
+import static com.orm.util.ThreadUtil.*;
+
+/**
+ * SugarDataSource provides basic crud operations and simplifies SugarRecord by using callbacks and
+ * performing Asynchronous execution to run queries.
+ *
+ * @author jonatan.salas
+ */
+public final class SugarDataSource<T> {
+    private final Class<T> sClass;
+
+    /**
+     *
+     * @param tClass
+     */
+    private SugarDataSource(Class<T> tClass) {
+        if (null == tClass) {
+            throw new IllegalArgumentException("sClass shouldn't be null!");
+        }
+
+        this.sClass = tClass;
+    }
+
+    /**
+     *
+     * @param sClass
+     * @param <T>
+     * @return
+     */
+    public static <T> SugarDataSource<T> getInstance(Class<T> sClass) {
+        return new SugarDataSource<>(sClass);
+    }
+
+    /**
+     *
+     * @param object
+     * @param success
+     * @param error
+     */
+    @SuppressWarnings("all")
+    public void insert(final T object, final SuccessCallback<Long> success, final ErrorCallback error) {
+        checkNotNull(success);
+        checkNotNull(object);
+        checkNotNull(error);
+
+        final Callable<Long> call = () -> { return SugarRecord.save(object); };
+        final Future<Long> future = doInBackground(call);
+
+        Long id = null;
+
+        try {
+            if (future.isDone()) {
+                id = future.get();
+            }
+
+            if (null == object) {
+                error.onError(new Exception("Error when performing insert of " + object.toString()));
+            } else {
+                success.onSuccess(id);
+            }
+
+        } catch (Exception e) {
+            error.onError(e);
+        }
+    }
+
+    /**
+     *
+     * @param id
+     * @param success
+     * @param error
+     */
+    @SuppressWarnings("all")
+    public void findById(final Long id, final SuccessCallback<T> success, final ErrorCallback error) {
+        checkNotNull(success);
+        checkNotNull(error);
+        checkNotNull(id);
+
+        final Callable<T> call = () -> { return SugarRecord.findById(getSugarClass(), id); };
+        final Future<T> future = doInBackground(call);
+
+        T object = null;
+
+        try {
+            if (future.isDone()) {
+                object = future.get();
+            }
+
+            if (null == object) {
+                error.onError(new Exception("The object with " + id.toString() + "doesn't exist in database"));
+            } else {
+                success.onSuccess(object);
+            }
+
+        } catch (Exception e) {
+            error.onError(e);
+        }
+    }
+
+    /**
+     *
+     * @param orderBy
+     * @param success
+     * @param error
+     */
+    @SuppressWarnings("all")
+    public void listAll(final String orderBy, final SuccessCallback<List<T>> success, final ErrorCallback error) {
+        checkNotNull(success);
+        checkNotNull(error);
+
+        final Callable<List<T>> call = () -> { return SugarRecord.listAll(getSugarClass(), orderBy); };
+        final Future<List<T>> future = doInBackground(call);
+
+        List<T> objects = null;
+
+        try {
+            if (future.isDone()) {
+                objects = future.get();
+            }
+
+            if (null == objects || objects.isEmpty()) {
+                error.onError(new Exception("There are no objects in the database"));
+            } else {
+                success.onSuccess(objects);
+            }
+
+        } catch (Exception e) {
+            error.onError(e);
+        }
+    }
+
+
+    /**
+     *
+     * @param object
+     * @param success
+     * @param error
+     */
+    @SuppressWarnings("all")
+    public void update(final T object, final SuccessCallback<Long> success, final ErrorCallback error) {
+        checkNotNull(success);
+        checkNotNull(object);
+        checkNotNull(error);
+
+        final Callable<Long> call = () -> { return SugarRecord.update(object); };
+        final Future<Long> future = doInBackground(call);
+
+        Long id = null;
+
+        try {
+            if (future.isDone()) {
+                id = future.get();
+            }
+
+            if (null == object) {
+                error.onError(new Exception("Error when performing update of " + object.toString()));
+            } else {
+                success.onSuccess(id);
+            }
+
+        } catch (Exception e) {
+            error.onError(e);
+        }
+    }
+
+    /**
+     *
+     * @param object
+     * @param success
+     * @param error
+     */
+    @SuppressWarnings("all")
+    public void delete(final T object, final SuccessCallback<Boolean> success, final ErrorCallback error) {
+        checkNotNull(success);
+        checkNotNull(object);
+        checkNotNull(error);
+
+        final Callable<Boolean> call = () -> { return SugarRecord.delete(object); };
+        final Future<Boolean> future = doInBackground(call);
+
+        Boolean deleted = null;
+
+        try {
+            if (future.isDone()) {
+                deleted = future.get();
+            }
+
+            if (null == object) {
+                error.onError(new Exception("Error when performing delete of " + object.toString()));
+            } else {
+                success.onSuccess(deleted);
+            }
+
+        } catch (Exception e) {
+            error.onError(e);
+        }
+    }
+
+    /**
+     *
+     * @param object
+     */
+    private void checkNotNull(Object object) {
+        if (null == object) {
+            throw new IllegalArgumentException("object shouldn't be null");
+        }
+    }
+
+    public Class<T> getSugarClass() {
+        return sClass;
+    }
+
+    /**
+     * @author jonatan.salas
+     * @param <S>
+     */
+    public interface SuccessCallback<S> {
+
+        /**
+         *
+         * @param object
+         */
+        void onSuccess(final S object);
+    }
+
+    /**
+     * @author jonatan.salas
+     */
+    public interface ErrorCallback {
+
+        /**
+         *
+         * @param e
+         */
+        void onError(final Exception e);
+    }
+}
diff --git a/library/src/main/java/com/orm/util/ThreadUtil.java b/library/src/main/java/com/orm/util/ThreadUtil.java
new file mode 100644
index 00000000..bcd9e03d
--- /dev/null
+++ b/library/src/main/java/com/orm/util/ThreadUtil.java
@@ -0,0 +1,26 @@
+package com.orm.util;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+/**
+ * @author jonatan.salas
+ */
+public final class ThreadUtil {
+
+    //Prevent instantiation..
+    private ThreadUtil() { }
+
+    public static Future doInBackground(Callable callable) {
+        final ExecutorService executor = Executors.newSingleThreadExecutor();
+        Future future = executor.submit(callable);
+
+        if(executor.isTerminated()) {
+            executor.shutdown();
+        }
+
+        return future;
+    }
+}

From 23587eec97f02853090eb1f0dce92dec835142b4 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 16 Apr 2016 20:45:29 -0300
Subject: [PATCH 275/305] Added delete, delete with params and deleteAll
 methods

---
 .../main/java/com/orm/SugarDataSource.java    | 167 ++++++++++++------
 .../src/main/java/com/orm/SugarRecord.java    |   2 -
 2 files changed, 117 insertions(+), 52 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index 678866c5..cb636505 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -12,6 +12,7 @@
  *
  * @author jonatan.salas
  */
+@SuppressWarnings("all")
 public final class SugarDataSource<T> {
     private final Class<T> sClass;
 
@@ -40,14 +41,13 @@ public static <T> SugarDataSource<T> getInstance(Class<T> sClass) {
     /**
      *
      * @param object
-     * @param success
-     * @param error
+     * @param successCallback
+     * @param errorCallback
      */
-    @SuppressWarnings("all")
-    public void insert(final T object, final SuccessCallback<Long> success, final ErrorCallback error) {
-        checkNotNull(success);
+    public void insert(final T object, final SuccessCallback<Long> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
         checkNotNull(object);
-        checkNotNull(error);
 
         final Callable<Long> call = () -> { return SugarRecord.save(object); };
         final Future<Long> future = doInBackground(call);
@@ -59,27 +59,26 @@ public void insert(final T object, final SuccessCallback<Long> success, final Er
                 id = future.get();
             }
 
-            if (null == object) {
-                error.onError(new Exception("Error when performing insert of " + object.toString()));
+            if (null == id) {
+                errorCallback.onError(new Exception("Error when performing insert of " + object.toString()));
             } else {
-                success.onSuccess(id);
+                successCallback.onSuccess(id);
             }
 
         } catch (Exception e) {
-            error.onError(e);
+            errorCallback.onError(e);
         }
     }
 
     /**
      *
      * @param id
-     * @param success
-     * @param error
+     * @param successCallback
+     * @param errorCallback
      */
-    @SuppressWarnings("all")
-    public void findById(final Long id, final SuccessCallback<T> success, final ErrorCallback error) {
-        checkNotNull(success);
-        checkNotNull(error);
+    public void findById(final Long id, final SuccessCallback<T> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
         checkNotNull(id);
 
         final Callable<T> call = () -> { return SugarRecord.findById(getSugarClass(), id); };
@@ -93,26 +92,25 @@ public void findById(final Long id, final SuccessCallback<T> success, final Erro
             }
 
             if (null == object) {
-                error.onError(new Exception("The object with " + id.toString() + "doesn't exist in database"));
+                errorCallback.onError(new Exception("The object with " + id.toString() + "doesn't exist in database"));
             } else {
-                success.onSuccess(object);
+                successCallback.onSuccess(object);
             }
 
         } catch (Exception e) {
-            error.onError(e);
+            errorCallback.onError(e);
         }
     }
 
     /**
      *
      * @param orderBy
-     * @param success
-     * @param error
+     * @param successCallback
+     * @param errorCallback
      */
-    @SuppressWarnings("all")
-    public void listAll(final String orderBy, final SuccessCallback<List<T>> success, final ErrorCallback error) {
-        checkNotNull(success);
-        checkNotNull(error);
+    public void listAll(final String orderBy, final SuccessCallback<List<T>> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
 
         final Callable<List<T>> call = () -> { return SugarRecord.listAll(getSugarClass(), orderBy); };
         final Future<List<T>> future = doInBackground(call);
@@ -125,13 +123,13 @@ public void listAll(final String orderBy, final SuccessCallback<List<T>> success
             }
 
             if (null == objects || objects.isEmpty()) {
-                error.onError(new Exception("There are no objects in the database"));
+                errorCallback.onError(new Exception("There are no objects in the database"));
             } else {
-                success.onSuccess(objects);
+                successCallback.onSuccess(objects);
             }
 
         } catch (Exception e) {
-            error.onError(e);
+            errorCallback.onError(e);
         }
     }
 
@@ -139,14 +137,13 @@ public void listAll(final String orderBy, final SuccessCallback<List<T>> success
     /**
      *
      * @param object
-     * @param success
-     * @param error
+     * @param successCallback
+     * @param errorCallback
      */
-    @SuppressWarnings("all")
-    public void update(final T object, final SuccessCallback<Long> success, final ErrorCallback error) {
-        checkNotNull(success);
+    public void update(final T object, final SuccessCallback<Long> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
         checkNotNull(object);
-        checkNotNull(error);
 
         final Callable<Long> call = () -> { return SugarRecord.update(object); };
         final Future<Long> future = doInBackground(call);
@@ -158,47 +155,117 @@ public void update(final T object, final SuccessCallback<Long> success, final Er
                 id = future.get();
             }
 
-            if (null == object) {
-                error.onError(new Exception("Error when performing update of " + object.toString()));
+            if (null == id) {
+                errorCallback.onError(new Exception("Error when performing update of " + object.toString()));
             } else {
-                success.onSuccess(id);
+                successCallback.onSuccess(id);
             }
 
         } catch (Exception e) {
-            error.onError(e);
+            errorCallback.onError(e);
         }
     }
 
     /**
      *
      * @param object
-     * @param success
-     * @param error
+     * @param successCallback
+     * @param errorCallback
      */
-    @SuppressWarnings("all")
-    public void delete(final T object, final SuccessCallback<Boolean> success, final ErrorCallback error) {
-        checkNotNull(success);
+    public void delete(final T object, final SuccessCallback<Boolean> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
         checkNotNull(object);
-        checkNotNull(error);
 
         final Callable<Boolean> call = () -> { return SugarRecord.delete(object); };
         final Future<Boolean> future = doInBackground(call);
 
-        Boolean deleted = null;
+        Boolean isDeleted = null;
 
         try {
             if (future.isDone()) {
-                deleted = future.get();
+                isDeleted = future.get();
             }
 
-            if (null == object) {
-                error.onError(new Exception("Error when performing delete of " + object.toString()));
+            if (null == isDeleted || !isDeleted) {
+                errorCallback.onError(new Exception("Error when performing delete of " + object.toString()));
+            } else {
+                successCallback.onSuccess(isDeleted);
+            }
+
+        } catch (Exception e) {
+            errorCallback.onError(e);
+        }
+    }
+
+    /**
+     *
+     * @param whereClause
+     * @param whereArgs
+     * @param successCallback
+     * @param errorCallback
+     */
+    public void delete(String whereClause, String[] whereArgs, final SuccessCallback<Integer> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
+
+        final Callable<Integer> call = () -> { return SugarRecord.deleteAll(getSugarClass(), whereClause, whereArgs); };
+        final Future<Integer> future = doInBackground(call);
+
+        Integer count = null;
+
+        try {
+            if (future.isDone()) {
+                count = future.get();
+            }
+
+            if (null == count || count == 0) {
+                errorCallback.onError(new Exception("Error when performing deleete of all elements"));
+            } else {
+                successCallback.onSuccess(count);
+            }
+
+        } catch (Exception e) {
+            errorCallback.onError(e);
+        }
+    }
+
+    /**
+     *
+     * @param successCallback
+     * @param errorCallback
+     */
+    public void deleteAll(final SuccessCallback<Integer> successCallback, final ErrorCallback errorCallback) {
+        delete(null, null, successCallback, errorCallback);
+    }
+
+    /**
+     *
+     * @param successCallback
+     * @param errorCallback
+     */
+    public void count(final SuccessCallback<Long> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
+
+        final Callable<Long> call = () -> { return SugarRecord.count(getSugarClass()); };
+        final Future<Long> future = doInBackground(call);
+
+        Long count = null;
+
+        try {
+            if (future.isDone()) {
+                count = future.get();
+            }
+
+            if (null == count) {
+                errorCallback.onError(new Exception("Error when trying to get count"));
             } else {
-                success.onSuccess(deleted);
+                successCallback.onSuccess(count);
             }
 
         } catch (Exception e) {
-            error.onError(e);
+            errorCallback.onError(e);
         }
     }
 
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index a6d22f04..040ab353 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -349,8 +349,6 @@ static long update(SQLiteDatabase db, Object object) {
         }
     }
 
-
-
     public static boolean isSugarEntity(Class<?> objectClass) {
         return objectClass.isAnnotationPresent(Table.class) || SugarRecord.class.isAssignableFrom(objectClass);
     }

From f2bca5b708c8379efe8ee166eb0876b39f39b93f Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 16 Apr 2016 22:17:43 -0300
Subject: [PATCH 276/305] Deleted all future.isDone calls Start adding
 SugarDataSourceTest to test all DataSource functionallity

---
 .../main/java/com/orm/SugarDataSource.java    |  63 ++++++---
 .../java/com/orm/SugarDataSourceTest.java     | 124 ++++++++++++++++++
 2 files changed, 166 insertions(+), 21 deletions(-)
 create mode 100644 library/src/test/java/com/orm/SugarDataSourceTest.java

diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index cb636505..db3edf03 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -1,5 +1,7 @@
 package com.orm;
 
+import android.database.Cursor;
+
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -55,9 +57,7 @@ public void insert(final T object, final SuccessCallback<Long> successCallback,
         Long id = null;
 
         try {
-            if (future.isDone()) {
-                id = future.get();
-            }
+            id = future.get();
 
             if (null == id) {
                 errorCallback.onError(new Exception("Error when performing insert of " + object.toString()));
@@ -87,9 +87,7 @@ public void findById(final Long id, final SuccessCallback<T> successCallback, fi
         T object = null;
 
         try {
-            if (future.isDone()) {
-                object = future.get();
-            }
+            object = future.get();
 
             if (null == object) {
                 errorCallback.onError(new Exception("The object with " + id.toString() + "doesn't exist in database"));
@@ -102,6 +100,39 @@ public void findById(final Long id, final SuccessCallback<T> successCallback, fi
         }
     }
 
+    /**
+     *
+     * @param whereClause
+     * @param whereArgs
+     * @param groupBy
+     * @param orderBy
+     * @param limit
+     * @param successCallback
+     * @param errorCallback
+     */
+    public void query(String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit, final SuccessCallback<Cursor> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
+
+        final Callable<Cursor> call = () -> { return SugarRecord.getCursor(getSugarClass(), whereClause, whereArgs, groupBy, orderBy, limit); };
+        final Future<Cursor> future = doInBackground(call);
+
+        Cursor cursor = null;
+
+        try {
+            cursor = future.get();
+
+            if (null == cursor) {
+                errorCallback.onError(new Exception("Problem when trying to get the cursor"));
+            } else {
+                successCallback.onSuccess(cursor);
+            }
+
+        } catch (Exception e) {
+            errorCallback.onError(e);
+        }
+    }
+
     /**
      *
      * @param orderBy
@@ -118,9 +149,7 @@ public void listAll(final String orderBy, final SuccessCallback<List<T>> success
         List<T> objects = null;
 
         try {
-            if (future.isDone()) {
-                objects = future.get();
-            }
+            objects = future.get();
 
             if (null == objects || objects.isEmpty()) {
                 errorCallback.onError(new Exception("There are no objects in the database"));
@@ -151,9 +180,7 @@ public void update(final T object, final SuccessCallback<Long> successCallback,
         Long id = null;
 
         try {
-            if (future.isDone()) {
-                id = future.get();
-            }
+            id = future.get();
 
             if (null == id) {
                 errorCallback.onError(new Exception("Error when performing update of " + object.toString()));
@@ -183,9 +210,7 @@ public void delete(final T object, final SuccessCallback<Boolean> successCallbac
         Boolean isDeleted = null;
 
         try {
-            if (future.isDone()) {
-                isDeleted = future.get();
-            }
+            isDeleted = future.get();
 
             if (null == isDeleted || !isDeleted) {
                 errorCallback.onError(new Exception("Error when performing delete of " + object.toString()));
@@ -215,9 +240,7 @@ public void delete(String whereClause, String[] whereArgs, final SuccessCallback
         Integer count = null;
 
         try {
-            if (future.isDone()) {
-                count = future.get();
-            }
+            count = future.get();
 
             if (null == count || count == 0) {
                 errorCallback.onError(new Exception("Error when performing deleete of all elements"));
@@ -254,9 +277,7 @@ public void count(final SuccessCallback<Long> successCallback, final ErrorCallba
         Long count = null;
 
         try {
-            if (future.isDone()) {
-                count = future.get();
-            }
+            count = future.get();
 
             if (null == count) {
                 errorCallback.onError(new Exception("Error when trying to get count"));
diff --git a/library/src/test/java/com/orm/SugarDataSourceTest.java b/library/src/test/java/com/orm/SugarDataSourceTest.java
new file mode 100644
index 00000000..645be074
--- /dev/null
+++ b/library/src/test/java/com/orm/SugarDataSourceTest.java
@@ -0,0 +1,124 @@
+package com.orm;
+
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.TestRecord;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * @author jonatan.salas
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class SugarDataSourceTest {
+    private SugarDataSource<TestRecord> recordSugarDataSource;
+
+    @Before
+    public void setUp() {
+        recordSugarDataSource = SugarDataSource.getInstance(TestRecord.class);
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void testInsertAndDelete() {
+        TestRecord record = new TestRecord();
+        record.setName("lalala");
+
+        recordSugarDataSource.insert(
+                record,
+                id -> {
+                    record.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        Assert.assertNotNull(record.getId());
+
+        recordSugarDataSource.delete(
+                record,
+                result -> {
+                    Assert.assertNotNull(result);
+                    Assert.assertEquals(true, result.booleanValue());
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void testInsertAndFindById() {
+        TestRecord record = new TestRecord();
+        record.setName("lalala");
+
+        recordSugarDataSource.insert(
+                record,
+                id -> {
+                    record.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        recordSugarDataSource.findById(
+                record.getId(),
+                result -> {
+                    Assert.assertEquals(record.getId(), result.getId());
+                    Assert.assertEquals(record.getName(), result.getName());
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void testInsertUpdateAndFindById() {
+        TestRecord record = new TestRecord();
+        record.setName("lalala");
+
+        recordSugarDataSource.insert(
+                record,
+                id -> {
+                    record.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        record.setName("fulano");
+        recordSugarDataSource.insert(
+                record,
+                id -> {
+                    Assert.assertEquals(record.getId(), id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        recordSugarDataSource.findById(
+                record.getId(),
+                result -> {
+                    Assert.assertEquals(record.getId(), result.getId());
+                    Assert.assertEquals("fulano", result.getName());
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+    }
+}

From 776a33c763a54de87a10f13a0101c1a0a6ae1ec2 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 16 Apr 2016 22:56:57 -0300
Subject: [PATCH 277/305] Added more tests to SugarDataSourceTest

---
 .../java/com/orm/SugarDataSourceTest.java     | 186 +++++++++++++++++-
 1 file changed, 185 insertions(+), 1 deletion(-)

diff --git a/library/src/test/java/com/orm/SugarDataSourceTest.java b/library/src/test/java/com/orm/SugarDataSourceTest.java
index 645be074..8141f467 100644
--- a/library/src/test/java/com/orm/SugarDataSourceTest.java
+++ b/library/src/test/java/com/orm/SugarDataSourceTest.java
@@ -100,7 +100,7 @@ public void testInsertUpdateAndFindById() {
         );
 
         record.setName("fulano");
-        recordSugarDataSource.insert(
+        recordSugarDataSource.update(
                 record,
                 id -> {
                     Assert.assertEquals(record.getId(), id);
@@ -121,4 +121,188 @@ public void testInsertUpdateAndFindById() {
                 }
         );
     }
+
+    @Test
+    @SuppressWarnings("all")
+    public void testInsertAndListAll() {
+        TestRecord record = new TestRecord();
+        record.setName("lalala");
+
+        recordSugarDataSource.insert(
+                record,
+                id -> {
+                    record.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        TestRecord record1 = new TestRecord();
+        record1.setName("fulano");
+
+        recordSugarDataSource.insert(
+                record1,
+                id -> {
+                    record1.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+
+        TestRecord record2 = new TestRecord();
+        record2.setName("mengano");
+
+        recordSugarDataSource.insert(
+                record2,
+                id -> {
+                    record2.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        recordSugarDataSource.listAll(
+                null,
+                list -> {
+                    Assert.assertEquals(3, list.size());
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        recordSugarDataSource.deleteAll(
+                count -> {
+                    Assert.assertEquals(3, count.longValue());
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void testInsertAndCount() {
+        TestRecord record = new TestRecord();
+        record.setName("lalala");
+
+        recordSugarDataSource.insert(
+                record,
+                id -> {
+                    record.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        TestRecord record1 = new TestRecord();
+        record1.setName("fulano");
+
+        recordSugarDataSource.insert(
+                record1,
+                id -> {
+                    record1.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+
+        TestRecord record2 = new TestRecord();
+        record2.setName("mengano");
+
+        recordSugarDataSource.insert(
+                record2,
+                id -> {
+                    record2.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        recordSugarDataSource.count(
+                count -> {
+                    Assert.assertEquals(3, count.longValue());
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+    }
+
+    @Test
+    @SuppressWarnings("all")
+    public void testInsertAndGetCursor() {
+        TestRecord record = new TestRecord();
+        record.setName("lalala");
+
+        recordSugarDataSource.insert(
+                record,
+                id -> {
+                    record.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        TestRecord record1 = new TestRecord();
+        record1.setName("fulano");
+
+        recordSugarDataSource.insert(
+                record1,
+                id -> {
+                    record1.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+
+        TestRecord record2 = new TestRecord();
+        record2.setName("mengano");
+
+        recordSugarDataSource.insert(
+                record2,
+                id -> {
+                    record2.setId(id);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        recordSugarDataSource.listAll(
+                null,
+                list -> {
+                    Assert.assertEquals(3, list.size());
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+
+        recordSugarDataSource.query(
+                null,
+                null,
+                null,
+                null,
+                null,
+                cursor -> {
+                    Assert.assertNotNull(cursor);
+                },
+                e -> {
+                    e.printStackTrace();
+                }
+        );
+    }
 }

From cd1949b1b46136b3594956e3b74b5a6f3f543902 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sat, 16 Apr 2016 23:31:37 -0300
Subject: [PATCH 278/305] Extracted retrolambda because of travis CI
 troubleshooting around JAVA_HOME var.

---
 build.gradle                                  |   1 -
 library/build.gradle                          |   5 -
 .../main/java/com/orm/SugarDataSource.java    |  68 +++-
 .../java/com/orm/SugarDataSourceTest.java     | 329 ++++++++++++------
 4 files changed, 287 insertions(+), 116 deletions(-)

diff --git a/build.gradle b/build.gradle
index ba428694..030e1cb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.0.0'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.3'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }
diff --git a/library/build.gradle b/library/build.gradle
index a9b12441..907162ee 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 apply from: '../maven_push.gradle'
 
 android {
@@ -15,10 +14,6 @@ android {
             minifyEnabled false
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
     testOptions {
         unitTests.returnDefaultValues = true
     }
diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index db3edf03..35f84c66 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -51,7 +51,13 @@ public void insert(final T object, final SuccessCallback<Long> successCallback,
         checkNotNull(errorCallback);
         checkNotNull(object);
 
-        final Callable<Long> call = () -> { return SugarRecord.save(object); };
+        final Callable<Long> call = new Callable<Long>() {
+            @Override
+            public Long call() throws Exception {
+                return SugarRecord.save(object);
+            }
+        };
+
         final Future<Long> future = doInBackground(call);
 
         Long id = null;
@@ -81,7 +87,13 @@ public void findById(final Long id, final SuccessCallback<T> successCallback, fi
         checkNotNull(errorCallback);
         checkNotNull(id);
 
-        final Callable<T> call = () -> { return SugarRecord.findById(getSugarClass(), id); };
+        final Callable<T> call = new Callable<T>() {
+            @Override
+            public T call() throws Exception {
+                return SugarRecord.findById(getSugarClass(), id);
+            }
+        };
+
         final Future<T> future = doInBackground(call);
 
         T object = null;
@@ -110,11 +122,17 @@ public void findById(final Long id, final SuccessCallback<T> successCallback, fi
      * @param successCallback
      * @param errorCallback
      */
-    public void query(String whereClause, String[] whereArgs, String groupBy, String orderBy, String limit, final SuccessCallback<Cursor> successCallback, final ErrorCallback errorCallback) {
+    public void query(final String whereClause, final String[] whereArgs, final String groupBy, final String orderBy, final String limit, final SuccessCallback<Cursor> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
         checkNotNull(errorCallback);
 
-        final Callable<Cursor> call = () -> { return SugarRecord.getCursor(getSugarClass(), whereClause, whereArgs, groupBy, orderBy, limit); };
+        final Callable<Cursor> call = new Callable<Cursor>() {
+            @Override
+            public Cursor call() throws Exception {
+                return SugarRecord.getCursor(getSugarClass(), whereClause, whereArgs, groupBy, orderBy, limit);
+            }
+        };
+
         final Future<Cursor> future = doInBackground(call);
 
         Cursor cursor = null;
@@ -143,7 +161,13 @@ public void listAll(final String orderBy, final SuccessCallback<List<T>> success
         checkNotNull(successCallback);
         checkNotNull(errorCallback);
 
-        final Callable<List<T>> call = () -> { return SugarRecord.listAll(getSugarClass(), orderBy); };
+        final Callable<List<T>> call = new Callable<List<T>>() {
+            @Override
+            public List<T> call() throws Exception {
+                return SugarRecord.listAll(getSugarClass(), orderBy);
+            }
+        };
+
         final Future<List<T>> future = doInBackground(call);
 
         List<T> objects = null;
@@ -174,7 +198,13 @@ public void update(final T object, final SuccessCallback<Long> successCallback,
         checkNotNull(errorCallback);
         checkNotNull(object);
 
-        final Callable<Long> call = () -> { return SugarRecord.update(object); };
+        final Callable<Long> call = new Callable<Long>() {
+            @Override
+            public Long call() throws Exception {
+                return SugarRecord.update(object);
+            }
+        };
+
         final Future<Long> future = doInBackground(call);
 
         Long id = null;
@@ -204,7 +234,13 @@ public void delete(final T object, final SuccessCallback<Boolean> successCallbac
         checkNotNull(errorCallback);
         checkNotNull(object);
 
-        final Callable<Boolean> call = () -> { return SugarRecord.delete(object); };
+        final Callable<Boolean> call = new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return SugarRecord.delete(object);
+            }
+        };
+
         final Future<Boolean> future = doInBackground(call);
 
         Boolean isDeleted = null;
@@ -230,11 +266,17 @@ public void delete(final T object, final SuccessCallback<Boolean> successCallbac
      * @param successCallback
      * @param errorCallback
      */
-    public void delete(String whereClause, String[] whereArgs, final SuccessCallback<Integer> successCallback, final ErrorCallback errorCallback) {
+    public void delete(final String whereClause, final String[] whereArgs, final SuccessCallback<Integer> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
         checkNotNull(errorCallback);
 
-        final Callable<Integer> call = () -> { return SugarRecord.deleteAll(getSugarClass(), whereClause, whereArgs); };
+        final Callable<Integer> call = new Callable<Integer>() {
+            @Override
+            public Integer call() throws Exception {
+                return SugarRecord.deleteAll(getSugarClass(), whereClause, whereArgs);
+            }
+        };
+
         final Future<Integer> future = doInBackground(call);
 
         Integer count = null;
@@ -271,7 +313,13 @@ public void count(final SuccessCallback<Long> successCallback, final ErrorCallba
         checkNotNull(successCallback);
         checkNotNull(errorCallback);
 
-        final Callable<Long> call = () -> { return SugarRecord.count(getSugarClass()); };
+        final Callable<Long> call = new Callable<Long>() {
+            @Override
+            public Long call() throws Exception {
+                return SugarRecord.count(getSugarClass());
+            }
+        };
+
         final Future<Long> future = doInBackground(call);
 
         Long count = null;
diff --git a/library/src/test/java/com/orm/SugarDataSourceTest.java b/library/src/test/java/com/orm/SugarDataSourceTest.java
index 8141f467..a922c0e9 100644
--- a/library/src/test/java/com/orm/SugarDataSourceTest.java
+++ b/library/src/test/java/com/orm/SugarDataSourceTest.java
@@ -1,5 +1,7 @@
 package com.orm;
 
+import android.database.Cursor;
+
 import com.orm.app.ClientApp;
 import com.orm.dsl.BuildConfig;
 import com.orm.model.TestRecord;
@@ -12,6 +14,8 @@
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.List;
+
 /**
  * @author jonatan.salas
  */
@@ -28,16 +32,22 @@ public void setUp() {
     @Test
     @SuppressWarnings("all")
     public void testInsertAndDelete() {
-        TestRecord record = new TestRecord();
+        final TestRecord record = new TestRecord();
         record.setName("lalala");
 
         recordSugarDataSource.insert(
                 record,
-                id -> {
-                    record.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
@@ -45,12 +55,18 @@ public void testInsertAndDelete() {
 
         recordSugarDataSource.delete(
                 record,
-                result -> {
-                    Assert.assertNotNull(result);
-                    Assert.assertEquals(true, result.booleanValue());
+                new SugarDataSource.SuccessCallback<Boolean>() {
+                    @Override
+                    public void onSuccess(Boolean result) {
+                        Assert.assertNotNull(result);
+                        Assert.assertEquals(true, result.booleanValue());
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
     }
@@ -58,27 +74,39 @@ public void testInsertAndDelete() {
     @Test
     @SuppressWarnings("all")
     public void testInsertAndFindById() {
-        TestRecord record = new TestRecord();
+        final TestRecord record = new TestRecord();
         record.setName("lalala");
 
         recordSugarDataSource.insert(
                 record,
-                id -> {
-                    record.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
         recordSugarDataSource.findById(
                 record.getId(),
-                result -> {
-                    Assert.assertEquals(record.getId(), result.getId());
-                    Assert.assertEquals(record.getName(), result.getName());
+                new SugarDataSource.SuccessCallback<TestRecord>() {
+                    @Override
+                    public void onSuccess(TestRecord result) {
+                        Assert.assertEquals(record.getId(), result.getId());
+                        Assert.assertEquals(record.getName(), result.getName());
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
     }
@@ -86,38 +114,56 @@ public void testInsertAndFindById() {
     @Test
     @SuppressWarnings("all")
     public void testInsertUpdateAndFindById() {
-        TestRecord record = new TestRecord();
+        final TestRecord record = new TestRecord();
         record.setName("lalala");
 
         recordSugarDataSource.insert(
                 record,
-                id -> {
-                    record.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
         record.setName("fulano");
         recordSugarDataSource.update(
                 record,
-                id -> {
-                    Assert.assertEquals(record.getId(), id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        Assert.assertEquals(record.getId(), id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
         recordSugarDataSource.findById(
                 record.getId(),
-                result -> {
-                    Assert.assertEquals(record.getId(), result.getId());
-                    Assert.assertEquals("fulano", result.getName());
+                new SugarDataSource.SuccessCallback<TestRecord>() {
+                    @Override
+                    public void onSuccess(TestRecord result) {
+                        Assert.assertEquals(record.getId(), result.getId());
+                        Assert.assertEquals("fulano", result.getName());
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
     }
@@ -125,62 +171,91 @@ public void testInsertUpdateAndFindById() {
     @Test
     @SuppressWarnings("all")
     public void testInsertAndListAll() {
-        TestRecord record = new TestRecord();
+        final TestRecord record = new TestRecord();
         record.setName("lalala");
 
         recordSugarDataSource.insert(
                 record,
-                id -> {
-                    record.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
-        TestRecord record1 = new TestRecord();
+        final TestRecord record1 = new TestRecord();
         record1.setName("fulano");
 
         recordSugarDataSource.insert(
                 record1,
-                id -> {
-                    record1.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record1.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
-
-        TestRecord record2 = new TestRecord();
+        final TestRecord record2 = new TestRecord();
         record2.setName("mengano");
 
         recordSugarDataSource.insert(
                 record2,
-                id -> {
-                    record2.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record2.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
         recordSugarDataSource.listAll(
                 null,
-                list -> {
-                    Assert.assertEquals(3, list.size());
+                new SugarDataSource.SuccessCallback<List<TestRecord>>() {
+                    @Override
+                    public void onSuccess(List<TestRecord> list) {
+                        Assert.assertEquals(3, list.size());
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
         recordSugarDataSource.deleteAll(
-                count -> {
-                    Assert.assertEquals(3, count.longValue());
+                new SugarDataSource.SuccessCallback<Integer>() {
+                    @Override
+                    public void onSuccess(Integer count) {
+                        Assert.assertEquals(3, count.intValue());
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
     }
@@ -188,52 +263,76 @@ public void testInsertAndListAll() {
     @Test
     @SuppressWarnings("all")
     public void testInsertAndCount() {
-        TestRecord record = new TestRecord();
+        final TestRecord record = new TestRecord();
         record.setName("lalala");
 
         recordSugarDataSource.insert(
                 record,
-                id -> {
-                    record.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
-        TestRecord record1 = new TestRecord();
+        final TestRecord record1 = new TestRecord();
         record1.setName("fulano");
 
         recordSugarDataSource.insert(
                 record1,
-                id -> {
-                    record1.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record1.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
 
-        TestRecord record2 = new TestRecord();
+        final TestRecord record2 = new TestRecord();
         record2.setName("mengano");
 
         recordSugarDataSource.insert(
                 record2,
-                id -> {
-                    record2.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record2.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
         recordSugarDataSource.count(
-                count -> {
-                    Assert.assertEquals(3, count.longValue());
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long count) {
+                        Assert.assertEquals(3, count.longValue());
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
     }
@@ -241,53 +340,77 @@ public void testInsertAndCount() {
     @Test
     @SuppressWarnings("all")
     public void testInsertAndGetCursor() {
-        TestRecord record = new TestRecord();
+        final TestRecord record = new TestRecord();
         record.setName("lalala");
 
         recordSugarDataSource.insert(
                 record,
-                id -> {
-                    record.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
-        TestRecord record1 = new TestRecord();
+        final TestRecord record1 = new TestRecord();
         record1.setName("fulano");
 
         recordSugarDataSource.insert(
                 record1,
-                id -> {
-                    record1.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record1.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
 
-        TestRecord record2 = new TestRecord();
+        final TestRecord record2 = new TestRecord();
         record2.setName("mengano");
 
         recordSugarDataSource.insert(
                 record2,
-                id -> {
-                    record2.setId(id);
+                new SugarDataSource.SuccessCallback<Long>() {
+                    @Override
+                    public void onSuccess(Long id) {
+                        record2.setId(id);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
         recordSugarDataSource.listAll(
                 null,
-                list -> {
-                    Assert.assertEquals(3, list.size());
+                new SugarDataSource.SuccessCallback<List<TestRecord>>() {
+                    @Override
+                    public void onSuccess(List<TestRecord> list) {
+                        Assert.assertEquals(3, list.size());
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
 
@@ -297,11 +420,17 @@ public void testInsertAndGetCursor() {
                 null,
                 null,
                 null,
-                cursor -> {
-                    Assert.assertNotNull(cursor);
+                new SugarDataSource.SuccessCallback<Cursor>() {
+                    @Override
+                    public void onSuccess(Cursor cursor) {
+                        Assert.assertNotNull(cursor);
+                    }
                 },
-                e -> {
-                    e.printStackTrace();
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
                 }
         );
     }

From c7d3961fe83ea369d101b3477bc01e4618af171a Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 17 Apr 2016 00:12:02 -0300
Subject: [PATCH 279/305] Added bulkInsert method Added bulkInsert test and
 datasource constructor test

---
 .../main/java/com/orm/SugarDataSource.java    |  46 +++++++-
 .../java/com/orm/SugarDataSourceTest.java     | 104 ++++++++++++++++++
 2 files changed, 149 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index 35f84c66..b88dac3c 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -76,6 +77,49 @@ public Long call() throws Exception {
         }
     }
 
+    /**
+     *
+     * @param objects
+     * @param successCallback
+     * @param errorCallback
+     */
+    public void bulkInsert(final List<T> objects, final SuccessCallback<List<Long>> successCallback, final ErrorCallback errorCallback) {
+        checkNotNull(successCallback);
+        checkNotNull(errorCallback);
+        checkNotNull(objects);
+
+        final Callable<List<Long>> call = new Callable<List<Long>>() {
+            @Override
+            public List<Long> call() throws Exception {
+                List<Long> ids = new ArrayList<>(objects.size());
+
+                for (int i = 0; i < objects.size(); i++) {
+                    Long id = SugarRecord.save(objects.get(i));
+                    ids.add(i, id);
+                }
+
+                return ids;
+            }
+        };
+
+        final Future<List<Long>> future = doInBackground(call);
+
+        List<Long> ids = null;
+
+        try {
+            ids = future.get();
+
+            if (null == ids || ids.isEmpty()) {
+                errorCallback.onError(new Exception("Error when performing bulk insert"));
+            } else {
+                successCallback.onSuccess(ids);
+            }
+
+        } catch (Exception e) {
+            errorCallback.onError(e);
+        }
+    }
+
     /**
      *
      * @param id
@@ -285,7 +329,7 @@ public Integer call() throws Exception {
             count = future.get();
 
             if (null == count || count == 0) {
-                errorCallback.onError(new Exception("Error when performing deleete of all elements"));
+                errorCallback.onError(new Exception("Error when performing delete of all elements"));
             } else {
                 successCallback.onSuccess(count);
             }
diff --git a/library/src/test/java/com/orm/SugarDataSourceTest.java b/library/src/test/java/com/orm/SugarDataSourceTest.java
index a922c0e9..fafd2beb 100644
--- a/library/src/test/java/com/orm/SugarDataSourceTest.java
+++ b/library/src/test/java/com/orm/SugarDataSourceTest.java
@@ -14,6 +14,7 @@
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -434,4 +435,107 @@ public void onError(Exception e) {
                 }
         );
     }
+
+    @Test
+    public void bulkInsertAndListAllTest() {
+        final TestRecord record = new TestRecord();
+        record.setName("lalala");
+
+        final TestRecord record1 = new TestRecord();
+        record1.setName("fulano");
+
+        final TestRecord record2 = new TestRecord();
+        record2.setName("mengano");
+
+        final List<TestRecord> list = new ArrayList<>();
+        list.add(record);
+        list.add(record1);
+        list.add(record2);
+
+        recordSugarDataSource.bulkInsert(
+                list,
+                new SugarDataSource.SuccessCallback<List<Long>>() {
+                    @Override
+                    public void onSuccess(List<Long> ids) {
+                        for (int i = 0; i < list.size(); i++) {
+                            list.get(i).setId(ids.get(i));
+                        }
+                    }
+                },
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+        );
+
+        recordSugarDataSource.listAll(
+                null,
+                new SugarDataSource.SuccessCallback<List<TestRecord>>() {
+                    @Override
+                    public void onSuccess(List<TestRecord> testRecords) {
+                        for (int i = 0; i < list.size(); i++) {
+                            TestRecord record1 = list.get(i);
+                            TestRecord record2 = testRecords.get(i);
+
+                            Assert.assertEquals(record1.getId(), record2.getId());
+                            Assert.assertEquals(record1.getName(), record2.getName());
+                        }
+                    }
+                },
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+        );
+    }
+
+    @Test
+    public void nullFindById() {
+        TestRecord record = new TestRecord();
+        record.setId(0L);
+
+        recordSugarDataSource.findById(
+                record.getId(),
+                new SugarDataSource.SuccessCallback<TestRecord>() {
+                    @Override
+                    public void onSuccess(TestRecord object) {
+                        Assert.assertNull(object);
+                    }
+                },
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        Assert.assertNotNull(e.getMessage());
+                    }
+                }
+        );
+    }
+
+    @Test
+    public void nullListAll() {
+        recordSugarDataSource.listAll(
+                null,
+                new SugarDataSource.SuccessCallback<List<TestRecord>>() {
+                    @Override
+                    public void onSuccess(List<TestRecord> object) {
+                        Assert.assertNull(object);
+                    }
+                },
+                new SugarDataSource.ErrorCallback() {
+                    @Override
+                    public void onError(Exception e) {
+                        Assert.assertNotNull(e.getMessage());
+                    }
+                }
+        );
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullConstructor() {
+        SugarDataSource<TestRecord> dataSource = SugarDataSource.getInstance(null);
+    }
 }

From a716a34bc960e1df9de9ed2a5b7a22cdb55d30fa Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 17 Apr 2016 00:36:15 -0300
Subject: [PATCH 280/305] Added class documentation

---
 .../main/java/com/orm/SugarDataSource.java    | 97 +++++++++++--------
 1 file changed, 59 insertions(+), 38 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index b88dac3c..e7e76bd8 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -20,8 +20,9 @@ public final class SugarDataSource<T> {
     private final Class<T> sClass;
 
     /**
+     * SugarDataSource constructor with params
      *
-     * @param tClass
+     * @param tClass class argument used then to run SugarRecord class queries
      */
     private SugarDataSource(Class<T> tClass) {
         if (null == tClass) {
@@ -32,20 +33,23 @@ private SugarDataSource(Class<T> tClass) {
     }
 
     /**
+     * SugarDataSource static method to construct an Instance of this class.
      *
-     * @param sClass
-     * @param <T>
-     * @return
+     * @param sClass class argument used then to run SugarRecord class queries
+     * @param <T> generic argument that must be a SugarRecord extended class or @Table annotated class
+     * @return an instance of SugarDataSource
      */
     public static <T> SugarDataSource<T> getInstance(Class<T> sClass) {
         return new SugarDataSource<>(sClass);
     }
 
     /**
+     * Method used to perform an Asynchronous insert. It works on top of SugarRecord class, executes the
+     * insert query using Futures.
      *
-     * @param object
-     * @param successCallback
-     * @param errorCallback
+     * @param object the object you want to insert. It must be a SugarRecord extended class or @Table annotated class
+     * @param successCallback the callback for a successful insert operation
+     * @param errorCallback the callback for an error in insert operation
      */
     public void insert(final T object, final SuccessCallback<Long> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -78,10 +82,12 @@ public Long call() throws Exception {
     }
 
     /**
+     * Method that performs a bulk insert. It works on top of SugarRecord class, and executes the query
+     * asynchronously using Futures.
      *
-     * @param objects
-     * @param successCallback
-     * @param errorCallback
+     * @param objects the list of objects that you want to insert. They must be SugarRecord extended objects or @Table annotatd objects.
+     * @param successCallback the callback for successful bulk insert operation
+     * @param errorCallback the callback for an error in bulk insert operation
      */
     public void bulkInsert(final List<T> objects, final SuccessCallback<List<Long>> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -121,10 +127,12 @@ public List<Long> call() throws Exception {
     }
 
     /**
+     * Method that performs a findById, It works on top of SugarRecord class providing asynchronous
+     * execution with the use of Futures.
      *
-     * @param id
-     * @param successCallback
-     * @param errorCallback
+     * @param id the id of the object you want to retrieve
+     * @param successCallback the callback to execute when the operation is successful
+     * @param errorCallback the callback to execute when the operation has a trouble
      */
     public void findById(final Long id, final SuccessCallback<T> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -157,14 +165,16 @@ public T call() throws Exception {
     }
 
     /**
+     * Method that provides you the ability of perform a custom query and retrieve a cursor. It works on top of SugarRecord class,
+     * All the code is executed asynchronously with the usage of Futures and callbacks.
      *
-     * @param whereClause
-     * @param whereArgs
-     * @param groupBy
-     * @param orderBy
-     * @param limit
-     * @param successCallback
-     * @param errorCallback
+     * @param whereClause the clause of the search
+     * @param whereArgs the arguments for the search
+     * @param groupBy the form that you want to group them
+     * @param orderBy the form that you want to order
+     * @param limit the limit of objects to want
+     * @param successCallback the callback to be executed if the operation is successful
+     * @param errorCallback the callback to be executed if the operation has an error
      */
     public void query(final String whereClause, final String[] whereArgs, final String groupBy, final String orderBy, final String limit, final SuccessCallback<Cursor> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -196,10 +206,12 @@ public Cursor call() throws Exception {
     }
 
     /**
+     * Method that list all elements. It run a SugarRecord.listAll but it's code is performed asynchronously
+     * with the usage of Futures and callbacks.
      *
-     * @param orderBy
-     * @param successCallback
-     * @param errorCallback
+     * @param orderBy the way you want to order the objects you get
+     * @param successCallback the callback that is performed if the operation is successful
+     * @param errorCallback the callback that is performed if your code has an error
      */
     public void listAll(final String orderBy, final SuccessCallback<List<T>> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -232,10 +244,12 @@ public List<T> call() throws Exception {
 
 
     /**
+     * Method that works on top of SugarRecord.update and runs the code asynchronously via Futures
+     * and callbacks.
      *
-     * @param object
-     * @param successCallback
-     * @param errorCallback
+     * @param object the object you want to update
+     * @param successCallback the callback that will be performed if the update is successful
+     * @param errorCallback the callback that will be performed if the update has an error
      */
     public void update(final T object, final SuccessCallback<Long> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -268,10 +282,12 @@ public Long call() throws Exception {
     }
 
     /**
+     * This method works on top of SugarRecord and provides asynchronous code execution via the usage of
+     * Futures and callbacks to handle success result and error.
      *
-     * @param object
-     * @param successCallback
-     * @param errorCallback
+     * @param object the object you want to delete
+     * @param successCallback the callback to be performed when the operation is successful
+     * @param errorCallback the callback to be performed when the operation has an error
      */
     public void delete(final T object, final SuccessCallback<Boolean> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -304,11 +320,13 @@ public Boolean call() throws Exception {
     }
 
     /**
+     * Method that performs a selective delete. The code is executed asynchronously via the usage of Futures
+     * and result callbacks
      *
-     * @param whereClause
-     * @param whereArgs
-     * @param successCallback
-     * @param errorCallback
+     * @param whereClause the clause for the search
+     * @param whereArgs the values
+     * @param successCallback the callback to be executed if there is no trouble
+     * @param errorCallback the callback to be executed if there is an error
      */
     public void delete(final String whereClause, final String[] whereArgs, final SuccessCallback<Integer> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -340,18 +358,20 @@ public Integer call() throws Exception {
     }
 
     /**
+     * Method that deletes all data in a SQLite table.
      *
-     * @param successCallback
-     * @param errorCallback
+     * @param successCallback the callback that is executed if the operation is succesful
+     * @param errorCallback the callback that is executed if there is an error
      */
     public void deleteAll(final SuccessCallback<Integer> successCallback, final ErrorCallback errorCallback) {
         delete(null, null, successCallback, errorCallback);
     }
 
     /**
+     * Method that performs a count
      *
-     * @param successCallback
-     * @param errorCallback
+     * @param successCallback the callback that is executed if this is successful
+     * @param errorCallback the callback that is executed if there is an error
      */
     public void count(final SuccessCallback<Long> successCallback, final ErrorCallback errorCallback) {
         checkNotNull(successCallback);
@@ -383,8 +403,9 @@ public Long call() throws Exception {
     }
 
     /**
+     * Method that checks an object to be not null
      *
-     * @param object
+     * @param object the object to be checked
      */
     private void checkNotNull(Object object) {
         if (null == object) {

From b85f2268e96d333d756256778f2aab176be92af3 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 17 Apr 2016 13:32:47 -0300
Subject: [PATCH 281/305] Added more test Modified from private to protected

---
 .../main/java/com/orm/SugarDataSource.java    |  2 +-
 .../java/com/orm/SugarDataSourceTest.java     | 58 ++++++++++---------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index e7e76bd8..01e12d1c 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -407,7 +407,7 @@ public Long call() throws Exception {
      *
      * @param object the object to be checked
      */
-    private void checkNotNull(Object object) {
+    protected void checkNotNull(Object object) {
         if (null == object) {
             throw new IllegalArgumentException("object shouldn't be null");
         }
diff --git a/library/src/test/java/com/orm/SugarDataSourceTest.java b/library/src/test/java/com/orm/SugarDataSourceTest.java
index fafd2beb..9f3d25ba 100644
--- a/library/src/test/java/com/orm/SugarDataSourceTest.java
+++ b/library/src/test/java/com/orm/SugarDataSourceTest.java
@@ -6,8 +6,6 @@
 import com.orm.dsl.BuildConfig;
 import com.orm.model.TestRecord;
 
-import junit.framework.Assert;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,6 +15,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static junit.framework.Assert.*;
+
 /**
  * @author jonatan.salas
  */
@@ -31,7 +31,6 @@ public void setUp() {
     }
 
     @Test
-    @SuppressWarnings("all")
     public void testInsertAndDelete() {
         final TestRecord record = new TestRecord();
         record.setName("lalala");
@@ -52,15 +51,15 @@ public void onError(Exception e) {
                 }
         );
 
-        Assert.assertNotNull(record.getId());
+        assertNotNull(record.getId());
 
         recordSugarDataSource.delete(
                 record,
                 new SugarDataSource.SuccessCallback<Boolean>() {
                     @Override
                     public void onSuccess(Boolean result) {
-                        Assert.assertNotNull(result);
-                        Assert.assertEquals(true, result.booleanValue());
+                        assertNotNull(result);
+                        assertEquals(true, result.booleanValue());
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -73,7 +72,6 @@ public void onError(Exception e) {
     }
 
     @Test
-    @SuppressWarnings("all")
     public void testInsertAndFindById() {
         final TestRecord record = new TestRecord();
         record.setName("lalala");
@@ -99,8 +97,8 @@ public void onError(Exception e) {
                 new SugarDataSource.SuccessCallback<TestRecord>() {
                     @Override
                     public void onSuccess(TestRecord result) {
-                        Assert.assertEquals(record.getId(), result.getId());
-                        Assert.assertEquals(record.getName(), result.getName());
+                        assertEquals(record.getId(), result.getId());
+                        assertEquals(record.getName(), result.getName());
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -113,7 +111,6 @@ public void onError(Exception e) {
     }
 
     @Test
-    @SuppressWarnings("all")
     public void testInsertUpdateAndFindById() {
         final TestRecord record = new TestRecord();
         record.setName("lalala");
@@ -140,7 +137,7 @@ public void onError(Exception e) {
                 new SugarDataSource.SuccessCallback<Long>() {
                     @Override
                     public void onSuccess(Long id) {
-                        Assert.assertEquals(record.getId(), id);
+                        assertEquals(record.getId(), id);
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -156,8 +153,8 @@ public void onError(Exception e) {
                 new SugarDataSource.SuccessCallback<TestRecord>() {
                     @Override
                     public void onSuccess(TestRecord result) {
-                        Assert.assertEquals(record.getId(), result.getId());
-                        Assert.assertEquals("fulano", result.getName());
+                        assertEquals(record.getId(), result.getId());
+                        assertEquals("fulano", result.getName());
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -170,7 +167,6 @@ public void onError(Exception e) {
     }
 
     @Test
-    @SuppressWarnings("all")
     public void testInsertAndListAll() {
         final TestRecord record = new TestRecord();
         record.setName("lalala");
@@ -234,7 +230,7 @@ public void onError(Exception e) {
                 new SugarDataSource.SuccessCallback<List<TestRecord>>() {
                     @Override
                     public void onSuccess(List<TestRecord> list) {
-                        Assert.assertEquals(3, list.size());
+                        assertEquals(3, list.size());
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -249,7 +245,7 @@ public void onError(Exception e) {
                 new SugarDataSource.SuccessCallback<Integer>() {
                     @Override
                     public void onSuccess(Integer count) {
-                        Assert.assertEquals(3, count.intValue());
+                        assertEquals(3, count.intValue());
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -262,7 +258,6 @@ public void onError(Exception e) {
     }
 
     @Test
-    @SuppressWarnings("all")
     public void testInsertAndCount() {
         final TestRecord record = new TestRecord();
         record.setName("lalala");
@@ -326,7 +321,7 @@ public void onError(Exception e) {
                 new SugarDataSource.SuccessCallback<Long>() {
                     @Override
                     public void onSuccess(Long count) {
-                        Assert.assertEquals(3, count.longValue());
+                        assertEquals(3, count.longValue());
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -339,7 +334,6 @@ public void onError(Exception e) {
     }
 
     @Test
-    @SuppressWarnings("all")
     public void testInsertAndGetCursor() {
         final TestRecord record = new TestRecord();
         record.setName("lalala");
@@ -404,7 +398,7 @@ public void onError(Exception e) {
                 new SugarDataSource.SuccessCallback<List<TestRecord>>() {
                     @Override
                     public void onSuccess(List<TestRecord> list) {
-                        Assert.assertEquals(3, list.size());
+                        assertEquals(3, list.size());
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -424,7 +418,7 @@ public void onError(Exception e) {
                 new SugarDataSource.SuccessCallback<Cursor>() {
                     @Override
                     public void onSuccess(Cursor cursor) {
-                        Assert.assertNotNull(cursor);
+                        assertNotNull(cursor);
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
@@ -479,8 +473,8 @@ public void onSuccess(List<TestRecord> testRecords) {
                             TestRecord record1 = list.get(i);
                             TestRecord record2 = testRecords.get(i);
 
-                            Assert.assertEquals(record1.getId(), record2.getId());
-                            Assert.assertEquals(record1.getName(), record2.getName());
+                            assertEquals(record1.getId(), record2.getId());
+                            assertEquals(record1.getName(), record2.getName());
                         }
                     }
                 },
@@ -503,39 +497,47 @@ public void nullFindById() {
                 new SugarDataSource.SuccessCallback<TestRecord>() {
                     @Override
                     public void onSuccess(TestRecord object) {
-                        Assert.assertNull(object);
+                        assertNull(object);
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
                     @Override
                     public void onError(Exception e) {
-                        Assert.assertNotNull(e.getMessage());
+                        assertNotNull(e.getMessage());
                     }
                 }
         );
     }
 
     @Test
-    public void nullListAll() {
+    public void testNullListAll() {
         recordSugarDataSource.listAll(
                 null,
                 new SugarDataSource.SuccessCallback<List<TestRecord>>() {
                     @Override
                     public void onSuccess(List<TestRecord> object) {
-                        Assert.assertNull(object);
+                        assertNull(object);
                     }
                 },
                 new SugarDataSource.ErrorCallback() {
                     @Override
                     public void onError(Exception e) {
-                        Assert.assertNotNull(e.getMessage());
+                        assertNotNull(e.getMessage());
                     }
                 }
         );
     }
 
     @Test(expected = IllegalArgumentException.class)
+    @SuppressWarnings("all")
     public void testNullConstructor() {
         SugarDataSource<TestRecord> dataSource = SugarDataSource.getInstance(null);
     }
+
+    @Test(expected = IllegalArgumentException.class)
+    @SuppressWarnings("all")
+    public void testCheckNotNull() {
+        TestRecord record = null;
+        recordSugarDataSource.checkNotNull(record);
+    }
 }

From ae23fa60fea2def23533126e7569f18d43ddebe9 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 17 Apr 2016 13:33:36 -0300
Subject: [PATCH 282/305] modified count method

---
 library/src/main/java/com/orm/SugarDataSource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index 01e12d1c..2aa2f8d4 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -346,7 +346,7 @@ public Integer call() throws Exception {
         try {
             count = future.get();
 
-            if (null == count || count == 0) {
+            if (null == count) {
                 errorCallback.onError(new Exception("Error when performing delete of all elements"));
             } else {
                 successCallback.onSuccess(count);

From badf5463b4e4487e42d9016c7f90c12f1bbf2e5b Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 17 Apr 2016 14:24:49 -0300
Subject: [PATCH 283/305] Added test to UpdateInTx

---
 .../java/com/orm/record/UpdateInTxTest.java   | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 library/src/test/java/com/orm/record/UpdateInTxTest.java

diff --git a/library/src/test/java/com/orm/record/UpdateInTxTest.java b/library/src/test/java/com/orm/record/UpdateInTxTest.java
new file mode 100644
index 00000000..2c5a032f
--- /dev/null
+++ b/library/src/test/java/com/orm/record/UpdateInTxTest.java
@@ -0,0 +1,70 @@
+package com.orm.record;
+
+import com.orm.SugarRecord;
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.TestRecord;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+/**
+ * @author jonatan.salas
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public final class UpdateInTxTest {
+
+    @Test
+    public void testUpdateInTx() {
+        final TestRecord record = new TestRecord();
+        record.setName("lalala");
+
+        Long id = SugarRecord.save(record);
+        record.setId(id);
+
+        final TestRecord record1 = new TestRecord();
+        record1.setName("lalala");
+
+        Long id1 = SugarRecord.save(record1);
+        record1.setId(id1);
+
+        final TestRecord record2 = new TestRecord();
+        record2.setName("lalala");
+
+        Long id2 = SugarRecord.save(record2);
+        record2.setId(id2);
+
+        final TestRecord record3 = new TestRecord();
+        record3.setName("lalala");
+
+        Long id3 = SugarRecord.save(record3);
+        record3.setId(id3);
+
+        final TestRecord record4 = new TestRecord();
+        record4.setName("lalala");
+
+        Long id4 = SugarRecord.save(record4);
+        record.setId(id4);
+
+        record.setName("fulano");
+        record1.setName("fulano");
+        record2.setName("fulano");
+        record3.setName("fulano");
+        record4.setName("fulano");
+
+        SugarRecord.updateInTx(record, record1, record2, record3, record4);
+
+        List<TestRecord> list = SugarRecord.listAll(TestRecord.class);
+
+        for (TestRecord r: list) {
+            Assert.assertEquals(record.getName(), r.getName());
+        }
+    }
+}

From 4059753f44222f6f7f0dea447ccf59f366c6b406 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 17 Apr 2016 18:55:13 -0300
Subject: [PATCH 284/305] Added Interfaces documentation

---
 library/src/main/java/com/orm/SugarDataSource.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index 2aa2f8d4..eff4b734 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -418,26 +418,32 @@ public Class<T> getSugarClass() {
     }
 
     /**
+     * The callback to be executed when some SugarDataSource operation is successful.
+     *
      * @author jonatan.salas
-     * @param <S>
+     * @param <S> the parameter of the result that is passed to onSuccess method
      */
     public interface SuccessCallback<S> {
 
         /**
+         * This code is executed if there is no trouble on any SugarDataSource operation.
          *
-         * @param object
+         * @param result the result of some SugarDatasource operation
          */
-        void onSuccess(final S object);
+        void onSuccess(final S result);
     }
 
     /**
+     * The callback to be executed when some SugarDataSource operation has an error.
+     *
      * @author jonatan.salas
      */
     public interface ErrorCallback {
 
         /**
+         * This method is executed if some trouble is detected when using some SugarDataSource method.
          *
-         * @param e
+         * @param e the exception thrown by the method of SugarDataSource you have invoked
          */
         void onError(final Exception e);
     }

From d9bceb06ec4bbd556d4f3be7272b1f6bea74909b Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 17 Apr 2016 19:21:25 -0300
Subject: [PATCH 285/305] Added ThreadUtil documentation

---
 library/src/main/java/com/orm/util/ThreadUtil.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/library/src/main/java/com/orm/util/ThreadUtil.java b/library/src/main/java/com/orm/util/ThreadUtil.java
index bcd9e03d..665e5c2d 100644
--- a/library/src/main/java/com/orm/util/ThreadUtil.java
+++ b/library/src/main/java/com/orm/util/ThreadUtil.java
@@ -6,6 +6,8 @@
 import java.util.concurrent.Future;
 
 /**
+ * Util class to deal with threads.
+ *
  * @author jonatan.salas
  */
 public final class ThreadUtil {
@@ -13,6 +15,12 @@ public final class ThreadUtil {
     //Prevent instantiation..
     private ThreadUtil() { }
 
+    /**
+     * Submits a Callable object and returns a Future ready to use.
+     *
+     * @param callable the callable you want to submit
+     * @return a Future object
+     */
     public static Future doInBackground(Callable callable) {
         final ExecutorService executor = Executors.newSingleThreadExecutor();
         Future future = executor.submit(callable);

From 7f60eb98d28cae633570433edd218435f807a353 Mon Sep 17 00:00:00 2001
From: jonatan <jonatansalas@live.com.ar>
Date: Sun, 17 Apr 2016 19:49:12 -0300
Subject: [PATCH 286/305] Deleted all null assigns

---
 .../main/java/com/orm/SugarDataSource.java    | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarDataSource.java b/library/src/main/java/com/orm/SugarDataSource.java
index eff4b734..d2d9aa2c 100644
--- a/library/src/main/java/com/orm/SugarDataSource.java
+++ b/library/src/main/java/com/orm/SugarDataSource.java
@@ -64,8 +64,7 @@ public Long call() throws Exception {
         };
 
         final Future<Long> future = doInBackground(call);
-
-        Long id = null;
+        Long id;
 
         try {
             id = future.get();
@@ -109,8 +108,7 @@ public List<Long> call() throws Exception {
         };
 
         final Future<List<Long>> future = doInBackground(call);
-
-        List<Long> ids = null;
+        List<Long> ids;
 
         try {
             ids = future.get();
@@ -147,8 +145,7 @@ public T call() throws Exception {
         };
 
         final Future<T> future = doInBackground(call);
-
-        T object = null;
+        T object;
 
         try {
             object = future.get();
@@ -188,8 +185,7 @@ public Cursor call() throws Exception {
         };
 
         final Future<Cursor> future = doInBackground(call);
-
-        Cursor cursor = null;
+        Cursor cursor;
 
         try {
             cursor = future.get();
@@ -225,8 +221,7 @@ public List<T> call() throws Exception {
         };
 
         final Future<List<T>> future = doInBackground(call);
-
-        List<T> objects = null;
+        List<T> objects;
 
         try {
             objects = future.get();
@@ -264,8 +259,7 @@ public Long call() throws Exception {
         };
 
         final Future<Long> future = doInBackground(call);
-
-        Long id = null;
+        Long id;
 
         try {
             id = future.get();
@@ -302,8 +296,7 @@ public Boolean call() throws Exception {
         };
 
         final Future<Boolean> future = doInBackground(call);
-
-        Boolean isDeleted = null;
+        Boolean isDeleted;
 
         try {
             isDeleted = future.get();
@@ -340,8 +333,7 @@ public Integer call() throws Exception {
         };
 
         final Future<Integer> future = doInBackground(call);
-
-        Integer count = null;
+        Integer count;
 
         try {
             count = future.get();
@@ -385,8 +377,7 @@ public Long call() throws Exception {
         };
 
         final Future<Long> future = doInBackground(call);
-
-        Long count = null;
+        Long count;
 
         try {
             count = future.get();

From 92b675e0d1ba4c9958116990d50e2403f5cc42d0 Mon Sep 17 00:00:00 2001
From: Tim Siebels <tim_siebels_aurich@yahoo.de>
Date: Sat, 14 May 2016 13:25:44 +0200
Subject: [PATCH 287/305] Implement SugarRecord.sum()

---
 .../src/main/java/com/orm/SugarRecord.java    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index a6d22f04..3cc5c2ab 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -261,6 +261,36 @@ public static <T> long count(Class<T> type, String whereClause, String[] whereAr
         return result;
     }
 
+    public static <T> long sum(Class<T> type, String field) {
+        return sum(type, field, null, null);
+    }
+
+    public static <T> long sum(Class<T> type, String field, String whereClause, String[] whereArgs) {
+        long result = -1;
+        String filter = (!TextUtils.isEmpty(whereClause)) ? " where " + whereClause : "";
+        SQLiteStatement sqLiteStatement;
+        try {
+            sqLiteStatement = getSugarDataBase().compileStatement("SELECT sum(" + field + ") FROM " + NamingHelper.toTableName(type) + filter);
+        } catch (SQLiteException e) {
+            e.printStackTrace();
+            return result;
+        }
+
+        if (whereArgs != null) {
+            for (int i = whereArgs.length; i != 0; i--) {
+                sqLiteStatement.bindString(i, whereArgs[i - 1]);
+            }
+        }
+
+        try {
+            result = sqLiteStatement.simpleQueryForLong();
+        } finally {
+            sqLiteStatement.close();
+        }
+
+        return result;
+    }
+
     public static long save(Object object) {
         return save(getSugarDataBase(), object);
     }

From f43255f24d7c39edc6ab796bfa6a00bc5e27ddf9 Mon Sep 17 00:00:00 2001
From: Tim Siebels <tim_siebels_aurich@yahoo.de>
Date: Mon, 16 May 2016 18:12:54 +0200
Subject: [PATCH 288/305] Add tests for sum()

---
 .../com/orm/record/IntegerFieldTests.java     | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/library/src/test/java/com/orm/record/IntegerFieldTests.java b/library/src/test/java/com/orm/record/IntegerFieldTests.java
index 5bb78a47..c30b13a5 100644
--- a/library/src/test/java/com/orm/record/IntegerFieldTests.java
+++ b/library/src/test/java/com/orm/record/IntegerFieldTests.java
@@ -10,9 +10,9 @@
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
-import static com.orm.SugarRecord.save;
 import static com.orm.SugarRecord.findById;
-
+import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.sum;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -76,4 +76,32 @@ public void intAnnotatedTest() {
         IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
         assertEquals(integer.intValue(), model.getInt());
     }
+
+
+    @Test
+    public void sumTest() {
+        save(new IntegerFieldAnnotatedModel(integer.intValue()));
+        save(new IntegerFieldAnnotatedModel(integer.intValue()));
+        assertEquals(2 * integer, sum(IntegerFieldAnnotatedModel.class, "raw_integer"));
+    }
+
+    @Test
+    public void whereSumTest() {
+        save(new IntegerFieldAnnotatedModel(integer.intValue()));
+        save(new IntegerFieldAnnotatedModel(integer.intValue()));
+        assertEquals((long) integer, sum(IntegerFieldAnnotatedModel.class,
+                "raw_integer", "id = ?", new String[]{"1"}));
+    }
+
+    @Test
+    public void noSumTest() {
+        assertEquals(0, sum(IntegerFieldAnnotatedModel.class, "raw_integer"));
+    }
+
+    @Test
+    public void brokenSumTest() {
+        save(new IntegerFieldAnnotatedModel(integer.intValue()));
+        save(new IntegerFieldAnnotatedModel(integer.intValue()));
+        assertEquals(-1, sum(IntegerFieldAnnotatedModel.class, "wrongfield"));
+    }
 }

From dabff002218a0f255debf0d7dce246ff1ba0e7e0 Mon Sep 17 00:00:00 2001
From: Tim Siebels <tim_siebels_aurich@yahoo.de>
Date: Mon, 16 May 2016 18:26:25 +0200
Subject: [PATCH 289/305] Make SugarRecord API more versatile

this should not change the API, but makes it easier to use.
Especially for cases like wanting to count for one specific value,
resulting in a where with only one or a few args.
Currently we need to create a String array for that, resulting in a
ugly new String[]{"bla"} block.
Now it is possible to directly pass "bla"

count was the motivation for this change, but I changed other signatures
where this was possible as well.
---
 library/src/main/java/com/orm/SugarRecord.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index a6d22f04..44ce2e01 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -142,7 +142,7 @@ public static <T> T findById(Class<T> type, Integer id) {
         return findById(type, Long.valueOf(id));
     }
 
-    public static <T> List<T> findById(Class<T> type, String[] ids) {
+    public static <T> List<T> findById(Class<T> type, String... ids) {
         String whereClause = "id IN (" + QueryBuilder.generatePlaceholders(ids.length) + ")";
         return find(type, whereClause, ids);
     }
@@ -231,7 +231,7 @@ public static <T> long count(Class<T> type) {
         return count(type, null, null, null, null, null);
     }
 
-    public static <T> long count(Class<T> type, String whereClause, String[] whereArgs) {
+    public static <T> long count(Class<T> type, String whereClause, String... whereArgs) {
     	return count(type, whereClause, whereArgs, null, null, null);
     }
 

From 59a2a918ce3328945c76586b8efc36d672f98857 Mon Sep 17 00:00:00 2001
From: Tim Siebels <tim_siebels_aurich@yahoo.de>
Date: Mon, 16 May 2016 18:33:00 +0200
Subject: [PATCH 290/305] Improve API

to use ... operator
---
 library/src/main/java/com/orm/SugarRecord.java              | 2 +-
 library/src/test/java/com/orm/record/IntegerFieldTests.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 3cc5c2ab..668b8b67 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -265,7 +265,7 @@ public static <T> long sum(Class<T> type, String field) {
         return sum(type, field, null, null);
     }
 
-    public static <T> long sum(Class<T> type, String field, String whereClause, String[] whereArgs) {
+    public static <T> long sum(Class<T> type, String field, String whereClause, String... whereArgs) {
         long result = -1;
         String filter = (!TextUtils.isEmpty(whereClause)) ? " where " + whereClause : "";
         SQLiteStatement sqLiteStatement;
diff --git a/library/src/test/java/com/orm/record/IntegerFieldTests.java b/library/src/test/java/com/orm/record/IntegerFieldTests.java
index c30b13a5..faf5fa84 100644
--- a/library/src/test/java/com/orm/record/IntegerFieldTests.java
+++ b/library/src/test/java/com/orm/record/IntegerFieldTests.java
@@ -90,7 +90,7 @@ public void whereSumTest() {
         save(new IntegerFieldAnnotatedModel(integer.intValue()));
         save(new IntegerFieldAnnotatedModel(integer.intValue()));
         assertEquals((long) integer, sum(IntegerFieldAnnotatedModel.class,
-                "raw_integer", "id = ?", new String[]{"1"}));
+                "raw_integer", "id = ?", "1"));
     }
 
     @Test

From 0ada490151dc7e3e343b48e563466252c8445688 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Mon, 16 May 2016 15:45:41 -0300
Subject: [PATCH 291/305] adding missing info of how to use master version

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index fa8a2c14..594782a7 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,11 @@ dependencies {
 }
 ```
 
+You should also comment this line just comment this line (library/build.gradle): https://github.com/satyan/sugar/blob/master/library%2Fbuild.gradle#L2
+
+```gradle
+// apply from: '../maven_push.gradle'
+```
 ===================
 
 After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html) **Outdated**. Check examples of 1.4 and master below: 

From af9abfaad12eb62f3e3f58d0e1270fd22040c366 Mon Sep 17 00:00:00 2001
From: Sibelius Seraphini <sibeliusseraphini@gmail.com>
Date: Thu, 16 Jun 2016 17:30:40 -0300
Subject: [PATCH 292/305] using ManifestHelper.isDebugEnabled() to disable logs
 based on meta-data on manifest, closes satyan/sugar#375

---
 .../main/java/com/orm/SchemaGenerator.java    | 42 ++++++++++++-----
 library/src/main/java/com/orm/SugarDb.java    | 13 ++++--
 .../src/main/java/com/orm/SugarRecord.java    | 45 ++++++++++++++-----
 .../java/com/orm/helper/ManifestHelper.java   | 10 +++--
 .../orm/helper/SugarTransactionHelper.java    | 12 +++--
 .../java/com/orm/util/ReflectionUtil.java     | 39 +++++++++++-----
 6 files changed, 120 insertions(+), 41 deletions(-)

diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index 5aa090cd..c25407fc 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -9,6 +9,8 @@
 import com.orm.annotation.MultiUnique;
 import com.orm.annotation.NotNull;
 import com.orm.annotation.Unique;
+import com.orm.dsl.BuildConfig;
+import com.orm.helper.ManifestHelper;
 import com.orm.util.KeyWordUtil;
 import com.orm.util.MigrationFileParser;
 import com.orm.helper.NamingHelper;
@@ -100,7 +102,9 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
             List<String> files = Arrays.asList(getAssets().list("sugar_upgrades"));
             Collections.sort(files, new NumberComparator());
             for (String file : files) {
-                Log.i(SUGAR, "filename : " + file);
+                if(ManifestHelper.isDebugEnabled()) {
+                    Log.i(SUGAR, "filename : " + file);
+                }
 
                 try {
                     int version = Integer.valueOf(file.replace(".sql", ""));
@@ -110,12 +114,16 @@ private boolean executeSugarUpgrade(SQLiteDatabase db, int oldVersion, int newVe
                         isSuccess = true;
                     }
                 } catch (NumberFormatException e) {
-                    Log.i(SUGAR, "not a sugar script. ignored." + file);
+                    if(ManifestHelper.isDebugEnabled()) {
+                        Log.i(SUGAR, "not a sugar script. ignored." + file);
+                    }
                 }
 
             }
         } catch (IOException e) {
-            Log.e(SUGAR, e.getMessage());
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.e(SUGAR, e.getMessage());
+            }
         }
 
         return isSuccess;
@@ -132,17 +140,23 @@ private void executeScript(SQLiteDatabase db,String path ,String file) {
             }
             MigrationFileParser migrationFileParser = new MigrationFileParser(sb.toString());
             for(String statement: migrationFileParser.getStatements()){
-                Log.i("Sugar script", statement);
+                if(ManifestHelper.isDebugEnabled()) {
+                    Log.i("Sugar script", statement);
+                }
                 if (!statement.isEmpty()) {
                     db.execSQL(statement);
                 }
             }
 
         } catch (IOException e) {
-            Log.e(SUGAR, e.getMessage());
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.e(SUGAR, e.getMessage());
+            }
         }
 
-        Log.i(SUGAR, "Script executed");
+        if(ManifestHelper.isDebugEnabled()) {
+            Log.i(SUGAR, "Script executed");
+        }
     }
 
     private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
@@ -179,18 +193,24 @@ private void addColumns(Class<?> table, SQLiteDatabase sqLiteDatabase) {
         }
 
         for (String command : alterCommands) {
-            Log.i("Sugar", command);
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.i("Sugar", command);
+            }
             sqLiteDatabase.execSQL(command);
         }
     }
 
     protected String createTableSQL(Class<?> table) {
-        Log.i(SUGAR, "Create table if not exists");
+        if(ManifestHelper.isDebugEnabled()) {
+            Log.i(SUGAR, "Create table if not exists");
+        }
         List<Field> fields = ReflectionUtil.getTableFields(table);
         String tableName = NamingHelper.toTableName(table);
 
         if(KeyWordUtil.isKeyword(tableName)) {
-            Log.i(SUGAR,"ERROR, SQLITE RESERVED WORD USED IN " + tableName);
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.i(SUGAR, "ERROR, SQLITE RESERVED WORD USED IN " + tableName);
+            }
         }
 
         StringBuilder sb = new StringBuilder("CREATE TABLE IF NOT EXISTS ");
@@ -258,7 +278,9 @@ protected String createTableSQL(Class<?> table) {
         }
 
         sb.append(" ) ");
-        Log.i(SUGAR, "Creating table " + tableName);
+        if(ManifestHelper.isDebugEnabled()) {
+            Log.i(SUGAR, "Creating table " + tableName);
+        }
 
         return sb.toString();
     }
diff --git a/library/src/main/java/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
index ed05b80a..bc71ba23 100644
--- a/library/src/main/java/com/orm/SugarDb.java
+++ b/library/src/main/java/com/orm/SugarDb.java
@@ -4,6 +4,7 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
+import com.orm.dsl.BuildConfig;
 import com.orm.helper.ManifestHelper;
 import com.orm.util.SugarCursorFactory;
 
@@ -62,17 +63,23 @@ public synchronized SQLiteDatabase getDB() {
 
     @Override
     public synchronized SQLiteDatabase getReadableDatabase() {
-        Log.d(LOG_TAG, "getReadableDatabase");
+        if(ManifestHelper.isDebugEnabled()) {
+            Log.d(LOG_TAG, "getReadableDatabase");
+        }
         openedConnections++;
         return super.getReadableDatabase();
     }
 
     @Override
     public synchronized void close() {
-        Log.d(LOG_TAG, "getReadableDatabase");
+        if(ManifestHelper.isDebugEnabled()) {
+            Log.d(LOG_TAG, "getReadableDatabase");
+        }
         openedConnections--;
         if(openedConnections == 0) {
-            Log.d(LOG_TAG, "closing");
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.d(LOG_TAG, "closing");
+            }
             super.close();
         }
     }
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index a6d22f04..50a85d73 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -10,6 +10,7 @@
 
 import com.orm.annotation.Table;
 import com.orm.annotation.Unique;
+import com.orm.dsl.BuildConfig;
 import com.orm.helper.ManifestHelper;
 import com.orm.helper.NamingHelper;
 import com.orm.util.QueryBuilder;
@@ -66,7 +67,9 @@ public static <T> void saveInTx(Collection<T> objects) {
             }
             sqLiteDatabase.setTransactionSuccessful();
         } catch (Exception e) {
-            Log.i(SUGAR, "Error in saving in transaction " + e.getMessage());
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.i(SUGAR, "Error in saving in transaction " + e.getMessage());
+            }
         } finally {
             sqLiteDatabase.endTransaction();
             sqLiteDatabase.setLockingEnabled(true);
@@ -89,7 +92,9 @@ public static <T> void updateInTx(Collection<T> objects) {
             }
             sqLiteDatabase.setTransactionSuccessful();
         } catch (Exception e) {
-            Log.i(SUGAR, "Error in saving in transaction " + e.getMessage());
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.i(SUGAR, "Error in saving in transaction " + e.getMessage());
+            }
         } finally {
             sqLiteDatabase.endTransaction();
             sqLiteDatabase.setLockingEnabled(true);
@@ -116,7 +121,9 @@ public static <T> int deleteInTx(Collection<T> objects) {
             sqLiteDatabase.setTransactionSuccessful();
         } catch (Exception e) {
             deletedRows = 0;
-            Log.i(SUGAR, "Error in deleting in transaction " + e.getMessage());
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.i(SUGAR, "Error in deleting in transaction " + e.getMessage());
+            }
         } finally {
             sqLiteDatabase.endTransaction();
             sqLiteDatabase.setLockingEnabled(true);
@@ -127,7 +134,7 @@ public static <T> int deleteInTx(Collection<T> objects) {
     public static <T> List<T> listAll(Class<T> type) {
         return find(type, null, null, null, null, null);
     }
-    
+
     public static <T> List<T> listAll(Class<T> type, String orderBy) {
         return find(type, null, null, null, orderBy, null);
     }
@@ -381,14 +388,18 @@ public boolean delete() {
         Long id = getId();
         Class<?> type = getClass();
         if (id != null && id > 0L) {
-            Log.i(SUGAR, type.getSimpleName() + " deleted : " + id);
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.i(SUGAR, type.getSimpleName() + " deleted : " + id);
+            }
             return getSugarDataBase().delete(NamingHelper.toTableName(type), "Id=?", new String[]{id.toString()}) == 1;
         } else {
-            Log.i(SUGAR, "Cannot delete object: " + type.getSimpleName() + " - object has not been saved");
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.i(SUGAR, "Cannot delete object: " + type.getSimpleName() + " - object has not been saved");
+            }
             return false;
         }
     }
-    
+
     public static boolean delete(Object object) {
         Class<?> type = object.getClass();
         if (type.isAnnotationPresent(Table.class)) {
@@ -398,23 +409,33 @@ public static boolean delete(Object object) {
                 Long id = (Long) field.get(object);
                 if (id != null && id > 0L) {
                     boolean deleted = getSugarDataBase().delete(NamingHelper.toTableName(type), "Id=?", new String[]{id.toString()}) == 1;
-                    Log.i(SUGAR, type.getSimpleName() + " deleted : " + id);
+                    if(ManifestHelper.isDebugEnabled()) {
+                        Log.i(SUGAR, type.getSimpleName() + " deleted : " + id);
+                    }
                     return deleted;
                 } else {
-                    Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - object has not been saved");
+                    if(ManifestHelper.isDebugEnabled()) {
+                        Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - object has not been saved");
+                    }
                     return false;
                 }
             } catch (NoSuchFieldException e) {
-                Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - annotated object has no id");
+                if(ManifestHelper.isDebugEnabled()) {
+                    Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - annotated object has no id");
+                }
                 return false;
             } catch (IllegalAccessException e) {
-                Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - can't access id");
+                if(ManifestHelper.isDebugEnabled()) {
+                    Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - can't access id");
+                }
                 return false;
             }
         } else if (SugarRecord.class.isAssignableFrom(type)) {
             return ((SugarRecord) object).delete();
         } else {
-            Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - not persisted");
+            if(ManifestHelper.isDebugEnabled()) {
+                Log.i(SUGAR, "Cannot delete object: " + object.getClass().getSimpleName() + " - not persisted");
+            }
             return false;
         }
     }
diff --git a/library/src/main/java/com/orm/helper/ManifestHelper.java b/library/src/main/java/com/orm/helper/ManifestHelper.java
index 1c20b4fe..cab85fd2 100644
--- a/library/src/main/java/com/orm/helper/ManifestHelper.java
+++ b/library/src/main/java/com/orm/helper/ManifestHelper.java
@@ -50,7 +50,7 @@ public static int getDatabaseVersion() {
     }
 
     /**
-     * Grabs the domain name of the model classes from the manifest. 
+     * Grabs the domain name of the model classes from the manifest.
      *
      * @return the package String that Sugar uses to search for model classes
      */
@@ -101,7 +101,9 @@ private static String getMetaDataString(String name) {
             ApplicationInfo ai = pm.getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
             value = ai.metaData.getString(name);
         } catch (Exception e) {
-            Log.d(LOG_TAG, "Couldn't find config value: " + name);
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.d(LOG_TAG, "Couldn't find config value: " + name);
+            }
         }
 
         return value;
@@ -115,7 +117,9 @@ private static Integer getMetaDataInteger(String name) {
             ApplicationInfo ai = pm.getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
             value = ai.metaData.getInt(name);
         } catch (Exception e) {
-            Log.d(LOG_TAG, "Couldn't find config value: " + name);
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.d(LOG_TAG, "Couldn't find config value: " + name);
+            }
         }
 
         return value;
diff --git a/library/src/main/java/com/orm/helper/SugarTransactionHelper.java b/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
index 82077a4a..dbb9ca26 100644
--- a/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
+++ b/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
@@ -16,14 +16,20 @@ public static void doInTransaction(Callback callback) {
         database.beginTransaction();
 
         try {
-            Log.d(LOG_TAG, "Callback executing within transaction");
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.d(LOG_TAG, "Callback executing within transaction");
+            }
 
             callback.manipulateInTransaction();
             database.setTransactionSuccessful();
 
-            Log.d(LOG_TAG, "Callback successfully executed within transaction");
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.d(LOG_TAG, "Callback successfully executed within transaction");
+            }
         } catch (Throwable e) {
-            Log.d(LOG_TAG, "Could execute callback within transaction", e);
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.d(LOG_TAG, "Could execute callback within transaction", e);
+            }
         } finally {
             database.endTransaction();
         }
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 05502bf6..7c0f168a 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -37,7 +37,9 @@ public static List<Field> getTableFields(Class table) {
         List<Field> fieldList = SugarConfig.getFields(table);
         if (fieldList != null) return fieldList;
 
-        Log.d("Sugar", "Fetching properties");
+        if (ManifestHelper.isDebugEnabled()) {
+            Log.d("Sugar", "Fetching properties");
+        }
         List<Field> typeFields = new ArrayList<>();
 
         getAllFields(typeFields, table);
@@ -144,7 +146,9 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
             }
 
         } catch (IllegalAccessException e) {
-            Log.e("Sugar", e.getMessage());
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.e("Sugar", e.getMessage());
+            }
         }
     }
 
@@ -158,7 +162,9 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
 
             //TODO auto upgrade to add new columns
             if (columnIndex < 0) {
-                Log.e("SUGAR", "Invalid colName, you should upgrade database");
+                if (ManifestHelper.isDebugEnabled()) {
+                    Log.e("SUGAR", "Invalid colName, you should upgrade database");
+                }
                 return;
             }
 
@@ -218,12 +224,19 @@ public static void setFieldValueFromCursor(Cursor cursor, Field field, Object ob
                     Object enumVal = valueOf.invoke(field.getType(), strVal);
                     field.set(object, enumVal);
                 } catch (Exception e) {
-                    Log.e("Sugar", "Enum cannot be read from Sqlite3 database. Please check the type of field " + field.getName());
+                    if (ManifestHelper.isDebugEnabled()) {
+                        Log.e("Sugar", "Enum cannot be read from Sqlite3 database. Please check the type of field " + field.getName());
+                    }
+                }
+            } else {
+                if (ManifestHelper.isDebugEnabled()) {
+                    Log.e("Sugar", "Class cannot be read from Sqlite3 database. Please check the type of field " + field.getName() + "(" + field.getType().getName() + ")");
                 }
-            } else
-                Log.e("Sugar", "Class cannot be read from Sqlite3 database. Please check the type of field " + field.getName() + "(" + field.getType().getName() + ")");
+            }
         } catch (IllegalArgumentException | IllegalAccessException e) {
-            Log.e("field set error", e.getMessage());
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.e("field set error", e.getMessage());
+            }
         }
     }
 
@@ -258,7 +271,9 @@ public static List<Class> getDomainClasses() {
                 if (domainClass != null) domainClasses.add(domainClass);
             }
         } catch (IOException | PackageManager.NameNotFoundException  e) {
-            Log.e("Sugar", e.getMessage());
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.e("Sugar", e.getMessage());
+            }
         }
 
         return domainClasses;
@@ -271,7 +286,9 @@ private static Class getDomainClass(String className) {
             discoveredClass = Class.forName(className, true, Thread.currentThread().getContextClassLoader());
         } catch (Throwable e) {
             String error = (e.getMessage() == null) ? "getDomainClass " + className + " error" : e.getMessage();
-            Log.e("Sugar", error);
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.e("Sugar", error);
+            }
         }
 
         if ((discoveredClass != null) &&
@@ -280,7 +297,9 @@ private static Class getDomainClass(String className) {
                         discoveredClass.isAnnotationPresent(Table.class)) &&
                 !Modifier.isAbstract(discoveredClass.getModifiers())) {
 
-            Log.i("Sugar", "domain class : " + discoveredClass.getSimpleName());
+            if (ManifestHelper.isDebugEnabled()) {
+                Log.i("Sugar", "domain class : " + discoveredClass.getSimpleName());
+            }
             return discoveredClass;
 
         } else {

From 5f3c63d491c69888ee8284019dd674d25439742a Mon Sep 17 00:00:00 2001
From: Vookash <vookash93@gmail.com>
Date: Wed, 3 Aug 2016 21:26:54 +0200
Subject: [PATCH 293/305] Added OneToMany relation support.

---
 .../src/main/java/com/orm/SugarRecord.java    | 54 ++++++++---
 .../java/com/orm/annotation/OneToMany.java    | 16 ++++
 .../java/com/orm/util/ReflectionUtil.java     |  2 +
 .../java/com/orm/SchemaGeneratorTest.java     |  2 +-
 .../java/com/orm/model/ManyToOneModel.java    | 55 +++++++++++
 .../java/com/orm/model/OneToManyModel.java    | 59 ++++++++++++
 .../java/com/orm/record/OneToManyTest.java    | 96 +++++++++++++++++++
 .../java/com/orm/util/ReflectionUtilTest.java |  2 +-
 8 files changed, 271 insertions(+), 15 deletions(-)
 create mode 100644 library/src/main/java/com/orm/annotation/OneToMany.java
 create mode 100644 library/src/test/java/com/orm/model/ManyToOneModel.java
 create mode 100644 library/src/test/java/com/orm/model/OneToManyModel.java
 create mode 100644 library/src/test/java/com/orm/record/OneToManyTest.java

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 1135a56c..bf7c0985 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -7,10 +7,9 @@
 import android.database.sqlite.SQLiteStatement;
 import android.text.TextUtils;
 import android.util.Log;
-
+import com.orm.annotation.OneToMany;
 import com.orm.annotation.Table;
 import com.orm.annotation.Unique;
-import com.orm.dsl.BuildConfig;
 import com.orm.helper.ManifestHelper;
 import com.orm.helper.NamingHelper;
 import com.orm.util.QueryBuilder;
@@ -18,13 +17,8 @@
 import com.orm.util.SugarCursor;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
+import java.lang.reflect.ParameterizedType;
+import java.util.*;
 
 import static com.orm.SugarContext.getSugarContext;
 
@@ -216,13 +210,27 @@ public static <T> List<T> find(Class<T> type, String whereClause, String[] where
         return getEntitiesFromCursor(cursor, type);
     }
 
+    private static <T> List<T> findOneToMany(Class<T> type, String relationFieldName, Object relationObject, Long relationObjectId) {
+        String args[] = { String.valueOf(relationObjectId) };
+        String whereClause = NamingHelper.toSQLNameDefault(relationFieldName) + " = ?";
+
+        Cursor cursor = getSugarDataBase().query(NamingHelper.toTableName(type), null, whereClause, args,
+                null, null, null, null);
+
+        return getEntitiesFromCursor(cursor, type, relationFieldName, relationObject);
+    }
+
     public static <T> List<T> getEntitiesFromCursor(Cursor cursor, Class<T> type){
+        return getEntitiesFromCursor(cursor, type, null, null);
+    }
+
+    public static <T> List<T> getEntitiesFromCursor(Cursor cursor, Class<T> type, String relationFieldName, Object relationObject){
         T entity;
         List<T> result = new ArrayList<>();
         try {
             while (cursor.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
-                inflate(cursor, entity, getSugarContext().getEntitiesMap());
+                inflate(cursor, entity, getSugarContext().getEntitiesMap(), relationFieldName, relationObject);
                 result.add(entity);
             }
         } catch (Exception e) {
@@ -391,9 +399,14 @@ public static boolean isSugarEntity(Class<?> objectClass) {
     }
 
     private static void inflate(Cursor cursor, Object object, Map<Object, Long> entitiesMap) {
+        inflate(cursor, object, entitiesMap, null, null);
+    }
+
+    private static void inflate(Cursor cursor, Object object, Map<Object, Long> entitiesMap, String oneToManyFieldName, Object oneToManyObject) {
         List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
+        Long objectId = cursor.getLong(cursor.getColumnIndex(("ID")));
         if (!entitiesMap.containsKey(object)) {
-            entitiesMap.put(object, cursor.getLong(cursor.getColumnIndex(("ID"))));
+            entitiesMap.put(object, objectId);
         }
 
         for (Field field : columns) {
@@ -401,11 +414,26 @@ private static void inflate(Cursor cursor, Object object, Map<Object, Long> enti
             Class<?> fieldType = field.getType();
             if (isSugarEntity(fieldType)) {
                 try {
-                    long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toColumnName(field)));
-                    field.set(object, (id > 0) ? findById(fieldType, id) : null);
+                    if (field.getName().equals(oneToManyFieldName)) {
+                        field.set(object, oneToManyObject);
+                    } else {
+                        long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toColumnName(field)));
+                        field.set(object, (id > 0) ? findById(fieldType, id) : null);
+                    }
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }
+            } else if (fieldType.equals(List.class)) {
+                if (field.isAnnotationPresent(OneToMany.class)) {
+                    try {
+                        ParameterizedType genericListType = (ParameterizedType) field.getGenericType();
+                        Class<?> genericListClass = (Class<?>) genericListType.getActualTypeArguments()[0];
+                        String targetName = field.getAnnotation(OneToMany.class).targetField();
+                        field.set(object, findOneToMany(genericListClass, targetName, object, objectId));
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
             } else {
                 ReflectionUtil.setFieldValueFromCursor(cursor, field, object);
             }
diff --git a/library/src/main/java/com/orm/annotation/OneToMany.java b/library/src/main/java/com/orm/annotation/OneToMany.java
new file mode 100644
index 00000000..5423256b
--- /dev/null
+++ b/library/src/main/java/com/orm/annotation/OneToMany.java
@@ -0,0 +1,16 @@
+package com.orm.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Created by Łukasz Wesołowski on 28.07.2016.
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface OneToMany {
+    String targetField();
+}
diff --git a/library/src/main/java/com/orm/util/ReflectionUtil.java b/library/src/main/java/com/orm/util/ReflectionUtil.java
index 7c0f168a..71a8b8c6 100644
--- a/library/src/main/java/com/orm/util/ReflectionUtil.java
+++ b/library/src/main/java/com/orm/util/ReflectionUtil.java
@@ -134,6 +134,8 @@ public static void addFieldValueToColumn(ContentValues values, Field column, Obj
                     } else {
                         values.put(columnName, (byte[]) columnValue);
                     }
+                } else if (columnType.equals(List.class)) {
+                    //ignore
                 } else {
                     if (columnValue == null) {
                         values.putNull(columnName);
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index fa75cdea..3b39c38c 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -137,7 +137,7 @@ public void testAllTableCreation() {
         Cursor c = sqLiteDatabase.rawQuery(sql, null);
 
         if (c.moveToFirst()) {
-            Assert.assertEquals(43, c.getInt(0));
+            Assert.assertEquals(45, c.getInt(0));
         }
 
         if (!c.isClosed()) {
diff --git a/library/src/test/java/com/orm/model/ManyToOneModel.java b/library/src/test/java/com/orm/model/ManyToOneModel.java
new file mode 100644
index 00000000..4e704142
--- /dev/null
+++ b/library/src/test/java/com/orm/model/ManyToOneModel.java
@@ -0,0 +1,55 @@
+package com.orm.model;
+
+import com.orm.SugarRecord;
+
+/**
+ * Created by Łukasz Wesołowski on 28.07.2016.
+ */
+public class ManyToOneModel extends SugarRecord {
+    private String name;
+    private OneToManyModel model;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public OneToManyModel getModel() {
+        return model;
+    }
+
+    public void setModel(OneToManyModel model) {
+        this.model = model;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ManyToOneModel that = (ManyToOneModel) o;
+
+        if (getId() != null ? !getId().equals(that.getId()) : that.getId() != null) return false;
+        return name != null ? name.equals(that.name) : that.name == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getId() != null ? getId().hashCode() : 0;
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ManyToOneModel{" +
+                "id=" + getId() +
+                ", name='" + name + '\'' +
+                ", model=" + model +
+                '}';
+    }
+}
diff --git a/library/src/test/java/com/orm/model/OneToManyModel.java b/library/src/test/java/com/orm/model/OneToManyModel.java
new file mode 100644
index 00000000..e23b2a1c
--- /dev/null
+++ b/library/src/test/java/com/orm/model/OneToManyModel.java
@@ -0,0 +1,59 @@
+package com.orm.model;
+
+import com.orm.SugarRecord;
+import com.orm.annotation.OneToMany;
+
+import java.util.List;
+
+/**
+ * Created by Łukasz Wesołowski on 28.07.2016.
+ */
+public class OneToManyModel extends SugarRecord {
+    private String name;
+    @OneToMany(targetField = "model")
+    private List<ManyToOneModel> models;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<ManyToOneModel> getModels() {
+        return models;
+    }
+
+    public void setModels(List<ManyToOneModel> models) {
+        this.models = models;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        OneToManyModel that = (OneToManyModel) o;
+
+        if (getId() != null ? !getId().equals(that.getId()) : that.getId() != null) return false;
+        return name != null ? name.equals(that.name) : that.name == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getId() != null ? getId().hashCode() : 0;
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "OneToManyModel{" +
+                "id=" + getId() +
+                ", name='" + name + '\'' +
+                ", models=" + models +
+                '}';
+    }
+}
diff --git a/library/src/test/java/com/orm/record/OneToManyTest.java b/library/src/test/java/com/orm/record/OneToManyTest.java
new file mode 100644
index 00000000..f9ddd9f4
--- /dev/null
+++ b/library/src/test/java/com/orm/record/OneToManyTest.java
@@ -0,0 +1,96 @@
+package com.orm.record;
+
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
+import com.orm.model.ManyToOneModel;
+import com.orm.model.OneToManyModel;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Created by Łukasz Wesołowski on 28.07.2016.
+ */
+
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
+public class OneToManyTest {
+    @Test
+    public void saveOneToManyRelationTest() {
+        OneToManyModel oneToManyModel = new OneToManyModel();
+        oneToManyModel.setId(1l);
+        oneToManyModel.setName("oneToMany");
+        oneToManyModel.save();
+
+        ManyToOneModel manyToOneModel1 = new ManyToOneModel();
+        manyToOneModel1.setId(1l);
+        manyToOneModel1.setName("manyToOne 1");
+        manyToOneModel1.setModel(oneToManyModel);
+        manyToOneModel1.save();
+
+        ManyToOneModel manyToOneModel2 = new ManyToOneModel();
+        manyToOneModel2.setId(2l);
+        manyToOneModel2.setName("manyToOne 2");
+        manyToOneModel2.setModel(oneToManyModel);
+        manyToOneModel2.save();
+
+        ManyToOneModel manyToOneModel3 = new ManyToOneModel();
+        manyToOneModel3.setId(3l);
+        manyToOneModel3.setName("manyToOne 3");
+        manyToOneModel3.setModel(oneToManyModel);
+        manyToOneModel3.save();
+
+        OneToManyModel result = OneToManyModel.findById(OneToManyModel.class, 1l);
+
+        Assert.assertEquals(3, result.getModels().size());
+
+        Assert.assertTrue(result.getModels().contains(manyToOneModel1));
+        Assert.assertTrue(result.getModels().contains(manyToOneModel2));
+        Assert.assertTrue(result.getModels().contains(manyToOneModel3));
+
+        Assert.assertEquals(result, result.getModels().get(0).getModel());
+        Assert.assertEquals(result, result.getModels().get(1).getModel());
+        Assert.assertEquals(result, result.getModels().get(2).getModel());
+    }
+
+    @Test
+    public void removeOneToManyRelationTest() {
+        OneToManyModel oneToManyModel = new OneToManyModel();
+        oneToManyModel.setId(1l);
+        oneToManyModel.setName("oneToMany");
+        oneToManyModel.save();
+
+        ManyToOneModel manyToOneModel1 = new ManyToOneModel();
+        manyToOneModel1.setId(1l);
+        manyToOneModel1.setName("manyToOne 1");
+        manyToOneModel1.setModel(oneToManyModel);
+        manyToOneModel1.save();
+
+        ManyToOneModel manyToOneModel2 = new ManyToOneModel();
+        manyToOneModel2.setId(2l);
+        manyToOneModel2.setName("manyToOne 2");
+        manyToOneModel2.setModel(oneToManyModel);
+        manyToOneModel2.save();
+
+        ManyToOneModel manyToOneModel3 = new ManyToOneModel();
+        manyToOneModel3.setId(3l);
+        manyToOneModel3.setName("manyToOne 3");
+        manyToOneModel3.setModel(oneToManyModel);
+        manyToOneModel3.save();
+
+        OneToManyModel result = OneToManyModel.findById(OneToManyModel.class, 1l);
+
+        Assert.assertEquals(3, result.getModels().size());
+
+        ManyToOneModel.delete(manyToOneModel2);
+
+        result = OneToManyModel.findById(OneToManyModel.class, 1l);
+
+        Assert.assertEquals(2, result.getModels().size());
+
+        Assert.assertTrue(result.getModels().contains(manyToOneModel1));
+        Assert.assertTrue(result.getModels().contains(manyToOneModel3));
+    }
+}
diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index 5d0dd12b..09fd4755 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -72,7 +72,7 @@ public void testSetFieldValueForId() {
     @Test
     public void testGetAllClasses() {
         List<Class> classes = ReflectionUtil.getDomainClasses();
-        Assert.assertEquals(41, classes.size());
+        Assert.assertEquals(43, classes.size());
     }
 
     @Test(expected = NoSuchFieldException.class)

From 96c843aaaa5aae48e8712b8247ac463ccce966df Mon Sep 17 00:00:00 2001
From: Vookash <vookash93@gmail.com>
Date: Wed, 3 Aug 2016 23:22:33 +0200
Subject: [PATCH 294/305] Refactored sugar record inflation.

---
 .../src/main/java/com/orm/SugarRecord.java    | 69 +++++------------
 .../java/com/orm/inflater/ObjectInflater.java | 75 +++++++++++++++++++
 .../inflater/field/DefaultFieldInflater.java  | 21 ++++++
 .../inflater/field/EntityFieldInflater.java   | 27 +++++++
 .../com/orm/inflater/field/FieldInflater.java | 24 ++++++
 .../orm/inflater/field/ListFieldInflater.java | 38 ++++++++++
 .../field/RelationEntityFieldInflater.java    | 29 +++++++
 7 files changed, 234 insertions(+), 49 deletions(-)
 create mode 100644 library/src/main/java/com/orm/inflater/ObjectInflater.java
 create mode 100644 library/src/main/java/com/orm/inflater/field/DefaultFieldInflater.java
 create mode 100644 library/src/main/java/com/orm/inflater/field/EntityFieldInflater.java
 create mode 100644 library/src/main/java/com/orm/inflater/field/FieldInflater.java
 create mode 100644 library/src/main/java/com/orm/inflater/field/ListFieldInflater.java
 create mode 100644 library/src/main/java/com/orm/inflater/field/RelationEntityFieldInflater.java

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index bf7c0985..d72c2b7e 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -7,17 +7,16 @@
 import android.database.sqlite.SQLiteStatement;
 import android.text.TextUtils;
 import android.util.Log;
-import com.orm.annotation.OneToMany;
 import com.orm.annotation.Table;
 import com.orm.annotation.Unique;
 import com.orm.helper.ManifestHelper;
 import com.orm.helper.NamingHelper;
+import com.orm.inflater.ObjectInflater;
 import com.orm.util.QueryBuilder;
 import com.orm.util.ReflectionUtil;
 import com.orm.util.SugarCursor;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
 import java.util.*;
 
 import static com.orm.SugarContext.getSugarContext;
@@ -192,7 +191,7 @@ public static <T> List<T> find(Class<T> type, String whereClause, String... wher
     public static <T> List<T> findWithQuery(Class<T> type, String query, String... arguments) {
         Cursor cursor = getSugarDataBase().rawQuery(query, arguments);
 
-        return  getEntitiesFromCursor(cursor, type);
+        return getEntitiesFromCursor(cursor, type);
     }
 
     public static void executeQuery(String query, String... arguments) {
@@ -210,7 +209,7 @@ public static <T> List<T> find(Class<T> type, String whereClause, String[] where
         return getEntitiesFromCursor(cursor, type);
     }
 
-    private static <T> List<T> findOneToMany(Class<T> type, String relationFieldName, Object relationObject, Long relationObjectId) {
+    public static <T> List<T> findOneToMany(Class<T> type, String relationFieldName, Object relationObject, Long relationObjectId) {
         String args[] = { String.valueOf(relationObjectId) };
         String whereClause = NamingHelper.toSQLNameDefault(relationFieldName) + " = ?";
 
@@ -230,7 +229,13 @@ public static <T> List<T> getEntitiesFromCursor(Cursor cursor, Class<T> type, St
         try {
             while (cursor.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
-                inflate(cursor, entity, getSugarContext().getEntitiesMap(), relationFieldName, relationObject);
+                new ObjectInflater()
+                        .withCursor(cursor)
+                        .withObject(entity)
+                        .withEntitiesMap(getSugarContext().getEntitiesMap())
+                        .withRelationFieldName(relationFieldName)
+                        .withRelationObject(relationObject)
+                        .inflate();
                 result.add(entity);
             }
         } catch (Exception e) {
@@ -398,48 +403,6 @@ public static boolean isSugarEntity(Class<?> objectClass) {
         return objectClass.isAnnotationPresent(Table.class) || SugarRecord.class.isAssignableFrom(objectClass);
     }
 
-    private static void inflate(Cursor cursor, Object object, Map<Object, Long> entitiesMap) {
-        inflate(cursor, object, entitiesMap, null, null);
-    }
-
-    private static void inflate(Cursor cursor, Object object, Map<Object, Long> entitiesMap, String oneToManyFieldName, Object oneToManyObject) {
-        List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
-        Long objectId = cursor.getLong(cursor.getColumnIndex(("ID")));
-        if (!entitiesMap.containsKey(object)) {
-            entitiesMap.put(object, objectId);
-        }
-
-        for (Field field : columns) {
-        	field.setAccessible(true);
-            Class<?> fieldType = field.getType();
-            if (isSugarEntity(fieldType)) {
-                try {
-                    if (field.getName().equals(oneToManyFieldName)) {
-                        field.set(object, oneToManyObject);
-                    } else {
-                        long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toColumnName(field)));
-                        field.set(object, (id > 0) ? findById(fieldType, id) : null);
-                    }
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            } else if (fieldType.equals(List.class)) {
-                if (field.isAnnotationPresent(OneToMany.class)) {
-                    try {
-                        ParameterizedType genericListType = (ParameterizedType) field.getGenericType();
-                        Class<?> genericListClass = (Class<?>) genericListType.getActualTypeArguments()[0];
-                        String targetName = field.getAnnotation(OneToMany.class).targetField();
-                        field.set(object, findOneToMany(genericListClass, targetName, object, objectId));
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-                }
-            } else {
-                ReflectionUtil.setFieldValueFromCursor(cursor, field, object);
-            }
-        }
-    }
-
     public boolean delete() {
         Long id = getId();
         Class<?> type = getClass();
@@ -506,7 +469,11 @@ public long update() {
 
     @SuppressWarnings("unchecked")
     void inflate(Cursor cursor) {
-        inflate(cursor, this, getSugarContext().getEntitiesMap());
+        new ObjectInflater()
+                .withCursor(cursor)
+                .withObject(this)
+                .withEntitiesMap(getSugarContext().getEntitiesMap())
+                .inflate();
     }
 
     public Long getId() {
@@ -544,7 +511,11 @@ public E next() {
 
             try {
                 entity = type.getDeclaredConstructor().newInstance();
-                inflate(cursor, entity, getSugarContext().getEntitiesMap());
+                new ObjectInflater()
+                        .withCursor(cursor)
+                        .withObject(entity)
+                        .withEntitiesMap(getSugarContext().getEntitiesMap())
+                        .inflate();
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {
diff --git a/library/src/main/java/com/orm/inflater/ObjectInflater.java b/library/src/main/java/com/orm/inflater/ObjectInflater.java
new file mode 100644
index 00000000..10ed4213
--- /dev/null
+++ b/library/src/main/java/com/orm/inflater/ObjectInflater.java
@@ -0,0 +1,75 @@
+package com.orm.inflater;
+
+import android.database.Cursor;
+import com.orm.SugarRecord;
+import com.orm.inflater.field.*;
+import com.orm.util.ReflectionUtil;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Łukasz Wesołowski on 03.08.2016.
+ */
+public class ObjectInflater {
+    private Cursor cursor;
+    private Object object;
+    private Object relationObject;
+    private String relationFieldName;
+    private Map<Object, Long> entitiesMap;
+
+    public ObjectInflater withCursor(Cursor cursor) {
+        this.cursor = cursor;
+        return this;
+    }
+
+    public ObjectInflater withObject(Object object) {
+        this.object = object;
+        return this;
+    }
+
+    public ObjectInflater withRelationObject(Object relationObject) {
+        this.relationObject = relationObject;
+        return this;
+    }
+
+    public ObjectInflater withRelationFieldName(String relationFieldName) {
+        this.relationFieldName = relationFieldName;
+        return this;
+    }
+
+    public ObjectInflater withEntitiesMap(Map<Object, Long> entitiesMap) {
+        this.entitiesMap = entitiesMap;
+        return this;
+    }
+
+    public void inflate() {
+        List<Field> columns = ReflectionUtil.getTableFields(object.getClass());
+        Long objectId = cursor.getLong(cursor.getColumnIndex(("ID")));
+        if (!entitiesMap.containsKey(object)) {
+            entitiesMap.put(object, objectId);
+        }
+
+        FieldInflater fieldInflater;
+
+        for (Field field : columns) {
+            field.setAccessible(true);
+            Class<?> fieldType = field.getType();
+
+            if (SugarRecord.isSugarEntity(fieldType)) {
+                if (field.getName().equals(relationFieldName)) {
+                    fieldInflater = new RelationEntityFieldInflater(field, cursor, object, fieldType, relationObject);
+                } else {
+                    fieldInflater = new EntityFieldInflater(field, cursor, object, fieldType);
+                }
+            } else if (fieldType.equals(List.class)) {
+                fieldInflater = new ListFieldInflater(field, cursor, object, fieldType);
+            } else {
+                fieldInflater = new DefaultFieldInflater(field, cursor, object, fieldType);
+            }
+
+            fieldInflater.inflate();
+        }
+    }
+}
diff --git a/library/src/main/java/com/orm/inflater/field/DefaultFieldInflater.java b/library/src/main/java/com/orm/inflater/field/DefaultFieldInflater.java
new file mode 100644
index 00000000..d1cd8542
--- /dev/null
+++ b/library/src/main/java/com/orm/inflater/field/DefaultFieldInflater.java
@@ -0,0 +1,21 @@
+package com.orm.inflater.field;
+
+import android.database.Cursor;
+import com.orm.util.ReflectionUtil;
+
+import java.lang.reflect.Field;
+
+/**
+ * Created by Łukasz Wesołowski on 03.08.2016.
+ */
+public class DefaultFieldInflater extends FieldInflater {
+
+    public DefaultFieldInflater(Field field, Cursor cursor, Object object, Class<?> fieldType) {
+        super(field, cursor, object, fieldType);
+    }
+
+    @Override
+    public void inflate() {
+        ReflectionUtil.setFieldValueFromCursor(cursor, field, object);
+    }
+}
diff --git a/library/src/main/java/com/orm/inflater/field/EntityFieldInflater.java b/library/src/main/java/com/orm/inflater/field/EntityFieldInflater.java
new file mode 100644
index 00000000..e56fc742
--- /dev/null
+++ b/library/src/main/java/com/orm/inflater/field/EntityFieldInflater.java
@@ -0,0 +1,27 @@
+package com.orm.inflater.field;
+
+import android.database.Cursor;
+import com.orm.SugarRecord;
+import com.orm.helper.NamingHelper;
+
+import java.lang.reflect.Field;
+
+/**
+ * Created by Łukasz Wesołowski on 03.08.2016.
+ */
+public class EntityFieldInflater extends FieldInflater {
+
+    public EntityFieldInflater(Field field, Cursor cursor, Object object, Class<?> fieldType) {
+        super(field, cursor, object, fieldType);
+    }
+
+    @Override
+    public void inflate() {
+        try {
+            long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toColumnName(field)));
+            field.set(object, (id > 0) ? SugarRecord.findById(fieldType, id) : null);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/library/src/main/java/com/orm/inflater/field/FieldInflater.java b/library/src/main/java/com/orm/inflater/field/FieldInflater.java
new file mode 100644
index 00000000..87795340
--- /dev/null
+++ b/library/src/main/java/com/orm/inflater/field/FieldInflater.java
@@ -0,0 +1,24 @@
+package com.orm.inflater.field;
+
+import android.database.Cursor;
+
+import java.lang.reflect.Field;
+
+/**
+ * Created by Łukasz Wesołowski on 03.08.2016.
+ */
+public abstract class FieldInflater {
+    protected Field field;
+    protected Cursor cursor;
+    protected Object object;
+    protected Class<?> fieldType;
+
+    public FieldInflater(Field field, Cursor cursor, Object object, Class<?> fieldType) {
+        this.field = field;
+        this.cursor = cursor;
+        this.object = object;
+        this.fieldType = fieldType;
+    }
+
+    public abstract void inflate();
+}
diff --git a/library/src/main/java/com/orm/inflater/field/ListFieldInflater.java b/library/src/main/java/com/orm/inflater/field/ListFieldInflater.java
new file mode 100644
index 00000000..8de64722
--- /dev/null
+++ b/library/src/main/java/com/orm/inflater/field/ListFieldInflater.java
@@ -0,0 +1,38 @@
+package com.orm.inflater.field;
+
+import android.database.Cursor;
+import android.util.Log;
+import com.orm.SugarRecord;
+import com.orm.annotation.OneToMany;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+
+/**
+ * Created by Łukasz Wesołowski on 03.08.2016.
+ */
+public class ListFieldInflater extends FieldInflater {
+    private static final String LOG_TAG = "ListFieldInflater";
+
+    public ListFieldInflater(Field field, Cursor cursor, Object object, Class<?> fieldType) {
+        super(field, cursor, object, fieldType);
+    }
+
+    @Override
+    public void inflate() {
+        if (field.isAnnotationPresent(OneToMany.class)) {
+            try {
+                Long objectId = cursor.getLong(cursor.getColumnIndex(("ID")));
+
+                ParameterizedType genericListType = (ParameterizedType) field.getGenericType();
+                Class<?> genericListClass = (Class<?>) genericListType.getActualTypeArguments()[0];
+                String targetName = field.getAnnotation(OneToMany.class).targetField();
+                field.set(object, SugarRecord.findOneToMany(genericListClass, targetName, object, objectId));
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        } else {
+            Log.w(LOG_TAG, String.format("List field %s has not OneToMany annotation", field));
+        }
+    }
+}
diff --git a/library/src/main/java/com/orm/inflater/field/RelationEntityFieldInflater.java b/library/src/main/java/com/orm/inflater/field/RelationEntityFieldInflater.java
new file mode 100644
index 00000000..72df20f7
--- /dev/null
+++ b/library/src/main/java/com/orm/inflater/field/RelationEntityFieldInflater.java
@@ -0,0 +1,29 @@
+package com.orm.inflater.field;
+
+import android.database.Cursor;
+import android.util.Log;
+
+import java.lang.reflect.Field;
+
+/**
+ * Created by Łukasz Wesołowski on 03.08.2016.
+ */
+public class RelationEntityFieldInflater extends EntityFieldInflater {
+    private static final String LOG_TAG = "RelEntityFieldInflater";
+
+    protected Object relationObject;
+
+    public RelationEntityFieldInflater(Field field, Cursor cursor, Object object, Class<?> fieldType, Object relationObject) {
+        super(field, cursor, object, fieldType);
+        this.relationObject = relationObject;
+    }
+
+    @Override
+    public void inflate() {
+        try {
+            field.set(object, relationObject);
+        } catch (IllegalAccessException e) {
+            Log.e(LOG_TAG, String.format("Error while inflating %s field", field), e);
+        }
+    }
+}

From 463bf3e9cb39b7e7b3c66d7683a03a14637a727f Mon Sep 17 00:00:00 2001
From: Vookash <vookash93@gmail.com>
Date: Thu, 18 Aug 2016 21:12:52 +0200
Subject: [PATCH 295/305] Refactored ObjectInflater name.

---
 library/src/main/java/com/orm/SugarRecord.java       |  8 ++++----
 .../{ObjectInflater.java => EntityInflater.java}     | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename library/src/main/java/com/orm/inflater/{ObjectInflater.java => EntityInflater.java} (85%)

diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index d72c2b7e..f4f4bd26 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -11,7 +11,7 @@
 import com.orm.annotation.Unique;
 import com.orm.helper.ManifestHelper;
 import com.orm.helper.NamingHelper;
-import com.orm.inflater.ObjectInflater;
+import com.orm.inflater.EntityInflater;
 import com.orm.util.QueryBuilder;
 import com.orm.util.ReflectionUtil;
 import com.orm.util.SugarCursor;
@@ -229,7 +229,7 @@ public static <T> List<T> getEntitiesFromCursor(Cursor cursor, Class<T> type, St
         try {
             while (cursor.moveToNext()) {
                 entity = type.getDeclaredConstructor().newInstance();
-                new ObjectInflater()
+                new EntityInflater()
                         .withCursor(cursor)
                         .withObject(entity)
                         .withEntitiesMap(getSugarContext().getEntitiesMap())
@@ -469,7 +469,7 @@ public long update() {
 
     @SuppressWarnings("unchecked")
     void inflate(Cursor cursor) {
-        new ObjectInflater()
+        new EntityInflater()
                 .withCursor(cursor)
                 .withObject(this)
                 .withEntitiesMap(getSugarContext().getEntitiesMap())
@@ -511,7 +511,7 @@ public E next() {
 
             try {
                 entity = type.getDeclaredConstructor().newInstance();
-                new ObjectInflater()
+                new EntityInflater()
                         .withCursor(cursor)
                         .withObject(entity)
                         .withEntitiesMap(getSugarContext().getEntitiesMap())
diff --git a/library/src/main/java/com/orm/inflater/ObjectInflater.java b/library/src/main/java/com/orm/inflater/EntityInflater.java
similarity index 85%
rename from library/src/main/java/com/orm/inflater/ObjectInflater.java
rename to library/src/main/java/com/orm/inflater/EntityInflater.java
index 10ed4213..5d71e5df 100644
--- a/library/src/main/java/com/orm/inflater/ObjectInflater.java
+++ b/library/src/main/java/com/orm/inflater/EntityInflater.java
@@ -12,34 +12,34 @@
 /**
  * Created by Łukasz Wesołowski on 03.08.2016.
  */
-public class ObjectInflater {
+public class EntityInflater {
     private Cursor cursor;
     private Object object;
     private Object relationObject;
     private String relationFieldName;
     private Map<Object, Long> entitiesMap;
 
-    public ObjectInflater withCursor(Cursor cursor) {
+    public EntityInflater withCursor(Cursor cursor) {
         this.cursor = cursor;
         return this;
     }
 
-    public ObjectInflater withObject(Object object) {
+    public EntityInflater withObject(Object object) {
         this.object = object;
         return this;
     }
 
-    public ObjectInflater withRelationObject(Object relationObject) {
+    public EntityInflater withRelationObject(Object relationObject) {
         this.relationObject = relationObject;
         return this;
     }
 
-    public ObjectInflater withRelationFieldName(String relationFieldName) {
+    public EntityInflater withRelationFieldName(String relationFieldName) {
         this.relationFieldName = relationFieldName;
         return this;
     }
 
-    public ObjectInflater withEntitiesMap(Map<Object, Long> entitiesMap) {
+    public EntityInflater withEntitiesMap(Map<Object, Long> entitiesMap) {
         this.entitiesMap = entitiesMap;
         return this;
     }

From 0f466d7785cb30029f40ddb91817b43626ce5c01 Mon Sep 17 00:00:00 2001
From: Vookash <vookash93@gmail.com>
Date: Thu, 18 Aug 2016 21:49:45 +0200
Subject: [PATCH 296/305] Improved tests.

---
 .../java/com/orm/model/ManyToOneModel.java    |  37 +----
 .../java/com/orm/model/OneToManyModel.java    |  37 +----
 .../java/com/orm/record/OneToManyTest.java    | 144 +++++++++++-------
 3 files changed, 93 insertions(+), 125 deletions(-)

diff --git a/library/src/test/java/com/orm/model/ManyToOneModel.java b/library/src/test/java/com/orm/model/ManyToOneModel.java
index 4e704142..c1dbf434 100644
--- a/library/src/test/java/com/orm/model/ManyToOneModel.java
+++ b/library/src/test/java/com/orm/model/ManyToOneModel.java
@@ -6,15 +6,14 @@
  * Created by Łukasz Wesołowski on 28.07.2016.
  */
 public class ManyToOneModel extends SugarRecord {
-    private String name;
     private OneToManyModel model;
 
-    public String getName() {
-        return name;
+    public ManyToOneModel() {
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public ManyToOneModel(Long id, OneToManyModel model) {
+        setId(id);
+        this.model = model;
     }
 
     public OneToManyModel getModel() {
@@ -24,32 +23,4 @@ public OneToManyModel getModel() {
     public void setModel(OneToManyModel model) {
         this.model = model;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ManyToOneModel that = (ManyToOneModel) o;
-
-        if (getId() != null ? !getId().equals(that.getId()) : that.getId() != null) return false;
-        return name != null ? name.equals(that.name) : that.name == null;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = getId() != null ? getId().hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "ManyToOneModel{" +
-                "id=" + getId() +
-                ", name='" + name + '\'' +
-                ", model=" + model +
-                '}';
-    }
 }
diff --git a/library/src/test/java/com/orm/model/OneToManyModel.java b/library/src/test/java/com/orm/model/OneToManyModel.java
index e23b2a1c..f4d24766 100644
--- a/library/src/test/java/com/orm/model/OneToManyModel.java
+++ b/library/src/test/java/com/orm/model/OneToManyModel.java
@@ -9,16 +9,15 @@
  * Created by Łukasz Wesołowski on 28.07.2016.
  */
 public class OneToManyModel extends SugarRecord {
-    private String name;
+    Long id;
     @OneToMany(targetField = "model")
     private List<ManyToOneModel> models;
 
-    public String getName() {
-        return name;
+    public OneToManyModel() {
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public OneToManyModel(Long id) {
+        setId(id);
     }
 
     public List<ManyToOneModel> getModels() {
@@ -28,32 +27,4 @@ public List<ManyToOneModel> getModels() {
     public void setModels(List<ManyToOneModel> models) {
         this.models = models;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        OneToManyModel that = (OneToManyModel) o;
-
-        if (getId() != null ? !getId().equals(that.getId()) : that.getId() != null) return false;
-        return name != null ? name.equals(that.name) : that.name == null;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = getId() != null ? getId().hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "OneToManyModel{" +
-                "id=" + getId() +
-                ", name='" + name + '\'' +
-                ", models=" + models +
-                '}';
-    }
 }
diff --git a/library/src/test/java/com/orm/record/OneToManyTest.java b/library/src/test/java/com/orm/record/OneToManyTest.java
index f9ddd9f4..f0ed48c4 100644
--- a/library/src/test/java/com/orm/record/OneToManyTest.java
+++ b/library/src/test/java/com/orm/record/OneToManyTest.java
@@ -10,6 +10,12 @@
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.Arrays;
+import java.util.List;
+
+import static com.orm.SugarRecord.save;
+import static com.orm.SugarRecord.findById;
+
 /**
  * Created by Łukasz Wesołowski on 28.07.2016.
  */
@@ -18,79 +24,99 @@
 @Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public class OneToManyTest {
     @Test
-    public void saveOneToManyRelationTest() {
-        OneToManyModel oneToManyModel = new OneToManyModel();
-        oneToManyModel.setId(1l);
-        oneToManyModel.setName("oneToMany");
-        oneToManyModel.save();
-
-        ManyToOneModel manyToOneModel1 = new ManyToOneModel();
-        manyToOneModel1.setId(1l);
-        manyToOneModel1.setName("manyToOne 1");
-        manyToOneModel1.setModel(oneToManyModel);
-        manyToOneModel1.save();
-
-        ManyToOneModel manyToOneModel2 = new ManyToOneModel();
-        manyToOneModel2.setId(2l);
-        manyToOneModel2.setName("manyToOne 2");
-        manyToOneModel2.setModel(oneToManyModel);
-        manyToOneModel2.save();
-
-        ManyToOneModel manyToOneModel3 = new ManyToOneModel();
-        manyToOneModel3.setId(3l);
-        manyToOneModel3.setName("manyToOne 3");
-        manyToOneModel3.setModel(oneToManyModel);
-        manyToOneModel3.save();
-
-        OneToManyModel result = OneToManyModel.findById(OneToManyModel.class, 1l);
+    public void shouldSaveWithOneToManyRelation() {
+        List<Long> relationIds = Arrays.asList(1l, 2l, 3l, 4l);
 
-        Assert.assertEquals(3, result.getModels().size());
+        OneToManyModel model = new OneToManyModel(1l);
+        save(model);
+
+        for (long i : relationIds) {
+            save(new ManyToOneModel(i, model));
+        }
 
-        Assert.assertTrue(result.getModels().contains(manyToOneModel1));
-        Assert.assertTrue(result.getModels().contains(manyToOneModel2));
-        Assert.assertTrue(result.getModels().contains(manyToOneModel3));
+        OneToManyModel result = findById(OneToManyModel.class, 1l);
+
+        Assert.assertEquals(4, result.getModels().size());
+
+        Assert.assertTrue(relationIds.contains(result.getModels().get(0).getId()));
+        Assert.assertTrue(relationIds.contains(result.getModels().get(1).getId()));
+        Assert.assertTrue(relationIds.contains(result.getModels().get(2).getId()));
+        Assert.assertTrue(relationIds.contains(result.getModels().get(3).getId()));
 
         Assert.assertEquals(result, result.getModels().get(0).getModel());
         Assert.assertEquals(result, result.getModels().get(1).getModel());
         Assert.assertEquals(result, result.getModels().get(2).getModel());
+        Assert.assertEquals(result, result.getModels().get(3).getModel());
     }
 
     @Test
-    public void removeOneToManyRelationTest() {
-        OneToManyModel oneToManyModel = new OneToManyModel();
-        oneToManyModel.setId(1l);
-        oneToManyModel.setName("oneToMany");
-        oneToManyModel.save();
-
-        ManyToOneModel manyToOneModel1 = new ManyToOneModel();
-        manyToOneModel1.setId(1l);
-        manyToOneModel1.setName("manyToOne 1");
-        manyToOneModel1.setModel(oneToManyModel);
-        manyToOneModel1.save();
-
-        ManyToOneModel manyToOneModel2 = new ManyToOneModel();
-        manyToOneModel2.setId(2l);
-        manyToOneModel2.setName("manyToOne 2");
-        manyToOneModel2.setModel(oneToManyModel);
-        manyToOneModel2.save();
-
-        ManyToOneModel manyToOneModel3 = new ManyToOneModel();
-        manyToOneModel3.setId(3l);
-        manyToOneModel3.setName("manyToOne 3");
-        manyToOneModel3.setModel(oneToManyModel);
-        manyToOneModel3.save();
-
-        OneToManyModel result = OneToManyModel.findById(OneToManyModel.class, 1l);
+    public void shouldRemoveOneOfManyToOneRelation() {
+        OneToManyModel model = new OneToManyModel(1l);
+        save(model);
+
+        for (long i : Arrays.asList(1l, 2l, 3l, 4l)) {
+            save(new ManyToOneModel(i, model));
+        }
+
+        OneToManyModel result = findById(OneToManyModel.class, 1l);
+
+        Assert.assertEquals(4, result.getModels().size());
+
+        ManyToOneModel.deleteAll(ManyToOneModel.class, "id = ?", String.valueOf(3l));
+
+        result = findById(OneToManyModel.class, 1l);
 
         Assert.assertEquals(3, result.getModels().size());
 
-        ManyToOneModel.delete(manyToOneModel2);
+        Assert.assertTrue(result.getModels().get(0).getId() != 3l);
+        Assert.assertTrue(result.getModels().get(1).getId() != 3l);
+        Assert.assertTrue(result.getModels().get(2).getId() != 3l);
+    }
+
+    @Test
+    public void shouldNotRemoveRelation() {
+        OneToManyModel model = new OneToManyModel(1l);
+        save(model);
+
+        for (long i : Arrays.asList(1l, 2l, 3l, 4l)) {
+            save(new ManyToOneModel(i, model));
+        }
 
-        result = OneToManyModel.findById(OneToManyModel.class, 1l);
+        OneToManyModel result = findById(OneToManyModel.class, 1l);
 
-        Assert.assertEquals(2, result.getModels().size());
+        result.getModels().clear();
 
-        Assert.assertTrue(result.getModels().contains(manyToOneModel1));
-        Assert.assertTrue(result.getModels().contains(manyToOneModel3));
+        save(model);
+
+        result = findById(OneToManyModel.class, 1l);
+
+        Assert.assertEquals(4, result.getModels().size());
+    }
+
+    @Test
+    public void shouldNotAddRelation() {
+        List<Long> relationIds = Arrays.asList(1l, 2l, 3l, 4l);
+        OneToManyModel model = new OneToManyModel(1l);
+        save(model);
+
+        for (long i : relationIds) {
+            save(new ManyToOneModel(i, model));
+        }
+
+        save(new ManyToOneModel(5l, null));
+
+        OneToManyModel result = findById(OneToManyModel.class, 1l);
+
+        Assert.assertEquals(4, result.getModels().size());
+
+        Assert.assertTrue(relationIds.contains(result.getModels().get(0).getId()));
+        Assert.assertTrue(relationIds.contains(result.getModels().get(1).getId()));
+        Assert.assertTrue(relationIds.contains(result.getModels().get(2).getId()));
+        Assert.assertTrue(relationIds.contains(result.getModels().get(3).getId()));
+
+        Assert.assertEquals(result, result.getModels().get(0).getModel());
+        Assert.assertEquals(result, result.getModels().get(1).getModel());
+        Assert.assertEquals(result, result.getModels().get(2).getModel());
+        Assert.assertEquals(result, result.getModels().get(3).getModel());
     }
 }

From 1ca3ecce3dfccf09406c786e7dfa780d516e247c Mon Sep 17 00:00:00 2001
From: Vookash <vookash93@gmail.com>
Date: Thu, 18 Aug 2016 21:54:37 +0200
Subject: [PATCH 297/305] Improved tests.

---
 library/src/test/java/com/orm/record/OneToManyTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/test/java/com/orm/record/OneToManyTest.java b/library/src/test/java/com/orm/record/OneToManyTest.java
index f0ed48c4..73de0775 100644
--- a/library/src/test/java/com/orm/record/OneToManyTest.java
+++ b/library/src/test/java/com/orm/record/OneToManyTest.java
@@ -13,8 +13,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static com.orm.SugarRecord.save;
 import static com.orm.SugarRecord.findById;
+import static com.orm.SugarRecord.save;
 
 /**
  * Created by Łukasz Wesołowski on 28.07.2016.

From e93b2f1dfc90dcf44e624552270e8bfa78eae573 Mon Sep 17 00:00:00 2001
From: Vookash <vookash93@gmail.com>
Date: Mon, 22 Aug 2016 23:33:01 +0200
Subject: [PATCH 298/305] Fixed NamingHelperTest.

---
 .../java/com/orm/helper/NamingHelperTest.java   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/library/src/test/java/com/orm/helper/NamingHelperTest.java b/library/src/test/java/com/orm/helper/NamingHelperTest.java
index 0cc8a9d6..d53769ad 100644
--- a/library/src/test/java/com/orm/helper/NamingHelperTest.java
+++ b/library/src/test/java/com/orm/helper/NamingHelperTest.java
@@ -1,22 +1,23 @@
 package com.orm.helper;
 
+import com.orm.app.ClientApp;
+import com.orm.dsl.BuildConfig;
 import com.orm.model.TestRecord;
 import com.orm.util.ReflectionUtil;
-
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-
-import static com.orm.helper.NamingHelper.toColumnName;
-import static com.orm.helper.NamingHelper.toTableName;
-import static com.orm.helper.NamingHelper.toSQLNameDefault;
+import static com.orm.helper.NamingHelper.*;
+import static junit.framework.Assert.*;
 
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
 public final class NamingHelperTest {
 
     @Test(expected = IllegalAccessException.class)

From cbd08b4fca320aea255b8a40ed379ed23ce1bd3b Mon Sep 17 00:00:00 2001
From: Vookash <vookash93@gmail.com>
Date: Sat, 27 Aug 2016 22:17:01 +0200
Subject: [PATCH 299/305] Improved tests and logging.

---
 .../inflater/field/EntityFieldInflater.java   |  4 ++-
 .../orm/inflater/field/ListFieldInflater.java |  2 +-
 .../java/com/orm/SchemaGeneratorTest.java     |  2 +-
 .../model/{ => onetomany}/OneToManyModel.java |  9 +++--
 .../OneToManyRelationModel.java}              |  8 ++---
 .../WithoutOneToManyAnnotationModel.java      | 27 +++++++++++++++
 ...thoutOneToManyAnnotationRelationModel.java | 26 +++++++++++++++
 .../java/com/orm/record/OneToManyTest.java    | 33 ++++++++++++++-----
 .../java/com/orm/util/ReflectionUtilTest.java |  2 +-
 9 files changed, 92 insertions(+), 21 deletions(-)
 rename library/src/test/java/com/orm/model/{ => onetomany}/OneToManyModel.java (66%)
 rename library/src/test/java/com/orm/model/{ManyToOneModel.java => onetomany/OneToManyRelationModel.java} (63%)
 create mode 100644 library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationModel.java
 create mode 100644 library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationRelationModel.java

diff --git a/library/src/main/java/com/orm/inflater/field/EntityFieldInflater.java b/library/src/main/java/com/orm/inflater/field/EntityFieldInflater.java
index e56fc742..9eda8f8e 100644
--- a/library/src/main/java/com/orm/inflater/field/EntityFieldInflater.java
+++ b/library/src/main/java/com/orm/inflater/field/EntityFieldInflater.java
@@ -1,6 +1,7 @@
 package com.orm.inflater.field;
 
 import android.database.Cursor;
+import android.util.Log;
 import com.orm.SugarRecord;
 import com.orm.helper.NamingHelper;
 
@@ -10,6 +11,7 @@
  * Created by Łukasz Wesołowski on 03.08.2016.
  */
 public class EntityFieldInflater extends FieldInflater {
+    private static final String LOG_TAG = "EntityFieldInflater";
 
     public EntityFieldInflater(Field field, Cursor cursor, Object object, Class<?> fieldType) {
         super(field, cursor, object, fieldType);
@@ -21,7 +23,7 @@ public void inflate() {
             long id = cursor.getLong(cursor.getColumnIndex(NamingHelper.toColumnName(field)));
             field.set(object, (id > 0) ? SugarRecord.findById(fieldType, id) : null);
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            Log.e(LOG_TAG, String.format("Error while inflating entity field %s", field), e);
         }
     }
 }
diff --git a/library/src/main/java/com/orm/inflater/field/ListFieldInflater.java b/library/src/main/java/com/orm/inflater/field/ListFieldInflater.java
index 8de64722..5fa7496c 100644
--- a/library/src/main/java/com/orm/inflater/field/ListFieldInflater.java
+++ b/library/src/main/java/com/orm/inflater/field/ListFieldInflater.java
@@ -29,7 +29,7 @@ public void inflate() {
                 String targetName = field.getAnnotation(OneToMany.class).targetField();
                 field.set(object, SugarRecord.findOneToMany(genericListClass, targetName, object, objectId));
             } catch (IllegalAccessException e) {
-                e.printStackTrace();
+                Log.e(LOG_TAG, String.format("Error while inflating list field %s", field), e);
             }
         } else {
             Log.w(LOG_TAG, String.format("List field %s has not OneToMany annotation", field));
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
index 3b39c38c..90f35c07 100644
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ b/library/src/test/java/com/orm/SchemaGeneratorTest.java
@@ -137,7 +137,7 @@ public void testAllTableCreation() {
         Cursor c = sqLiteDatabase.rawQuery(sql, null);
 
         if (c.moveToFirst()) {
-            Assert.assertEquals(45, c.getInt(0));
+            Assert.assertEquals(47, c.getInt(0));
         }
 
         if (!c.isClosed()) {
diff --git a/library/src/test/java/com/orm/model/OneToManyModel.java b/library/src/test/java/com/orm/model/onetomany/OneToManyModel.java
similarity index 66%
rename from library/src/test/java/com/orm/model/OneToManyModel.java
rename to library/src/test/java/com/orm/model/onetomany/OneToManyModel.java
index f4d24766..bb7bd96a 100644
--- a/library/src/test/java/com/orm/model/OneToManyModel.java
+++ b/library/src/test/java/com/orm/model/onetomany/OneToManyModel.java
@@ -1,4 +1,4 @@
-package com.orm.model;
+package com.orm.model.onetomany;
 
 import com.orm.SugarRecord;
 import com.orm.annotation.OneToMany;
@@ -9,9 +9,8 @@
  * Created by Łukasz Wesołowski on 28.07.2016.
  */
 public class OneToManyModel extends SugarRecord {
-    Long id;
     @OneToMany(targetField = "model")
-    private List<ManyToOneModel> models;
+    private List<OneToManyRelationModel> models;
 
     public OneToManyModel() {
     }
@@ -20,11 +19,11 @@ public OneToManyModel(Long id) {
         setId(id);
     }
 
-    public List<ManyToOneModel> getModels() {
+    public List<OneToManyRelationModel> getModels() {
         return models;
     }
 
-    public void setModels(List<ManyToOneModel> models) {
+    public void setModels(List<OneToManyRelationModel> models) {
         this.models = models;
     }
 }
diff --git a/library/src/test/java/com/orm/model/ManyToOneModel.java b/library/src/test/java/com/orm/model/onetomany/OneToManyRelationModel.java
similarity index 63%
rename from library/src/test/java/com/orm/model/ManyToOneModel.java
rename to library/src/test/java/com/orm/model/onetomany/OneToManyRelationModel.java
index c1dbf434..4c17ec56 100644
--- a/library/src/test/java/com/orm/model/ManyToOneModel.java
+++ b/library/src/test/java/com/orm/model/onetomany/OneToManyRelationModel.java
@@ -1,17 +1,17 @@
-package com.orm.model;
+package com.orm.model.onetomany;
 
 import com.orm.SugarRecord;
 
 /**
  * Created by Łukasz Wesołowski on 28.07.2016.
  */
-public class ManyToOneModel extends SugarRecord {
+public class OneToManyRelationModel extends SugarRecord {
     private OneToManyModel model;
 
-    public ManyToOneModel() {
+    public OneToManyRelationModel() {
     }
 
-    public ManyToOneModel(Long id, OneToManyModel model) {
+    public OneToManyRelationModel(Long id, OneToManyModel model) {
         setId(id);
         this.model = model;
     }
diff --git a/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationModel.java b/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationModel.java
new file mode 100644
index 00000000..d48e38f0
--- /dev/null
+++ b/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationModel.java
@@ -0,0 +1,27 @@
+package com.orm.model.onetomany;
+
+import com.orm.SugarRecord;
+
+import java.util.List;
+
+/**
+ * Created by Łukasz Wesołowski on 27.08.2016.
+ */
+public class WithoutOneToManyAnnotationModel extends SugarRecord {
+    private List<OneToManyRelationModel> models;
+
+    public WithoutOneToManyAnnotationModel() {
+    }
+
+    public WithoutOneToManyAnnotationModel(Long id) {
+        setId(id);
+    }
+
+    public List<OneToManyRelationModel> getModels() {
+        return models;
+    }
+
+    public void setModels(List<OneToManyRelationModel> models) {
+        this.models = models;
+    }
+}
diff --git a/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationRelationModel.java b/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationRelationModel.java
new file mode 100644
index 00000000..34e1eb2a
--- /dev/null
+++ b/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationRelationModel.java
@@ -0,0 +1,26 @@
+package com.orm.model.onetomany;
+
+import com.orm.SugarRecord;
+
+/**
+ * Created by Łukasz Wesołowski on 27.08.2016.
+ */
+public class WithoutOneToManyAnnotationRelationModel extends SugarRecord {
+    private WithoutOneToManyAnnotationModel model;
+
+    public WithoutOneToManyAnnotationRelationModel() {
+    }
+
+    public WithoutOneToManyAnnotationRelationModel(Long id, WithoutOneToManyAnnotationModel model) {
+        setId(id);
+        this.model = model;
+    }
+
+    public WithoutOneToManyAnnotationModel getModel() {
+        return model;
+    }
+
+    public void setModel(WithoutOneToManyAnnotationModel model) {
+        this.model = model;
+    }
+}
diff --git a/library/src/test/java/com/orm/record/OneToManyTest.java b/library/src/test/java/com/orm/record/OneToManyTest.java
index 73de0775..73a60b57 100644
--- a/library/src/test/java/com/orm/record/OneToManyTest.java
+++ b/library/src/test/java/com/orm/record/OneToManyTest.java
@@ -2,8 +2,10 @@
 
 import com.orm.app.ClientApp;
 import com.orm.dsl.BuildConfig;
-import com.orm.model.ManyToOneModel;
-import com.orm.model.OneToManyModel;
+import com.orm.model.onetomany.OneToManyRelationModel;
+import com.orm.model.onetomany.OneToManyModel;
+import com.orm.model.onetomany.WithoutOneToManyAnnotationModel;
+import com.orm.model.onetomany.WithoutOneToManyAnnotationRelationModel;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,7 +33,7 @@ public void shouldSaveWithOneToManyRelation() {
         save(model);
 
         for (long i : relationIds) {
-            save(new ManyToOneModel(i, model));
+            save(new OneToManyRelationModel(i, model));
         }
 
         OneToManyModel result = findById(OneToManyModel.class, 1l);
@@ -55,14 +57,14 @@ public void shouldRemoveOneOfManyToOneRelation() {
         save(model);
 
         for (long i : Arrays.asList(1l, 2l, 3l, 4l)) {
-            save(new ManyToOneModel(i, model));
+            save(new OneToManyRelationModel(i, model));
         }
 
         OneToManyModel result = findById(OneToManyModel.class, 1l);
 
         Assert.assertEquals(4, result.getModels().size());
 
-        ManyToOneModel.deleteAll(ManyToOneModel.class, "id = ?", String.valueOf(3l));
+        OneToManyRelationModel.deleteAll(OneToManyRelationModel.class, "id = ?", String.valueOf(3l));
 
         result = findById(OneToManyModel.class, 1l);
 
@@ -79,7 +81,7 @@ public void shouldNotRemoveRelation() {
         save(model);
 
         for (long i : Arrays.asList(1l, 2l, 3l, 4l)) {
-            save(new ManyToOneModel(i, model));
+            save(new OneToManyRelationModel(i, model));
         }
 
         OneToManyModel result = findById(OneToManyModel.class, 1l);
@@ -100,10 +102,10 @@ public void shouldNotAddRelation() {
         save(model);
 
         for (long i : relationIds) {
-            save(new ManyToOneModel(i, model));
+            save(new OneToManyRelationModel(i, model));
         }
 
-        save(new ManyToOneModel(5l, null));
+        save(new OneToManyRelationModel(5l, null));
 
         OneToManyModel result = findById(OneToManyModel.class, 1l);
 
@@ -119,4 +121,19 @@ public void shouldNotAddRelation() {
         Assert.assertEquals(result, result.getModels().get(2).getModel());
         Assert.assertEquals(result, result.getModels().get(3).getModel());
     }
+
+    @Test
+    public void shouldNotInflateList() {
+        List<Long> relationIds = Arrays.asList(1l, 2l, 3l, 4l);
+        WithoutOneToManyAnnotationModel model = new WithoutOneToManyAnnotationModel(1l);
+        save(model);
+
+        for (long i : relationIds) {
+            save(new WithoutOneToManyAnnotationRelationModel(i, model));
+        }
+
+        WithoutOneToManyAnnotationModel result = findById(WithoutOneToManyAnnotationModel.class, 1l);
+
+        Assert.assertEquals(null, result.getModels());
+    }
 }
diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
index 09fd4755..318aa40d 100644
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
@@ -72,7 +72,7 @@ public void testSetFieldValueForId() {
     @Test
     public void testGetAllClasses() {
         List<Class> classes = ReflectionUtil.getDomainClasses();
-        Assert.assertEquals(43, classes.size());
+        Assert.assertEquals(45, classes.size());
     }
 
     @Test(expected = NoSuchFieldException.class)

From b800c4a23f8fa84a90487987eb42be0c6d4665f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Rossin=C3=A8s?= <pierre.rossines@ecoco2.com>
Date: Thu, 6 Oct 2016 15:11:14 +0200
Subject: [PATCH 300/305] * The @MultiUnique annotation is now inherited, so
 that we can use it on parent SugarRecord classes that are subclassed

---
 library/src/main/java/com/orm/annotation/MultiUnique.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/src/main/java/com/orm/annotation/MultiUnique.java b/library/src/main/java/com/orm/annotation/MultiUnique.java
index 4c312f15..fbdaa0df 100644
--- a/library/src/main/java/com/orm/annotation/MultiUnique.java
+++ b/library/src/main/java/com/orm/annotation/MultiUnique.java
@@ -1,12 +1,15 @@
 package com.orm.annotation;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Inherited
 public @interface MultiUnique {
     String value();
 }
+

From 3c8a57b3c4a39aefec162b2c1afb4d8c12d801c2 Mon Sep 17 00:00:00 2001
From: ethantam <ethantam@4d.com.hk>
Date: Wed, 26 Oct 2016 18:41:06 +0800
Subject: [PATCH 301/305] 1st Commit

---
 library/build.gradle                          |   7 +-
 .../main/java/com/orm/SchemaGenerator.java    |   6 +-
 library/src/main/java/com/orm/SugarApp.java   |   3 +
 library/src/main/java/com/orm/SugarDb.java    |  35 +-
 .../src/main/java/com/orm/SugarRecord.java    |   8 +-
 .../java/com/orm/helper/ManifestHelper.java   |   8 +
 .../orm/helper/SugarTransactionHelper.java    |   2 +-
 .../com/orm/inflater/field/FieldInflater.java |   2 +-
 .../main/java/com/orm/util/SugarCursor.java   |   4 +-
 .../java/com/orm/util/SugarCursorFactory.java |  11 +-
 .../java/com/orm/SchemaGeneratorTest.java     | 179 ------
 .../src/test/java/com/orm/SugarAppTest.java   |  31 -
 .../java/com/orm/SugarDataSourceTest.java     | 543 ------------------
 .../com/orm/SugarDbConfigurationTest.java     |  64 ---
 .../src/test/java/com/orm/SugarDbTest.java    |  41 --
 .../src/test/java/com/orm/app/ClientApp.java  |  20 -
 .../com/orm/helper/ManifestHelperTest.java    |  60 --
 .../java/com/orm/helper/NamingHelperTest.java |  90 ---
 .../helper/SugarTransactionHelperTest.java    |  84 ---
 .../java/com/orm/model/AllAnotatedModel.java  |  25 -
 .../model/BigDecimalFieldAnnotatedModel.java  |  25 -
 .../model/BigDecimalFieldExtendedModel.java   |  19 -
 .../orm/model/BooleanFieldAnnotatedModel.java |  28 -
 .../orm/model/BooleanFieldExtendedModel.java  |  26 -
 .../orm/model/ByteArrayAnnotatedModel.java    |  23 -
 .../com/orm/model/ByteArrayExtendedModel.java |  17 -
 .../orm/model/DoubleFieldAnnotatedModel.java  |  28 -
 .../orm/model/DoubleFieldExtendedModel.java   |  26 -
 .../test/java/com/orm/model/EmptyModel.java   |  10 -
 .../orm/model/EnumFieldAnnotatedModel.java    |  52 --
 .../com/orm/model/EnumFieldExtendedModel.java |  46 --
 .../orm/model/FloatFieldAnnotatedModel.java   |  28 -
 .../orm/model/FloatFieldExtendedModel.java    |  26 -
 .../orm/model/IncompleteAnnotatedModel.java   |   9 -
 .../java/com/orm/model/IntUniqueModel.java    |  19 -
 .../orm/model/IntegerFieldAnnotatedModel.java |  28 -
 .../orm/model/IntegerFieldExtendedModel.java  |  26 -
 .../orm/model/LongFieldAnnotatedModel.java    |  28 -
 .../com/orm/model/LongFieldExtendedModel.java |  26 -
 .../com/orm/model/MultiColumnUniqueModel.java |  21 -
 .../com/orm/model/NestedAnnotatedModel.java   |  23 -
 .../com/orm/model/NestedExtendedModel.java    |  18 -
 .../com/orm/model/NestedMixedAAModel.java     |  18 -
 .../com/orm/model/NestedMixedABModel.java     |  18 -
 .../com/orm/model/NestedMixedBAModel.java     |  24 -
 .../com/orm/model/NestedMixedBBModel.java     |  24 -
 .../test/java/com/orm/model/NoSugarModel.java |   7 -
 .../orm/model/RelationshipAnnotatedModel.java |  23 -
 .../orm/model/RelationshipExtendedModel.java  |  18 -
 .../orm/model/RelationshipMixedAModel.java    |  18 -
 .../orm/model/RelationshipMixedBModel.java    |  24 -
 .../orm/model/ShortFieldAnnotatedModel.java   |  28 -
 .../orm/model/ShortFieldExtendedModel.java    |  26 -
 .../com/orm/model/SimpleAnnotatedModel.java   |  15 -
 .../com/orm/model/SimpleExtendedModel.java    |   8 -
 .../test/java/com/orm/model/SimpleModel.java  |  33 --
 .../orm/model/StringFieldAnnotatedModel.java  |  23 -
 .../model/StringFieldAnnotatedNoIdModel.java  |  22 -
 .../orm/model/StringFieldExtendedModel.java   |  21 -
 ...ringFieldExtendedModelAnnotatedColumn.java |  18 -
 .../test/java/com/orm/model/TestRecord.java   |  21 -
 .../orm/model/onetomany/OneToManyModel.java   |  29 -
 .../onetomany/OneToManyRelationModel.java     |  26 -
 .../WithoutOneToManyAnnotationModel.java      |  27 -
 ...thoutOneToManyAnnotationRelationModel.java |  26 -
 .../java/com/orm/query/QueryBuilderTests.java |  30 -
 .../test/java/com/orm/query/SelectTest.java   | 140 -----
 .../com/orm/record/BigDecimalFieldTests.java  |  59 --
 .../com/orm/record/BooleanFieldTests.java     |  83 ---
 .../com/orm/record/ByteArrayFieldTests.java   |  58 --
 .../test/java/com/orm/record/CursorTests.java |  78 ---
 .../java/com/orm/record/DoubleFieldTests.java |  83 ---
 .../java/com/orm/record/EnumFieldTests.java   |  86 ---
 .../com/orm/record/FirstAndLastTests.java     | 199 -------
 .../java/com/orm/record/FloatFieldTests.java  |  80 ---
 .../record/IncompleteAnnotatedModelTests.java |  32 --
 .../com/orm/record/IntegerFieldTests.java     | 107 ----
 .../com/orm/record/ListAllOrderByTests.java   |  62 --
 .../java/com/orm/record/LongFieldTests.java   |  80 ---
 .../com/orm/record/MultipleSaveTests.java     | 111 ----
 .../com/orm/record/NestedAnnotatedTests.java  | 142 -----
 .../com/orm/record/NestedExtendedTests.java   | 140 -----
 .../com/orm/record/NestedMixedAATests.java    | 141 -----
 .../com/orm/record/NestedMixedABTests.java    | 150 -----
 .../com/orm/record/NestedMixedBATests.java    | 151 -----
 .../com/orm/record/NestedMixedBBTests.java    | 150 -----
 .../com/orm/record/NoSugarModelTests.java     |  34 --
 .../java/com/orm/record/OneToManyTest.java    | 139 -----
 .../record/RelationshipAnnotatedTests.java    | 125 ----
 .../orm/record/RelationshipExtendedTests.java | 125 ----
 .../orm/record/RelationshipMixedATests.java   | 141 -----
 .../orm/record/RelationshipMixedBTests.java   | 120 ----
 .../java/com/orm/record/ShortFieldTests.java  |  80 ---
 .../orm/record/SimpleAnnotatedModelTests.java | 373 ------------
 .../orm/record/SimpleExtendedModelTests.java  | 382 ------------
 .../java/com/orm/record/StringFieldTests.java |  51 --
 .../java/com/orm/record/UpdateInTxTest.java   |  70 ---
 .../java/com/orm/util/ContextUtilTest.java    |  62 --
 .../java/com/orm/util/KeyWordUtilTest.java    |  36 --
 .../com/orm/util/MigrationFileParserTest.java |  44 --
 .../com/orm/util/NumberComparatorTest.java    |  48 --
 .../java/com/orm/util/ReflectionUtilTest.java |  91 ---
 .../java/com/orm/util/SugarConfigTest.java    |  33 --
 103 files changed, 51 insertions(+), 6337 deletions(-)
 delete mode 100644 library/src/test/java/com/orm/SchemaGeneratorTest.java
 delete mode 100644 library/src/test/java/com/orm/SugarAppTest.java
 delete mode 100644 library/src/test/java/com/orm/SugarDataSourceTest.java
 delete mode 100644 library/src/test/java/com/orm/SugarDbConfigurationTest.java
 delete mode 100644 library/src/test/java/com/orm/SugarDbTest.java
 delete mode 100644 library/src/test/java/com/orm/app/ClientApp.java
 delete mode 100644 library/src/test/java/com/orm/helper/ManifestHelperTest.java
 delete mode 100644 library/src/test/java/com/orm/helper/NamingHelperTest.java
 delete mode 100644 library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
 delete mode 100644 library/src/test/java/com/orm/model/AllAnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/BigDecimalFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/BigDecimalFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/BooleanFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/BooleanFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/ByteArrayAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/ByteArrayExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/DoubleFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/DoubleFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/EmptyModel.java
 delete mode 100644 library/src/test/java/com/orm/model/EnumFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/EnumFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/FloatFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/FloatFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/IncompleteAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/IntUniqueModel.java
 delete mode 100644 library/src/test/java/com/orm/model/IntegerFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/IntegerFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/LongFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/LongFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/MultiColumnUniqueModel.java
 delete mode 100644 library/src/test/java/com/orm/model/NestedAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/NestedExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/NestedMixedAAModel.java
 delete mode 100644 library/src/test/java/com/orm/model/NestedMixedABModel.java
 delete mode 100644 library/src/test/java/com/orm/model/NestedMixedBAModel.java
 delete mode 100644 library/src/test/java/com/orm/model/NestedMixedBBModel.java
 delete mode 100644 library/src/test/java/com/orm/model/NoSugarModel.java
 delete mode 100644 library/src/test/java/com/orm/model/RelationshipAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/RelationshipExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/RelationshipMixedAModel.java
 delete mode 100644 library/src/test/java/com/orm/model/RelationshipMixedBModel.java
 delete mode 100644 library/src/test/java/com/orm/model/ShortFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/ShortFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/SimpleAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/SimpleExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/SimpleModel.java
 delete mode 100644 library/src/test/java/com/orm/model/StringFieldAnnotatedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/StringFieldAnnotatedNoIdModel.java
 delete mode 100644 library/src/test/java/com/orm/model/StringFieldExtendedModel.java
 delete mode 100644 library/src/test/java/com/orm/model/StringFieldExtendedModelAnnotatedColumn.java
 delete mode 100644 library/src/test/java/com/orm/model/TestRecord.java
 delete mode 100644 library/src/test/java/com/orm/model/onetomany/OneToManyModel.java
 delete mode 100644 library/src/test/java/com/orm/model/onetomany/OneToManyRelationModel.java
 delete mode 100644 library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationModel.java
 delete mode 100644 library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationRelationModel.java
 delete mode 100644 library/src/test/java/com/orm/query/QueryBuilderTests.java
 delete mode 100644 library/src/test/java/com/orm/query/SelectTest.java
 delete mode 100644 library/src/test/java/com/orm/record/BigDecimalFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/BooleanFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/ByteArrayFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/CursorTests.java
 delete mode 100644 library/src/test/java/com/orm/record/DoubleFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/EnumFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/FirstAndLastTests.java
 delete mode 100644 library/src/test/java/com/orm/record/FloatFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
 delete mode 100644 library/src/test/java/com/orm/record/IntegerFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/ListAllOrderByTests.java
 delete mode 100644 library/src/test/java/com/orm/record/LongFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/MultipleSaveTests.java
 delete mode 100644 library/src/test/java/com/orm/record/NestedAnnotatedTests.java
 delete mode 100644 library/src/test/java/com/orm/record/NestedExtendedTests.java
 delete mode 100644 library/src/test/java/com/orm/record/NestedMixedAATests.java
 delete mode 100644 library/src/test/java/com/orm/record/NestedMixedABTests.java
 delete mode 100644 library/src/test/java/com/orm/record/NestedMixedBATests.java
 delete mode 100644 library/src/test/java/com/orm/record/NestedMixedBBTests.java
 delete mode 100644 library/src/test/java/com/orm/record/NoSugarModelTests.java
 delete mode 100644 library/src/test/java/com/orm/record/OneToManyTest.java
 delete mode 100644 library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
 delete mode 100644 library/src/test/java/com/orm/record/RelationshipExtendedTests.java
 delete mode 100644 library/src/test/java/com/orm/record/RelationshipMixedATests.java
 delete mode 100644 library/src/test/java/com/orm/record/RelationshipMixedBTests.java
 delete mode 100644 library/src/test/java/com/orm/record/ShortFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
 delete mode 100644 library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
 delete mode 100644 library/src/test/java/com/orm/record/StringFieldTests.java
 delete mode 100644 library/src/test/java/com/orm/record/UpdateInTxTest.java
 delete mode 100644 library/src/test/java/com/orm/util/ContextUtilTest.java
 delete mode 100644 library/src/test/java/com/orm/util/KeyWordUtilTest.java
 delete mode 100644 library/src/test/java/com/orm/util/MigrationFileParserTest.java
 delete mode 100644 library/src/test/java/com/orm/util/NumberComparatorTest.java
 delete mode 100644 library/src/test/java/com/orm/util/ReflectionUtilTest.java
 delete mode 100644 library/src/test/java/com/orm/util/SugarConfigTest.java

diff --git a/library/build.gradle b/library/build.gradle
index 907162ee..1d5acf78 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'com.android.library'
-apply from: '../maven_push.gradle'
+//apply from: '../maven_push.gradle'
 
 android {
     compileSdkVersion 23
@@ -25,10 +25,13 @@ android {
 dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'org.robolectric:robolectric:3.0'
+    compile 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
 }
 
+
+
 task libraryJar(type: Jar) {
-    dependsOn assembleRelease
+    dependsOn "assembleRelease"
     from android.sourceSets.main.java.srcDirs,
          ['build/intermediates/classes/release/'] // Add the release classes into the jar
     baseName 'sugar'
diff --git a/library/src/main/java/com/orm/SchemaGenerator.java b/library/src/main/java/com/orm/SchemaGenerator.java
index c25407fc..d355c76c 100644
--- a/library/src/main/java/com/orm/SchemaGenerator.java
+++ b/library/src/main/java/com/orm/SchemaGenerator.java
@@ -1,8 +1,8 @@
 package com.orm;
 
-import android.database.Cursor;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteDatabase;
+import net.sqlcipher.Cursor;
+import net.sqlcipher.SQLException;
+import net.sqlcipher.database.SQLiteDatabase;
 import android.util.Log;
 
 import com.orm.annotation.Column;
diff --git a/library/src/main/java/com/orm/SugarApp.java b/library/src/main/java/com/orm/SugarApp.java
index cab35ca7..7007cff9 100644
--- a/library/src/main/java/com/orm/SugarApp.java
+++ b/library/src/main/java/com/orm/SugarApp.java
@@ -2,11 +2,14 @@
 
 import android.app.Application;
 
+import net.sqlcipher.database.SQLiteDatabase;
+
 public class SugarApp extends Application {
 
     @Override
     public void onCreate() {
         super.onCreate();
+        SQLiteDatabase.loadLibs(this);
         SugarContext.init(this);
     }
 
diff --git a/library/src/main/java/com/orm/SugarDb.java b/library/src/main/java/com/orm/SugarDb.java
index bc71ba23..f6283612 100644
--- a/library/src/main/java/com/orm/SugarDb.java
+++ b/library/src/main/java/com/orm/SugarDb.java
@@ -1,7 +1,7 @@
 package com.orm;
 
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteOpenHelper;
 import android.util.Log;
 
 import com.orm.dsl.BuildConfig;
@@ -35,18 +35,18 @@ public void onCreate(SQLiteDatabase sqLiteDatabase) {
         schemaGenerator.createDatabase(sqLiteDatabase);
     }
 
-    @Override
-    public void onConfigure(SQLiteDatabase db) {
-        final SugarDbConfiguration configuration = getDbConfiguration();
-
-        if (null != configuration) {
-            db.setLocale(configuration.getDatabaseLocale());
-            db.setMaximumSize(configuration.getMaxSize());
-            db.setPageSize(configuration.getPageSize());
-        }
-
-        super.onConfigure(db);
-    }
+//    @Override
+//    public void onConfigure(SQLiteDatabase db) {
+//        final SugarDbConfiguration configuration = getDbConfiguration();
+//
+//        if (null != configuration) {
+//            db.setLocale(configuration.getDatabaseLocale());
+//            db.setMaximumSize(configuration.getMaxSize());
+//            db.setPageSize(configuration.getPageSize());
+//        }
+//
+//        super.onConfigure(db);
+//    }
 
     @Override
     public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVersion) {
@@ -55,19 +55,20 @@ public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
 
     public synchronized SQLiteDatabase getDB() {
         if (this.sqLiteDatabase == null) {
-            this.sqLiteDatabase = getWritableDatabase();
+            this.sqLiteDatabase = getWritableDatabase(ManifestHelper.getEncryptionKey());
         }
+        openedConnections++;
 
         return this.sqLiteDatabase;
     }
 
     @Override
-    public synchronized SQLiteDatabase getReadableDatabase() {
+    public synchronized SQLiteDatabase getReadableDatabase(String password) {
         if(ManifestHelper.isDebugEnabled()) {
             Log.d(LOG_TAG, "getReadableDatabase");
         }
         openedConnections++;
-        return super.getReadableDatabase();
+        return super.getReadableDatabase(password);
     }
 
     @Override
diff --git a/library/src/main/java/com/orm/SugarRecord.java b/library/src/main/java/com/orm/SugarRecord.java
index 2ade2ba3..d775c772 100644
--- a/library/src/main/java/com/orm/SugarRecord.java
+++ b/library/src/main/java/com/orm/SugarRecord.java
@@ -1,10 +1,10 @@
 package com.orm;
 
 import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteStatement;
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteException;
+import net.sqlcipher.database.SQLiteStatement;
 import android.text.TextUtils;
 import android.util.Log;
 import com.orm.annotation.Table;
diff --git a/library/src/main/java/com/orm/helper/ManifestHelper.java b/library/src/main/java/com/orm/helper/ManifestHelper.java
index cab85fd2..9fcc7a2f 100644
--- a/library/src/main/java/com/orm/helper/ManifestHelper.java
+++ b/library/src/main/java/com/orm/helper/ManifestHelper.java
@@ -24,6 +24,8 @@ public final class ManifestHelper {
     public final static String METADATA_VERSION = "VERSION";
     public final static String METADATA_DOMAIN_PACKAGE_NAME = "DOMAIN_PACKAGE_NAME";
     public final static String METADATA_QUERY_LOG = "QUERY_LOG";
+    public final static String METADATA_DB_PASSWORD = "DB_PASSWORD";
+
 
     /**
      * The default name for the database unless specified in the AndroidManifest.
@@ -39,6 +41,12 @@ private ManifestHelper() { }
      * @return the database version as specified by the {@link #METADATA_VERSION} version or 1 of
      *         not present
      */
+
+    public static String getEncryptionKey() {
+        String encryptionKey = getMetaDataString(METADATA_DB_PASSWORD);
+        return encryptionKey;
+    }
+
     public static int getDatabaseVersion() {
         Integer databaseVersion = getMetaDataInteger(METADATA_VERSION);
 
diff --git a/library/src/main/java/com/orm/helper/SugarTransactionHelper.java b/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
index dbb9ca26..b28503fc 100644
--- a/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
+++ b/library/src/main/java/com/orm/helper/SugarTransactionHelper.java
@@ -1,6 +1,6 @@
 package com.orm.helper;
 
-import android.database.sqlite.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabase;
 import android.util.Log;
 
 import static com.orm.SugarContext.getSugarContext;
diff --git a/library/src/main/java/com/orm/inflater/field/FieldInflater.java b/library/src/main/java/com/orm/inflater/field/FieldInflater.java
index 87795340..bff2fba5 100644
--- a/library/src/main/java/com/orm/inflater/field/FieldInflater.java
+++ b/library/src/main/java/com/orm/inflater/field/FieldInflater.java
@@ -20,5 +20,5 @@ public FieldInflater(Field field, Cursor cursor, Object object, Class<?> fieldTy
         this.fieldType = fieldType;
     }
 
-    public abstract void inflate();
+    public abstract void  inflate();
 }
diff --git a/library/src/main/java/com/orm/util/SugarCursor.java b/library/src/main/java/com/orm/util/SugarCursor.java
index d058c5c1..1d05fcc7 100644
--- a/library/src/main/java/com/orm/util/SugarCursor.java
+++ b/library/src/main/java/com/orm/util/SugarCursor.java
@@ -1,7 +1,7 @@
 package com.orm.util;
 
-import android.database.Cursor;
-import android.database.CursorWrapper;
+import net.sqlcipher.Cursor;
+import net.sqlcipher.CursorWrapper;
 
 public class SugarCursor extends CursorWrapper {
 
diff --git a/library/src/main/java/com/orm/util/SugarCursorFactory.java b/library/src/main/java/com/orm/util/SugarCursorFactory.java
index 3274fccc..dd56fa90 100644
--- a/library/src/main/java/com/orm/util/SugarCursorFactory.java
+++ b/library/src/main/java/com/orm/util/SugarCursorFactory.java
@@ -1,10 +1,10 @@
 package com.orm.util;
 
-import android.database.Cursor;
-import android.database.sqlite.SQLiteCursor;
-import android.database.sqlite.SQLiteCursorDriver;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQuery;
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteCursor;
+import net.sqlcipher.database.SQLiteCursorDriver;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteQuery;
 import android.util.Log;
 
 public class SugarCursorFactory implements SQLiteDatabase.CursorFactory {
@@ -32,4 +32,5 @@ public Cursor newCursor(SQLiteDatabase sqLiteDatabase,
         return new SQLiteCursor(sqLiteDatabase, sqLiteCursorDriver, editTable, sqLiteQuery);
     }
 
+
 }
diff --git a/library/src/test/java/com/orm/SchemaGeneratorTest.java b/library/src/test/java/com/orm/SchemaGeneratorTest.java
deleted file mode 100644
index 90f35c07..00000000
--- a/library/src/test/java/com/orm/SchemaGeneratorTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.orm;
-
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.AllAnotatedModel;
-import com.orm.model.EmptyModel;
-import com.orm.model.IntUniqueModel;
-import com.orm.model.MultiColumnUniqueModel;
-import com.orm.model.StringFieldAnnotatedModel;
-import com.orm.model.StringFieldExtendedModel;
-import com.orm.model.StringFieldExtendedModelAnnotatedColumn;
-import com.orm.helper.NamingHelper;
-import com.orm.model.TestRecord;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class SchemaGeneratorTest {
-
-    @Test
-    public void testEmptyTableCreation() throws Exception {
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-        String createSQL = schemaGenerator.createTableSQL(EmptyModel.class);
-        assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(EmptyModel.class) +
-                    " ( ID INTEGER PRIMARY KEY AUTOINCREMENT  ) ",
-                createSQL);
-    }
-
-    @Test
-    public void testSimpleColumnTableCreation() throws Exception {
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-        String createSQL = schemaGenerator.createTableSQL(StringFieldExtendedModel.class);
-        assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(StringFieldExtendedModel.class) +
-                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
-                        "STRING TEXT ) ",
-                createSQL);
-
-        String createSQL2 = schemaGenerator.createTableSQL(StringFieldAnnotatedModel.class);
-
-        assertEquals("CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(StringFieldAnnotatedModel.class) +
-                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
-                        "STRING TEXT ) ",
-                createSQL2);
-
-        String createSQL3 = schemaGenerator.createTableSQL(StringFieldExtendedModelAnnotatedColumn.class);
-
-        assertEquals("CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(StringFieldExtendedModelAnnotatedColumn.class) +
-                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
-                        "anyName TEXT ) ",
-                createSQL3);
-    }
-
-    @Test
-    public void testUniqueTableCreation() {
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-        String createSQL = schemaGenerator.createTableSQL(IntUniqueModel.class);
-        assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(IntUniqueModel.class) +
-                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
-                        "VALUE INTEGER UNIQUE ) ",
-                createSQL);
-    }
-
-    @Test
-    public void testMultiColumnUniqueTableCreation() {
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-        String createSQL = schemaGenerator.createTableSQL(MultiColumnUniqueModel.class);
-        assertEquals(
-                "CREATE TABLE IF NOT EXISTS " + NamingHelper.toTableName(MultiColumnUniqueModel.class) +
-                        " ( ID INTEGER PRIMARY KEY AUTOINCREMENT , " +
-                        "A INTEGER, B INTEGER, " +
-                        "UNIQUE(A, B) ON CONFLICT REPLACE ) ",
-                createSQL);
-    }
-
-    @Test
-    public void testTableCreation() {
-        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-        schemaGenerator.createTable(TestRecord.class, sqLiteDatabase);
-        String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
-
-        String tableName = NamingHelper.toTableName(TestRecord.class);
-        Cursor c = sqLiteDatabase.rawQuery(String.format(sql, tableName), null);
-
-        if (c.moveToFirst()) {
-            Assert.assertEquals(1, c.getInt(0));
-        }
-
-        if (!c.isClosed()) {
-            c.close();
-        }
-    }
-
-    @Test
-    public void testAnnotatedModelTableCreation() {
-        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-        schemaGenerator.createTable(AllAnotatedModel.class, sqLiteDatabase);
-        String sql = "select count(*) from sqlite_master where type='table' and name='%s';";
-
-        String tableName = NamingHelper.toTableName(AllAnotatedModel.class);
-        Cursor c = sqLiteDatabase.rawQuery(String.format(sql, tableName), null);
-
-        if (c.moveToFirst()) {
-            Assert.assertEquals(1, c.getInt(0));
-        }
-
-        if (!c.isClosed()) {
-            c.close();
-        }
-    }
-
-    @Test
-    public void testAllTableCreation() {
-        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-
-        schemaGenerator.createDatabase(sqLiteDatabase);
-        String sql = "select count(*) from sqlite_master where type='table';";
-
-        Cursor c = sqLiteDatabase.rawQuery(sql, null);
-
-        if (c.moveToFirst()) {
-            Assert.assertEquals(47, c.getInt(0));
-        }
-
-        if (!c.isClosed()) {
-            c.close();
-        }
-    }
-
-    @Test
-    public void testDeleteAllTables() {
-        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-
-        schemaGenerator.createDatabase(sqLiteDatabase);
-        schemaGenerator.deleteTables(sqLiteDatabase);
-
-        String sql = "select count(*) from sqlite_master where type='table';";
-
-        Cursor c = sqLiteDatabase.rawQuery(sql, null);
-
-        if (c.moveToFirst()) {
-            //Two tables are by default created by SQLite
-            Assert.assertEquals(2, c.getInt(0));
-        }
-
-        if (!c.isClosed()) {
-            c.close();
-        }
-    }
-
-    @Test
-    public void testGetColumnNames() {
-        SQLiteDatabase sqLiteDatabase = SugarContext.getSugarContext().getSugarDb().getDB();
-        SchemaGenerator schemaGenerator = SchemaGenerator.getInstance();
-        schemaGenerator.createTable(TestRecord.class, sqLiteDatabase);
-
-        List<String> columnNames = schemaGenerator.getColumnNames(sqLiteDatabase, NamingHelper.toTableName(TestRecord.class));
-        Assert.assertEquals(2, columnNames.size());
-    }
-}
diff --git a/library/src/test/java/com/orm/SugarAppTest.java b/library/src/test/java/com/orm/SugarAppTest.java
deleted file mode 100644
index 0f247ae8..00000000
--- a/library/src/test/java/com/orm/SugarAppTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.orm;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-/**
- * @author jonatan.salas
- */
-public final class SugarAppTest {
-
-    @Test
-    public void testOnCreate() {
-        SugarApp app = new SugarApp();
-        app.onCreate();
-
-        SugarContext context = SugarContext.getSugarContext();
-        Assert.assertNotNull(context);
-    }
-
-
-    @Test(expected = NullPointerException.class)
-    public void testOnTerminate() {
-        SugarApp app = new SugarApp();
-        app.onCreate();
-        app.onTerminate();
-
-        SugarContext context = SugarContext.getSugarContext();
-        Assert.assertNull(context);
-    }
-}
diff --git a/library/src/test/java/com/orm/SugarDataSourceTest.java b/library/src/test/java/com/orm/SugarDataSourceTest.java
deleted file mode 100644
index 9f3d25ba..00000000
--- a/library/src/test/java/com/orm/SugarDataSourceTest.java
+++ /dev/null
@@ -1,543 +0,0 @@
-package com.orm;
-
-import android.database.Cursor;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.TestRecord;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.Assert.*;
-
-/**
- * @author jonatan.salas
- */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class SugarDataSourceTest {
-    private SugarDataSource<TestRecord> recordSugarDataSource;
-
-    @Before
-    public void setUp() {
-        recordSugarDataSource = SugarDataSource.getInstance(TestRecord.class);
-    }
-
-    @Test
-    public void testInsertAndDelete() {
-        final TestRecord record = new TestRecord();
-        record.setName("lalala");
-
-        recordSugarDataSource.insert(
-                record,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        assertNotNull(record.getId());
-
-        recordSugarDataSource.delete(
-                record,
-                new SugarDataSource.SuccessCallback<Boolean>() {
-                    @Override
-                    public void onSuccess(Boolean result) {
-                        assertNotNull(result);
-                        assertEquals(true, result.booleanValue());
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void testInsertAndFindById() {
-        final TestRecord record = new TestRecord();
-        record.setName("lalala");
-
-        recordSugarDataSource.insert(
-                record,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        recordSugarDataSource.findById(
-                record.getId(),
-                new SugarDataSource.SuccessCallback<TestRecord>() {
-                    @Override
-                    public void onSuccess(TestRecord result) {
-                        assertEquals(record.getId(), result.getId());
-                        assertEquals(record.getName(), result.getName());
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void testInsertUpdateAndFindById() {
-        final TestRecord record = new TestRecord();
-        record.setName("lalala");
-
-        recordSugarDataSource.insert(
-                record,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        record.setName("fulano");
-        recordSugarDataSource.update(
-                record,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        assertEquals(record.getId(), id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        recordSugarDataSource.findById(
-                record.getId(),
-                new SugarDataSource.SuccessCallback<TestRecord>() {
-                    @Override
-                    public void onSuccess(TestRecord result) {
-                        assertEquals(record.getId(), result.getId());
-                        assertEquals("fulano", result.getName());
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void testInsertAndListAll() {
-        final TestRecord record = new TestRecord();
-        record.setName("lalala");
-
-        recordSugarDataSource.insert(
-                record,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        final TestRecord record1 = new TestRecord();
-        record1.setName("fulano");
-
-        recordSugarDataSource.insert(
-                record1,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record1.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        final TestRecord record2 = new TestRecord();
-        record2.setName("mengano");
-
-        recordSugarDataSource.insert(
-                record2,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record2.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        recordSugarDataSource.listAll(
-                null,
-                new SugarDataSource.SuccessCallback<List<TestRecord>>() {
-                    @Override
-                    public void onSuccess(List<TestRecord> list) {
-                        assertEquals(3, list.size());
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        recordSugarDataSource.deleteAll(
-                new SugarDataSource.SuccessCallback<Integer>() {
-                    @Override
-                    public void onSuccess(Integer count) {
-                        assertEquals(3, count.intValue());
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void testInsertAndCount() {
-        final TestRecord record = new TestRecord();
-        record.setName("lalala");
-
-        recordSugarDataSource.insert(
-                record,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        final TestRecord record1 = new TestRecord();
-        record1.setName("fulano");
-
-        recordSugarDataSource.insert(
-                record1,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record1.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-
-        final TestRecord record2 = new TestRecord();
-        record2.setName("mengano");
-
-        recordSugarDataSource.insert(
-                record2,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record2.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        recordSugarDataSource.count(
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long count) {
-                        assertEquals(3, count.longValue());
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void testInsertAndGetCursor() {
-        final TestRecord record = new TestRecord();
-        record.setName("lalala");
-
-        recordSugarDataSource.insert(
-                record,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        final TestRecord record1 = new TestRecord();
-        record1.setName("fulano");
-
-        recordSugarDataSource.insert(
-                record1,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record1.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-
-        final TestRecord record2 = new TestRecord();
-        record2.setName("mengano");
-
-        recordSugarDataSource.insert(
-                record2,
-                new SugarDataSource.SuccessCallback<Long>() {
-                    @Override
-                    public void onSuccess(Long id) {
-                        record2.setId(id);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        recordSugarDataSource.listAll(
-                null,
-                new SugarDataSource.SuccessCallback<List<TestRecord>>() {
-                    @Override
-                    public void onSuccess(List<TestRecord> list) {
-                        assertEquals(3, list.size());
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        recordSugarDataSource.query(
-                null,
-                null,
-                null,
-                null,
-                null,
-                new SugarDataSource.SuccessCallback<Cursor>() {
-                    @Override
-                    public void onSuccess(Cursor cursor) {
-                        assertNotNull(cursor);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void bulkInsertAndListAllTest() {
-        final TestRecord record = new TestRecord();
-        record.setName("lalala");
-
-        final TestRecord record1 = new TestRecord();
-        record1.setName("fulano");
-
-        final TestRecord record2 = new TestRecord();
-        record2.setName("mengano");
-
-        final List<TestRecord> list = new ArrayList<>();
-        list.add(record);
-        list.add(record1);
-        list.add(record2);
-
-        recordSugarDataSource.bulkInsert(
-                list,
-                new SugarDataSource.SuccessCallback<List<Long>>() {
-                    @Override
-                    public void onSuccess(List<Long> ids) {
-                        for (int i = 0; i < list.size(); i++) {
-                            list.get(i).setId(ids.get(i));
-                        }
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-
-        recordSugarDataSource.listAll(
-                null,
-                new SugarDataSource.SuccessCallback<List<TestRecord>>() {
-                    @Override
-                    public void onSuccess(List<TestRecord> testRecords) {
-                        for (int i = 0; i < list.size(); i++) {
-                            TestRecord record1 = list.get(i);
-                            TestRecord record2 = testRecords.get(i);
-
-                            assertEquals(record1.getId(), record2.getId());
-                            assertEquals(record1.getName(), record2.getName());
-                        }
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void nullFindById() {
-        TestRecord record = new TestRecord();
-        record.setId(0L);
-
-        recordSugarDataSource.findById(
-                record.getId(),
-                new SugarDataSource.SuccessCallback<TestRecord>() {
-                    @Override
-                    public void onSuccess(TestRecord object) {
-                        assertNull(object);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        assertNotNull(e.getMessage());
-                    }
-                }
-        );
-    }
-
-    @Test
-    public void testNullListAll() {
-        recordSugarDataSource.listAll(
-                null,
-                new SugarDataSource.SuccessCallback<List<TestRecord>>() {
-                    @Override
-                    public void onSuccess(List<TestRecord> object) {
-                        assertNull(object);
-                    }
-                },
-                new SugarDataSource.ErrorCallback() {
-                    @Override
-                    public void onError(Exception e) {
-                        assertNotNull(e.getMessage());
-                    }
-                }
-        );
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    @SuppressWarnings("all")
-    public void testNullConstructor() {
-        SugarDataSource<TestRecord> dataSource = SugarDataSource.getInstance(null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    @SuppressWarnings("all")
-    public void testCheckNotNull() {
-        TestRecord record = null;
-        recordSugarDataSource.checkNotNull(record);
-    }
-}
diff --git a/library/src/test/java/com/orm/SugarDbConfigurationTest.java b/library/src/test/java/com/orm/SugarDbConfigurationTest.java
deleted file mode 100644
index 64d50df6..00000000
--- a/library/src/test/java/com/orm/SugarDbConfigurationTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.orm;
-
-import com.orm.dsl.BuildConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.Locale;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-/**
- * @author jonatan.salas
- */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 16, constants = BuildConfig.class)
-public final class SugarDbConfigurationTest {
-
-    @Test
-    public void testNotNullConfiguration() {
-        SugarDbConfiguration configuration = new SugarDbConfiguration()
-                .setDatabaseLocale(Locale.getDefault())
-                .setMaxSize(1024L)
-                .setPageSize(400L);
-
-        SugarContext.init(RuntimeEnvironment.application, configuration);
-
-        final SugarDbConfiguration config = SugarContext.getDbConfiguration();
-
-        assertEquals(configuration.getDatabaseLocale(), config.getDatabaseLocale());
-        assertEquals(configuration.getMaxSize(), config.getMaxSize());
-        assertEquals(configuration.getPageSize(), config.getPageSize());
-    }
-
-    @Test
-    public void testNullConfiguration() {
-        SugarContext.init(RuntimeEnvironment.application);
-        assertNull(SugarContext.getDbConfiguration());
-    }
-
-//    @Test
-//    public void testNotNullConfigurationWithSugarDb() {
-//        SugarDbConfiguration configuration = new SugarDbConfiguration()
-//                .setDatabaseLocale(Locale.getDefault())
-//                .setMaxSize(100000L)
-//                .setPageSize(100000L);
-//
-//        SugarContext.init(RuntimeEnvironment.application, configuration);
-//
-//        SQLiteDatabase database = SugarContext.getSugarContext().getSugarDb().getDB();
-//        SQLiteDatabase sqLiteDatabase = SugarDb.getInstance().getDB();
-//
-//        assertEquals(database.getMaximumSize(), sqLiteDatabase.getMaximumSize());
-//        assertEquals(database.getPageSize(), sqLiteDatabase.getPageSize());
-//
-//        if (sqLiteDatabase.isOpen()) {
-//            sqLiteDatabase.close();
-//        }
-//    }
-}
diff --git a/library/src/test/java/com/orm/SugarDbTest.java b/library/src/test/java/com/orm/SugarDbTest.java
deleted file mode 100644
index 7ff5914a..00000000
--- a/library/src/test/java/com/orm/SugarDbTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.orm;
-
-import android.database.sqlite.SQLiteDatabase;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author jonatan.salas
- */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class SugarDbTest {
-    private final SugarDb sugarDb = SugarDb.getInstance();
-
-    @Test
-    //TODO check this better!
-    public void testGetReadableDatabase() {
-        final SQLiteDatabase db = sugarDb.getReadableDatabase();
-        assertEquals(false, db.isReadOnly());
-    }
-
-    @Test
-    public void testGetWritableDatabase() {
-        final SQLiteDatabase db = sugarDb.getWritableDatabase();
-        assertEquals(false, db.isReadOnly());
-    }
-
-    @Test
-    public void testGetDB() {
-        final SQLiteDatabase db = sugarDb.getDB();
-        assertEquals(false, db.isReadOnly());
-    }
-}
diff --git a/library/src/test/java/com/orm/app/ClientApp.java b/library/src/test/java/com/orm/app/ClientApp.java
deleted file mode 100644
index e9943aea..00000000
--- a/library/src/test/java/com/orm/app/ClientApp.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.orm.app;
-
-import android.app.Application;
-
-import com.orm.SugarContext;
-
-public class ClientApp extends Application {
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        SugarContext.init(this);
-    }
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-        SugarContext.terminate();
-    }
-}
diff --git a/library/src/test/java/com/orm/helper/ManifestHelperTest.java b/library/src/test/java/com/orm/helper/ManifestHelperTest.java
deleted file mode 100644
index 2fad344c..00000000
--- a/library/src/test/java/com/orm/helper/ManifestHelperTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.orm.helper;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.util.KeyWordUtil;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import static com.orm.helper.ManifestHelper.getDatabaseName;
-import static com.orm.helper.ManifestHelper.getDatabaseVersion;
-import static com.orm.helper.ManifestHelper.getDomainPackageName;
-import static com.orm.helper.ManifestHelper.isDebugEnabled;
-import static com.orm.helper.ManifestHelper.DATABASE_DEFAULT_NAME;
-
-/**
- * @author jonatan.salas
- */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class ManifestHelperTest {
-
-    @Test(expected = IllegalAccessException.class)
-    public void testPrivateConstructor() throws Exception {
-        ManifestHelper helper = ManifestHelper.class.getDeclaredConstructor().newInstance();
-        assertNull(helper);
-    }
-
-
-    @Test
-    public void testGetDbName() {
-        assertEquals(DATABASE_DEFAULT_NAME, getDatabaseName());
-    }
-
-    @Test
-    public void testGetDatabaseName() {
-        assertEquals(DATABASE_DEFAULT_NAME, getDatabaseName());
-    }
-
-    @Test
-    public void testGetDatabaseVersion() {
-        assertEquals(1, getDatabaseVersion());
-    }
-
-    @Test
-    public void testGetDomainPackageName() {
-        assertNotNull(getDomainPackageName());
-    }
-
-    @Test
-    public void testGetDebugEnabled() {
-        assertEquals(false, isDebugEnabled());
-    }
-}
diff --git a/library/src/test/java/com/orm/helper/NamingHelperTest.java b/library/src/test/java/com/orm/helper/NamingHelperTest.java
deleted file mode 100644
index d53769ad..00000000
--- a/library/src/test/java/com/orm/helper/NamingHelperTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.orm.helper;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.TestRecord;
-import com.orm.util.ReflectionUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.orm.helper.NamingHelper.*;
-import static junit.framework.Assert.*;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class NamingHelperTest {
-
-    @Test(expected = IllegalAccessException.class)
-    public void testPrivateConstructor() throws Exception {
-        NamingHelper helper = NamingHelper.class.getDeclaredConstructor().newInstance();
-        assertNull(helper);
-    }
-
-    @Test
-    public void testToSQLNameFromField() {
-        List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
-
-        if (null != fieldList && !fieldList.isEmpty()) {
-            List<String> columnList = new ArrayList<>();
-
-            for(Field field: fieldList) {
-                columnList.add(toColumnName(field));
-            }
-
-            boolean isIdInList = inList(columnList, "ID");
-            boolean isNameInList = inList(columnList, "NAME");
-
-            assertTrue(isIdInList);
-            assertTrue(isNameInList);
-        }
-    }
-
-    private boolean inList(List<String> list, String searchValue) {
-        for (String val: list) {
-            if (val.equals(searchValue)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Test
-    public void testToSQLNameFromClass() {
-        assertEquals("TEST_RECORD", toTableName(TestRecord.class));
-    }
-
-    @Test
-    public void testToSQLNameCaseConversion() throws Exception {
-        assertToSqlNameEquals("TESTLOWERCASE", "testlowercase");
-        assertToSqlNameEquals("TESTUPPERCASE", "TESTUPPERCASE");
-    }
-
-    @Test
-    public void testToSQLNameUnderscore() {
-        assertToSqlNameEquals("TEST_UNDERSCORE", "testUnderscore");
-        assertToSqlNameEquals("AB_CD", "AbCd");
-        assertToSqlNameEquals("AB_CD", "ABCd");
-        assertToSqlNameEquals("AB_CD", "AbCD");
-        assertToSqlNameEquals("SOME_DETAILS_OBJECT", "SomeDetailsObject");
-        assertToSqlNameEquals("H_OL_A","hOlA");
-        assertToSqlNameEquals("A","a");
-    }
-
-    /**
-     * Helper method that asserts a CamelCaseString is converted to UPPER_CASE_UNDER_SCORE.
-     *
-     * @param expected  a CamelCaseString
-     * @param actual    the expected UPPER_CASE_UNDER_SCORE string
-     */
-    private static void assertToSqlNameEquals(String expected, String actual) {
-        assertEquals(expected, toSQLNameDefault(actual));
-    }
-
-}
diff --git a/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java b/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
deleted file mode 100644
index 1fe73708..00000000
--- a/library/src/test/java/com/orm/helper/SugarTransactionHelperTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.orm.helper;
-
-import com.orm.app.ClientApp;
-import com.orm.SugarContext;
-import com.orm.dsl.BuildConfig;
-import com.orm.helper.SugarTransactionHelper;
-import com.orm.model.TestRecord;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-
-/**
- * @author jonatan.salas
- */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class SugarTransactionHelperTest {
-    private List<TestRecord> recordList = new ArrayList<>();
-    private TestRecord record1 = new TestRecord();
-    private TestRecord record2 = new TestRecord();
-    private TestRecord record3 = new TestRecord();
-
-    @Before
-    public void setUp() {
-        SugarContext.init(RuntimeEnvironment.application);
-
-        record1.setId(1L);
-        record1.setName("lala");
-
-        record2.setId(2L);
-        record2.setName("fefe");
-
-        record3.setId(3L);
-        record3.setName("jaja");
-
-        recordList.add(record1);
-        recordList.add(record2);
-        recordList.add(record3);
-    }
-
-    @Test(expected = IllegalAccessException.class)
-    public void testPrivateConstructor() throws Exception {
-        SugarTransactionHelper helper = SugarTransactionHelper.class.getDeclaredConstructor().newInstance();
-        assertNull(helper);
-    }
-
-    @Test
-    public void testDoInTransaction() {
-        SugarTransactionHelper.doInTransaction(new SugarTransactionHelper.Callback() {
-            @Override
-            public void manipulateInTransaction() {
-                for (TestRecord record: recordList) {
-                    TestRecord.save(record);
-                }
-            }
-        });
-
-        final List<TestRecord> results = TestRecord.listAll(TestRecord.class);
-
-        assertEquals(true, inList(results, record1));
-        assertEquals(true, inList(results, record2));
-        assertEquals(true, inList(results, record3));
-    }
-
-    private boolean inList(List<TestRecord> list, TestRecord testRecord) {
-        for (TestRecord record: list) {
-            if (record.getId().equals(testRecord.getId()) &&
-                record.getName().equals(testRecord.getName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/AllAnotatedModel.java b/library/src/test/java/com/orm/model/AllAnotatedModel.java
deleted file mode 100644
index c2fb888d..00000000
--- a/library/src/test/java/com/orm/model/AllAnotatedModel.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Column;
-import com.orm.annotation.Ignore;
-import com.orm.annotation.NotNull;
-import com.orm.annotation.Table;
-import com.orm.annotation.Unique;
-
-/**
- * @author jonatan.salas
- */
-@Table
-public class AllAnotatedModel {
-
-    @NotNull @Unique
-    private Long id;
-
-    @Column(notNull = true, name = "name", unique = true)
-    private String name;
-
-    @Ignore
-    private String surname;
-
-    public AllAnotatedModel() { }
-}
diff --git a/library/src/test/java/com/orm/model/BigDecimalFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/BigDecimalFieldAnnotatedModel.java
deleted file mode 100644
index f5529512..00000000
--- a/library/src/test/java/com/orm/model/BigDecimalFieldAnnotatedModel.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-import java.math.BigDecimal;
-
-@Table
-public class BigDecimalFieldAnnotatedModel {
-    private BigDecimal decimal;
-    private Long id;
-
-    public BigDecimalFieldAnnotatedModel() {}
-
-    public BigDecimalFieldAnnotatedModel(BigDecimal decimal) {
-        this.decimal = decimal;
-    }
-
-    public BigDecimal getBigDecimal() {
-        return decimal;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/BigDecimalFieldExtendedModel.java b/library/src/test/java/com/orm/model/BigDecimalFieldExtendedModel.java
deleted file mode 100644
index cbcdc3c9..00000000
--- a/library/src/test/java/com/orm/model/BigDecimalFieldExtendedModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-import java.math.BigDecimal;
-
-public class BigDecimalFieldExtendedModel extends SugarRecord {
-    private BigDecimal decimal;
-
-    public BigDecimalFieldExtendedModel() {}
-
-    public BigDecimalFieldExtendedModel(BigDecimal decimal) {
-        this.decimal = decimal;
-    }
-
-    public BigDecimal getBigDecimal() {
-        return decimal;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/BooleanFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/BooleanFieldAnnotatedModel.java
deleted file mode 100644
index 31a8668b..00000000
--- a/library/src/test/java/com/orm/model/BooleanFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class BooleanFieldAnnotatedModel {
-    private Boolean objectBoolean;
-    private boolean rawBoolean;
-    private Long id;
-
-    public BooleanFieldAnnotatedModel() {}
-
-    public BooleanFieldAnnotatedModel(Boolean objectBoolean) {
-        this.objectBoolean = objectBoolean;
-    }
-
-    public BooleanFieldAnnotatedModel(boolean rawBoolean) {
-        this.rawBoolean = rawBoolean;
-    }
-
-    public Boolean getBoolean() {
-        return objectBoolean;
-    }
-
-    public boolean getRawBoolean() {
-        return rawBoolean;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/BooleanFieldExtendedModel.java b/library/src/test/java/com/orm/model/BooleanFieldExtendedModel.java
deleted file mode 100644
index 0c78c82a..00000000
--- a/library/src/test/java/com/orm/model/BooleanFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class BooleanFieldExtendedModel extends SugarRecord {
-    private Boolean objectBoolean;
-    private boolean rawBoolean;
-
-    public BooleanFieldExtendedModel() {}
-
-    public BooleanFieldExtendedModel(Boolean objectBoolean) {
-        this.objectBoolean = objectBoolean;
-    }
-
-    public BooleanFieldExtendedModel(boolean rawBoolean) {
-        this.rawBoolean = rawBoolean;
-    }
-
-    public Boolean getBoolean() {
-        return objectBoolean;
-    }
-
-    public boolean getRawBoolean() {
-        return rawBoolean;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/ByteArrayAnnotatedModel.java b/library/src/test/java/com/orm/model/ByteArrayAnnotatedModel.java
deleted file mode 100644
index 4a9f809c..00000000
--- a/library/src/test/java/com/orm/model/ByteArrayAnnotatedModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class ByteArrayAnnotatedModel {
-    private byte[] byteArray;
-    private Long id;
-
-    public ByteArrayAnnotatedModel() {}
-
-    public ByteArrayAnnotatedModel(byte[] byteArray) {
-        this.byteArray = byteArray;
-    }
-
-    public byte[] getByteArray() {
-        return byteArray;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/ByteArrayExtendedModel.java b/library/src/test/java/com/orm/model/ByteArrayExtendedModel.java
deleted file mode 100644
index 7e40208d..00000000
--- a/library/src/test/java/com/orm/model/ByteArrayExtendedModel.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class ByteArrayExtendedModel extends SugarRecord {
-    private byte[] byteArray;
-
-    public ByteArrayExtendedModel() {}
-
-    public ByteArrayExtendedModel(byte[] byteArray) {
-        this.byteArray = byteArray;
-    }
-
-    public byte[] getByteArray() {
-        return byteArray;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/DoubleFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/DoubleFieldAnnotatedModel.java
deleted file mode 100644
index 2c13e075..00000000
--- a/library/src/test/java/com/orm/model/DoubleFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class DoubleFieldAnnotatedModel {
-    private Double objectDouble;
-    private double rawDouble;
-    private Long id;
-
-    public DoubleFieldAnnotatedModel() {}
-
-    public DoubleFieldAnnotatedModel(Double objectDouble) {
-        this.objectDouble = objectDouble;
-    }
-
-    public DoubleFieldAnnotatedModel(double rawDouble) {
-        this.rawDouble = rawDouble;
-    }
-
-    public Double getDouble() {
-        return objectDouble;
-    }
-
-    public double getRawDouble() {
-        return rawDouble;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/DoubleFieldExtendedModel.java b/library/src/test/java/com/orm/model/DoubleFieldExtendedModel.java
deleted file mode 100644
index 1a000c3c..00000000
--- a/library/src/test/java/com/orm/model/DoubleFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class DoubleFieldExtendedModel extends SugarRecord {
-    private Double objectDouble;
-    private double rawDouble;
-
-    public DoubleFieldExtendedModel() {}
-
-    public DoubleFieldExtendedModel(Double objectDouble) {
-        this.objectDouble = objectDouble;
-    }
-
-    public DoubleFieldExtendedModel(double rawDouble) {
-        this.rawDouble = rawDouble;
-    }
-
-    public Double getDouble() {
-        return objectDouble;
-    }
-
-    public double getRawDouble() {
-        return rawDouble;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/EmptyModel.java b/library/src/test/java/com/orm/model/EmptyModel.java
deleted file mode 100644
index a98ab5e2..00000000
--- a/library/src/test/java/com/orm/model/EmptyModel.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-/**
- * Created by sibelius on 02/12/15.
- */
-public class EmptyModel extends SugarRecord {
-    public EmptyModel() { }
-}
diff --git a/library/src/test/java/com/orm/model/EnumFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/EnumFieldAnnotatedModel.java
deleted file mode 100644
index abb3a63f..00000000
--- a/library/src/test/java/com/orm/model/EnumFieldAnnotatedModel.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class EnumFieldAnnotatedModel {
-    public static enum DefaultEnum {
-        ONE, TWO
-    }
-
-    public static enum OverrideEnum {
-        ONE, TWO;
-
-        @Override
-        public String toString() {
-            return super.toString().toLowerCase();
-        }
-    }
-
-    private OverrideEnum overrideEnum;
-    private DefaultEnum defaultEnum;
-    private Long id;
-
-    public EnumFieldAnnotatedModel() {
-
-    }
-
-    public EnumFieldAnnotatedModel(OverrideEnum e1, DefaultEnum d1) {
-        overrideEnum = e1;
-        defaultEnum = d1;
-    }
-
-    public DefaultEnum getDefaultEnum() {
-        return defaultEnum;
-    }
-
-    public void setDefaultEnum(DefaultEnum defaultEnum) {
-        this.defaultEnum = defaultEnum;
-    }
-
-    public void setOverrideEnum(OverrideEnum overrideEnum) {
-        this.overrideEnum = overrideEnum;
-    }
-
-    public OverrideEnum getOverrideEnum() {
-        return overrideEnum;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/EnumFieldExtendedModel.java b/library/src/test/java/com/orm/model/EnumFieldExtendedModel.java
deleted file mode 100644
index 24ec7725..00000000
--- a/library/src/test/java/com/orm/model/EnumFieldExtendedModel.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class EnumFieldExtendedModel extends SugarRecord {
-    public static enum DefaultEnum {
-        ONE, TWO
-    }
-
-    public static enum OverrideEnum {
-        ONE, TWO;
-
-        @Override
-        public String toString() {
-            return super.toString().toLowerCase();
-        }
-    }
-
-    private OverrideEnum overrideEnum;
-    private DefaultEnum defaultEnum;
-
-    public EnumFieldExtendedModel() {
-
-    }
-
-    public EnumFieldExtendedModel(OverrideEnum e1, DefaultEnum d1) {
-        overrideEnum = e1;
-        defaultEnum = d1;
-    }
-
-    public DefaultEnum getDefaultEnum() {
-        return defaultEnum;
-    }
-
-    public void setDefaultEnum(DefaultEnum defaultEnum) {
-        this.defaultEnum = defaultEnum;
-    }
-
-    public void setOverrideEnum(OverrideEnum overrideEnum) {
-        this.overrideEnum = overrideEnum;
-    }
-
-    public OverrideEnum getOverrideEnum() {
-        return overrideEnum;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/FloatFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/FloatFieldAnnotatedModel.java
deleted file mode 100644
index be2f01f5..00000000
--- a/library/src/test/java/com/orm/model/FloatFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class FloatFieldAnnotatedModel {
-    private Float objectFloat;
-    private float rawFloat;
-    private Long id;
-
-    public FloatFieldAnnotatedModel() {}
-
-    public FloatFieldAnnotatedModel(Float objectFloat) {
-        this.objectFloat = objectFloat;
-    }
-
-    public FloatFieldAnnotatedModel(float rawFloat) {
-        this.rawFloat = rawFloat;
-    }
-
-    public Float getFloat() {
-        return objectFloat;
-    }
-
-    public float getRawFloat() {
-        return rawFloat;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/FloatFieldExtendedModel.java b/library/src/test/java/com/orm/model/FloatFieldExtendedModel.java
deleted file mode 100644
index e79f1a4b..00000000
--- a/library/src/test/java/com/orm/model/FloatFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class FloatFieldExtendedModel extends SugarRecord {
-    private Float objectFloat;
-    private float rawFloat;
-
-    public FloatFieldExtendedModel() {}
-
-    public FloatFieldExtendedModel(Float objectFloat) {
-        this.objectFloat = objectFloat;
-    }
-
-    public FloatFieldExtendedModel(float rawFloat) {
-        this.rawFloat = rawFloat;
-    }
-
-    public Float getFloat() {
-        return objectFloat;
-    }
-
-    public float getRawFloat() {
-        return rawFloat;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/IncompleteAnnotatedModel.java b/library/src/test/java/com/orm/model/IncompleteAnnotatedModel.java
deleted file mode 100644
index 64f8436b..00000000
--- a/library/src/test/java/com/orm/model/IncompleteAnnotatedModel.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class IncompleteAnnotatedModel {
-    // An annotated model must provide a Long id field. A setter or getter is optional
-    public IncompleteAnnotatedModel() {}
-}
diff --git a/library/src/test/java/com/orm/model/IntUniqueModel.java b/library/src/test/java/com/orm/model/IntUniqueModel.java
deleted file mode 100644
index 7a03e3d0..00000000
--- a/library/src/test/java/com/orm/model/IntUniqueModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-import com.orm.annotation.Unique;
-
-/**
- * Created by sibelius on 02/12/15.
- */
-public class IntUniqueModel extends SugarRecord {
-
-    @Unique
-    private int value;
-
-    public IntUniqueModel() { }
-
-    public IntUniqueModel(int value) {
-        this.value = value;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/IntegerFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/IntegerFieldAnnotatedModel.java
deleted file mode 100644
index e486d5db..00000000
--- a/library/src/test/java/com/orm/model/IntegerFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class IntegerFieldAnnotatedModel {
-    private Integer integer;
-    private int rawInteger;
-    public Long id;
-
-    public IntegerFieldAnnotatedModel() {}
-
-    public IntegerFieldAnnotatedModel(Integer integer) {
-        this.integer = integer;
-    }
-
-    public IntegerFieldAnnotatedModel(int rawInteger) {
-        this.rawInteger = rawInteger;
-    }
-
-    public Integer getInteger() {
-        return integer;
-    }
-
-    public int getInt() {
-        return rawInteger;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/IntegerFieldExtendedModel.java b/library/src/test/java/com/orm/model/IntegerFieldExtendedModel.java
deleted file mode 100644
index 407979a3..00000000
--- a/library/src/test/java/com/orm/model/IntegerFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class IntegerFieldExtendedModel extends SugarRecord {
-    private Integer integer;
-    private int rawInteger;
-
-    public IntegerFieldExtendedModel() {}
-
-    public IntegerFieldExtendedModel(Integer integer) {
-        this.integer = integer;
-    }
-
-    public IntegerFieldExtendedModel(int rawInteger) {
-        this.rawInteger = rawInteger;
-    }
-
-    public Integer getInteger() {
-        return integer;
-    }
-
-    public int getInt() {
-        return rawInteger;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/LongFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/LongFieldAnnotatedModel.java
deleted file mode 100644
index 7f2cd539..00000000
--- a/library/src/test/java/com/orm/model/LongFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class LongFieldAnnotatedModel {
-    private Long objectLong;
-    private long rawLong;
-    private Long id;
-
-    public LongFieldAnnotatedModel() {}
-
-    public LongFieldAnnotatedModel(Long objectLong) {
-        this.objectLong = objectLong;
-    }
-
-    public LongFieldAnnotatedModel(long rawLong) {
-        this.rawLong = rawLong;
-    }
-
-    public Long getLong() {
-        return objectLong;
-    }
-
-    public long getRawLong() {
-        return rawLong;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/LongFieldExtendedModel.java b/library/src/test/java/com/orm/model/LongFieldExtendedModel.java
deleted file mode 100644
index 66bc7d6d..00000000
--- a/library/src/test/java/com/orm/model/LongFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class LongFieldExtendedModel extends SugarRecord {
-    private Long objectLong;
-    private long rawLong;
-
-    public LongFieldExtendedModel() {}
-
-    public LongFieldExtendedModel(Long objectLong) {
-        this.objectLong = objectLong;
-    }
-
-    public LongFieldExtendedModel(long rawLong) {
-        this.rawLong = rawLong;
-    }
-
-    public Long getLong() {
-        return objectLong;
-    }
-
-    public long getRawLong() {
-        return rawLong;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/MultiColumnUniqueModel.java b/library/src/test/java/com/orm/model/MultiColumnUniqueModel.java
deleted file mode 100644
index cea9cd92..00000000
--- a/library/src/test/java/com/orm/model/MultiColumnUniqueModel.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-import com.orm.annotation.MultiUnique;
-
-/**
- * Created by sibelius on 02/12/15.
- */
-@MultiUnique("a, b")
-public class MultiColumnUniqueModel extends SugarRecord {
-
-    private int a;
-    private int b;
-
-    public MultiColumnUniqueModel() { }
-
-    public MultiColumnUniqueModel(int a, int b) {
-        this.a = a;
-        this.b = b;
-    }
-}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/model/NestedAnnotatedModel.java b/library/src/test/java/com/orm/model/NestedAnnotatedModel.java
deleted file mode 100644
index f57b2d7a..00000000
--- a/library/src/test/java/com/orm/model/NestedAnnotatedModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class NestedAnnotatedModel {
-    private RelationshipAnnotatedModel nested;
-    private Long id;
-
-    public NestedAnnotatedModel() {}
-
-    public NestedAnnotatedModel(RelationshipAnnotatedModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipAnnotatedModel getNested() {
-        return nested;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/NestedExtendedModel.java b/library/src/test/java/com/orm/model/NestedExtendedModel.java
deleted file mode 100644
index 0b583d95..00000000
--- a/library/src/test/java/com/orm/model/NestedExtendedModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.orm.model;
-
-
-import com.orm.SugarRecord;
-
-public class NestedExtendedModel extends SugarRecord {
-    private RelationshipExtendedModel nested;
-
-    public NestedExtendedModel() {}
-
-    public NestedExtendedModel(RelationshipExtendedModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipExtendedModel getNested() {
-        return nested;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/NestedMixedAAModel.java b/library/src/test/java/com/orm/model/NestedMixedAAModel.java
deleted file mode 100644
index a96500f5..00000000
--- a/library/src/test/java/com/orm/model/NestedMixedAAModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.orm.model;
-
-
-import com.orm.SugarRecord;
-
-public class NestedMixedAAModel extends SugarRecord {
-    private RelationshipMixedAModel nested;
-
-    public NestedMixedAAModel() {}
-
-    public NestedMixedAAModel(RelationshipMixedAModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipMixedAModel getNested() {
-        return nested;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/NestedMixedABModel.java b/library/src/test/java/com/orm/model/NestedMixedABModel.java
deleted file mode 100644
index 2cbae3db..00000000
--- a/library/src/test/java/com/orm/model/NestedMixedABModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.orm.model;
-
-
-import com.orm.SugarRecord;
-
-public class NestedMixedABModel extends SugarRecord {
-    private RelationshipMixedBModel nested;
-
-    public NestedMixedABModel() {}
-
-    public NestedMixedABModel(RelationshipMixedBModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipMixedBModel getNested() {
-        return nested;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/NestedMixedBAModel.java b/library/src/test/java/com/orm/model/NestedMixedBAModel.java
deleted file mode 100644
index 82de9717..00000000
--- a/library/src/test/java/com/orm/model/NestedMixedBAModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.orm.model;
-
-
-import com.orm.annotation.Table;
-
-@Table
-public class NestedMixedBAModel {
-    private RelationshipMixedAModel nested;
-    private Long id;
-
-    public NestedMixedBAModel() {}
-
-    public NestedMixedBAModel(RelationshipMixedAModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipMixedAModel getNested() {
-        return nested;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/NestedMixedBBModel.java b/library/src/test/java/com/orm/model/NestedMixedBBModel.java
deleted file mode 100644
index 6a208b5b..00000000
--- a/library/src/test/java/com/orm/model/NestedMixedBBModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.orm.model;
-
-
-import com.orm.annotation.Table;
-
-@Table
-public class NestedMixedBBModel {
-    private RelationshipMixedBModel nested;
-    private Long id;
-
-    public NestedMixedBBModel() {}
-
-    public NestedMixedBBModel(RelationshipMixedBModel nested) {
-        this.nested = nested;
-    }
-
-    public RelationshipMixedBModel getNested() {
-        return nested;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/NoSugarModel.java b/library/src/test/java/com/orm/model/NoSugarModel.java
deleted file mode 100644
index 617a99c4..00000000
--- a/library/src/test/java/com/orm/model/NoSugarModel.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.orm.model;
-
-
-public class NoSugarModel {
-    public NoSugarModel() {
-    }
-}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/model/RelationshipAnnotatedModel.java b/library/src/test/java/com/orm/model/RelationshipAnnotatedModel.java
deleted file mode 100644
index 42b9a4d9..00000000
--- a/library/src/test/java/com/orm/model/RelationshipAnnotatedModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class RelationshipAnnotatedModel {
-    private SimpleAnnotatedModel simple;
-    private Long id;
-
-    public RelationshipAnnotatedModel() {}
-
-    public RelationshipAnnotatedModel(SimpleAnnotatedModel simple) {
-        this.simple = simple;
-    }
-
-    public SimpleAnnotatedModel getSimple() {
-        return simple;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/RelationshipExtendedModel.java b/library/src/test/java/com/orm/model/RelationshipExtendedModel.java
deleted file mode 100644
index 1e4e99bc..00000000
--- a/library/src/test/java/com/orm/model/RelationshipExtendedModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.orm.model;
-
-
-import com.orm.SugarRecord;
-
-public class RelationshipExtendedModel extends SugarRecord {
-    private SimpleExtendedModel simple;
-
-    public RelationshipExtendedModel() {}
-
-    public RelationshipExtendedModel(SimpleExtendedModel simple) {
-        this.simple = simple;
-    }
-
-    public SimpleExtendedModel getSimple() {
-        return simple;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/RelationshipMixedAModel.java b/library/src/test/java/com/orm/model/RelationshipMixedAModel.java
deleted file mode 100644
index 1afa4a82..00000000
--- a/library/src/test/java/com/orm/model/RelationshipMixedAModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.orm.model;
-
-
-import com.orm.SugarRecord;
-
-public class RelationshipMixedAModel extends SugarRecord {
-    private SimpleAnnotatedModel simple;
-
-    public RelationshipMixedAModel() {}
-
-    public RelationshipMixedAModel(SimpleAnnotatedModel simple) {
-        this.simple = simple;
-    }
-
-    public SimpleAnnotatedModel getSimple() {
-        return simple;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/RelationshipMixedBModel.java b/library/src/test/java/com/orm/model/RelationshipMixedBModel.java
deleted file mode 100644
index 2197e62f..00000000
--- a/library/src/test/java/com/orm/model/RelationshipMixedBModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.orm.model;
-
-
-import com.orm.annotation.Table;
-
-@Table
-public class RelationshipMixedBModel {
-    private SimpleExtendedModel simple;
-    private Long id;
-
-    public RelationshipMixedBModel() {}
-
-    public RelationshipMixedBModel(SimpleExtendedModel simple) {
-        this.simple = simple;
-    }
-
-    public SimpleExtendedModel getSimple() {
-        return simple;
-    }
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/ShortFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/ShortFieldAnnotatedModel.java
deleted file mode 100644
index fea8e58e..00000000
--- a/library/src/test/java/com/orm/model/ShortFieldAnnotatedModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class ShortFieldAnnotatedModel {
-    private Short objectShort;
-    private short rawShort;
-    private Long id;
-
-    public ShortFieldAnnotatedModel() {}
-
-    public ShortFieldAnnotatedModel(Short objectShort) {
-        this.objectShort = objectShort;
-    }
-
-    public ShortFieldAnnotatedModel(short rawShort) {
-        this.rawShort = rawShort;
-    }
-
-    public Short getShort() {
-        return objectShort;
-    }
-
-    public short getRawShort() {
-        return rawShort;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/ShortFieldExtendedModel.java b/library/src/test/java/com/orm/model/ShortFieldExtendedModel.java
deleted file mode 100644
index 5e90b9f6..00000000
--- a/library/src/test/java/com/orm/model/ShortFieldExtendedModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class ShortFieldExtendedModel extends SugarRecord {
-    private Short objectShort;
-    private short rawShort;
-
-    public ShortFieldExtendedModel() {}
-
-    public ShortFieldExtendedModel(Short objectShort) {
-        this.objectShort = objectShort;
-    }
-
-    public ShortFieldExtendedModel(short rawShort) {
-        this.rawShort = rawShort;
-    }
-
-    public Short getShort() {
-        return objectShort;
-    }
-
-    public short getRawShort() {
-        return rawShort;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/SimpleAnnotatedModel.java b/library/src/test/java/com/orm/model/SimpleAnnotatedModel.java
deleted file mode 100644
index 918840ed..00000000
--- a/library/src/test/java/com/orm/model/SimpleAnnotatedModel.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-
-@Table
-public class SimpleAnnotatedModel {
-    private Long id;
-
-    public SimpleAnnotatedModel() {}
-
-    public Long getId() {
-        return id;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/SimpleExtendedModel.java b/library/src/test/java/com/orm/model/SimpleExtendedModel.java
deleted file mode 100644
index 9040145d..00000000
--- a/library/src/test/java/com/orm/model/SimpleExtendedModel.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-
-public class SimpleExtendedModel extends SugarRecord {
-    public SimpleExtendedModel() {}
-}
diff --git a/library/src/test/java/com/orm/model/SimpleModel.java b/library/src/test/java/com/orm/model/SimpleModel.java
deleted file mode 100644
index b2659084..00000000
--- a/library/src/test/java/com/orm/model/SimpleModel.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class SimpleModel extends SugarRecord {
-    private String str;
-    private int integer;
-    private boolean bool;
-
-    public String getStr() {
-        return str;
-    }
-
-    public void setStr(String str) {
-        this.str = str;
-    }
-
-    public int getInteger() {
-        return integer;
-    }
-
-    public void setInteger(int integer) {
-        this.integer = integer;
-    }
-
-    public boolean isBool() {
-        return bool;
-    }
-
-    public void setBool(boolean bool) {
-        this.bool = bool;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/StringFieldAnnotatedModel.java b/library/src/test/java/com/orm/model/StringFieldAnnotatedModel.java
deleted file mode 100644
index e3220278..00000000
--- a/library/src/test/java/com/orm/model/StringFieldAnnotatedModel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class StringFieldAnnotatedModel {
-    private String string;
-    private Long id;
-
-    public StringFieldAnnotatedModel() {}
-
-    public StringFieldAnnotatedModel(String string) {
-        this.string = string;
-    }
-
-    public String getString() {
-        return string;
-    }
-
-    public void setString(String string) {
-        this.string = string;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/StringFieldAnnotatedNoIdModel.java b/library/src/test/java/com/orm/model/StringFieldAnnotatedNoIdModel.java
deleted file mode 100644
index 4b458960..00000000
--- a/library/src/test/java/com/orm/model/StringFieldAnnotatedNoIdModel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.orm.model;
-
-import com.orm.annotation.Table;
-
-@Table
-public class StringFieldAnnotatedNoIdModel {
-    private String string;
-
-    public StringFieldAnnotatedNoIdModel() {}
-
-    public StringFieldAnnotatedNoIdModel(String string) {
-        this.string = string;
-    }
-
-    public String getString() {
-        return string;
-    }
-
-    public void setString(String string) {
-        this.string = string;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/StringFieldExtendedModel.java b/library/src/test/java/com/orm/model/StringFieldExtendedModel.java
deleted file mode 100644
index 9b79bc61..00000000
--- a/library/src/test/java/com/orm/model/StringFieldExtendedModel.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class StringFieldExtendedModel extends SugarRecord {
-    private String string;
-
-    public StringFieldExtendedModel() {}
-
-    public StringFieldExtendedModel(String string) {
-        this.string = string;
-    }
-
-    public String getString() {
-        return string;
-    }
-
-    public void setString(String string) {
-        this.string = string;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/StringFieldExtendedModelAnnotatedColumn.java b/library/src/test/java/com/orm/model/StringFieldExtendedModelAnnotatedColumn.java
deleted file mode 100644
index 674d53ba..00000000
--- a/library/src/test/java/com/orm/model/StringFieldExtendedModelAnnotatedColumn.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-import com.orm.annotation.Column;
-
-/**
- * Created by sibelius on 02/12/15.
- */
-public class StringFieldExtendedModelAnnotatedColumn extends SugarRecord {
-    @Column(name="anyName")
-    public String name;
-
-    public StringFieldExtendedModelAnnotatedColumn() { }
-
-    public StringFieldExtendedModelAnnotatedColumn(String name) {
-        this.name = name;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/TestRecord.java b/library/src/test/java/com/orm/model/TestRecord.java
deleted file mode 100644
index 64fe7dba..00000000
--- a/library/src/test/java/com/orm/model/TestRecord.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.orm.model;
-
-import com.orm.SugarRecord;
-
-public class TestRecord extends SugarRecord {
-
-    private String name;
-
-    public TestRecord() {
-        super();
-    }
-
-    public TestRecord setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public String getName() {
-        return name;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/onetomany/OneToManyModel.java b/library/src/test/java/com/orm/model/onetomany/OneToManyModel.java
deleted file mode 100644
index bb7bd96a..00000000
--- a/library/src/test/java/com/orm/model/onetomany/OneToManyModel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.orm.model.onetomany;
-
-import com.orm.SugarRecord;
-import com.orm.annotation.OneToMany;
-
-import java.util.List;
-
-/**
- * Created by Łukasz Wesołowski on 28.07.2016.
- */
-public class OneToManyModel extends SugarRecord {
-    @OneToMany(targetField = "model")
-    private List<OneToManyRelationModel> models;
-
-    public OneToManyModel() {
-    }
-
-    public OneToManyModel(Long id) {
-        setId(id);
-    }
-
-    public List<OneToManyRelationModel> getModels() {
-        return models;
-    }
-
-    public void setModels(List<OneToManyRelationModel> models) {
-        this.models = models;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/onetomany/OneToManyRelationModel.java b/library/src/test/java/com/orm/model/onetomany/OneToManyRelationModel.java
deleted file mode 100644
index 4c17ec56..00000000
--- a/library/src/test/java/com/orm/model/onetomany/OneToManyRelationModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.orm.model.onetomany;
-
-import com.orm.SugarRecord;
-
-/**
- * Created by Łukasz Wesołowski on 28.07.2016.
- */
-public class OneToManyRelationModel extends SugarRecord {
-    private OneToManyModel model;
-
-    public OneToManyRelationModel() {
-    }
-
-    public OneToManyRelationModel(Long id, OneToManyModel model) {
-        setId(id);
-        this.model = model;
-    }
-
-    public OneToManyModel getModel() {
-        return model;
-    }
-
-    public void setModel(OneToManyModel model) {
-        this.model = model;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationModel.java b/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationModel.java
deleted file mode 100644
index d48e38f0..00000000
--- a/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationModel.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.orm.model.onetomany;
-
-import com.orm.SugarRecord;
-
-import java.util.List;
-
-/**
- * Created by Łukasz Wesołowski on 27.08.2016.
- */
-public class WithoutOneToManyAnnotationModel extends SugarRecord {
-    private List<OneToManyRelationModel> models;
-
-    public WithoutOneToManyAnnotationModel() {
-    }
-
-    public WithoutOneToManyAnnotationModel(Long id) {
-        setId(id);
-    }
-
-    public List<OneToManyRelationModel> getModels() {
-        return models;
-    }
-
-    public void setModels(List<OneToManyRelationModel> models) {
-        this.models = models;
-    }
-}
diff --git a/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationRelationModel.java b/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationRelationModel.java
deleted file mode 100644
index 34e1eb2a..00000000
--- a/library/src/test/java/com/orm/model/onetomany/WithoutOneToManyAnnotationRelationModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.orm.model.onetomany;
-
-import com.orm.SugarRecord;
-
-/**
- * Created by Łukasz Wesołowski on 27.08.2016.
- */
-public class WithoutOneToManyAnnotationRelationModel extends SugarRecord {
-    private WithoutOneToManyAnnotationModel model;
-
-    public WithoutOneToManyAnnotationRelationModel() {
-    }
-
-    public WithoutOneToManyAnnotationRelationModel(Long id, WithoutOneToManyAnnotationModel model) {
-        setId(id);
-        this.model = model;
-    }
-
-    public WithoutOneToManyAnnotationModel getModel() {
-        return model;
-    }
-
-    public void setModel(WithoutOneToManyAnnotationModel model) {
-        this.model = model;
-    }
-}
diff --git a/library/src/test/java/com/orm/query/QueryBuilderTests.java b/library/src/test/java/com/orm/query/QueryBuilderTests.java
deleted file mode 100644
index 30b220df..00000000
--- a/library/src/test/java/com/orm/query/QueryBuilderTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.orm.query;
-
-import com.orm.util.QueryBuilder;
-
-import org.junit.Test;
-
-import static junit.framework.Assert.assertEquals;
-
-public final class QueryBuilderTests {
-
-    @Test(expected=RuntimeException.class)
-    public void noArgumentsTest() {
-        QueryBuilder.generatePlaceholders(0);
-    }
-
-    @Test()
-    public void oneArgumentsTest() {
-        assertEquals("?", QueryBuilder.generatePlaceholders(1));
-    }
-
-    @Test
-    public void twoArgumentsTest() {
-        assertEquals("?,?", QueryBuilder.generatePlaceholders(2));
-    }
-
-    @Test
-    public void manyArgumentsTest() {
-        assertEquals("?,?,?,?,?,?,?,?,?,?", QueryBuilder.generatePlaceholders(10));
-    }
-}
diff --git a/library/src/test/java/com/orm/query/SelectTest.java b/library/src/test/java/com/orm/query/SelectTest.java
deleted file mode 100644
index ad0393bd..00000000
--- a/library/src/test/java/com/orm/query/SelectTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.orm.query;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.TestRecord;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class SelectTest {
-
-    @Test
-    public void testMergeCondition(){
-        Select where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"));
-        assertEquals("(test = ? )", where.getWhereCond());
-        assertEquals(1, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-
-        where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"), Condition.prop("prop").eq(2));
-        assertEquals("(test = ?  AND prop = ? )", where.getWhereCond());
-        assertEquals(2, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-        assertEquals("2", where.getArgs()[1]);
-    }
-
-    @Test
-    public void testWhere(){
-        Select where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"));
-        assertEquals("(test = ? )", where.getWhereCond());
-        assertEquals(1, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-
-        where = Select.from(TestRecord.class).where(Condition.prop("test").eq("satya"), Condition.prop("prop").eq(2));
-        assertEquals("(test = ?  AND prop = ? )", where.getWhereCond());
-        assertEquals(2, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-        assertEquals("2", where.getArgs()[1]);
-    }
-
-    @Test
-    public void toSqlAllClauses(){
-        String toSql = Select.from(TestRecord.class)
-                .where("foo")
-                .orderBy("doe")
-                .groupBy("john")
-                .limit("5")
-                .offset("10")
-                .toSql();
-        assertEquals("SELECT * FROM TEST_RECORD WHERE foo ORDER BY doe GROUP BY john LIMIT 5 OFFSET 10 ", toSql);
-    }
-
-    @Test
-    public void toSqlNoClauses(){
-        String toSql = Select.from(TestRecord.class)
-                .toSql();
-        assertEquals("SELECT * FROM TEST_RECORD ", toSql);
-    }
-
-    @Test
-    public void toSqlWhereLimitClauses(){
-        String toSql = Select.from(TestRecord.class)
-                .where("foo")
-                .limit("10")
-                .toSql();
-        assertEquals("SELECT * FROM TEST_RECORD WHERE foo LIMIT 10 ", toSql);
-    }
-
-
-    @Test
-    public void testWhereOr(){
-        Select where = Select.from(TestRecord.class).whereOr(Condition.prop("test").eq("satya"));
-        assertEquals("(test = ? )", where.getWhereCond());
-        assertEquals(1, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-
-        where = Select.from(TestRecord.class).whereOr(Condition.prop("test").eq("satya"), Condition.prop("prop").eq(2));
-        assertEquals("(test = ?  OR prop = ? )", where.getWhereCond());
-        assertEquals(2, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-        assertEquals("2", where.getArgs()[1]);
-    }
-
-    @Test
-    public void testAnd(){
-        Select where = Select.from(TestRecord.class).whereOr(Condition.prop("test").eq("satya"));
-        assertEquals("(test = ? )", where.getWhereCond());
-        assertEquals(1, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-
-        where.and(Condition.prop("prop").eq(2));
-
-        assertEquals("(test = ? ) AND (prop = ? )", where.getWhereCond());
-        assertEquals(2, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-        assertEquals("2", where.getArgs()[1]);
-    }
-
-    @Test
-    public void testOr(){
-        Select where = Select.from(TestRecord.class).whereOr(Condition.prop("test").eq("satya"));
-        assertEquals("(test = ? )", where.getWhereCond());
-        assertEquals(1, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-
-        where.or(Condition.prop("prop").eq(2));
-
-        assertEquals("(test = ? ) OR (prop = ? )", where.getWhereCond());
-        assertEquals(2, where.getArgs().length);
-        assertEquals("satya", where.getArgs()[0]);
-        assertEquals("2", where.getArgs()[1]);
-    }
-
-    @Test
-    public void testIsNull() {
-        Select where = Select.from(TestRecord.class).where(Condition.prop("test").isNull());
-        assertEquals("(test IS NULL )", where.getWhereCond());
-        assertEquals(0, where.getArgs().length);
-
-        where = Select.from(TestRecord.class).where(Condition.prop("test").eq(null));
-        assertEquals("(test IS NULL )", where.getWhereCond());
-        assertEquals(0, where.getArgs().length);
-    }
-
-    @Test
-    public void testIsNotNull() {
-        Select where = Select.from(TestRecord.class).where(Condition.prop("test").isNotNull());
-        assertEquals("(test IS NOT NULL )", where.getWhereCond());
-        assertEquals(0, where.getArgs().length);
-
-        where = Select.from(TestRecord.class).where(Condition.prop("test").notEq(null));
-        assertEquals("(test IS NOT NULL )", where.getWhereCond());
-        assertEquals(0, where.getArgs().length);
-    }
-}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/BigDecimalFieldTests.java b/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
deleted file mode 100644
index a877a6af..00000000
--- a/library/src/test/java/com/orm/record/BigDecimalFieldTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.BigDecimalFieldAnnotatedModel;
-import com.orm.model.BigDecimalFieldExtendedModel;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.math.BigDecimal;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class BigDecimalFieldTests {
-    private BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
-
-    @Test
-    public void nullBigDecimalExtendedTest() {
-        save(new BigDecimalFieldExtendedModel());
-        BigDecimalFieldExtendedModel model = findById(BigDecimalFieldExtendedModel.class, 1);
-        assertNull(model.getBigDecimal());
-    }
-
-    @Test
-    public void nullBigDecimalAnnotatedTest() {
-        save(new BigDecimalFieldAnnotatedModel());
-        BigDecimalFieldAnnotatedModel model = findById(BigDecimalFieldAnnotatedModel.class, 1);
-        assertNull(model.getBigDecimal());
-    }
-
-    @Test
-    public void bigDecimalExtendedTest() {
-        save(new BigDecimalFieldExtendedModel(decimal));
-        BigDecimalFieldExtendedModel model = findById(BigDecimalFieldExtendedModel.class, 1);
-        assertEquals(decimal, model.getBigDecimal());
-    }
-
-    @Test
-    public void bigDecimalAnnotatedTest() {
-        save(new BigDecimalFieldAnnotatedModel(decimal));
-        BigDecimalFieldAnnotatedModel model = findById(BigDecimalFieldAnnotatedModel.class, 1);
-        assertEquals(decimal, model.getBigDecimal());
-    }
-
-    @After
-    public void after() {
-        decimal = null;
-    }
-}
diff --git a/library/src/test/java/com/orm/record/BooleanFieldTests.java b/library/src/test/java/com/orm/record/BooleanFieldTests.java
deleted file mode 100644
index 3a026a48..00000000
--- a/library/src/test/java/com/orm/record/BooleanFieldTests.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.BooleanFieldAnnotatedModel;
-import com.orm.model.BooleanFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class BooleanFieldTests {
-
-    @Test
-    public void nullBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel());
-        BooleanFieldExtendedModel model = findById(BooleanFieldExtendedModel.class, 1);
-        assertNull(model.getBoolean());
-    }
-
-    @Test
-    public void nullRawBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel());
-        BooleanFieldExtendedModel model = findById(BooleanFieldExtendedModel.class, 1);
-        assertEquals(false, model.getRawBoolean());
-    }
-
-    @Test
-    public void nullBooleanAnnotatedTest() {
-        save(new BooleanFieldAnnotatedModel());
-        BooleanFieldAnnotatedModel model = findById(BooleanFieldAnnotatedModel.class, 1);
-        assertNull(model.getBoolean());
-    }
-
-    @Test
-    public void nullRawBooleanAnnotatedTest() {
-        save(new BooleanFieldAnnotatedModel());
-        BooleanFieldAnnotatedModel model = findById(BooleanFieldAnnotatedModel.class, 1);
-        assertEquals(false, model.getRawBoolean());
-    }
-
-////TODO check this method
-//    @Test
-//    public void objectBooleanExtendedTest() {
-//        save(new BooleanFieldExtendedModel(true));
-//        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
-//        assertEquals(true, model.getBoolean());
-//    }
-
-    @Test
-    public void rawBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel(true));
-        BooleanFieldExtendedModel model = findById(BooleanFieldExtendedModel.class, 1);
-        assertEquals(true, model.getRawBoolean());
-    }
-
-//    //TODO check this
-//    @Test
-//    public void objectBooleanAnnotatedTest() {
-//        save(new BooleanFieldAnnotatedModel(true));
-//        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
-//
-//        if (null != model) {
-//            assertEquals(true, model.getBoolean());
-//        }
-//    }
-
-    @Test
-    public void rawBooleanAnnotatedTest() {
-        save(new BooleanFieldAnnotatedModel(true));
-        BooleanFieldAnnotatedModel model = findById(BooleanFieldAnnotatedModel.class, 1);
-        assertEquals(true, model.getRawBoolean());
-    }
-}
diff --git a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java b/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
deleted file mode 100644
index 450823f2..00000000
--- a/library/src/test/java/com/orm/record/ByteArrayFieldTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.ByteArrayAnnotatedModel;
-import com.orm.model.ByteArrayExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class ByteArrayFieldTests {
-
-    @Test
-    public void nullByteArrayExtendedTest() {
-        byte[] array = "".getBytes();
-        save(new ByteArrayExtendedModel());
-        ByteArrayExtendedModel model = findById(ByteArrayExtendedModel.class, 1);
-        assertEquals(new String(array), new String(model.getByteArray()));
-        assertArrayEquals(array, model.getByteArray());
-    }
-
-    @Test
-    public void nullByteArrayAnnotatedTest() {
-        byte[] array = "".getBytes();
-        save(new ByteArrayAnnotatedModel());
-        ByteArrayAnnotatedModel model = findById(ByteArrayAnnotatedModel.class, 1);
-        assertEquals(new String(array), new String(model.getByteArray()));
-        assertArrayEquals(array, model.getByteArray());
-    }
-
-    @Test
-    public void byteArrayExtendedTest() {
-        byte[] array = "hello".getBytes();
-        save(new ByteArrayExtendedModel(array));
-        ByteArrayExtendedModel model = findById(ByteArrayExtendedModel.class, 1);
-        assertEquals(new String(array), new String(model.getByteArray()));
-        assertArrayEquals(array, model.getByteArray());
-    }
-
-    @Test
-    public void byteArrayAnnotatedTest() {
-        byte[] array = "hello".getBytes();
-        save(new ByteArrayAnnotatedModel(array));
-        ByteArrayAnnotatedModel model = findById(ByteArrayAnnotatedModel.class, 1);
-        assertEquals(new String(array), new String(model.getByteArray()));
-        assertArrayEquals(array, model.getByteArray());
-    }
-}
diff --git a/library/src/test/java/com/orm/record/CursorTests.java b/library/src/test/java/com/orm/record/CursorTests.java
deleted file mode 100644
index a6036a15..00000000
--- a/library/src/test/java/com/orm/record/CursorTests.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.orm.record;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Build;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.TextView;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.SimpleModel;
-import com.orm.query.Select;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertSame;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class CursorTests {
-
-    @Test
-    public void testColumnNames() {
-        save(new SimpleModel());
-        Cursor c = Select.from(SimpleModel.class).getCursor();
-        for (String col : new String[]{"STR", "INTEGER", "BOOL", "ID"}) {
-            assertNotSame("Missing column for field: " + col, -1, c.getColumnIndex(col));
-        }
-    }
-    @Test
-    public void testSugarCursor() {
-        save(new SimpleModel());
-        Cursor cursor = Select.from(SimpleModel.class).getCursor();
-        assertNotSame("No _id", -1, cursor.getColumnIndex("_id"));
-        assertSame("_id != ID", cursor.getColumnIndex("_id"), cursor.getColumnIndex("ID"));
-    }
-
-    @Test
-    public void testNoColumn() {
-        save(new SimpleModel());
-        Cursor cursor = Select.from(SimpleModel.class).getCursor();
-        assertSame(-1, cursor.getColumnIndex("nonexistent"));
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    @Test
-    public void testMakeAdapter() {
-        save(new SimpleModel());
-        Cursor c = Select.from(SimpleModel.class).getCursor();
-        CursorAdapter adapter = new CursorAdapter(RuntimeEnvironment.application, c, true) {
-            @Override
-            public View newView(Context context, Cursor cursor, ViewGroup parent) {
-                TextView tv = new TextView(context);
-                String s = cursor.getString(cursor.getColumnIndex("STR"));
-                tv.setText(s);
-                return null;
-            }
-
-            @Override
-            public void bindView(View view, Context context, Cursor cursor) {
-                String s = cursor.getString(cursor.getColumnIndex("STR"));
-                ((TextView) view).setText(s);
-            }
-        };
-
-        Assert.assertNotNull(adapter);
-    }
-}
diff --git a/library/src/test/java/com/orm/record/DoubleFieldTests.java b/library/src/test/java/com/orm/record/DoubleFieldTests.java
deleted file mode 100644
index a05fa3e0..00000000
--- a/library/src/test/java/com/orm/record/DoubleFieldTests.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.DoubleFieldAnnotatedModel;
-import com.orm.model.DoubleFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class DoubleFieldTests {
-
-    @Test
-    public void nullDoubleExtendedTest() {
-        save(new DoubleFieldExtendedModel());
-        DoubleFieldExtendedModel model = findById(DoubleFieldExtendedModel.class, 1);
-        assertNull(model.getDouble());
-    }
-
-    @Test
-    public void nullRawDoubleExtendedTest() {
-        save(new DoubleFieldExtendedModel());
-        DoubleFieldExtendedModel model = findById(DoubleFieldExtendedModel.class, 1);
-        assertEquals(0.0, model.getRawDouble(), 0.0000000001);
-    }
-
-    @Test
-    public void nullDoubleAnnotatedTest() {
-        save(new DoubleFieldAnnotatedModel());
-        DoubleFieldAnnotatedModel model = findById(DoubleFieldAnnotatedModel.class, 1);
-        assertNull(model.getDouble());
-    }
-
-    @Test
-    public void nullRawDoubleAnnotatedTest() {
-        save(new DoubleFieldAnnotatedModel());
-        DoubleFieldAnnotatedModel model = findById(DoubleFieldAnnotatedModel.class, 1);
-        assertEquals(0.0, model.getRawDouble(), 0.0000000001);
-    }
-
-    @Test
-    @SuppressWarnings("all")
-    public void objectDoubleExtendedTest() {
-        Double objectDouble = Double.valueOf(25.0);
-        save(new DoubleFieldExtendedModel(objectDouble));
-        DoubleFieldExtendedModel model = findById(DoubleFieldExtendedModel.class, 1);
-        assertEquals(objectDouble, model.getDouble());
-    }
-
-    @Test
-    public void rawDoubleExtendedTest() {
-        save(new DoubleFieldExtendedModel(25.0));
-        DoubleFieldExtendedModel model = findById(DoubleFieldExtendedModel.class, 1);
-        assertEquals(25.0, model.getRawDouble(), 0.0000000001);
-    }
-
-    @Test
-    @SuppressWarnings("all")
-    public void objectDoubleAnnotatedTest() {
-        Double objectDouble = Double.valueOf(25.0);
-        save(new DoubleFieldAnnotatedModel(objectDouble));
-        DoubleFieldAnnotatedModel model = findById(DoubleFieldAnnotatedModel.class, 1);
-        assertEquals(objectDouble, model.getDouble());
-    }
-
-    @Test
-    public void rawDoubleAnnotatedTest() {
-        save(new DoubleFieldAnnotatedModel(25.0));
-        DoubleFieldAnnotatedModel model = findById(DoubleFieldAnnotatedModel.class, 1);
-        assertEquals(25.0, model.getRawDouble(), 0.0000000001);
-    }
-}
diff --git a/library/src/test/java/com/orm/record/EnumFieldTests.java b/library/src/test/java/com/orm/record/EnumFieldTests.java
deleted file mode 100644
index 42647b00..00000000
--- a/library/src/test/java/com/orm/record/EnumFieldTests.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.EnumFieldAnnotatedModel;
-import com.orm.model.EnumFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-import static com.orm.model.EnumFieldExtendedModel.DefaultEnum;
-import static com.orm.model.EnumFieldExtendedModel.OverrideEnum;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class EnumFieldTests {
-
-    @Test
-    public void nullDefaultEnumExtendedTest() {
-        save(new EnumFieldExtendedModel());
-        EnumFieldExtendedModel model = findById(EnumFieldExtendedModel.class, 1);
-        assertNull(model.getDefaultEnum());
-    }
-
-    @Test
-    public void nullOverriddenEnumExtendedTest() {
-        save(new EnumFieldExtendedModel());
-        EnumFieldExtendedModel model = findById(EnumFieldExtendedModel.class, 1);
-        assertNull(model.getOverrideEnum());
-    }
-    @Test
-    public void nullDefaultEnumAnnotatedTest() {
-        save(new EnumFieldAnnotatedModel());
-        EnumFieldAnnotatedModel model = findById(EnumFieldAnnotatedModel.class, 1);
-        assertNull(model.getDefaultEnum());
-    }
-
-    @Test
-    public void nullOverriddenEnumAnnotatedTest() {
-        save(new EnumFieldAnnotatedModel());
-        EnumFieldAnnotatedModel model = findById(EnumFieldAnnotatedModel.class, 1);
-        assertNull(model.getOverrideEnum());
-    }
-
-    @Test
-    public void defaultEnumExtendedTest() {
-        save(new EnumFieldExtendedModel(OverrideEnum.ONE, DefaultEnum.TWO));
-        EnumFieldExtendedModel model = findById(EnumFieldExtendedModel.class, 1);
-        assertNotNull(model);
-        assertEquals(model.getDefaultEnum(), DefaultEnum.TWO);
-    }
-
-    @Test
-    public void overriddenEnumExtendedTest() {
-        save(new EnumFieldExtendedModel(OverrideEnum.ONE, DefaultEnum.TWO));
-        EnumFieldExtendedModel model = findById(EnumFieldExtendedModel.class, 1);
-        assertNotNull(model);
-        assertEquals(model.getOverrideEnum(), OverrideEnum.ONE);
-    }
-
-    @Test
-    public void defaultEnumAnnotatedTest() {
-        save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
-                EnumFieldAnnotatedModel.DefaultEnum.TWO));
-        EnumFieldAnnotatedModel model = findById(EnumFieldAnnotatedModel.class, 1);
-        assertNotNull(model);
-        assertEquals(model.getDefaultEnum(), EnumFieldAnnotatedModel.DefaultEnum.TWO);
-    }
-
-    @Test
-    public void overriddenEnumAnnotatedTest() {
-        save(new EnumFieldAnnotatedModel(EnumFieldAnnotatedModel.OverrideEnum.ONE,
-                EnumFieldAnnotatedModel.DefaultEnum.TWO));
-        EnumFieldAnnotatedModel model = findById(EnumFieldAnnotatedModel.class, 1);
-        assertNotNull(model);
-        assertEquals(model.getOverrideEnum(), EnumFieldAnnotatedModel.OverrideEnum.ONE);
-    }
-}
diff --git a/library/src/test/java/com/orm/record/FirstAndLastTests.java b/library/src/test/java/com/orm/record/FirstAndLastTests.java
deleted file mode 100644
index 1b6db799..00000000
--- a/library/src/test/java/com/orm/record/FirstAndLastTests.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.FloatFieldAnnotatedModel;
-import com.orm.model.FloatFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.first;
-import static com.orm.SugarRecord.delete;
-import static com.orm.SugarRecord.findById;
-import static com.orm.SugarRecord.last;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class FirstAndLastTests {
-
-    @Test
-    @SuppressWarnings("all")
-    public void firstExtendedTest() {
-        Float firstObjectFloat = 25F;
-        Float lastObjectFloat = 50F;
-        save(new FloatFieldExtendedModel(firstObjectFloat));
-        save(new FloatFieldExtendedModel(lastObjectFloat));
-        FloatFieldExtendedModel model = first(FloatFieldExtendedModel.class);
-
-        if (null != model) {
-            assertEquals(firstObjectFloat, model.getFloat());
-        }
-    }
-
-    @Test
-    public void firstDeletedRecordExtendedTest() {
-        Float second = 25F;
-
-        save(new FloatFieldExtendedModel(15F));
-        save(new FloatFieldExtendedModel(second));
-        save(new FloatFieldExtendedModel(35F));
-        save(new FloatFieldExtendedModel(45F));
-
-        FloatFieldExtendedModel firstRecord = findById(FloatFieldExtendedModel.class, 1);
-        delete(firstRecord);
-        FloatFieldExtendedModel model = first(FloatFieldExtendedModel.class);
-
-        if (null != model) {
-            assertEquals(second, model.getFloat());
-        }
-    }
-
-    @Test
-    public void lastExtendedTest() {
-        Float last = 50F;
-
-        save(new FloatFieldExtendedModel(25F));
-        save(new FloatFieldExtendedModel(last));
-
-        FloatFieldExtendedModel model = last(FloatFieldExtendedModel.class);
-
-        if (null != model) {
-            assertEquals(last, model.getFloat());
-        }
-    }
-
-    @Test
-    public void lastDeletedRecordExtendedTest() {
-        Float third = 35F;
-
-        save(new FloatFieldExtendedModel(15F));
-        save(new FloatFieldExtendedModel(25F));
-        save(new FloatFieldExtendedModel(third));
-        save(new FloatFieldExtendedModel(45F));
-
-        FloatFieldExtendedModel lastRecord = findById(FloatFieldExtendedModel.class, 4);
-        delete(lastRecord);
-        FloatFieldExtendedModel model = last(FloatFieldExtendedModel.class);
-
-        if (null != model) {
-            assertEquals(third, model.getFloat());
-        }
-    }
-
-    @Test
-    public void nullFirstExtendedTest() {
-        assertNull(first(FloatFieldExtendedModel.class));
-    }
-
-    @Test
-    public void nullLastExtendedTest() {
-        assertNull(last(FloatFieldExtendedModel.class));
-    }
-
-    @Test
-    public void oneItemExtendedTest() {
-        save(new FloatFieldExtendedModel(25F));
-
-        FloatFieldExtendedModel firstModel = first(FloatFieldExtendedModel.class);
-        FloatFieldExtendedModel lastModel = last(FloatFieldExtendedModel.class);
-
-        if (null != firstModel && null != lastModel) {
-            assertEquals(firstModel.getFloat(), lastModel.getFloat());
-        }
-    }
-
-    @Test
-    public void firstAnnotatedTest() {
-        Float first = 25F;
-
-        save(new FloatFieldAnnotatedModel(first));
-        save(new FloatFieldAnnotatedModel(50F));
-
-        FloatFieldAnnotatedModel model = first(FloatFieldAnnotatedModel.class);
-
-        if (null != model) {
-            assertEquals(first, model.getFloat());
-        }
-    }
-
-    @Test
-    public void firstDeletedRecordAnnotatedTest() {
-        Float second = 25F;
-
-        save(new FloatFieldAnnotatedModel(15F));
-        save(new FloatFieldAnnotatedModel(second));
-        save(new FloatFieldAnnotatedModel(35F));
-        save(new FloatFieldAnnotatedModel(45F));
-
-        FloatFieldAnnotatedModel firstRecord = findById(FloatFieldAnnotatedModel.class, 1);
-
-        delete(firstRecord);
-
-        FloatFieldAnnotatedModel model = first(FloatFieldAnnotatedModel.class);
-
-        if (null != model) {
-            assertEquals(second, model.getFloat());
-        }
-    }
-
-    @Test
-    public void lastAnnotatedTest() {
-        Float last = 50F;
-
-        save(new FloatFieldAnnotatedModel(25F));
-        save(new FloatFieldAnnotatedModel(last));
-
-        FloatFieldAnnotatedModel model = last(FloatFieldAnnotatedModel.class);
-
-        if (null != model) {
-            assertEquals(last, model.getFloat());
-        }
-    }
-
-    @Test
-    public void lastDeletedRecordAnnotatedTest() {
-        Float third = 35F;
-
-        save(new FloatFieldAnnotatedModel(15F));
-        save(new FloatFieldAnnotatedModel(25F));
-        save(new FloatFieldAnnotatedModel(third));
-        save(new FloatFieldAnnotatedModel(45F));
-
-        FloatFieldAnnotatedModel lastRecord = findById(FloatFieldAnnotatedModel.class, 4);
-        delete(lastRecord);
-        FloatFieldAnnotatedModel model = last(FloatFieldAnnotatedModel.class);
-
-        if (null != model) {
-            assertEquals(third, model.getFloat());
-        }
-    }
-
-    @Test
-    public void nullFirstAnnotatedTest() {
-        assertNull(first(FloatFieldAnnotatedModel.class));
-    }
-
-    @Test
-    public void nullLastAnnotatedTest() {
-        assertNull(last(FloatFieldAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneItemAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel(25F));
-
-        FloatFieldAnnotatedModel first = first(FloatFieldAnnotatedModel.class);
-        FloatFieldAnnotatedModel last = last(FloatFieldAnnotatedModel.class);
-
-        if (null != first && null != last) {
-            assertEquals(first.getFloat(), last.getFloat());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/FloatFieldTests.java b/library/src/test/java/com/orm/record/FloatFieldTests.java
deleted file mode 100644
index d76516b9..00000000
--- a/library/src/test/java/com/orm/record/FloatFieldTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.FloatFieldAnnotatedModel;
-import com.orm.model.FloatFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@SuppressWarnings("all")
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class FloatFieldTests {
-    Float aFloat = Float.valueOf(25F);
-
-    @Test
-    public void nullFloatExtendedTest() {
-        save(new FloatFieldExtendedModel());
-        FloatFieldExtendedModel model = findById(FloatFieldExtendedModel.class, 1);
-        assertNull(model.getFloat());
-    }
-
-    @Test
-    public void nullRawFloatExtendedTest() {
-        save(new FloatFieldExtendedModel());
-        FloatFieldExtendedModel model = findById(FloatFieldExtendedModel.class, 1);
-        assertEquals(0F, model.getRawFloat(), 0.0000000001F);
-    }
-
-    @Test
-    public void nullFloatAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel());
-        FloatFieldAnnotatedModel model = findById(FloatFieldAnnotatedModel.class, 1);
-        assertNull(model.getFloat());
-    }
-
-    @Test
-    public void nullRawFloatAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel());
-        FloatFieldAnnotatedModel model = findById(FloatFieldAnnotatedModel.class, 1);
-        assertEquals(0F, model.getRawFloat(), 0.0000000001F);
-    }
-
-    @Test
-    public void objectFloatExtendedTest() {
-        save(new FloatFieldExtendedModel(aFloat));
-        FloatFieldExtendedModel model = findById(FloatFieldExtendedModel.class, 1);
-        assertEquals(aFloat, model.getFloat());
-    }
-
-    @Test
-    public void rawFloatExtendedTest() {
-        save(new FloatFieldExtendedModel(aFloat.floatValue()));
-        FloatFieldExtendedModel model = findById(FloatFieldExtendedModel.class, 1);
-        assertEquals(aFloat.floatValue(), model.getRawFloat(), 0.0000000001F);
-    }
-
-    @Test
-    public void objectFloatAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel(aFloat));
-        FloatFieldAnnotatedModel model = findById(FloatFieldAnnotatedModel.class, 1);
-        assertEquals(aFloat, model.getFloat());
-    }
-
-    @Test
-    public void rawFloatAnnotatedTest() {
-        save(new FloatFieldAnnotatedModel(aFloat.floatValue()));
-        FloatFieldAnnotatedModel model = findById(FloatFieldAnnotatedModel.class, 1);
-        assertEquals(aFloat.floatValue(), model.getRawFloat(), 0.0000000001F);
-    }
-}
diff --git a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java b/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
deleted file mode 100644
index 0053ed96..00000000
--- a/library/src/test/java/com/orm/record/IncompleteAnnotatedModelTests.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.orm.record;
-
-import android.database.sqlite.SQLiteException;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.IncompleteAnnotatedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.delete;
-import static com.orm.SugarRecord.save;
-
-import static org.junit.Assert.assertFalse;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class IncompleteAnnotatedModelTests {
-
-    @Test(expected = SQLiteException.class)
-    public void saveNoIdFieldTest() {
-        save(new IncompleteAnnotatedModel());
-    }
-
-    @Test
-    public void deleteNoIdFieldTest() {
-        assertFalse(delete(new IncompleteAnnotatedModel()));
-    }
-}
diff --git a/library/src/test/java/com/orm/record/IntegerFieldTests.java b/library/src/test/java/com/orm/record/IntegerFieldTests.java
deleted file mode 100644
index faf5fa84..00000000
--- a/library/src/test/java/com/orm/record/IntegerFieldTests.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.IntegerFieldAnnotatedModel;
-import com.orm.model.IntegerFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.findById;
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.sum;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class IntegerFieldTests {
-    private Integer integer = 25;
-
-    @Test
-    public void nullIntegerExtendedTest() {
-        save(new IntegerFieldExtendedModel());
-        IntegerFieldExtendedModel model = findById(IntegerFieldExtendedModel.class, 1);
-        assertNull(model.getInteger());
-    }
-
-    @Test
-    public void nullIntExtendedTest() {
-        save(new IntegerFieldExtendedModel());
-        IntegerFieldExtendedModel model = findById(IntegerFieldExtendedModel.class, 1);
-        assertEquals(0, model.getInt());
-    }
-
-    @Test
-    public void nullIntegerAnnotatedTest() {
-        save(new IntegerFieldAnnotatedModel());
-        IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
-        assertNull(model.getInteger());
-    }
-
-    @Test
-    public void nullIntAnnotatedTest() {
-        save(new IntegerFieldAnnotatedModel());
-        IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
-        assertEquals(0, model.getInt());
-    }
-
-    @Test
-    public void integerExtendedTest() {
-        save(new IntegerFieldExtendedModel(integer));
-        IntegerFieldExtendedModel model = findById(IntegerFieldExtendedModel.class, 1);
-        assertEquals(integer, model.getInteger());
-    }
-
-    @Test
-    public void intExtendedTest() {
-        save(new IntegerFieldExtendedModel(integer.intValue()));
-        IntegerFieldExtendedModel model = findById(IntegerFieldExtendedModel.class, 1);
-        assertEquals(integer.intValue(), model.getInt());
-    }
-
-    @Test
-    public void integerAnnotatedTest() {
-        save(new IntegerFieldAnnotatedModel(integer));
-        IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
-        assertEquals(integer, model.getInteger());
-    }
-
-    @Test
-    public void intAnnotatedTest() {
-        save(new IntegerFieldAnnotatedModel(integer.intValue()));
-        IntegerFieldAnnotatedModel model = findById(IntegerFieldAnnotatedModel.class, 1);
-        assertEquals(integer.intValue(), model.getInt());
-    }
-
-
-    @Test
-    public void sumTest() {
-        save(new IntegerFieldAnnotatedModel(integer.intValue()));
-        save(new IntegerFieldAnnotatedModel(integer.intValue()));
-        assertEquals(2 * integer, sum(IntegerFieldAnnotatedModel.class, "raw_integer"));
-    }
-
-    @Test
-    public void whereSumTest() {
-        save(new IntegerFieldAnnotatedModel(integer.intValue()));
-        save(new IntegerFieldAnnotatedModel(integer.intValue()));
-        assertEquals((long) integer, sum(IntegerFieldAnnotatedModel.class,
-                "raw_integer", "id = ?", "1"));
-    }
-
-    @Test
-    public void noSumTest() {
-        assertEquals(0, sum(IntegerFieldAnnotatedModel.class, "raw_integer"));
-    }
-
-    @Test
-    public void brokenSumTest() {
-        save(new IntegerFieldAnnotatedModel(integer.intValue()));
-        save(new IntegerFieldAnnotatedModel(integer.intValue()));
-        assertEquals(-1, sum(IntegerFieldAnnotatedModel.class, "wrongfield"));
-    }
-}
diff --git a/library/src/test/java/com/orm/record/ListAllOrderByTests.java b/library/src/test/java/com/orm/record/ListAllOrderByTests.java
deleted file mode 100644
index 548ead23..00000000
--- a/library/src/test/java/com/orm/record/ListAllOrderByTests.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.IntegerFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class ListAllOrderByTests {
-
-    @Test
-    public void listAllOrderByEmptyTest() {
-        final List<IntegerFieldExtendedModel> list = listAll(IntegerFieldExtendedModel.class, "id");
-        assertEquals(0L, list.size());
-    }
-
-    @Test
-    public void listAllOrderByIdTest() {
-        for (int i = 1; i <= 100; i++) {
-            save(new IntegerFieldExtendedModel(i));
-        }
-
-        List<IntegerFieldExtendedModel> models = listAll(IntegerFieldExtendedModel.class, "id");
-        assertEquals(100L, models.size());
-
-        Long id = models.get(0).getId();
-
-        for (int i = 1; i < 100; i++) {
-            assertTrue(id < models.get(i).getId());
-        }
-    }
-
-    @Test
-    public void listAllOrderByFieldTest() {
-        for (int i = 1; i <= 100; i++) {
-            save(new IntegerFieldExtendedModel(i));
-        }
-
-        List<IntegerFieldExtendedModel> models = listAll(IntegerFieldExtendedModel.class, "raw_integer");
-
-        assertEquals(100L, models.size());
-
-        int raw = models.get(0).getInt();
-
-        for (int i = 1; i < 100; i++) {
-            assertTrue(raw < models.get(i).getInt());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/LongFieldTests.java b/library/src/test/java/com/orm/record/LongFieldTests.java
deleted file mode 100644
index d1516a42..00000000
--- a/library/src/test/java/com/orm/record/LongFieldTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.LongFieldAnnotatedModel;
-import com.orm.model.LongFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@SuppressWarnings("all")
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class LongFieldTests {
-    private Long aLong = Long.valueOf(25L);
-
-    @Test
-    public void nullLongExtendedTest() {
-        save(new LongFieldExtendedModel());
-        LongFieldExtendedModel model = findById(LongFieldExtendedModel.class, 1);
-        assertNull(model.getLong());
-    }
-
-    @Test
-    public void nullRawLongExtendedTest() {
-        save(new LongFieldExtendedModel());
-        LongFieldExtendedModel model = findById(LongFieldExtendedModel.class, 1);
-        assertEquals(0L, model.getRawLong());
-    }
-
-    @Test
-    public void nullLongAnnotatedTest() {
-        save(new LongFieldAnnotatedModel());
-        LongFieldAnnotatedModel model = findById(LongFieldAnnotatedModel.class, 1);
-        assertNull(model.getLong());
-    }
-
-    @Test
-    public void nullRawLongAnnotatedTest() {
-        save(new LongFieldAnnotatedModel());
-        LongFieldAnnotatedModel model = findById(LongFieldAnnotatedModel.class, 1);
-        assertEquals(0L, model.getRawLong());
-    }
-
-    @Test
-    public void objectLongExtendedTest() {
-        save(new LongFieldExtendedModel(aLong));
-        LongFieldExtendedModel model = findById(LongFieldExtendedModel.class, 1);
-        assertEquals(aLong, model.getLong());
-    }
-
-    @Test
-    public void rawLongExtendedTest() {
-        save(new LongFieldExtendedModel(aLong.longValue()));
-        LongFieldExtendedModel model = findById(LongFieldExtendedModel.class, 1);
-        assertEquals(aLong.longValue(), model.getRawLong());
-    }
-
-    @Test
-    public void objectLongAnnotatedTest() {
-        save(new LongFieldAnnotatedModel(aLong));
-        LongFieldAnnotatedModel model = findById(LongFieldAnnotatedModel.class, 1);
-        assertEquals(aLong, model.getLong());
-    }
-
-    @Test
-    public void rawLongAnnotatedTest() {
-        save(new LongFieldAnnotatedModel(aLong.longValue()));
-        LongFieldAnnotatedModel model = findById(LongFieldAnnotatedModel.class, 1);
-        assertEquals(aLong.longValue(), model.getRawLong());
-    }
-}
diff --git a/library/src/test/java/com/orm/record/MultipleSaveTests.java b/library/src/test/java/com/orm/record/MultipleSaveTests.java
deleted file mode 100644
index 73b353ad..00000000
--- a/library/src/test/java/com/orm/record/MultipleSaveTests.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.StringFieldAnnotatedModel;
-import com.orm.model.StringFieldAnnotatedNoIdModel;
-import com.orm.model.StringFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class MultipleSaveTests {
-    private String testString = "Test String";
-    private String anotherString = "Another test";
-
-    @Test
-    public void stringMultipleSaveOriginalExtendedTest() {
-        StringFieldExtendedModel model = new StringFieldExtendedModel(testString);
-        long id = save(model);
-        StringFieldExtendedModel query = findById(StringFieldExtendedModel.class, id);
-
-        if (null != query) {
-            assertEquals(testString, query.getString());
-        }
-
-        model.setString(anotherString);
-
-        assertEquals(id, save(model));
-        assertNull(findById(StringFieldExtendedModel.class, 2));
-    }
-
-    @Test
-    public void stringMultipleSaveQueriedExtendedTest() {
-        StringFieldExtendedModel model = new StringFieldExtendedModel(testString);
-        long id = save(model);
-        StringFieldExtendedModel query = findById(StringFieldExtendedModel.class, id);
-
-        if (null != query) {
-            assertEquals(testString, query.getString());
-            query.setString(anotherString);
-            assertEquals(id, save(query));
-            assertNull(findById(StringFieldExtendedModel.class, 2));
-        }
-    }
-
-    @Test
-    public void stringMultipleSaveOriginalAnnotatedTest() {
-        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(testString);
-        long id = save(model);
-        StringFieldAnnotatedModel query = findById(StringFieldAnnotatedModel.class, id);
-
-        if (null != query) {
-            assertEquals(testString, query.getString());
-            model.setString(anotherString);
-            assertEquals(id, save(model));
-            assertNull(findById(StringFieldAnnotatedModel.class, 2));
-        }
-    }
-
-    @Test
-    public void stringMultipleSaveQueriedAnnotatedTest() {
-        StringFieldAnnotatedModel model = new StringFieldAnnotatedModel(testString);
-        long id = save(model);
-        StringFieldAnnotatedModel query = findById(StringFieldAnnotatedModel.class, id);
-
-        if (null != query) {
-            assertEquals(testString, query.getString());
-            query.setString(anotherString);
-            assertEquals(id, save(query));
-            assertNull(findById(StringFieldAnnotatedModel.class, 2));
-        }
-    }
-
-    @Test
-    public void stringMultipleSaveOriginalAnnotatedNoIdTest() {
-        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(testString);
-        long id = save(model);
-        StringFieldAnnotatedNoIdModel query = findById(StringFieldAnnotatedNoIdModel.class, id);
-
-        if (null != query) {
-            assertEquals(testString, query.getString());
-            model.setString(anotherString);
-            assertEquals(id, save(model));
-            assertNull(findById(StringFieldAnnotatedNoIdModel.class, 2));
-        }
-    }
-
-    @Test
-    public void stringMultipleSaveQueriedAnnotatedNoIdTest() {
-        StringFieldAnnotatedNoIdModel model = new StringFieldAnnotatedNoIdModel(testString);
-        long id = save(model);
-        StringFieldAnnotatedNoIdModel query = findById(StringFieldAnnotatedNoIdModel.class, id);
-
-        if (null != query) {
-            assertEquals(testString, query.getString());
-            query.setString(anotherString);
-            assertEquals(id, save(query));
-            assertNull(findById(StringFieldAnnotatedNoIdModel.class, 2));
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java b/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
deleted file mode 100644
index d7c8ef43..00000000
--- a/library/src/test/java/com/orm/record/NestedAnnotatedTests.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.NestedAnnotatedModel;
-import com.orm.model.RelationshipAnnotatedModel;
-import com.orm.model.SimpleAnnotatedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class NestedAnnotatedTests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(NestedAnnotatedModel.class));
-        assertEquals(0L, count(RelationshipAnnotatedModel.class));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        save(new NestedAnnotatedModel(nested));
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipAnnotatedModel.class));
-        assertEquals(1L, count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        save(new NestedAnnotatedModel(nested));
-        save(new NestedAnnotatedModel(nested));
-
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipAnnotatedModel.class));
-        assertEquals(2L, count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
-        save(anotherSimple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        RelationshipAnnotatedModel anotherNested = new RelationshipAnnotatedModel(anotherSimple);
-        save(anotherNested);
-        save(new NestedAnnotatedModel(nested));
-        save(new NestedAnnotatedModel(anotherNested));
-        assertEquals(2L, count(SimpleAnnotatedModel.class));
-        assertEquals(2L, count(RelationshipAnnotatedModel.class));
-        assertEquals(2L, count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedAnnotatedModel(nested));
-        }
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipAnnotatedModel.class));
-        assertEquals(100L, count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-            save(nested);
-            save(new NestedAnnotatedModel(nested));
-        }
-        assertEquals(100L, count(SimpleAnnotatedModel.class));
-        assertEquals(100L, count(RelationshipAnnotatedModel.class));
-        assertEquals(100L, count(NestedAnnotatedModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-        save(nested);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedAnnotatedModel(nested));
-        }
-
-        List<NestedAnnotatedModel> models = listAll(NestedAnnotatedModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedAnnotatedModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipAnnotatedModel nested = new RelationshipAnnotatedModel(simple);
-            save(nested);
-            save(new NestedAnnotatedModel(nested));
-        }
-
-        List<NestedAnnotatedModel> models = listAll(NestedAnnotatedModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedAnnotatedModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/NestedExtendedTests.java b/library/src/test/java/com/orm/record/NestedExtendedTests.java
deleted file mode 100644
index eaf8c120..00000000
--- a/library/src/test/java/com/orm/record/NestedExtendedTests.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.NestedExtendedModel;
-import com.orm.model.RelationshipExtendedModel;
-import com.orm.model.SimpleExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class NestedExtendedTests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(NestedExtendedModel.class));
-        assertEquals(0L, count(RelationshipExtendedModel.class));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        save(new NestedExtendedModel(nested));
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipExtendedModel.class));
-        assertEquals(1L, count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        save(new NestedExtendedModel(nested));
-        save(new NestedExtendedModel(nested));
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipExtendedModel.class));
-        assertEquals(2L, count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
-        save(anotherSimple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        RelationshipExtendedModel anotherNested = new RelationshipExtendedModel(anotherSimple);
-        save(anotherNested);
-        save(new NestedExtendedModel(nested));
-        save(new NestedExtendedModel(anotherNested));
-        assertEquals(2L, count(SimpleExtendedModel.class));
-        assertEquals(2L, count(RelationshipExtendedModel.class));
-        assertEquals(2L, count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedExtendedModel(nested));
-        }
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipExtendedModel.class));
-        assertEquals(100L, count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-            save(nested);
-            save(new NestedExtendedModel(nested));
-        }
-        assertEquals(100L, count(SimpleExtendedModel.class));
-        assertEquals(100L, count(RelationshipExtendedModel.class));
-        assertEquals(100L, count(NestedExtendedModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedExtendedModel(nested));
-        }
-
-        List<NestedExtendedModel> models = listAll(NestedExtendedModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedExtendedModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipExtendedModel nested = new RelationshipExtendedModel(simple);
-            save(nested);
-            save(new NestedExtendedModel(nested));
-        }
-
-        List<NestedExtendedModel> models = listAll(NestedExtendedModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedExtendedModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/NestedMixedAATests.java b/library/src/test/java/com/orm/record/NestedMixedAATests.java
deleted file mode 100644
index 9daf3fa9..00000000
--- a/library/src/test/java/com/orm/record/NestedMixedAATests.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.NestedMixedAAModel;
-import com.orm.model.RelationshipMixedAModel;
-import com.orm.model.SimpleAnnotatedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class NestedMixedAATests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(NestedMixedAAModel.class));
-        assertEquals(0L, count(RelationshipMixedAModel.class));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        save(new NestedMixedAAModel(nested));
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipMixedAModel.class));
-        assertEquals(1L, count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        save(new NestedMixedAAModel(nested));
-        save(new NestedMixedAAModel(nested));
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipMixedAModel.class));
-        assertEquals(2L, count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
-        save(anotherSimple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        RelationshipMixedAModel anotherNested = new RelationshipMixedAModel(anotherSimple);
-        save(anotherNested);
-        save(new NestedMixedAAModel(nested));
-        save(new NestedMixedAAModel(anotherNested));
-        assertEquals(2L, count(SimpleAnnotatedModel.class));
-        assertEquals(2L, count(RelationshipMixedAModel.class));
-        assertEquals(2L, count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedAAModel(nested));
-        }
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipMixedAModel.class));
-        assertEquals(100L, count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-            save(nested);
-            save(new NestedMixedAAModel(nested));
-        }
-        assertEquals(100L, count(SimpleAnnotatedModel.class));
-        assertEquals(100L, count(RelationshipMixedAModel.class));
-        assertEquals(100L, count(NestedMixedAAModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedAAModel(nested));
-        }
-
-        List<NestedMixedAAModel> models = listAll(NestedMixedAAModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedMixedAAModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-            save(nested);
-            save(new NestedMixedAAModel(nested));
-        }
-
-        List<NestedMixedAAModel> models = listAll(NestedMixedAAModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedMixedAAModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/NestedMixedABTests.java b/library/src/test/java/com/orm/record/NestedMixedABTests.java
deleted file mode 100644
index fa16b506..00000000
--- a/library/src/test/java/com/orm/record/NestedMixedABTests.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.NestedMixedABModel;
-import com.orm.model.RelationshipMixedBModel;
-import com.orm.model.SimpleExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class NestedMixedABTests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(NestedMixedABModel.class));
-        assertEquals(0L, count(RelationshipMixedBModel.class));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-
-        save(nested);
-        save(new NestedMixedABModel(nested));
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipMixedBModel.class));
-        assertEquals(1L, count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-
-        save(nested);
-        save(new NestedMixedABModel(nested));
-        save(new NestedMixedABModel(nested));
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipMixedBModel.class));
-        assertEquals(2L, count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
-        save(anotherSimple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        RelationshipMixedBModel anotherNested = new RelationshipMixedBModel(anotherSimple);
-
-        save(anotherNested);
-        save(new NestedMixedABModel(nested));
-        save(new NestedMixedABModel(anotherNested));
-
-        assertEquals(2L, count(SimpleExtendedModel.class));
-        assertEquals(2L, count(RelationshipMixedBModel.class));
-        assertEquals(2L, count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedABModel(nested));
-        }
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipMixedBModel.class));
-        assertEquals(100L, count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-            save(nested);
-            save(new NestedMixedABModel(nested));
-        }
-
-        assertEquals(100L, count(SimpleExtendedModel.class));
-        assertEquals(100L, count(RelationshipMixedBModel.class));
-        assertEquals(100L, count(NestedMixedABModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedABModel(nested));
-        }
-
-        List<NestedMixedABModel> models = listAll(NestedMixedABModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedMixedABModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-            save(nested);
-            save(new NestedMixedABModel(nested));
-        }
-
-        List<NestedMixedABModel> models = listAll(NestedMixedABModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedMixedABModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/NestedMixedBATests.java b/library/src/test/java/com/orm/record/NestedMixedBATests.java
deleted file mode 100644
index c6f07da5..00000000
--- a/library/src/test/java/com/orm/record/NestedMixedBATests.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.SugarRecord;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.NestedMixedBAModel;
-import com.orm.model.RelationshipMixedAModel;
-import com.orm.model.SimpleAnnotatedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class NestedMixedBATests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(NestedMixedBAModel.class));
-        assertEquals(0L, count(RelationshipMixedAModel.class));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-
-        save(nested);
-        save(new NestedMixedBAModel(nested));
-
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipMixedAModel.class));
-        assertEquals(1L, count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-
-        save(nested);
-        save(new NestedMixedBAModel(nested));
-        save(new NestedMixedBAModel(nested));
-
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipMixedAModel.class));
-        assertEquals(2L, count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
-        save(anotherSimple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-        RelationshipMixedAModel anotherNested = new RelationshipMixedAModel(anotherSimple);
-
-        save(anotherNested);
-        save(new NestedMixedBAModel(nested));
-        save(new NestedMixedBAModel(anotherNested));
-
-        assertEquals(2L, count(SimpleAnnotatedModel.class));
-        assertEquals(2L, count(RelationshipMixedAModel.class));
-        assertEquals(2L, count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedBAModel(nested));
-        }
-
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipMixedAModel.class));
-        assertEquals(100L, count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-            save(nested);
-            save(new NestedMixedBAModel(nested));
-        }
-
-        assertEquals(100L, count(SimpleAnnotatedModel.class));
-        assertEquals(100L, count(RelationshipMixedAModel.class));
-        assertEquals(100L, count(NestedMixedBAModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-        save(nested);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedBAModel(nested));
-        }
-
-        List<NestedMixedBAModel> models = listAll(NestedMixedBAModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedMixedBAModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            RelationshipMixedAModel nested = new RelationshipMixedAModel(simple);
-            save(nested);
-            save(new NestedMixedBAModel(nested));
-        }
-
-        List<NestedMixedBAModel> models = listAll(NestedMixedBAModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedMixedBAModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/NestedMixedBBTests.java b/library/src/test/java/com/orm/record/NestedMixedBBTests.java
deleted file mode 100644
index 1eeb2a7d..00000000
--- a/library/src/test/java/com/orm/record/NestedMixedBBTests.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.NestedMixedBBModel;
-import com.orm.model.RelationshipMixedBModel;
-import com.orm.model.SimpleExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class NestedMixedBBTests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(NestedMixedBBModel.class));
-        assertEquals(0L, count(RelationshipMixedBModel.class));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-
-        save(nested);
-        save(new NestedMixedBBModel(nested));
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipMixedBModel.class));
-        assertEquals(1L, count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-
-        save(nested);
-        save(new NestedMixedBBModel(nested));
-        save(new NestedMixedBBModel(nested));
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipMixedBModel.class));
-        assertEquals(2L, count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
-        save(anotherSimple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-        RelationshipMixedBModel anotherNested = new RelationshipMixedBModel(anotherSimple);
-
-        save(anotherNested);
-        save(new NestedMixedBBModel(nested));
-        save(new NestedMixedBBModel(anotherNested));
-
-        assertEquals(2L, count(SimpleExtendedModel.class));
-        assertEquals(2L, count(RelationshipMixedBModel.class));
-        assertEquals(2L, count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedBBModel(nested));
-        }
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipMixedBModel.class));
-        assertEquals(100L, count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-            save(nested);
-            save(new NestedMixedBBModel(nested));
-        }
-
-        assertEquals(100L, count(SimpleExtendedModel.class));
-        assertEquals(100L, count(RelationshipMixedBModel.class));
-        assertEquals(100L, count(NestedMixedBBModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-        save(nested);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new NestedMixedBBModel(nested));
-        }
-
-        List<NestedMixedBBModel> models = listAll(NestedMixedBBModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedMixedBBModel model : models) {
-            assertEquals(nested.getId(), model.getNested().getId());
-            assertEquals(simple.getId(), model.getNested().getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            RelationshipMixedBModel nested = new RelationshipMixedBModel(simple);
-            save(nested);
-            save(new NestedMixedBBModel(nested));
-        }
-
-        List<NestedMixedBBModel> models = listAll(NestedMixedBBModel.class);
-        assertEquals(100, models.size());
-
-        for (NestedMixedBBModel model : models) {
-            assertEquals(model.getId(), model.getNested().getId());
-            assertEquals(model.getId(), model.getNested().getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/NoSugarModelTests.java b/library/src/test/java/com/orm/record/NoSugarModelTests.java
deleted file mode 100644
index 08f43154..00000000
--- a/library/src/test/java/com/orm/record/NoSugarModelTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.NoSugarModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.delete;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.saveInTx;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class NoSugarModelTests {
-
-    @Test
-    public void deleteTest() throws Exception {
-        NoSugarModel model = new NoSugarModel();
-        assertFalse(delete(model));
-    }
-
-    @Test
-    public void saveInTransactionTest() throws Exception {
-        saveInTx(new NoSugarModel(), new NoSugarModel());
-        assertEquals(-1L, count(NoSugarModel.class));
-    }
-}
diff --git a/library/src/test/java/com/orm/record/OneToManyTest.java b/library/src/test/java/com/orm/record/OneToManyTest.java
deleted file mode 100644
index 73a60b57..00000000
--- a/library/src/test/java/com/orm/record/OneToManyTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.onetomany.OneToManyRelationModel;
-import com.orm.model.onetomany.OneToManyModel;
-import com.orm.model.onetomany.WithoutOneToManyAnnotationModel;
-import com.orm.model.onetomany.WithoutOneToManyAnnotationRelationModel;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static com.orm.SugarRecord.findById;
-import static com.orm.SugarRecord.save;
-
-/**
- * Created by Łukasz Wesołowski on 28.07.2016.
- */
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class OneToManyTest {
-    @Test
-    public void shouldSaveWithOneToManyRelation() {
-        List<Long> relationIds = Arrays.asList(1l, 2l, 3l, 4l);
-
-        OneToManyModel model = new OneToManyModel(1l);
-        save(model);
-
-        for (long i : relationIds) {
-            save(new OneToManyRelationModel(i, model));
-        }
-
-        OneToManyModel result = findById(OneToManyModel.class, 1l);
-
-        Assert.assertEquals(4, result.getModels().size());
-
-        Assert.assertTrue(relationIds.contains(result.getModels().get(0).getId()));
-        Assert.assertTrue(relationIds.contains(result.getModels().get(1).getId()));
-        Assert.assertTrue(relationIds.contains(result.getModels().get(2).getId()));
-        Assert.assertTrue(relationIds.contains(result.getModels().get(3).getId()));
-
-        Assert.assertEquals(result, result.getModels().get(0).getModel());
-        Assert.assertEquals(result, result.getModels().get(1).getModel());
-        Assert.assertEquals(result, result.getModels().get(2).getModel());
-        Assert.assertEquals(result, result.getModels().get(3).getModel());
-    }
-
-    @Test
-    public void shouldRemoveOneOfManyToOneRelation() {
-        OneToManyModel model = new OneToManyModel(1l);
-        save(model);
-
-        for (long i : Arrays.asList(1l, 2l, 3l, 4l)) {
-            save(new OneToManyRelationModel(i, model));
-        }
-
-        OneToManyModel result = findById(OneToManyModel.class, 1l);
-
-        Assert.assertEquals(4, result.getModels().size());
-
-        OneToManyRelationModel.deleteAll(OneToManyRelationModel.class, "id = ?", String.valueOf(3l));
-
-        result = findById(OneToManyModel.class, 1l);
-
-        Assert.assertEquals(3, result.getModels().size());
-
-        Assert.assertTrue(result.getModels().get(0).getId() != 3l);
-        Assert.assertTrue(result.getModels().get(1).getId() != 3l);
-        Assert.assertTrue(result.getModels().get(2).getId() != 3l);
-    }
-
-    @Test
-    public void shouldNotRemoveRelation() {
-        OneToManyModel model = new OneToManyModel(1l);
-        save(model);
-
-        for (long i : Arrays.asList(1l, 2l, 3l, 4l)) {
-            save(new OneToManyRelationModel(i, model));
-        }
-
-        OneToManyModel result = findById(OneToManyModel.class, 1l);
-
-        result.getModels().clear();
-
-        save(model);
-
-        result = findById(OneToManyModel.class, 1l);
-
-        Assert.assertEquals(4, result.getModels().size());
-    }
-
-    @Test
-    public void shouldNotAddRelation() {
-        List<Long> relationIds = Arrays.asList(1l, 2l, 3l, 4l);
-        OneToManyModel model = new OneToManyModel(1l);
-        save(model);
-
-        for (long i : relationIds) {
-            save(new OneToManyRelationModel(i, model));
-        }
-
-        save(new OneToManyRelationModel(5l, null));
-
-        OneToManyModel result = findById(OneToManyModel.class, 1l);
-
-        Assert.assertEquals(4, result.getModels().size());
-
-        Assert.assertTrue(relationIds.contains(result.getModels().get(0).getId()));
-        Assert.assertTrue(relationIds.contains(result.getModels().get(1).getId()));
-        Assert.assertTrue(relationIds.contains(result.getModels().get(2).getId()));
-        Assert.assertTrue(relationIds.contains(result.getModels().get(3).getId()));
-
-        Assert.assertEquals(result, result.getModels().get(0).getModel());
-        Assert.assertEquals(result, result.getModels().get(1).getModel());
-        Assert.assertEquals(result, result.getModels().get(2).getModel());
-        Assert.assertEquals(result, result.getModels().get(3).getModel());
-    }
-
-    @Test
-    public void shouldNotInflateList() {
-        List<Long> relationIds = Arrays.asList(1l, 2l, 3l, 4l);
-        WithoutOneToManyAnnotationModel model = new WithoutOneToManyAnnotationModel(1l);
-        save(model);
-
-        for (long i : relationIds) {
-            save(new WithoutOneToManyAnnotationRelationModel(i, model));
-        }
-
-        WithoutOneToManyAnnotationModel result = findById(WithoutOneToManyAnnotationModel.class, 1l);
-
-        Assert.assertEquals(null, result.getModels());
-    }
-}
diff --git a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java b/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
deleted file mode 100644
index 506e0264..00000000
--- a/library/src/test/java/com/orm/record/RelationshipAnnotatedTests.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.RelationshipAnnotatedModel;
-import com.orm.model.SimpleAnnotatedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class RelationshipAnnotatedTests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(RelationshipAnnotatedModel.class));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-
-        save(simple);
-        save(new RelationshipAnnotatedModel(simple));
-
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(1L, count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-
-        save(simple);
-        save(new RelationshipAnnotatedModel(simple));
-        save(new RelationshipAnnotatedModel(simple));
-
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(2L, count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
-
-        save(anotherSimple);
-        save(new RelationshipAnnotatedModel(simple));
-        save(new RelationshipAnnotatedModel(anotherSimple));
-
-        assertEquals(2L, count(SimpleAnnotatedModel.class));
-        assertEquals(2L, count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipAnnotatedModel(simple));
-        }
-
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertEquals(100L, count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            save(new RelationshipAnnotatedModel(simple));
-        }
-
-        assertEquals(100L, count(SimpleAnnotatedModel.class));
-        assertEquals(100L, count(RelationshipAnnotatedModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        save(simple);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipAnnotatedModel(simple));
-        }
-
-        List<RelationshipAnnotatedModel> models = listAll(RelationshipAnnotatedModel.class);
-        assertEquals(100, models.size());
-
-        for (RelationshipAnnotatedModel model : models) {
-            assertEquals(simple.getId(), model.getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-            save(simple);
-            save(new RelationshipAnnotatedModel(simple));
-        }
-
-        List<RelationshipAnnotatedModel> models = listAll(RelationshipAnnotatedModel.class);
-        assertEquals(100, models.size());
-
-        for (RelationshipAnnotatedModel model : models) {
-            assertEquals(model.getId(), model.getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java b/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
deleted file mode 100644
index f9faeedd..00000000
--- a/library/src/test/java/com/orm/record/RelationshipExtendedTests.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.RelationshipExtendedModel;
-import com.orm.model.SimpleExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class RelationshipExtendedTests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(RelationshipExtendedModel.class));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-
-        save(simple);
-        save(new RelationshipExtendedModel(simple));
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-
-        save(simple);
-        save(new RelationshipExtendedModel(simple));
-        save(new RelationshipExtendedModel(simple));
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(2L, count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
-
-        save(anotherSimple);
-        save(new RelationshipExtendedModel(simple));
-        save(new RelationshipExtendedModel(anotherSimple));
-
-        assertEquals(2L, count(SimpleExtendedModel.class));
-        assertEquals(2L, count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipExtendedModel(simple));
-        }
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(100L, count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            save(new RelationshipExtendedModel(simple));
-        }
-
-        assertEquals(100L, count(SimpleExtendedModel.class));
-        assertEquals(100L, count(RelationshipExtendedModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipExtendedModel(simple));
-        }
-
-        List<RelationshipExtendedModel> models = listAll(RelationshipExtendedModel.class);
-        assertEquals(100, models.size());
-
-        for (RelationshipExtendedModel model : models) {
-            assertEquals(simple.getId(), model.getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            save(new RelationshipExtendedModel(simple));
-        }
-
-        List<RelationshipExtendedModel> models = listAll(RelationshipExtendedModel.class);
-        assertEquals(100, models.size());
-
-        for (RelationshipExtendedModel model : models) {
-            assertEquals(model.getId(), model.getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/RelationshipMixedATests.java b/library/src/test/java/com/orm/record/RelationshipMixedATests.java
deleted file mode 100644
index 35aaa16d..00000000
--- a/library/src/test/java/com/orm/record/RelationshipMixedATests.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.RelationshipMixedAModel;
-import com.orm.model.SimpleAnnotatedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class RelationshipMixedATests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(RelationshipMixedAModel.class));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        RelationshipMixedAModel mixedAModel = new RelationshipMixedAModel(simple);
-
-        save(simple);
-        save(mixedAModel);
-
-        assertEquals(1L, count(simple.getClass()));
-        assertEquals(1L, count(mixedAModel.getClass()));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        RelationshipMixedAModel mixedAModel1 = new RelationshipMixedAModel(simple);
-        RelationshipMixedAModel mixedAModel2 = new RelationshipMixedAModel(simple);
-
-
-        save(simple);
-        save(mixedAModel1);
-        save(mixedAModel2);
-
-        assertEquals(1L, count(simple.getClass()));
-        assertEquals(2L, count(mixedAModel1.getClass()));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel anotherSimple = new SimpleAnnotatedModel();
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        RelationshipMixedAModel mixedAModel = new RelationshipMixedAModel(simple);
-        RelationshipMixedAModel anotherMixedAModel = new RelationshipMixedAModel(anotherSimple);
-
-        save(simple);
-        save(anotherSimple);
-        save(mixedAModel);
-        save(anotherMixedAModel);
-
-        assertEquals(2L, count(simple.getClass()));
-        assertEquals(2L, count(mixedAModel.getClass()));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        final SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-        RelationshipMixedAModel mixedAModel = null;
-        save(simple);
-
-        for (int i = 1; i <= 100; i++) {
-            mixedAModel = new RelationshipMixedAModel(simple);
-            save(mixedAModel);
-        }
-
-        assertEquals(1L, count(simple.getClass()));
-        assertEquals(100L, count(mixedAModel.getClass()));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        SimpleAnnotatedModel simple = null;
-        RelationshipMixedAModel mixedAModel = null;
-
-        for (int i = 1; i <= 100; i++) {
-            simple = new SimpleAnnotatedModel();
-            mixedAModel = new RelationshipMixedAModel(simple);
-
-            save(simple);
-            save(mixedAModel);
-        }
-
-        assertEquals(100L, count(simple.getClass()));
-        assertEquals(100L, count(mixedAModel.getClass()));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-
-        for (int i = 1; i <= 100; i++) {
-            RelationshipMixedAModel mixedAModel = new RelationshipMixedAModel(simple);
-
-            save(simple);
-            save(mixedAModel);
-        }
-
-        List<RelationshipMixedAModel> models = listAll(RelationshipMixedAModel.class);
-        assertEquals(100, models.size());
-
-        for (RelationshipMixedAModel model : models) {
-            assertEquals(simple.getId(), model.getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel simple = new SimpleAnnotatedModel();
-
-            save(simple);
-            save(new RelationshipMixedAModel(simple));
-        }
-
-        List<RelationshipMixedAModel> models = listAll(RelationshipMixedAModel.class);
-        assertEquals(100, models.size());
-
-        for (RelationshipMixedAModel model : models) {
-            assertEquals(model.getId(), model.getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java b/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
deleted file mode 100644
index 7792fce8..00000000
--- a/library/src/test/java/com/orm/record/RelationshipMixedBTests.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.RelationshipMixedBModel;
-import com.orm.model.SimpleExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public class RelationshipMixedBTests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(RelationshipMixedBModel.class));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-
-        save(simple);
-        save(new RelationshipMixedBModel(simple));
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(1L, count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void twoSameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-
-        save(simple);
-        save(new RelationshipMixedBModel(simple));
-        save(new RelationshipMixedBModel(simple));
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(2L, count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void twoDifferentSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        SimpleExtendedModel anotherSimple = new SimpleExtendedModel();
-
-        save(anotherSimple);
-        save(new RelationshipMixedBModel(simple));
-        save(new RelationshipMixedBModel(anotherSimple));
-
-        assertEquals(2L, count(SimpleExtendedModel.class));
-        assertEquals(2L, count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void manySameSaveTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipMixedBModel(simple));
-        }
-
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertEquals(100L, count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void manyDifferentSaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            save(new RelationshipMixedBModel(simple));
-        }
-
-        assertEquals(100L, count(SimpleExtendedModel.class));
-        assertEquals(100L, count(RelationshipMixedBModel.class));
-    }
-
-    @Test
-    public void listAllSameTest() throws Exception {
-        SimpleExtendedModel simple = new SimpleExtendedModel();
-        save(simple);
-        for (int i = 1; i <= 100; i++) {
-            save(new RelationshipMixedBModel(simple));
-        }
-        List<RelationshipMixedBModel> models = listAll(RelationshipMixedBModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipMixedBModel model : models) {
-            assertEquals(simple.getId(), model.getSimple().getId());
-        }
-    }
-
-    @Test
-    public void listAllDifferentTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            SimpleExtendedModel simple = new SimpleExtendedModel();
-            save(simple);
-            save(new RelationshipMixedBModel(simple));
-        }
-        List<RelationshipMixedBModel> models = listAll(RelationshipMixedBModel.class);
-        assertEquals(100, models.size());
-        for (RelationshipMixedBModel model : models) {
-            assertEquals(model.getId(), model.getSimple().getId());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/record/ShortFieldTests.java b/library/src/test/java/com/orm/record/ShortFieldTests.java
deleted file mode 100644
index 1a65f676..00000000
--- a/library/src/test/java/com/orm/record/ShortFieldTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.ShortFieldAnnotatedModel;
-import com.orm.model.ShortFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@SuppressWarnings("all")
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class ShortFieldTests {
-    private Short aShort = Short.valueOf((short) 25);
-
-    @Test
-    public void nullShortExtendedTest() {
-        save(new ShortFieldExtendedModel());
-        ShortFieldExtendedModel model = findById(ShortFieldExtendedModel.class, 1);
-        assertNull(model.getShort());
-    }
-
-    @Test
-    public void nullRawShortExtendedTest() {
-        save(new ShortFieldExtendedModel());
-        ShortFieldExtendedModel model = findById(ShortFieldExtendedModel.class, 1);
-        assertEquals((short) 0, model.getRawShort());
-    }
-
-    @Test
-    public void nullShortAnnotatedTest() {
-        save(new ShortFieldAnnotatedModel());
-        ShortFieldAnnotatedModel model = findById(ShortFieldAnnotatedModel.class, 1);
-        assertNull(model.getShort());
-    }
-
-    @Test
-    public void nullRawShortAnnotatedTest() {
-        save(new ShortFieldAnnotatedModel());
-        ShortFieldAnnotatedModel model = findById(ShortFieldAnnotatedModel.class, 1);
-        assertEquals((short) 0, model.getRawShort());
-    }
-
-    @Test
-    public void objectShortExtendedTest() {
-        save(new ShortFieldExtendedModel(aShort));
-        ShortFieldExtendedModel model = findById(ShortFieldExtendedModel.class, 1);
-        assertEquals(aShort, model.getShort());
-    }
-
-    @Test
-    public void rawShortExtendedTest() {
-        save(new ShortFieldExtendedModel(aShort.shortValue()));
-        ShortFieldExtendedModel model = findById(ShortFieldExtendedModel.class, 1);
-        assertEquals(aShort.shortValue(), model.getRawShort());
-    }
-
-    @Test
-    public void objectShortAnnotatedTest() {
-        save(new ShortFieldAnnotatedModel(aShort));
-        ShortFieldAnnotatedModel model = findById(ShortFieldAnnotatedModel.class, 1);
-        assertEquals(aShort, model.getShort());
-    }
-
-    @Test
-    public void rawShortAnnotatedTest() {
-        save(new ShortFieldAnnotatedModel(aShort.shortValue()));
-        ShortFieldAnnotatedModel model = findById(ShortFieldAnnotatedModel.class, 1);
-        assertEquals(aShort.shortValue(), model.getRawShort());
-    }
-}
diff --git a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java b/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
deleted file mode 100644
index a201a9eb..00000000
--- a/library/src/test/java/com/orm/record/SimpleAnnotatedModelTests.java
+++ /dev/null
@@ -1,373 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.helper.NamingHelper;
-import com.orm.model.SimpleAnnotatedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.deleteAll;
-import static com.orm.SugarRecord.delete;
-import static com.orm.SugarRecord.deleteInTx;
-import static com.orm.SugarRecord.listAll;
-import static com.orm.SugarRecord.findById;
-import static com.orm.SugarRecord.saveInTx;
-import static com.orm.SugarRecord.find;
-import static com.orm.SugarRecord.findAsIterator;
-import static com.orm.SugarRecord.findWithQuery;
-import static com.orm.SugarRecord.findAll;
-import static com.orm.SugarRecord.findWithQueryAsIterator;
-import static com.orm.SugarRecord.executeQuery;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class SimpleAnnotatedModelTests {
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void twoSaveTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        assertEquals(2L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void manySaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        assertEquals(100L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void defaultIdTest() throws Exception {
-        assertEquals(1L, save(new SimpleAnnotatedModel()));
-    }
-
-    @Test
-    public void whereCountTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        assertEquals(1L, count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void whereNoCountTest() throws Exception {
-        assertEquals(0L, count(SimpleAnnotatedModel.class, "id = ?", new String[]{"1"}));
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        assertEquals(0L, count(SimpleAnnotatedModel.class, "id = ?", new String[]{"3"}));
-        assertEquals(0L, count(SimpleAnnotatedModel.class, "id = ?", new String[]{"a"}));
-    }
-
-    @Test
-    public void whereBrokenCountTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        assertEquals(-1L, count(SimpleAnnotatedModel.class, "di = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void deleteTest() throws Exception {
-        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-        save(model);
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-        assertTrue(delete(model));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteUnsavedTest() throws Exception {
-        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-        assertFalse(delete(model));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteWrongTest() throws Exception {
-        SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-        save(model);
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-
-        Field idField = model.getClass().getDeclaredField("id");
-        idField.setAccessible(true);
-        idField.set(model, Long.MAX_VALUE);
-
-        assertFalse(delete(model));
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-
-        assertEquals(100, deleteAll(SimpleAnnotatedModel.class));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    @SuppressWarnings("all")
-    public void deleteAllWhereTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-
-        assertEquals(99, deleteAll(SimpleAnnotatedModel.class, "id > ?", new String[]{"1"}));
-        assertEquals(1L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteInTransactionFewTest() throws Exception {
-        SimpleAnnotatedModel first = new SimpleAnnotatedModel();
-        SimpleAnnotatedModel second = new SimpleAnnotatedModel();
-        SimpleAnnotatedModel third = new SimpleAnnotatedModel();
-        save(first);
-        save(second);
-        // Not saving last model
-        assertEquals(2L, count(SimpleAnnotatedModel.class));
-        assertEquals(2, deleteInTx(first, second, third));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void deleteInTransactionManyTest() throws Exception {
-        List<SimpleAnnotatedModel> models = new ArrayList<>();
-
-        for (int i = 1; i <= 100; i++) {
-            SimpleAnnotatedModel model = new SimpleAnnotatedModel();
-            models.add(model);
-            // Not saving last model
-            if (i < 100) {
-                save(model);
-            }
-        }
-
-        assertEquals(99, count(SimpleAnnotatedModel.class));
-        assertEquals(99, deleteInTx(models));
-        assertEquals(0L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void saveInTransactionTest() throws Exception {
-        saveInTx(new SimpleAnnotatedModel(), new SimpleAnnotatedModel());
-        assertEquals(2L, count(SimpleAnnotatedModel.class));
-    }
-
-    @Test
-    public void listAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-
-        List<SimpleAnnotatedModel> models = listAll(SimpleAnnotatedModel.class);
-        assertEquals(100, models.size());
-
-        for (long i = 1; i <= 100; i++) {
-            assertEquals(Long.valueOf(i), models.get((int) i - 1).getId());
-        }
-    }
-
-    @Test
-    public void findTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-
-        List<SimpleAnnotatedModel> models = find(SimpleAnnotatedModel.class, "id = ?", "2");
-
-        assertEquals(1, models.size());
-        assertEquals(2L, models.get(0).getId().longValue());
-    }
-
-    @Test
-    public void findWithQueryTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-
-        List<SimpleAnnotatedModel> models = findWithQuery(SimpleAnnotatedModel.class, "Select * from " +
-                        NamingHelper.toTableName(SimpleAnnotatedModel.class) +
-                        " where id >= ? ", "50");
-
-        for (SimpleAnnotatedModel model : models) {
-            assertEquals(75L, model.getId(), 25L);
-        }
-    }
-
-    @Test
-    @SuppressWarnings("all")
-    public void findByIdTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertEquals(1L, findById(SimpleAnnotatedModel.class, 1L).getId().longValue());
-    }
-
-    @Test
-    public void findByIdIntegerTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertEquals(1L, findById(SimpleAnnotatedModel.class, 1).getId().longValue());
-    }
-
-    @Test
-    public void findByIdStringsNullTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertEquals(0, findById(SimpleAnnotatedModel.class, new String[]{""}).size());
-    }
-
-    @Test
-    public void findByIdStringsOneTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        List<SimpleAnnotatedModel> models = findById(SimpleAnnotatedModel.class, new String[]{"1"});
-        assertEquals(1, models.size());
-        assertEquals(1L, models.get(0).getId().longValue());
-    }
-
-    @Test
-    public void findByIdStringsTwoTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        save(new SimpleAnnotatedModel());
-        List<SimpleAnnotatedModel> models = findById(SimpleAnnotatedModel.class, new String[]{"1", "3"});
-        assertEquals(2, models.size());
-        assertEquals(Long.valueOf(1L), models.get(0).getId());
-        assertEquals(Long.valueOf(3L), models.get(1).getId());
-    }
-
-    @Test
-    public void findByIdStringsManyTest() throws Exception {
-        for (int i = 1; i <= 10; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        List<SimpleAnnotatedModel> models = findById(SimpleAnnotatedModel.class, new String[]{"1", "3", "6", "10"});
-        assertEquals(4, models.size());
-        assertEquals(Long.valueOf(1L), models.get(0).getId());
-        assertEquals(Long.valueOf(3L), models.get(1).getId());
-        assertEquals(Long.valueOf(6L), models.get(2).getId());
-        assertEquals(Long.valueOf(10L), models.get(3).getId());
-    }
-
-    @Test
-    public void findByIdStringsOrderTest() throws Exception {
-        for (int i = 1; i <= 10; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        List<SimpleAnnotatedModel> models = findById(SimpleAnnotatedModel.class, new String[]{"10", "6", "3", "1"});
-        assertEquals(4, models.size());
-        // The order of the query doesn't matter
-        assertEquals(Long.valueOf(1L), models.get(0).getId());
-        assertEquals(Long.valueOf(3L), models.get(1).getId());
-        assertEquals(Long.valueOf(6L), models.get(2).getId());
-        assertEquals(Long.valueOf(10L), models.get(3).getId());
-    }
-
-    @Test
-    public void findByIdNullTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        assertNull(findById(SimpleAnnotatedModel.class, 2L));
-    }
-
-    @Test
-    public void findAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        Iterator<SimpleAnnotatedModel> cursor = findAll(SimpleAnnotatedModel.class);
-        for (int i = 1; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleAnnotatedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(Long.valueOf(i), model.getId());
-        }
-    }
-
-    @Test
-    public void findAsIteratorTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        Iterator<SimpleAnnotatedModel> cursor = findAsIterator(SimpleAnnotatedModel.class,
-                "id >= ?", "50");
-        for (int i = 50; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleAnnotatedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(Long.valueOf(i), model.getId());
-        }
-    }
-
-    @Test
-    public void findWithQueryAsIteratorTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleAnnotatedModel());
-        }
-        Iterator<SimpleAnnotatedModel> cursor = findWithQueryAsIterator(SimpleAnnotatedModel.class,
-                        "Select * from " +
-                                NamingHelper.toTableName(SimpleAnnotatedModel.class) +
-                                " where id >= ? ", "50");
-        for (int i = 50; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleAnnotatedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(Long.valueOf(i), model.getId());
-        }
-    }
-
-    @Test(expected=NoSuchElementException.class)
-    public void findAsIteratorOutOfBoundsTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        Iterator<SimpleAnnotatedModel> cursor = findAsIterator(SimpleAnnotatedModel.class,
-                "id = ?", "1");
-        assertTrue(cursor.hasNext());
-        SimpleAnnotatedModel model = cursor.next();
-        assertNotNull(model);
-        assertEquals(Long.valueOf(1), model.getId());
-        // This should throw a NoSuchElementException
-        cursor.next();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void disallowRemoveCursorTest() throws Exception {
-        save(new SimpleAnnotatedModel());
-        Iterator<SimpleAnnotatedModel> cursor = findAsIterator(SimpleAnnotatedModel.class, "id = ?", "1");
-        assertTrue(cursor.hasNext());
-        SimpleAnnotatedModel model = cursor.next();
-        assertNotNull(model);
-        assertEquals(Long.valueOf(1), model.getId());
-        // This should throw a UnsupportedOperationException
-        cursor.remove();
-    }
-
-    @Test
-    public void vacuumTest() throws Exception {
-        executeQuery("Vacuum");
-    }
-}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java b/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
deleted file mode 100644
index e809405d..00000000
--- a/library/src/test/java/com/orm/record/SimpleExtendedModelTests.java
+++ /dev/null
@@ -1,382 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.helper.NamingHelper;
-import com.orm.model.SimpleExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.count;
-import static com.orm.SugarRecord.delete;
-import static com.orm.SugarRecord.deleteAll;
-import static com.orm.SugarRecord.executeQuery;
-import static com.orm.SugarRecord.find;
-import static com.orm.SugarRecord.findAll;
-import static com.orm.SugarRecord.findById;
-import static com.orm.SugarRecord.findWithQuery;
-import static com.orm.SugarRecord.findAsIterator;
-import static com.orm.SugarRecord.findWithQueryAsIterator;
-import static com.orm.SugarRecord.deleteInTx;
-import static com.orm.SugarRecord.saveInTx;
-import static com.orm.SugarRecord.listAll;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class SimpleExtendedModelTests {
-    private String id = "id = ?";
-
-    @Test
-    public void emptyDatabaseTest() throws Exception {
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void oneSaveTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertEquals(1L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void twoSaveTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        assertEquals(2L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void manySaveTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-
-        assertEquals(100L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void defaultIdTest() throws Exception {
-        assertEquals(1L, save(new SimpleExtendedModel()));
-    }
-
-    @Test
-    public void whereCountTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        assertEquals(1L, count(SimpleExtendedModel.class, id, new String[]{"1"}));
-    }
-
-    @Test
-    public void whereNoCountTest() throws Exception {
-        assertEquals(0L, count(SimpleExtendedModel.class, id, new String[]{"1"}));
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        assertEquals(0L, count(SimpleExtendedModel.class, id, new String[]{"3"}));
-        assertEquals(0L, count(SimpleExtendedModel.class, id, new String[]{"a"}));
-    }
-
-    @Test
-    public void whereBrokenCountTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        assertEquals(-1L, count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void saveMethodTest() throws Exception {
-        SimpleExtendedModel model = new SimpleExtendedModel();
-        model.save();
-        assertEquals(-1L, count(SimpleExtendedModel.class, "di = ?", new String[]{"1"}));
-    }
-
-    @Test
-    public void deleteTest() throws Exception {
-        SimpleExtendedModel model = new SimpleExtendedModel();
-        save(model);
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        assertTrue(delete(model));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteUnsavedTest() throws Exception {
-        SimpleExtendedModel model = new SimpleExtendedModel();
-        assertEquals(0L, count(SimpleExtendedModel.class));
-        assertFalse(delete(model));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteWrongTest() throws Exception {
-        SimpleExtendedModel model = new SimpleExtendedModel();
-        save(model);
-        assertEquals(1L, count(SimpleExtendedModel.class));
-        Field idField = model.getClass().getSuperclass().getDeclaredField("id");
-        idField.setAccessible(true);
-        idField.set(model, Long.MAX_VALUE);
-        assertFalse(delete(model));
-        assertEquals(1L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteAllTest() throws Exception {
-        int elementNumber = 100;
-        for (int i = 1; i <= elementNumber; i++) {
-            save(new SimpleExtendedModel());
-        }
-        assertEquals(elementNumber, deleteAll(SimpleExtendedModel.class));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    @SuppressWarnings("all")
-    public void deleteAllWhereTest() throws Exception {
-        int elementNumber = 100;
-        for (int i = 1; i <= elementNumber; i++) {
-            save(new SimpleExtendedModel());
-        }
-        assertEquals(elementNumber - 1, deleteAll(SimpleExtendedModel.class, "id > ?", new String[]{"1"}));
-        assertEquals(1L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteInTransactionFewTest() throws Exception {
-        SimpleExtendedModel first = new SimpleExtendedModel();
-        SimpleExtendedModel second = new SimpleExtendedModel();
-        SimpleExtendedModel third = new SimpleExtendedModel();
-        save(first);
-        save(second);
-        // Not saving last model
-        assertEquals(2L, count(SimpleExtendedModel.class));
-        assertEquals(2, deleteInTx(first, second, third));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void deleteInTransactionManyTest() throws Exception {
-        long elementNumber = 100;
-        List<SimpleExtendedModel> models = new ArrayList<>();
-        for (int i = 1; i <= elementNumber; i++) {
-            SimpleExtendedModel model = new SimpleExtendedModel();
-            models.add(model);
-            // Not saving last model
-            if (i < elementNumber) {
-                save(model);
-            }
-        }
-        assertEquals(elementNumber - 1, count(SimpleExtendedModel.class));
-        assertEquals(elementNumber - 1, deleteInTx(models));
-        assertEquals(0L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void saveInTransactionTest() throws Exception {
-        saveInTx(new SimpleExtendedModel(), new SimpleExtendedModel());
-        assertEquals(2L, count(SimpleExtendedModel.class));
-    }
-
-    @Test
-    public void listAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-        List<SimpleExtendedModel> models = listAll(SimpleExtendedModel.class);
-        assertEquals(100, models.size());
-        for (long i = 1; i <= 100; i++) {
-            assertEquals(Long.valueOf(i), models.get((int) i - 1).getId());
-        }
-    }
-
-    @Test
-    public void findTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        List<SimpleExtendedModel> models = find(SimpleExtendedModel.class, "id = ?", "2");
-        assertEquals(1, models.size());
-        assertEquals(Long.valueOf(2L), models.get(0).getId());
-    }
-
-    @Test
-    public void findWithQueryTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-        List<SimpleExtendedModel> models = findWithQuery(SimpleExtendedModel.class, "Select * from " +
-                                          NamingHelper.toTableName(SimpleExtendedModel.class) +
-                                          " where id >= ? ", "50");
-        for (SimpleExtendedModel model : models) {
-            assertEquals(75, model.getId(), 25L);
-        }
-    }
-
-    @Test
-    @SuppressWarnings("all")
-    public void findByIdTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertEquals(Long.valueOf(1L), findById(SimpleExtendedModel.class, 1L).getId());
-    }
-
-    @Test
-    public void findByIdIntegerTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertEquals(Long.valueOf(1L), findById(SimpleExtendedModel.class, 1).getId());
-    }
-
-    @Test
-    public void findByIdStringsNullTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertEquals(0, findById(SimpleExtendedModel.class, new String[]{""}).size());
-    }
-
-    @Test
-    public void findByIdStringsOneTest() throws Exception {
-        save(new SimpleExtendedModel());
-        List<SimpleExtendedModel> models = findById(SimpleExtendedModel.class, new String[]{"1"});
-        assertEquals(1, models.size());
-        assertEquals(Long.valueOf(1L), models.get(0).getId());
-    }
-
-    @Test
-    public void findByIdStringsTwoTest() throws Exception {
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-        save(new SimpleExtendedModel());
-
-        List<SimpleExtendedModel> models = findById(SimpleExtendedModel.class, new String[]{"1", "3"});
-
-        assertEquals(2, models.size());
-        assertEquals(Long.valueOf(1L), models.get(0).getId());
-        assertEquals(Long.valueOf(3L), models.get(1).getId());
-    }
-
-    @Test
-    public void findByIdStringsManyTest() throws Exception {
-        for (int i = 1; i <= 10; i++) {
-            save(new SimpleExtendedModel());
-        }
-
-        List<SimpleExtendedModel> models = findById(SimpleExtendedModel.class, new String[]{"1", "3", "6", "10"});
-
-        assertEquals(4, models.size());
-        assertEquals(Long.valueOf(1L), models.get(0).getId());
-        assertEquals(Long.valueOf(3L), models.get(1).getId());
-        assertEquals(Long.valueOf(6L), models.get(2).getId());
-        assertEquals(Long.valueOf(10L), models.get(3).getId());
-    }
-
-    @Test
-    public void findByIdStringsOrderTest() throws Exception {
-        for (int i = 1; i <= 10; i++) {
-            save(new SimpleExtendedModel());
-        }
-
-        List<SimpleExtendedModel> models = findById(SimpleExtendedModel.class, new String[]{"10", "6", "3", "1"});
-
-        assertEquals(4, models.size());
-        // The order of the query doesn't matter
-        assertEquals(Long.valueOf(1L), models.get(0).getId());
-        assertEquals(Long.valueOf(3L), models.get(1).getId());
-        assertEquals(Long.valueOf(6L), models.get(2).getId());
-        assertEquals(Long.valueOf(10L), models.get(3).getId());
-    }
-
-    @Test
-    public void findByIdNullTest() throws Exception {
-        save(new SimpleExtendedModel());
-        assertNull(findById(SimpleExtendedModel.class, 2L));
-    }
-
-    @Test
-    public void findAllTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-
-        Iterator<SimpleExtendedModel> cursor = findAll(SimpleExtendedModel.class);
-
-        for (int i = 1; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleExtendedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(Long.valueOf(i), model.getId());
-        }
-    }
-
-    @Test
-    public void findAsIteratorTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-
-        Iterator<SimpleExtendedModel> cursor = findAsIterator(SimpleExtendedModel.class, "id >= ?", "50");
-
-        for (int i = 50; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleExtendedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(Long.valueOf(i), model.getId());
-        }
-    }
-
-    @Test
-    public void findWithQueryAsIteratorTest() throws Exception {
-        for (int i = 1; i <= 100; i++) {
-            save(new SimpleExtendedModel());
-        }
-
-        Iterator<SimpleExtendedModel> cursor = findWithQueryAsIterator(SimpleExtendedModel.class,
-                                                    "Select * from " +
-                                                    NamingHelper.toTableName(SimpleExtendedModel.class) +
-                                                    " where id >= ? ", "50");
-        for (int i = 50; i <= 100; i++) {
-            assertTrue(cursor.hasNext());
-            SimpleExtendedModel model = cursor.next();
-            assertNotNull(model);
-            assertEquals(Long.valueOf(i), model.getId());
-        }
-    }
-
-    @Test(expected=NoSuchElementException.class)
-    public void findAsIteratorOutOfBoundsTest() throws Exception {
-        save(new SimpleExtendedModel());
-        Iterator<SimpleExtendedModel> cursor = findAsIterator(SimpleExtendedModel.class, id, "1");
-        assertTrue(cursor.hasNext());
-        SimpleExtendedModel model = cursor.next();
-        assertNotNull(model);
-        assertEquals(Long.valueOf(1), model.getId());
-        // This should throw a NoSuchElementException
-        cursor.next();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void disallowRemoveCursorTest() throws Exception {
-        save(new SimpleExtendedModel());
-        Iterator<SimpleExtendedModel> cursor = findAsIterator(SimpleExtendedModel.class, id, "1");
-        assertTrue(cursor.hasNext());
-        SimpleExtendedModel model = cursor.next();
-        assertNotNull(model);
-        assertEquals(Long.valueOf(1), model.getId());
-        // This should throw a UnsupportedOperationException
-        cursor.remove();
-    }
-
-    @Test
-    public void vacuumTest() throws Exception {
-        executeQuery("Vacuum");
-    }
-}
\ No newline at end of file
diff --git a/library/src/test/java/com/orm/record/StringFieldTests.java b/library/src/test/java/com/orm/record/StringFieldTests.java
deleted file mode 100644
index d9641ad7..00000000
--- a/library/src/test/java/com/orm/record/StringFieldTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.orm.record;
-
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.StringFieldAnnotatedModel;
-import com.orm.model.StringFieldExtendedModel;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.orm.SugarRecord.save;
-import static com.orm.SugarRecord.findById;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class StringFieldTests {
-    private String string = "Test String";
-
-    @Test
-    public void nullStringExtendedTest() {
-        save(new StringFieldExtendedModel());
-        StringFieldExtendedModel model = findById(StringFieldExtendedModel.class, 1);
-        assertNull(model.getString());
-    }
-
-    @Test
-    public void nullStringAnnotatedTest() {
-        save(new StringFieldAnnotatedModel());
-        StringFieldAnnotatedModel model = findById(StringFieldAnnotatedModel.class, 1);
-        assertNull(model.getString());
-    }
-
-    @Test
-    public void stringExtendedTest() {
-        save(new StringFieldExtendedModel(string));
-        StringFieldExtendedModel model = findById(StringFieldExtendedModel.class, 1);
-        assertEquals(string, model.getString());
-    }
-
-    @Test
-    public void stringAnnotatedTest() {
-        save(new StringFieldAnnotatedModel(string));
-        StringFieldAnnotatedModel model = findById(StringFieldAnnotatedModel.class, 1);
-        assertEquals(string, model.getString());
-    }
-}
diff --git a/library/src/test/java/com/orm/record/UpdateInTxTest.java b/library/src/test/java/com/orm/record/UpdateInTxTest.java
deleted file mode 100644
index 2c5a032f..00000000
--- a/library/src/test/java/com/orm/record/UpdateInTxTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.orm.record;
-
-import com.orm.SugarRecord;
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.TestRecord;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-/**
- * @author jonatan.salas
- */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class UpdateInTxTest {
-
-    @Test
-    public void testUpdateInTx() {
-        final TestRecord record = new TestRecord();
-        record.setName("lalala");
-
-        Long id = SugarRecord.save(record);
-        record.setId(id);
-
-        final TestRecord record1 = new TestRecord();
-        record1.setName("lalala");
-
-        Long id1 = SugarRecord.save(record1);
-        record1.setId(id1);
-
-        final TestRecord record2 = new TestRecord();
-        record2.setName("lalala");
-
-        Long id2 = SugarRecord.save(record2);
-        record2.setId(id2);
-
-        final TestRecord record3 = new TestRecord();
-        record3.setName("lalala");
-
-        Long id3 = SugarRecord.save(record3);
-        record3.setId(id3);
-
-        final TestRecord record4 = new TestRecord();
-        record4.setName("lalala");
-
-        Long id4 = SugarRecord.save(record4);
-        record.setId(id4);
-
-        record.setName("fulano");
-        record1.setName("fulano");
-        record2.setName("fulano");
-        record3.setName("fulano");
-        record4.setName("fulano");
-
-        SugarRecord.updateInTx(record, record1, record2, record3, record4);
-
-        List<TestRecord> list = SugarRecord.listAll(TestRecord.class);
-
-        for (TestRecord r: list) {
-            Assert.assertEquals(record.getName(), r.getName());
-        }
-    }
-}
diff --git a/library/src/test/java/com/orm/util/ContextUtilTest.java b/library/src/test/java/com/orm/util/ContextUtilTest.java
deleted file mode 100644
index 9ce16c7d..00000000
--- a/library/src/test/java/com/orm/util/ContextUtilTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.orm.util;
-
-import android.content.Context;
-
-import com.orm.app.ClientApp;
-import com.orm.SugarContext;
-import com.orm.dsl.BuildConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static com.orm.util.ContextUtil.*;
-
-/**
- * @author jonatan.salas
- */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class ContextUtilTest {
-
-    @Test(expected = IllegalAccessException.class)
-    public void testPrivateConstructor() throws Exception {
-        ContextUtil contextUtil = ContextUtil.class.getDeclaredConstructor().newInstance();
-        assertNull(contextUtil);
-    }
-
-
-    @Test
-    public void testInitContext() {
-        assertNotNull(getContext());
-    }
-
-    @Test
-    public void testGetAssets() {
-        assertNotNull(getAssets());
-    }
-
-    @Test
-    public void testGetPackageManager() {
-        assertNotNull(getPackageManager());
-    }
-
-    @Test
-    public void testGetPackageName() {
-        assertNotNull(getPackageName());
-    }
-
-    @Test
-    public void testGetPreferences() {
-        assertNotNull(getSharedPreferences("lala", Context.MODE_PRIVATE));
-    }
-
-    @Test
-    public void testTerminateContext() {
-        SugarContext.terminate();
-        assertNull(getContext());
-    }
-}
diff --git a/library/src/test/java/com/orm/util/KeyWordUtilTest.java b/library/src/test/java/com/orm/util/KeyWordUtilTest.java
deleted file mode 100644
index 417f1b21..00000000
--- a/library/src/test/java/com/orm/util/KeyWordUtilTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.orm.util;
-
-import org.junit.Test;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-
-/**
- * @author jonatan.salas
- */
-public final class KeyWordUtilTest {
-
-    @Test(expected = IllegalAccessException.class)
-    public void testPrivateConstructor() throws Exception {
-        KeyWordUtil keyWordUtil = KeyWordUtil.class.getDeclaredConstructor().newInstance();
-        assertNull(keyWordUtil);
-    }
-
-    @Test
-    public void testKeyWord() {
-        assertEquals(true, KeyWordUtil.isKeyword("SELECT"));
-        assertEquals(true, KeyWordUtil.isKeyword("TRANSACTION"));
-        assertEquals(true, KeyWordUtil.isKeyword("MATCH"));
-        assertEquals(true, KeyWordUtil.isKeyword("AS"));
-        assertEquals(true, KeyWordUtil.isKeyword("NOTNULL"));
-        assertEquals(true, KeyWordUtil.isKeyword("NOT"));
-        assertEquals(false, KeyWordUtil.isKeyword("PERSONS"));
-        assertEquals(false, KeyWordUtil.isKeyword("NAME"));
-        assertEquals(false, KeyWordUtil.isKeyword("LOCATION"));
-    }
-
-    @Test
-    public void testNullKeyword() {
-        assertEquals(false, KeyWordUtil.isKeyword(null));
-    }
-}
diff --git a/library/src/test/java/com/orm/util/MigrationFileParserTest.java b/library/src/test/java/com/orm/util/MigrationFileParserTest.java
deleted file mode 100644
index 9b2d87ce..00000000
--- a/library/src/test/java/com/orm/util/MigrationFileParserTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.orm.util;
-
-import org.junit.Test;
-
-import java.lang.String;
-
-import static junit.framework.Assert.assertEquals;
-
-public final class MigrationFileParserTest {
-
-    @Test
-    public void testSingleLineStatement() {
-        MigrationFileParser singleLineComment = new MigrationFileParser("insert into table--comment");
-
-        String statements[] = singleLineComment.getStatements();
-        assertEquals("Testing single line statement size",1,statements.length);
-        assertEquals("Testing single line statement content","insert into table",statements[0]);
-
-        singleLineComment = new MigrationFileParser("insert into table--comment\n");
-
-        singleLineComment.getStatements();
-        assertEquals("Testing single line statement size",1,statements.length);
-        assertEquals("Testing single line statement content","insert into table",statements[0]);
-    }
-
-    @Test
-    public void testMultiLineComment() {
-        MigrationFileParser multiLineComment = new MigrationFileParser("insert into table /**comment \n new line 2 \n new line 3 */hello");
-
-        String statements[] = multiLineComment.getStatements();
-        assertEquals("Testing multiline statement size",1,statements.length);
-        assertEquals("Testing multiline comment","insert into table hello",statements[0]);
-    }
-
-    @Test
-    public void testMixedComment() {
-        MigrationFileParser mixedComment = new MigrationFileParser("insert into/*multiline\n **comment*/--comment");
-
-        String statements[] = mixedComment.getStatements();
-
-        assertEquals("Testing mixed comment statement size",1,statements.length);
-        assertEquals("Testing mixed comment statments", "insert into", statements[0]);
-    }
-}
diff --git a/library/src/test/java/com/orm/util/NumberComparatorTest.java b/library/src/test/java/com/orm/util/NumberComparatorTest.java
deleted file mode 100644
index aaabf453..00000000
--- a/library/src/test/java/com/orm/util/NumberComparatorTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.orm.util;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author jonatan.salas
- */
-public final class NumberComparatorTest {
-    private NumberComparator comparator;
-
-    @Before
-    public void setUp() {
-        comparator = new NumberComparator();
-    }
-
-    @Test
-    public void testNumberComparatorWithoutNumbers() {
-        int result = comparator.compare("hola", "hola");
-        assertEquals(0, result);
-    }
-
-    @Test
-    public void testNumberComparatorWithNumbers() {
-        int result = comparator.compare("1", "2");
-        assertEquals(-1, result);
-    }
-
-    @Test
-    public void testComparatorWithNumbers() {
-        int result = comparator.compare("4", "2");
-        assertEquals(1, result);
-    }
-
-    @Test
-    public void testCompareRight() {
-        int result = comparator.compareRight("hola", "hola");
-        assertEquals(0, result);
-    }
-
-    @Test
-    public void testCharAt() {
-        Character c = NumberComparator.charAt("Hola", 0);
-        assertEquals("H", c.toString());
-    }
-}
diff --git a/library/src/test/java/com/orm/util/ReflectionUtilTest.java b/library/src/test/java/com/orm/util/ReflectionUtilTest.java
deleted file mode 100644
index 318aa40d..00000000
--- a/library/src/test/java/com/orm/util/ReflectionUtilTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.orm.util;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-
-import com.orm.SugarContext;
-import com.orm.app.ClientApp;
-import com.orm.dsl.BuildConfig;
-import com.orm.model.TestRecord;
-import com.orm.query.Select;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author jonatan.salas
- */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk = 18, constants = BuildConfig.class, application = ClientApp.class, packageName = "com.orm.model", manifest = Config.NONE)
-public final class ReflectionUtilTest {
-
-    @Test(expected = IllegalAccessException.class)
-    public void testPrivateConstructor() throws Exception {
-        ReflectionUtil reflectionUtil = ReflectionUtil.class.getDeclaredConstructor().newInstance();
-        Assert.assertNull(reflectionUtil);
-    }
-
-    @Test
-    public void testGetTableFields() {
-        List<Field> fieldList = ReflectionUtil.getTableFields(TestRecord.class);
-        List<String> strings = new ArrayList<>();
-
-        for (Field field: fieldList) {
-            strings.add(field.getName());
-        }
-
-        Assert.assertEquals(true, strings.contains("id"));
-        Assert.assertEquals(true, strings.contains("name"));
-    }
-
-    @Test(expected = NoSuchFieldException.class)
-    public void testAddFieldValueToColumn() throws NoSuchFieldException {
-        SugarContext context = SugarContext.getSugarContext();
-        TestRecord record = new TestRecord();
-        record.setName("lala");
-
-        Field column = TestRecord.class.getField("name");
-        ContentValues values = new ContentValues();
-
-        ReflectionUtil.addFieldValueToColumn(values, column, record, context.getEntitiesMap());
-
-        Assert.assertEquals(record.getName(), values.getAsString("NAME"));
-    }
-
-    @Test
-    public void testSetFieldValueForId() {
-        TestRecord record = new TestRecord();
-        record.setName("Bla bla");
-
-        ReflectionUtil.setFieldValueForId(record, 1L);
-        Assert.assertEquals(1L, record.getId().longValue());
-    }
-
-    @Test
-    public void testGetAllClasses() {
-        List<Class> classes = ReflectionUtil.getDomainClasses();
-        Assert.assertEquals(45, classes.size());
-    }
-
-    @Test(expected = NoSuchFieldException.class)
-    public void testSetFieldValueFromCursor() throws NoSuchFieldException {
-        final TestRecord record = new TestRecord().setName("bla bla");
-        Long id = record.save();
-        record.setId(id);
-
-        Cursor cursor = Select.from(TestRecord.class).getCursor();
-
-        TestRecord testRecord = new TestRecord();
-        Field field = TestRecord.class.getField("name");
-
-        ReflectionUtil.setFieldValueFromCursor(cursor, field, testRecord);
-    }
-}
diff --git a/library/src/test/java/com/orm/util/SugarConfigTest.java b/library/src/test/java/com/orm/util/SugarConfigTest.java
deleted file mode 100644
index 82943e9e..00000000
--- a/library/src/test/java/com/orm/util/SugarConfigTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.orm.util;
-
-import com.orm.model.TestRecord;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author jonatan.salas
- */
-public final class SugarConfigTest {
-
-    @Test
-    public void testSetGetFields() {
-        Field[] fields = TestRecord.class.getFields();
-
-        List<Field> fieldList = Arrays.asList(fields);
-        SugarConfig.setFields(TestRecord.class, fieldList);
-
-        Assert.assertEquals(fieldList, SugarConfig.getFields(TestRecord.class));
-    }
-
-    @Test
-    public void testClearCache() {
-        SugarConfig.clearCache();
-        Assert.assertEquals(true, SugarConfig.fields.isEmpty());
-    }
-}

From 1c19a7d5afcb6679f22c859ffc7e71cc54380878 Mon Sep 17 00:00:00 2001
From: ethantam <ethantam@4d.com.hk>
Date: Thu, 27 Oct 2016 16:41:52 +0800
Subject: [PATCH 302/305] -Update grade build tools version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 030e1cb3..aa590672 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }

From 1490872378ffe8ed58db938900eb58e20fa8cce0 Mon Sep 17 00:00:00 2001
From: ethantam <ethantam@4d.com.hk>
Date: Thu, 27 Oct 2016 17:06:26 +0800
Subject: [PATCH 303/305] Update README.md

---
 README.md | 67 +++++++++++++------------------------------------------
 1 file changed, 16 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index 594782a7..ecc97721 100644
--- a/README.md
+++ b/README.md
@@ -1,55 +1,20 @@
-# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg?branch=master)](https://coveralls.io/r/satyan/sugar?branch=master) [![Code Triagers Badge](http://www.codetriage.com/satyan/sugar/badges/users.svg)](http://www.codetriage.com/satyan/sugar)
+#Sugar Cipher using Sugar ORM v2.5
+ by Ethan Tam(sbhkin)
 
-[![Join the chat at https://gitter.im/satyan/sugar](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/satyan/sugar?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Insanely easy way to work with Android databases.
+- Extract the libs and assets into your application. This dependency is not included in the sugar library.
+- Clone this branch to you Project root folder
+- Follow [How to use master version](#usemasterv)
+- Add a meta property named DB_PASSWORD in your manifest file along with other Sugar configuration as follows:
+          <meta-data
+           android:name="DB_PASSWORD"
+           android:value="your_DB_ENCRYPTION_KEY_here"/>
 
-Official documentation can be found [here](http://satyan.github.io/sugar) - Check some examples below. The example application is provided in the **example** folder in the source.
+You're good to go. Use Sugar as usual and your database is encrypted now.
 
-## Features
+# Sugar ORM
 
-Sugar ORM was built in contrast to other ORM's to have:
-
-- A simple, concise, and clean integration process with minimal configuration.
-- Automatic table and column naming through reflection.
-- Support for migrations between different schema versions.
-
-## Installing
-
-There are four ways to install Sugar:
-
-#### As a Gradle dependency
-
-This is the preferred way. Simply add:
-
-```groovy
-compile 'com.github.satyan:sugar:1.5'
-```
-
-to your project dependencies and run `gradle build` or `gradle assemble`.
-
-#### As a Maven dependency
-
-Declare the dependency in Maven:
-
-```xml
-<dependency>
-    <groupId>com.github.satyan</groupId>
-    <artifactId>sugar</artifactId>
-    <version>1.5</version>
-</dependency>
-```
-
-#### As a library project
-
-Download the source code and import it as a library project in Eclipse. The project is available in the folder **library**. For more information on how to do this, read [here](http://developer.android.com/tools/projects/index.html#LibraryProjects).
-
-#### As a jar
-
-Visit the [releases](https://github.com/satyan/sugar/releases) page to download jars directly. You can drop them into your `libs` folder and configure the Java build path to include the library. See this [tutorial](http://www.vogella.com/tutorials/AndroidLibraryProjects/article.html) for an excellent guide on how to do this.
-
-
-### How to use master version
+###  <a link = "usemasterv"></a>How to use master version
 First, download sugar repository
 ```
 git clone git@github.com:satyan/sugar.git
@@ -89,7 +54,7 @@ You should also comment this line just comment this line (library/build.gradle):
 ```
 ===================
 
-After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html) **Outdated**. Check examples of 1.4 and master below: 
+After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html) **Outdated**. Check examples of 1.4 and master below:
 
 ## Examples
 ### SugarRecord
@@ -126,7 +91,7 @@ book.save();
 
 or
 ```java
-SugarRecord.save(book); // if using the @Table annotation 
+SugarRecord.save(book); // if using the @Table annotation
 ```
 
 ### Load Entity
@@ -151,7 +116,7 @@ book.delete();
 
 or
 ```java
-SugarRecord.delete(book); // if using the @Table annotation 
+SugarRecord.delete(book); // if using the @Table annotation
 ```
 
 ### Update Entity based on Unique values
@@ -168,7 +133,7 @@ book.getId() == sameBook.getId(); // true
 
 or
 ```java
-SugarRecord.update(sameBook); // if using the @Table annotation 
+SugarRecord.update(sameBook); // if using the @Table annotation
 ```
 
 ### Bulk Insert

From b1c1f0ef378d3a1a9b16194836df9c90ead5340f Mon Sep 17 00:00:00 2001
From: ethantam <ethantam@4d.com.hk>
Date: Thu, 27 Oct 2016 17:09:21 +0800
Subject: [PATCH 304/305] Correctly it is sugar v2.4

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ecc97721..1ea8ed76 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#Sugar Cipher using Sugar ORM v2.5
+#Sugar Cipher using Sugar ORM v2.4
  by Ethan Tam(sbhkin)
 
 

From 425999c3b7c0ea509f7f1cb929cb34a0da82db6d Mon Sep 17 00:00:00 2001
From: ethantam <ethantam@4d.com.hk>
Date: Thu, 27 Oct 2016 18:44:40 +0800
Subject: [PATCH 305/305] Update README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 1ea8ed76..e91b5182 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,11 @@
 - Clone this branch to you Project root folder
 - Follow [How to use master version](#usemasterv)
 - Add a meta property named DB_PASSWORD in your manifest file along with other Sugar configuration as follows:
+```
           <meta-data
            android:name="DB_PASSWORD"
            android:value="your_DB_ENCRYPTION_KEY_here"/>
+```
 
 You're good to go. Use Sugar as usual and your database is encrypted now.