Skip to content

Add support for TRIM LEADING/TRAILING/BOTH syntax #947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alamb merged 1 commit into from
Aug 29, 2021
Merged

Add support for TRIM LEADING/TRAILING/BOTH syntax #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions datafusion/src/sql/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ use sqlparser::ast::{
BinaryOperator, DataType as SQLDataType, DateTimeField, Expr as SQLExpr, FunctionArg,
Ident, Join, JoinConstraint, JoinOperator, ObjectName, Query, Select, SelectItem,
SetExpr, SetOperator, ShowStatementFilter, TableFactor, TableWithJoins,
UnaryOperator, Value,
TrimWhereField, UnaryOperator, Value,
};
use sqlparser::ast::{ColumnDef as SQLColumnDef, ColumnOption};
use sqlparser::ast::{OrderByExpr, Statement};
Expand Down Expand Up @@ -1275,21 +1275,27 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
}

SQLExpr::Trim { expr, trim_where } => {
let fun = match trim_where {
Some((trim_where, _expr)) => {
return Err(DataFusionError::Plan(format!(
"TRIM {} is not yet supported ",
trim_where
)))
let (fun, where_expr) = match trim_where {
Some((TrimWhereField::Leading, expr)) => {
(functions::BuiltinScalarFunction::Ltrim, Some(expr))
}
None => functions::BuiltinScalarFunction::Trim,
Some((TrimWhereField::Trailing, expr)) => {
(functions::BuiltinScalarFunction::Rtrim, Some(expr))
}
Some((TrimWhereField::Both, expr)) => {
(functions::BuiltinScalarFunction::Btrim, Some(expr))
}
None => (functions::BuiltinScalarFunction::Trim, None),
};

let arg = self.sql_expr_to_logical_expr(expr, schema)?;
Ok(Expr::ScalarFunction {
fun,
args: vec![arg],
})
let args = match where_expr {
Some(to_trim) => {
let to_trim = self.sql_expr_to_logical_expr(to_trim, schema)?;
vec![arg, to_trim]
}
None => vec![arg],
};
Ok(Expr::ScalarFunction { fun, args })
}

SQLExpr::Function(function) => {
Expand Down
9 changes: 9 additions & 0 deletions datafusion/tests/sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3811,6 +3811,15 @@ async fn test_string_expressions() -> Result<()> {
test_expression!("to_hex(9223372036854775807)", "7fffffffffffffff");
test_expression!("to_hex(CAST(NULL AS int))", "NULL");
test_expression!("trim(' tom ')", "tom");
test_expression!("trim(LEADING ' ' FROM ' tom ')", "tom ");
test_expression!("trim(TRAILING ' ' FROM ' tom ')", " tom");
test_expression!("trim(BOTH ' ' FROM ' tom ')", "tom");
test_expression!("trim(LEADING 'x' FROM 'xxxtomxxx')", "tomxxx");
test_expression!("trim(TRAILING 'x' FROM 'xxxtomxxx')", "xxxtom");
test_expression!("trim(BOTH 'x' FROM 'xxxtomxx')", "tom");
test_expression!("trim(LEADING 'xy' FROM 'xyxabcxyzdefxyx')", "abcxyzdefxyx");
test_expression!("trim(TRAILING 'xy' FROM 'xyxabcxyzdefxyx')", "xyxabcxyzdef");
test_expression!("trim(BOTH 'xy' FROM 'xyxabcxyzdefxyx')", "abcxyzdef");
test_expression!("trim(' tom')", "tom");
test_expression!("trim('')", "");
test_expression!("trim('tom ')", "tom");
Expand Down