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

[#7171] Support parsing the ENABLE keyword on constraints

Browse Source
This commit is contained in:
lukaseder 2018-05-16 11:28:08 +02:00
parent f9b63e14c3
commit bd26ea245a
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
View File

@ -281,10 +281,12 @@ index = ( 'KEY' | 'INDEX' ) [ identifier ] '(' sortFields ')'
;
constraint =
(
'PRIMARY KEY' '(' fieldNames ')'
| 'UNIQUE' [ 'KEY' | 'INDEX' ] '(' fieldNames ')'
| 'FOREIGN KEY' '(' fieldNames ')' 'REFERENCES' constraintReferenceSpecification
| 'CHECK' '(' condition ')'
) [ 'ENABLE' ]
;
constraintReferenceSpecification = tableName '(' fieldNames ')'

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

@ -2635,6 +2635,11 @@ final class ParserImpl implements Parser {
return Internal.createIndex(name == null ? DSL.name("") : name, table, fields, false);
}
private static boolean parseConstraintStateIf(ParserContext ctx) {
parseKeywordIf(ctx, "ENABLE");
return true;
}
private static final Constraint parsePrimaryKeySpecification(ParserContext ctx, ConstraintTypeStep constraint) {
parse(ctx, '(');
Field<?>[] fieldNames = parseFieldNames(ctx).toArray(EMPTY_FIELD);
@ -2643,6 +2648,8 @@ final class ParserImpl implements Parser {
Constraint e = constraint == null
? primaryKey(fieldNames)
: constraint.primaryKey(fieldNames);
parseConstraintStateIf(ctx);
return e;
}
@ -2651,9 +2658,12 @@ final class ParserImpl implements Parser {
Field<?>[] fieldNames = parseFieldNames(ctx).toArray(EMPTY_FIELD);
parse(ctx, ')');
return constraint == null
Constraint e = constraint == null
? unique(fieldNames)
: constraint.unique(fieldNames);
parseConstraintStateIf(ctx);
return e;
}
private static final Constraint parseCheckSpecification(ParserContext ctx, ConstraintTypeStep constraint) {
@ -2661,9 +2671,12 @@ final class ParserImpl implements Parser {
Condition condition = parseCondition(ctx);
parse(ctx, ')');
return constraint == null
Constraint e = constraint == null
? check(condition)
: constraint.check(condition);
parseConstraintStateIf(ctx);
return e;
}
private static final Constraint parseForeignKeySpecification(ParserContext ctx, ConstraintTypeStep constraint) {
@ -2730,6 +2743,7 @@ final class ParserImpl implements Parser {
throw ctx.expected("DELETE", "UPDATE");
}
parseConstraintStateIf(ctx);
return e;
}