Easy projection generation + fixed "do all possible joins by default" problem

.gitignore

@@ -1,3 +1,4 @@
 target
 .idea
-.DS_Store
+.DS_Store
+*.iml

src/main/resources/org/jraf/androidcontentprovidergenerator/abstractselection.ftl

@@ -39,6 +39,7 @@ public abstract class AbstractSelection<T extends AbstractSelection<?>> {
     private final List<String> mSelectionArgs = new ArrayList<String>(5);
 
     private final StringBuilder mOrderBy = new StringBuilder();
+    private final List<String> mProjection = new ArrayList<String>(5);
 
     Boolean mNotify;
     String mGroupBy;
@@ -286,6 +287,13 @@ public abstract class AbstractSelection<T extends AbstractSelection<?>> {
         return mOrderBy.length() > 0 ? mOrderBy.toString() : null;
     }
 
+    /**
+     * Returns the projection produced by this object.
+     */
+    public String[] proj() {
+        return mProjection.isEmpty() ? null : mProjection.toArray(new String[mProjection.size()]);
+    }
+
     /**
      * Returns the {@code uri} argument to pass to the {@code ContentResolver} methods.
      */
@@ -364,6 +372,14 @@ public abstract class AbstractSelection<T extends AbstractSelection<?>> {
         return (T) this;
     }
 
+    @SuppressWarnings("unchecked")
+    public T forColumn(String... columns) {
+        for (String column : columns) {
+            mProjection.add(column);
+        }
+        return (T) this;
+    }
+
     public int count(ContentResolver resolver) {
         Cursor cursor = resolver.query(uri(), new String[] { COUNT }, sel(), args(), null);
         if (cursor == null) return 0;

src/main/resources/org/jraf/androidcontentprovidergenerator/selection.ftl

@@ -28,42 +28,39 @@ public class ${entity.nameCamelCase}Selection extends AbstractSelection<${entity
      * Query the given content resolver using this selection.
      *
      * @param contentResolver The content resolver to query.
-     * @param projection A list of which columns to return. Passing null will return all columns, which is inefficient.
      * @return A {@code ${entity.nameCamelCase}Cursor} object, which is positioned before the first entry, or null.
      */
-    public ${entity.nameCamelCase}Cursor query(ContentResolver contentResolver, String[] projection) {
-        Cursor cursor = contentResolver.query(uri(), projection, sel(), args(), order());
+    public ${entity.nameCamelCase}Cursor query(ContentResolver contentResolver) {
+        Cursor cursor = contentResolver.query(uri(), proj(), sel(), args(), order());
         if (cursor == null) return null;
         return new ${entity.nameCamelCase}Cursor(cursor);
     }
 
-    /**
-     * Equivalent of calling {@code query(contentResolver, null)}.
-     */
-    public ${entity.nameCamelCase}Cursor query(ContentResolver contentResolver) {
-        return query(contentResolver, null);
-    }
-
     /**
      * Query the given content resolver using this selection.
      *
      * @param context The context to use for the query.
-     * @param projection A list of which columns to return. Passing null will return all columns, which is inefficient.
      * @return A {@code ${entity.nameCamelCase}Cursor} object, which is positioned before the first entry, or null.
      */
-    public ${entity.nameCamelCase}Cursor query(Context context, String[] projection) {
-        Cursor cursor = context.getContentResolver().query(uri(), projection, sel(), args(), order());
+    public ${entity.nameCamelCase}Cursor query(Context context) {
+        Cursor cursor = context.getContentResolver().query(uri(), proj(), sel(), args(), order());
         if (cursor == null) return null;
         return new ${entity.nameCamelCase}Cursor(cursor);
     }
 
-    /**
-     * Equivalent of calling {@code query(context, null)}.
-     */
-    public ${entity.nameCamelCase}Cursor query(Context context) {
-        return query(context, null);
+    @Override
+    public String[] proj() {
+        String[] projection = super.proj();
+        return projection == null ? ${entity.nameCamelCase}Columns.ALL_COLUMNS : projection;
     }
 
+    public ${entity.nameCamelCase}Selection forAll${entity.nameCamelCase}Columns() {
+        return forColumn(${entity.nameCamelCase}Columns.ALL_COLUMNS);
+    }
+
+    public ${entity.nameCamelCase}Selection forId() {
+        return forColumn(${entity.nameCamelCase}Columns._ID);
+    }
 
     public ${entity.nameCamelCase}Selection id(long... value) {
         addEquals("${entity.nameLowerCase}." + ${entity.nameCamelCase}Columns._ID, toObjectArray(value));
@@ -76,8 +73,7 @@ public class ${entity.nameCamelCase}Selection extends AbstractSelection<${entity
     }
 
     public ${entity.nameCamelCase}Selection orderById(boolean desc) {
-        orderBy("${entity.nameLowerCase}." + ${entity.nameCamelCase}Columns._ID, desc);
-        return this;
+        return orderBy("${entity.nameLowerCase}." + ${entity.nameCamelCase}Columns._ID, desc);
     }
 
     public ${entity.nameCamelCase}Selection orderById() {
@@ -240,14 +236,16 @@ public class ${entity.nameCamelCase}Selection extends AbstractSelection<${entity
     <#break>
     </#switch>
 
+    public ${entity.nameCamelCase}Selection for<#if field.isForeign>${field.path}${field.nameCamelCase}<#else>${field.nameCamelCase}</#if>() {
+        return forColumn(${field.entity.nameCamelCase}Columns.${field.nameUpperCase});
+    }
+
     public ${entity.nameCamelCase}Selection orderBy<#if field.isForeign>${field.path}${field.nameCamelCase}<#else>${field.nameCamelCase}</#if>(boolean desc) {
-        orderBy(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, desc);
-        return this;
+        return orderBy(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, desc);
     }
 
     public ${entity.nameCamelCase}Selection orderBy<#if field.isForeign>${field.path}${field.nameCamelCase}<#else>${field.nameCamelCase}</#if>() {
-        orderBy(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, false);
-        return this;
+        return orderBy(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, false);
     }
     </#if>
     </#list>