Skip to content

Commit 25fa311

Browse files
committed
started describe
some cleanup
1 parent 5818085 commit 25fa311

File tree

1 file changed

+2
-33
lines changed

1 file changed

+2
-33
lines changed

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,8 @@ Statement SingleStatement() :
433433
stm = Commit()
434434
|
435435
stm = Comment()
436+
|
437+
stm = Describe()
436438
)
437439
{ return stm; }
438440
} catch (ParseException e) {
@@ -1014,34 +1016,9 @@ Column Column() #Column :
10141016
List<String> data = new ArrayList<String>();
10151017
}
10161018
{
1017-
/* token = RelObjectName() { data.add(token); }
1018-
( LOOKAHEAD (2) "." ("." { data.add(null); })* token = RelObjectName() { data.add(token); } ) *
1019-
*/
10201019
data = RelObjectNameList()
10211020

1022-
/*columnName = RelObjectName()
1023-
( "." [LOOKAHEAD(2) token = RelObjectName()] { tableName = columnName; columnName = token; token = null;}
1024-
( "." token = RelObjectName() { schemaName = tableName; tableName = columnName; columnName = token; token = null;}
1025-
( "." token = RelObjectName() { databaseName = schemaName; schemaName = tableName; tableName = columnName; columnName = token; }
1026-
)?
1027-
)?
1028-
)?
1029-
*/
1030-
1031-
/*(
1032-
LOOKAHEAD(7) databaseName=RelObjectName() "." [schemaName=RelObjectName()] "." tableName=RelObjectName() "." columnName=RelObjectName()
1033-
| LOOKAHEAD(5) schemaName=RelObjectName() "." tableName=RelObjectName() "." columnName=RelObjectName()
1034-
| LOOKAHEAD(3) tableName=RelObjectName() "." columnName=RelObjectName()
1035-
| columnName=RelObjectName()
1036-
)*/
1037-
10381021
{
1039-
/*if (tableName==null && (databaseName!=null || schemaName!=null)) {
1040-
throw generateParseException();
1041-
}*/
1042-
1043-
//final Database database = new Database(databaseName);
1044-
//final Table table = new Table(database, schemaName, tableName);
10451022
Column col = new Column(data);
10461023
linkAST(col,jjtThis);
10471024
return col;
@@ -1126,15 +1103,7 @@ Table Table() #Table :
11261103
token = RelObjectName() { data.add(token); }
11271104
( LOOKAHEAD(2) "." ("." { data.add(null); })* token = RelObjectName() { data.add(token); } ) *
11281105

1129-
/* (
1130-
LOOKAHEAD(7) serverName=RelObjectName() "." [databaseName=RelObjectName()] "." [schemaName=RelObjectName()] "." tableName=RelObjectName()
1131-
| LOOKAHEAD(5) databaseName=RelObjectName() "." [schemaName=RelObjectName()] "." tableName=RelObjectName()
1132-
| LOOKAHEAD(3) schemaName=RelObjectName() "." tableName=RelObjectName()
1133-
| tableName=RelObjectName()
1134-
)*/
11351106
{
1136-
//final Server server = new Server(serverName);
1137-
//final Database database = new Database(server, databaseName);
11381107
Table table = new Table(data);
11391108
return table;
11401109
}

0 commit comments

Comments
 (0)