aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-09 02:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converted the unconditional unwrap to a match which handles the case when the function is COUNT and args are None and replaces the args. Solves https://github.com/tursodatabase/limbo/issues/725

Browse Source
This commit is contained in:
Krishna Vishal
2025-01-18 11:18:12 +05:30
parent 4a41736f89
commit 68553904c7
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/translate/select.rs
View File

@@ -1,3 +1,5 @@
use std::ops::Deref;
use super::emitter::emit_program;
use super::expr::get_name;
use super::plan::SelectQueryType;
@@ -9,10 +11,10 @@ use crate::translate::planner::{
parse_where, resolve_aggregates, OperatorIdCounter,
};
use crate::util::normalize_ident;
use crate::SymbolTable;
use crate::{schema::Schema, vdbe::builder::ProgramBuilder, Result};
use sqlite3_parser::ast;
use crate::{LimboError, SymbolTable};
use sqlite3_parser::ast::ResultColumn;
use sqlite3_parser::ast::{self, Expr};
pub fn translate_select(
program: &mut ProgramBuilder,
@@ -116,9 +118,25 @@ pub fn prepare_select_plan(
args_count,
) {
Ok(Func::Agg(f)) => {
let count_args = vec![ast::Expr::Literal(
ast::Literal::Numeric("1".to_string()),
)];
let agg_args: Result<Vec<Expr>, LimboError> = match args {
// if args is None and its COUNT
None if name.0.to_uppercase() == "COUNT" => {
Ok(count_args)
}
// if args is None and the function is not COUNT
None => crate::bail_parse_error!(
"Aggregate function {} requires arguments",
name.0
),
Some(args) => Ok(args.clone()),
};
let agg = Aggregate {
func: f,
args: args.as_ref().unwrap().clone(),
args: agg_args?.clone(),
original_expr: expr.clone(),
};
aggregate_expressions.push(agg.clone());