Skip to content
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.

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

feat(hogql): better error if placeholder in HogQL expression #14153

Merged
merged 9 commits into from
Feb 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions posthog/hogql/hogql.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@


def translate_hogql(query: str, context: HogQLContext, dialect: Literal["hogql", "clickhouse"] = "clickhouse") -> str:
"""Translate a HogQL expression into a Clickhouse expression."""
"""Translate a HogQL expression into a Clickhouse expression. Raises if any placeholders found."""
if query == "":
raise ValueError("Empty query")

try:
if context.select_team_id:
node = parse_select(query)
node = parse_select(query, no_placeholders=True)
else:
node = parse_expr(query)
node = parse_expr(query, no_placeholders=True)
except SyntaxError as err:
raise ValueError(f"SyntaxError: {err.msg}")
except NotImplementedError as err:
Expand Down
11 changes: 8 additions & 3 deletions posthog/hogql/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,27 @@
from posthog.hogql.grammar.HogQLLexer import HogQLLexer
from posthog.hogql.grammar.HogQLParser import HogQLParser
from posthog.hogql.parse_string import parse_string, parse_string_literal
from posthog.hogql.placeholders import replace_placeholders
from posthog.hogql.placeholders import assert_no_placeholders, replace_placeholders


def parse_expr(expr: str, placeholders: Optional[Dict[str, ast.Expr]] = None) -> ast.Expr:
def parse_expr(expr: str, placeholders: Optional[Dict[str, ast.Expr]] = None, no_placeholders=False) -> ast.Expr:
parse_tree = get_parser(expr).expr()
node = HogQLParseTreeConverter().visit(parse_tree)
if placeholders:
return replace_placeholders(node, placeholders)
elif no_placeholders:
assert_no_placeholders(node)

return node


def parse_select(statement: str, placeholders: Optional[Dict[str, ast.Expr]] = None) -> ast.Expr:
def parse_select(statement: str, placeholders: Optional[Dict[str, ast.Expr]] = None, no_placeholders=False) -> ast.Expr:
parse_tree = get_parser(statement).select()
node = HogQLParseTreeConverter().visit(parse_tree)
if placeholders:
node = replace_placeholders(node, placeholders)
elif no_placeholders:
assert_no_placeholders(node)
return node


Expand Down
9 changes: 9 additions & 0 deletions posthog/hogql/placeholders.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,12 @@ def visit_placeholder(self, node):
if node.field in self.placeholders:
return self.placeholders[node.field]
raise ValueError(f"Placeholder '{node.field}' not found in provided dict: {', '.join(list(self.placeholders))}")


def assert_no_placeholders(node: ast.Expr):
AssertNoPlaceholders().visit(node)


class AssertNoPlaceholders(EverythingVisitor):
def visit_placeholder(self, node):
raise ValueError(f"Placeholder '{node.field}' not allowed in this context")
17 changes: 16 additions & 1 deletion posthog/hogql/test/test_placeholders.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from posthog.hogql import ast
from posthog.hogql.parser import parse_expr
from posthog.hogql.placeholders import replace_placeholders
from posthog.hogql.placeholders import assert_no_placeholders, replace_placeholders
from posthog.test.base import BaseTest


Expand All @@ -17,6 +17,15 @@ def test_replace_placeholders_simple(self):
ast.Constant(value="bar"),
)

def test_replace_placeholders_error(self):
expr = ast.Placeholder(field="foo")
with self.assertRaises(ValueError) as context:
replace_placeholders(expr, {})
self.assertTrue("Placeholder 'foo' not found in provided dict:" in str(context.exception))
with self.assertRaises(ValueError) as context:
replace_placeholders(expr, {"bar": ast.Constant(value=123)})
self.assertTrue("Placeholder 'foo' not found in provided dict: bar" in str(context.exception))

def test_replace_placeholders_comparison(self):
expr = parse_expr("timestamp < {timestamp}")
self.assertEqual(
Expand All @@ -36,3 +45,9 @@ def test_replace_placeholders_comparison(self):
right=ast.Constant(value=123),
),
)

def test_assert_no_placeholders(self):
expr = ast.Placeholder(field="foo")
with self.assertRaises(ValueError) as context:
assert_no_placeholders(expr)
self.assertTrue("Placeholder 'foo' not allowed in this context" in str(context.exception))