|
|
|
@ -30,6 +30,7 @@ import java.util.Map; |
|
|
|
import org.springframework.jdbc.InvalidResultSetAccessException; |
|
|
|
import org.springframework.jdbc.InvalidResultSetAccessException; |
|
|
|
import org.springframework.lang.Nullable; |
|
|
|
import org.springframework.lang.Nullable; |
|
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
|
|
|
|
import org.springframework.util.StringUtils; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* The default implementation of Spring's {@link SqlRowSet} interface, wrapping a |
|
|
|
* The default implementation of Spring's {@link SqlRowSet} interface, wrapping a |
|
|
|
@ -110,7 +111,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet { |
|
|
|
// Also support column names prefixed with table name
|
|
|
|
// Also support column names prefixed with table name
|
|
|
|
// as in {table_name}.{column.name}.
|
|
|
|
// as in {table_name}.{column.name}.
|
|
|
|
String table = rsmd.getTableName(i); |
|
|
|
String table = rsmd.getTableName(i); |
|
|
|
if (table != null && !table.isEmpty()) { |
|
|
|
if (StringUtils.hasLength(table)) { |
|
|
|
key = table + "." + rsmd.getColumnName(i); |
|
|
|
key = table + "." + rsmd.getColumnName(i); |
|
|
|
if (!this.columnLabelMap.containsKey(key)) { |
|
|
|
if (!this.columnLabelMap.containsKey(key)) { |
|
|
|
this.columnLabelMap.put(key, i); |
|
|
|
this.columnLabelMap.put(key, i); |
|
|
|
|