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

[#5291] Bad DataType.defaultValue() call generated for MySQL tables

Browse Source
This commit is contained in:
lukaseder 2016-05-24 16:29:58 +02:00
parent cc37533ae7
commit 4755504dfa
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
View File

@ -41,6 +41,8 @@
package org.jooq.util;
import static java.util.Arrays.asList;
import static org.jooq.SQLDialect.MYSQL;
import static org.jooq.tools.StringUtils.defaultIfBlank;
import static org.jooq.tools.StringUtils.defaultString;
import static org.jooq.util.AbstractGenerator.Language.JAVA;
@ -5075,12 +5077,24 @@ public class JavaGenerator extends AbstractGenerator {
if (!dataType.nullable())
sb.append(".nullable(false)");
if (dataType.defaulted())
sb.append(".defaultValue(org.jooq.impl.DSL.field(\"")
.append(escapeString(d))
.append("\", ")
// [#5291] Some dialects report valid SQL expresions (e.g. PostgreSQL), others
// report actual values (e.g. MySQL).
if (dataType.defaulted()) {
sb.append(".defaultValue(");
if (asList(MYSQL).contains(db.getDialect().family()))
sb.append("org.jooq.impl.DSL.inline(\"")
.append(escapeString(d))
.append("\"");
else
sb.append("org.jooq.impl.DSL.field(\"")
.append(escapeString(d))
.append("\"");
sb.append(", ")
.append(sqlDataTypeRef)
.append("))");
}
}
// Otherwise, reference the dialect-specific DataType itself.