Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 17 additions & 18 deletions src/ast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1955,24 +1955,23 @@ impl fmt::Display for Expr {
if add_parens { ")" } else { "" },
)
}
Expr::UnaryOp { op, expr } => {
if op == &UnaryOperator::PGPostfixFactorial {
write!(f, "{expr}{op}")
} else if matches!(
op,
UnaryOperator::Not
| UnaryOperator::Hash
| UnaryOperator::AtDashAt
| UnaryOperator::DoubleAt
| UnaryOperator::PGAbs
| UnaryOperator::QuestionDash
| UnaryOperator::QuestionPipe
) {
write!(f, "{op} {expr}")
} else {
write!(f, "{op}{expr}")
}
}
Expr::UnaryOp { op, expr } => match op {
UnaryOperator::PGPostfixFactorial => write!(f, "{expr}{op}"),
UnaryOperator::Not
| UnaryOperator::BitwiseNot
| UnaryOperator::Hash
| UnaryOperator::AtDashAt
| UnaryOperator::DoubleAt
| UnaryOperator::PGAbs
| UnaryOperator::QuestionDash
| UnaryOperator::QuestionPipe => write!(f, "{op} {expr}"),
UnaryOperator::Plus

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

| UnaryOperator::Minus
| UnaryOperator::BangNot
| UnaryOperator::PGPrefixFactorial
| UnaryOperator::PGSquareRoot
| UnaryOperator::PGCubeRoot => write!(f, "{op}{expr}"),
},
Expr::Convert {
is_try,
expr,
Expand Down
22 changes: 17 additions & 5 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19469,11 +19469,7 @@ fn test_parse_alter_user() {

#[test]
fn parse_generic_unary_ops() {
let unary_ops = &[
("~", UnaryOperator::BitwiseNot),
("-", UnaryOperator::Minus),
("+", UnaryOperator::Plus),
];
let unary_ops = &[("-", UnaryOperator::Minus), ("+", UnaryOperator::Plus)];
for (str_op, op) in unary_ops {
let select = verified_only_select(&format!("SELECT {}expr", str_op));
assert_eq!(
Expand All @@ -19484,6 +19480,16 @@ fn parse_generic_unary_ops() {
select.projection[0]
);
}

let select = verified_only_select("SELECT ~ expr");
assert_eq!(
UnnamedExpr(UnaryOp {
op: UnaryOperator::BitwiseNot,
expr: Box::new(Identifier(Ident::new("expr"))),
}),
select.projection[0]
);
one_statement_parses_to("SELECT ~expr", "SELECT ~ expr");
}

#[test]
Expand Down Expand Up @@ -20060,3 +20066,9 @@ fn parse_insert_by_name() {
_ => unreachable!(),
}
}

#[test]
fn parse_bitwise_not_renders_apart_from_operand() {
all_dialects().verified_stmt("SELECT ~ -1");
all_dialects().verified_stmt("SELECT ~ ~ 1");
}
7 changes: 7 additions & 0 deletions tests/sqlparser_postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9968,3 +9968,10 @@ fn parse_pg_abs_space_before_negative_operand() {
err
);
}

#[test]
fn parse_bitwise_not_before_pg_prefix_operators() {
pg().one_statement_parses_to("SELECT ~ @2", "SELECT ~ @ 2");
pg().verified_stmt("SELECT ~ @ 2");
pg().one_statement_parses_to("SELECT ~ #x", "SELECT ~ # x");
}
Loading