From b0af10ae45ce9dd4efec9b0f62fb0a7e9f56694e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 3 Jul 2023 11:17:12 +0200 Subject: [PATCH] [jOOQ/jOOQ#15319] Error when generating code from a MariaDB database containing packages --- .../java/org/jooq/meta/mysql/MySQLDatabase.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java index deb35e5d80..33be5b15bf 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java @@ -106,6 +106,7 @@ import org.jooq.meta.RoutineDefinition; import org.jooq.meta.SchemaDefinition; import org.jooq.meta.SequenceDefinition; import org.jooq.meta.TableDefinition; +// ... import org.jooq.meta.UDTDefinition; import org.jooq.meta.XMLSchemaCollectionDefinition; import org.jooq.meta.mariadb.MariaDBDatabase; @@ -547,6 +548,16 @@ public class MySQLDatabase extends AbstractDatabase implements ResultQueryDataba return result; } + + + + + + + + + + @Override protected List getXMLSchemaCollections0() throws SQLException { List result = new ArrayList<>(); @@ -580,6 +591,9 @@ public class MySQLDatabase extends AbstractDatabase implements ResultQueryDataba ROUTINES.ROUTINE_TYPE.coerce(PROC.TYPE).as(ROUTINES.ROUTINE_TYPE)) .from(ROUTINES) .where(ROUTINES.ROUTINE_SCHEMA.in(getInputSchemata())) + + // [#9309] [#15319] Until we support MariaDB packages, we must exclude them here, explicitly + .and(ROUTINES.ROUTINE_TYPE.in(ProcType.FUNCTION.name(), ProcType.PROCEDURE.name())) .orderBy(1, 2, 6) .fetch() @@ -592,6 +606,9 @@ public class MySQLDatabase extends AbstractDatabase implements ResultQueryDataba PROC.TYPE.as(ROUTINES.ROUTINE_TYPE)) .from(PROC) .where(PROC.DB.in(getInputSchemata())) + + // [#9309] [#15319] Until we support MariaDB packages, we must exclude them here, explicitly + .and(PROC.TYPE.in(ProcType.FUNCTION, ProcType.PROCEDURE)) .orderBy(1, 2, 6) .fetch();