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
3 changes: 2 additions & 1 deletion src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3503,7 +3503,8 @@ impl<'a> Parser<'a> {
///
/// [map]: https://duckdb.org/docs/sql/data_types/map.html#creating-maps
fn parse_duckdb_map_field(&mut self) -> Result<MapEntry, ParserError> {
let key = self.parse_expr()?;
// Stop before `:` so it can act as a key/value separator
let key = self.parse_subexpr(self.dialect.prec_value(Precedence::Colon))?;

self.expect_token(&Token::Colon)?;

Expand Down
53 changes: 53 additions & 0 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13584,6 +13584,10 @@ fn test_map_syntax() {
Expr::value(number(s))
}

fn null_expr() -> Expr {
Expr::Value((Value::Null).with_empty_span())
}

check(
"MAP {1: 10.0, 2: 20.0}",
Expr::Map(Map {
Expand Down Expand Up @@ -13648,6 +13652,55 @@ fn test_map_syntax() {
);

check("MAP {}", Expr::Map(Map { entries: vec![] }));

check(
"MAP {'a': 1, 'b': NULL}",
Expr::Map(Map {
entries: vec![
MapEntry {
key: Box::new(Expr::Value(
(Value::SingleQuotedString("a".to_owned())).with_empty_span(),
)),
value: Box::new(number_expr("1")),
},
MapEntry {
key: Box::new(Expr::Value(
(Value::SingleQuotedString("b".to_owned())).with_empty_span(),
)),
value: Box::new(null_expr()),
},
],
}),
);

check(
"MAP {1: [1, NULL, 3], 2: [4, NULL, 6], 3: [7, 8, 9]}",
Expr::Map(Map {
entries: vec![
MapEntry {
key: Box::new(number_expr("1")),
value: Box::new(Expr::Array(Array {
elem: vec![number_expr("1"), null_expr(), number_expr("3")],
named: false,
})),
},
MapEntry {
key: Box::new(number_expr("2")),
value: Box::new(Expr::Array(Array {
elem: vec![number_expr("4"), null_expr(), number_expr("6")],
named: false,
})),
},
MapEntry {
key: Box::new(number_expr("3")),
value: Box::new(Expr::Array(Array {
elem: vec![number_expr("7"), number_expr("8"), number_expr("9")],
named: false,
})),
},
],
}),
);
}

#[test]
Expand Down