fix: select must propagate column names.

project-tsurugi · Jul 1, 2024 · 7aff518 · 7aff518
1 parent e34107a
commit 7aff518
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/mizugaki/analyzer/details/analyze_query_expression.cpp b/src/mizugaki/analyzer/details/analyze_query_expression.cpp
@@ -29,6 +29,7 @@
 #include <yugawara/binding/factory.h>
 
 #include <mizugaki/ast/scalar/value_constructor.h>
+#include <mizugaki/ast/scalar/variable_reference.h>
 
 #include <mizugaki/ast/query/dispatch.h>
 #include <mizugaki/ast/table/dispatch.h>
@@ -613,13 +614,21 @@ class engine {
         if (!result) {
             return {};
         }
+        std::string name;
+        if (auto n = maybe_name(elem.name())) {
+            name = std::move(*n);
+        } else if (name.empty() && elem.value()->node_kind() == ast::scalar::variable_reference::tag) {
+            auto&& var = unsafe_downcast<ast::scalar::variable_reference>(*elem.value());
+            name = var.name()->last_identifier();
+        }
+
         auto column = factory_.stream_variable(maybe_name(elem.name()).value_or(""));
         column.region() = result.value().region();
         target.columns().emplace_back(column, result.release());
         info.add({
                 {},
                 std::move(column),
-                maybe_name(elem.name()),
+                std::move(name),
                 true,
         });
         return { true, result.saw_aggregate() };

diff --git a/test/mizugaki/analyzer/details/analyze_query_expression_select_test.cpp b/test/mizugaki/analyzer/details/analyze_query_expression_select_test.cpp
@@ -64,8 +64,7 @@ TEST_F(analyze_query_expression_select_test, simple) {
     ASSERT_EQ(relation_columns.size(), 1);
     {
         auto&& column = relation_columns[0];
-        // FIXME: check spec
-        // EXPECT_EQ(column.identifier(), "v");
+        EXPECT_EQ(column.identifier(), "v");
         EXPECT_TRUE(column.exported());
     }