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

[jOOQ/jOOQ#15319] Error when generating code from a MariaDB database containing packages

Browse Source
This commit is contained in:
Lukas Eder 2023-07-03 11:17:12 +02:00
parent 9dc53ed975
commit b0af10ae45
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java
View File

@ -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<XMLSchemaCollectionDefinition> getXMLSchemaCollections0() throws SQLException {
List<XMLSchemaCollectionDefinition> 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();