Improve naming and documentation

src/expr/src/scalar/mod.rs

@@ -893,13 +893,10 @@ pub enum EvalError {
     Parse(ParseError),
     ParseHex(ParseHexError),
     Internal(String),
-<<<<<<< HEAD
     InfinityOutOfDomain(String),
     NegativeOutOfDomain(String),
     ZeroOutOfDomain(String),
-=======
     TooManyDamnRecords,
->>>>>>> ad2034333 (error if subqueries contain more than one result)
 }
 
 impl fmt::Display for EvalError {
@@ -960,7 +957,6 @@ impl fmt::Display for EvalError {
             EvalError::Parse(e) => e.fmt(f),
             EvalError::ParseHex(e) => e.fmt(f),
             EvalError::Internal(s) => write!(f, "internal error: {}", s),
-<<<<<<< HEAD
             EvalError::InfinityOutOfDomain(s) => {
                 write!(f, "function {} is only defined for finite arguments", s)
             }
@@ -970,6 +966,7 @@ impl fmt::Display for EvalError {
             EvalError::ZeroOutOfDomain(s) => {
                 write!(f, "function {} is not defined for zero", s)
             }
+            EvalError::TooManyDamnRecords => write!(f, "more than one record produced in subquery"),
         }
     }
 }
@@ -985,9 +982,6 @@ impl EvalError {
                 "Input data is missing padding, is truncated, or is otherwise corrupted.".into(),
             ),
             _ => None,
-=======
-            EvalError::TooManyDamnRecords => write!(f, "more than one record produced in subquery"),
->>>>>>> ad2034333 (error if subqueries contain more than one result)
         }
     }
 }

src/sql/src/plan/lowering.rs

@@ -662,9 +662,10 @@ impl HirScalarExpr {
                         let col_type = select.typ().column_types.into_last();
 
                         let inner_arity = get_inner.arity();
+                        // We must determine a count for each `get_inner` prefix,
+                        // and report an error if that count exceeds one.
                         let guarded = select.let_in(id_gen, |_id_gen, get_select| {
-                            // We must determine a count for each `get_inner` prefix,
-                            // and report an error if that count exceeds one.
+                            // Count for each `get_inner` prefix.
                             let counts = get_select.clone().reduce(
                                 (0..inner_arity).collect::<Vec<_>>(),
                                 vec![expr::AggregateExpr {
@@ -688,7 +689,7 @@ impl HirScalarExpr {
                                 )])
                                 .project((0..inner_arity).collect::<Vec<_>>())
                                 .map(vec![expr::MirScalarExpr::literal(
-                                    Err(expr::EvalError::TooManyDamnRecords),
+                                    Err(expr::EvalError::MultipleRowsFromSubquery),
                                     col_type.clone().scalar_type,
                                 )]);
                             // Return `get_select` and any errors added in.