fix(grammar): SET isn't always a reserved keyword, it can be used as …

…a object name
felipebz · Jun 23, 2024 · 6fc3fe1 · 6fc3fe1
1 parent a2b45d2
commit 6fc3fe1
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 9 deletions.
diff --git a/zpa-checks/src/integrationTest/resources/expected/oracle-database_23/ParsingErrorCheck.json b/zpa-checks/src/integrationTest/resources/expected/oracle-database_23/ParsingErrorCheck.json
@@ -1521,7 +1521,7 @@
     2
   ],
   "sqlrf/ALTER-TABLE-8.sql" : [
-    4
+    3
   ],
   "sqlrf/ALTER-TABLE-81.sql" : [
     2

diff --git a/zpa-checks/src/integrationTest/resources/expected/pljson/DbmsOutputPutCheck.json b/zpa-checks/src/integrationTest/resources/expected/pljson/DbmsOutputPutCheck.json
@@ -84,6 +84,13 @@
     197,
     371
   ],
+  "src/addons/pljson_object_cache.impl.sql" : [
+    42,
+    43,
+    44,
+    45,
+    46
+  ],
   "src/addons/pljson_util_pkg.package.sql" : [
     345,
     346,

diff --git a/zpa-checks/src/integrationTest/resources/expected/pljson/ExplicitInParameterCheck.json b/zpa-checks/src/integrationTest/resources/expected/pljson/ExplicitInParameterCheck.json
@@ -164,6 +164,24 @@
     464,
     464
   ],
+  "src/addons/pljson_object_cache.decl.sql" : [
+    19,
+    20,
+    26,
+    26,
+    27,
+    28,
+    28
+  ],
+  "src/addons/pljson_object_cache.impl.sql" : [
+    7,
+    17,
+    55,
+    55,
+    66,
+    82,
+    82
+  ],
   "src/addons/pljson_table_impl.type.decl.sql" : [
     131,
     131,

diff --git a/zpa-checks/src/integrationTest/resources/expected/pljson/ParsingErrorCheck.json b/zpa-checks/src/integrationTest/resources/expected/pljson/ParsingErrorCheck.json
@@ -1,11 +1,5 @@
 {
   "examples/ex_pljson_table.sql" : [
     200
-  ],
-  "src/addons/pljson_object_cache.decl.sql" : [
-    28
-  ],
-  "src/addons/pljson_object_cache.impl.sql" : [
-    82
   ]
 }
diff --git a/zpa-checks/src/integrationTest/resources/expected/pljson/ReturnOfBooleanExpressionCheck.json b/zpa-checks/src/integrationTest/resources/expected/pljson/ReturnOfBooleanExpressionCheck.json
@@ -0,0 +1,5 @@
+{
+  "src/addons/pljson_object_cache.impl.sql" : [
+    19
+  ]
+}
diff --git a/zpa-checks/src/integrationTest/resources/expected/pljson/UnnecessaryElseCheck.json b/zpa-checks/src/integrationTest/resources/expected/pljson/UnnecessaryElseCheck.json
@@ -2,6 +2,10 @@
   "src/addons/pljson_helper.package.sql" : [
     243
   ],
+  "src/addons/pljson_object_cache.impl.sql" : [
+    21,
+    77
+  ],
   "src/addons/pljson_table_impl.type.impl.sql" : [
     380,
     656

diff --git a/zpa-core/src/main/kotlin/org/sonar/plugins/plsqlopen/api/DmlGrammar.kt b/zpa-core/src/main/kotlin/org/sonar/plugins/plsqlopen/api/DmlGrammar.kt
@@ -198,7 +198,7 @@ enum class DmlGrammar : GrammarRuleKey {
                             OBJECT_REFERENCE
                         ),
                         b.optional(NESTED_CLAUSE),
-                        b.optional(b.nextNot(b.firstOf(PARTITION, CROSS, USING, FULL, NATURAL, INNER, LEFT, RIGHT, OUTER, JOIN, RETURN, RETURNING, LOG, EXCEPT)),
+                        b.optional(b.nextNot(b.firstOf(PARTITION, CROSS, USING, FULL, NATURAL, INNER, LEFT, RIGHT, OUTER, JOIN, RETURN, RETURNING, LOG, EXCEPT, SET)),
                             b.optional(AS),
                             ALIAS
                         )

diff --git a/zpa-core/src/main/kotlin/org/sonar/plugins/plsqlopen/api/PlSqlKeyword.kt b/zpa-core/src/main/kotlin/org/sonar/plugins/plsqlopen/api/PlSqlKeyword.kt
@@ -84,7 +84,6 @@ enum class PlSqlKeyword(override val value: String, val isReserved: Boolean = fa
     RESOURCE("resource", true),
     REVOKE("revoke", true),
     SELECT("select", true),
-    SET("set", true),
     SHARE("share", true),
     SIZE("size", true),
     SMALLINT("smallint"),
@@ -465,6 +464,7 @@ enum class PlSqlKeyword(override val value: String, val isReserved: Boolean = fa
     SECOND("second"),
     SEGMENT("segment"),
     SELF("self"),
+    SET("set"),
     SEQUENCE("sequence"),
     SERIALIZABLE("serializable"),
     SERIALLY_REUSABLE("serially_reusable"),