Merge pull request #1128 from Raizlabs/develop

4.0.0-beta4

Author: agrosner

README.md

@@ -41,7 +41,7 @@ Add the library to the project-level build.gradle, using the apt plugin to enabl
 
 ```groovy
 
-  def dbflow_version = "4.0.0-beta3"
+  def dbflow_version = "4.0.0-beta4"
   // or dbflow_version = "develop-SNAPSHOT" for grabbing latest dependency in your project on the develop branch
   // or 10-digit short-hash of a specific commit. (Useful for bugs fixed in develop, but not in a release yet)
 

build.gradle

@@ -5,6 +5,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2'
     }
 }
 

dbflow-core/src/main/java/com/raizlabs/android/dbflow/annotation/Database.java

@@ -30,6 +30,11 @@
      */
     String name() default "";
 
+    /**
+     * @return Specify the extension of the file name : {fileName}.{extension}. Default is ".db"
+     */
+    String databaseExtension() default "";
+
     /**
      * @return If true, SQLite will throw exceptions when {@link ForeignKey} constraints are not respected.
      * Default is false and will not throw exceptions.

dbflow-core/src/main/java/com/raizlabs/android/dbflow/annotation/TypeConverter.java

@@ -10,7 +10,13 @@
  * Description: Marks a class as being a TypeConverter. A type converter will turn a non-model, non-SQLiteTyped class into
  * a valid database type.
  */
-@Retention(RetentionPolicy.SOURCE)
+@Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)
 public @interface TypeConverter {
+
+    /**
+     * @return Specify a set of subclasses by which the {@link TypeConverter} registers for. For
+     * each one, this will create a new instance of the converter.
+     */
+    Class<?>[] allowedSubtypes() default {};
 }

dbflow-core/src/main/java/com/raizlabs/android/dbflow/annotation/provider/ContentUri.java

@@ -39,12 +39,12 @@ class ContentType {
     }
 
     /**
-     * @return the path of this ContentUri. ex: notes/#, notes/1, etc. Must be unique within a {@link com.raizlabs.android.dbflow.annotation.provider.TableEndpoint}
+     * @return the path of this ContentUri. ex: notes/#, notes/1, etc. Must be unique within a {@link TableEndpoint}
      */
     String path();
 
     /**
-     * @return The type of content that this uri is associated with. Ex: {@link com.raizlabs.android.dbflow.annotation.provider.ContentUri.ContentType#VND_SINGLE}
+     * @return The type of content that this uri is associated with. Ex: {@link ContentType#VND_SINGLE}
      */
     String type();
 

dbflow-core/src/main/java/com/raizlabs/android/dbflow/converter/CalendarConverter.java

@@ -1,11 +1,13 @@
 package com.raizlabs.android.dbflow.converter;
 
 import java.util.Calendar;
+import java.util.GregorianCalendar;
 
 /**
  * Author: andrewgrosner
  * Description: Defines how we store and retrieve a {@link java.util.Calendar}
  */
+@com.raizlabs.android.dbflow.annotation.TypeConverter(allowedSubtypes = {GregorianCalendar.class})
 public class CalendarConverter extends TypeConverter<Long, Calendar> {
 
     @Override

dbflow-core/src/main/java/com/raizlabs/android/dbflow/converter/SqlDateConverter.java

@@ -1,11 +1,14 @@
 package com.raizlabs.android.dbflow.converter;
 
 import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
 
 /**
  * Author: andrewgrosner
  * Description: Defines how we store and retrieve a {@link java.sql.Date}
  */
+@com.raizlabs.android.dbflow.annotation.TypeConverter(allowedSubtypes = {Time.class, Timestamp.class})
 public class SqlDateConverter extends TypeConverter<Long, Date> {
 
     @Override

dbflow-kotlinextensions/src/androidTest/java/com/raizlabs/android/dbflow/kotlinextensions/ApplicationTest.java

@@ -56,10 +56,10 @@ inline fun <reified T : Any> Collection<T>.processInTransaction(crossinline proc
 inline fun <reified T : Any> Collection<T>.processInTransactionAsync(crossinline processFunction: (T, DatabaseWrapper) -> Unit) {
     val wrapper = database<T>()
     wrapper.beginTransactionAsync(
-            ProcessModelTransaction.Builder(ProcessModelTransaction.ProcessModel<T> {
-                processFunction(it, wrapper.writableDatabase)
+            ProcessModelTransaction.Builder(ProcessModelTransaction.ProcessModel<T> { it, wrapper ->
+                processFunction(it, wrapper)
             }).addAll(this).build()
-    ).build().execute();
+    ).execute()
 }
 
 /**
@@ -71,10 +71,10 @@ inline fun <reified T : Any> Collection<T>.processInTransactionAsync(crossinline
                                                                      error: Transaction.Error? = null) {
     val wrapper = database<T>()
     wrapper.beginTransactionAsync(
-            ProcessModelTransaction.Builder(ProcessModelTransaction.ProcessModel<T> {
-                processFunction(it, wrapper.writableDatabase)
-            }).addAll(this).build()
-    ).success(success).error(error).build().execute();
+            ProcessModelTransaction.Builder(
+                    ProcessModelTransaction.ProcessModel<T> { it, wrapper -> processFunction(it, wrapper) })
+                    .addAll(this).build())
+            .success(success).error(error).execute()
 }
 
 /**
@@ -87,10 +87,10 @@ inline fun <reified T : Any> Collection<T>.processInTransactionAsync(crossinline
                                                                      error: Transaction.Error? = null) {
     val wrapper = database<T>()
     wrapper.beginTransactionAsync(
-            ProcessModelTransaction.Builder(ProcessModelTransaction.ProcessModel<T> {
-                processFunction(it, wrapper.writableDatabase)
+            ProcessModelTransaction.Builder(ProcessModelTransaction.ProcessModel<T> { it, wrapper ->
+                processFunction(it, wrapper)
             }).addAll(this).processListener(processListener).build()
-    ).success(success).error(error).build().execute();
+    ).success(success).error(error).execute()
 }
 
 /**

dbflow-kotlinextensions/src/main/java/com/raizlabs/android/dbflow/kotlinextensions/DatabaseExtensions.kt

@@ -10,27 +10,27 @@ import com.raizlabs.android.dbflow.structure.Model
  * Description: Provides property methods in via infix functions.
  */
 
-infix fun <T : Any> Property<T>.eq(value: T) = this.eq(value)
+infix fun <T : Any> Property<T>.eq(value: T): Condition = this.eq(value)
 
-infix fun <T : Any> Property<T>.`is`(value: T) = this.`is`(value)
+infix fun <T : Any> Property<T>.`is`(value: T): Condition = this.`is`(value)
 
-infix fun <T : Any> Property<T>.isNot(value: T) = this.isNot(value)
+infix fun <T : Any> Property<T>.isNot(value: T): Condition = this.isNot(value)
 
-infix fun <T : Any> Property<T>.notEq(value: T) = this.notEq(value)
+infix fun <T : Any> Property<T>.notEq(value: T): Condition = this.notEq(value)
 
-infix fun <T : Any> Property<T>.like(value: String) = this.like(value)
+infix fun <T : Any> Property<T>.like(value: String): Condition = this.like(value)
 
-infix fun <T : Any> Property<T>.glob(value: String) = this.glob(value)
+infix fun <T : Any> Property<T>.glob(value: String): Condition = this.glob(value)
 
-infix fun <T : Any> Property<T>.greaterThan(value: T) = this.greaterThan(value)
+infix fun <T : Any> Property<T>.greaterThan(value: T): Condition = this.greaterThan(value)
 
-infix fun <T : Any> Property<T>.greaterThanOrEq(value: T) = this.greaterThanOrEq(value)
+infix fun <T : Any> Property<T>.greaterThanOrEq(value: T): Condition = this.greaterThanOrEq(value)
 
-infix fun <T : Any> Property<T>.lessThan(value: T) = this.lessThan(value)
+infix fun <T : Any> Property<T>.lessThan(value: T): Condition = this.lessThan(value)
 
-infix fun <T : Any> Property<T>.lessThanOrEq(value: T) = this.lessThanOrEq(value)
+infix fun <T : Any> Property<T>.lessThanOrEq(value: T): Condition = this.lessThanOrEq(value)
 
-infix fun <T : Any> Property<T>.between(value: T) = this.between(value)
+infix fun <T : Any> Property<T>.between(value: T): Condition.Between = this.between(value)
 
 infix fun <T : Any> Property<T>.`in`(values: Array<T>): Condition.In {
     return when (values.size) {
@@ -46,37 +46,37 @@ infix fun <T : Any> Property<T>.notIn(values: Array<T>): Condition.In {
     }
 }
 
-infix fun <T : Any> Property<T>.`in`(values: Collection<T>) = this.`in`(values)
+infix fun <T : Any> Property<T>.`in`(values: Collection<T>): Condition.In = this.`in`(values)
 
-infix fun <T : Any> Property<T>.notIn(values: Collection<T>) = this.notIn(values)
+infix fun <T : Any> Property<T>.notIn(values: Collection<T>): Condition.In = this.notIn(values)
 
-infix fun <T : Any> Property<T>.concatenate(value: T) = this.concatenate(value)
+infix fun <T : Any> Property<T>.concatenate(value: T): Condition = this.concatenate(value)
 
-infix fun IConditional.eq(value: IConditional) = this.eq(value)
+infix fun IConditional.eq(value: IConditional): Condition = this.eq(value)
 
-infix fun IConditional.`is`(conditional: IConditional) = this.`is`(conditional)
+infix fun IConditional.`is`(conditional: IConditional): Condition = this.`is`(conditional)
 
-infix fun IConditional.isNot(conditional: IConditional) = this.isNot(conditional)
+infix fun IConditional.isNot(conditional: IConditional): Condition = this.isNot(conditional)
 
-infix fun IConditional.notEq(conditional: IConditional) = this.notEq(conditional)
+infix fun IConditional.notEq(conditional: IConditional): Condition = this.notEq(conditional)
 
-infix fun IConditional.like(conditional: IConditional) = this.like(conditional)
+infix fun IConditional.like(conditional: IConditional): Condition = this.like(conditional)
 
-infix fun IConditional.glob(conditional: IConditional) = this.glob(conditional)
+infix fun IConditional.glob(conditional: IConditional): Condition = this.glob(conditional)
 
-infix fun IConditional.like(value: String) = this.like(value)
+infix fun IConditional.like(value: String): Condition = this.like(value)
 
-infix fun IConditional.glob(value: String) = this.glob(value)
+infix fun IConditional.glob(value: String): Condition = this.glob(value)
 
-infix fun IConditional.greaterThan(conditional: IConditional) = this.greaterThan(conditional)
+infix fun IConditional.greaterThan(conditional: IConditional): Condition = this.greaterThan(conditional)
 
-infix fun IConditional.greaterThanOrEq(conditional: IConditional) = this.greaterThanOrEq(conditional)
+infix fun IConditional.greaterThanOrEq(conditional: IConditional): Condition = this.greaterThanOrEq(conditional)
 
-infix fun IConditional.lessThan(conditional: IConditional) = this.lessThan(conditional)
+infix fun IConditional.lessThan(conditional: IConditional): Condition = this.lessThan(conditional)
 
-infix fun IConditional.lessThanOrEq(conditional: IConditional) = this.lessThanOrEq(conditional)
+infix fun IConditional.lessThanOrEq(conditional: IConditional): Condition = this.lessThanOrEq(conditional)
 
-infix fun IConditional.between(conditional: IConditional) = this.between(conditional)
+infix fun IConditional.between(conditional: IConditional): Condition.Between = this.between(conditional)
 
 infix fun IConditional.`in`(values: Array<IConditional>): Condition.In {
     return when (values.size) {
@@ -92,27 +92,27 @@ infix fun IConditional.notIn(values: Array<IConditional>): Condition.In {
     }
 }
 
-infix fun IConditional.`is`(baseModelQueriable: BaseModelQueriable<Model>) = this.`is`(baseModelQueriable)
+infix fun IConditional.`is`(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.`is`(baseModelQueriable)
 
-infix fun IConditional.eq(baseModelQueriable: BaseModelQueriable<Model>) = this.eq(baseModelQueriable)
+infix fun IConditional.eq(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.eq(baseModelQueriable)
 
-infix fun IConditional.isNot(baseModelQueriable: BaseModelQueriable<Model>) = this.isNot(baseModelQueriable)
+infix fun IConditional.isNot(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.isNot(baseModelQueriable)
 
-infix fun IConditional.notEq(baseModelQueriable: BaseModelQueriable<Model>) = this.notEq(baseModelQueriable)
+infix fun IConditional.notEq(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.notEq(baseModelQueriable)
 
-infix fun IConditional.like(baseModelQueriable: BaseModelQueriable<Model>) = this.like(baseModelQueriable)
+infix fun IConditional.like(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.like(baseModelQueriable)
 
-infix fun IConditional.glob(baseModelQueriable: BaseModelQueriable<Model>) = this.glob(baseModelQueriable)
+infix fun IConditional.glob(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.glob(baseModelQueriable)
 
-infix fun IConditional.greaterThan(baseModelQueriable: BaseModelQueriable<Model>) = this.greaterThan(baseModelQueriable)
+infix fun IConditional.greaterThan(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.greaterThan(baseModelQueriable)
 
-infix fun IConditional.greaterThanOrEq(baseModelQueriable: BaseModelQueriable<Model>) = this.greaterThanOrEq(baseModelQueriable)
+infix fun IConditional.greaterThanOrEq(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.greaterThanOrEq(baseModelQueriable)
 
-infix fun IConditional.lessThan(baseModelQueriable: BaseModelQueriable<Model>) = this.lessThan(baseModelQueriable)
+infix fun IConditional.lessThan(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.lessThan(baseModelQueriable)
 
-infix fun IConditional.lessThanOrEq(baseModelQueriable: BaseModelQueriable<Model>) = this.lessThanOrEq(baseModelQueriable)
+infix fun IConditional.lessThanOrEq(baseModelQueriable: BaseModelQueriable<Model>): Condition = this.lessThanOrEq(baseModelQueriable)
 
-infix fun IConditional.between(baseModelQueriable: BaseModelQueriable<Model>) = this.between(baseModelQueriable)
+infix fun IConditional.between(baseModelQueriable: BaseModelQueriable<Model>): Condition.Between = this.between(baseModelQueriable)
 
 infix fun IConditional.`in`(values: Array<BaseModelQueriable<Model>>): Condition.In {
     return when (values.size) {
@@ -128,5 +128,5 @@ infix fun IConditional.notIn(values: Array<BaseModelQueriable<Model>>): Conditio
     }
 }
 
-infix fun IConditional.concatenate(conditional: IConditional) = this.concatenate(conditional)
+infix fun IConditional.concatenate(conditional: IConditional): Condition = this.concatenate(conditional)