From 587cf345cc9eceb9a03de20379788f7d2d43c5e1 Mon Sep 17 00:00:00 2001 From: "Levy A." Date: Tue, 20 May 2025 17:46:36 -0300 Subject: [PATCH] refactor: merge branches --- core/translate/mod.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/core/translate/mod.rs b/core/translate/mod.rs index be5a4178a..c32365a55 100644 --- a/core/translate/mod.rs +++ b/core/translate/mod.rs @@ -152,16 +152,13 @@ pub fn translate_inner( ))); } - if col.unique { - return Err(LimboError::ParseError(format!( - "cannot drop column \"{column}\": UNIQUE" - ))); - } - - if btree.unique_sets.as_ref().is_some_and(|set| { - set.iter() - .any(|set| set.iter().any(|(column_name, _)| column_name == &column)) - }) { + if col.unique + || btree.unique_sets.as_ref().is_some_and(|set| { + set.iter().any(|set| { + set.iter().any(|(column_name, _)| column_name == &column) + }) + }) + { return Err(LimboError::ParseError(format!( "cannot drop column \"{column}\": UNIQUE" )));