From 192a655396f5da5af3d66b0cb156bee3481f5b71 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 12 Aug 2021 16:40:26 +0200 Subject: [PATCH] [jOOQ/jOOQ#12291] Reference to database and/or server name in 'master.sys.schemas' is not supported in this version of SQL Server. Including: - Added Azure SQL connection strings - Added test script to JDBC --- .../src/main/java/org/jooq/impl/MetaImpl.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index d7a61be373..b005fbb9c7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -39,6 +39,7 @@ package org.jooq.impl; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; +import static java.util.Arrays.asList; // ... // ... // ... @@ -114,7 +115,6 @@ import org.jooq.TableOptions; import org.jooq.TableOptions.TableType; import org.jooq.UniqueKey; import org.jooq.conf.ParseUnknownFunctions; -import org.jooq.conf.SettingsTools; import org.jooq.exception.DataAccessException; import org.jooq.exception.DataDefinitionException; import org.jooq.exception.DataTypeException; @@ -281,18 +281,31 @@ final class MetaImpl extends AbstractMeta { if (!inverseSchemaCatalog) { - Result schemas = meta(meta -> dsl().fetch( + Result schemas = meta(meta -> { + + + + + + + + + + + + + + - meta.getSchemas(), // [#2681] Work around a flaw in the MySQL JDBC driver - SQLDataType.VARCHAR // TABLE_SCHEM - )); + return dsl().fetch(meta.getSchemas(), VARCHAR); // TABLE_SCHEM + }); for (String name : schemas.getValues(0, String.class)) result.add(new MetaSchema(name, MetaCatalog.this));