From 5456651fede6670b090a618e90ee2225f20bc97e Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Thu, 30 Oct 2014 22:42:23 +0100
Subject: [PATCH 1/9] Reverting to commit
 7871607d40d125b9212acf0f20f4ea22c77de8da

---
 README.md                                     |  5 +-
 etc/sample/app/res/layout/main.xml            |  6 --
 .../sample/app/SampleActivity.java            | 21 +-----
 .../sample/provider/SampleProvider.java       | 74 ++++---------------
 .../sample/provider/base/AbstractCursor.java  |  4 +-
 .../sample/provider/base/AliasCursor.java     | 74 -------------------
 .../provider/company/CompanyColumns.java      | 25 +------
 .../sample/provider/person/PersonColumns.java | 55 ++------------
 .../sample/provider/team/TeamColumns.java     | 25 +------
 pom.xml                                       |  2 +-
 .../androidcontentprovidergenerator/Main.java |  8 --
 .../model/Entity.java                         | 30 --------
 .../abstractcursor.ftl                        |  4 +-
 .../aliascursor.ftl                           | 47 ------------
 .../columns.ftl                               | 30 +-------
 .../contentprovider.ftl                       | 62 ++++------------
 16 files changed, 50 insertions(+), 422 deletions(-)
 delete mode 100644 etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AliasCursor.java
 delete mode 100644 src/main/resources/org/jraf/androidcontentprovidergenerator/aliascursor.ftl

diff --git a/README.md b/README.md
index ff4ebef..c7a299d 100644
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ https://github.com/BoD/android-contentprovider-generator/releases/latest
 
 ### Run the tool
 
-`java -jar android-contentprovider-generator-1.8.1-bundle.jar -i <input folder> -o <output folder>`
+`java -jar android-contentprovider-generator-1.8.0-bundle.jar -i <input folder> -o <output folder>`
 - Input folder: where to find `_config.json` and your entity json files
 - Output folder: where the resulting files will be generated
 
@@ -195,6 +195,7 @@ In this example, the field `main_team_id` is a foreign key referencing the prima
 
 #### Limitations
 - **Only one foreign key to a particular table is allowed per table.**  In the example above only one column in `person` can point to `team`.
+- **Columns of joined tables must have unique names.**  In the example above there must not be a column `name` both in `person` and in `team`. You can just prefix their name with the table name (i.e. `person_name`, `team_name`).
 - **Loops** (i.e. A has a foreign key to B and B has a foreign key to A) **aren't detected.**  The generator will infinitely loop if they exist.
 - Foreign keys always reference the `_id` column (the implicit primary key of all tables) and thus must always be of type `Long`  - by design.
 
@@ -206,7 +207,7 @@ You need maven to build this tool.
 
 `mvn package`
 
-This will produce `android-contentprovider-generator-1.8.1-bundle.jar` in the `target` folder.
+This will produce `android-contentprovider-generator-1.8.0-bundle.jar` in the `target` folder.
 
 
 Similar tools
diff --git a/etc/sample/app/res/layout/main.xml b/etc/sample/app/res/layout/main.xml
index 7feeb33..a1ae944 100644
--- a/etc/sample/app/res/layout/main.xml
+++ b/etc/sample/app/res/layout/main.xml
@@ -34,10 +34,4 @@
         android:layout_height="wrap_content"
         android:text="Query people with team and company" />
 
-    <Button
-        android:id="@+id/btnQueryTeamsWithCompany"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Query teams with company" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
index e5c8408..a59a53d 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
@@ -24,8 +24,6 @@
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonSelection;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamContentValues;
-import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamCursor;
-import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamSelection;
 
 public class SampleActivity extends Activity {
     private static final String TAG = SampleActivity.class.getSimpleName();
@@ -45,7 +43,6 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.btnQueryPeople).setOnClickListener(mOnClickListener);
         findViewById(R.id.btnQueryPeopleWithTeam).setOnClickListener(mOnClickListener);
         findViewById(R.id.btnQueryPeopleWithTeamAndCompany).setOnClickListener(mOnClickListener);
-        findViewById(R.id.btnQueryTeamsWithCompany).setOnClickListener(mOnClickListener);
 
     }
 
@@ -72,10 +69,6 @@ public void onClick(View v) {
                 case R.id.btnQueryPeopleWithTeamAndCompany:
                     queryPeopleWithTeamAndCompany();
                     break;
-
-                case R.id.btnQueryTeamsWithCompany:
-                    queryTeamsWithCompany();
-                    break;
             }
         }
     };
