feat: JdbcNamedParameter allows "&" (instead of ":")

manticore-projects · manticore-projects · commit c07a43b3c128 · 2023-05-11T16:05:28.000+07:00
- fixes #1785
diff --git a/build.gradle b/build.gradle
@@ -150,8 +150,6 @@ test {
     // set heap size for the test JVM(s)
     minHeapSize = "128m"
     maxHeapSize = "1G"
-
-    finalizedBy check
 }
 
 jacocoTestReport {
diff --git a/src/main/java/net/sf/jsqlparser/expression/JdbcNamedParameter.java b/src/main/java/net/sf/jsqlparser/expression/JdbcNamedParameter.java
@@ -12,16 +12,24 @@
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 public class JdbcNamedParameter extends ASTNodeAccessImpl implements Expression {
-
+    private String parameterCharacter = ":";
     private String name;
 
-    public JdbcNamedParameter() {
-    }
+    public JdbcNamedParameter() {}
 
     public JdbcNamedParameter(String name) {
         this.name = name;
     }
 
+    public String getParameterCharacter() {
+        return parameterCharacter;
+    }
+
+    public JdbcNamedParameter setParameterCharacter(String parameterCharacter) {
+        this.parameterCharacter = parameterCharacter;
+        return this;
+    }
+
     public String getName() {
         return name;
     }
@@ -37,7 +45,7 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
     @Override
     public String toString() {
-        return ":" + name;
+        return parameterCharacter + name;
     }
 
     public JdbcNamedParameter withName(String name) {
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -3623,7 +3623,7 @@ Expression BitwiseAndOr():
 {
     leftExpression=AdditiveExpression()  { result = leftExpression; }
     (
-        (
+        LOOKAHEAD(2) (
             "|" { result = new BitwiseOr(); }
             |
             "&" { result = new BitwiseAnd(); }
@@ -3918,7 +3918,7 @@ JdbcNamedParameter JdbcNamedParameter() : {
     String namePart;
 }
 {
-    ":"
+    (":" | "&" { parameter.setParameterCharacter("&"); } )
     name=IdentifierChain()
     {
         parameter.setName(name);
diff --git a/src/test/java/net/sf/jsqlparser/expression/JdbcNamedParameterTest.java b/src/test/java/net/sf/jsqlparser/expression/JdbcNamedParameterTest.java
@@ -0,0 +1,33 @@
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class JdbcNamedParameterTest {
+    @Test
+    void testDoubleColon() throws JSQLParserException {
+        String sqlStr = "select :test";
+        PlainSelect select = (PlainSelect) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+        assertTrue(select.getSelectItems().get(0).getExpression() instanceof JdbcNamedParameter);
+    }
+
+    @Test
+    void testAmpersand() throws JSQLParserException {
+        String sqlStr = "select &test, 'a & b', a & b";
+        PlainSelect select = (PlainSelect) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+        assertTrue(select.getSelectItems().get(0).getExpression() instanceof JdbcNamedParameter);
+        assertTrue(select.getSelectItems().get(2).getExpression() instanceof BitwiseAnd);
+    }
+
+    @Test
+    void testIssue1785() throws JSQLParserException {
+        String sqlStr = "select * from all_tables\n"
+                + "where owner = &myowner";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,6 @@ test {`
`150`	`150`	`// set heap size for the test JVM(s)`
`151`	`151`	`minHeapSize = "128m"`
`152`	`152`	`maxHeapSize = "1G"`
`153`		`-`
`154`		`- finalizedBy check`
`155`	`153`	`}`
`156`	`154`
`157`	`155`	`jacocoTestReport {`
Original file line number	Diff line number	Diff line change
`@@ -3623,7 +3623,7 @@ Expression BitwiseAndOr():`
`3623`	`3623`	`{`
`3624`	`3624`	`leftExpression=AdditiveExpression() { result = leftExpression; }`
`3625`	`3625`	`(`
`3626`		`- (`
	`3626`	`+ LOOKAHEAD(2) (`
`3627`	`3627`	`"\|" { result = new BitwiseOr(); }`
`3628`	`3628`	`\|`
`3629`	`3629`	`"&" { result = new BitwiseAnd(); }`
`@@ -3918,7 +3918,7 @@ JdbcNamedParameter JdbcNamedParameter() : {`
`3918`	`3918`	`String namePart;`
`3919`	`3919`	`}`
`3920`	`3920`	`{`
`3921`		`- ":"`
	`3921`	`+ (":" \| "&" { parameter.setParameterCharacter("&"); } )`
`3922`	`3922`	`name=IdentifierChain()`
`3923`	`3923`	`{`
`3924`	`3924`	`parameter.setName(name);`