Fix wildcard SELECT column mapping on JOIN statements

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: ~

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);