Merge branch 'main' into bump-deps

mergify[bot] · web-flow · commit 8cb4ee39be03 · 2023-03-15T10:03:39.000Z
diff --git a/src/query/sql/src/executor/format.rs b/src/query/sql/src/executor/format.rs
@@ -309,6 +309,10 @@ fn aggregate_expand_to_format_tree(
                             column_name
                         }
                         ColumnEntry::DerivedColumn(DerivedColumn { alias, .. }) => alias,
+                        ColumnEntry::InternalColumn(TableInternalColumn {
+                            internal_column,
+                            ..
+                        }) => internal_column.column_name().to_string(),
                     }
                 })
                 .collect::<Vec<_>>()

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,10 @@ fn aggregate_expand_to_format_tree(`
`309`	`309`	`column_name`
`310`	`310`	`}`
`311`	`311`	`ColumnEntry::DerivedColumn(DerivedColumn { alias, .. }) => alias,`
	`312`	`+ ColumnEntry::InternalColumn(TableInternalColumn {`
	`313`	`+ internal_column,`
	`314`	`+ ..`
	`315`	`+ }) => internal_column.column_name().to_string(),`
`312`	`316`	`}`
`313`	`317`	`})`
`314`	`318`	`.collect::<Vec<_>>()`