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

[jOOQ/jOOQ#9161] Add support for MySQL FULLTEXT KEY inline declaration in CREATE TABLE

Browse Source
This commit is contained in:
lukaseder 2019-09-05 15:19:16 +02:00
parent b7f0d51034
commit 495baed1ee
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3159,7 +3159,7 @@ final class ParserImpl implements Parser {
constraints.add(parseCheckSpecification(ctx, constraint));
continue columnLoop;
}
else if (constraint == null && (parseKeywordIf(ctx, "KEY") || parseKeywordIf(ctx, "INDEX"))) {
else if (constraint == null && parseIndexOrKeyIf(ctx)) {
int p2 = ctx.position();
// [#7348] [#7651] Look ahead if the next tokens indicate a MySQL index definition
@ -3855,14 +3855,7 @@ final class ParserImpl implements Parser {
private static final DDLQuery parseAlterTableAdd(ParserContext ctx, AlterTableStep s1, Table<?> tableName) {
List<FieldOrConstraint> list = new ArrayList<>();
if (((parseKeywordIf(ctx, "SPATIAL INDEX")
|| parseKeywordIf(ctx, "SPATIAL KEY")
|| parseKeywordIf(ctx, "FULLTEXT INDEX")
|| parseKeywordIf(ctx, "FULLTEXT KEY"))
&& ctx.requireUnsupportedSyntax())
|| parseKeywordIf(ctx, "INDEX")
|| parseKeywordIf(ctx, "KEY")) {
if (parseIndexOrKeyIf(ctx)) {
Name name = parseIdentifierIf(ctx);
parse(ctx, '(');
List<SortField<?>> sort = parseSortSpecification(ctx);
@ -3898,6 +3891,17 @@ final class ParserImpl implements Parser {
return s1.add(list);
}
private static final boolean parseIndexOrKeyIf(ParserContext ctx) {
return ((parseKeywordIf(ctx, "SPATIAL INDEX")
|| parseKeywordIf(ctx, "SPATIAL KEY")
|| parseKeywordIf(ctx, "FULLTEXT INDEX")
|| parseKeywordIf(ctx, "FULLTEXT KEY"))
&& ctx.requireUnsupportedSyntax())
|| parseKeywordIf(ctx, "INDEX")
|| parseKeywordIf(ctx, "KEY");
}
private static final FieldOrConstraint parseAlterTableAddFieldOrConstraint(ParserContext ctx) {
ConstraintTypeStep constraint = null;