This commit is contained in:
Jussi Saurio
2025-01-01 07:53:36 +02:00
parent 6633a3c66a
commit 2b5b54c44e
3 changed files with 10 additions and 13 deletions

View File

@@ -250,7 +250,7 @@ impl Connection {
self.header.clone(),
self.pager.clone(),
Rc::downgrade(self),
&syms,
syms,
)?);
Ok(Statement::new(program, self.pager.clone()))
}
@@ -278,7 +278,7 @@ impl Connection {
self.header.clone(),
self.pager.clone(),
Rc::downgrade(self),
&syms,
syms,
)?);
let stmt = Statement::new(program, self.pager.clone());
Ok(Some(Rows { stmt }))
@@ -290,7 +290,7 @@ impl Connection {
self.header.clone(),
self.pager.clone(),
Rc::downgrade(self),
&syms,
syms,
)?;
program.explain();
Ok(None)
@@ -327,7 +327,7 @@ impl Connection {
self.header.clone(),
self.pager.clone(),
Rc::downgrade(self),
&syms,
syms,
)?;
program.explain();
}
@@ -339,7 +339,7 @@ impl Connection {
self.header.clone(),
self.pager.clone(),
Rc::downgrade(self),
&syms,
syms,
)?;
let mut state = vdbe::ProgramState::new(program.max_registers);
program.step(&mut state, self.pager.clone())?;

View File

@@ -129,7 +129,6 @@ pub enum OperationMode {
fn prologue() -> Result<(ProgramBuilder, Metadata, BranchOffset, BranchOffset)> {
let mut program = ProgramBuilder::new();
let init_label = program.allocate_label();
let halt_label = program.allocate_label();
program.emit_insn_with_label_dependency(
Insn::Init {
@@ -1414,7 +1413,6 @@ fn close_loop(
close_loop(program, left, metadata)?;
}
SourceOperator::Scan {
id,
table_reference,
iter_dir,
..
@@ -1451,7 +1449,6 @@ fn close_loop(
}
}
SourceOperator::Search {
id,
table_reference,
search,
..

View File

@@ -125,7 +125,7 @@ pub fn prepare_select_plan(schema: &Schema, select: ast::Select) -> Result<Plan>
plan.result_columns.push(ResultSetColumn {
name: get_name(
maybe_alias.as_ref(),
&expr,
expr,
&plan.referenced_tables,
|| format!("expr_{}", result_column_idx),
),
@@ -135,11 +135,11 @@ pub fn prepare_select_plan(schema: &Schema, select: ast::Select) -> Result<Plan>
}
Ok(_) => {
let contains_aggregates =
resolve_aggregates(&expr, &mut aggregate_expressions);
resolve_aggregates(expr, &mut aggregate_expressions);
plan.result_columns.push(ResultSetColumn {
name: get_name(
maybe_alias.as_ref(),
&expr,
expr,
&plan.referenced_tables,
|| format!("expr_{}", result_column_idx),
),
@@ -169,7 +169,7 @@ pub fn prepare_select_plan(schema: &Schema, select: ast::Select) -> Result<Plan>
plan.result_columns.push(ResultSetColumn {
name: get_name(
maybe_alias.as_ref(),
&expr,
expr,
&plan.referenced_tables,
|| format!("expr_{}", result_column_idx),
),
@@ -189,7 +189,7 @@ pub fn prepare_select_plan(schema: &Schema, select: ast::Select) -> Result<Plan>
plan.result_columns.push(ResultSetColumn {
name: get_name(
maybe_alias.as_ref(),
&expr,
expr,
&plan.referenced_tables,
|| format!("expr_{}", result_column_idx),
),