Author: wumpz

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

@@ -692,7 +692,22 @@ String RelObjectNameExt():
   String result=null;
 } 
 {
-    ( result=RelObjectName() | tk=<K_LEFT> | tk=<K_RIGHT> | tk=<K_SET> )
+    ( result=RelObjectName() | tk=<K_LEFT> | tk=<K_RIGHT> | tk=<K_SET>)
+    {
+        if (tk!=null) result=tk.image;
+        return result;
+    }
+}
+
+/*
+Extended usage of object names - part 2.
+*/
+String RelObjectNameExt2():
+{ Token tk = null;
+  String result=null;
+} 
+{
+    ( result=RelObjectNameExt() | tk=<K_TOP>)
     {
         if (tk!=null) result=tk.image;
         return result;
@@ -2093,13 +2108,13 @@ JdbcNamedParameter JdbcNamedParameter() : {
 
 UserVariable UserVariable() : {
     UserVariable var = new UserVariable();
-	Token token;
+	String varName;
 }
 {
     ("@" | "@@" { var.setDoubleAdd(true);} )
-    token=<S_IDENTIFIER> 
+    varName=RelObjectNameExt2() 
     { 
-        var.setName(token.image); 
+        var.setName(varName); 
         return var; 
     }
 }

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -2195,4 +2195,8 @@ public void testTopExpressionIssue243() throws JSQLParserException {
     public void testTopExpressionIssue243_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT TOP (CAST(? AS INT)) * FROM MyTable");
     }
+    
+    public void testKeywordTop() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT @top");
+    }
 }