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
21 changes: 20 additions & 1 deletion src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -10913,6 +10913,25 @@ CreateIndex CreateIndex():
}
}

List<String> ColumnDefinitionParameter(): {
Token tk = null;
List<String> parameter = new ArrayList<String>();
} {
(
parameter=CreateParameter()
|
(
tk=<K_DEFERRABLE>
| tk=<K_DISABLE>
| tk=<K_ENABLE>
| tk=<K_NOVALIDATE>
| tk=<K_VALIDATE>
)
{ parameter.add(tk.image); }
)
{ return parameter; }
}

ColumnDefinition ColumnDefinition(): {
ColumnDefinition coldef;
String columnName;
Expand All @@ -10922,7 +10941,7 @@ ColumnDefinition ColumnDefinition(): {
} {
columnName=RelObjectName()
colDataType=ColDataType()
( LOOKAHEAD(2) parameter=CreateParameter() { columnSpecs.addAll(parameter); } )*
( LOOKAHEAD(2) parameter=ColumnDefinitionParameter() { columnSpecs.addAll(parameter); } )*
{
coldef = new ColumnDefinition();
coldef.setColumnName(columnName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,36 @@ void testCreateTableColumnVisibility() throws JSQLParserException {
createTable.getColumnDefinitions().get(1).getColumnSpecs());
}

@Test
void testOracleInlineConstraintState() throws JSQLParserException {
String sqlStr =
"CREATE TABLE DIAM.IAM_DENEME1 ("
+ "ID VARCHAR2(36 BYTE) NOT NULL ENABLE,"
+ "REQUEST_ID VARCHAR2(50 BYTE),"
+ "CREATE_DATE TIMESTAMP(9),"
+ "USER_ID VARCHAR2(50 BYTE),"
+ "CODE VARCHAR2(100 BYTE) NOT NULL ENABLE,"
+ "IS_OUTSOURCE_ENABLED CHAR(1 BYTE) DEFAULT 1 NOT NULL ENABLE,"
+ "IS_PASSWORD_NUMERIC CHAR(1 BYTE) DEFAULT 0 NOT NULL ENABLE"
+ ")";

CreateTable createTable = (CreateTable) CCJSqlParserUtil.parse(sqlStr);

assertSqlCanBeParsedAndDeparsed(
"CREATE TABLE test ("
+ "a NUMBER NOT NULL ENABLE,"
+ "b NUMBER NOT NULL DISABLE,"
+ "c NUMBER NOT NULL ENABLE NOVALIDATE,"
+ "d NUMBER CONSTRAINT d_nn NOT NULL DEFERRABLE VALIDATE"
+ ")",
true);

assertEquals(Arrays.asList("NOT", "NULL", "ENABLE"),
createTable.getColumnDefinitions().get(0).getColumnSpecs());
assertEquals(Arrays.asList("DEFAULT", "1", "NOT", "NULL", "ENABLE"),
createTable.getColumnDefinitions().get(5).getColumnSpecs());
}

@Test
void testCreateTableIndexVisibilityWithOtherIndexOptions() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed(
Expand Down
Loading