fixes #612

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/JdbcNamedParameter.java

@@ -31,11 +31,13 @@ public class JdbcNamedParameter extends ASTNodeAccessImpl implements Expression
 
     private String name;
 
-    /**
-     * The name of the parameter
-     *
-     * @return the name of the parameter
-     */
+    public JdbcNamedParameter() {
+    }
+
+    public JdbcNamedParameter(String name) {
+        this.name = name;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -21,6 +21,8 @@
  */
 package net.sf.jsqlparser.statement.select;
 
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.JdbcNamedParameter;
 import net.sf.jsqlparser.expression.JdbcParameter;
 
 /**
@@ -29,7 +31,7 @@
 public class Offset {
 
     private long offset;
-    private JdbcParameter offsetJdbcParameter = null;
+    private Expression offsetJdbcParameter = null;
     private String offsetParam = null;
 
     public long getOffset() {
@@ -48,13 +50,17 @@ public void setOffsetParam(String s) {
         offsetParam = s;
     }
 
-    public JdbcParameter getOffsetJdbcParameter() {
+    public Expression getOffsetJdbcParameter() {
         return offsetJdbcParameter;
     }
 
     public void setOffsetJdbcParameter(JdbcParameter jdbc) {
         offsetJdbcParameter = jdbc;
     }
+    
+    public void setOffsetJdbcParameter(JdbcNamedParameter jdbc) {
+        offsetJdbcParameter = jdbc;
+    }
 
     @Override
     public String toString() {

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -1745,6 +1745,16 @@ JdbcParameter SimpleJdbcParameter() : {
     }
 }
 
+JdbcNamedParameter SimpleJdbcNamedParameter() : {
+    Token token;
+}
+{
+    ":" token = <S_IDENTIFIER>
+    {
+        return new JdbcNamedParameter(token.image);
+    }
+}
+
 Limit LimitWithOffset() #LimitWithOffset:
 {
     Limit limit = new Limit();
@@ -1813,14 +1823,16 @@ Offset Offset():
     Offset offset = new Offset();
     Token token = null;
     JdbcParameter jdbc;
+    JdbcNamedParameter jdbcNamed;
 }
 {
     (
             // postgresql-> OFFSET offset
             // sqlserver-oracle-> OFFSET offset (ROW | ROWS)
              <K_OFFSET>
                  (token=<S_LONG> { offset.setOffset(Long.parseLong(token.image)); }
-                 | jdbc = SimpleJdbcParameter() { offset.setOffsetJdbcParameter(jdbc); } ) 
+                 | jdbc = SimpleJdbcParameter() { offset.setOffsetJdbcParameter(jdbc); } 
+                 | jdbcNamed = SimpleJdbcNamedParameter() { offset.setOffsetJdbcParameter(jdbcNamed); }) 
                  [(<K_ROWS> { offset.setOffsetParam("ROWS"); } | <K_ROW> { offset.setOffsetParam("ROW"); })]
 
         )

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

@@ -3166,4 +3166,9 @@ public void testSqlContainIsNullFunctionShouldBeParsed() throws JSQLParserExcept
     public void testNestedCast() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT acolumn::bit (64)::bigint FROM mytable");
     }
+    
+     @Test
+    public void testNamedParametersIssue612() throws Exception {
+        assertSqlCanBeParsedAndDeparsed( "SELECT a FROM b LIMIT 10 OFFSET :param");
+    }
 }