sec index on without rowid tables shall have prim key cols fully..

Author: Pavan-Nambi

core/schema.rs

@@ -2620,7 +2620,33 @@ impl Index {
                 ..
             })) => {
                 let index_name = normalize_ident(idx_name.name.as_str());
-                let index_columns = resolve_sorted_columns(table, &columns)?;
+                let mut index_columns = resolve_sorted_columns(table, &columns)?;
+
+                if !table.has_rowid {
+                    let existing_index_cols: HashSet<String> =
+                        index_columns.iter().map(|c| c.name.clone()).collect();
+
+                    for (pk_col_name, _order) in &table.primary_key_columns {
+                        if !existing_index_cols.contains(pk_col_name.as_str()) {
+                            let (pos_in_table, column) =
+                                table.get_column(pk_col_name).ok_or_else(|| {
+                                    LimboError::InternalError(format!(
+                                        "Could not find PK column '{}' in table '{}'",
+                                        pk_col_name, table.name
+                                    ))
+                                })?;
+
+                            index_columns.push(IndexColumn {
+                                name: pk_col_name.clone(),
+                                order: SortOrder::Asc,
+                                pos_in_table,
+                                collation: column.collation_opt(),
+                                default: column.default.clone(),
+                            });
+                        }
+                    }
+                }
+
                 if let Some(using) = using {
                     if where_clause.is_some() {
                         bail_parse_error!("custom index module do not support partial indices");

core/translate/insert.rs

@@ -2936,24 +2936,29 @@ fn translate_without_rowid_insert(
 
         tracing::debug!("Processing secondary index '{}'", index.name);
 
-        let num_key_cols = index.n_key_col;
-        let key_start_reg = program.alloc_registers(num_key_cols);
+        let num_total_cols = index.columns.len();
+        let key_start_reg = program.alloc_registers(num_total_cols);
 
-        let mut current_reg = key_start_reg;
-        for idx_col in index.columns.iter().take(num_key_cols) {
-            let mapping = insertion.get_col_mapping_by_name(&idx_col.name).unwrap();
+        for (i, idx_col) in index.columns.iter().enumerate() {
+            let mapping = insertion
+                .get_col_mapping_by_name(&idx_col.name)
+                .unwrap_or_else(|| {
+                    panic!(
+                        "Could not find column mapping for '{}' in index '{}'",
+                        idx_col.name, index.name
+                    )
+                });
             program.emit_insn(Insn::Copy {
                 src_reg: mapping.register,
-                dst_reg: current_reg,
+                dst_reg: key_start_reg + i,
                 extra_amount: 0,
             });
-            current_reg += 1;
         }
 
         let record_reg = program.alloc_register();
         program.emit_insn(Insn::MakeRecord {
             start_reg: key_start_reg,
-            count: num_key_cols,
+            count: num_total_cols,
             dest_reg: record_reg,
             index_name: Some(index.name.clone()),
             affinity_str: None,
@@ -2968,7 +2973,7 @@ fn translate_without_rowid_insert(
             cursor_id: idx_cursor_id,
             record_reg,
             unpacked_start: Some(key_start_reg),
-            unpacked_count: Some(num_key_cols as u16),
+            unpacked_count: Some(num_total_cols as u16),
             flags: IdxInsertFlags::new().nchange(true),
         });
         tracing::debug!("Emitted OP_IdxInsert for secondary index '{}'", index.name);