Skip to content

Commit a3e024a

Browse files
committed
fixes #115
1 parent c916f14 commit a3e024a

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,7 @@ CreateTable CreateTable():
21592159
List columnSpecs = null;
21602160
List<String> tableOptions = new ArrayList<String>();
21612161
List<String> createOptions = new ArrayList<String>();
2162-
Token columnName;
2162+
String columnName;
21632163
Token tk = null;
21642164
Token tk2 = null;
21652165
Token tk3 = null;
@@ -2186,9 +2186,7 @@ CreateTable CreateTable():
21862186
table=Table()
21872187
[
21882188
("("
2189-
(columnName=<S_IDENTIFIER>
2190-
|
2191-
columnName=<S_QUOTED_IDENTIFIER>)
2189+
columnName=RelObjectName()
21922190

21932191
colDataType = ColDataType()
21942192
{
@@ -2199,7 +2197,7 @@ CreateTable CreateTable():
21992197

22002198
{
22012199
coldef = new ColumnDefinition();
2202-
coldef.setColumnName(columnName.image);
2200+
coldef.setColumnName(columnName);
22032201
coldef.setColDataType(colDataType);
22042202
if (columnSpecs.size() > 0)
22052203
coldef.setColumnSpecStrings(columnSpecs);
@@ -2272,9 +2270,8 @@ CreateTable CreateTable():
22722270
)
22732271
|
22742272
(
2275-
(columnName=<S_IDENTIFIER>
2276-
|
2277-
columnName=<S_QUOTED_IDENTIFIER>)
2273+
columnName=RelObjectName()
2274+
22782275
colDataType = ColDataType()
22792276
{
22802277
columnSpecs = new ArrayList();
@@ -2284,7 +2281,7 @@ CreateTable CreateTable():
22842281

22852282
{
22862283
coldef = new ColumnDefinition();
2287-
coldef.setColumnName(columnName.image);
2284+
coldef.setColumnName(columnName);
22882285
coldef.setColDataType(colDataType);
22892286
if (columnSpecs.size() > 0)
22902287
coldef.setColumnSpecStrings(columnSpecs);

src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ public void testCreateTableIfNotExists() throws JSQLParserException {
115115
public void testCreateTableInlinePrimaryKey() throws JSQLParserException {
116116
assertSqlCanBeParsedAndDeparsed("CREATE TABLE animals (id INT PRIMARY KEY NOT NULL)");
117117
}
118+
119+
public void testCreateTableWithRange() throws JSQLParserException {
120+
assertSqlCanBeParsedAndDeparsed("CREATE TABLE foo (name character varying (255), range character varying (255), start_range integer, end_range integer)");
121+
}
122+
123+
public void testCreateTableWithKey() throws JSQLParserException {
124+
assertSqlCanBeParsedAndDeparsed("CREATE TABLE bar (key character varying (255) NOT NULL)");
125+
}
118126

119127
public void testRUBiSCreateList() throws Exception {
120128
BufferedReader in = new BufferedReader(new InputStreamReader(CreateTableTest.class.getResourceAsStream("/RUBiS-create-requests.txt")));

0 commit comments

Comments
 (0)