mirror of
https://github.com/apache/datafusion-sqlparser-rs.git
synced 2025-08-04 06:18:17 +00:00
Parse true and false as identifiers in mssql (#1510)
This commit is contained in:
parent
90824486df
commit
3a8369aaf5
6 changed files with 97 additions and 60 deletions
|
@ -616,6 +616,12 @@ pub trait Dialect: Debug + Any {
|
||||||
fn supports_top_before_distinct(&self) -> bool {
|
fn supports_top_before_distinct(&self) -> bool {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns true if the dialect supports boolean literals (`true` and `false`).
|
||||||
|
/// For example, in MSSQL these are treated as identifiers rather than boolean literals.
|
||||||
|
fn supports_boolean_literals(&self) -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// This represents the operators for which precedence must be defined
|
/// This represents the operators for which precedence must be defined
|
||||||
|
|
|
@ -57,4 +57,9 @@ impl Dialect for MsSqlDialect {
|
||||||
fn supports_try_convert(&self) -> bool {
|
fn supports_try_convert(&self) -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// In MSSQL, there is no boolean type, and `true` and `false` are valid column names
|
||||||
|
fn supports_boolean_literals(&self) -> bool {
|
||||||
|
false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1014,7 +1014,11 @@ impl<'a> Parser<'a> {
|
||||||
let next_token = self.next_token();
|
let next_token = self.next_token();
|
||||||
let expr = match next_token.token {
|
let expr = match next_token.token {
|
||||||
Token::Word(w) => match w.keyword {
|
Token::Word(w) => match w.keyword {
|
||||||
Keyword::TRUE | Keyword::FALSE | Keyword::NULL => {
|
Keyword::TRUE | Keyword::FALSE if self.dialect.supports_boolean_literals() => {
|
||||||
|
self.prev_token();
|
||||||
|
Ok(Expr::Value(self.parse_value()?))
|
||||||
|
}
|
||||||
|
Keyword::NULL => {
|
||||||
self.prev_token();
|
self.prev_token();
|
||||||
Ok(Expr::Value(self.parse_value()?))
|
Ok(Expr::Value(self.parse_value()?))
|
||||||
}
|
}
|
||||||
|
@ -7577,8 +7581,12 @@ impl<'a> Parser<'a> {
|
||||||
let location = next_token.location;
|
let location = next_token.location;
|
||||||
match next_token.token {
|
match next_token.token {
|
||||||
Token::Word(w) => match w.keyword {
|
Token::Word(w) => match w.keyword {
|
||||||
Keyword::TRUE => Ok(Value::Boolean(true)),
|
Keyword::TRUE if self.dialect.supports_boolean_literals() => {
|
||||||
Keyword::FALSE => Ok(Value::Boolean(false)),
|
Ok(Value::Boolean(true))
|
||||||
|
}
|
||||||
|
Keyword::FALSE if self.dialect.supports_boolean_literals() => {
|
||||||
|
Ok(Value::Boolean(false))
|
||||||
|
}
|
||||||
Keyword::NULL => Ok(Value::Null),
|
Keyword::NULL => Ok(Value::Null),
|
||||||
Keyword::NoKeyword if w.quote_style.is_some() => match w.quote_style {
|
Keyword::NoKeyword if w.quote_style.is_some() => match w.quote_style {
|
||||||
Some('"') => Ok(Value::DoubleQuotedString(w.value)),
|
Some('"') => Ok(Value::DoubleQuotedString(w.value)),
|
||||||
|
|
|
@ -820,7 +820,7 @@ fn parse_top_level() {
|
||||||
verified_stmt("(SELECT 1)");
|
verified_stmt("(SELECT 1)");
|
||||||
verified_stmt("((SELECT 1))");
|
verified_stmt("((SELECT 1))");
|
||||||
verified_stmt("VALUES (1)");
|
verified_stmt("VALUES (1)");
|
||||||
verified_stmt("VALUES ROW(1, true, 'a'), ROW(2, false, 'b')");
|
verified_stmt("VALUES ROW(1, NULL, 'a'), ROW(2, NULL, 'b')");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -1499,7 +1499,7 @@ fn parse_is_not_distinct_from() {
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_not_precedence() {
|
fn parse_not_precedence() {
|
||||||
// NOT has higher precedence than OR/AND, so the following must parse as (NOT true) OR true
|
// NOT has higher precedence than OR/AND, so the following must parse as (NOT true) OR true
|
||||||
let sql = "NOT true OR true";
|
let sql = "NOT 1 OR 1";
|
||||||
assert_matches!(
|
assert_matches!(
|
||||||
verified_expr(sql),
|
verified_expr(sql),
|
||||||
Expr::BinaryOp {
|
Expr::BinaryOp {
|
||||||
|
@ -1919,44 +1919,6 @@ fn parse_binary_all() {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn parse_logical_xor() {
|
|
||||||
let sql = "SELECT true XOR true, false XOR false, true XOR false, false XOR true";
|
|
||||||
let select = verified_only_select(sql);
|
|
||||||
assert_eq!(
|
|
||||||
SelectItem::UnnamedExpr(Expr::BinaryOp {
|
|
||||||
left: Box::new(Expr::Value(Value::Boolean(true))),
|
|
||||||
op: BinaryOperator::Xor,
|
|
||||||
right: Box::new(Expr::Value(Value::Boolean(true))),
|
|
||||||
}),
|
|
||||||
select.projection[0]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
SelectItem::UnnamedExpr(Expr::BinaryOp {
|
|
||||||
left: Box::new(Expr::Value(Value::Boolean(false))),
|
|
||||||
op: BinaryOperator::Xor,
|
|
||||||
right: Box::new(Expr::Value(Value::Boolean(false))),
|
|
||||||
}),
|
|
||||||
select.projection[1]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
SelectItem::UnnamedExpr(Expr::BinaryOp {
|
|
||||||
left: Box::new(Expr::Value(Value::Boolean(true))),
|
|
||||||
op: BinaryOperator::Xor,
|
|
||||||
right: Box::new(Expr::Value(Value::Boolean(false))),
|
|
||||||
}),
|
|
||||||
select.projection[2]
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
SelectItem::UnnamedExpr(Expr::BinaryOp {
|
|
||||||
left: Box::new(Expr::Value(Value::Boolean(false))),
|
|
||||||
op: BinaryOperator::Xor,
|
|
||||||
right: Box::new(Expr::Value(Value::Boolean(true))),
|
|
||||||
}),
|
|
||||||
select.projection[3]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_between() {
|
fn parse_between() {
|
||||||
fn chk(negated: bool) {
|
fn chk(negated: bool) {
|
||||||
|
@ -4113,14 +4075,14 @@ fn parse_alter_table_alter_column() {
|
||||||
);
|
);
|
||||||
|
|
||||||
match alter_table_op(verified_stmt(&format!(
|
match alter_table_op(verified_stmt(&format!(
|
||||||
"{alter_stmt} ALTER COLUMN is_active SET DEFAULT false"
|
"{alter_stmt} ALTER COLUMN is_active SET DEFAULT 0"
|
||||||
))) {
|
))) {
|
||||||
AlterTableOperation::AlterColumn { column_name, op } => {
|
AlterTableOperation::AlterColumn { column_name, op } => {
|
||||||
assert_eq!("is_active", column_name.to_string());
|
assert_eq!("is_active", column_name.to_string());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
op,
|
op,
|
||||||
AlterColumnOperation::SetDefault {
|
AlterColumnOperation::SetDefault {
|
||||||
value: Expr::Value(Value::Boolean(false))
|
value: Expr::Value(test_utils::number("0"))
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -6502,7 +6464,7 @@ fn parse_values() {
|
||||||
verified_stmt("SELECT * FROM (VALUES (1), (2), (3))");
|
verified_stmt("SELECT * FROM (VALUES (1), (2), (3))");
|
||||||
verified_stmt("SELECT * FROM (VALUES (1), (2), (3)), (VALUES (1, 2, 3))");
|
verified_stmt("SELECT * FROM (VALUES (1), (2), (3)), (VALUES (1, 2, 3))");
|
||||||
verified_stmt("SELECT * FROM (VALUES (1)) UNION VALUES (1)");
|
verified_stmt("SELECT * FROM (VALUES (1)) UNION VALUES (1)");
|
||||||
verified_stmt("SELECT * FROM (VALUES ROW(1, true, 'a'), ROW(2, false, 'b')) AS t (a, b, c)");
|
verified_stmt("SELECT * FROM (VALUES ROW(1, NULL, 'a'), ROW(2, NULL, 'b')) AS t (a, b, c)");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -7321,7 +7283,7 @@ fn lateral_derived() {
|
||||||
let lateral_str = if lateral_in { "LATERAL " } else { "" };
|
let lateral_str = if lateral_in { "LATERAL " } else { "" };
|
||||||
let sql = format!(
|
let sql = format!(
|
||||||
"SELECT * FROM customer LEFT JOIN {lateral_str}\
|
"SELECT * FROM customer LEFT JOIN {lateral_str}\
|
||||||
(SELECT * FROM order WHERE order.customer = customer.id LIMIT 3) AS order ON true"
|
(SELECT * FROM orders WHERE orders.customer = customer.id LIMIT 3) AS orders ON 1"
|
||||||
);
|
);
|
||||||
let select = verified_only_select(&sql);
|
let select = verified_only_select(&sql);
|
||||||
let from = only(select.from);
|
let from = only(select.from);
|
||||||
|
@ -7329,7 +7291,7 @@ fn lateral_derived() {
|
||||||
let join = &from.joins[0];
|
let join = &from.joins[0];
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
join.join_operator,
|
join.join_operator,
|
||||||
JoinOperator::LeftOuter(JoinConstraint::On(Expr::Value(Value::Boolean(true))))
|
JoinOperator::LeftOuter(JoinConstraint::On(Expr::Value(test_utils::number("1"))))
|
||||||
);
|
);
|
||||||
if let TableFactor::Derived {
|
if let TableFactor::Derived {
|
||||||
lateral,
|
lateral,
|
||||||
|
@ -7338,10 +7300,10 @@ fn lateral_derived() {
|
||||||
} = join.relation
|
} = join.relation
|
||||||
{
|
{
|
||||||
assert_eq!(lateral_in, lateral);
|
assert_eq!(lateral_in, lateral);
|
||||||
assert_eq!(Ident::new("order"), alias.name);
|
assert_eq!(Ident::new("orders"), alias.name);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
subquery.to_string(),
|
subquery.to_string(),
|
||||||
"SELECT * FROM order WHERE order.customer = customer.id LIMIT 3"
|
"SELECT * FROM orders WHERE orders.customer = customer.id LIMIT 3"
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
unreachable!()
|
unreachable!()
|
||||||
|
@ -8381,7 +8343,7 @@ fn parse_merge() {
|
||||||
_ => unreachable!(),
|
_ => unreachable!(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let sql = "MERGE INTO s.bar AS dest USING newArrivals AS S ON false WHEN NOT MATCHED THEN INSERT VALUES (stg.A, stg.B, stg.C)";
|
let sql = "MERGE INTO s.bar AS dest USING newArrivals AS S ON (1 > 1) WHEN NOT MATCHED THEN INSERT VALUES (stg.A, stg.B, stg.C)";
|
||||||
verified_stmt(sql);
|
verified_stmt(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11160,13 +11122,11 @@ fn parse_explain_with_option_list() {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_create_policy() {
|
fn test_create_policy() {
|
||||||
let sql = concat!(
|
let sql: &str = "CREATE POLICY my_policy ON my_table \
|
||||||
"CREATE POLICY my_policy ON my_table ",
|
AS PERMISSIVE FOR SELECT \
|
||||||
"AS PERMISSIVE FOR SELECT ",
|
TO my_role, CURRENT_USER \
|
||||||
"TO my_role, CURRENT_USER ",
|
USING (c0 = 1) \
|
||||||
"USING (c0 = 1) ",
|
WITH CHECK (1 = 1)";
|
||||||
"WITH CHECK (true)"
|
|
||||||
);
|
|
||||||
|
|
||||||
match all_dialects().verified_stmt(sql) {
|
match all_dialects().verified_stmt(sql) {
|
||||||
Statement::CreatePolicy {
|
Statement::CreatePolicy {
|
||||||
|
@ -11194,7 +11154,14 @@ fn test_create_policy() {
|
||||||
right: Box::new(Expr::Value(Value::Number("1".parse().unwrap(), false))),
|
right: Box::new(Expr::Value(Value::Number("1".parse().unwrap(), false))),
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
assert_eq!(with_check, Some(Expr::Value(Value::Boolean(true))));
|
assert_eq!(
|
||||||
|
with_check,
|
||||||
|
Some(Expr::BinaryOp {
|
||||||
|
left: Box::new(Expr::Value(Value::Number("1".parse().unwrap(), false))),
|
||||||
|
op: BinaryOperator::Eq,
|
||||||
|
right: Box::new(Expr::Value(Value::Number("1".parse().unwrap(), false))),
|
||||||
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
_ => unreachable!(),
|
_ => unreachable!(),
|
||||||
}
|
}
|
||||||
|
@ -11205,7 +11172,7 @@ fn test_create_policy() {
|
||||||
"AS PERMISSIVE FOR SELECT ",
|
"AS PERMISSIVE FOR SELECT ",
|
||||||
"TO my_role, CURRENT_USER ",
|
"TO my_role, CURRENT_USER ",
|
||||||
"USING (c0 IN (SELECT column FROM t0)) ",
|
"USING (c0 IN (SELECT column FROM t0)) ",
|
||||||
"WITH CHECK (true)"
|
"WITH CHECK (1 = 1)"
|
||||||
));
|
));
|
||||||
// omit AS / FOR / TO / USING / WITH CHECK clauses is allowed
|
// omit AS / FOR / TO / USING / WITH CHECK clauses is allowed
|
||||||
all_dialects().verified_stmt("CREATE POLICY my_policy ON my_table");
|
all_dialects().verified_stmt("CREATE POLICY my_policy ON my_table");
|
||||||
|
|
|
@ -1366,6 +1366,18 @@ fn parse_create_table_with_identity_column() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parse_true_false_as_identifiers() {
|
||||||
|
assert_eq!(
|
||||||
|
ms().verified_expr("true"),
|
||||||
|
Expr::Identifier(Ident::new("true"))
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
ms().verified_expr("false"),
|
||||||
|
Expr::Identifier(Ident::new("false"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
fn ms() -> TestedDialects {
|
fn ms() -> TestedDialects {
|
||||||
TestedDialects::new(vec![Box::new(MsSqlDialect {})])
|
TestedDialects::new(vec![Box::new(MsSqlDialect {})])
|
||||||
}
|
}
|
||||||
|
|
|
@ -2817,3 +2817,42 @@ fn test_group_concat() {
|
||||||
mysql_and_generic()
|
mysql_and_generic()
|
||||||
.verified_expr("GROUP_CONCAT(DISTINCT test_score ORDER BY test_score DESC SEPARATOR ' ')");
|
.verified_expr("GROUP_CONCAT(DISTINCT test_score ORDER BY test_score DESC SEPARATOR ' ')");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The XOR binary operator is only supported in MySQL
|
||||||
|
#[test]
|
||||||
|
fn parse_logical_xor() {
|
||||||
|
let sql = "SELECT true XOR true, false XOR false, true XOR false, false XOR true";
|
||||||
|
let select = mysql_and_generic().verified_only_select(sql);
|
||||||
|
assert_eq!(
|
||||||
|
SelectItem::UnnamedExpr(Expr::BinaryOp {
|
||||||
|
left: Box::new(Expr::Value(Value::Boolean(true))),
|
||||||
|
op: BinaryOperator::Xor,
|
||||||
|
right: Box::new(Expr::Value(Value::Boolean(true))),
|
||||||
|
}),
|
||||||
|
select.projection[0]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
SelectItem::UnnamedExpr(Expr::BinaryOp {
|
||||||
|
left: Box::new(Expr::Value(Value::Boolean(false))),
|
||||||
|
op: BinaryOperator::Xor,
|
||||||
|
right: Box::new(Expr::Value(Value::Boolean(false))),
|
||||||
|
}),
|
||||||
|
select.projection[1]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
SelectItem::UnnamedExpr(Expr::BinaryOp {
|
||||||
|
left: Box::new(Expr::Value(Value::Boolean(true))),
|
||||||
|
op: BinaryOperator::Xor,
|
||||||
|
right: Box::new(Expr::Value(Value::Boolean(false))),
|
||||||
|
}),
|
||||||
|
select.projection[2]
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
SelectItem::UnnamedExpr(Expr::BinaryOp {
|
||||||
|
left: Box::new(Expr::Value(Value::Boolean(false))),
|
||||||
|
op: BinaryOperator::Xor,
|
||||||
|
right: Box::new(Expr::Value(Value::Boolean(true))),
|
||||||
|
}),
|
||||||
|
select.projection[3]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue