diff options
| author | James Moger <james.moger@gitblit.com> | 2015-06-29 15:39:36 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2015-06-29 15:39:36 -0400 |
| commit | 8a8fb469e19ebd689f8339efba4d0e585efce6d8 (patch) | |
| tree | 0f4941850d38c5693e733fdebfa4bf53c7d0dc8c | |
| parent | 75c995b50cf8f00655d578de7cb88106c9c27918 (diff) | |
| download | iciql-8a8fb469e19ebd689f8339efba4d0e585efce6d8.tar.gz iciql-8a8fb469e19ebd689f8339efba4d0e585efce6d8.zip | |
Fix wildcard SELECT column mapping on JOIN statements
| -rw-r--r-- | releases.moxie | 3 | ||||
| -rw-r--r-- | src/main/java/com/iciql/Db.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/releases.moxie b/releases.moxie index 156c86d..71f5402 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 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); |