diff --git a/pyiceberg/expressions/parser.py b/pyiceberg/expressions/parser.py index d813bcaa07..67bdfce14a 100644 --- a/pyiceberg/expressions/parser.py +++ b/pyiceberg/expressions/parser.py @@ -107,9 +107,11 @@ def _(result: ParseResults) -> Reference: string = sgl_quoted_string.set_results_name("raw_quoted_string") decimal = common.real().set_results_name("decimal") integer = common.signed_integer().set_results_name("integer") -literal = Group(string | decimal | integer | boolean).set_results_name("literal") +literal = Group((string | decimal | integer | boolean).set_name("a literal value")).set_results_name("literal") literal_set = Group( - DelimitedList(string) | DelimitedList(decimal) | DelimitedList(integer) | DelimitedList(boolean) + (DelimitedList(string) | DelimitedList(decimal) | DelimitedList(integer) | DelimitedList(boolean)).set_name( + "a non-empty list of literals" + ) ).set_results_name("literal_set") diff --git a/tests/expressions/test_parser.py b/tests/expressions/test_parser.py index 581ee90b72..74a2e82a04 100644 --- a/tests/expressions/test_parser.py +++ b/tests/expressions/test_parser.py @@ -126,6 +126,18 @@ def test_not_equal_to() -> None: assert NotEqualTo("foo", 5) == parser.parse("5 <> foo") +@pytest.mark.parametrize( + ("expression", "message"), + [ + ("id =", "Expected a literal value"), + ("id IN ()", "Expected a non-empty list of literals"), + ], +) +def test_missing_literal_error(expression: str, message: str) -> None: + with pytest.raises(ParseException, match=message): + parser.parse(expression) + + def test_in() -> None: assert In("foo", {5, 6, 7}) == parser.parse("foo in (5, 6, 7)") assert In("foo", {"a", "b", "c"}) == parser.parse("foo IN ('a', 'b', 'c')")