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: Fix wildcard SELECT column mapping on JOIN statements

---
 src/main/java/com/iciql/Db.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/iciql/Db.java b/src/main/java/com/iciql/Db.java
index 4b55150..ef07963 100644
--- a/src/main/java/com/iciql/Db.java
+++ b/src/main/java/com/iciql/Db.java
@@ -799,8 +799,7 @@ public class Db implements AutoCloseable {
 				}
 				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);
-- 
cgit v1.2.3