Fix wildcard SELECT column mapping on JOIN statements

diff --git a/releases.moxie b/releases.moxie
index 156c86dfdace2a7db296bbeacd6d7e05d73eafd9..71f5402d3f514e9241c71bd9b71408e754073aa2 100644 (file)
--- 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 4b55150c7601e715ac51e5e7608e549dbb428c26..ef079632200b203a8aae2484d562ecec1d7db5c0 100644 (file)
--- 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);