diff --git a/core/lib.rs b/core/lib.rs index 813a8c2be..dfe4e8b5f 100644 --- a/core/lib.rs +++ b/core/lib.rs @@ -1,6 +1,5 @@ mod btree; mod buffer_pool; -mod expr; mod function; mod io; mod pager; diff --git a/core/expr.rs b/core/translate/expr.rs similarity index 100% rename from core/expr.rs rename to core/translate/expr.rs diff --git a/core/translate/mod.rs b/core/translate/mod.rs index 0b85e6c13..7208b1245 100644 --- a/core/translate/mod.rs +++ b/core/translate/mod.rs @@ -1,7 +1,9 @@ +pub(crate) mod expr; + use std::cell::RefCell; use std::rc::Rc; -use crate::expr::{build_select, maybe_apply_affinity, translate_expr}; +use expr::{build_select, maybe_apply_affinity, translate_expr}; use crate::function::{AggFunc, Func}; use crate::pager::Pager; use crate::schema::{Column, PseudoTable, Schema, Table}; diff --git a/core/where_clause.rs b/core/where_clause.rs index caa128ba3..ec8db22b7 100644 --- a/core/where_clause.rs +++ b/core/where_clause.rs @@ -2,7 +2,7 @@ use anyhow::Result; use sqlite3_parser::ast::{self, JoinOperator}; use crate::{ - expr::{resolve_ident_qualified, resolve_ident_table, translate_expr}, + translate::expr::{resolve_ident_qualified, resolve_ident_table, translate_expr}, function::SingleRowFunc, select::Select, vdbe::{BranchOffset, Insn, ProgramBuilder},