@@ -123,8 +116,7 @@ private void queryPeopleWithTeam() {
     private void queryPeopleWithTeamAndCompany() {
         PersonSelection personSelection = new PersonSelection();
         personSelection.firstName("James", "John");
-        String[] projection = { PersonColumns._ID, PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, TeamColumns.NAME, CompanyColumns.NAME,
-                TeamColumns._ID, CompanyColumns._ID };
+        String[] projection = { PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, TeamColumns.NAME, CompanyColumns.NAME };
         PersonCursor c = personSelection.query(getContentResolver(), projection);
         while (c.moveToNext()) {
             Log.d(TAG, c.getFirstName() + " " + c.getLastName() + " (age: " + c.getAge() + ") - team: " + c.getTeamName() + " - company: " + c.getCompanyName());
@@ -132,17 +124,6 @@ private void queryPeopleWithTeamAndCompany() {
         c.close();
     }
 
-    private void queryTeamsWithCompany() {
-        TeamSelection teamSelection = new TeamSelection();
-        teamSelection.name("Red Legends");
-        String[] projection = { TeamColumns._ID, TeamColumns.NAME, CompanyColumns.NAME, };
-        TeamCursor c = teamSelection.query(getContentResolver(), projection);
-        while (c.moveToNext()) {
-            Log.d(TAG, c.getId() + " " + c.getName() + " - company: " + c.getCompanyName());
-        }
-        c.close();
-    }
-
     private void deleteBase() {
         CompanySelection companySelection = new CompanySelection();
         companySelection.delete(getContentResolver());
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
index d0bd2a3..129fae7 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
@@ -42,7 +42,6 @@
 import android.util.Log;
 
 import org.jraf.androidcontentprovidergenerator.sample.BuildConfig;
-import org.jraf.androidcontentprovidergenerator.sample.provider.base.AliasCursor;
 import org.jraf.androidcontentprovidergenerator.sample.provider.company.CompanyColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
@@ -202,10 +201,21 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
             Log.d(TAG, "query uri=" + uri + " selection=" + selection + " selectionArgs=" + Arrays.toString(selectionArgs) + " sortOrder=" + sortOrder
                     + " groupBy=" + groupBy);
         QueryParams queryParams = getQueryParams(uri, selection, projection);
-        Cursor res = mSampleSQLiteOpenHelper.getReadableDatabase().query(queryParams.tablesWithJoins, queryParams.projection, queryParams.selection,
-                selectionArgs, groupBy, null, sortOrder == null ? queryParams.orderBy : sortOrder);
+        ensureIdIsFullyQualified(projection, queryParams.table);
+        Cursor res = mSampleSQLiteOpenHelper.getReadableDatabase().query(queryParams.tablesWithJoins, projection, queryParams.selection, selectionArgs, groupBy,
+                null, sortOrder == null ? queryParams.orderBy : sortOrder);
         res.setNotificationUri(getContext().getContentResolver(), uri);
-        return new AliasCursor(res);
+        return res;
+    }
+
+    private void ensureIdIsFullyQualified(String[] projection, String tableName) {
+        if (projection != null) {
+            for (int i = 0; i < projection.length; ++i) {
+                if (projection[i].equals(BaseColumns._ID)) {
+                    projection[i] = tableName + "." + BaseColumns._ID + " AS " + BaseColumns._ID;
+                }
+            }
+        }
     }
 
     @Override
@@ -242,14 +252,12 @@ private static class QueryParams {
         public String tablesWithJoins;
         public String selection;
         public String orderBy;
-        public String[] projection;
     }
 
     private QueryParams getQueryParams(Uri uri, String selection, String[] projection) {
         QueryParams res = new QueryParams();
         String id = null;
         int matchedId = URI_MATCHER.match(uri);
-        res.projection = projection;
         switch (matchedId) {
             case URI_TYPE_COMPANY:
             case URI_TYPE_COMPANY_ID:
@@ -268,9 +276,6 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
                 if (CompanyColumns.hasColumns(projection)) {
                     res.tablesWithJoins += " LEFT OUTER JOIN " + CompanyColumns.TABLE_NAME + " ON " + TeamColumns.TABLE_NAME + "." + TeamColumns.COMPANY_ID + "=" + CompanyColumns.TABLE_NAME + "." + CompanyColumns._ID;
                 }
-
-                res.projection = qualifyAmbiguousColumns(res.projection, PersonColumns.ALL_COLUMNS, TeamColumns.ALL_COLUMNS, CompanyColumns.ALL_COLUMNS);
-
                 res.orderBy = PersonColumns.DEFAULT_ORDER;
                 break;
 
@@ -281,9 +286,6 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
                 if (CompanyColumns.hasColumns(projection)) {
                     res.tablesWithJoins += " LEFT OUTER JOIN " + CompanyColumns.TABLE_NAME + " ON " + TeamColumns.TABLE_NAME + "." + TeamColumns.COMPANY_ID + "=" + CompanyColumns.TABLE_NAME + "." + CompanyColumns._ID;
                 }
-
-                res.projection = qualifyAmbiguousColumns(res.projection, TeamColumns.ALL_COLUMNS, CompanyColumns.ALL_COLUMNS);
-
                 res.orderBy = TeamColumns.DEFAULT_ORDER;
                 break;
 
@@ -306,57 +308,9 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
         } else {
             res.selection = selection;
         }
-
         return res;
     }
 
-    private static String[] qualifyAmbiguousColumns(String[] projection, String[]... columns) {
-        if (projection == null) return null;
-        String[] res = new String[projection.length];
-        for (int p = 0; p < projection.length; p++) {
-            String colP = projection[p];
-            if (isInAtLeast2(colP, columns)) {
-                // Ambiguous column names
-                res[p] = getQualifiedColumnName(colP);
-            } else {
-                res[p] = colP;
-            }
-        }
-        return res;
-    }
-
-    private static boolean isInAtLeast2(String colP, String[][] columnsList) {
-        int found = 0;
-        for (String[] columns : columnsList) {
-            for (String column : columns) {
-                if (colP.equals(column)) {
-                    found++;
-                    if (found > 1) return true;
-                    break;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private static String getQualifiedColumnName(String columnName) {
-        String res = null;
-        //  Company
-        res =  CompanyColumns.getQualifiedColumnName(columnName);
-        if (res != null) return res;
-
-        //  Person
-        res =  PersonColumns.getQualifiedColumnName(columnName);
-        if (res != null) return res;
-
-        //  Team
-        res =  TeamColumns.getQualifiedColumnName(columnName);
-        if (res != null) return res;
-
-        return null;
-    }
-
     public static Uri notify(Uri uri, boolean notify) {
         return uri.buildUpon().appendQueryParameter(QUERY_NOTIFY, String.valueOf(notify)).build();
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
index 9f62f34..3d1bffb 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
@@ -25,14 +25,14 @@
 package org.jraf.androidcontentprovidergenerator.sample.provider.base;
 
 import java.util.Date;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
 
 import android.database.Cursor;
 import android.database.CursorWrapper;
 import android.provider.BaseColumns;
 
 public abstract class AbstractCursor extends CursorWrapper {
-    private IdentityHashMap<String, Integer> mColumnIndexes = new IdentityHashMap<String, Integer>();
+	private HashMap<String, Integer> mColumnIndexes = new HashMap<String, Integer>();
 
     public AbstractCursor(Cursor cursor) {
         super(cursor);
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AliasCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AliasCursor.java
deleted file mode 100644
index 63d8a35..0000000
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AliasCursor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This source is part of the
- *      _____  ___   ____
- *  __ / / _ \/ _ | / __/___  _______ _
- * / // / , _/ __ |/ _/_/ _ \/ __/ _ `/
- * \___/_/|_/_/ |_/_/ (_)___/_/  \_, /
- *                              /___/
- * repository.
- * 
- * Copyright (C) 2012-2014 Benoit 'BoD' Lubek (BoD@JRAF.org)
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.jraf.androidcontentprovidergenerator.sample.provider.base;
-
-import android.database.Cursor;
-import android.database.CursorWrapper;
-
-import org.jraf.androidcontentprovidergenerator.sample.provider.company.CompanyColumns;
-import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonColumns;
-import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
-
-public class AliasCursor extends CursorWrapper {
-    public AliasCursor(Cursor cursor) {
-        super(cursor);
-    }
-
-    @Override
-    public int getColumnIndexOrThrow(String columnName) throws IllegalArgumentException {
-        int res = getColumnIndex(columnName);
-        if (res == -1) throw new IllegalArgumentException("column '" + columnName + "' does not exist");
-        return res;
-    }
-
-    @Override
-    public int getColumnIndex(String columnName) {
-        int res = super.getColumnIndex(columnName);
-        if (res == -1) {
-            // Could not find the column, try with its alias
-            String alias = getAlias(columnName);
-            if (alias == null) return -1;
-            return super.getColumnIndex(alias);
-        }
-        return res;
-    }
-
-    private static String getAlias(String columnName) {
-        String res = null;
-        // Company
-        res = CompanyColumns.getAlias(columnName);
-        if (res != null) return res;
-
-        // Person
-        res = PersonColumns.getAlias(columnName);
-        if (res != null) return res;
-
-        // Team
-        res = TeamColumns.getAlias(columnName);
-        if (res != null) return res;
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
index a1c4804..13202a5 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
@@ -37,19 +37,11 @@ public class CompanyColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String NAME = new String("name");
-    public static final String ADDRESS = new String("address");
+    public static final String NAME = "name";
+    public static final String ADDRESS = "address";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
-    // @formatter:off
-    public static final String[] ALL_COLUMNS = new String[] {
-            _ID,
-            NAME,
-            ADDRESS
-    };
-    // @formatter:on
-
     public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {
@@ -59,17 +51,4 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
-
-    public static String getQualifiedColumnName(String columnName) {
-        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
-        if (columnName == NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == ADDRESS) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        return null;
-    }
-
-    public static String getAlias(String columnName) {
-        if (columnName == NAME) return TABLE_NAME + "__" + columnName;
-        if (columnName == ADDRESS) return TABLE_NAME + "__" + columnName;
-        return null;
-    }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
index fbfb418..b182959 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
@@ -37,31 +37,17 @@ public class PersonColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String MAIN_TEAM_ID = new String("main_team_id");
-    public static final String FIRST_NAME = new String("first_name");
-    public static final String LAST_NAME = new String("last_name");
-    public static final String AGE = new String("age");
-    public static final String BIRTH_DATE = new String("birth_date");
-    public static final String HAS_BLUE_EYES = new String("has_blue_eyes");
-    public static final String HEIGHT = new String("height");
-    public static final String GENDER = new String("gender");
+    public static final String MAIN_TEAM_ID = "main_team_id";
+    public static final String FIRST_NAME = "first_name";
+    public static final String LAST_NAME = "last_name";
+    public static final String AGE = "age";
+    public static final String BIRTH_DATE = "birth_date";
+    public static final String HAS_BLUE_EYES = "has_blue_eyes";
+    public static final String HEIGHT = "height";
+    public static final String GENDER = "gender";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
-    // @formatter:off
-    public static final String[] ALL_COLUMNS = new String[] {
-            _ID,
-            MAIN_TEAM_ID,
-            FIRST_NAME,
-            LAST_NAME,
-            AGE,
-            BIRTH_DATE,
-            HAS_BLUE_EYES,
-            HEIGHT,
-            GENDER
-    };
-    // @formatter:on
-
     public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {
@@ -77,29 +63,4 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
-
-    public static String getQualifiedColumnName(String columnName) {
-        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
-        if (columnName == MAIN_TEAM_ID) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == FIRST_NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == LAST_NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == AGE) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == BIRTH_DATE) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == HAS_BLUE_EYES) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == HEIGHT) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == GENDER) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        return null;
-    }
-
-    public static String getAlias(String columnName) {
-        if (columnName == MAIN_TEAM_ID) return TABLE_NAME + "__" + columnName;
-        if (columnName == FIRST_NAME) return TABLE_NAME + "__" + columnName;
-        if (columnName == LAST_NAME) return TABLE_NAME + "__" + columnName;
-        if (columnName == AGE) return TABLE_NAME + "__" + columnName;
-        if (columnName == BIRTH_DATE) return TABLE_NAME + "__" + columnName;
-        if (columnName == HAS_BLUE_EYES) return TABLE_NAME + "__" + columnName;
-        if (columnName == HEIGHT) return TABLE_NAME + "__" + columnName;
-        if (columnName == GENDER) return TABLE_NAME + "__" + columnName;
-        return null;
-    }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
index 4fd64de..6948c31 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
@@ -37,19 +37,11 @@ public class TeamColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String COMPANY_ID = new String("company_id");
-    public static final String NAME = new String("name");
+    public static final String COMPANY_ID = "company_id";
+    public static final String NAME = "name";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
-    // @formatter:off
-    public static final String[] ALL_COLUMNS = new String[] {
-            _ID,
-            COMPANY_ID,
-            NAME
-    };
-    // @formatter:on
-
     public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {
@@ -59,17 +51,4 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
-
-    public static String getQualifiedColumnName(String columnName) {
-        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
-        if (columnName == COMPANY_ID) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        return null;
-    }
-
-    public static String getAlias(String columnName) {
-        if (columnName == COMPANY_ID) return TABLE_NAME + "__" + columnName;
-        if (columnName == NAME) return TABLE_NAME + "__" + columnName;
-        return null;
-    }
 }
diff --git a/pom.xml b/pom.xml
index e395387..e3a1ce4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.jraf</groupId>
     <artifactId>android_contentprovider_generator</artifactId>
-    <version>1.8.1</version> <!-- Do not forget to update README.md when updating this value -->
+    <version>1.8.0</version> <!-- Do not forget to update README.md when updating this value -->
     <packaging>jar</packaging>
 
     <name>GenerateAndroidProvider</name>
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java b/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
index 26e6c93..0cc3663 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
@@ -275,7 +275,6 @@ private void generateWrappers(Arguments arguments) throws IOException, JSONExcep
         Map<String, Object> root = new HashMap<>();
         root.put("config", getConfig(arguments.inputDir));
         root.put("header", Model.get().getHeader());
-        root.put("model", Model.get());
 
         // AbstractCursor
         Template template = getFreeMarkerConfig().getTemplate("abstractcursor.ftl");
@@ -284,13 +283,6 @@ private void generateWrappers(Arguments arguments) throws IOException, JSONExcep
         template.process(root, out);
         IOUtils.closeQuietly(out);
 
-        // AliasCursor
-        template = getFreeMarkerConfig().getTemplate("aliascursor.ftl");
-        outputFile = new File(baseClassesDir, "AliasCursor.java");
-        out = new OutputStreamWriter(new FileOutputStream(outputFile));
-        template.process(root, out);
-        IOUtils.closeQuietly(out);
-
         // AbstractContentValuesWrapper
         template = getFreeMarkerConfig().getTemplate("abstractcontentvalues.ftl");
         outputFile = new File(baseClassesDir, "AbstractContentValues.java");
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
index ee808a6..034c81f 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
@@ -48,9 +48,6 @@ public class Entity {
     private static final String ON = "\" ON \"";
     private static final String EQUALS = "\"=\"";
     private static final String DOT = "\".\"";
-    private static final String QUALIFY_AMBIGUOUS = "res.projection = qualifyAmbiguousColumns(res.projection";
-    private static final String ALL_COLUMNS = "Columns.ALL_COLUMNS";
-    private static final String COMMA = ", ";
 
 
     private static final Map<String, Entity> ALL_ENTITIES = new HashMap<>();
@@ -146,20 +143,6 @@ public String getAllJoinedTableNames() {
         res.append(";");
 
         addAllJoinedClauses(this, res);
-
-        List<Entity> joinedEntities = new ArrayList<>();
-        getAllJoinedEntities(this, joinedEntities);
-        if (joinedEntities.size() > 1) {
-            res.append("\n\n");
-            res.append(INDENT1);
-            res.append(QUALIFY_AMBIGUOUS);
-            for (Entity entity : joinedEntities) {
-                res.append(COMMA);
-                res.append(entity.getNameCamelCase());
-                res.append(ALL_COLUMNS);
-            }
-            res.append(");\n");
-        }
         return res.toString();
     }
 
@@ -195,7 +178,6 @@ private static void addAllJoinedClauses(Entity entity, StringBuilder res) {
 
             res.append(getQualifiedColumnName(foreignKey.getEntity(), foreignKey.getField()));
             res.append(";\n");
-
             res.append(INDENT1);
             res.append("}");
 
@@ -204,18 +186,6 @@ private static void addAllJoinedClauses(Entity entity, StringBuilder res) {
         }
     }
 
-    private static void getAllJoinedEntities(Entity entity, List<Entity> joinedEntities) {
-        joinedEntities.add(entity);
-        List<Field> fields = entity.getFields();
-        for (Field field : fields) {
-            ForeignKey foreignKey = field.getForeignKey();
-            if (foreignKey == null) continue;
-
-            // Recurse
-            getAllJoinedEntities(foreignKey.getEntity(), joinedEntities);
-        }
-    }
-
     private static void getHasColumnClauses(StringBuilder res, Entity entity) {
         res.append(entity.getNameCamelCase());
         res.append(COLUMNS);
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/abstractcursor.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/abstractcursor.ftl
index ea47d79..9b0b573 100644
--- a/src/main/resources/org/jraf/androidcontentprovidergenerator/abstractcursor.ftl
+++ b/src/main/resources/org/jraf/androidcontentprovidergenerator/abstractcursor.ftl
@@ -4,14 +4,14 @@ ${header}
 package ${config.providerJavaPackage}.base;
 
 import java.util.Date;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
 
 import android.database.Cursor;
 import android.database.CursorWrapper;
 import android.provider.BaseColumns;
 
 public abstract class AbstractCursor extends CursorWrapper {
-    private IdentityHashMap<String, Integer> mColumnIndexes = new IdentityHashMap<String, Integer>();
+	private HashMap<String, Integer> mColumnIndexes = new HashMap<String, Integer>();
 
     public AbstractCursor(Cursor cursor) {
         super(cursor);
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/aliascursor.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/aliascursor.ftl
deleted file mode 100644
index 33a936a..0000000
--- a/src/main/resources/org/jraf/androidcontentprovidergenerator/aliascursor.ftl
+++ /dev/null
@@ -1,47 +0,0 @@
-<#if header??>
-${header}
-</#if>
-package ${config.providerJavaPackage}.base;
-
-import android.database.Cursor;
-import android.database.CursorWrapper;
-
-<#list model.entities as entity>
-import ${config.providerJavaPackage}.${entity.packageName}.${entity.nameCamelCase}Columns;
-</#list>
-
-public class AliasCursor extends CursorWrapper {
-    public AliasCursor(Cursor cursor) {
-        super(cursor);
-    }
-
-    @Override
-    public int getColumnIndexOrThrow(String columnName) throws IllegalArgumentException {
-        int res = getColumnIndex(columnName);
-        if (res == -1) throw new IllegalArgumentException("column '" + columnName + "' does not exist");
-        return res;
-    }
-
-    @Override
-    public int getColumnIndex(String columnName) {
-        int res = super.getColumnIndex(columnName);
-        if (res == -1) {
-            // Could not find the column, try with its alias
-            String alias = getAlias(columnName);
-            if (alias == null) return -1;
-            return super.getColumnIndex(alias);
-        }
-        return res;
-    }
-
-    private static String getAlias(String columnName) {
-        String res = null;
-<#list model.entities as entity>
-        // ${entity.nameCamelCase}
-        res = ${entity.nameCamelCase}Columns.getAlias(columnName);
-        if (res != null) return res;
-
-</#list>
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
index dca04f4..a5e4440 100644
--- a/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
+++ b/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
@@ -19,20 +19,12 @@ public class ${entity.nameCamelCase}Columns implements BaseColumns {
     <#if field.isId>
     public static final String ${field.nameUpperCase} = new String(BaseColumns._ID);
     <#else>
-    public static final String ${field.nameUpperCase} = new String("${field.nameLowerCase}");
+    public static final String ${field.nameUpperCase} = "${field.nameLowerCase}";
     </#if>
     </#list>
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
-    // @formatter:off
-    public static final String[] ALL_COLUMNS = new String[] {
-            <#list entity.fields as field>
-            ${field.nameUpperCase}<#if field_has_next>,</#if>
-            </#list>
-    };
-    // @formatter:on
-
     public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {
@@ -42,24 +34,4 @@ public class ${entity.nameCamelCase}Columns implements BaseColumns {
         }
         return false;
     }
-
-    public static String getQualifiedColumnName(String columnName) {
-        <#list entity.fields as field>
-            <#if field.isId>
-        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
-            <#else>
-        if (columnName == ${field.nameUpperCase}) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-            </#if>
-        </#list>
-        return null;
-    }
-
-    public static String getAlias(String columnName) {
-        <#list entity.fields as field>
-            <#if !field.isId>
-        if (columnName == ${field.nameUpperCase}) return TABLE_NAME + "__" + columnName;
-            </#if>
-        </#list>
-        return null;
-    }
 }
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/contentprovider.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/contentprovider.ftl
index bfaa372..cb851f9 100644
--- a/src/main/resources/org/jraf/androidcontentprovidergenerator/contentprovider.ftl
+++ b/src/main/resources/org/jraf/androidcontentprovidergenerator/contentprovider.ftl
@@ -21,7 +21,6 @@ import android.provider.BaseColumns;
 import android.util.Log;
 
 import ${config.projectPackageId}.BuildConfig;
-import ${config.providerJavaPackage}.base.AliasCursor;
 <#list model.entities as entity>
 import ${config.providerJavaPackage}.${entity.packageName}.${entity.nameCamelCase}Columns;
 </#list>
@@ -170,10 +169,21 @@ public class ${config.providerClassName} extends ContentProvider {
             Log.d(TAG, "query uri=" + uri + " selection=" + selection + " selectionArgs=" + Arrays.toString(selectionArgs) + " sortOrder=" + sortOrder
                     + " groupBy=" + groupBy);
         QueryParams queryParams = getQueryParams(uri, selection, projection);
-        Cursor res = m${config.sqliteOpenHelperClassName}.getReadableDatabase().query(queryParams.tablesWithJoins, queryParams.projection, queryParams.selection,
-                selectionArgs, groupBy, null, sortOrder == null ? queryParams.orderBy : sortOrder);
+        ensureIdIsFullyQualified(projection, queryParams.table);
+        Cursor res = m${config.sqliteOpenHelperClassName}.getReadableDatabase().query(queryParams.tablesWithJoins, projection, queryParams.selection, selectionArgs, groupBy,
+                null, sortOrder == null ? queryParams.orderBy : sortOrder);
         res.setNotificationUri(getContext().getContentResolver(), uri);
-        return new AliasCursor(res);
+        return res;
+    }
+
+    private void ensureIdIsFullyQualified(String[] projection, String tableName) {
+        if (projection != null) {
+            for (int i = 0; i < projection.length; ++i) {
+                if (projection[i].equals(BaseColumns._ID)) {
+                    projection[i] = tableName + "." + BaseColumns._ID + " AS " + BaseColumns._ID;
+                }
+            }
+        }
     }
 
     @Override
@@ -210,14 +220,12 @@ public class ${config.providerClassName} extends ContentProvider {
         public String tablesWithJoins;
         public String selection;
         public String orderBy;
-        public String[] projection;
     }
 
     private QueryParams getQueryParams(Uri uri, String selection, String[] projection) {
         QueryParams res = new QueryParams();
         String id = null;
         int matchedId = URI_MATCHER.match(uri);
-        res.projection = projection;
         switch (matchedId) {
             <#list model.entities as entity>
             case URI_TYPE_${entity.nameUpperCase}:
@@ -247,51 +255,9 @@ public class ${config.providerClassName} extends ContentProvider {
         } else {
             res.selection = selection;
         }
-
-        return res;
-    }
-
-    private static String[] qualifyAmbiguousColumns(String[] projection, String[]... columns) {
-        if (projection == null) return null;
-        String[] res = new String[projection.length];
-        for (int p = 0; p < projection.length; p++) {
-            String colP = projection[p];
-            if (isInAtLeast2(colP, columns)) {
-                // Ambiguous column names
-                res[p] = getQualifiedColumnName(colP);
-            } else {
-                res[p] = colP;
-            }
-        }
         return res;
     }
 
-    private static boolean isInAtLeast2(String colP, String[][] columnsList) {
-        int found = 0;
-        for (String[] columns : columnsList) {
-            for (String column : columns) {
-                if (colP.equals(column)) {
-                    found++;
-                    if (found > 1) return true;
-                    break;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private static String getQualifiedColumnName(String columnName) {
-        String res = null;
-        <#list model.entities as entity>
-        //  ${entity.nameCamelCase}
-        res =  ${entity.nameCamelCase}Columns.getQualifiedColumnName(columnName);
-        if (res != null) return res;
-
-        </#list>
-        return null;
-    }
-
     public static Uri notify(Uri uri, boolean notify) {
         return uri.buildUpon().appendQueryParameter(QUERY_NOTIFY, String.valueOf(notify)).build();
     }

From 2a12305bc0549db3021f1abede1196a8576d6d55 Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Thu, 30 Oct 2014 22:45:27 +0100
Subject: [PATCH 2/9] Cherry-picking a few bits of the experimental ambiguous
 columns fix.

---
 README.md                                     |  5 +-
 etc/sample/app/res/layout/main.xml            |  6 ++
 .../sample/app/SampleActivity.java            | 21 +++++-
 .../sample/provider/SampleProvider.java       | 74 +++++++++++++++----
 .../sample/provider/base/AbstractCursor.java  |  4 +-
 .../provider/company/CompanyColumns.java      | 25 ++++++-
 .../sample/provider/person/PersonColumns.java | 55 ++++++++++++--
 .../sample/provider/team/TeamColumns.java     | 25 ++++++-
 pom.xml                                       |  2 +-
 .../androidcontentprovidergenerator/Main.java |  1 +
 .../columns.ftl                               |  8 ++
 11 files changed, 193 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index c7a299d..ff4ebef 100644
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ https://github.com/BoD/android-contentprovider-generator/releases/latest
 
 ### Run the tool
 
-`java -jar android-contentprovider-generator-1.8.0-bundle.jar -i <input folder> -o <output folder>`
+`java -jar android-contentprovider-generator-1.8.1-bundle.jar -i <input folder> -o <output folder>`
 - Input folder: where to find `_config.json` and your entity json files
 - Output folder: where the resulting files will be generated
 
@@ -195,7 +195,6 @@ In this example, the field `main_team_id` is a foreign key referencing the prima
 
 #### Limitations
 - **Only one foreign key to a particular table is allowed per table.**  In the example above only one column in `person` can point to `team`.
-- **Columns of joined tables must have unique names.**  In the example above there must not be a column `name` both in `person` and in `team`. You can just prefix their name with the table name (i.e. `person_name`, `team_name`).
 - **Loops** (i.e. A has a foreign key to B and B has a foreign key to A) **aren't detected.**  The generator will infinitely loop if they exist.
 - Foreign keys always reference the `_id` column (the implicit primary key of all tables) and thus must always be of type `Long`  - by design.
 
@@ -207,7 +206,7 @@ You need maven to build this tool.
 
 `mvn package`
 
-This will produce `android-contentprovider-generator-1.8.0-bundle.jar` in the `target` folder.
+This will produce `android-contentprovider-generator-1.8.1-bundle.jar` in the `target` folder.
 
 
 Similar tools
diff --git a/etc/sample/app/res/layout/main.xml b/etc/sample/app/res/layout/main.xml
index a1ae944..7feeb33 100644
--- a/etc/sample/app/res/layout/main.xml
+++ b/etc/sample/app/res/layout/main.xml
@@ -34,4 +34,10 @@
         android:layout_height="wrap_content"
         android:text="Query people with team and company" />
 
+    <Button
+        android:id="@+id/btnQueryTeamsWithCompany"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Query teams with company" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
index a59a53d..e5c8408 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
@@ -24,6 +24,8 @@
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonSelection;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamContentValues;
+import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamCursor;
+import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamSelection;
 
 public class SampleActivity extends Activity {
     private static final String TAG = SampleActivity.class.getSimpleName();
@@ -43,6 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.btnQueryPeople).setOnClickListener(mOnClickListener);
         findViewById(R.id.btnQueryPeopleWithTeam).setOnClickListener(mOnClickListener);
         findViewById(R.id.btnQueryPeopleWithTeamAndCompany).setOnClickListener(mOnClickListener);
+        findViewById(R.id.btnQueryTeamsWithCompany).setOnClickListener(mOnClickListener);
 
     }
 
@@ -69,6 +72,10 @@ public void onClick(View v) {
                 case R.id.btnQueryPeopleWithTeamAndCompany:
                     queryPeopleWithTeamAndCompany();
                     break;
+
+                case R.id.btnQueryTeamsWithCompany:
+                    queryTeamsWithCompany();
+                    break;
             }
         }
     };
@@ -116,7 +123,8 @@ private void queryPeopleWithTeam() {
     private void queryPeopleWithTeamAndCompany() {
         PersonSelection personSelection = new PersonSelection();
         personSelection.firstName("James", "John");
-        String[] projection = { PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, TeamColumns.NAME, CompanyColumns.NAME };
+        String[] projection = { PersonColumns._ID, PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, TeamColumns.NAME, CompanyColumns.NAME,
+                TeamColumns._ID, CompanyColumns._ID };
         PersonCursor c = personSelection.query(getContentResolver(), projection);
         while (c.moveToNext()) {
             Log.d(TAG, c.getFirstName() + " " + c.getLastName() + " (age: " + c.getAge() + ") - team: " + c.getTeamName() + " - company: " + c.getCompanyName());
@@ -124,6 +132,17 @@ private void queryPeopleWithTeamAndCompany() {
         c.close();
     }
 
+    private void queryTeamsWithCompany() {
+        TeamSelection teamSelection = new TeamSelection();
+        teamSelection.name("Red Legends");
+        String[] projection = { TeamColumns._ID, TeamColumns.NAME, CompanyColumns.NAME, };
+        TeamCursor c = teamSelection.query(getContentResolver(), projection);
+        while (c.moveToNext()) {
+            Log.d(TAG, c.getId() + " " + c.getName() + " - company: " + c.getCompanyName());
+        }
+        c.close();
+    }
+
     private void deleteBase() {
         CompanySelection companySelection = new CompanySelection();
         companySelection.delete(getContentResolver());
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
index 129fae7..d0bd2a3 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
@@ -42,6 +42,7 @@
 import android.util.Log;
 
 import org.jraf.androidcontentprovidergenerator.sample.BuildConfig;
+import org.jraf.androidcontentprovidergenerator.sample.provider.base.AliasCursor;
 import org.jraf.androidcontentprovidergenerator.sample.provider.company.CompanyColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
@@ -201,21 +202,10 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
             Log.d(TAG, "query uri=" + uri + " selection=" + selection + " selectionArgs=" + Arrays.toString(selectionArgs) + " sortOrder=" + sortOrder
                     + " groupBy=" + groupBy);
         QueryParams queryParams = getQueryParams(uri, selection, projection);
-        ensureIdIsFullyQualified(projection, queryParams.table);
-        Cursor res = mSampleSQLiteOpenHelper.getReadableDatabase().query(queryParams.tablesWithJoins, projection, queryParams.selection, selectionArgs, groupBy,
-                null, sortOrder == null ? queryParams.orderBy : sortOrder);
+        Cursor res = mSampleSQLiteOpenHelper.getReadableDatabase().query(queryParams.tablesWithJoins, queryParams.projection, queryParams.selection,
+                selectionArgs, groupBy, null, sortOrder == null ? queryParams.orderBy : sortOrder);
         res.setNotificationUri(getContext().getContentResolver(), uri);
-        return res;
-    }
-
-    private void ensureIdIsFullyQualified(String[] projection, String tableName) {
-        if (projection != null) {
-            for (int i = 0; i < projection.length; ++i) {
-                if (projection[i].equals(BaseColumns._ID)) {
-                    projection[i] = tableName + "." + BaseColumns._ID + " AS " + BaseColumns._ID;
-                }
-            }
-        }
+        return new AliasCursor(res);
     }
 
     @Override
@@ -252,12 +242,14 @@ private static class QueryParams {
         public String tablesWithJoins;
         public String selection;
         public String orderBy;
+        public String[] projection;
     }
 
     private QueryParams getQueryParams(Uri uri, String selection, String[] projection) {
         QueryParams res = new QueryParams();
         String id = null;
         int matchedId = URI_MATCHER.match(uri);
+        res.projection = projection;
         switch (matchedId) {
             case URI_TYPE_COMPANY:
             case URI_TYPE_COMPANY_ID:
@@ -276,6 +268,9 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
                 if (CompanyColumns.hasColumns(projection)) {
                     res.tablesWithJoins += " LEFT OUTER JOIN " + CompanyColumns.TABLE_NAME + " ON " + TeamColumns.TABLE_NAME + "." + TeamColumns.COMPANY_ID + "=" + CompanyColumns.TABLE_NAME + "." + CompanyColumns._ID;
                 }
+
+                res.projection = qualifyAmbiguousColumns(res.projection, PersonColumns.ALL_COLUMNS, TeamColumns.ALL_COLUMNS, CompanyColumns.ALL_COLUMNS);
+
                 res.orderBy = PersonColumns.DEFAULT_ORDER;
                 break;
 
@@ -286,6 +281,9 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
                 if (CompanyColumns.hasColumns(projection)) {
                     res.tablesWithJoins += " LEFT OUTER JOIN " + CompanyColumns.TABLE_NAME + " ON " + TeamColumns.TABLE_NAME + "." + TeamColumns.COMPANY_ID + "=" + CompanyColumns.TABLE_NAME + "." + CompanyColumns._ID;
                 }
+
+                res.projection = qualifyAmbiguousColumns(res.projection, TeamColumns.ALL_COLUMNS, CompanyColumns.ALL_COLUMNS);
+
                 res.orderBy = TeamColumns.DEFAULT_ORDER;
                 break;
 
@@ -308,9 +306,57 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
         } else {
             res.selection = selection;
         }
+
         return res;
     }
 
+    private static String[] qualifyAmbiguousColumns(String[] projection, String[]... columns) {
+        if (projection == null) return null;
+        String[] res = new String[projection.length];
+        for (int p = 0; p < projection.length; p++) {
+            String colP = projection[p];
+            if (isInAtLeast2(colP, columns)) {
+                // Ambiguous column names
+                res[p] = getQualifiedColumnName(colP);
+            } else {
+                res[p] = colP;
+            }
+        }
+        return res;
+    }
+
+    private static boolean isInAtLeast2(String colP, String[][] columnsList) {
+        int found = 0;
+        for (String[] columns : columnsList) {
+            for (String column : columns) {
+                if (colP.equals(column)) {
+                    found++;
+                    if (found > 1) return true;
+                    break;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static String getQualifiedColumnName(String columnName) {
+        String res = null;
+        //  Company
+        res =  CompanyColumns.getQualifiedColumnName(columnName);
+        if (res != null) return res;
+
+        //  Person
+        res =  PersonColumns.getQualifiedColumnName(columnName);
+        if (res != null) return res;
+
+        //  Team
+        res =  TeamColumns.getQualifiedColumnName(columnName);
+        if (res != null) return res;
+
+        return null;
+    }
+
     public static Uri notify(Uri uri, boolean notify) {
         return uri.buildUpon().appendQueryParameter(QUERY_NOTIFY, String.valueOf(notify)).build();
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
index 3d1bffb..9f62f34 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
@@ -25,14 +25,14 @@
 package org.jraf.androidcontentprovidergenerator.sample.provider.base;
 
 import java.util.Date;
-import java.util.HashMap;
+import java.util.IdentityHashMap;
 
 import android.database.Cursor;
 import android.database.CursorWrapper;
 import android.provider.BaseColumns;
 
 public abstract class AbstractCursor extends CursorWrapper {
-	private HashMap<String, Integer> mColumnIndexes = new HashMap<String, Integer>();
+    private IdentityHashMap<String, Integer> mColumnIndexes = new IdentityHashMap<String, Integer>();
 
     public AbstractCursor(Cursor cursor) {
         super(cursor);
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
index 13202a5..a1c4804 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
@@ -37,11 +37,19 @@ public class CompanyColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String NAME = "name";
-    public static final String ADDRESS = "address";
+    public static final String NAME = new String("name");
+    public static final String ADDRESS = new String("address");
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
+    // @formatter:off
+    public static final String[] ALL_COLUMNS = new String[] {
+            _ID,
+            NAME,
+            ADDRESS
+    };
+    // @formatter:on
+
     public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {
@@ -51,4 +59,17 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
+
+    public static String getQualifiedColumnName(String columnName) {
+        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
+        if (columnName == NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == ADDRESS) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        return null;
+    }
+
+    public static String getAlias(String columnName) {
+        if (columnName == NAME) return TABLE_NAME + "__" + columnName;
+        if (columnName == ADDRESS) return TABLE_NAME + "__" + columnName;
+        return null;
+    }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
index b182959..fbfb418 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
@@ -37,17 +37,31 @@ public class PersonColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String MAIN_TEAM_ID = "main_team_id";
-    public static final String FIRST_NAME = "first_name";
-    public static final String LAST_NAME = "last_name";
-    public static final String AGE = "age";
-    public static final String BIRTH_DATE = "birth_date";
-    public static final String HAS_BLUE_EYES = "has_blue_eyes";
-    public static final String HEIGHT = "height";
-    public static final String GENDER = "gender";
+    public static final String MAIN_TEAM_ID = new String("main_team_id");
+    public static final String FIRST_NAME = new String("first_name");
+    public static final String LAST_NAME = new String("last_name");
+    public static final String AGE = new String("age");
+    public static final String BIRTH_DATE = new String("birth_date");
+    public static final String HAS_BLUE_EYES = new String("has_blue_eyes");
+    public static final String HEIGHT = new String("height");
+    public static final String GENDER = new String("gender");
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
+    // @formatter:off
+    public static final String[] ALL_COLUMNS = new String[] {
+            _ID,
+            MAIN_TEAM_ID,
+            FIRST_NAME,
+            LAST_NAME,
+            AGE,
+            BIRTH_DATE,
+            HAS_BLUE_EYES,
+            HEIGHT,
+            GENDER
+    };
+    // @formatter:on
+
     public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {
@@ -63,4 +77,29 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
+
+    public static String getQualifiedColumnName(String columnName) {
+        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
+        if (columnName == MAIN_TEAM_ID) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == FIRST_NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == LAST_NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == AGE) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == BIRTH_DATE) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == HAS_BLUE_EYES) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == HEIGHT) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == GENDER) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        return null;
+    }
+
+    public static String getAlias(String columnName) {
+        if (columnName == MAIN_TEAM_ID) return TABLE_NAME + "__" + columnName;
+        if (columnName == FIRST_NAME) return TABLE_NAME + "__" + columnName;
+        if (columnName == LAST_NAME) return TABLE_NAME + "__" + columnName;
+        if (columnName == AGE) return TABLE_NAME + "__" + columnName;
+        if (columnName == BIRTH_DATE) return TABLE_NAME + "__" + columnName;
+        if (columnName == HAS_BLUE_EYES) return TABLE_NAME + "__" + columnName;
+        if (columnName == HEIGHT) return TABLE_NAME + "__" + columnName;
+        if (columnName == GENDER) return TABLE_NAME + "__" + columnName;
+        return null;
+    }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
index 6948c31..4fd64de 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
@@ -37,11 +37,19 @@ public class TeamColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String COMPANY_ID = "company_id";
-    public static final String NAME = "name";
+    public static final String COMPANY_ID = new String("company_id");
+    public static final String NAME = new String("name");
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
+    // @formatter:off
+    public static final String[] ALL_COLUMNS = new String[] {
+            _ID,
+            COMPANY_ID,
+            NAME
+    };
+    // @formatter:on
+
     public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {
@@ -51,4 +59,17 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
+
+    public static String getQualifiedColumnName(String columnName) {
+        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
+        if (columnName == COMPANY_ID) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        if (columnName == NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
+        return null;
+    }
+
+    public static String getAlias(String columnName) {
+        if (columnName == COMPANY_ID) return TABLE_NAME + "__" + columnName;
+        if (columnName == NAME) return TABLE_NAME + "__" + columnName;
+        return null;
+    }
 }
diff --git a/pom.xml b/pom.xml
index e3a1ce4..e395387 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.jraf</groupId>
     <artifactId>android_contentprovider_generator</artifactId>
-    <version>1.8.0</version> <!-- Do not forget to update README.md when updating this value -->
+    <version>1.8.1</version> <!-- Do not forget to update README.md when updating this value -->
     <packaging>jar</packaging>
 
     <name>GenerateAndroidProvider</name>
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java b/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
index 0cc3663..7cbf1ce 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
@@ -275,6 +275,7 @@ private void generateWrappers(Arguments arguments) throws IOException, JSONExcep
         Map<String, Object> root = new HashMap<>();
         root.put("config", getConfig(arguments.inputDir));
         root.put("header", Model.get().getHeader());
+        root.put("model", Model.get());
 
         // AbstractCursor
         Template template = getFreeMarkerConfig().getTemplate("abstractcursor.ftl");
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
index a5e4440..776d944 100644
--- a/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
+++ b/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
@@ -25,6 +25,14 @@ public class ${entity.nameCamelCase}Columns implements BaseColumns {
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
+    // @formatter:off
+    public static final String[] ALL_COLUMNS = new String[] {
+            <#list entity.fields as field>
+            ${field.nameUpperCase}<#if field_has_next>,</#if>
+            </#list>
+    };
+    // @formatter:on
+
     public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {

From b48e65a746dd01c5d45ec7add4ca8c6a29b5ce31 Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Thu, 30 Oct 2014 23:35:26 +0100
Subject: [PATCH 3/9] Regenerated the sample with current code.

---
 .../sample/provider/SampleProvider.java       | 74 ++++---------------
 .../sample/provider/base/AbstractCursor.java  |  4 +-
 .../provider/company/CompanyColumns.java      | 17 +----
 .../sample/provider/person/PersonColumns.java | 41 ++--------
 .../sample/provider/team/TeamColumns.java     | 17 +----
 5 files changed, 28 insertions(+), 125 deletions(-)

diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
index d0bd2a3..129fae7 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
@@ -42,7 +42,6 @@
 import android.util.Log;
 
 import org.jraf.androidcontentprovidergenerator.sample.BuildConfig;
-import org.jraf.androidcontentprovidergenerator.sample.provider.base.AliasCursor;
 import org.jraf.androidcontentprovidergenerator.sample.provider.company.CompanyColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
@@ -202,10 +201,21 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
             Log.d(TAG, "query uri=" + uri + " selection=" + selection + " selectionArgs=" + Arrays.toString(selectionArgs) + " sortOrder=" + sortOrder
                     + " groupBy=" + groupBy);
         QueryParams queryParams = getQueryParams(uri, selection, projection);
-        Cursor res = mSampleSQLiteOpenHelper.getReadableDatabase().query(queryParams.tablesWithJoins, queryParams.projection, queryParams.selection,
-                selectionArgs, groupBy, null, sortOrder == null ? queryParams.orderBy : sortOrder);
+        ensureIdIsFullyQualified(projection, queryParams.table);
+        Cursor res = mSampleSQLiteOpenHelper.getReadableDatabase().query(queryParams.tablesWithJoins, projection, queryParams.selection, selectionArgs, groupBy,
+                null, sortOrder == null ? queryParams.orderBy : sortOrder);
         res.setNotificationUri(getContext().getContentResolver(), uri);
-        return new AliasCursor(res);
+        return res;
+    }
+
+    private void ensureIdIsFullyQualified(String[] projection, String tableName) {
+        if (projection != null) {
+            for (int i = 0; i < projection.length; ++i) {
+                if (projection[i].equals(BaseColumns._ID)) {
+                    projection[i] = tableName + "." + BaseColumns._ID + " AS " + BaseColumns._ID;
+                }
+            }
+        }
     }
 
     @Override
@@ -242,14 +252,12 @@ private static class QueryParams {
         public String tablesWithJoins;
         public String selection;
         public String orderBy;
-        public String[] projection;
     }
 
     private QueryParams getQueryParams(Uri uri, String selection, String[] projection) {
         QueryParams res = new QueryParams();
         String id = null;
         int matchedId = URI_MATCHER.match(uri);
-        res.projection = projection;
         switch (matchedId) {
             case URI_TYPE_COMPANY:
             case URI_TYPE_COMPANY_ID:
@@ -268,9 +276,6 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
                 if (CompanyColumns.hasColumns(projection)) {
                     res.tablesWithJoins += " LEFT OUTER JOIN " + CompanyColumns.TABLE_NAME + " ON " + TeamColumns.TABLE_NAME + "." + TeamColumns.COMPANY_ID + "=" + CompanyColumns.TABLE_NAME + "." + CompanyColumns._ID;
                 }
-
-                res.projection = qualifyAmbiguousColumns(res.projection, PersonColumns.ALL_COLUMNS, TeamColumns.ALL_COLUMNS, CompanyColumns.ALL_COLUMNS);
-
                 res.orderBy = PersonColumns.DEFAULT_ORDER;
                 break;
 
@@ -281,9 +286,6 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
                 if (CompanyColumns.hasColumns(projection)) {
                     res.tablesWithJoins += " LEFT OUTER JOIN " + CompanyColumns.TABLE_NAME + " ON " + TeamColumns.TABLE_NAME + "." + TeamColumns.COMPANY_ID + "=" + CompanyColumns.TABLE_NAME + "." + CompanyColumns._ID;
                 }
-
-                res.projection = qualifyAmbiguousColumns(res.projection, TeamColumns.ALL_COLUMNS, CompanyColumns.ALL_COLUMNS);
-
                 res.orderBy = TeamColumns.DEFAULT_ORDER;
                 break;
 
@@ -306,57 +308,9 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
         } else {
             res.selection = selection;
         }
-
         return res;
     }
 
-    private static String[] qualifyAmbiguousColumns(String[] projection, String[]... columns) {
-        if (projection == null) return null;
-        String[] res = new String[projection.length];
-        for (int p = 0; p < projection.length; p++) {
-            String colP = projection[p];
-            if (isInAtLeast2(colP, columns)) {
-                // Ambiguous column names
-                res[p] = getQualifiedColumnName(colP);
-            } else {
-                res[p] = colP;
-            }
-        }
-        return res;
-    }
-
-    private static boolean isInAtLeast2(String colP, String[][] columnsList) {
-        int found = 0;
-        for (String[] columns : columnsList) {
-            for (String column : columns) {
-                if (colP.equals(column)) {
-                    found++;
-                    if (found > 1) return true;
-                    break;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private static String getQualifiedColumnName(String columnName) {
-        String res = null;
-        //  Company
-        res =  CompanyColumns.getQualifiedColumnName(columnName);
-        if (res != null) return res;
-
-        //  Person
-        res =  PersonColumns.getQualifiedColumnName(columnName);
-        if (res != null) return res;
-
-        //  Team
-        res =  TeamColumns.getQualifiedColumnName(columnName);
-        if (res != null) return res;
-
-        return null;
-    }
-
     public static Uri notify(Uri uri, boolean notify) {
         return uri.buildUpon().appendQueryParameter(QUERY_NOTIFY, String.valueOf(notify)).build();
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
index 9f62f34..3d1bffb 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/base/AbstractCursor.java
@@ -25,14 +25,14 @@
 package org.jraf.androidcontentprovidergenerator.sample.provider.base;
 
 import java.util.Date;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
 
 import android.database.Cursor;
 import android.database.CursorWrapper;
 import android.provider.BaseColumns;
 
 public abstract class AbstractCursor extends CursorWrapper {
-    private IdentityHashMap<String, Integer> mColumnIndexes = new IdentityHashMap<String, Integer>();
+	private HashMap<String, Integer> mColumnIndexes = new HashMap<String, Integer>();
 
     public AbstractCursor(Cursor cursor) {
         super(cursor);
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
index a1c4804..75f7150 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
@@ -37,8 +37,8 @@ public class CompanyColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String NAME = new String("name");
-    public static final String ADDRESS = new String("address");
+    public static final String NAME = "name";
+    public static final String ADDRESS = "address";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
@@ -59,17 +59,4 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
-
-    public static String getQualifiedColumnName(String columnName) {
-        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
-        if (columnName == NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == ADDRESS) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        return null;
-    }
-
-    public static String getAlias(String columnName) {
-        if (columnName == NAME) return TABLE_NAME + "__" + columnName;
-        if (columnName == ADDRESS) return TABLE_NAME + "__" + columnName;
-        return null;
-    }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
index fbfb418..426335b 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
@@ -37,14 +37,14 @@ public class PersonColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String MAIN_TEAM_ID = new String("main_team_id");
-    public static final String FIRST_NAME = new String("first_name");
-    public static final String LAST_NAME = new String("last_name");
-    public static final String AGE = new String("age");
-    public static final String BIRTH_DATE = new String("birth_date");
-    public static final String HAS_BLUE_EYES = new String("has_blue_eyes");
-    public static final String HEIGHT = new String("height");
-    public static final String GENDER = new String("gender");
+    public static final String MAIN_TEAM_ID = "main_team_id";
+    public static final String FIRST_NAME = "first_name";
+    public static final String LAST_NAME = "last_name";
+    public static final String AGE = "age";
+    public static final String BIRTH_DATE = "birth_date";
+    public static final String HAS_BLUE_EYES = "has_blue_eyes";
+    public static final String HEIGHT = "height";
+    public static final String GENDER = "gender";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
@@ -77,29 +77,4 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
-
-    public static String getQualifiedColumnName(String columnName) {
-        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
-        if (columnName == MAIN_TEAM_ID) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == FIRST_NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == LAST_NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == AGE) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == BIRTH_DATE) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == HAS_BLUE_EYES) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == HEIGHT) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == GENDER) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        return null;
-    }
-
-    public static String getAlias(String columnName) {
-        if (columnName == MAIN_TEAM_ID) return TABLE_NAME + "__" + columnName;
-        if (columnName == FIRST_NAME) return TABLE_NAME + "__" + columnName;
-        if (columnName == LAST_NAME) return TABLE_NAME + "__" + columnName;
-        if (columnName == AGE) return TABLE_NAME + "__" + columnName;
-        if (columnName == BIRTH_DATE) return TABLE_NAME + "__" + columnName;
-        if (columnName == HAS_BLUE_EYES) return TABLE_NAME + "__" + columnName;
-        if (columnName == HEIGHT) return TABLE_NAME + "__" + columnName;
-        if (columnName == GENDER) return TABLE_NAME + "__" + columnName;
-        return null;
-    }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
index 4fd64de..89ed0f9 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
@@ -37,8 +37,8 @@ public class TeamColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String COMPANY_ID = new String("company_id");
-    public static final String NAME = new String("name");
+    public static final String COMPANY_ID = "company_id";
+    public static final String NAME = "name";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
     
@@ -59,17 +59,4 @@ public static boolean hasColumns(String[] projection) {
         }
         return false;
     }
-
-    public static String getQualifiedColumnName(String columnName) {
-        if (columnName == _ID) return TABLE_NAME + "." + columnName + " AS " + _ID;
-        if (columnName == COMPANY_ID) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        if (columnName == NAME) return TABLE_NAME + "." + columnName + " AS " + TABLE_NAME + "__" + columnName;
-        return null;
-    }
-
-    public static String getAlias(String columnName) {
-        if (columnName == COMPANY_ID) return TABLE_NAME + "__" + columnName;
-        if (columnName == NAME) return TABLE_NAME + "__" + columnName;
-        return null;
-    }
 }

From bc7ad706cc198c7207169168a91876287c1e1162 Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Sat, 1 Nov 2014 15:39:12 +0100
Subject: [PATCH 4/9] Rename ambiguous columns.

---
 .../sample/app/SampleActivity.java            | 108 ++++++++---
 .../sample/provider/SampleProvider.java       |  30 +++-
 .../provider/SampleSQLiteOpenHelper.java      |  22 ++-
 .../provider/company/CompanyColumns.java      |   4 +-
 .../sample/provider/person/PersonColumns.java |  10 +-
 .../provider/person/PersonContentValues.java  |  15 +-
 .../sample/provider/person/PersonCursor.java  |  40 +----
 .../provider/person/PersonSelection.java      |  45 ++---
 .../personteam/PersonTeamColumns.java         |  62 +++++++
 .../personteam/PersonTeamContentValues.java   |  66 +++++++
 .../provider/personteam/PersonTeamCursor.java | 167 ++++++++++++++++++
 .../personteam/PersonTeamSelection.java       | 139 +++++++++++++++
 .../sample/provider/team/TeamColumns.java     |   9 +-
 .../provider/team/TeamContentValues.java      |   8 +
 .../sample/provider/team/TeamCursor.java      |   9 +
 .../sample/provider/team/TeamSelection.java   |  15 ++
 etc/sample/person.json                        |  14 +-
 etc/sample/person_team.json                   |  28 +++
 etc/sample/team.json                          |   7 +-
 .../androidcontentprovidergenerator/Log.java  |  13 +-
 .../androidcontentprovidergenerator/Main.java |   5 +-
 .../model/Entity.java                         |  28 +++
 .../model/Field.java                          |  18 ++
 .../model/Model.java                          |  28 ++-
 .../columns.ftl                               |   4 +-
 25 files changed, 757 insertions(+), 137 deletions(-)
 create mode 100644 etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamColumns.java
 create mode 100644 etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamContentValues.java
 create mode 100644 etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamCursor.java
 create mode 100644 etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java
 create mode 100644 etc/sample/person_team.json

diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
index e5c8408..3e91c4c 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
@@ -7,6 +7,7 @@
 import android.app.Activity;
 import android.content.ContentUris;
 import android.database.Cursor;
+import android.database.SQLException;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@@ -22,6 +23,10 @@
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonContentValues;
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonCursor;
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonSelection;
+import org.jraf.androidcontentprovidergenerator.sample.provider.personteam.PersonTeamColumns;
+import org.jraf.androidcontentprovidergenerator.sample.provider.personteam.PersonTeamContentValues;
+import org.jraf.androidcontentprovidergenerator.sample.provider.personteam.PersonTeamCursor;
+import org.jraf.androidcontentprovidergenerator.sample.provider.personteam.PersonTeamSelection;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamContentValues;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamCursor;
@@ -32,6 +37,7 @@ public class SampleActivity extends Activity {
 
     private static final String[] FIRST_NAMES = { "James", "John", "Robert", "Michael", "William", "David", "Richard", "Charles", "Joseph", "Thomas", };
     private static final String[] LAST_NAMES = { "SMITH", "JOHNSON", "WILLIAMS", "BROWN", "JONES", "MILLER", "DAVIS", "GARCIA", "RODRIGUEZ", "WILSON", };
+    private static final String[] COUNTRY_CODES = { "fr", "uk", "us", "de", "be", };
     private static long YEAR_IN_MS = 365 * 24 * 60 * 60 * 1000 * 1000L;
     private static final Random sRandom = new Random();
 
@@ -110,24 +116,27 @@ private void queryPeople() {
     }
 
     private void queryPeopleWithTeam() {
-        PersonSelection personSelection = new PersonSelection();
-        personSelection.firstName("James", "John");
-        String[] projection = { PersonColumns._ID, PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, TeamColumns.NAME };
-        PersonCursor c = personSelection.query(getContentResolver(), projection);
+        PersonTeamSelection personTeamSelection = new PersonTeamSelection();
+        //        personTeamSelection.personFirstName("James", "John");
+        String[] projection = { PersonTeamColumns._ID, PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, PersonColumns.COUNTRY_CODE,
+                TeamColumns.NAME, TeamColumns.COUNTRY_CODE };
+        PersonTeamCursor c = personTeamSelection.query(getContentResolver(), projection);
         while (c.moveToNext()) {
-            Log.d(TAG, c.getFirstName() + " " + c.getLastName() + " (age: " + c.getAge() + ") - team: " + c.getTeamName());
+            Log.d(TAG, c.getPersonFirstName() + " " + c.getPersonLastName() + " (age: " + c.getPersonAge() + ", country code:" + c.getPersonCountryCode()
+                    + " ) - team: " + c.getTeamName() + " (country code: " + c.getTeamCountryCode() + ")");
         }
         c.close();
     }
 
     private void queryPeopleWithTeamAndCompany() {
-        PersonSelection personSelection = new PersonSelection();
-        personSelection.firstName("James", "John");
-        String[] projection = { PersonColumns._ID, PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, TeamColumns.NAME, CompanyColumns.NAME,
-                TeamColumns._ID, CompanyColumns._ID };
-        PersonCursor c = personSelection.query(getContentResolver(), projection);
+        PersonTeamSelection personTeamSelection = new PersonTeamSelection();
+        //        personTeamSelection.personFirstName("James", "John");
+        String[] projection = { PersonTeamColumns._ID, PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, PersonColumns.COUNTRY_CODE,
+                TeamColumns.NAME, TeamColumns.COUNTRY_CODE, CompanyColumns.NAME };
+        PersonTeamCursor c = personTeamSelection.query(getContentResolver(), projection);
         while (c.moveToNext()) {
-            Log.d(TAG, c.getFirstName() + " " + c.getLastName() + " (age: " + c.getAge() + ") - team: " + c.getTeamName() + " - company: " + c.getCompanyName());
+            Log.d(TAG, c.getPersonFirstName() + " " + c.getPersonLastName() + " (age: " + c.getPersonAge() + ", country code:" + c.getPersonCountryCode()
+                    + " ) - team: " + c.getTeamName() + " (country code: " + c.getTeamCountryCode() + ") - company: " + c.getCompanyName());
         }
         c.close();
     }
@@ -144,25 +153,38 @@ private void queryTeamsWithCompany() {
     }
 
     private void deleteBase() {
+        // Delete person-teams first
+        PersonTeamSelection personTeamSelection = new PersonTeamSelection();
+        personTeamSelection.delete(getContentResolver());
+
+        // Now delete companies (which should also delete teams because of the "on delete cascade" constraint
         CompanySelection companySelection = new CompanySelection();
         companySelection.delete(getContentResolver());
+
+        // Now delete persons
+        PersonSelection personSelection = new PersonSelection();
+        personSelection.delete(getContentResolver());
     }
 
     private void populateBase() {
+        // Insert companies
         long google = insertCompany("Google", "1600 Amphitheatre Pkwy, Mountain View, CA 94043");
         long microsoft = insertCompany("Microsoft", "One Microsoft Way Redmond, WA 98052-7329 USA");
         long apple = insertCompany("Apple", "1 Infinite Loop, Cupertino, CA 95014");
 
+        // Insert teams
         ArrayList<Long> teams = new ArrayList<>();
-        teams.add(insertTeam(google, "Nunchuk Geckos"));
-        teams.add(insertTeam(google, "Dancing Dingoes"));
-        teams.add(insertTeam(google, "American Dragons"));
-        teams.add(insertTeam(microsoft, "New York Lightning"));
-        teams.add(insertTeam(microsoft, "Red Legends"));
-        teams.add(insertTeam(microsoft, "Awesome Predators"));
-        teams.add(insertTeam(apple, "Cyborg Chasers"));
-        teams.add(insertTeam(apple, "Kamikaze Falcons"));
+        teams.add(insertTeam(google, "Nunchuk Geckos", COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)]));
+        teams.add(insertTeam(google, "Dancing Dingoes", COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)]));
+        teams.add(insertTeam(google, "American Dragons", COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)]));
+        teams.add(insertTeam(microsoft, "New York Lightning", COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)]));
+        teams.add(insertTeam(microsoft, "Red Legends", COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)]));
+        teams.add(insertTeam(microsoft, "Awesome Predators", COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)]));
+        teams.add(insertTeam(apple, "Cyborg Chasers", COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)]));
+        teams.add(insertTeam(apple, "Kamikaze Falcons", COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)]));
 
+        // Insert persons
+        ArrayList<Long> persons = new ArrayList<>();
         for (int i = 0; i < 40; i++) {
             long mainTeamId = teams.get(sRandom.nextInt(teams.size()));
             long secondaryTeamId = teams.get(sRandom.nextInt(teams.size()));
@@ -173,11 +195,27 @@ private void populateBase() {
             boolean hasBlueEyes = sRandom.nextBoolean();
             Float height = sRandom.nextFloat() + 1f;
             Gender gender = Gender.values()[sRandom.nextInt(Gender.values().length)];
-            insertPerson(mainTeamId, secondaryTeamId, firstName, lastName, age, birthDate, hasBlueEyes, height, gender);
+            String countryCode = COUNTRY_CODES[sRandom.nextInt(COUNTRY_CODES.length)];
+            persons.add(insertPerson(mainTeamId, secondaryTeamId, firstName, lastName, age, birthDate, hasBlueEyes, height, gender, countryCode));
+        }
+
+        // Insert persons-teams
+        for (int i = 0; i < 150; i++) {
+            try {
+                insertPersonTeam(persons.get(sRandom.nextInt(persons.size())), teams.get(sRandom.nextInt(teams.size())));
+            } catch (SQLException e) {
+                // This can happen because of the unique constraint on person - some ids in persons can sometimes no longer exist
+                Log.w(TAG, "populateBase Trying to join with a person id that does not exist: this can happen, and should be expected", e);
+            }
         }
 
     }
 
+    /**
+     * Insert a company.
+     *
+     * @return the id of the created company.
+     */
     private long insertCompany(String name, String address) {
         CompanyContentValues values = new CompanyContentValues();
         values.putName(name);
@@ -186,18 +224,28 @@ private long insertCompany(String name, String address) {
         return ContentUris.parseId(uri);
     }
 
-    private long insertTeam(long companyId, String name) {
+    /**
+     * Insert a team.
+     *
+     * @return the id of the created team.
+     */
+    private long insertTeam(long companyId, String name, String countryCode) {
         TeamContentValues values = new TeamContentValues();
         values.putCompanyId(companyId);
         values.putName(name);
+        values.putCountryCode(countryCode);
         Uri uri = values.insert(getContentResolver());
         return ContentUris.parseId(uri);
     }
 
+    /**
+     * Insert a person.
+     *
+     * @return the id of the created person.
+     */
     private long insertPerson(long mainTeamId, long secondaryTeamId, String firstName, String lastName, int age, Date birthDate, boolean hasBlueEyes,
-            Float height, Gender gender) {
+            Float height, Gender gender, String countryCode) {
         PersonContentValues values = new PersonContentValues();
-        values.putMainTeamId(mainTeamId);
         values.putFirstName(firstName);
         values.putLastName(lastName);
         values.putAge(age);
@@ -205,7 +253,21 @@ private long insertPerson(long mainTeamId, long secondaryTeamId, String firstNam
         values.putHasBlueEyes(hasBlueEyes);
         values.putHeight(height);
         values.putGender(gender);
+        values.putCountryCode(countryCode);
+
+        Uri uri = values.insert(getContentResolver());
+        return ContentUris.parseId(uri);
+    }
 
+    /**
+     * Insert a person-team.
+     *
+     * @return the id of the created person-team.
+     */
+    private long insertPersonTeam(long personId, long teamId) {
+        PersonTeamContentValues values = new PersonTeamContentValues();
+        values.putPersonId(personId);
+        values.putTeamId(teamId);
         Uri uri = values.insert(getContentResolver());
         return ContentUris.parseId(uri);
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
index 129fae7..cff882d 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleProvider.java
@@ -44,6 +44,7 @@
 import org.jraf.androidcontentprovidergenerator.sample.BuildConfig;
 import org.jraf.androidcontentprovidergenerator.sample.provider.company.CompanyColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonColumns;
+import org.jraf.androidcontentprovidergenerator.sample.provider.personteam.PersonTeamColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
 
 public class SampleProvider extends ContentProvider {
@@ -66,8 +67,11 @@ public class SampleProvider extends ContentProvider {
     private static final int URI_TYPE_PERSON = 2;
     private static final int URI_TYPE_PERSON_ID = 3;
 
-    private static final int URI_TYPE_TEAM = 4;
-    private static final int URI_TYPE_TEAM_ID = 5;
+    private static final int URI_TYPE_PERSON_TEAM = 4;
+    private static final int URI_TYPE_PERSON_TEAM_ID = 5;
+
+    private static final int URI_TYPE_TEAM = 6;
+    private static final int URI_TYPE_TEAM_ID = 7;
 
 
 
@@ -78,6 +82,8 @@ public class SampleProvider extends ContentProvider {
         URI_MATCHER.addURI(AUTHORITY, CompanyColumns.TABLE_NAME + "/#", URI_TYPE_COMPANY_ID);
         URI_MATCHER.addURI(AUTHORITY, PersonColumns.TABLE_NAME, URI_TYPE_PERSON);
         URI_MATCHER.addURI(AUTHORITY, PersonColumns.TABLE_NAME + "/#", URI_TYPE_PERSON_ID);
+        URI_MATCHER.addURI(AUTHORITY, PersonTeamColumns.TABLE_NAME, URI_TYPE_PERSON_TEAM);
+        URI_MATCHER.addURI(AUTHORITY, PersonTeamColumns.TABLE_NAME + "/#", URI_TYPE_PERSON_TEAM_ID);
         URI_MATCHER.addURI(AUTHORITY, TeamColumns.TABLE_NAME, URI_TYPE_TEAM);
         URI_MATCHER.addURI(AUTHORITY, TeamColumns.TABLE_NAME + "/#", URI_TYPE_TEAM_ID);
     }
@@ -121,6 +127,11 @@ public String getType(Uri uri) {
             case URI_TYPE_PERSON_ID:
                 return TYPE_CURSOR_ITEM + PersonColumns.TABLE_NAME;
 
+            case URI_TYPE_PERSON_TEAM:
+                return TYPE_CURSOR_DIR + PersonTeamColumns.TABLE_NAME;
+            case URI_TYPE_PERSON_TEAM_ID:
+                return TYPE_CURSOR_ITEM + PersonTeamColumns.TABLE_NAME;
+
             case URI_TYPE_TEAM:
                 return TYPE_CURSOR_DIR + TeamColumns.TABLE_NAME;
             case URI_TYPE_TEAM_ID:
@@ -270,13 +281,23 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
             case URI_TYPE_PERSON_ID:
                 res.table = PersonColumns.TABLE_NAME;
                 res.tablesWithJoins = PersonColumns.TABLE_NAME;
+                res.orderBy = PersonColumns.DEFAULT_ORDER;
+                break;
+
+            case URI_TYPE_PERSON_TEAM:
+            case URI_TYPE_PERSON_TEAM_ID:
+                res.table = PersonTeamColumns.TABLE_NAME;
+                res.tablesWithJoins = PersonTeamColumns.TABLE_NAME;
+                if (PersonColumns.hasColumns(projection)) {
+                    res.tablesWithJoins += " LEFT OUTER JOIN " + PersonColumns.TABLE_NAME + " ON " + PersonTeamColumns.TABLE_NAME + "." + PersonTeamColumns.PERSON_ID + "=" + PersonColumns.TABLE_NAME + "." + PersonColumns._ID;
+                }
                 if (TeamColumns.hasColumns(projection) || CompanyColumns.hasColumns(projection)) {
-                    res.tablesWithJoins += " LEFT OUTER JOIN " + TeamColumns.TABLE_NAME + " ON " + PersonColumns.TABLE_NAME + "." + PersonColumns.MAIN_TEAM_ID + "=" + TeamColumns.TABLE_NAME + "." + TeamColumns._ID;
+                    res.tablesWithJoins += " LEFT OUTER JOIN " + TeamColumns.TABLE_NAME + " ON " + PersonTeamColumns.TABLE_NAME + "." + PersonTeamColumns.TEAM_ID + "=" + TeamColumns.TABLE_NAME + "." + TeamColumns._ID;
                 }
                 if (CompanyColumns.hasColumns(projection)) {
                     res.tablesWithJoins += " LEFT OUTER JOIN " + CompanyColumns.TABLE_NAME + " ON " + TeamColumns.TABLE_NAME + "." + TeamColumns.COMPANY_ID + "=" + CompanyColumns.TABLE_NAME + "." + CompanyColumns._ID;
                 }
-                res.orderBy = PersonColumns.DEFAULT_ORDER;
+                res.orderBy = PersonTeamColumns.DEFAULT_ORDER;
                 break;
 
             case URI_TYPE_TEAM:
@@ -296,6 +317,7 @@ private QueryParams getQueryParams(Uri uri, String selection, String[] projectio
         switch (matchedId) {
             case URI_TYPE_COMPANY_ID:
             case URI_TYPE_PERSON_ID:
+            case URI_TYPE_PERSON_TEAM_ID:
             case URI_TYPE_TEAM_ID:
                 id = uri.getLastPathSegment();
         }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleSQLiteOpenHelper.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleSQLiteOpenHelper.java
index a2b0dda..4321322 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleSQLiteOpenHelper.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/SampleSQLiteOpenHelper.java
@@ -37,6 +37,7 @@
 import org.jraf.androidcontentprovidergenerator.sample.BuildConfig;
 import org.jraf.androidcontentprovidergenerator.sample.provider.company.CompanyColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.person.PersonColumns;
+import org.jraf.androidcontentprovidergenerator.sample.provider.personteam.PersonTeamColumns;
 import org.jraf.androidcontentprovidergenerator.sample.provider.team.TeamColumns;
 
 public class SampleSQLiteOpenHelper extends SQLiteOpenHelper {
@@ -62,28 +63,38 @@ public class SampleSQLiteOpenHelper extends SQLiteOpenHelper {
     private static final String SQL_CREATE_TABLE_PERSON = "CREATE TABLE IF NOT EXISTS "
             + PersonColumns.TABLE_NAME + " ( "
             + PersonColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
-            + PersonColumns.MAIN_TEAM_ID + " INTEGER NOT NULL, "
             + PersonColumns.FIRST_NAME + " TEXT NOT NULL, "
             + PersonColumns.LAST_NAME + " TEXT NOT NULL, "
             + PersonColumns.AGE + " INTEGER NOT NULL, "
             + PersonColumns.BIRTH_DATE + " INTEGER, "
             + PersonColumns.HAS_BLUE_EYES + " INTEGER NOT NULL DEFAULT '0', "
             + PersonColumns.HEIGHT + " REAL, "
-            + PersonColumns.GENDER + " INTEGER NOT NULL "
-            + ", CONSTRAINT fk_main_team_id FOREIGN KEY (main_team_id) REFERENCES team (_id) ON DELETE CASCADE"
+            + PersonColumns.GENDER + " INTEGER NOT NULL, "
+            + PersonColumns.COUNTRY_CODE + " TEXT NOT NULL "
             + ", CONSTRAINT unique_name UNIQUE (first_name, last_name) ON CONFLICT REPLACE"
             + " );";
 
     private static final String SQL_CREATE_INDEX_PERSON_LAST_NAME = "CREATE INDEX IDX_PERSON_LAST_NAME "
             + " ON " + PersonColumns.TABLE_NAME + " ( " + PersonColumns.LAST_NAME + " );";
 
+    private static final String SQL_CREATE_TABLE_PERSON_TEAM = "CREATE TABLE IF NOT EXISTS "
+            + PersonTeamColumns.TABLE_NAME + " ( "
+            + PersonTeamColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + PersonTeamColumns.PERSON_ID + " INTEGER NOT NULL, "
+            + PersonTeamColumns.TEAM_ID + " INTEGER NOT NULL "
+            + ", CONSTRAINT fk_person_id FOREIGN KEY (person_id) REFERENCES person (_id) ON DELETE RESTRICT"
+            + ", CONSTRAINT fk_team_id FOREIGN KEY (team_id) REFERENCES team (_id) ON DELETE RESTRICT"
+            + ", CONSTRAINT unique_person_team UNIQUE (person_id, team_id) ON CONFLICT REPLACE"
+            + " );";
+
     private static final String SQL_CREATE_TABLE_TEAM = "CREATE TABLE IF NOT EXISTS "
             + TeamColumns.TABLE_NAME + " ( "
             + TeamColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
             + TeamColumns.COMPANY_ID + " INTEGER NOT NULL, "
-            + TeamColumns.NAME + " TEXT NOT NULL "
+            + TeamColumns.NAME + " TEXT NOT NULL, "
+            + TeamColumns.COUNTRY_CODE + " TEXT NOT NULL "
             + ", CONSTRAINT fk_company_id FOREIGN KEY (company_id) REFERENCES company (_id) ON DELETE CASCADE"
-            + ", CONSTRAINT unique_name UNIQUE (name) ON CONFLICT REPLACE"
+            + ", CONSTRAINT unique_name UNIQUE (team__name) ON CONFLICT REPLACE"
             + " );";
 
     // @formatter:on
@@ -146,6 +157,7 @@ public void onCreate(SQLiteDatabase db) {
         db.execSQL(SQL_CREATE_INDEX_COMPANY_NAME);
         db.execSQL(SQL_CREATE_TABLE_PERSON);
         db.execSQL(SQL_CREATE_INDEX_PERSON_LAST_NAME);
+        db.execSQL(SQL_CREATE_TABLE_PERSON_TEAM);
         db.execSQL(SQL_CREATE_TABLE_TEAM);
         mOpenHelperCallbacks.onPostCreate(mContext, db);
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
index 75f7150..59dd067 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java
@@ -37,11 +37,11 @@ public class CompanyColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String NAME = "name";
+    public static final String NAME = "company__name";
     public static final String ADDRESS = "address";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
-    
+
     // @formatter:off
     public static final String[] ALL_COLUMNS = new String[] {
             _ID,
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
index 426335b..c2540bb 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java
@@ -37,7 +37,6 @@ public class PersonColumns implements BaseColumns {
     public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
 
     public static final String _ID = new String(BaseColumns._ID);
-    public static final String MAIN_TEAM_ID = "main_team_id";
     public static final String FIRST_NAME = "first_name";
     public static final String LAST_NAME = "last_name";
     public static final String AGE = "age";
@@ -45,20 +44,21 @@ public class PersonColumns implements BaseColumns {
     public static final String HAS_BLUE_EYES = "has_blue_eyes";
     public static final String HEIGHT = "height";
     public static final String GENDER = "gender";
+    public static final String COUNTRY_CODE = "person__country_code";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
-    
+
     // @formatter:off
     public static final String[] ALL_COLUMNS = new String[] {
             _ID,
-            MAIN_TEAM_ID,
             FIRST_NAME,
             LAST_NAME,
             AGE,
             BIRTH_DATE,
             HAS_BLUE_EYES,
             HEIGHT,
-            GENDER
+            GENDER,
+            COUNTRY_CODE
     };
     // @formatter:on
 
@@ -66,7 +66,6 @@ public static boolean hasColumns(String[] projection) {
         if (projection == null) return true;
         for (String c : projection) {
             if (c == _ID) return true;
-            if (c == MAIN_TEAM_ID) return true;
             if (c == FIRST_NAME) return true;
             if (c == LAST_NAME) return true;
             if (c == AGE) return true;
@@ -74,6 +73,7 @@ public static boolean hasColumns(String[] projection) {
             if (c == HAS_BLUE_EYES) return true;
             if (c == HEIGHT) return true;
             if (c == GENDER) return true;
+            if (c == COUNTRY_CODE) return true;
         }
         return false;
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonContentValues.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonContentValues.java
index 1cbe0da..84f8da6 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonContentValues.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonContentValues.java
@@ -50,13 +50,6 @@ public int update(ContentResolver contentResolver, PersonSelection where) {
         return contentResolver.update(uri(), values(), where == null ? null : where.sel(), where == null ? null : where.args());
     }
 
-    public PersonContentValues putMainTeamId(long value) {
-        mContentValues.put(PersonColumns.MAIN_TEAM_ID, value);
-        return this;
-    }
-
-
-
     public PersonContentValues putFirstName(String value) {
         if (value == null) throw new IllegalArgumentException("value for firstName must not be null");
         mContentValues.put(PersonColumns.FIRST_NAME, value);
@@ -121,4 +114,12 @@ public PersonContentValues putGender(Gender value) {
     }
 
 
+
+    public PersonContentValues putCountryCode(String value) {
+        if (value == null) throw new IllegalArgumentException("value for countryCode must not be null");
+        mContentValues.put(PersonColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonCursor.java
index 4f6eacd..63b6f6a 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonCursor.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonCursor.java
@@ -29,8 +29,6 @@
 import android.database.Cursor;
 
 import org.jraf.androidcontentprovidergenerator.sample.provider.base.AbstractCursor;
-import org.jraf.androidcontentprovidergenerator.sample.provider.team.*;
-import org.jraf.androidcontentprovidergenerator.sample.provider.company.*;
 
 /**
  * Cursor wrapper for the {@code person} table.
@@ -40,13 +38,6 @@ public PersonCursor(Cursor cursor) {
         super(cursor);
     }
 
-    /**
-     * Get the {@code main_team_id} value.
-     */
-    public long getMainTeamId() {
-        return getLongOrNull(PersonColumns.MAIN_TEAM_ID);
-    }
-
     /**
      * Get the {@code first_name} value.
      * Cannot be {@code null}.
@@ -106,36 +97,11 @@ public Gender getGender() {
     }
 
     /**
-     * Get the {@code company_id} value.
-     */
-    public long getTeamCompanyId() {
-        return getLongOrNull(TeamColumns.COMPANY_ID);
-    }
-
-    /**
-     * Get the {@code name} value.
-     * Cannot be {@code null}.
-     */
-    public String getTeamName() {
-        Integer index = getCachedColumnIndexOrThrow(TeamColumns.NAME);
-        return getString(index);
-    }
-
-    /**
-     * Get the {@code name} value.
+     * Get the {@code country_code} value.
      * Cannot be {@code null}.
      */
-    public String getCompanyName() {
-        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.NAME);
-        return getString(index);
-    }
-
-    /**
-     * Get the {@code address} value.
-     * Can be {@code null}.
-     */
-    public String getCompanyAddress() {
-        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.ADDRESS);
+    public String getCountryCode() {
+        Integer index = getCachedColumnIndexOrThrow(PersonColumns.COUNTRY_CODE);
         return getString(index);
     }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonSelection.java
index f555fad..92c7215 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonSelection.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonSelection.java
@@ -77,36 +77,6 @@ public PersonSelection id(long... value) {
     }
 
 
-    public PersonSelection mainTeamId(long... value) {
-        addEquals(PersonColumns.MAIN_TEAM_ID, toObjectArray(value));
-        return this;
-    }
-
-    public PersonSelection mainTeamIdNot(long... value) {
-        addNotEquals(PersonColumns.MAIN_TEAM_ID, toObjectArray(value));
-        return this;
-    }
-
-    public PersonSelection mainTeamIdGt(long value) {
-        addGreaterThan(PersonColumns.MAIN_TEAM_ID, value);
-        return this;
-    }
-
-    public PersonSelection mainTeamIdGtEq(long value) {
-        addGreaterThanOrEquals(PersonColumns.MAIN_TEAM_ID, value);
-        return this;
-    }
-
-    public PersonSelection mainTeamIdLt(long value) {
-        addLessThan(PersonColumns.MAIN_TEAM_ID, value);
-        return this;
-    }
-
-    public PersonSelection mainTeamIdLtEq(long value) {
-        addLessThanOrEquals(PersonColumns.MAIN_TEAM_ID, value);
-        return this;
-    }
-
     public PersonSelection firstName(String... value) {
         addEquals(PersonColumns.FIRST_NAME, value);
         return this;
@@ -247,4 +217,19 @@ public PersonSelection genderNot(Gender... value) {
         return this;
     }
 
+
+    public PersonSelection countryCode(String... value) {
+        addEquals(PersonColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+    public PersonSelection countryCodeNot(String... value) {
+        addNotEquals(PersonColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+    public PersonSelection countryCodeLike(String... value) {
+        addLike(PersonColumns.COUNTRY_CODE, value);
+        return this;
+    }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamColumns.java
new file mode 100644
index 0000000..2c5aab6
--- /dev/null
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamColumns.java
@@ -0,0 +1,62 @@
+/*
+ * This source is part of the
+ *      _____  ___   ____
+ *  __ / / _ \/ _ | / __/___  _______ _
+ * / // / , _/ __ |/ _/_/ _ \/ __/ _ `/
+ * \___/_/|_/_/ |_/_/ (_)___/_/  \_, /
+ *                              /___/
+ * repository.
+ * 
+ * Copyright (C) 2012-2014 Benoit 'BoD' Lubek (BoD@JRAF.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.jraf.androidcontentprovidergenerator.sample.provider.personteam;
+
+import android.net.Uri;
+import android.provider.BaseColumns;
+
+import org.jraf.androidcontentprovidergenerator.sample.provider.SampleProvider;
+
+/**
+ * Columns for the {@code person_team} table.
+ */
+public class PersonTeamColumns implements BaseColumns {
+    public static final String TABLE_NAME = "person_team";
+    public static final Uri CONTENT_URI = Uri.parse(SampleProvider.CONTENT_URI_BASE + "/" + TABLE_NAME);
+
+    public static final String _ID = new String(BaseColumns._ID);
+    public static final String PERSON_ID = "person_id";
+    public static final String TEAM_ID = "team_id";
+
+    public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
+
+    // @formatter:off
+    public static final String[] ALL_COLUMNS = new String[] {
+            _ID,
+            PERSON_ID,
+            TEAM_ID
+    };
+    // @formatter:on
+
+    public static boolean hasColumns(String[] projection) {
+        if (projection == null) return true;
+        for (String c : projection) {
+            if (c == _ID) return true;
+            if (c == PERSON_ID) return true;
+            if (c == TEAM_ID) return true;
+        }
+        return false;
+    }
+}
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamContentValues.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamContentValues.java
new file mode 100644
index 0000000..0ff8ff8
--- /dev/null
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamContentValues.java
@@ -0,0 +1,66 @@
+/*
+ * This source is part of the
+ *      _____  ___   ____
+ *  __ / / _ \/ _ | / __/___  _______ _
+ * / // / , _/ __ |/ _/_/ _ \/ __/ _ `/
+ * \___/_/|_/_/ |_/_/ (_)___/_/  \_, /
+ *                              /___/
+ * repository.
+ * 
+ * Copyright (C) 2012-2014 Benoit 'BoD' Lubek (BoD@JRAF.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.jraf.androidcontentprovidergenerator.sample.provider.personteam;
+
+import java.util.Date;
+
+import android.content.ContentResolver;
+import android.net.Uri;
+
+import org.jraf.androidcontentprovidergenerator.sample.provider.base.AbstractContentValues;
+
+/**
+ * Content values wrapper for the {@code person_team} table.
+ */
+public class PersonTeamContentValues extends AbstractContentValues {
+    @Override
+    public Uri uri() {
+        return PersonTeamColumns.CONTENT_URI;
+    }
+
+    /**
+     * Update row(s) using the values stored by this object and the given selection.
+     *
+     * @param contentResolver The content resolver to use.
+     * @param where The selection to use (can be {@code null}).
+     */
+    public int update(ContentResolver contentResolver, PersonTeamSelection where) {
+        return contentResolver.update(uri(), values(), where == null ? null : where.sel(), where == null ? null : where.args());
+    }
+
+    public PersonTeamContentValues putPersonId(long value) {
+        mContentValues.put(PersonTeamColumns.PERSON_ID, value);
+        return this;
+    }
+
+
+
+    public PersonTeamContentValues putTeamId(long value) {
+        mContentValues.put(PersonTeamColumns.TEAM_ID, value);
+        return this;
+    }
+
+
+}
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamCursor.java
new file mode 100644
index 0000000..3416d6c
--- /dev/null
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamCursor.java
@@ -0,0 +1,167 @@
+/*
+ * This source is part of the
+ *      _____  ___   ____
+ *  __ / / _ \/ _ | / __/___  _______ _
+ * / // / , _/ __ |/ _/_/ _ \/ __/ _ `/
+ * \___/_/|_/_/ |_/_/ (_)___/_/  \_, /
+ *                              /___/
+ * repository.
+ * 
+ * Copyright (C) 2012-2014 Benoit 'BoD' Lubek (BoD@JRAF.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.jraf.androidcontentprovidergenerator.sample.provider.personteam;
+
+import java.util.Date;
+
+import android.database.Cursor;
+
+import org.jraf.androidcontentprovidergenerator.sample.provider.base.AbstractCursor;
+import org.jraf.androidcontentprovidergenerator.sample.provider.person.*;
+import org.jraf.androidcontentprovidergenerator.sample.provider.team.*;
+import org.jraf.androidcontentprovidergenerator.sample.provider.company.*;
+
+/**
+ * Cursor wrapper for the {@code person_team} table.
+ */
+public class PersonTeamCursor extends AbstractCursor {
+    public PersonTeamCursor(Cursor cursor) {
+        super(cursor);
+    }
+
+    /**
+     * Get the {@code person_id} value.
+     */
+    public long getPersonId() {
+        return getLongOrNull(PersonTeamColumns.PERSON_ID);
+    }
+
+    /**
+     * Get the {@code team_id} value.
+     */
+    public long getTeamId() {
+        return getLongOrNull(PersonTeamColumns.TEAM_ID);
+    }
+
+    /**
+     * Get the {@code first_name} value.
+     * Cannot be {@code null}.
+     */
+    public String getPersonFirstName() {
+        Integer index = getCachedColumnIndexOrThrow(PersonColumns.FIRST_NAME);
+        return getString(index);
+    }
+
+    /**
+     * Get the {@code last_name} value.
+     * Cannot be {@code null}.
+     */
+    public String getPersonLastName() {
+        Integer index = getCachedColumnIndexOrThrow(PersonColumns.LAST_NAME);
+        return getString(index);
+    }
+
+    /**
+     * Get the {@code age} value.
+     */
+    public int getPersonAge() {
+        return getIntegerOrNull(PersonColumns.AGE);
+    }
+
+    /**
+     * Get the {@code birth_date} value.
+     * Can be {@code null}.
+     */
+    public Date getPersonBirthDate() {
+        return getDate(PersonColumns.BIRTH_DATE);
+    }
+
+    /**
+     * Get the {@code has_blue_eyes} value.
+     */
+    public boolean getPersonHasBlueEyes() {
+        return getBoolean(PersonColumns.HAS_BLUE_EYES);
+    }
+
+    /**
+     * Get the {@code height} value.
+     * Can be {@code null}.
+     */
+    public Float getPersonHeight() {
+        return getFloatOrNull(PersonColumns.HEIGHT);
+    }
+
+    /**
+     * Get the {@code gender} value.
+     * Cannot be {@code null}.
+     */
+    public Gender getPersonGender() {
+        Integer intValue = getIntegerOrNull(PersonColumns.GENDER);
+        if (intValue == null) return null;
+        return Gender.values()[intValue];
+    }
+
+    /**
+     * Get the {@code country_code} value.
+     * Cannot be {@code null}.
+     */
+    public String getPersonCountryCode() {
+        Integer index = getCachedColumnIndexOrThrow(PersonColumns.COUNTRY_CODE);
+        return getString(index);
+    }
+
+    /**
+     * Get the {@code company_id} value.
+     */
+    public long getTeamCompanyId() {
+        return getLongOrNull(TeamColumns.COMPANY_ID);
+    }
+
+    /**
+     * Get the {@code name} value.
+     * Cannot be {@code null}.
+     */
+    public String getTeamName() {
+        Integer index = getCachedColumnIndexOrThrow(TeamColumns.NAME);
+        return getString(index);
+    }
+
+    /**
+     * Get the {@code country_code} value.
+     * Cannot be {@code null}.
+     */
+    public String getTeamCountryCode() {
+        Integer index = getCachedColumnIndexOrThrow(TeamColumns.COUNTRY_CODE);
+        return getString(index);
+    }
+
+    /**
+     * Get the {@code name} value.
+     * Cannot be {@code null}.
+     */
+    public String getCompanyName() {
+        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.NAME);
+        return getString(index);
+    }
+
+    /**
+     * Get the {@code address} value.
+     * Can be {@code null}.
+     */
+    public String getCompanyAddress() {
+        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.ADDRESS);
+        return getString(index);
+    }
+}
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java
new file mode 100644
index 0000000..5ca5f26
--- /dev/null
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java
@@ -0,0 +1,139 @@
+/*
+ * This source is part of the
+ *      _____  ___   ____
+ *  __ / / _ \/ _ | / __/___  _______ _
+ * / // / , _/ __ |/ _/_/ _ \/ __/ _ `/
+ * \___/_/|_/_/ |_/_/ (_)___/_/  \_, /
+ *                              /___/
+ * repository.
+ * 
+ * Copyright (C) 2012-2014 Benoit 'BoD' Lubek (BoD@JRAF.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.jraf.androidcontentprovidergenerator.sample.provider.personteam;
+
+import java.util.Date;
+
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+
+import org.jraf.androidcontentprovidergenerator.sample.provider.base.AbstractSelection;
+
+/**
+ * Selection for the {@code person_team} table.
+ */
+public class PersonTeamSelection extends AbstractSelection<PersonTeamSelection> {
+    @Override
+    public Uri uri() {
+        return PersonTeamColumns.CONTENT_URI;
+    }
+
+    /**
+     * 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.
+     * @param sortOrder How to order the rows, formatted as an SQL ORDER BY clause (excluding the ORDER BY itself). Passing null will use the default sort
+     *            order, which may be unordered.
+     * @return A {@code PersonTeamCursor} object, which is positioned before the first entry, or null.
+     */
+    public PersonTeamCursor query(ContentResolver contentResolver, String[] projection, String sortOrder) {
+        Cursor cursor = contentResolver.query(uri(), projection, sel(), args(), sortOrder);
+        if (cursor == null) return null;
+        return new PersonTeamCursor(cursor);
+    }
+
+    /**
+     * Equivalent of calling {@code query(contentResolver, projection, null}.
+     */
+    public PersonTeamCursor query(ContentResolver contentResolver, String[] projection) {
+        return query(contentResolver, projection, null);
+    }
+
+    /**
+     * Equivalent of calling {@code query(contentResolver, projection, null, null}.
+     */
+    public PersonTeamCursor query(ContentResolver contentResolver) {
+        return query(contentResolver, null, null);
+    }
+
+
+    public PersonTeamSelection id(long... value) {
+        addEquals("person_team." + PersonTeamColumns._ID, toObjectArray(value));
+        return this;
+    }
+
+
+    public PersonTeamSelection personId(long... value) {
+        addEquals(PersonTeamColumns.PERSON_ID, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection personIdNot(long... value) {
+        addNotEquals(PersonTeamColumns.PERSON_ID, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection personIdGt(long value) {
+        addGreaterThan(PersonTeamColumns.PERSON_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection personIdGtEq(long value) {
+        addGreaterThanOrEquals(PersonTeamColumns.PERSON_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection personIdLt(long value) {
+        addLessThan(PersonTeamColumns.PERSON_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection personIdLtEq(long value) {
+        addLessThanOrEquals(PersonTeamColumns.PERSON_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamId(long... value) {
+        addEquals(PersonTeamColumns.TEAM_ID, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection teamIdNot(long... value) {
+        addNotEquals(PersonTeamColumns.TEAM_ID, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection teamIdGt(long value) {
+        addGreaterThan(PersonTeamColumns.TEAM_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamIdGtEq(long value) {
+        addGreaterThanOrEquals(PersonTeamColumns.TEAM_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamIdLt(long value) {
+        addLessThan(PersonTeamColumns.TEAM_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamIdLtEq(long value) {
+        addLessThanOrEquals(PersonTeamColumns.TEAM_ID, value);
+        return this;
+    }
+}
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
index 89ed0f9..f56e1bf 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java
@@ -38,15 +38,17 @@ public class TeamColumns implements BaseColumns {
 
     public static final String _ID = new String(BaseColumns._ID);
     public static final String COMPANY_ID = "company_id";
-    public static final String NAME = "name";
+    public static final String NAME = "team__name";
+    public static final String COUNTRY_CODE = "team__country_code";
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
-    
+
     // @formatter:off
     public static final String[] ALL_COLUMNS = new String[] {
             _ID,
             COMPANY_ID,
-            NAME
+            NAME,
+            COUNTRY_CODE
     };
     // @formatter:on
 
@@ -56,6 +58,7 @@ public static boolean hasColumns(String[] projection) {
             if (c == _ID) return true;
             if (c == COMPANY_ID) return true;
             if (c == NAME) return true;
+            if (c == COUNTRY_CODE) return true;
         }
         return false;
     }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamContentValues.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamContentValues.java
index 8526b74..0f8469f 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamContentValues.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamContentValues.java
@@ -64,4 +64,12 @@ public TeamContentValues putName(String value) {
     }
 
 
+
+    public TeamContentValues putCountryCode(String value) {
+        if (value == null) throw new IllegalArgumentException("value for countryCode must not be null");
+        mContentValues.put(TeamColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamCursor.java
index 9e0fd92..ee74ae2 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamCursor.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamCursor.java
@@ -55,6 +55,15 @@ public String getName() {
         return getString(index);
     }
 
+    /**
+     * Get the {@code country_code} value.
+     * Cannot be {@code null}.
+     */
+    public String getCountryCode() {
+        Integer index = getCachedColumnIndexOrThrow(TeamColumns.COUNTRY_CODE);
+        return getString(index);
+    }
+
     /**
      * Get the {@code name} value.
      * Cannot be {@code null}.
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java
index c360208..c3d8f9d 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java
@@ -121,4 +121,19 @@ public TeamSelection nameLike(String... value) {
         addLike(TeamColumns.NAME, value);
         return this;
     }
+
+    public TeamSelection countryCode(String... value) {
+        addEquals(TeamColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+    public TeamSelection countryCodeNot(String... value) {
+        addNotEquals(TeamColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+    public TeamSelection countryCodeLike(String... value) {
+        addLike(TeamColumns.COUNTRY_CODE, value);
+        return this;
+    }
 }
diff --git a/etc/sample/person.json b/etc/sample/person.json
index 050d83d..8e97cab 100644
--- a/etc/sample/person.json
+++ b/etc/sample/person.json
@@ -1,14 +1,5 @@
 {
 	"fields": [
-		{
-			"name": "main_team_id",
-			"type": "Long",
-			"nullable": false,
-			"foreignKey": {
-				"table": "team",
-				"onDelete": "CASCADE",
-			},
-		},
 		{
 			"name": "first_name",
 			"type": "String",
@@ -52,6 +43,11 @@
 			],
 			"nullable": false,
 		},
+		{
+			"name": "country_code",
+			"type": "String",
+			"nullable": false,
+		},
 	],
 
 	"constraints": [
diff --git a/etc/sample/person_team.json b/etc/sample/person_team.json
new file mode 100644
index 0000000..e21308f
--- /dev/null
+++ b/etc/sample/person_team.json
@@ -0,0 +1,28 @@
+{
+	"fields": [
+		{
+			"name": "person_id",
+			"type": "Long",
+			"nullable": false,
+			"foreignKey": {
+				"table": "person",
+				"onDelete": "RESTRICT",
+			},
+		},
+		{
+			"name": "team_id",
+			"type": "Long",
+			"nullable": false,
+			"foreignKey": {
+				"table": "team",
+				"onDelete": "RESTRICT",
+			},
+		},
+	],
+	"constraints": [
+		{
+			"name": "unique_person_team",
+			"definition": "UNIQUE (person_id, team_id) ON CONFLICT REPLACE"
+		},
+	],
+}
diff --git a/etc/sample/team.json b/etc/sample/team.json
index 8fc57f4..677c4b6 100644
--- a/etc/sample/team.json
+++ b/etc/sample/team.json
@@ -14,12 +14,17 @@
 			"type": "String",
 			"nullable": false,
 		},
+		{
+			"name": "country_code",
+			"type": "String",
+			"nullable": false,
+		},
 	],
 
 	"constraints": [
 		{
 			"name": "unique_name",
-			"definition": "UNIQUE (name) ON CONFLICT REPLACE"
+			"definition": "UNIQUE (team__name) ON CONFLICT REPLACE"
 		},
 	],
 }
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/Log.java b/src/main/java/org/jraf/androidcontentprovidergenerator/Log.java
index c9813b6..2f111b4 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/Log.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/Log.java
@@ -6,19 +6,19 @@
  * \___/_/|_/_/ |_/_/ (_)___/_/  \_, /
  *                              /___/
  * repository.
- * 
+ *
  * Copyright (C) 2012-2014 Benoit 'BoD' Lubek (BoD@JRAF.org)
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -33,4 +33,9 @@ public class Log {
     public static void d(String tag, String string) {
         System.out.println(FORMAT.format(new Date()) + " D/" + tag + " " + string);
     }
+
+
+    public static void i(String tag, String string) {
+        System.out.println(FORMAT.format(new Date()) + " I/" + tag + " " + string);
+    }
 }
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java b/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
index 7cbf1ce..54d4162 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/Main.java
@@ -407,7 +407,7 @@ private void printManifest(Arguments arguments) throws IOException, JSONExceptio
         root.put("model", Model.get());
         root.put("header", Model.get().getHeader());
 
-        System.out.println("\nProvider declaration to paste in the AndroidManifest.xml file: ");
+        Log.i(TAG, "\nProvider declaration to paste in the AndroidManifest.xml file: ");
         template.process(root, out);
     }
 
@@ -424,6 +424,9 @@ private void go(String[] args) throws IOException, JSONException, TemplateExcept
         getConfig(arguments.inputDir);
 
         loadModel(arguments.inputDir);
+
+        Model.get().flagAmbiguousFields();
+
         generateColumns(arguments);
         generateWrappers(arguments);
         generateContentProvider(arguments);
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
index 034c81f..aac0127 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
@@ -224,4 +224,32 @@ public String toString() {
     public static Entity getByName(String entityName) {
         return ALL_ENTITIES.get(entityName);
     }
+
+    public void flagAmbiguousFields() {
+        List<Field> allJoinedFields = getAllJoinedFields(this);
+        for (Field f1 : allJoinedFields) {
+            for (Field f2 : allJoinedFields) {
+                if (f1 == f2) continue;
+                if (f1.getNameLowerCase().equals(f2.getNameLowerCase())) {
+                    f1.setIsAmbiguous(true);
+                    f2.setIsAmbiguous(true);
+                }
+            }
+        }
+    }
+
+    private static List<Field> getAllJoinedFields(Entity entity) {
+        List<Field> res = new ArrayList<>();
+
+        for (Field field : entity.mFields) {
+            if (field.getIsId()) continue;
+            res.add(field);
+
+            ForeignKey foreignKey = field.getForeignKey();
+            if (foreignKey == null) continue;
+            // Recurse
+            res.addAll(getAllJoinedFields(foreignKey.getEntity()));
+        }
+        return res;
+    }
 }
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Field.java b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Field.java
index 1f852cb..c8daca5 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Field.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Field.java
@@ -149,6 +149,7 @@ public static OnDeleteAction fromJsonName(String jsonName) {
     private final List<EnumValue> mEnumValues = new ArrayList<>();
     private final ForeignKey mForeignKey;
     private boolean mIsForeign;
+    private boolean mIsAmbiguous;
 
     public Field(Entity entity, String name, String type, boolean isId, boolean isIndex, boolean isNullable, String defaultValue, String enumName,
             List<EnumValue> enumValues, ForeignKey foreignKey) {
@@ -198,6 +199,15 @@ public List<EnumValue> getEnumValues() {
         return mEnumValues;
     }
 
+    public String getPrefixedName() {
+        return mEntity.getNameLowerCase() + "__" + getNameLowerCase();
+    }
+
+    public String getNameLowerCaseOrPrefixed() {
+        if (mIsAmbiguous) return getPrefixedName();
+        return getNameLowerCase();
+    }
+
     public Type getType() {
         return mType;
     }
@@ -248,6 +258,14 @@ public boolean getIsForeign() {
         return mIsForeign;
     }
 
+    /* package */void setIsAmbiguous(boolean isAmbiguous) {
+        mIsAmbiguous = isAmbiguous;
+    }
+
+    /* package */boolean getIsAmbiguous() {
+        return mIsAmbiguous;
+    }
+
     @Override
     public String toString() {
         return "Field [mName=" + mName + ", mType=" + mType + ", mIsId=" + mIsId + ", mIsIndex=" + mIsIndex + ", mIsNullable=" + mIsNullable
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Model.java b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Model.java
index fc6ed2a..1595548 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Model.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Model.java
@@ -6,19 +6,19 @@
  * \___/_/|_/_/ |_/_/ (_)___/_/  \_, /
  *                              /___/
  * repository.
- * 
+ *
  * Copyright (C) 2012-2014 Benoit 'BoD' Lubek (BoD@JRAF.org)
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -28,7 +28,12 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jraf.androidcontentprovidergenerator.Constants;
+import org.jraf.androidcontentprovidergenerator.Log;
+
 public class Model {
+    private static final String TAG = Constants.TAG + Model.class.getSimpleName();
+
     private static final Model INSTANCE = new Model();
 
     public static Model get() {
@@ -60,4 +65,19 @@ public String getHeader() {
     public String toString() {
         return mEntities.toString();
     }
+
+    public void flagAmbiguousFields() {
+        for (Entity entity : mEntities) {
+            entity.flagAmbiguousFields();
+        }
+
+        for (Entity entity : mEntities) {
+            for (Field field : entity.getFields()) {
+                if (field.getIsAmbiguous()) {
+                    Log.i(TAG, "\nNote: in the table '" + entity.getNameLowerCase() + "', the column '" + field.getNameLowerCase() + "' will be named '"
+                            + field.getPrefixedName() + "' to avoid ambiguities when joining.\n");
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
index 776d944..e328d65 100644
--- a/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
+++ b/src/main/resources/org/jraf/androidcontentprovidergenerator/columns.ftl
@@ -19,12 +19,12 @@ public class ${entity.nameCamelCase}Columns implements BaseColumns {
     <#if field.isId>
     public static final String ${field.nameUpperCase} = new String(BaseColumns._ID);
     <#else>
-    public static final String ${field.nameUpperCase} = "${field.nameLowerCase}";
+    public static final String ${field.nameUpperCase} = "${field.nameLowerCaseOrPrefixed}";
     </#if>
     </#list>
 
     public static final String DEFAULT_ORDER = TABLE_NAME + "." +_ID;
-    
+
     // @formatter:off
     public static final String[] ALL_COLUMNS = new String[] {
             <#list entity.fields as field>

From 73aabe2ffc907c5f160f73229979ac5049026218 Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Sat, 1 Nov 2014 18:21:42 +0100
Subject: [PATCH 5/9] Reuse the getFieldsIncludingJoins method that already
 existed.

---
 .../provider/personteam/PersonTeamCursor.java | 38 +++++++++----------
 .../model/Entity.java                         | 21 ++--------
 .../model/Field.java                          |  3 ++
 3 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamCursor.java
index 3416d6c..a256a58 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamCursor.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamCursor.java
@@ -48,13 +48,6 @@ public long getPersonId() {
         return getLongOrNull(PersonTeamColumns.PERSON_ID);
     }
 
-    /**
-     * Get the {@code team_id} value.
-     */
-    public long getTeamId() {
-        return getLongOrNull(PersonTeamColumns.TEAM_ID);
-    }
-
     /**
      * Get the {@code first_name} value.
      * Cannot be {@code null}.
@@ -122,6 +115,13 @@ public String getPersonCountryCode() {
         return getString(index);
     }
 
+    /**
+     * Get the {@code team_id} value.
+     */
+    public long getTeamId() {
+        return getLongOrNull(PersonTeamColumns.TEAM_ID);
+    }
+
     /**
      * Get the {@code company_id} value.
      */
@@ -133,17 +133,17 @@ public long getTeamCompanyId() {
      * Get the {@code name} value.
      * Cannot be {@code null}.
      */
-    public String getTeamName() {
-        Integer index = getCachedColumnIndexOrThrow(TeamColumns.NAME);
+    public String getCompanyName() {
+        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.NAME);
         return getString(index);
     }
 
     /**
-     * Get the {@code country_code} value.
-     * Cannot be {@code null}.
+     * Get the {@code address} value.
+     * Can be {@code null}.
      */
-    public String getTeamCountryCode() {
-        Integer index = getCachedColumnIndexOrThrow(TeamColumns.COUNTRY_CODE);
+    public String getCompanyAddress() {
+        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.ADDRESS);
         return getString(index);
     }
 
@@ -151,17 +151,17 @@ public String getTeamCountryCode() {
      * Get the {@code name} value.
      * Cannot be {@code null}.
      */
-    public String getCompanyName() {
-        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.NAME);
+    public String getTeamName() {
+        Integer index = getCachedColumnIndexOrThrow(TeamColumns.NAME);
         return getString(index);
     }
 
     /**
-     * Get the {@code address} value.
-     * Can be {@code null}.
+     * Get the {@code country_code} value.
+     * Cannot be {@code null}.
      */
-    public String getCompanyAddress() {
-        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.ADDRESS);
+    public String getTeamCountryCode() {
+        Integer index = getCachedColumnIndexOrThrow(TeamColumns.COUNTRY_CODE);
         return getString(index);
     }
 }
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
index aac0127..5e3e179 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Entity.java
@@ -72,14 +72,14 @@ public List<Field> getFields() {
     public List<Field> getFieldsIncludingJoins(boolean isForeign) {
         List<Field> res = new ArrayList<>();
         for (Field field : mFields) {
+            if (field.getIsId()) continue;
+
             if (isForeign) {
                 res.add(field.asForeignField());
             } else {
                 res.add(field);
             }
-        }
 
-        for (Field field : getFields()) {
             ForeignKey foreignKey = field.getForeignKey();
             if (foreignKey == null) continue;
 
@@ -226,7 +226,7 @@ public static Entity getByName(String entityName) {
     }
 
     public void flagAmbiguousFields() {
-        List<Field> allJoinedFields = getAllJoinedFields(this);
+        List<Field> allJoinedFields = getFieldsIncludingJoins(false);
         for (Field f1 : allJoinedFields) {
             for (Field f2 : allJoinedFields) {
                 if (f1 == f2) continue;
@@ -237,19 +237,4 @@ public void flagAmbiguousFields() {
             }
         }
     }
-
-    private static List<Field> getAllJoinedFields(Entity entity) {
-        List<Field> res = new ArrayList<>();
-
-        for (Field field : entity.mFields) {
-            if (field.getIsId()) continue;
-            res.add(field);
-
-            ForeignKey foreignKey = field.getForeignKey();
-            if (foreignKey == null) continue;
-            // Recurse
-            res.addAll(getAllJoinedFields(foreignKey.getEntity()));
-        }
-        return res;
-    }
 }
diff --git a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Field.java b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Field.java
index c8daca5..2a500df 100644
--- a/src/main/java/org/jraf/androidcontentprovidergenerator/model/Field.java
+++ b/src/main/java/org/jraf/androidcontentprovidergenerator/model/Field.java
@@ -150,6 +150,7 @@ public static OnDeleteAction fromJsonName(String jsonName) {
     private final ForeignKey mForeignKey;
     private boolean mIsForeign;
     private boolean mIsAmbiguous;
+    private Field mOriginalField;
 
     public Field(Entity entity, String name, String type, boolean isId, boolean isIndex, boolean isNullable, String defaultValue, String enumName,
             List<EnumValue> enumValues, ForeignKey foreignKey) {
@@ -168,6 +169,7 @@ public Field(Entity entity, String name, String type, boolean isId, boolean isIn
     public Field asForeignField() {
         Field res = new Field(mEntity, mName, mType.mJsonName, mIsId, mIsIndex, mIsNullable, mDefaultValue, mEnumName, mEnumValues, mForeignKey);
         res.mIsForeign = true;
+        res.mOriginalField = this;
         return res;
     }
 
@@ -260,6 +262,7 @@ public boolean getIsForeign() {
 
     /* package */void setIsAmbiguous(boolean isAmbiguous) {
         mIsAmbiguous = isAmbiguous;
+        if (mOriginalField != null) mOriginalField.mIsAmbiguous = isAmbiguous;
     }
 
     /* package */boolean getIsAmbiguous() {

From b7897aa5d90795447c4517f2ab859f6ee875202a Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Sat, 1 Nov 2014 18:55:12 +0100
Subject: [PATCH 6/9] Added joined tables to selection classes.

---
 .../sample/app/SampleActivity.java            |   4 +-
 .../personteam/PersonTeamSelection.java       | 249 ++++++++++++++++++
 .../sample/provider/team/TeamCursor.java      |  24 +-
 .../sample/provider/team/TeamSelection.java   |  31 +++
 .../selection.ftl                             | 105 ++++----
 5 files changed, 348 insertions(+), 65 deletions(-)

diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
index 3e91c4c..1e20ad8 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/app/SampleActivity.java
@@ -117,7 +117,7 @@ private void queryPeople() {
 
     private void queryPeopleWithTeam() {
         PersonTeamSelection personTeamSelection = new PersonTeamSelection();
-        //        personTeamSelection.personFirstName("James", "John");
+        personTeamSelection.personFirstName("James", "John");
         String[] projection = { PersonTeamColumns._ID, PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, PersonColumns.COUNTRY_CODE,
                 TeamColumns.NAME, TeamColumns.COUNTRY_CODE };
         PersonTeamCursor c = personTeamSelection.query(getContentResolver(), projection);
@@ -130,7 +130,7 @@ private void queryPeopleWithTeam() {
 
     private void queryPeopleWithTeamAndCompany() {
         PersonTeamSelection personTeamSelection = new PersonTeamSelection();
-        //        personTeamSelection.personFirstName("James", "John");
+        personTeamSelection.personFirstName("James", "John");
         String[] projection = { PersonTeamColumns._ID, PersonColumns.FIRST_NAME, PersonColumns.LAST_NAME, PersonColumns.AGE, PersonColumns.COUNTRY_CODE,
                 TeamColumns.NAME, TeamColumns.COUNTRY_CODE, CompanyColumns.NAME };
         PersonTeamCursor c = personTeamSelection.query(getContentResolver(), projection);
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java
index 5ca5f26..0f28b23 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamSelection.java
@@ -31,6 +31,9 @@
 import android.net.Uri;
 
 import org.jraf.androidcontentprovidergenerator.sample.provider.base.AbstractSelection;
+import org.jraf.androidcontentprovidergenerator.sample.provider.person.*;
+import org.jraf.androidcontentprovidergenerator.sample.provider.team.*;
+import org.jraf.androidcontentprovidergenerator.sample.provider.company.*;
 
 /**
  * Selection for the {@code person_team} table.
@@ -107,6 +110,162 @@ public PersonTeamSelection personIdLtEq(long value) {
         return this;
     }
 
+    public PersonTeamSelection personFirstName(String... value) {
+        addEquals(PersonColumns.FIRST_NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection personFirstNameNot(String... value) {
+        addNotEquals(PersonColumns.FIRST_NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection personFirstNameLike(String... value) {
+        addLike(PersonColumns.FIRST_NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection personLastName(String... value) {
+        addEquals(PersonColumns.LAST_NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection personLastNameNot(String... value) {
+        addNotEquals(PersonColumns.LAST_NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection personLastNameLike(String... value) {
+        addLike(PersonColumns.LAST_NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection personAge(int... value) {
+        addEquals(PersonColumns.AGE, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection personAgeNot(int... value) {
+        addNotEquals(PersonColumns.AGE, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection personAgeGt(int value) {
+        addGreaterThan(PersonColumns.AGE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personAgeGtEq(int value) {
+        addGreaterThanOrEquals(PersonColumns.AGE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personAgeLt(int value) {
+        addLessThan(PersonColumns.AGE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personAgeLtEq(int value) {
+        addLessThanOrEquals(PersonColumns.AGE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personBirthDate(Date... value) {
+        addEquals(PersonColumns.BIRTH_DATE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personBirthDateNot(Date... value) {
+        addNotEquals(PersonColumns.BIRTH_DATE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personBirthDate(Long... value) {
+        addEquals(PersonColumns.BIRTH_DATE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personBirthDateAfter(Date value) {
+        addGreaterThan(PersonColumns.BIRTH_DATE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personBirthDateAfterEq(Date value) {
+        addGreaterThanOrEquals(PersonColumns.BIRTH_DATE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personBirthDateBefore(Date value) {
+        addLessThan(PersonColumns.BIRTH_DATE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personBirthDateBeforeEq(Date value) {
+        addLessThanOrEquals(PersonColumns.BIRTH_DATE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personHasBlueEyes(boolean value) {
+        addEquals(PersonColumns.HAS_BLUE_EYES, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection personHeight(Float... value) {
+        addEquals(PersonColumns.HEIGHT, value);
+        return this;
+    }
+
+    public PersonTeamSelection personHeightNot(Float... value) {
+        addNotEquals(PersonColumns.HEIGHT, value);
+        return this;
+    }
+
+    public PersonTeamSelection personHeightGt(float value) {
+        addGreaterThan(PersonColumns.HEIGHT, value);
+        return this;
+    }
+
+    public PersonTeamSelection personHeightGtEq(float value) {
+        addGreaterThanOrEquals(PersonColumns.HEIGHT, value);
+        return this;
+    }
+
+    public PersonTeamSelection personHeightLt(float value) {
+        addLessThan(PersonColumns.HEIGHT, value);
+        return this;
+    }
+
+    public PersonTeamSelection personHeightLtEq(float value) {
+        addLessThanOrEquals(PersonColumns.HEIGHT, value);
+        return this;
+    }
+
+    public PersonTeamSelection personGender(Gender... value) {
+        addEquals(PersonColumns.GENDER, value);
+        return this;
+    }
+
+    public PersonTeamSelection personGenderNot(Gender... value) {
+        addNotEquals(PersonColumns.GENDER, value);
+        return this;
+    }
+
+
+    public PersonTeamSelection personCountryCode(String... value) {
+        addEquals(PersonColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personCountryCodeNot(String... value) {
+        addNotEquals(PersonColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+    public PersonTeamSelection personCountryCodeLike(String... value) {
+        addLike(PersonColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
     public PersonTeamSelection teamId(long... value) {
         addEquals(PersonTeamColumns.TEAM_ID, toObjectArray(value));
         return this;
@@ -136,4 +295,94 @@ public PersonTeamSelection teamIdLtEq(long value) {
         addLessThanOrEquals(PersonTeamColumns.TEAM_ID, value);
         return this;
     }
+
+    public PersonTeamSelection teamCompanyId(long... value) {
+        addEquals(TeamColumns.COMPANY_ID, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection teamCompanyIdNot(long... value) {
+        addNotEquals(TeamColumns.COMPANY_ID, toObjectArray(value));
+        return this;
+    }
+
+    public PersonTeamSelection teamCompanyIdGt(long value) {
+        addGreaterThan(TeamColumns.COMPANY_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamCompanyIdGtEq(long value) {
+        addGreaterThanOrEquals(TeamColumns.COMPANY_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamCompanyIdLt(long value) {
+        addLessThan(TeamColumns.COMPANY_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamCompanyIdLtEq(long value) {
+        addLessThanOrEquals(TeamColumns.COMPANY_ID, value);
+        return this;
+    }
+
+    public PersonTeamSelection companyName(String... value) {
+        addEquals(CompanyColumns.NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection companyNameNot(String... value) {
+        addNotEquals(CompanyColumns.NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection companyNameLike(String... value) {
+        addLike(CompanyColumns.NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection companyAddress(String... value) {
+        addEquals(CompanyColumns.ADDRESS, value);
+        return this;
+    }
+
+    public PersonTeamSelection companyAddressNot(String... value) {
+        addNotEquals(CompanyColumns.ADDRESS, value);
+        return this;
+    }
+
+    public PersonTeamSelection companyAddressLike(String... value) {
+        addLike(CompanyColumns.ADDRESS, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamName(String... value) {
+        addEquals(TeamColumns.NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamNameNot(String... value) {
+        addNotEquals(TeamColumns.NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamNameLike(String... value) {
+        addLike(TeamColumns.NAME, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamCountryCode(String... value) {
+        addEquals(TeamColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamCountryCodeNot(String... value) {
+        addNotEquals(TeamColumns.COUNTRY_CODE, value);
+        return this;
+    }
+
+    public PersonTeamSelection teamCountryCodeLike(String... value) {
+        addLike(TeamColumns.COUNTRY_CODE, value);
+        return this;
+    }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamCursor.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamCursor.java
index ee74ae2..4a9fa75 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamCursor.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamCursor.java
@@ -50,17 +50,17 @@ public long getCompanyId() {
      * Get the {@code name} value.
      * Cannot be {@code null}.
      */
-    public String getName() {
-        Integer index = getCachedColumnIndexOrThrow(TeamColumns.NAME);
+    public String getCompanyName() {
+        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.NAME);
         return getString(index);
     }
 
     /**
-     * Get the {@code country_code} value.
-     * Cannot be {@code null}.
+     * Get the {@code address} value.
+     * Can be {@code null}.
      */
-    public String getCountryCode() {
-        Integer index = getCachedColumnIndexOrThrow(TeamColumns.COUNTRY_CODE);
+    public String getCompanyAddress() {
+        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.ADDRESS);
         return getString(index);
     }
 
@@ -68,17 +68,17 @@ public String getCountryCode() {
      * Get the {@code name} value.
      * Cannot be {@code null}.
      */
-    public String getCompanyName() {
-        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.NAME);
+    public String getName() {
+        Integer index = getCachedColumnIndexOrThrow(TeamColumns.NAME);
         return getString(index);
     }
 
     /**
-     * Get the {@code address} value.
-     * Can be {@code null}.
+     * Get the {@code country_code} value.
+     * Cannot be {@code null}.
      */
-    public String getCompanyAddress() {
-        Integer index = getCachedColumnIndexOrThrow(CompanyColumns.ADDRESS);
+    public String getCountryCode() {
+        Integer index = getCachedColumnIndexOrThrow(TeamColumns.COUNTRY_CODE);
         return getString(index);
     }
 }
diff --git a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java
index c3d8f9d..086721e 100644
--- a/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java
+++ b/etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamSelection.java
@@ -31,6 +31,7 @@
 import android.net.Uri;
 
 import org.jraf.androidcontentprovidergenerator.sample.provider.base.AbstractSelection;
+import org.jraf.androidcontentprovidergenerator.sample.provider.company.*;
 
 /**
  * Selection for the {@code team} table.
@@ -107,6 +108,36 @@ public TeamSelection companyIdLtEq(long value) {
         return this;
     }
 
+    public TeamSelection companyName(String... value) {
+        addEquals(CompanyColumns.NAME, value);
+        return this;
+    }
+
+    public TeamSelection companyNameNot(String... value) {
+        addNotEquals(CompanyColumns.NAME, value);
+        return this;
+    }
+
+    public TeamSelection companyNameLike(String... value) {
+        addLike(CompanyColumns.NAME, value);
+        return this;
+    }
+
+    public TeamSelection companyAddress(String... value) {
+        addEquals(CompanyColumns.ADDRESS, value);
+        return this;
+    }
+
+    public TeamSelection companyAddressNot(String... value) {
+        addNotEquals(CompanyColumns.ADDRESS, value);
+        return this;
+    }
+
+    public TeamSelection companyAddressLike(String... value) {
+        addLike(CompanyColumns.ADDRESS, value);
+        return this;
+    }
+
     public TeamSelection name(String... value) {
         addEquals(TeamColumns.NAME, value);
         return this;
diff --git a/src/main/resources/org/jraf/androidcontentprovidergenerator/selection.ftl b/src/main/resources/org/jraf/androidcontentprovidergenerator/selection.ftl
index d859fb8..c246605 100644
--- a/src/main/resources/org/jraf/androidcontentprovidergenerator/selection.ftl
+++ b/src/main/resources/org/jraf/androidcontentprovidergenerator/selection.ftl
@@ -10,6 +10,9 @@ import android.database.Cursor;
 import android.net.Uri;
 
 import ${config.providerJavaPackage}.base.AbstractSelection;
+<#list entity.joinedEntities as joinedEntity>
+import ${config.providerJavaPackage}.${joinedEntity.nameLowerCase}.*;
+</#list>
 
 /**
  * Selection for the {@code ${entity.nameLowerCase}} table.
@@ -55,143 +58,143 @@ public class ${entity.nameCamelCase}Selection extends AbstractSelection<${entity
         return this;
     }
 
-    <#list entity.fields as field>
+    <#list entity.getFieldsIncludingJoins(false) as field>
     <#if !field.isId>
     <#switch field.type.name()>
     <#case "BOOLEAN">
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}(${field.javaTypeSimpleName} value) {
-        addEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, toObjectArray(value));
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>(${field.javaTypeSimpleName} value) {
+        addEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, toObjectArray(value));
         return this;
     }
     <#break>
     <#default>
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}(${field.javaTypeSimpleName}... value) {
-        addEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, <#if field.isConvertionNeeded>toObjectArray(value)<#else>value</#if>);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>(${field.javaTypeSimpleName}... value) {
+        addEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, <#if field.isConvertionNeeded>toObjectArray(value)<#else>value</#if>);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Not(${field.javaTypeSimpleName}... value) {
-        addNotEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, <#if field.isConvertionNeeded>toObjectArray(value)<#else>value</#if>);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Not(${field.javaTypeSimpleName}... value) {
+        addNotEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, <#if field.isConvertionNeeded>toObjectArray(value)<#else>value</#if>);
         return this;
     }
 
     </#switch>
     <#switch field.type.name()>
     <#case "DATE">
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}(<#if field.isNullable>Long<#else>long</#if>... value) {
-        addEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, <#if field.isNullable>value<#else>toObjectArray(value)</#if>);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>(<#if field.isNullable>Long<#else>long</#if>... value) {
+        addEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, <#if field.isNullable>value<#else>toObjectArray(value)</#if>);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}After(Date value) {
-        addGreaterThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>After(Date value) {
+        addGreaterThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}AfterEq(Date value) {
-        addGreaterThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>AfterEq(Date value) {
+        addGreaterThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Before(Date value) {
-        addLessThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Before(Date value) {
+        addLessThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}BeforeEq(Date value) {
-        addLessThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>BeforeEq(Date value) {
+        addLessThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
     <#break>
     <#case "INTEGER">
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Gt(int value) {
-        addGreaterThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Gt(int value) {
+        addGreaterThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}GtEq(int value) {
-        addGreaterThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>GtEq(int value) {
+        addGreaterThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Lt(int value) {
-        addLessThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Lt(int value) {
+        addLessThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}LtEq(int value) {
-        addLessThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>LtEq(int value) {
+        addLessThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
     <#break>
     <#case "LONG">
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Gt(long value) {
-        addGreaterThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Gt(long value) {
+        addGreaterThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}GtEq(long value) {
-        addGreaterThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>GtEq(long value) {
+        addGreaterThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Lt(long value) {
-        addLessThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Lt(long value) {
+        addLessThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}LtEq(long value) {
-        addLessThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>LtEq(long value) {
+        addLessThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
     <#break>
     <#case "FLOAT">
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Gt(float value) {
-        addGreaterThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Gt(float value) {
+        addGreaterThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}GtEq(float value) {
-        addGreaterThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>GtEq(float value) {
+        addGreaterThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Lt(float value) {
-        addLessThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Lt(float value) {
+        addLessThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}LtEq(float value) {
-        addLessThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>LtEq(float value) {
+        addLessThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
     <#break>
     <#case "DOUBLE">
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Gt(double value) {
-        addGreaterThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Gt(double value) {
+        addGreaterThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}GtEq(double value) {
-        addGreaterThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>GtEq(double value) {
+        addGreaterThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Lt(double value) {
-        addLessThan(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Lt(double value) {
+        addLessThan(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
 
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}LtEq(double value) {
-        addLessThanOrEquals(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>LtEq(double value) {
+        addLessThanOrEquals(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
     <#break>
     <#case "STRING">
-    public ${entity.nameCamelCase}Selection ${field.nameCamelCaseLowerCase}Like(String... value) {
-        addLike(${entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
+    public ${entity.nameCamelCase}Selection <#if field.isForeign>${field.entity.nameCamelCase?uncap_first}${field.nameCamelCase}<#else>${field.nameCamelCaseLowerCase}</#if>Like(String... value) {
+        addLike(${field.entity.nameCamelCase}Columns.${field.nameUpperCase}, value);
         return this;
     }
     <#break>

From 217c319e117bc3c7ccd38fd7567974e5edd2c234 Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Sat, 1 Nov 2014 19:05:50 +0100
Subject: [PATCH 7/9] Changed the name of the bundle file.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e395387..aace615 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>android-contentprovider-generator-${project.version}-bundle</finalName>
+                    <finalName>android_contentprovider_generator-${project.version}-bundle</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
             </plugin>

From c013d8f07fc4176b4ff9868628ee0dca22140cec Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Tue, 11 Nov 2014 13:48:42 +0100
Subject: [PATCH 8/9] Fixed doc about the BaseColumns.

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

diff --git a/README.md b/README.md
index ff4ebef..f5b4d1c 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ It takes a set of entity (a.k.a "table") definitions as the input, and generates
 - a `ContentProvider` class
 - a `SQLiteOpenHelper` class
 - a `SQLiteOpenHelperCallbacks` class
-- one `BaseColumns` interface per entity
+- one `BaseColumns` class per entity
 - one `Cursor` class per entity
 - one `ContentValues` class per entity
 - one `Selection` class per entity

From c2e2420b059f3eddc221c9936327a0dcc4892432 Mon Sep 17 00:00:00 2001
From: BoD <BoD@JRAF.org>
Date: Tue, 11 Nov 2014 13:59:16 +0100
Subject: [PATCH 9/9] Minor README changes.

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

diff --git a/README.md b/README.md
index f5b4d1c..7933ff0 100644
--- a/README.md
+++ b/README.md
@@ -194,9 +194,9 @@ In this example, the field `main_team_id` is a foreign key referencing the prima
 - Of course if `team` has foreign keys they will also be handled (and recursively).
 
 #### Limitations
+- Foreign keys always reference the `_id` column (the implicit primary key of all tables) and thus must always be of type `Long`  - by design.
 - **Only one foreign key to a particular table is allowed per table.**  In the example above only one column in `person` can point to `team`.
 - **Loops** (i.e. A has a foreign key to B and B has a foreign key to A) **aren't detected.**  The generator will infinitely loop if they exist.
-- Foreign keys always reference the `_id` column (the implicit primary key of all tables) and thus must always be of type `Long`  - by design.
 
 
 Building