Added PERCENT support for the TOP statement;

Author: Pap Lőrinc

src/main/java/net/sf/jsqlparser/statement/select/Top.java

@@ -29,6 +29,7 @@ public class Top {
     private long rowCount;
     private boolean rowCountJdbcParameter = false;
     private boolean hasParenthesis = false;
+    private boolean isPercentage = false;
 
     public long getRowCount() {
         return rowCount;
@@ -55,6 +56,16 @@ public void setParenthesis(boolean hasParenthesis) {
         this.hasParenthesis = hasParenthesis;
     }
 
+    public boolean isPercentage()
+    {
+        return isPercentage;
+    }
+
+    public void setPercentage(boolean percentage)
+    {
+        this.isPercentage = percentage;
+    }
+
     @Override
     public String toString() {
         String result = "TOP ";
@@ -64,12 +75,16 @@ public String toString() {
         }
 
         result += rowCountJdbcParameter ? "?"
-                : rowCount;
+                                        : rowCount;
 
         if (hasParenthesis) {
             result += ")";
         }
 
+        if (isPercentage) {
+            result += " PERCENT";
+        }
+
         return result;
     }
 }

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

@@ -101,14 +101,15 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_IN:"IN">
 |   <K_OR:"OR">
 |   <K_ON:"ON">
-|   <K_ALL: "ALL">
-|   <K_AND: "AND">
-|   <K_ANY: "ANY">
-|   <K_KEY: "KEY">
+|   <K_ALL:"ALL">
+|   <K_AND:"AND">
+|   <K_ANY:"ANY">
+|   <K_KEY:"KEY">
 |   <K_NOT:"NOT">
 |   <K_SET:"SET">
 |   <K_ASC:"ASC">
 |   <K_TOP:"TOP">
+|   <K_PERCENT:"PERCENT">
 |   <K_END:"END">
 |   <K_DESC:"DESC">
 |   <K_INTO:"INTO">
@@ -1097,12 +1098,12 @@ Top Top():
 	   |
 	 	"?"                                 { top.setRowCountJdbcParameter(true);}
 	   |
-	   "(" 
-            ( token=<S_LONG>                { top.setRowCount(Long.parseLong(token.image)); } 
-              | "?"                         { top.setRowCountJdbcParameter(true);} ) 
+	   "("
+            ( token=<S_LONG>                { top.setRowCount(Long.parseLong(token.image)); }
+              | "?"                         { top.setRowCountJdbcParameter(true);} )
             { top.setParenthesis(true);}
        ")"
-	)
+	) [ <K_PERCENT>                         { top.setPercentage(true); } ]    // TODO how would you select a column called 'percent' if it was after the TOP expression?
 	{
 		return top;
 	}

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

@@ -266,18 +266,24 @@ public void testTop() throws JSQLParserException {
 	}
 
     public void testTopWithParenthesis() throws JSQLParserException {
-		final String statement = "SELECT TOP (5) PERCENT JobTitle, HireDate FROM HumanResources.Employee ORDER BY HireDate DESC";
+        final String firstColumnName = "alias.columnName1";
+        final String secondColumnName = "alias.columnName2";
+        final String statement = "SELECT TOP (5) PERCENT " + firstColumnName + ", " + secondColumnName + " FROM schemaName.tableName alias ORDER BY " + secondColumnName + " DESC";
         final Select select = (Select) parserManager.parse(new StringReader(statement));
 
-        assertEquals(5, ((PlainSelect) select.getSelectBody()).getTop().getRowCount());
-        assertStatementCanBeDeparsedAs(select, statement);
-    }
-    
-    public void testTopWithParenthesisJDBC() throws JSQLParserException {
-		final String statement = "SELECT TOP (?) col1 FROM mytab";
-        final Select select = (Select) parserManager.parse(new StringReader(statement));
+        final PlainSelect selectBody = (PlainSelect) select.getSelectBody();
+
+        final Top top = selectBody.getTop();
+        assertEquals(5, top.getRowCount());
+        assertFalse(top.isRowCountJdbcParameter());
+        assertTrue(top.hasParenthesis());
+        assertTrue(top.isPercentage());
+
+        final List<SelectItem> selectItems = selectBody.getSelectItems();
+        assertEquals(2, selectItems.size());
+        assertEquals(firstColumnName, selectItems.get(0).toString());
+        assertEquals(secondColumnName, selectItems.get(1).toString());
 
-        assertTrue(((PlainSelect) select.getSelectBody()).getTop().isRowCountJdbcParameter());
         assertStatementCanBeDeparsedAs(select, statement);
     }
 
@@ -551,7 +557,7 @@ public void testOrderBy() throws JSQLParserException {
 				((Column) plainSelect.getOrderByElements().get(0).getExpression())
 				.getFullyQualifiedName());
 		assertEquals("b",
-				((Column) plainSelect.getOrderByElements().get(1).getExpression()).getColumnName());
+                     ((Column) plainSelect.getOrderByElements().get(1).getExpression()).getColumnName());
 		assertTrue(plainSelect.getOrderByElements().get(1).isAsc());
 		assertFalse(plainSelect.getOrderByElements().get(0).isAsc());
 		assertStatementCanBeDeparsedAs(select, statementToString);
@@ -561,7 +567,7 @@ public void testOrderBy() throws JSQLParserException {
 		plainSelect = (PlainSelect) select.getSelectBody();
 		assertEquals(2, plainSelect.getOrderByElements().size());
 		assertEquals("a",
-				((Column) plainSelect.getOrderByElements().get(0).getExpression()).getColumnName());
+                     ((Column) plainSelect.getOrderByElements().get(0).getExpression()).getColumnName());
 		assertEquals(2,
 				((LongValue) plainSelect.getOrderByElements().get(1).getExpression()).getValue());
 		assertStatementCanBeDeparsedAs(select, statement);
@@ -696,23 +702,23 @@ public void testDouble2() throws JSQLParserException {
 		Select select = (Select) parserManager.parse(new StringReader(statement));
 
 		assertEquals(1e22, ((DoubleValue) ((SelectExpressionItem) ((PlainSelect) select.getSelectBody())
-				.getSelectItems().get(0)).getExpression()).getValue(), 0);
+                .getSelectItems().get(0)).getExpression()).getValue(), 0);
 	}
 
 	public void testDouble3() throws JSQLParserException {
 		String statement = "SELECT 1. FROM mytable";
 		Select select = (Select) parserManager.parse(new StringReader(statement));
 
 		assertEquals(1.0, ((DoubleValue) ((SelectExpressionItem) ((PlainSelect) select.getSelectBody())
-				.getSelectItems().get(0)).getExpression()).getValue(), 0);
+                .getSelectItems().get(0)).getExpression()).getValue(), 0);
 	}
 
 	public void testDouble4() throws JSQLParserException {
 		String statement = "SELECT 1.2e22 FROM mytable";
 		Select select = (Select) parserManager.parse(new StringReader(statement));
 
 		assertEquals(1.2e22, ((DoubleValue) ((SelectExpressionItem) ((PlainSelect) select.getSelectBody())
-				.getSelectItems().get(0)).getExpression()).getValue(), 0);
+                .getSelectItems().get(0)).getExpression()).getValue(), 0);
 	}
 
 	public void testWith() throws JSQLParserException {