Merge pull request pmd#3928 from LiGaOg:master

[plsql] Fix plsql parsing error in parenthesis groups pmd#3928
sfdcsteve · Apr 21, 2022 · a6d8c1b · a6d8c1b
2 parents be2618b + cb4b981
commit a6d8c1b
Show file tree

Hide file tree

Showing 11 changed files with 826 additions and 64 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -6594,6 +6594,15 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "LiGaOg",
+      "name": "LiGaOg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72175888?v=4",
+      "profile": "https://github.com/LiGaOg",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
@@ -18,18 +18,19 @@ This is a {{ site.pmd.release_type }} release.
 * core
   * [#3881](https://github.com/pmd/pmd/issues/3881): \[core] SARIF renderer depends on platform default encoding
   * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
+  * [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice
 * doc
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
-
-*   core
-    *   [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice
+* plsql
+  * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
 
 ### API Changes
 
 ### External Contributions
 * [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
+* [#3928](https://github.com/pmd/pmd/pull/3928): \[plsql] Fix plsql parsing error in parenthesis groups - [@LiGaOg](https://github.com/LiGaOg)
 
 {% endtocmaker %}
 
diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -2124,7 +2124,11 @@ void QueryTableExpression() #void :
   |
     TableCollectionExpression()
   |
-    [ <LATERAL> ] "(" Subquery() [ SubqueryRestrictionClause() ] ")"
+    LOOKAHEAD(5) "(" [ LOOKAHEAD(2) SchemaName() "." ] TableName() [TableAlias()] ")"  
+  |  
+    LOOKAHEAD(5) [ <LATERAL> ] "(" Subquery() [ SubqueryRestrictionClause() ] ")"
+  | 
+    "(" JoinClause() ")"
   )
 }
 

diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
@@ -0,0 +1,40 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.plsql.ast;
+
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
+import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper;
+
+public class ParenthesisGroupTest extends BaseTreeDumpTest {
+
+    public ParenthesisGroupTest() {
+        super(new RelevantAttributePrinter(), ".pls");
+    }
+
+    @Override
+    public BaseParsingHelper<?, ?> getParser() {
+        return PlsqlParsingHelper.WITH_PROCESSING.withResourceContext(getClass());
+    }
+
+    @Test
+    public void parseParenthesisGroup0() {
+        doTest("ParenthesisGroup0");
+    }
+
+    @Test
+    public void parseParenthesisGroup1() {
+        doTest("ParenthesisGroup1");
+    }
+
+    @Test
+    public void parseParenthesisGroup2() {
+        doTest("ParenthesisGroup2");
+    }
+
+}
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
@@ -0,0 +1,21 @@
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   CURSOR c_example IS
+      SELECT a.owner, u.object_name, p.aggregate
+        FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
+               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id
+               INNER JOIN (ALL_PROCEDURES p) ON
+               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type
+       WHERE a.owner = USER;
+   --
+BEGIN
+   --
+   FOR l_object IN c_example LOOP
+      --
+      DBMS_OUTPUT.Put_Line(l_object.owner);
+      DBMS_OUTPUT.Put_Line(l_object.object_name);
+      DBMS_OUTPUT.Put_Line(l_object.aggregate);
+      --
+   END LOOP;
+   --
+END EXAMPLE_PROCEDURE;
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls
@@ -0,0 +1,21 @@
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   CURSOR c_example IS
+      SELECT a.owner, u.object_name, p.aggregate
+        FROM (((USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
+               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)
+               INNER JOIN (ALL_PROCEDURES p) ON
+               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type)
+       WHERE a.owner = USER;
+   --
+BEGIN
+   --
+   FOR l_object IN c_example LOOP
+      --
+      DBMS_OUTPUT.Put_Line(l_object.owner);
+      DBMS_OUTPUT.Put_Line(l_object.object_name);
+      DBMS_OUTPUT.Put_Line(l_object.aggregate);
+      --
+   END LOOP;
+   --
+END EXAMPLE_PROCEDURE;