Fix clippy warnings

This commit is contained in:
PThorpe92
2025-09-26 12:17:34 -04:00
parent 5fcc187434
commit d9658070a9
6 changed files with 17 additions and 18 deletions

View File

@@ -142,7 +142,7 @@ pub fn translate_analyze(
// Add the table entry to sqlite_schema
emit_schema_entry(
&mut program,
&resolver,
resolver,
sqlite_schema_cursor_id,
None,
SchemaEntryType::Table,

View File

@@ -54,7 +54,7 @@ pub fn translate_attach(
});
}
_ => {
translate_expr(&mut program, None, expr, arg_reg, &resolver)?;
translate_expr(&mut program, None, expr, arg_reg, resolver)?;
}
}
@@ -85,13 +85,13 @@ pub fn translate_attach(
});
}
_ => {
translate_expr(&mut program, None, db_name, arg_reg + 1, &resolver)?;
translate_expr(&mut program, None, db_name, arg_reg + 1, resolver)?;
}
}
// Load key argument (NULL if not provided)
if let Some(key_expr) = key {
translate_expr(&mut program, None, key_expr, arg_reg + 2, &resolver)?;
translate_expr(&mut program, None, key_expr, arg_reg + 2, resolver)?;
} else {
program.emit_insn(Insn::Null {
dest: arg_reg + 2,
@@ -157,7 +157,7 @@ pub fn translate_detach(
});
}
_ => {
translate_expr(&mut program, None, expr, arg_reg, &resolver)?;
translate_expr(&mut program, None, expr, arg_reg, resolver)?;
}
}

View File

@@ -181,7 +181,7 @@ pub fn translate_create_index(
let cdc_table = prepare_cdc_if_necessary(&mut program, resolver.schema, SQLITE_TABLEID)?;
emit_schema_entry(
&mut program,
&resolver,
resolver,
sqlite_schema_cursor_id,
cdc_table.map(|x| x.0),
SchemaEntryType::Index,
@@ -239,7 +239,7 @@ pub fn translate_create_index(
jump_target_when_false: label,
jump_target_when_true: BranchOffset::Placeholder,
},
&resolver,
resolver,
)?;
skip_row_label = Some(label);
}
@@ -553,7 +553,7 @@ pub fn translate_drop_index(
};
emit_cdc_insns(
&mut program,
&resolver,
resolver,
OperationMode::DELETE,
cdc_cursor_id,
row_id_reg,

View File

@@ -438,7 +438,7 @@ pub fn translate_insert(
&mut program,
&insertion,
yield_reg_opt.unwrap() + 1,
&resolver,
resolver,
&temp_table_ctx,
)?;
} else {
@@ -449,7 +449,7 @@ pub fn translate_insert(
db: 0,
});
translate_rows_single(&mut program, &values.unwrap(), &insertion, &resolver)?;
translate_rows_single(&mut program, &values.unwrap(), &insertion, resolver)?;
}
// Open all the index btrees for writing
@@ -714,7 +714,7 @@ pub fn translate_insert(
Some(&TableReferences::new_empty()),
&where_for_eval,
reg,
&resolver,
resolver,
NoConstantOptReason::RegisterReuse,
)?;
let lbl = program.allocate_label();
@@ -953,7 +953,7 @@ pub fn translate_insert(
Some(&TableReferences::new_empty()),
&where_for_eval,
reg,
&resolver,
resolver,
NoConstantOptReason::RegisterReuse,
)?;
let lbl = program.allocate_label();
@@ -1060,7 +1060,7 @@ pub fn translate_insert(
};
emit_cdc_insns(
&mut program,
&resolver,
resolver,
OperationMode::INSERT,
*cdc_cursor_id,
insertion.key_register(),
@@ -1100,14 +1100,13 @@ pub fn translate_insert(
emit_upsert(
&mut program,
resolver.schema,
&table,
&insertion,
cursor_id,
conflict_rowid_reg,
&mut rewritten_sets,
where_clause,
&resolver,
resolver,
&idx_cursors,
&mut result_columns,
cdc_table.as_ref().map(|c| c.0),

View File

@@ -341,7 +341,6 @@ pub fn resolve_upsert_target(
/// (unchanged) row. To refer to would-be inserted values, use `excluded.x`.
pub fn emit_upsert(
program: &mut ProgramBuilder,
schema: &Schema,
table: &Table,
insertion: &Insertion,
tbl_cursor_id: usize,
@@ -476,7 +475,8 @@ pub fn emit_upsert(
let (changed_cols, rowid_changed) = collect_changed_cols(table, set_pairs);
for (idx_name, _root, idx_cid) in idx_cursors {
let idx_meta = schema
let idx_meta = resolver
.schema
.get_index(table.get_name(), idx_name)
.expect("index exists");

View File

@@ -190,7 +190,7 @@ pub fn translate_create_materialized_view(
);
emit_schema_entry(
&mut program,
&resolver,
resolver,
sqlite_schema_cursor_id,
None, // cdc_table_cursor_id
SchemaEntryType::Index,