feat(grammar): Accept "?" as a binding expression

felipebz · Jun 19, 2024 · 2f72915 · 2f72915
1 parent 4e7970d
commit 2f72915
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 7 deletions.
diff --git a/...ks/src/integrationTest/resources/expected/antlr-grammars-v4/IdenticalExpressionCheck.json b/...ks/src/integrationTest/resources/expected/antlr-grammars-v4/IdenticalExpressionCheck.json
@@ -15,6 +15,10 @@
     2,
     3
   ],
+  "examples/union07.sql" : [
+    23,
+    37
+  ],
   "examples/union09.sql" : [
     13,
     19

diff --git a/zpa-checks/src/integrationTest/resources/expected/antlr-grammars-v4/ParsingErrorCheck.json b/zpa-checks/src/integrationTest/resources/expected/antlr-grammars-v4/ParsingErrorCheck.json
@@ -452,9 +452,6 @@
   "examples/unified.sql" : [
     1
   ],
-  "examples/union07.sql" : [
-    24
-  ],
   "examples/validate_conversion.sql" : [
     3
   ],

diff --git a/...hecks/src/integrationTest/resources/expected/antlr-grammars-v4/SelectAllColumnsCheck.json b/...hecks/src/integrationTest/resources/expected/antlr-grammars-v4/SelectAllColumnsCheck.json
@@ -194,6 +194,12 @@
     24,
     28
   ],
+  "examples/union07.sql" : [
+    5,
+    6,
+    8,
+    11
+  ],
   "examples/union08.sql" : [
     1
   ],

diff --git a/...rc/integrationTest/resources/expected/antlr-grammars-v4/UnnecessaryAliasInQueryCheck.json b/...rc/integrationTest/resources/expected/antlr-grammars-v4/UnnecessaryAliasInQueryCheck.json
@@ -98,6 +98,10 @@
   "examples/select_all_some_any.sql" : [
     6
   ],
+  "examples/union07.sql" : [
+    36,
+    21
+  ],
   "examples/xmltable03.sql" : [
     6
   ],

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
@@ -451,9 +451,17 @@ enum class PlSqlGrammar : GrammarRuleKey {
         }
 
         private fun createStatements(b: PlSqlGrammarBuilder) {
-            b.rule(HOST_AND_INDICATOR_VARIABLE).define(COLON, b.firstOf(
-                b.sequence(IDENTIFIER_NAME, b.optional(INDICATOR), b.optional(COLON, IDENTIFIER_NAME)),
-                INTEGER_LITERAL))
+            b.rule(HOST_AND_INDICATOR_VARIABLE).define(
+                b.firstOf(
+                    b.sequence(
+                        COLON, b.firstOf(
+                            b.sequence(IDENTIFIER_NAME, b.optional(INDICATOR), b.optional(COLON, IDENTIFIER_NAME)),
+                            INTEGER_LITERAL
+                        )
+                    ),
+                    QUESTION_MARK
+                )
+            )
 
             b.rule(NULL_STATEMENT, NullStatement::class).define(NULL, SEMICOLON)
 

diff --git a/zpa-core/src/main/kotlin/org/sonar/plugins/plsqlopen/api/PlSqlPunctuator.kt b/zpa-core/src/main/kotlin/org/sonar/plugins/plsqlopen/api/PlSqlPunctuator.kt
@@ -52,7 +52,8 @@ enum class PlSqlPunctuator(override val value: String) : TokenType {
     TILDE("~"),
     CARET("^"),
     LBRACKET("["),
-    RBRACKET("]"),;
+    RBRACKET("]"),
+    QUESTION_MARK("?");
 
     override fun hasToBeSkippedFromAst(node: AstNode?) = false
 }
diff --git a/zpa-core/src/test/kotlin/org/sonar/plugins/plsqlopen/api/HostAndIndicatorVariableTest.kt b/zpa-core/src/test/kotlin/org/sonar/plugins/plsqlopen/api/HostAndIndicatorVariableTest.kt
@@ -50,4 +50,9 @@ class HostAndIndicatorVariableTest : RuleTest() {
         assertThat(p).matches(":var indicator :ind")
     }
 
+    @Test
+    fun matchesQuestionMarkBinding() {
+        assertThat(p).matches("?")
+    }
+
 }