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

[#5213] NullPointerException when generating code in single-uppercase-named-database setup on MariaDB and MySQL

Browse Source
This commit is contained in:
lukaseder 2017-04-20 18:59:05 +02:00
parent 7fe7d55889
commit cf1829c8e7
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@
package org.jooq.util.mysql;
import static org.jooq.impl.DSL.falseCondition;
import static org.jooq.impl.DSL.inline;
import static org.jooq.util.mysql.information_schema.Tables.COLUMNS;
import static org.jooq.util.mysql.information_schema.Tables.KEY_COLUMN_USAGE;
@ -142,7 +143,11 @@ public class MySQLDatabase extends AbstractDatabase {
Statistics.COLUMN_NAME,
Statistics.INDEX_NAME)
.from(STATISTICS)
.where(Statistics.TABLE_SCHEMA.in(getInputSchemata()))
// [#5213] Duplicate schema value to work around MySQL issue https://bugs.mysql.com/bug.php?id=86022
.where(Statistics.TABLE_SCHEMA.in(getInputSchemata()).or(
getInputSchemata().size() == 1
? Statistics.TABLE_SCHEMA.in(getInputSchemata())
: falseCondition()))
.and(primary
? Statistics.INDEX_NAME.eq(inline("PRIMARY"))
: Statistics.INDEX_NAME.ne(inline("PRIMARY")).and(Statistics.NON_UNIQUE.eq(inline(0L))))
@ -168,7 +173,11 @@ public class MySQLDatabase extends AbstractDatabase {
.join(KEY_COLUMN_USAGE)
.on(ReferentialConstraints.CONSTRAINT_SCHEMA.equal(KeyColumnUsage.CONSTRAINT_SCHEMA))
.and(ReferentialConstraints.CONSTRAINT_NAME.equal(KeyColumnUsage.CONSTRAINT_NAME))
.where(ReferentialConstraints.CONSTRAINT_SCHEMA.in(getInputSchemata()))
// [#5213] Duplicate schema value to work around MySQL issue https://bugs.mysql.com/bug.php?id=86022
.where(ReferentialConstraints.CONSTRAINT_SCHEMA.in(getInputSchemata()).or(
getInputSchemata().size() == 1
? ReferentialConstraints.CONSTRAINT_SCHEMA.in(getInputSchemata())
: falseCondition()))
.orderBy(
KeyColumnUsage.CONSTRAINT_SCHEMA.asc(),
KeyColumnUsage.CONSTRAINT_NAME.asc(),
@ -237,7 +246,11 @@ public class MySQLDatabase extends AbstractDatabase {
Tables.TABLE_NAME,
Tables.TABLE_COMMENT)
.from(TABLES)
.where(Tables.TABLE_SCHEMA.in(getInputSchemata()))
// [#5213] Duplicate schema value to work around MySQL issue https://bugs.mysql.com/bug.php?id=86022
.where(Tables.TABLE_SCHEMA.in(getInputSchemata()).or(
getInputSchemata().size() == 1
? Tables.TABLE_SCHEMA.in(getInputSchemata())
: falseCondition()))
.orderBy(
Tables.TABLE_SCHEMA,
Tables.TABLE_NAME)
@ -268,7 +281,11 @@ public class MySQLDatabase extends AbstractDatabase {
.from(COLUMNS)
.where(
Columns.COLUMN_TYPE.like("enum(%)").and(
Columns.TABLE_SCHEMA.in(getInputSchemata())))
// [#5213] Duplicate schema value to work around MySQL issue https://bugs.mysql.com/bug.php?id=86022
Columns.TABLE_SCHEMA.in(getInputSchemata()).or(
getInputSchemata().size() == 1
? Columns.TABLE_SCHEMA.in(getInputSchemata())
: falseCondition())))
.orderBy(
Columns.TABLE_SCHEMA.asc(),
Columns.TABLE_NAME.asc(),

3
jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLRoutineDefinition.java
View File

@ -105,7 +105,8 @@ public class MySQLRoutineDefinition extends AbstractRoutineDefinition {
Parameters.NUMERIC_SCALE
)
.from(PARAMETERS)
.where(Parameters.SPECIFIC_SCHEMA.eq(getSchema().getInputName()))
// [#5213] Duplicate schema value to work around MySQL issue https://bugs.mysql.com/bug.php?id=86022
.where(Parameters.SPECIFIC_SCHEMA.in(getSchema().getInputName(), getSchema().getInputName()))
.and(Parameters.SPECIFIC_NAME.eq(getInputName()))
.and(Parameters.ROUTINE_TYPE.eq(procType.name()))
.orderBy(Parameters.ORDINAL_POSITION.asc())

3
jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLTableDefinition.java
View File

@ -81,7 +81,8 @@ public class MySQLTableDefinition extends AbstractTableDefinition {
Columns.NUMERIC_SCALE,
Columns.EXTRA)
.from(COLUMNS)
.where(TABLE_SCHEMA.equal(getSchema().getName()))
// [#5213] Duplicate schema value to work around MySQL issue https://bugs.mysql.com/bug.php?id=86022
.where(TABLE_SCHEMA.in(getSchema().getName(), getSchema().getName()))
.and(TABLE_NAME.equal(getName()))
.orderBy(ORDINAL_POSITION)) {