fix

alexvolha · alexvolha · commit 449c4401e1c6 · 2024-10-21T11:28:13.000+03:00
diff --git a/uncoder-core/app/translator/core/str_value_manager.py b/uncoder-core/app/translator/core/str_value_manager.py
@@ -182,7 +182,11 @@ class StrValueManager:
     container_spec_symbols_map: ClassVar[dict[type[BaseSpecSymbol], str]] = CONTAINER_SPEC_SYMBOLS_MAP
 
     @staticmethod
-    def from_str_to_container(value: str, escape_symbol: Optional[str] = None) -> StrValue:  # noqa: ARG004
+    def from_str_to_container(
+        value: str,
+        value_type: str = ValueType.value,  # noqa: ARG004
+        escape_symbol: Optional[str] = None,  # noqa: ARG004
+    ) -> StrValue:
         return StrValue(value=value, split_value=[value])
 
     def from_re_str_to_container(self, value: str) -> StrValue:
diff --git a/uncoder-core/app/translator/platforms/base/aql/str_value_manager.py b/uncoder-core/app/translator/platforms/base/aql/str_value_manager.py
@@ -55,7 +55,12 @@ class AQLStrValueManager(StrValueManager):
         "%": UnboundLenWildCard,
     }
 
-    def from_str_to_container(self, value: str, escape_symbol: Optional[str] = None) -> StrValue:  # noqa: ARG002
+    def from_str_to_container(
+        self,
+        value: str,
+        value_type: str = ValueType.value,  # noqa: ARG002
+        escape_symbol: Optional[str] = None,  # noqa: ARG002
+    ) -> StrValue:
         split = []
         prev_char = None
         for char in value:
diff --git a/uncoder-core/app/translator/platforms/base/lucene/str_value_manager.py b/uncoder-core/app/translator/platforms/base/lucene/str_value_manager.py
@@ -19,6 +19,7 @@
 
 from typing import ClassVar, Optional
 
+from app.translator.core.custom_types.values import ValueType
 from app.translator.core.str_value_manager import (
     BaseSpecSymbol,
     ReAnySymbol,
@@ -68,7 +69,12 @@ class LuceneStrValueManager(StrValueManager):
     }
     re_str_spec_symbols_map = RE_STR_SPEC_SYMBOLS_MAP
 
-    def from_str_to_container(self, value: str, escape_symbol: Optional[str] = None) -> StrValue:  # noqa: ARG002
+    def from_str_to_container(
+        self,
+        value: str,
+        value_type: str = ValueType.value,  # noqa: ARG002
+        escape_symbol: Optional[str] = None,  # noqa: ARG002
+    ) -> StrValue:
         split = []
         prev_char = None
         for char in value:
