Skip to content

Logscale escaping fix #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nazargesyk merged 1 commit into from
Jan 10, 2024
Merged

Logscale escaping fix #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion translator/app/translator/platforms/logscale/escape_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class LogscaleEscapeManager(EscapeManager):
escape_map = {
ValueType.value: EscapeDetails(pattern='(/|\+|\\\\|{|\[|\*|"|\(|\)(?![*?\\\\]))')
ValueType.value: EscapeDetails(pattern='(\\\\|/|\+|{|\[|\*|"|\(|\))')
}


Expand Down
10 changes: 6 additions & 4 deletions translator/app/translator/platforms/logscale/renders/logscale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
from typing import Union

from app.translator.const import DEFAULT_VALUE_TYPE
from app.translator.core.mapping import SourceMapping
from app.translator.core.models.parser_output import MetaInfoContainer
from app.translator.core.models.platform_details import PlatformDetails
from app.translator.core.render import BaseQueryFieldValue, BaseQueryRender
from app.translator.platforms.logscale.const import logscale_query_details
from app.translator.platforms.logscale.escape_manager import logscale_escape_manager
from app.translator.platforms.logscale.functions import LogScaleFunctions, log_scale_functions
from app.translator.platforms.logscale.mapping import LogScaleMappings, logscale_mappings
from app.translator.core.mapping import SourceMapping
from app.translator.core.models.platform_details import PlatformDetails
from app.translator.core.models.parser_output import MetaInfoContainer
from app.translator.core.render import BaseQueryRender, BaseQueryFieldValue


class LogScaleFieldValue(BaseQueryFieldValue):
Expand All @@ -41,6 +41,8 @@ def apply_field_name(self, field_name: str) -> str:
def equal_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
if isinstance(value, list):
return f"({self.or_token.join(self.equal_modifier(field=field, value=v) for v in value)})"
if value == "":
return f'{self.apply_field_name(field_name=field)}=""'
return f'{self.apply_field_name(field_name=field)}=/{self.apply_value(value)}/i'

def less_modifier(self, field: str, value: Union[int, str]) -> str:
Expand Down