diff --git a/src/main/java/net/sf/jsqlparser/schema/Sequence.java b/src/main/java/net/sf/jsqlparser/schema/Sequence.java index 2f813c1d7..083122434 100644 --- a/src/main/java/net/sf/jsqlparser/schema/Sequence.java +++ b/src/main/java/net/sf/jsqlparser/schema/Sequence.java @@ -158,7 +158,7 @@ public Sequence addParameters(Collection parameters) { * The available parameters to a sequence */ public enum ParameterType { - INCREMENT_BY, START_WITH, RESTART_WITH, MAXVALUE, NOMAXVALUE, MINVALUE, NOMINVALUE, CYCLE, NOCYCLE, CACHE, NOCACHE, ORDER, NOORDER, KEEP, NOKEEP, SESSION, GLOBAL; + INCREMENT_BY, INCREMENT, START_WITH, START, RESTART_WITH, MAXVALUE, NOMAXVALUE, MINVALUE, NOMINVALUE, CYCLE, NOCYCLE, CACHE, NOCACHE, ORDER, NOORDER, KEEP, NOKEEP, SESSION, GLOBAL; public static ParameterType from(String type) { return Enum.valueOf(ParameterType.class, type.toUpperCase()); @@ -189,8 +189,12 @@ public String formatParameter() { switch (option) { case INCREMENT_BY: return prefix("INCREMENT BY"); + case INCREMENT: + return prefix("INCREMENT"); case START_WITH: return prefix("START WITH"); + case START: + return prefix("START"); case RESTART_WITH: if (value != null) { return prefix("RESTART WITH"); diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index 36f60ed58..aaeea09c7 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -10209,23 +10209,33 @@ List SequenceParameters(): List sequenceParameters = new ArrayList(); Sequence.Parameter parameter = null; Token token = null; + Token byToken = null; + Token withToken = null; } { ( LOOKAHEAD(2) ( ( - token= + [ byToken= ] token= { - parameter = new Sequence.Parameter(Sequence.ParameterType.INCREMENT_BY); + if (byToken != null) { + parameter = new Sequence.Parameter(Sequence.ParameterType.INCREMENT_BY); + } else { + parameter = new Sequence.Parameter(Sequence.ParameterType.INCREMENT); + } parameter.setValue(Long.parseLong(token.image)); sequenceParameters.add(parameter); } ) | ( - token= + [ withToken= ] token= { - parameter = new Sequence.Parameter(Sequence.ParameterType.START_WITH); + if (withToken != null) { + parameter = new Sequence.Parameter(Sequence.ParameterType.START_WITH); + } else { + parameter = new Sequence.Parameter(Sequence.ParameterType.START); + } parameter.setValue(Long.parseLong(token.image)); sequenceParameters.add(parameter); } diff --git a/src/test/java/net/sf/jsqlparser/statement/create/CreateSequenceTest.java b/src/test/java/net/sf/jsqlparser/statement/create/CreateSequenceTest.java index db4e1984d..2ef0de36f 100644 --- a/src/test/java/net/sf/jsqlparser/statement/create/CreateSequenceTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/create/CreateSequenceTest.java @@ -39,11 +39,21 @@ public void testCreateSequence_withIncrement() throws JSQLParserException { statement); } + @Test + public void testCreateSequence_withIncrementPostres() throws JSQLParserException { + assertSqlCanBeParsedAndDeparsed("CREATE SEQUENCE db.schema.my_seq INCREMENT 1"); + } + @Test public void testCreateSequence_withStart() throws JSQLParserException { assertSqlCanBeParsedAndDeparsed("CREATE SEQUENCE my_seq START WITH 10"); } + @Test + public void testCreateSequence_withStartPostgres() throws JSQLParserException { + assertSqlCanBeParsedAndDeparsed("CREATE SEQUENCE my_seq START 10"); + } + @Test public void testCreateSequence_withMaxValue() throws JSQLParserException { assertSqlCanBeParsedAndDeparsed("CREATE SEQUENCE my_seq MAXVALUE 5");