From 43db84e6ea1bc80cb2a269e52357fa9804a952d3 Mon Sep 17 00:00:00 2001
From: "Levy A." <levyddsa@gmail.com>
Date: Tue, 10 Jun 2025 16:33:29 -0300
Subject: [PATCH] fix: broken rebase

---
 core/vdbe/execute.rs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/vdbe/execute.rs b/core/vdbe/execute.rs
index 04813efeb..f936c94ec 100644
--- a/core/vdbe/execute.rs
+++ b/core/vdbe/execute.rs
@@ -1334,17 +1334,18 @@ pub fn op_column(
                     must_be_btree_cursor!(*cursor_id, program.cursor_ref, state, "Column");
                 let cursor = cursor.as_btree_mut();
                 let record = return_if_io!(cursor.record());
-                let value = if let Some(record) = record.as_ref() {
-                    if cursor.get_null_flag() {
-                        RefValue::Null
-                    } else {
-                        match record.get_value_opt(*column) {
-                            Some(val) => val.clone(),
-                            None => RefValue::Null,
-                        }
-                    }
+
+                let Some(record) = record.as_ref() else {
+                    break 'value Value::Null;
+                };
+
+                let value = if cursor.get_null_flag() {
+                    Value::Null
                 } else {
-                    RefValue::Null
+                    match record.get_value_opt(*column) {
+                        Some(val) => val.to_owned(),
+                        None => Value::Null,
+                    }
                 };
 
                 if cursor.get_null_flag() {