Skip to content

Commit 56af2f6

Browse files
committed
fix: make field lookups case-insensitive and use explicit table alias key in mapper
1 parent c719709 commit 56af2f6

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/main/java/io/retrorock/theory/helpers/ModelMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public ModelMapper fields(Class entity, String alias) {
235235

236236
public ModelMapper fields(Class entity) {
237237
Map<String, String> tableInfo = getTableinfo(entity);
238-
this.fields(entity, tableInfo.get(tableAlias));
238+
this.fields(entity, tableInfo.get("tableAlias"));
239239
return this;
240240
}
241241

src/main/java/io/retrorock/theory/helpers/RowMapperHelper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ public RowMapperHelper(ResultSet resultSet) throws SQLException {
1616
public Boolean fieldExists(String fieldName) throws SQLException {
1717
Boolean result = false;
1818
for (int i = 1; i <= this.metaData.getColumnCount(); i ++) {
19-
if (metaData.getColumnLabel(i).equals(fieldName)) {
20-
Object fieldObject = resultSet.getObject(fieldName);
19+
String label = metaData.getColumnLabel(i);
20+
if (label != null && label.equalsIgnoreCase(fieldName)) {
21+
Object fieldObject = resultSet.getObject(label);
2122
if (fieldObject != null) {
2223
result = true;
2324
}

0 commit comments

Comments
 (0)