fix(grammar): Fix parsing of "in (subquery)"

felipebz · Jul 25, 2024 · 78cfa6a · 78cfa6a
1 parent 0dc3f66
commit 78cfa6a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/zpa-core/src/main/kotlin/org/sonar/plugins/plsqlopen/api/PlSqlGrammar.kt b/zpa-core/src/main/kotlin/org/sonar/plugins/plsqlopen/api/PlSqlGrammar.kt
@@ -792,7 +792,13 @@ enum class PlSqlGrammar : GrammarRuleKey {
                     b.optional(b.sequence(
                             b.optional(NOT), IN,
                             b.firstOf(
-                                    b.sequence(LPARENTHESIS, EXPRESSION, b.zeroOrMore(COMMA, EXPRESSION), RPARENTHESIS),
+                                    b.sequence(
+                                        LPARENTHESIS,
+                                        b.firstOf(
+                                            SELECT_EXPRESSION,
+                                            b.sequence(EXPRESSION, b.zeroOrMore(COMMA, EXPRESSION)),
+                                        ),
+                                        RPARENTHESIS),
                                     EXPRESSION)))).skipIfOneChild()
 
             b.rule(EXISTS_EXPRESSION).define(EXISTS, LPARENTHESIS, SELECT_EXPRESSION, RPARENTHESIS).skipIfOneChild()

diff --git a/zpa-core/src/test/kotlin/org/sonar/plugins/plsqlopen/api/expressions/OtherExpressionTest.kt b/zpa-core/src/test/kotlin/org/sonar/plugins/plsqlopen/api/expressions/OtherExpressionTest.kt
@@ -88,4 +88,10 @@ class OtherExpressionTest : RuleTest() {
         assertThat(p).matches("foo(1)(1)")
     }
 
+    @Test
+    fun InExpressionShouldNotMatchAdditionalExpressions() {
+        setRootRule(PlSqlGrammar.IN_EXPRESSION)
+        assertThat(p).notMatches("var in (select 1 from dual) and x = y")
+    }
+
 }