From 8a8fb469e19ebd689f8339efba4d0e585efce6d8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 29 Jun 2015 15:39:36 -0400
Subject: [PATCH] Fix wildcard SELECT column mapping on JOIN statements

---
 releases.moxie                  | 3 ++-
 src/main/java/com/iciql/Db.java | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 156c86df..71f5402d 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -9,7 +9,8 @@ r27: {
     html: ~
     text: ~
     security: ~
-    fixes: ~
+    fixes:
+    - Fix column mapping on wildcard select JOIN statements
     changes:
     - Add support for PostgreSQL 9.5 UPSERT syntax
     additions: ~
diff --git a/src/main/java/com/iciql/Db.java b/src/main/java/com/iciql/Db.java
index 4b55150c..ef079632 100644
--- a/src/main/java/com/iciql/Db.java
+++ b/src/main/java/com/iciql/Db.java
@@ -799,8 +799,7 @@ public <T> List<T> executeQuery(Class<? extends T> modelClass, String sql, Objec
 				}
 				rs = stat.executeQuery();
 			}
-			boolean wildcardSelect = sql.toLowerCase().startsWith("select *")
-					|| sql.toLowerCase().startsWith("select distinct *");
+			boolean wildcardSelect = sql.toLowerCase().matches("select .*\\*.+");
 			return buildObjects(modelClass, wildcardSelect, rs);
 		} catch (SQLException e) {
 			throw new IciqlException(e);