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

[#6485] Better support for ALTER TABLE .. DROP COLUMN:

Browse Source 
- Make COLUMN keyword optional
- Allow for dropping more than one column (#5319)
- Allow for optional parentheses around column(s)
This commit is contained in:
lukaseder 2017-12-07 15:02:50 +01:00
parent 3d2f24ff4b
commit 8f7ff41c42
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1855,12 +1855,33 @@ class ParserImpl implements Parser {
case 'd':
case 'D':
if (parseKeywordIf(ctx, "DROP")) {
if (parseKeywordIf(ctx, "COLUMN")) {
if (parseKeywordIf(ctx, "CONSTRAINT")) {
Name constraint = parseIdentifier(ctx);
return s1.dropConstraint(constraint);
}
else {
parseKeywordIf(ctx, "COLUMN");
boolean parens = parseIf(ctx, '(');
Field<?> field = parseFieldName(ctx);
List<Field<?>> fields = null;
while (parseIf(ctx, ',')) {
if (fields == null) {
fields = new ArrayList<Field<?>>();
fields.add(field);
}
fields.add(parseFieldName(ctx));
}
if (parens)
parse(ctx, ')');
boolean cascade = parseKeywordIf(ctx, "CASCADE");
boolean restrict = !cascade && parseKeywordIf(ctx, "RESTRICT");
AlterTableDropStep s2 = s1.dropColumn(field);
AlterTableDropStep s2 = fields == null ? s1.dropColumn(field) : s1.dropColumns(fields);
AlterTableFinalStep s3 =
cascade
? s2.cascade()
@ -1869,11 +1890,6 @@ class ParserImpl implements Parser {
: s2;
return s3;
}
else if (parseKeywordIf(ctx, "CONSTRAINT")) {
Name constraint = parseIdentifier(ctx);
return s1.dropConstraint(constraint);
}
}
break;