diff --git a/uncoder-core/app/translator/platforms/base/spl/str_value_manager.py b/uncoder-core/app/translator/platforms/base/spl/str_value_manager.py
@@ -18,6 +18,7 @@
 """
 from typing import ClassVar, Optional
 
+from app.translator.core.custom_types.values import ValueType
 from app.translator.core.str_value_manager import BaseSpecSymbol, StrValue, StrValueManager, UnboundLenWildCard
 from app.translator.platforms.base.spl.escape_manager import spl_escape_manager
 
@@ -26,7 +27,12 @@ class SplStrValueManager(StrValueManager):
     escape_manager = spl_escape_manager
     str_spec_symbols_map: ClassVar[dict[str, type[BaseSpecSymbol]]] = {"*": UnboundLenWildCard}
 
-    def from_str_to_container(self, value: str, escape_symbol: Optional[str] = None) -> StrValue:  # noqa: ARG002
+    def from_str_to_container(
+        self,
+        value: str,
+        value_type: str = ValueType.value,  # noqa: ARG002
+        escape_symbol: Optional[str] = None,  # noqa: ARG002
+    ) -> StrValue:
         split = []
         prev_char = None
         for char in value:
diff --git a/uncoder-core/app/translator/platforms/base/sql/str_value_manager.py b/uncoder-core/app/translator/platforms/base/sql/str_value_manager.py
@@ -20,7 +20,6 @@
 import copy
 from typing import ClassVar, Optional
 
-from app.translator.core.custom_types.values import ValueType
 from app.translator.core.str_value_manager import (
     CONTAINER_SPEC_SYMBOLS_MAP,
     RE_STR_SPEC_SYMBOLS_MAP,
@@ -34,6 +33,7 @@
     StrValueManager,
     UnboundLenWildCard,
 )
+from app.translator.platforms.base.sql.custom_types.values import SQLValueType
 from app.translator.platforms.base.sql.escape_manager import sql_escape_manager
 
 SQL_CONTAINER_SPEC_SYMBOLS_MAP = copy.copy(CONTAINER_SPEC_SYMBOLS_MAP)
@@ -55,7 +55,9 @@ class SQLStrValueManager(StrValueManager):
         "%": UnboundLenWildCard,
     }
 
-    def from_str_to_container(self, value: str, escape_symbol: Optional[str] = None) -> StrValue:
+    def from_str_to_container(
+        self, value: str, value_type: str = SQLValueType.value, escape_symbol: Optional[str] = None
+    ) -> StrValue:
         split = []
         prev_char = None
         for char in value:
@@ -71,7 +73,7 @@ def from_str_to_container(self, value: str, escape_symbol: Optional[str] = None)
                     split.append(char)
                     prev_char = None
                     continue
-            elif char in ("'", "_", "%"):
+            elif char in ("'", "_", "%") and value_type == SQLValueType.like_value:
                 if escape_symbol and prev_char == escape_symbol:
                     split.append(char)
                 elif char in self.str_spec_symbols_map:
@@ -87,13 +89,13 @@ def from_re_str_to_container(self, value: str) -> StrValue:
         value = value.replace("''", "'")
         return super().from_re_str_to_container(value)
 
-    def from_container_to_str(self, container: StrValue, value_type: str = ValueType.value) -> str:
+    def from_container_to_str(self, container: StrValue, value_type: str = SQLValueType.value) -> str:
         result = ""
         for el in container.split_value:
             if isinstance(el, str):
                 result += self.escape_manager.escape(el, value_type)
             elif isinstance(el, BaseSpecSymbol):
-                if value_type == ValueType.regex_value:
+                if value_type == SQLValueType.regex_value:
                     if isinstance(el, SingleSymbolWildCard):
                         result += "."
                         continue
diff --git a/uncoder-core/app/translator/platforms/base/sql/tokenizer.py b/uncoder-core/app/translator/platforms/base/sql/tokenizer.py
@@ -26,6 +26,7 @@
 from app.translator.core.models.query_tokens.identifier import Identifier
 from app.translator.core.models.query_tokens.keyword import Keyword
 from app.translator.core.tokenizer import QueryTokenizer
+from app.translator.platforms.base.sql.custom_types.values import SQLValueType
 from app.translator.platforms.base.sql.str_value_manager import sql_str_value_manager
 from app.translator.tools.utils import get_match_group
 
@@ -72,7 +73,11 @@ def get_operator_and_value(
 
         if (s_q_value := get_match_group(match, group_name=ValueType.single_quotes_value)) is not None:
             escape_symbol = get_match_group(match, group_name=_ESCAPE_SYMBOL_GROUP_NAME)
-            return mapped_operator, self.str_value_manager.from_str_to_container(s_q_value, escape_symbol=escape_symbol)
+            should_process_value_wildcards = self.should_process_value_wildcards(operator)
+            value_type = SQLValueType.like_value if should_process_value_wildcards else SQLValueType.value
+            return mapped_operator, self.str_value_manager.from_str_to_container(
+                s_q_value, value_type=value_type, escape_symbol=escape_symbol
+            )
 
         return super().get_operator_and_value(match, mapped_operator, operator)
 
diff --git a/uncoder-core/app/translator/platforms/elasticsearch/str_value_manager.py b/uncoder-core/app/translator/platforms/elasticsearch/str_value_manager.py
@@ -18,6 +18,7 @@
 """
 from typing import ClassVar, Optional
 
+from app.translator.core.custom_types.values import ValueType
 from app.translator.core.str_value_manager import (
     BaseSpecSymbol,
     ReDigitalSymbol,
@@ -42,7 +43,12 @@ class ESQLStrValueManager(StrValueManager):
 class EQLStrValueManager(StrValueManager):
     str_spec_symbols_map: ClassVar[dict[str, type[BaseSpecSymbol]]] = {"*": SingleSymbolWildCard}
 
-    def from_str_to_container(self, value: str, escape_symbol: Optional[str] = None) -> StrValue:  # noqa: ARG002
+    def from_str_to_container(
+        self,
+        value: str,
+        value_type: str = ValueType.value,  # noqa: ARG002
+        escape_symbol: Optional[str] = None,  # noqa: ARG002
+    ) -> StrValue:
         split = [self.str_spec_symbols_map[char]() if char in self.str_spec_symbols_map else char for char in value]
         return StrValue(value, self._concat(split))
 
diff --git a/uncoder-core/app/translator/platforms/sigma/str_value_manager.py b/uncoder-core/app/translator/platforms/sigma/str_value_manager.py
@@ -18,6 +18,7 @@
 """
 from typing import Optional
 
+from app.translator.core.custom_types.values import ValueType
 from app.translator.core.str_value_manager import (
     RE_STR_SPEC_SYMBOLS_MAP,
     ReDigitalSymbol,
@@ -43,7 +44,12 @@ class SigmaStrValueManager(StrValueManager):
     }
     re_str_spec_symbols_map = RE_STR_SPEC_SYMBOLS_MAP
 
-    def from_str_to_container(self, value: str, escape_symbol: Optional[str] = None) -> StrValue:  # noqa: ARG002
+    def from_str_to_container(
+        self,
+        value: str,
+        value_type: str = ValueType.value,  # noqa: ARG002
+        escape_symbol: Optional[str] = None  # noqa: ARG002
+    ) -> StrValue:
         split = []
         prev_char = None
         for char in value:
