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

[jOOQ/jOOQ#14944] Wrong warning logged regarding CockroachDB version support

Browse Source
This commit is contained in:
Lukas Eder 2023-05-25 16:36:12 +02:00
parent 30d3762403
commit cc36b552a3
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
jOOQ/src/main/java/org/jooq/impl/DefaultExecuteContext.java
View File

@ -38,6 +38,7 @@
package org.jooq.impl;
import static java.lang.Boolean.TRUE;
// ...
import static org.jooq.conf.SettingsTools.renderLocale;
import static org.jooq.impl.Tools.EMPTY_INT;
import static org.jooq.impl.Tools.EMPTY_QUERY;
@ -58,6 +59,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jooq.Configuration;
import org.jooq.ConnectionProvider;
@ -84,6 +87,8 @@ import org.jooq.conf.DiagnosticsConnection;
import org.jooq.conf.Settings;
import org.jooq.tools.JooqLogger;
import org.jooq.tools.jdbc.JDBCUtils;
import org.jooq.tools.reflect.Reflect;
import org.jooq.tools.reflect.ReflectException;
import org.jetbrains.annotations.NotNull;
@ -634,15 +639,32 @@ class DefaultExecuteContext implements ExecuteContext {
// [#11355] Check configured dialect version vs. JDBC Connection server version.
if (dialect().isVersioned() && logVersionSupport.isWarnEnabled()) {
String productVersion = null;
try {
int majorVersion = c.getMetaData().getDatabaseMajorVersion();
int minorVersion = c.getMetaData().getDatabaseMinorVersion();
String productVersion = c.getMetaData().getDatabaseProductVersion();
productVersion = c.getMetaData().getDatabaseProductVersion();
if (!dialect().supportsDatabaseVersion(majorVersion, minorVersion, productVersion))
logVersionSupport.warn("Version mismatch", "Database version is older than what dialect " + dialect() + " supports: " + productVersion + ". Consider https://www.jooq.org/download/support-matrix to see what jOOQ version and edition supports which RDBMS versions.");
else
logVersionSupport.info("Version", "Database version is supported by dialect " + dialect() + ": " + productVersion);
logVersionSupport(majorVersion, minorVersion, productVersion);
}
// [#14833] There are various reasons why the version can't be read, which we can ignore
@ -652,7 +674,7 @@ class DefaultExecuteContext implements ExecuteContext {
// [#14791] Could also be NumberFormatException when reading non-standard version numbers
catch (Exception e) {
logVersionSupport.error("Error reading database version", e);
logVersionSupport.info("Version", "Cannot obtain database version for " + dialect() + ": " + productVersion + ". (" + e.getClass() + ": " + e.getMessage() + "). Please consider reporting this here: https://jooq.org/bug");
}
}
@ -662,6 +684,13 @@ class DefaultExecuteContext implements ExecuteContext {
}
}
private final void logVersionSupport(int majorVersion, int minorVersion, String productVersion) {
if (!dialect().supportsDatabaseVersion(majorVersion, minorVersion, productVersion))
logVersionSupport.warn("Version mismatch", "Database version is older than what dialect " + dialect() + " supports: " + productVersion + ". Consider https://www.jooq.org/download/support-matrix to see what jOOQ version and edition supports which RDBMS versions.");
else
logVersionSupport.info("Version", "Database version is supported by dialect " + dialect() + ": " + productVersion);
}
private final Connection wrap(ConnectionProvider provider, Connection c) {
return wrap0(new SettingsEnabledConnection(new ProviderEnabledConnection(provider, c), derivedConfiguration.settings(), this));
}