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

[#7412] [#7171] Support parsing CREATE INDEX .. INCLUDE syntax

Browse Source
This commit is contained in:
lukaseder 2018-04-12 18:07:06 +02:00
parent 26cc27c57b
commit 07cdead29d
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,8 @@ break
;
createIndexStatement = 'CREATE' [ 'UNIQUE' ] 'INDEX' [ 'IF NOT EXISTS' ] [ indexName ] break
'ON' tableName '(' identifiers ')'
'ON' tableName '(' sortFields ')'
[ 'INCLUDE' '(' identifiers ')' ]
[ 'WHERE' condition ]
;

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

@ -279,6 +279,7 @@ import org.jooq.Constraint;
import org.jooq.ConstraintForeignKeyOnStep;
import org.jooq.ConstraintTypeStep;
import org.jooq.CreateIndexFinalStep;
import org.jooq.CreateIndexIncludeStep;
import org.jooq.CreateIndexStep;
import org.jooq.CreateIndexWhereStep;
import org.jooq.CreateTableAsStep;
@ -3051,11 +3052,18 @@ final class ParserImpl implements Parser {
parse(ctx, '(');
SortField<?>[] fields = parseSortSpecification(ctx).toArray(EMPTY_SORTFIELD);
parse(ctx, ')');
Name[] include = null;
if (parseKeywordIf(ctx, "INCLUDE")) {
parse(ctx, '(');
include = parseIdentifiers(ctx).toArray(EMPTY_NAME);
parse(ctx, ')');
}
Condition condition = parseKeywordIf(ctx, "WHERE")
? parseCondition(ctx)
: null;
CreateIndexStep s1 = ifNotExists
? unique
? ctx.dsl.createUniqueIndexIfNotExists(indexName)
@ -3068,12 +3076,15 @@ final class ParserImpl implements Parser {
? ctx.dsl.createIndex()
: ctx.dsl.createIndex(indexName);
CreateIndexWhereStep s2 = s1.on(tableName, fields);
CreateIndexFinalStep s3 = condition != null
? s2.where(condition)
CreateIndexIncludeStep s2 = s1.on(tableName, fields);
CreateIndexWhereStep s3 = include != null
? s2.include(include)
: s2;
CreateIndexFinalStep s4 = condition != null
? s3.where(condition)
: s3;
return s3;
return s4;
}
private static final DDLQuery parseAlterDomain(ParserContext ctx) {