merge ddl target handling

open-telemetry · Feb 28, 2024 · 1711c80 · 1711c80
1 parent 63c805d
commit 1711c80
Showing 1 changed file with 2 additions and 46 deletions.
diff --git a/instrumentation-api-incubator/src/main/jflex/SqlSanitizer.jflex b/instrumentation-api-incubator/src/main/jflex/SqlSanitizer.jflex
@@ -439,54 +439,10 @@ WHITESPACE          = [ \t\r\n]+
           appendCurrentFragment();
           if (isOverLimit()) return YYEOF;
       }
-  "TABLE"  {
-          if (!insideComment && !extractionDone) {
-              if (operation.expectingOperationTarget()) {
-                extractionDone = operation.handleOperationTarget("TABLE");
-              } else {
-                extractionDone = operation.handleIdentifier();
-              }
-          }
-          appendCurrentFragment();
-          if (isOverLimit()) return YYEOF;
-      }
-  "INDEX"  {
-          if (!insideComment && !extractionDone) {
-          if (operation.expectingOperationTarget()) {
-              extractionDone = operation.handleOperationTarget("INDEX");
-            } else {
-              extractionDone = operation.handleIdentifier();
-            }
-          }
-          appendCurrentFragment();
-          if (isOverLimit()) return YYEOF;
-      }
-  "DATABASE"  {
-          if (!insideComment && !extractionDone) {
-            if (operation.expectingOperationTarget()) {
-              extractionDone = operation.handleOperationTarget("DATABASE");
-            } else {
-              extractionDone = operation.handleIdentifier();
-            }
-          }
-          appendCurrentFragment();
-          if (isOverLimit()) return YYEOF;
-      }
-  "PROCEDURE" {
-          if (!insideComment && !extractionDone) {
-            if (operation.expectingOperationTarget()) {
-              extractionDone = operation.handleOperationTarget("PROCEDURE");
-            } else {
-              extractionDone = operation.handleIdentifier();
-            }
-          }
-          appendCurrentFragment();
-          if (isOverLimit()) return YYEOF;
-      }
-  "VIEW" {
+  "TABLE" | "INDEX" | "DATABASE" | "PROCEDURE" | "VIEW" {
           if (!insideComment && !extractionDone) {
             if (operation.expectingOperationTarget()) {
-              extractionDone = operation.handleOperationTarget("VIEW");
+              extractionDone = operation.handleOperationTarget(yytext());
             } else {
               extractionDone = operation.handleIdentifier();
             }