From 191e4426a7ad1c1e1c01d0b49fa3b9b00dde73c7 Mon Sep 17 00:00:00 2001 From: Mateo Date: Thu, 11 Jun 2026 12:14:02 +0200 Subject: [PATCH 1/2] Fixed ASTString set scalars to None in time_agg --- src/vtlengine/AST/ASTString.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vtlengine/AST/ASTString.py b/src/vtlengine/AST/ASTString.py index 6cc31c54..dc3976cf 100644 --- a/src/vtlengine/AST/ASTString.py +++ b/src/vtlengine/AST/ASTString.py @@ -717,7 +717,10 @@ def visit_RenameNode(self, node: AST.RenameNode) -> str: return f"{node.old_name} to {node.new_name}" def visit_TimeAggregation(self, node: AST.TimeAggregation) -> str: - period_to = _handle_literal(node.period_to) + if node.period_to_ref is not None: + period_to = self.visit(node.period_to_ref) + else: + period_to = _handle_literal(node.period_to) operand = "" if node.operand is None else f", {self.visit(node.operand)}" if node.period_from is None: From 4bfd5e8e991c4d4aaedeb7852d01d00109bd48e0 Mon Sep 17 00:00:00 2001 From: Mateo Date: Thu, 11 Jun 2026 12:20:43 +0200 Subject: [PATCH 2/2] Added related tests --- tests/AST/data/prettier/reference_time_agg_ref.vtl | 4 ++++ tests/AST/data/prettier/time_agg_ref.vtl | 1 + tests/AST/data/vtl/time_agg_ref.vtl | 1 + tests/AST/test_AST_String.py | 2 ++ 4 files changed, 8 insertions(+) create mode 100644 tests/AST/data/prettier/reference_time_agg_ref.vtl create mode 100644 tests/AST/data/prettier/time_agg_ref.vtl create mode 100644 tests/AST/data/vtl/time_agg_ref.vtl diff --git a/tests/AST/data/prettier/reference_time_agg_ref.vtl b/tests/AST/data/prettier/reference_time_agg_ref.vtl new file mode 100644 index 00000000..fa6fe089 --- /dev/null +++ b/tests/AST/data/prettier/reference_time_agg_ref.vtl @@ -0,0 +1,4 @@ +avr_m_1 <- + avg( + Day group all time_agg(sc_time) + ); diff --git a/tests/AST/data/prettier/time_agg_ref.vtl b/tests/AST/data/prettier/time_agg_ref.vtl new file mode 100644 index 00000000..f3701d46 --- /dev/null +++ b/tests/AST/data/prettier/time_agg_ref.vtl @@ -0,0 +1 @@ +avr_m_1 <- avg(Day group all time_agg(sc_time)); \ No newline at end of file diff --git a/tests/AST/data/vtl/time_agg_ref.vtl b/tests/AST/data/vtl/time_agg_ref.vtl new file mode 100644 index 00000000..f3701d46 --- /dev/null +++ b/tests/AST/data/vtl/time_agg_ref.vtl @@ -0,0 +1 @@ +avr_m_1 <- avg(Day group all time_agg(sc_time)); \ No newline at end of file diff --git a/tests/AST/test_AST_String.py b/tests/AST/test_AST_String.py index 0cd5ab1c..29a18ebc 100644 --- a/tests/AST/test_AST_String.py +++ b/tests/AST/test_AST_String.py @@ -26,6 +26,7 @@ "GH_358.vtl", "comments_end_line.vtl", "time_agg.vtl", + "time_agg_ref.vtl", "viral_propagation.vtl", "round_with_slash.vtl", "trunc_with_slash.vtl", @@ -58,6 +59,7 @@ ("validation_str_errorlevel.vtl", "reference_validation_str_errorlevel.vtl"), ("unbounded.vtl", "reference_unbounded.vtl"), ("time_agg.vtl", "reference_time_agg.vtl"), + ("time_agg_ref.vtl", "reference_time_agg_ref.vtl"), ("viral_propagation.vtl", "reference_viral_propagation.vtl"), ]