Merge pull request #81 from LionelNirva/patch2

wumpz · wumpz · commit c743ad4f4cb3 · 2014-10-22T22:58:12.000+02:00
Support for SQL Server and Oracle OFFSET ... FETCH ... clauses
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Fetch.java b/src/main/java/net/sf/jsqlparser/statement/select/Fetch.java
@@ -0,0 +1,70 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.statement.select;
+
+/**
+ * A fetch clause in the form FETCH (FIRST | NEXT) row_count (ROW | ROWS) ONLY
+ */
+public class Fetch {
+
+	private long rowCount;
+	private boolean fetchJdbcParameter = false;
+    private boolean isFetchParamFirst = false;
+	private String fetchParam = "ROW";
+
+	public long getRowCount() {
+		return rowCount;
+	}
+
+	public void setRowCount(long l) {
+		rowCount = l;
+	}
+
+	public boolean isFetchJdbcParameter() {
+		return fetchJdbcParameter;
+	}
+
+    public String getFetchParam() {
+		return fetchParam;
+	}
+
+	public boolean isFetchParamFirst() {
+		return isFetchParamFirst;
+	}
+
+	public void setFetchJdbcParameter(boolean b) {
+		fetchJdbcParameter = b;
+	}
+
+	public void setFetchParam(String s) {
+		this.fetchParam = s;
+	}
+
+	public void setFetchParamFirst(boolean b) {
+		this.isFetchParamFirst = b;
+	}
+
+	@Override
+	public String toString() {
+		return " FETCH " + (isFetchParamFirst ? "FIRST" : "NEXT") + " " + (fetchJdbcParameter ? "?" : rowCount + "") + " "+ fetchParam + " ONLY";
+	}
+}
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/Offset.java b/src/main/java/net/sf/jsqlparser/statement/select/Offset.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.statement.select;
+
+/**
+ * An offset clause in the form OFFSET offset
+ * or in the form OFFSET offset (ROW | ROWS)
+ */
+public class Offset {
+
+	private long offset;
+	private boolean offsetJdbcParameter = false;
+	private String offsetParam = null;
+
+	public long getOffset() {
+		return offset;
+	}
+
+	public String getOffsetParam() {
+		return offsetParam;
+	}
+
+	public void setOffset(long l) {
+		offset = l;
+	}
+
+	public void setOffsetParam(String s) {
+		offsetParam = s;
+	}
+
+	public boolean isOffsetJdbcParameter() {
+		return offsetJdbcParameter;
+	}
+
+	public void setOffsetJdbcParameter(boolean b) {
+		offsetJdbcParameter = b;
+	}
+
+	@Override
+	public String toString() {
+		return " OFFSET " + (offsetJdbcParameter ? "?" : offset) + (offsetParam != null ? " "+offsetParam : "");
+	}
+}
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java b/src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java
@@ -45,6 +45,8 @@ public class PlainSelect implements SelectBody {
     private List<OrderByElement> orderByElements;
     private Expression having;
     private Limit limit;
+    private Offset offset;
+    private Fetch fetch;
     private Top top;
     private OracleHierarchicalExpression oracleHierarchical = null;
     private boolean oracleSiblings = false;
@@ -133,6 +135,22 @@ public void setLimit(Limit limit) {
         this.limit = limit;
     }
 
+    public Offset getOffset() {
+        return offset;
+    }
+
+    public void setOffset(Offset offset) {
+        this.offset = offset;
+    }
+
+    public Fetch getFetch() {
+        return fetch;
+    }
+
+    public void setFetch(Fetch fetch) {
+        this.fetch = fetch;
+    }
+
     public Top getTop() {
         return top;
     }
@@ -236,6 +254,12 @@ public String toString() {
             if (limit != null) {
                 sql.append(limit);
             }
+            if (offset != null) {
+            	sql.append(offset);
+            }
+            if (fetch != null) {
+            	sql.append(fetch);
+            }
         }
         return sql.toString();
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SetOperationList.java b/src/main/java/net/sf/jsqlparser/statement/select/SetOperationList.java
@@ -36,6 +36,8 @@ public class SetOperationList implements SelectBody {
 	private List<SetOperation> operations;
 	private List<OrderByElement> orderByElements;
 	private Limit limit;
+	private Offset offset;
+	private Fetch fetch;
 
 	@Override
 	public void accept(SelectVisitor selectVisitor) {
@@ -75,6 +77,22 @@ public void setLimit(Limit limit) {
 		this.limit = limit;
 	}
 
+	public Offset getOffset() {
+		return offset;
+	}
+
+	public void setOffset(Offset offset) {
+		this.offset = offset;
+	}
+
+	public Fetch getFetch() {
+		return fetch;
+	}
+
+	public void setFetch(Fetch fetch) {
+		this.fetch = fetch;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder buffer = new StringBuilder();
@@ -92,6 +110,12 @@ public String toString() {
 		if (limit != null) {
 			buffer.append(limit.toString());
 		}
+		if (offset != null) {
+			buffer.append(offset.toString());
+		}
+		if (fetch != null) {
+			buffer.append(fetch.toString());
+		}
 		return buffer.toString();
 	}
 
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -134,6 +134,12 @@ public void visit(PlainSelect plainSelect) {
         if (plainSelect.getLimit() != null) {
             deparseLimit(plainSelect.getLimit());
         }
+        if (plainSelect.getOffset() != null) {
+            deparseOffset(plainSelect.getOffset());
+        }
+        if (plainSelect.getFetch() != null) {
+            deparseFetch(plainSelect.getFetch());
+        }
 
     }
 
@@ -266,6 +272,38 @@ public void deparseLimit(Limit limit) {
 
     }
 
+    public void deparseOffset(Offset offset) {
+        // OFFSET offset
+    	// or OFFSET offset (ROW | ROWS)
+        if (offset.isOffsetJdbcParameter()) {
+            buffer.append(" OFFSET ?");
+        } else if (offset.getOffset() != 0) {
+            buffer.append(" OFFSET ");
+            buffer.append(offset.getOffset());
+        }
+        if (offset.getOffsetParam() != null) {
+        	buffer.append(" ").append(offset.getOffsetParam());
+        }
+
+    }
+
+    public void deparseFetch(Fetch fetch) {
+        // FETCH (FIRST | NEXT) row_count (ROW | ROWS) ONLY
+    	buffer.append(" FETCH ");
+    	if (fetch.isFetchParamFirst()) {
+    		buffer.append("FIRST ");
+    	} else {
+    		buffer.append("NEXT ");
+    	}
+    	if (fetch.isFetchJdbcParameter()) {
+    		buffer.append("?");
+    	} else {
+    		buffer.append(fetch.getRowCount());
+    	}
+    	buffer.append(" ").append(fetch.getFetchParam()).append(" ONLY");
+
+    }
+
     public StringBuilder getBuffer() {
         return buffer;
     }
@@ -359,6 +397,12 @@ public void visit(SetOperationList list) {
         if (list.getLimit() != null) {
             deparseLimit(list.getLimit());
         }
+        if (list.getOffset() != null) {
+            deparseOffset(list.getOffset());
+        }
+        if (list.getFetch() != null) {
+            deparseFetch(list.getFetch());
+        }
     }
 
     @Override
diff --git a/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj b/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj
diff --git a/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java
