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

[jOOQ/jOOQ#19106] Diff doesn't change between different MySQL TEXT and BLOB types

Browse Source
This commit is contained in:
Lukas Eder 2025-09-25 18:02:53 +02:00
parent af10358afd
commit ac4a55560b
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -510,6 +510,9 @@ import static org.jooq.impl.Tools.EMPTY_ROW;
import static org.jooq.impl.Tools.EMPTY_SORTFIELD;
import static org.jooq.impl.Tools.EMPTY_STRING;
import static org.jooq.impl.Tools.EMPTY_TABLE;
import static org.jooq.impl.Tools.MYSQL_LOB_LENGTH;
import static org.jooq.impl.Tools.MYSQL_MEDIUM_LOB_LENGTH;
import static org.jooq.impl.Tools.MYSQL_TINY_LOB_LENGTH;
import static org.jooq.impl.Tools.aliased;
import static org.jooq.impl.Tools.anyMatch;
import static org.jooq.impl.Tools.asInt;
@ -13865,6 +13868,8 @@ final class DefaultParseContext extends AbstractParseContext implements ParseCon
return parseDataTypeLength(CLOB);
else
throw expected("0", "BINARY", "1", "TEXT");
else if (parseCategory() == SQLDialectCategory.MYSQL)
return BLOB(MYSQL_LOB_LENGTH);
else
return parseDataTypeLength(BLOB);
else if (parseKeywordOrIdentifierIf("BOOLEAN") ||
@ -13891,7 +13896,10 @@ final class DefaultParseContext extends AbstractParseContext implements ParseCon
else if (parseKeywordOrIdentifierIf("CITEXT"))
return parseDataTypeCollation(parseAndIgnoreDataTypeLength(CLOB));
else if (parseKeywordOrIdentifierIf("CLOB"))
return parseDataTypeCollation(parseDataTypeLength(CLOB));
if (parseCategory() == SQLDialectCategory.MYSQL)
return parseDataTypeCollation(CLOB(MYSQL_LOB_LENGTH));
else
return parseDataTypeCollation(parseDataTypeLength(CLOB));
}
break;
@ -14005,9 +14013,9 @@ final class DefaultParseContext extends AbstractParseContext implements ParseCon
return parseUnsigned(parseAndIgnoreDataTypeLength(INTEGER));
else if (!parseNumericOnly) {
if (parseKeywordOrIdentifierIf("MEDIUMBLOB"))
return BLOB;
return BLOB(MYSQL_MEDIUM_LOB_LENGTH);
else if (parseKeywordOrIdentifierIf("MEDIUMTEXT"))
return parseDataTypeCollation(CLOB);
return parseDataTypeCollation(CLOB(MYSQL_MEDIUM_LOB_LENGTH));
}
break;
@ -14080,8 +14088,12 @@ final class DefaultParseContext extends AbstractParseContext implements ParseCon
if (parseKeywordOrIdentifierIf("TINYINT"))
return parseUnsigned(parseAndIgnoreDataTypeLength(TINYINT));
else if (!parseNumericOnly) {
if (parseKeywordOrIdentifierIf("TEXT"))
return parseDataTypeCollation(parseAndIgnoreDataTypeLength(CLOB));
if (parseKeywordOrIdentifierIf("TEXT")) {
if (parseCategory() == SQLDialectCategory.MYSQL)
return parseDataTypeCollation(CLOB(MYSQL_LOB_LENGTH));
else
return parseDataTypeCollation(parseAndIgnoreDataTypeLength(CLOB));
}
else if (parseKeywordOrIdentifierIf("TIMESTAMPTZ"))
return parseDataTypePrecisionIf(TIMESTAMPWITHTIMEZONE);
else if (parseKeywordOrIdentifierIf("TIMESTAMP")) {
@ -14103,9 +14115,9 @@ final class DefaultParseContext extends AbstractParseContext implements ParseCon
return precision == null ? TIME : TIME(precision);
}
else if (parseKeywordOrIdentifierIf("TINYBLOB"))
return BLOB;
return BLOB(MYSQL_TINY_LOB_LENGTH);
else if (parseKeywordOrIdentifierIf("TINYTEXT"))
return parseDataTypeCollation(CLOB);
return parseDataTypeCollation(CLOB(MYSQL_TINY_LOB_LENGTH));
}
break;

10
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -443,6 +443,10 @@ final class Tools {
static final Type[] EMPTY_TYPE = {};
static final UpdatableRecord<?>[] EMPTY_UPDATABLE_RECORD = {};
static final int MYSQL_TINY_LOB_LENGTH = 255;
static final int MYSQL_LOB_LENGTH = 65535;
static final int MYSQL_MEDIUM_LOB_LENGTH = 16777215;
// ------------------------------------------------------------------------
// Some constants for use with Context.data()
// ------------------------------------------------------------------------
@ -6303,11 +6307,11 @@ final class Tools {
static final String mysqlLobTypeName(DataType<?> type) {
if (type.lengthDefined()) {
if (type.length() <= 255)
if (type.length() <= MYSQL_TINY_LOB_LENGTH)
return type.isBinary() ? "tinyblob" : "tinytext";
else if (type.length() <= 65535)
else if (type.length() <= MYSQL_LOB_LENGTH)
return type.isBinary() ? "blob" : "text";
else if (type.length() <= 16777215)
else if (type.length() <= MYSQL_MEDIUM_LOB_LENGTH)
return type.isBinary() ? "mediumblob" : "mediumtext";
}