Merge branch 'feature/agrosner/RewriteUnitTests' into develop

Author: fuzzagrosner

gradle.properties

@@ -1,4 +1,4 @@
-version=4.0.0-beta5
+version=4.0.0-beta6
 version_code=1
 group=com.raizlabs.android
 bt_siteUrl=https://github.com/Raizlabs/DBFlow

usage2/ContentProviderGeneration.md

@@ -110,7 +110,6 @@ public class ContentProviderModel extends BaseProviderModel<ContentProviderModel
     @ContentUri(path = NAME, type = ContentUri.ContentType.VND_MULTIPLE + NAME)
     public static final Uri CONTENT_URI = ContentUtils.buildUriWithAuthority(ContentDatabase.AUTHORITY);
 
-    @Column
     @PrimaryKey(autoincrement = true)
     long id;
 

usage2/Databases.md

@@ -77,6 +77,7 @@ In DBFlow when an INSERT or UPDATE are performed, by default, we use `NONE`. If
 
 @Database(name = AppDatabase.NAME, version = AppDatabase.VERSION, insertConflict = ConflictAction.IGNORE, updateConflict= ConflictAction.REPLACE)
 public class AppDatabase {
+}
 
 ```
 

usage2/GettingStarted.md

@@ -44,7 +44,7 @@ public class ExampleApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        FlowManager.init(new FlowConfig.Builder(this).build());
+        FlowManager.init(this);
     }
 }
 

usage2/KotlinSupport.md

@@ -159,13 +159,16 @@ List<TestModel> items = SQLite.select()
     .from(TestModel.class)
     .queryList();
 
-TransactionManager.getInstance()
-  .add(new ProcessModelTransaction(ProcessModelInfo.withModels(items), null) {
-    @Override
-    public void processModel(TestModel model) {
-        // do something.
-    }
-});
+    database.beginTransactionAsync(new ProcessModelTransaction.Builder<>(
+      new ProcessModel<TestModel>() {
+        @Override
+        public void processModel(TestModel model, DatabaseWrapper database) {
+
+        }
+      })
+      .success(successCallback)
+      .error(errorCallback).build()
+      .execute();
 
 ```
 
@@ -208,18 +211,21 @@ items.processInTransaction { it, databaseWrapper -> it.delete(databaseWrapper) }
 #### Class Extensions
 
 If you need access to the Database, ModelAdapter, etc for a specific class you
-can now:
-
+can now use the following (and more) reified global functions for easy access!
 
 ```kotlin
 
-database<TestModel>
+database<MyDatabase>()
 
-tableName<TestModel>
+databaseForTable<TestModel>()
 
-modelAdapter<TestModel>
+writableDatabaseForTable<TestModel>()
 
-```
+tableName<TestModel>()
 
+modelAdapter<TestModel>()
+
+
+```
 
 Which under-the-hood call their corresponding `FlowManager` methods.

usage2/Migration4Guide.md

@@ -16,7 +16,7 @@ _Major Changes In this release_
 
 6. Removed the `Model` restriction on tables. If you leave out extending `BaseModel`, you _must_ interact with the `ModelAdapter`.
 
-7. We generate ~45% less code than 3.0. Combined the `_Table` + `_Adapter` into the singular `_Table` class, which contains both `Property` + all of the regular `ModelAdapter` methods. To ease the transition to 4.0, it is named `_Table` but extends `ModelAdapter`. So most use cases / interactions will not break.
+7. We generate much less less code than 3.0. Combined the `_Table` + `_Adapter` into the singular `_Table` class, which contains both `Property` + all of the regular `ModelAdapter` methods. To ease the transition to 4.0, it is named `_Table` but extends `ModelAdapter`. So most use cases / interactions will not break.
 
 8. `Condition` are now `Operator`, this includes `SQLCondition` -> `SQLOperator`, `ConditionGroup` -> `OperatorGroup`. `Operator` are now typed and safer to use.
   1. `Operator` now also have `div`, `times`, `rem`, `plus` and `minus` methods.