fixes #334

Author: wumpz

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

@@ -86,15 +86,18 @@ public void setLimitAll(boolean b) {
 
 	@Override
 	public String toString() {
-		String retVal = "";
+		String retVal = " LIMIT ";
 		if (limitNull) {
-            retVal += " LIMIT NULL";
-        } else if (rowCount >= 0 || rowCountJdbcParameter) {
-			retVal += " LIMIT " + (rowCountJdbcParameter ? "?" : Long.toString(rowCount));
-		}
-		if (offset > 0 || offsetJdbcParameter) {
-			retVal += " OFFSET " + (offsetJdbcParameter ? "?" : Long.toString(offset));
-		}
+            retVal += "NULL";
+        } else {
+            if (offset > 0 || offsetJdbcParameter) {
+                retVal += (offsetJdbcParameter ? "?" : Long.toString(offset)) + ", ";
+    		}
+            if ( rowCount >= 0 || rowCountJdbcParameter) {
+                retVal += (rowCountJdbcParameter ? "?" : Long.toString(rowCount));
+            }
+        }
+		
 		return retVal;
 	}
 }

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

@@ -32,21 +32,20 @@ public LimitDeparser(StringBuilder buffer) {
     }
 
     public void deParse(Limit limit) {
-        if (limit.isRowCountJdbcParameter()) {
-            buffer.append(" LIMIT ");
-            buffer.append("?");
-        } else if (limit.getRowCount() >= 0) {
-            buffer.append(" LIMIT ");
-            buffer.append(limit.getRowCount());
-        } else if (limit.isLimitNull()) {
-            buffer.append(" LIMIT NULL");
+        buffer.append(" LIMIT ");
+        if (limit.isLimitNull()) {
+            buffer.append("NULL");
+        } else {
+            if (limit.isOffsetJdbcParameter()) {
+                buffer.append("?, ");
+            } else if (limit.getOffset() != 0) {
+                buffer.append(limit.getOffset()).append(", ");
+            }
+            
+            if (limit.isRowCountJdbcParameter()) {
+                buffer.append("?");
+            } else if (limit.getRowCount() >= 0) {
+                buffer.append(limit.getRowCount());
+            }
         }
-
-        if (limit.isOffsetJdbcParameter()) {
-            buffer.append(" OFFSET ?");
-        } else if (limit.getOffset() != 0) {
-            buffer.append(" OFFSET ").append(limit.getOffset());
-        }
-    }
-
-}
+    }}

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

@@ -579,7 +579,7 @@ public void testSelectItems() throws JSQLParserException {
 
     public void testUnion() throws JSQLParserException {
         String statement = "SELECT * FROM mytable WHERE mytable.col = 9 UNION "
-                + "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION " + "SELECT * FROM mytable2 LIMIT 3,4";
+                + "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION " + "SELECT * FROM mytable2 LIMIT 3, 4";
 
         Select select = (Select) parserManager.parse(new StringReader(statement));
         SetOperationList setList = (SetOperationList) select.getSelectBody();
@@ -593,9 +593,31 @@ public void testUnion() throws JSQLParserException {
         // use standard limit syntax
         String statementToString = "SELECT * FROM mytable WHERE mytable.col = 9 UNION "
                 + "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION "
-                + "SELECT * FROM mytable2 LIMIT 4 OFFSET 3";
+                + "SELECT * FROM mytable2 LIMIT 3, 4";
         assertStatementCanBeDeparsedAs(select, statementToString);
     }
+    
+    public void testUnion2() throws JSQLParserException {
+        String statement = "SELECT * FROM mytable WHERE mytable.col = 9 UNION "
+                + "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION " + "SELECT * FROM mytable2 LIMIT 3 OFFSET 4";
+
+        Select select = (Select) parserManager.parse(new StringReader(statement));
+        SetOperationList setList = (SetOperationList) select.getSelectBody();
+        assertEquals(3, setList.getSelects().size());
+        assertEquals("mytable", ((Table) ((PlainSelect) setList.getSelects().get(0)).getFromItem()).getName());
+        assertEquals("mytable3", ((Table) ((PlainSelect) setList.getSelects().get(1)).getFromItem()).getName());
+        assertEquals("mytable2", ((Table) ((PlainSelect) setList.getSelects().get(2)).getFromItem()).getName());
+        assertEquals(0, ((PlainSelect) setList.getSelects().get(2)).getLimit().getOffset());
+        assertEquals(4, ((PlainSelect) setList.getSelects().get(2)).getOffset().getOffset());
+
+        // use brakets for toString
+        // use standard limit syntax
+        String statementToString = "SELECT * FROM mytable WHERE mytable.col = 9 UNION "
+                + "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION "
+                + "SELECT * FROM mytable2 LIMIT 3 OFFSET 4";
+        assertStatementCanBeDeparsedAs(select, statementToString);
+    }
+    
 
     public void testDistinct() throws JSQLParserException {
         String statement = "SELECT DISTINCT ON (myid) myid, mycol FROM mytable WHERE mytable.col = 9";