Skip to content

Commit

Permalink
[#7171] [#7203] DDLDatabase fails with order in Index statements
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaseder committed Feb 20, 2018
1 parent 54c79f9 commit 15cd970
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
Expand Up @@ -230,6 +230,7 @@
import static org.jooq.impl.Tools.EMPTY_FIELD; import static org.jooq.impl.Tools.EMPTY_FIELD;
import static org.jooq.impl.Tools.EMPTY_NAME; import static org.jooq.impl.Tools.EMPTY_NAME;
import static org.jooq.impl.Tools.EMPTY_QUERYPART; import static org.jooq.impl.Tools.EMPTY_QUERYPART;
import static org.jooq.impl.Tools.EMPTY_SORTFIELD;
import static org.jooq.tools.StringUtils.defaultIfNull; import static org.jooq.tools.StringUtils.defaultIfNull;


import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
Expand Down Expand Up @@ -2680,7 +2681,7 @@ private static final DDLQuery parseCreateIndex(ParserContext ctx, boolean unique
parseKeyword(ctx, "ON"); parseKeyword(ctx, "ON");
Table<?> tableName = parseTableName(ctx); Table<?> tableName = parseTableName(ctx);
parse(ctx, '('); parse(ctx, '(');
Field<?>[] fieldNames = Tools.fieldsByName(parseIdentifiers(ctx).toArray(EMPTY_NAME)); SortField<?>[] fields = parseSortSpecification(ctx).toArray(EMPTY_SORTFIELD);
parse(ctx, ')'); parse(ctx, ')');
Condition condition = parseKeywordIf(ctx, "WHERE") Condition condition = parseKeywordIf(ctx, "WHERE")
? parseCondition(ctx) ? parseCondition(ctx)
Expand All @@ -2699,7 +2700,7 @@ private static final DDLQuery parseCreateIndex(ParserContext ctx, boolean unique
? ctx.dsl.createIndex() ? ctx.dsl.createIndex()
: ctx.dsl.createIndex(indexName); : ctx.dsl.createIndex(indexName);


CreateIndexWhereStep s2 = s1.on(tableName, fieldNames); CreateIndexWhereStep s2 = s1.on(tableName, fields);
CreateIndexFinalStep s3 = condition != null CreateIndexFinalStep s3 = condition != null
? s2.where(condition) ? s2.where(condition)
: s2; : s2;
Expand Down

0 comments on commit 15cd970

Please sign in to comment.