changes from review

crates/core/src/sql/execute.rs

@@ -199,7 +199,7 @@ pub fn run(
             });
 
             // Compute the header for the result set
-            stmt.iter_return_fields(|col_name, col_type| {
+            stmt.for_each_return_field(|col_name, col_type| {
                 head.push((col_name.into(), col_type.clone()));
             });
 

crates/expr/src/expr.rs

@@ -47,7 +47,7 @@ impl ProjectName {
     }
 
     /// Iterate over the returned column names and types
-    pub fn iter_return_fields(&self, mut f: impl FnMut(&str, &AlgebraicType)) {
+    pub fn for_each_return_field(&self, mut f: impl FnMut(&str, &AlgebraicType)) {
         if let Some(schema) = self.return_table() {
             for schema in schema.columns() {
                 f(&schema.col_name, &schema.col_type);
@@ -98,10 +98,10 @@ impl ProjectList {
     }
 
     /// Iterate over the projected column names and types
-    pub fn iter_return_fields(&self, mut f: impl FnMut(&str, &AlgebraicType)) {
+    pub fn for_each_return_field(&self, mut f: impl FnMut(&str, &AlgebraicType)) {
         match self {
             Self::Name(project) => {
-                project.iter_return_fields(f);
+                project.for_each_return_field(f);
             }
             Self::List(_, fields) => {
                 for (name, FieldProject { ty, .. }) in fields {

crates/expr/src/statement.rs

@@ -315,6 +315,8 @@ pub fn type_and_rewrite_show(show: SqlShow, tx: &impl SchemaView) -> TypingResul
     // -------------------------------------------
     let var_name_field = Expr::Field(FieldProject {
         table: ST_VAR_NAME.into(),
+        // TODO: Avoid hard coding the field position.
+        // See `StVarFields` for the schema of `st_var`.
         field: 0,
         ty: AlgebraicType::String,
     });
@@ -333,6 +335,8 @@ pub fn type_and_rewrite_show(show: SqlShow, tx: &impl SchemaView) -> TypingResul
         VALUE_COLUMN.into(),
         FieldProject {
             table: ST_VAR_NAME.into(),
+            // TODO: Avoid hard coding the field position.
+            // See `StVarFields` for the schema of `st_var`.
             field: 1,
             ty: value_col_ty.clone(),
         },