github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#5046] Issue a warning when Record.field(String) runs into ambiguous columns

Browse Source
This commit is contained in:
lukaseder 2016-02-04 11:48:01 +01:00
parent 9b3342a560
commit cbfb7b6095
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jOOQ/src/main/java/org/jooq/impl/Fields.java
View File

@ -43,6 +43,7 @@ package org.jooq.impl;
import static org.jooq.impl.Utils.indexOrFail;
import java.sql.SQLWarning;
import java.util.Collection;
import org.jooq.Clause;
@ -118,7 +119,7 @@ class Fields<R extends Record> extends AbstractQueryPart implements RecordType<R
else
// [#4476] [#4477] This might be unintentional from a user
// perspective, e.g. when ambiguous ID columns are present.
log.info("Ambiguous match found for " + fieldName + ". Both " + columnMatch + " and " + f + " match.");
log.info("Ambiguous match found for " + fieldName + ". Both " + columnMatch + " and " + f + " match.", new SQLWarning());
}
}
@ -138,18 +139,22 @@ class Fields<R extends Record> extends AbstractQueryPart implements RecordType<R
}
@Override
public final Field<?> field(String name) {
if (name == null) {
public final Field<?> field(String fieldName) {
if (fieldName == null)
return null;
}
for (Field<?> f : fields) {
if (f.getName().equals(name)) {
return f;
}
}
Field<?> columnMatch = null;
return null;
for (Field<?> f : fields)
if (f.getName().equals(fieldName))
if (columnMatch == null)
columnMatch = f;
else
// [#4476] [#4477] [#5046] This might be unintentional from a user
// perspective, e.g. when ambiguous ID columns are present.
log.info("Ambiguous match found for " + fieldName + ". Both " + columnMatch + " and " + f + " match.", new SQLWarning());
return columnMatch;
}
@Override