summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2015-06-29 15:39:36 -0400
committerJames Moger <james.moger@gitblit.com>2015-06-29 15:39:36 -0400
commit8a8fb469e19ebd689f8339efba4d0e585efce6d8 (patch)
tree0f4941850d38c5693e733fdebfa4bf53c7d0dc8c /src/main
parent75c995b50cf8f00655d578de7cb88106c9c27918 (diff)
downloadiciql-8a8fb469e19ebd689f8339efba4d0e585efce6d8.tar.gz
iciql-8a8fb469e19ebd689f8339efba4d0e585efce6d8.zip
Fix wildcard SELECT column mapping on JOIN statements
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/iciql/Db.java3
1 files changed, 1 insertions, 2 deletions
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);