Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reestablish warning on duplicate column in query.

Browse Source 
Closes #1680
Original pull request #1825
This commit is contained in:
Jens Schauder
2024-06-25 14:42:37 +02:00
parent 5c76ddca9e
commit faee85116a
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentResultSetExtractor.java
View File

@@ -22,6 +22,8 @@ import java.sql.SQLException;
import java.util.Iterator;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataRetrievalFailureException;
import org.springframework.data.jdbc.core.convert.RowDocumentExtractorSupport.AggregateContext;
import org.springframework.data.jdbc.core.convert.RowDocumentExtractorSupport.RowDocumentSink;
@@ -43,6 +45,9 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
*/
class RowDocumentResultSetExtractor {
private static final Logger log = LoggerFactory.getLogger(RowDocumentResultSetExtractor.class);
public static final String DUPLICATE_COLUMN_WARNING = "ResultSet contains column \"{}\" multiple times. Later column index is {}";
private final RelationalMappingContext context;
private final PathToColumnMapping propertyToColumn;
@@ -66,9 +71,13 @@ class RowDocumentResultSetExtractor {
RowDocument document = new RowDocument(columnCount);
for (int i = 0; i < columnCount; i++) {
Object rsv = JdbcUtils.getResultSetValue(resultSet, i + 1);
String columnName = md.getColumnLabel(i + 1);
document.put(columnName, rsv instanceof Array a ? a.getArray() : rsv);
Object old = document.put(columnName, rsv instanceof Array a ? a.getArray() : rsv);
if (old != null) {
log.warn(DUPLICATE_COLUMN_WARNING, columnName, i);
}
}
return document;
@@ -107,7 +116,12 @@ class RowDocumentResultSetExtractor {
Map<String, Integer> columns = new LinkedCaseInsensitiveMap<>(metaData.getColumnCount());
for (int i = 0; i < metaData.getColumnCount(); i++) {
columns.put(metaData.getColumnLabel(i + 1), i + 1);
String columnLabel = metaData.getColumnLabel(i + 1);
Object old = columns.put(columnLabel, i + 1);
if (old != null) {
log.warn(DUPLICATE_COLUMN_WARNING, columnLabel, i);
}
}
return columns;
} catch (SQLException e) {