Merge pull request #10733 from SkyFan2002/pivot

feat: PIVOT result column

Author: BohuTANG

src/query/sql/src/planner/binder/select.rs

@@ -772,6 +772,17 @@ impl<'a> SelectRewriter<'a> {
                 .collect(),
         }
     }
+
+    // For Expr::Literal, expr.to_string() is quoted, sometimes we need the raw string.
+    fn raw_string_from_literal_expr(expr: &Expr) -> Option<String> {
+        match expr {
+            Expr::Literal { lit, .. } => match lit {
+                Literal::String(v) => Some(v.clone()),
+                _ => Some(expr.to_string()),
+            },
+            _ => None,
+        }
+    }
 }
 
 impl<'a> SelectRewriter<'a> {
@@ -841,10 +852,12 @@ impl<'a> SelectRewriter<'a> {
                 pivot.value_column.clone(),
                 value.clone(),
             ));
+            let alias = Self::raw_string_from_literal_expr(value)
+                .ok_or_else(|| ErrorCode::SyntaxException("Pivot value should be literal"))?;
             new_select_list.push(Self::target_func_from_name_args(
                 new_aggregate_name.clone(),
                 args,
-                None,
+                Some(Self::ident_from_string(&alias)),
             ));
         }
 
@@ -875,14 +888,14 @@ impl<'a> SelectRewriter<'a> {
             vec![Self::expr_literal_array_from_vec_ident(
                 unpivot.names.clone(),
             )],
-            None,
+            Some(unpivot.column_name.clone()),
         ));
         new_select_list.push(Self::target_func_from_name_args(
             Self::ident_from_string("unnest"),
             vec![Self::expr_column_ref_array_from_vec_ident(
                 unpivot.names.clone(),
             )],
-            None,
+            Some(unpivot.value_column.clone()),
         ));
 
         if let Some(ref mut new_stmt) = self.new_stmt {

tests/sqllogictests/suites/query/pivot.test

@@ -23,6 +23,7 @@ INSERT INTO monthly_sales VALUES
 
 
 query IIIII
+SELECT empid,jan,feb,mar,apr FROM
 SELECT *
   FROM monthly_sales
     PIVOT(SUM(amount) FOR MONTH IN ('JAN', 'FEB', 'MAR', 'APR'))

tests/sqllogictests/suites/query/unpivot.test

@@ -26,6 +26,7 @@ ORDER BY empid;
 3	cars	April	50
 
 query IIII
+SELECT empid,dept,month,sales FROM
 SELECT * FROM monthly_sales_1
     UNPIVOT(sales FOR month IN (jan, feb, mar, april))
     ORDER BY empid;