Limit: properly retain 'ALL' in queries with 'LIMIT ALL' (#904)

Author: sivaraam

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

@@ -57,11 +57,15 @@ public String toString() {
         if (limitNull) {
             retVal += "NULL";
         } else {
-            if (null != offset) {
-                retVal += offset + ", ";
-            }
-            if (null != rowCount) {
-                retVal += rowCount;
+            if (limitAll) {
+                retVal += "ALL";
+            } else {
+                if (null != offset) {
+                    retVal += offset + ", ";
+                }
+                if (null != rowCount) {
+                    retVal += rowCount;
+                }
             }
         }
 

src/main/java/net/sf/jsqlparser/util/deparser/LimitDeparser.java

@@ -24,12 +24,16 @@ public void deParse(Limit limit) {
         if (limit.isLimitNull()) {
             buffer.append("NULL");
         } else {
-            if (null != limit.getOffset()) {
-                buffer.append(limit.getOffset()).append(", ");
-            }
+            if (limit.isLimitAll()) {
+                buffer.append("ALL");
+            } else {
+                if (null != limit.getOffset()) {
+                    buffer.append(limit.getOffset()).append(", ");
+                }
 
-            if (null != limit.getRowCount()) {
-                buffer.append(limit.getRowCount());
+                if (null != limit.getRowCount()) {
+                    buffer.append(limit.getRowCount());
+                }
             }
         }
     }

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

@@ -339,6 +339,18 @@ public void testLimit2() throws JSQLParserException {
         assertTrue(((PlainSelect) select.getSelectBody()).getLimit().isLimitNull());
         assertSqlCanBeParsedAndDeparsed(statement);
 
+        statement = "SELECT * FROM mytable WHERE mytable.col = 9 LIMIT ALL OFFSET 5";
+        select = (Select) parserManager.parse(new StringReader(statement));
+        offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();
+        rowCount = ((PlainSelect) select.getSelectBody()).getLimit().getRowCount();
+
+        assertNull(offset);
+        assertNull(rowCount);
+        assertEquals(5, ((PlainSelect) select.getSelectBody()).getOffset().getOffset());
+        assertTrue(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());
+        assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitNull());
+        assertSqlCanBeParsedAndDeparsed(statement);
+
         statement = "SELECT * FROM mytable WHERE mytable.col = 9 LIMIT 0 OFFSET 3";
         select = (Select) parserManager.parse(new StringReader(statement));
         offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();