Browse Source

Use first column in case of duplicate columns.

Also, fallback on column names when label is not present.

See #1680
Original pull request #1825
pull/1830/head
Jens Schauder 1 year ago
parent
commit
eaa3d66842
No known key found for this signature in database
GPG Key ID: 74F6C554AE971567
  1. 4
      spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentResultSetExtractor.java

4
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentResultSetExtractor.java

@ -73,8 +73,8 @@ class RowDocumentResultSetExtractor { @@ -73,8 +73,8 @@ class RowDocumentResultSetExtractor {
for (int i = 0; i < columnCount; i++) {
Object rsv = JdbcUtils.getResultSetValue(resultSet, i + 1);
String columnName = md.getColumnLabel(i + 1);
Object old = document.put(columnName, rsv instanceof Array a ? a.getArray() : rsv);
String columnName = JdbcUtils.lookupColumnName(md, i+1);
Object old = document.putIfAbsent(columnName, rsv instanceof Array a ? a.getArray() : rsv);
if (old != null) {
log.warn(DUPLICATE_COLUMN_WARNING, columnName, i);
}

Loading…
Cancel
Save