Merge origin/master

Author: wumpz

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

@@ -376,6 +376,16 @@ public void testLimit3() throws JSQLParserException {
         assertNotNull(((JdbcParameter)rowCount).getIndex());
         assertFalse(((JdbcParameter)rowCount).isUseFixedIndex());
         assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());
+
+        statement = "SELECT * FROM mytable WHERE mytable.col = 9 LIMIT ?1";
+        select = (Select) parserManager.parse(new StringReader(statement));
+
+        offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();
+        rowCount = ((PlainSelect) select.getSelectBody()).getLimit().getRowCount();
+
+        assertNull(offset);
+        assertEquals(1, ((JdbcParameter)rowCount).getIndex().intValue());
+        assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());
     }
 
     public void testLimit4() throws JSQLParserException {
@@ -421,6 +431,14 @@ public void testLimit4() throws JSQLParserException {
         assertEquals(1, (int)(((JdbcParameter)rowCount).getIndex()));
         assertEquals("name1", (((JdbcNamedParameter)offset).getName()));
         assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());
+
+        statement = "SELECT * FROM mytable WHERE mytable.col = 9 LIMIT :param_name";
+        select = (Select) parserManager.parse(new StringReader(statement));
+        offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();
+        rowCount = ((PlainSelect) select.getSelectBody()).getLimit().getRowCount();
+        assertNull(offset);
+        assertEquals("param_name", (((JdbcNamedParameter)rowCount).getName()));
+        assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());
     }
 
     public void testLimitSqlServer1() throws JSQLParserException {