Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/main/java/net/sf/jsqlparser/schema/Sequence.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
*/
package net.sf.jsqlparser.schema;

import net.sf.jsqlparser.parser.ASTNodeAccessImpl;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;

/**
* Represents the database type for a {@code SEQUENCE}
Expand All @@ -29,6 +28,7 @@ public class Sequence extends ASTNodeAccessImpl implements MultiPartName {
private List<String> partItems = new ArrayList<>();

private List<Parameter> parameters;
private String dataType;

public Sequence() {}

Expand All @@ -45,6 +45,19 @@ public void setParameters(List<Parameter> parameters) {
this.parameters = parameters;
}

public String getDataType() {
return dataType;
}

public void setDataType(String dataType) {
this.dataType = dataType;
}

public Sequence withDataType(String dataType) {
this.setDataType(dataType);
return this;
}

public Database getDatabase() {
return new Database(getIndex(DATABASE_IDX));
}
Expand Down Expand Up @@ -129,6 +142,9 @@ public String getUnquotedName() {
@Override
public String toString() {
StringBuilder sql = new StringBuilder(getFullyQualifiedName());
if (dataType != null) {
sql.append(" AS ").append(dataType);
}
if (parameters != null) {
for (Sequence.Parameter parameter : parameters) {
sql.append(" ").append(parameter.formatParameter());
Expand Down
2 changes: 2 additions & 0 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -11500,9 +11500,11 @@ CreateSequence CreateSequence():
CreateSequence createSequence = new CreateSequence();
Sequence sequence;
List<Sequence.Parameter> sequenceParameters;
Token dataType = null;
}
{
<K_SEQUENCE> sequence=Sequence() { createSequence.setSequence(sequence); }
[ <K_AS> ( dataType=<S_IDENTIFIER> | dataType=<DATA_TYPE> ) { sequence.setDataType(dataType.image); } ]
sequenceParameters = SequenceParameters()
{
sequence.setParameters(sequenceParameters);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
*/
package net.sf.jsqlparser.statement.create;

import static net.sf.jsqlparser.test.TestUtils.*;

import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.schema.Database;
import net.sf.jsqlparser.schema.Sequence;
import net.sf.jsqlparser.schema.Sequence.Parameter;
import net.sf.jsqlparser.schema.Sequence.ParameterType;
import net.sf.jsqlparser.statement.create.sequence.CreateSequence;
import static net.sf.jsqlparser.test.TestUtils.*;
import org.junit.jupiter.api.Test;

public class CreateSequenceTest {
Expand Down Expand Up @@ -143,4 +144,20 @@ public void testCreateSequence_preservesParamOrder() throws JSQLParserException
statement);
}

@Test
public void testCreateSequence_withAsDataType() throws JSQLParserException {
String statement =
"CREATE SEQUENCE public.activites_activite_id_seq AS integer START WITH 1 INCREMENT BY 1 NOMINVALUE NOMAXVALUE CACHE 1";
assertSqlCanBeParsedAndDeparsed(statement);
}

@Test
public void testCreateSequence_withAsDataTypeSimple() throws JSQLParserException {
String statement = "CREATE SEQUENCE my_seq AS integer";
assertSqlCanBeParsedAndDeparsed(statement);
assertDeparse(new CreateSequence().withSequence(
new Sequence().withName("my_seq").withDataType("integer")),
statement);
}

}