Fix wildcard SELECT column mapping on JOIN statements

gitblit · Jun 29, 2015 · 8a8fb46 · 8a8fb46
1 parent 75c995b
commit 8a8fb46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);