From 28f76ad760f25364a315f8aeffee02c9f59359db Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 20 Jul 2023 09:54:48 +0200 Subject: [PATCH] [jOOQ/jOOQ#15413] "Ambiguous match found" warning log should reference qualified field name, if available --- jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java b/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java index bc37fe2ddf..3d93c044e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java @@ -301,13 +301,13 @@ final class FieldsImpl extends AbstractQueryPart implements Re } if (aliasMatch2 != null && log.isInfoEnabled()) - log.info("Ambiguous match found for " + fieldName + ". Both " + aliasMatch + " and " + aliasMatch2 + " match.", new SQLWarning()); + log.info("Ambiguous match found for " + field + ". Both " + aliasMatch + " and " + aliasMatch2 + " match.", new SQLWarning()); if (aliasMatch != null) return result.result(aliasMatch, aliasIndexMatch); if (columnOnlyMatch2 != null && log.isInfoEnabled()) - log.info("Ambiguous match found for " + fieldName + ". Both " + columnOnlyMatch + " and " + columnOnlyMatch2 + " match.", new SQLWarning()); + log.info("Ambiguous match found for " + field + ". Both " + columnOnlyMatch + " and " + columnOnlyMatch2 + " match.", new SQLWarning()); return result.result(columnOnlyMatch, columnOnlyIndexMatch); }