Refactoring.

1 files changed, 7 insertions, 8 deletions

diff --git a/src/com/iciql/Query.java b/src/com/iciql/Query.java
index 9aefe27..c2f81af 100644
--- a/src/com/iciql/Query.java
+++ b/src/com/iciql/Query.java
@@ -836,19 +836,18 @@ public class Query<T> {
 	 * @return the joined query

 	 */

 

-	@SuppressWarnings({ "unchecked", "rawtypes" })

 	public <A> QueryJoin<T> innerJoin(A alias) {

-		TableDefinition<T> def = (TableDefinition<T>) db.define(alias.getClass());

-		SelectTable<T> join = new SelectTable(db, this, alias, false);

-		def.initSelectObject(join, alias, aliasMap);

-		joins.add(join);

-		return new QueryJoin(this, join);

+        return join(alias, false);

 	}

 

-    @SuppressWarnings({ "unchecked", "rawtypes" })

     public <A> QueryJoin<T> leftJoin(A alias) {

+        return join(alias, true);

+    }

+

+    @SuppressWarnings({ "unchecked", "rawtypes" })

+    private <A> QueryJoin<T> join(A alias, boolean outerJoin) {

         TableDefinition<T> def = (TableDefinition<T>) db.define(alias.getClass());

-        SelectTable<T> join = new SelectTable(db, this, alias, true);

+        SelectTable<T> join = new SelectTable(db, this, alias, outerJoin);

         def.initSelectObject(join, alias, aliasMap);

         joins.add(join);

         return new QueryJoin(this, join);