core/translate: Improve error handling in display.rs

Author: penberg

core/translate/display.rs

@@ -120,13 +120,14 @@ impl Display for SelectPlan {
                     }
                 },
                 Operation::IndexMethodQuery(query) => {
-                    let index_method = query.index.index_method.as_ref().unwrap();
-                    writeln!(
-                        f,
-                        "{}QUERY INDEX METHOD {}",
-                        indent,
-                        index_method.definition().method_name
-                    )?;
+                    if let Some(index_method) = query.index.index_method.as_ref() {
+                        writeln!(
+                            f,
+                            "{}QUERY INDEX METHOD {}",
+                            indent,
+                            index_method.definition().method_name
+                        )?;
+                    }
                 }
             }
         }
@@ -171,13 +172,14 @@ impl Display for DeletePlan {
                     }
                 },
                 Operation::IndexMethodQuery(query) => {
-                    let module = query.index.index_method.as_ref().unwrap();
-                    writeln!(
-                        f,
-                        "{}QUERY MODULE {}",
-                        indent,
-                        module.definition().method_name
-                    )?;
+                    if let Some(module) = query.index.index_method.as_ref() {
+                        writeln!(
+                            f,
+                            "{}QUERY MODULE {}",
+                            indent,
+                            module.definition().method_name
+                        )?;
+                    }
                 }
             }
         }
@@ -234,13 +236,14 @@ impl fmt::Display for UpdatePlan {
                     }
                 },
                 Operation::IndexMethodQuery(query) => {
-                    let module = query.index.index_method.as_ref().unwrap();
-                    writeln!(
-                        f,
-                        "{}QUERY MODULE {}",
-                        indent,
-                        module.definition().method_name
-                    )?;
+                    if let Some(module) = query.index.index_method.as_ref() {
+                        writeln!(
+                            f,
+                            "{}QUERY MODULE {}",
+                            indent,
+                            module.definition().method_name
+                        )?;
+                    }
                 }
             }
         }
@@ -447,7 +450,10 @@ impl ToTokens for SelectPlan {
                     s.append(TokenType::TK_JOIN, None)?;
                 }
 
-                let table_ref = self.joined_tables().get(order.original_idx).unwrap();
+                let table_ref = self
+                    .joined_tables()
+                    .get(order.original_idx)
+                    .expect("table reference not found for join order");
                 table_ref.to_tokens(s, context)?;
             }
 
@@ -631,14 +637,11 @@ impl ToTokens for UpdatePlan {
 
         s.comma(
             self.set_clauses.iter().map(|(col_idx, set_expr)| {
-                let col_name = table
+                let col = table
                     .table
                     .get_column_at(*col_idx)
-                    .as_ref()
-                    .unwrap()
-                    .name
-                    .as_ref()
-                    .unwrap();
+                    .unwrap_or_else(|| panic!("column at index {} not found", col_idx));
+                let col_name = col.name.as_ref().expect("column must have a name");
 
                 ast::Set {
                     col_names: vec![ast::Name::exact(col_name.clone())],