pyturso 0.3.0rc5__tar.gz → 0.3.0rc6__tar.gz

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/Cargo.lock

@@ -828,7 +828,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core_tester"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -2545,7 +2545,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_completion"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_crypto"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "blake3",
  "data-encoding",
@@ -2566,7 +2566,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_csv"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "csv",
  "mimalloc",
@@ -2576,7 +2576,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_fuzzy"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2584,7 +2584,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_ipaddr"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "ipnetwork",
  "mimalloc",
@@ -2593,7 +2593,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_percentile"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2601,7 +2601,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_regexp"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "mimalloc",
  "regex",
@@ -2610,7 +2610,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sim"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "anyhow",
  "bitflags 2.9.4",
@@ -2646,7 +2646,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sqlite_test_ext"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "cc",
 ]
@@ -3462,7 +3462,7 @@ dependencies = [
 
 [[package]]
 name = "py-turso"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -4208,7 +4208,7 @@ checksum = "d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d"
 
 [[package]]
 name = "sql_generation"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "anarchist-readable-name-generator-lib 0.2.0",
  "anyhow",
@@ -4836,7 +4836,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "turso"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "mimalloc",
  "rand 0.9.2",
@@ -4851,7 +4851,7 @@ dependencies = [
 
 [[package]]
 name = "turso-java"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "jni",
  "thiserror 2.0.16",
@@ -4860,7 +4860,7 @@ dependencies = [
 
 [[package]]
 name = "turso_cli"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -4896,7 +4896,7 @@ dependencies = [
 
 [[package]]
 name = "turso_core"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "aegis",
  "aes",
@@ -4957,7 +4957,7 @@ dependencies = [
 
 [[package]]
 name = "turso_dart"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "flutter_rust_bridge",
  "turso_core",
@@ -4965,7 +4965,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "chrono",
  "getrandom 0.3.2",
@@ -4974,7 +4974,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext_tests"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "env_logger 0.11.7",
  "lazy_static",
@@ -4985,7 +4985,7 @@ dependencies = [
 
 [[package]]
 name = "turso_macros"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4994,7 +4994,7 @@ dependencies = [
 
 [[package]]
 name = "turso_node"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "chrono",
  "napi",
@@ -5007,7 +5007,7 @@ dependencies = [
 
 [[package]]
 name = "turso_parser"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "bitflags 2.9.4",
  "criterion",
@@ -5023,7 +5023,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sqlite3"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "env_logger 0.11.7",
  "libc",
@@ -5036,7 +5036,7 @@ dependencies = [
 
 [[package]]
 name = "turso_stress"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "anarchist-readable-name-generator-lib 0.1.2",
  "antithesis_sdk",
@@ -5053,7 +5053,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_engine"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -5080,7 +5080,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_js"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "genawaiter",
  "napi",
@@ -5095,7 +5095,7 @@ dependencies = [
 
 [[package]]
 name = "turso_whopper"
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 dependencies = [
  "anyhow",
  "clap",

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/Cargo.toml

@@ -8,29 +8,29 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.3.0-pre.5"
+version = "0.3.0-pre.6"
 authors = ["the Limbo authors"]
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/tursodatabase/turso"
 
 [workspace.dependencies]
-turso = { path = "bindings/rust", version = "0.3.0-pre.5" }
-turso_node = { path = "bindings/javascript", version = "0.3.0-pre.5" }
-limbo_completion = { path = "extensions/completion", version = "0.3.0-pre.5" }
-turso_core = { path = "core", version = "0.3.0-pre.5" }
-turso_sync_engine = { path = "sync/engine", version = "0.3.0-pre.5" }
-limbo_crypto = { path = "extensions/crypto", version = "0.3.0-pre.5" }
-limbo_csv = { path = "extensions/csv", version = "0.3.0-pre.5" }
-turso_ext = { path = "extensions/core", version = "0.3.0-pre.5" }
-turso_ext_tests = { path = "extensions/tests", version = "0.3.0-pre.5" }
-limbo_ipaddr = { path = "extensions/ipaddr", version = "0.3.0-pre.5" }
-turso_macros = { path = "macros", version = "0.3.0-pre.5" }
-limbo_percentile = { path = "extensions/percentile", version = "0.3.0-pre.5" }
-limbo_regexp = { path = "extensions/regexp", version = "0.3.0-pre.5" }
-limbo_uuid = { path = "extensions/uuid", version = "0.3.0-pre.5" }
-turso_parser = { path = "parser", version = "0.3.0-pre.5" }
-limbo_fuzzy = { path = "extensions/fuzzy", version = "0.3.0-pre.5" }
+turso = { path = "bindings/rust", version = "0.3.0-pre.6" }
+turso_node = { path = "bindings/javascript", version = "0.3.0-pre.6" }
+limbo_completion = { path = "extensions/completion", version = "0.3.0-pre.6" }
+turso_core = { path = "core", version = "0.3.0-pre.6" }
+turso_sync_engine = { path = "sync/engine", version = "0.3.0-pre.6" }
+limbo_crypto = { path = "extensions/crypto", version = "0.3.0-pre.6" }
+limbo_csv = { path = "extensions/csv", version = "0.3.0-pre.6" }
+turso_ext = { path = "extensions/core", version = "0.3.0-pre.6" }
+turso_ext_tests = { path = "extensions/tests", version = "0.3.0-pre.6" }
+limbo_ipaddr = { path = "extensions/ipaddr", version = "0.3.0-pre.6" }
+turso_macros = { path = "macros", version = "0.3.0-pre.6" }
+limbo_percentile = { path = "extensions/percentile", version = "0.3.0-pre.6" }
+limbo_regexp = { path = "extensions/regexp", version = "0.3.0-pre.6" }
+limbo_uuid = { path = "extensions/uuid", version = "0.3.0-pre.6" }
+turso_parser = { path = "parser", version = "0.3.0-pre.6" }
+limbo_fuzzy = { path = "extensions/fuzzy", version = "0.3.0-pre.6" }
 sql_generation = { path = "sql_generation" }
 strum = { version = "0.26", features = ["derive"] }
 strum_macros = "0.26"

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyturso
-Version: 0.3.0rc5
+Version: 0.3.0rc6
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/core/index_method/mod.rs

@@ -87,7 +87,9 @@ pub trait IndexMethodCursor {
     /// For example, for 2 patterns ["SELECT * FROM {table} LIMIT ?", "SELECT * FROM {table} WHERE x = ?"], query_start(...) call can have following arguments:
     /// - [Integer(0), Integer(10)] - pattern "SELECT * FROM {table} LIMIT ?" was chosen with LIMIT parameter equals to 10
     /// - [Integer(1), Text("turso")] - pattern "SELECT * FROM {table} WHERE x = ?" was chosen with equality comparison equals to "turso"
-    fn query_start(&mut self, values: &[Register]) -> Result<IOResult<()>>;
+    ///
+    /// Returns false if query will produce no rows (similar to VFilter/Rewind op codes)
+    fn query_start(&mut self, values: &[Register]) -> Result<IOResult<bool>>;
 
     /// Moves cursor to the next response row
     /// Returns false if query exhausted all rows

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/core/index_method/toy_vector_sparse_ivf.rs

@@ -43,6 +43,7 @@ pub enum VectorSparseInvertedIndexCreateState {
     Run { stmt: Box<Statement> },
 }
 
+#[derive(Debug)]
 pub enum VectorSparseInvertedIndexInsertState {
     Init,
     Prepare {
@@ -64,6 +65,7 @@ pub enum VectorSparseInvertedIndexInsertState {
     },
 }
 
+#[derive(Debug)]
 pub enum VectorSparseInvertedIndexDeleteState {
     Init,
     Prepare {
@@ -151,7 +153,6 @@ pub struct VectorSparseInvertedIndexMethodCursor {
     delete_state: VectorSparseInvertedIndexDeleteState,
     search_state: VectorSparseInvertedIndexSearchState,
     search_result: VecDeque<(i64, f64)>,
-    search_row: Option<(i64, f64)>,
 }
 
 impl IndexMethod for VectorSparseInvertedIndexMethod {
@@ -199,7 +200,6 @@ impl VectorSparseInvertedIndexMethodCursor {
             scratch_cursor: None,
             main_btree: None,
             search_result: VecDeque::new(),
-            search_row: None,
             create_state: VectorSparseInvertedIndexCreateState::Init,
             insert_state: VectorSparseInvertedIndexInsertState::Init,
             delete_state: VectorSparseInvertedIndexDeleteState::Init,
@@ -288,6 +288,7 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
             ));
         };
         loop {
+            tracing::debug!("insert_state: {:?}", self.insert_state);
             match &mut self.insert_state {
                 VectorSparseInvertedIndexInsertState::Init => {
                     let Some(vector) = values[0].get_value().to_blob() else {
@@ -377,6 +378,7 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
             ));
         };
         loop {
+            tracing::debug!("delete_state: {:?}", self.delete_state);
             match &mut self.delete_state {
                 VectorSparseInvertedIndexDeleteState::Init => {
                     let Some(vector) = values[0].get_value().to_blob() else {
@@ -459,7 +461,7 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
         }
     }
 
-    fn query_start(&mut self, values: &[Register]) -> Result<IOResult<()>> {
+    fn query_start(&mut self, values: &[Register]) -> Result<IOResult<bool>> {
         let Some(scratch) = &mut self.scratch_cursor else {
             return Err(LimboError::InternalError(
                 "cursor must be opened".to_string(),
@@ -471,7 +473,7 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
             ));
         };
         loop {
-            tracing::debug!("state: {:?}", self.search_state);
+            tracing::debug!("query_state: {:?}", self.search_state);
             match &mut self.search_state {
                 VectorSparseInvertedIndexSearchState::Init => {
                     let Some(vector) = values[1].get_value().to_blob() else {
@@ -521,7 +523,7 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
                         continue;
                     }
                     let position = p[*idx];
-                    let key = ImmutableRecord::from_values(&[Value::Integer(position as i64)], 2);
+                    let key = ImmutableRecord::from_values(&[Value::Integer(position as i64)], 1);
                     self.search_state = VectorSparseInvertedIndexSearchState::Seek {
                         collected: collected.take(),
                         positions: positions.take(),
@@ -551,7 +553,7 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
                                 limit: *limit,
                             };
                         }
-                        SeekResult::TryAdvance => {
+                        SeekResult::TryAdvance | SeekResult::NotFound => {
                             self.search_state = VectorSparseInvertedIndexSearchState::Next {
                                 collected: collected.take(),
                                 positions: positions.take(),
@@ -560,9 +562,6 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
                                 limit: *limit,
                             };
                         }
-                        SeekResult::NotFound => {
-                            return Err(LimboError::Corrupt("inverted index corrupted".to_string()))
-                        }
                     }
                 }
                 VectorSparseInvertedIndexSearchState::Read {
@@ -637,7 +636,7 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
                     let Some(rowid) = rowids.as_ref().unwrap().last() else {
                         let distances = distances.take().unwrap();
                         self.search_result = distances.iter().map(|(d, i)| (*i, d.0)).collect();
-                        return Ok(IOResult::Done(()));
+                        return Ok(IOResult::Done(!self.search_result.is_empty()));
                     };
                     let result = return_if_io!(
                         main.seek(SeekKey::TableRowId(*rowid), SeekOp::GE { eq_only: true })
@@ -709,17 +708,17 @@ impl IndexMethodCursor for VectorSparseInvertedIndexMethodCursor {
     }
 
     fn query_rowid(&mut self) -> Result<IOResult<Option<i64>>> {
-        let result = self.search_row.as_ref().unwrap();
+        let result = self.search_result.front().unwrap();
         Ok(IOResult::Done(Some(result.0)))
     }
 
     fn query_column(&mut self, _: usize) -> Result<IOResult<Value>> {
-        let result = self.search_row.as_ref().unwrap();
+        let result = self.search_result.front().unwrap();
         Ok(IOResult::Done(Value::Float(result.1)))
     }
 
     fn query_next(&mut self) -> Result<IOResult<bool>> {
-        self.search_row = self.search_result.pop_front();
-        Ok(IOResult::Done(self.search_row.is_some()))
+        let _ = self.search_result.pop_front();
+        Ok(IOResult::Done(!self.search_result.is_empty()))
     }
 }

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/core/lib.rs

@@ -1212,7 +1212,7 @@ impl Connection {
         }
 
         let sql = sql.as_ref();
-        tracing::trace!("Preparing: {}", sql);
+        tracing::debug!("Preparing: {}", sql);
         let mut parser = Parser::new(sql.as_bytes());
         let cmd = parser.next_cmd()?;
         let syms = self.syms.read();

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/core/storage/btree.rs

@@ -2589,6 +2589,9 @@ impl BTreeCursor {
     /// 4. Continue balance from the parent page (inserting the new divider cell may have overflowed the parent)
     #[instrument(skip(self), level = Level::DEBUG)]
     fn balance_quick(&mut self) -> Result<IOResult<()>> {
+        // Since we are going to change the btree structure, let's forget our cached knowledge of the rightmost page.
+        let _ = self.move_to_right_state.1.take();
+
         // Allocate a new leaf page and insert the overflow cell payload in it.
         let new_rightmost_leaf = return_if_io!(self.pager.do_allocate_page(
             PageType::TableLeaf,

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/core/storage/pager.rs

@@ -1528,7 +1528,7 @@ impl Pager {
         allow_empty_read: bool,
     ) -> Result<(PageRef, Completion)> {
         assert!(page_idx >= 0);
-        tracing::trace!("read_page_no_cache(page_idx = {})", page_idx);
+        tracing::debug!("read_page_no_cache(page_idx = {})", page_idx);
         let page = Arc::new(Page::new(page_idx));
         let io_ctx = self.io_ctx.read();
         let Some(wal) = self.wal.as_ref() else {
@@ -1565,11 +1565,11 @@ impl Pager {
     #[tracing::instrument(skip_all, level = Level::DEBUG)]
     pub fn read_page(&self, page_idx: i64) -> Result<(PageRef, Option<Completion>)> {
         assert!(page_idx >= 0, "pages in pager should be positive, negative might indicate unallocated pages from mvcc or any other nasty bug");
-        tracing::trace!("read_page(page_idx = {})", page_idx);
+        tracing::debug!("read_page(page_idx = {})", page_idx);
         let mut page_cache = self.page_cache.write();
         let page_key = PageCacheKey::new(page_idx as usize);
         if let Some(page) = page_cache.get(&page_key)? {
-            tracing::trace!("read_page(page_idx = {}) = cached", page_idx);
+            tracing::debug!("read_page(page_idx = {}) = cached", page_idx);
             turso_assert!(
                 page_idx as usize == page.get().id,
                 "attempted to read page {page_idx} but got page {}",

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/core/storage/wal.rs

@@ -1139,7 +1139,7 @@ impl Wal for WalFile {
 
     #[instrument(skip_all, level = Level::DEBUG)]
     fn read_frame_raw(&self, frame_id: u64, frame: &mut [u8]) -> Result<Completion> {
-        tracing::debug!("read_frame({})", frame_id);
+        tracing::debug!("read_frame_raw({})", frame_id);
         let offset = self.frame_offset(frame_id);
         let (frame_ptr, frame_len) = (frame.as_mut_ptr(), frame.len());
 
@@ -1511,6 +1511,7 @@ impl Wal for WalFile {
         let mut next_frame_id = self.max_frame.load(Ordering::Acquire) + 1;
         // Build every frame in order, updating the rolling checksum
         for (idx, page) in pages.iter().enumerate() {
+            tracing::debug!("append_frames_vectored: page_id={}", page.get().id);
             let page_id = page.get().id;
             let plain = page.get_contents().as_ptr();
 

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/core/translate/display.rs

@@ -119,6 +119,15 @@ 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
+                    )?;
+                }
             }
         }
         Ok(())
@@ -161,6 +170,15 @@ 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
+                    )?;
+                }
             }
         }
         Ok(())
@@ -215,6 +233,15 @@ 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 !self.order_by.is_empty() {

{pyturso-0.3.0rc5 → pyturso-0.3.0rc6}/core/translate/emitter.rs

@@ -35,8 +35,9 @@ use crate::translate::fkeys::{
     emit_fk_delete_parent_existence_checks, emit_guarded_fk_decrement,
     emit_parent_key_change_checks, open_read_index, open_read_table, stabilize_new_row_for_fk,
 };
-use crate::translate::plan::{DeletePlan, JoinedTable, Plan, QueryDestination, Search};
+use crate::translate::plan::{DeletePlan, EvalAt, JoinedTable, Plan, QueryDestination, Search};
 use crate::translate::planner::ROWID_STRS;
+use crate::translate::subquery::emit_non_from_clause_subquery;
 use crate::translate::values::emit_values;
 use crate::translate::window::{emit_window_results, init_window, WindowMetadata};
 use crate::util::{exprs_are_equivalent, normalize_ident};
@@ -272,14 +273,33 @@ pub fn emit_query<'a>(
     let after_main_loop_label = program.allocate_label();
     t_ctx.label_main_loop_end = Some(after_main_loop_label);
 
-    init_limit(program, t_ctx, &plan.limit, &plan.offset)?;
-
     if !plan.values.is_empty() {
         let reg_result_cols_start = emit_values(program, plan, t_ctx)?;
         program.preassign_label_to_next_insn(after_main_loop_label);
         return Ok(reg_result_cols_start);
     }
 
+    // Evaluate uncorrelated subqueries as early as possible, because even LIMIT can reference a subquery.
+    for subquery in plan
+        .non_from_clause_subqueries
+        .iter_mut()
+        .filter(|s| !s.has_been_evaluated())
+    {
+        let eval_at = subquery.get_eval_at(&plan.join_order)?;
+        if eval_at != EvalAt::BeforeLoop {
+            continue;
+        }
+        let plan = subquery.consume_plan(EvalAt::BeforeLoop);
+
+        emit_non_from_clause_subquery(
+            program,
+            t_ctx,
+            *plan,
+            &subquery.query_type,
+            subquery.correlated,
+        )?;
+    }
+
     // Emit FROM clause subqueries first so the results can be read in the main query loop.
     emit_from_clause_subqueries(program, t_ctx, &mut plan.table_references)?;
 
@@ -356,6 +376,9 @@ pub fn emit_query<'a>(
     if let Distinctness::Distinct { ctx } = &mut plan.distinctness {
         *ctx = distinct_ctx
     }
+
+    init_limit(program, t_ctx, &plan.limit, &plan.offset)?;
+
     init_loop(
         program,
         t_ctx,
@@ -670,6 +693,9 @@ fn emit_delete_insns(
                 index: Some(index), ..
             } => program.resolve_cursor_id(&CursorKey::index(internal_id, index.clone())),
         },
+        Operation::IndexMethodQuery(_) => {
+            panic!("access through IndexMethod is not supported for delete statements")
+        }
     };
     let main_table_cursor_id = program.resolve_cursor_id(&CursorKey::table(internal_id));
 
@@ -980,7 +1006,7 @@ fn emit_program_for_update(
         )) {
             cursor
         } else {
-            let cursor = program.alloc_cursor_id(CursorType::BTreeIndex(index.clone()));
+            let cursor = program.alloc_cursor_index(None, index)?;
             program.emit_insn(Insn::OpenWrite {
                 cursor_id: cursor,
                 root_page: RegisterOrLiteral::Literal(index.root_page),
@@ -1087,6 +1113,9 @@ fn emit_update_insns(
                 false,
             ),
         },
+        Operation::IndexMethodQuery(_) => {
+            panic!("access through IndexMethod is not supported for update operations")
+        }
     };
 
     let beg = program.alloc_registers(
@@ -2073,7 +2102,7 @@ fn init_limit(
                 _ => {
                     let r = limit_ctx.reg_limit;
 
-                    _ = translate_expr(program, None, expr, r, &t_ctx.resolver);
+                    _ = translate_expr(program, None, expr, r, &t_ctx.resolver)?;
                     program.emit_insn(Insn::MustBeInt { reg: r });
                 }
             }
@@ -2103,7 +2132,7 @@ fn init_limit(
                     }
                 }
                 _ => {
-                    _ = translate_expr(program, None, expr, offset_reg, &t_ctx.resolver);
+                    _ = translate_expr(program, None, expr, offset_reg, &t_ctx.resolver)?;
                 }
             }
             program.add_comment(program.offset(), "OFFSET counter");