mirror of
https://github.com/apache/datafusion-sqlparser-rs.git
synced 2025-08-04 14:28:22 +00:00
Make TypedString preserve quote style (#1679)
This commit is contained in:
Paul Grau
GitHub
parent
aeaafbe6e4
commit
447142c6d0
7 changed files with 132 additions and 55 deletions
|
|
@ -39,43 +39,45 @@ fn parse_literal_string() {
|
|||
r#"'''triple-single'unescaped''', "#,
|
||||
r#""double\"escaped", "#,
|
||||
r#""""triple-double\"escaped""", "#,
|
||||
r#""""triple-double"unescaped""""#,
|
||||
r#""""triple-double"unescaped""", "#,
|
||||
r#""""triple-double'unescaped""", "#,
|
||||
r#"'''triple-single"unescaped'''"#,
|
||||
);
|
||||
let dialect = TestedDialects::new_with_options(
|
||||
vec![Box::new(BigQueryDialect {})],
|
||||
ParserOptions::new().with_unescape(false),
|
||||
);
|
||||
let select = dialect.verified_only_select(sql);
|
||||
assert_eq!(10, select.projection.len());
|
||||
assert_eq!(12, select.projection.len());
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::SingleQuotedString("single".to_string())),
|
||||
&Expr::Value(Value::SingleQuotedString("single".into())),
|
||||
expr_from_projection(&select.projection[0])
|
||||
);
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::DoubleQuotedString("double".to_string())),
|
||||
&Expr::Value(Value::DoubleQuotedString("double".into())),
|
||||
expr_from_projection(&select.projection[1])
|
||||
);
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::TripleSingleQuotedString("triple-single".to_string())),
|
||||
&Expr::Value(Value::TripleSingleQuotedString("triple-single".into())),
|
||||
expr_from_projection(&select.projection[2])
|
||||
);
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::TripleDoubleQuotedString("triple-double".to_string())),
|
||||
&Expr::Value(Value::TripleDoubleQuotedString("triple-double".into())),
|
||||
expr_from_projection(&select.projection[3])
|
||||
);
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::SingleQuotedString(r#"single\'escaped"#.to_string())),
|
||||
&Expr::Value(Value::SingleQuotedString(r#"single\'escaped"#.into())),
|
||||
expr_from_projection(&select.projection[4])
|
||||
);
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::TripleSingleQuotedString(
|
||||
r#"triple-single\'escaped"#.to_string()
|
||||
r#"triple-single\'escaped"#.into()
|
||||
)),
|
||||
expr_from_projection(&select.projection[5])
|
||||
);
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::TripleSingleQuotedString(
|
||||
r#"triple-single'unescaped"#.to_string()
|
||||
r#"triple-single'unescaped"#.into()
|
||||
)),
|
||||
expr_from_projection(&select.projection[6])
|
||||
);
|
||||
|
|
@ -95,6 +97,18 @@ fn parse_literal_string() {
|
|||
)),
|
||||
expr_from_projection(&select.projection[9])
|
||||
);
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::TripleDoubleQuotedString(
|
||||
r#"triple-double'unescaped"#.to_string()
|
||||
)),
|
||||
expr_from_projection(&select.projection[10])
|
||||
);
|
||||
assert_eq!(
|
||||
&Expr::Value(Value::TripleSingleQuotedString(
|
||||
r#"triple-single"unescaped"#.to_string()
|
||||
)),
|
||||
expr_from_projection(&select.projection[11])
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -588,7 +602,7 @@ fn parse_tuple_struct_literal() {
|
|||
&Expr::Tuple(vec![
|
||||
Expr::Value(number("1")),
|
||||
Expr::Value(number("1.0")),
|
||||
Expr::Value(Value::SingleQuotedString("123".to_string())),
|
||||
Expr::Value(Value::SingleQuotedString("123".into())),
|
||||
Expr::Value(Value::Boolean(true))
|
||||
]),
|
||||
expr_from_projection(&select.projection[1])
|
||||
|
|
@ -616,7 +630,7 @@ fn parse_typeless_struct_syntax() {
|
|||
|
||||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Value(Value::SingleQuotedString("abc".to_string())),],
|
||||
values: vec![Expr::Value(Value::SingleQuotedString("abc".into())),],
|
||||
fields: Default::default()
|
||||
},
|
||||
expr_from_projection(&select.projection[1])
|
||||
|
|
@ -639,7 +653,7 @@ fn parse_typeless_struct_syntax() {
|
|||
name: Ident::from("a")
|
||||
},
|
||||
Expr::Named {
|
||||
expr: Expr::Value(Value::SingleQuotedString("abc".to_string())).into(),
|
||||
expr: Expr::Value(Value::SingleQuotedString("abc".into())).into(),
|
||||
name: Ident::from("b")
|
||||
},
|
||||
],
|
||||
|
|
@ -804,9 +818,7 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
assert_eq!(4, select.projection.len());
|
||||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Value(Value::DoubleQuotedString(
|
||||
"2011-05-05".to_string()
|
||||
)),],
|
||||
values: vec![Expr::Value(Value::DoubleQuotedString("2011-05-05".into())),],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
field_type: DataType::Date
|
||||
|
|
@ -818,7 +830,7 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::Datetime(None),
|
||||
value: "1999-01-01 01:23:34.45".to_string()
|
||||
value: Value::SingleQuotedString("1999-01-01 01:23:34.45".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -854,7 +866,7 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Interval(Interval {
|
||||
value: Box::new(Expr::Value(Value::SingleQuotedString("2".to_string()))),
|
||||
value: Box::new(Expr::Value(Value::SingleQuotedString("2".into()))),
|
||||
leading_field: Some(DateTimeField::Hour),
|
||||
leading_precision: None,
|
||||
last_field: None,
|
||||
|
|
@ -871,7 +883,9 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::JSON,
|
||||
value: r#"{"class" : {"students" : [{"name" : "Jane"}]}}"#.to_string()
|
||||
value: Value::SingleQuotedString(
|
||||
r#"{"class" : {"students" : [{"name" : "Jane"}]}}"#.into()
|
||||
)
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -886,7 +900,7 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
assert_eq!(3, select.projection.len());
|
||||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Value(Value::DoubleQuotedString("foo".to_string())),],
|
||||
values: vec![Expr::Value(Value::DoubleQuotedString("foo".into())),],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
field_type: DataType::String(Some(42))
|
||||
|
|
@ -898,7 +912,7 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::Timestamp(None, TimezoneInfo::None),
|
||||
value: "2008-12-25 15:30:00 America/Los_Angeles".to_string()
|
||||
value: Value::SingleQuotedString("2008-12-25 15:30:00 America/Los_Angeles".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -912,7 +926,7 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::Time(None, TimezoneInfo::None),
|
||||
value: "15:30:00".to_string()
|
||||
value: Value::SingleQuotedString("15:30:00".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -929,7 +943,7 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::Numeric(ExactNumberInfo::None),
|
||||
value: "1".to_string()
|
||||
value: Value::SingleQuotedString("1".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -942,7 +956,7 @@ fn parse_typed_struct_syntax_bigquery() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::BigNumeric(ExactNumberInfo::None),
|
||||
value: "1".to_string()
|
||||
value: Value::SingleQuotedString("1".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -1119,9 +1133,7 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
assert_eq!(4, select.projection.len());
|
||||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Value(Value::SingleQuotedString(
|
||||
"2011-05-05".to_string()
|
||||
)),],
|
||||
values: vec![Expr::Value(Value::SingleQuotedString("2011-05-05".into())),],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
field_type: DataType::Date
|
||||
|
|
@ -1133,7 +1145,7 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::Datetime(None),
|
||||
value: "1999-01-01 01:23:34.45".to_string()
|
||||
value: Value::SingleQuotedString("1999-01-01 01:23:34.45".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -1169,7 +1181,7 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Interval(Interval {
|
||||
value: Box::new(Expr::Value(Value::SingleQuotedString("1".to_string()))),
|
||||
value: Box::new(Expr::Value(Value::SingleQuotedString("1".into()))),
|
||||
leading_field: Some(DateTimeField::Month),
|
||||
leading_precision: None,
|
||||
last_field: None,
|
||||
|
|
@ -1186,7 +1198,9 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::JSON,
|
||||
value: r#"{"class" : {"students" : [{"name" : "Jane"}]}}"#.to_string()
|
||||
value: Value::SingleQuotedString(
|
||||
r#"{"class" : {"students" : [{"name" : "Jane"}]}}"#.into()
|
||||
)
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -1201,7 +1215,7 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
assert_eq!(3, select.projection.len());
|
||||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Value(Value::SingleQuotedString("foo".to_string())),],
|
||||
values: vec![Expr::Value(Value::SingleQuotedString("foo".into())),],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
field_type: DataType::String(Some(42))
|
||||
|
|
@ -1213,7 +1227,7 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::Timestamp(None, TimezoneInfo::None),
|
||||
value: "2008-12-25 15:30:00 America/Los_Angeles".to_string()
|
||||
value: Value::SingleQuotedString("2008-12-25 15:30:00 America/Los_Angeles".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -1227,7 +1241,7 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::Time(None, TimezoneInfo::None),
|
||||
value: "15:30:00".to_string()
|
||||
value: Value::SingleQuotedString("15:30:00".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -1244,7 +1258,7 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::Numeric(ExactNumberInfo::None),
|
||||
value: "1".to_string()
|
||||
value: Value::SingleQuotedString("1".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -1257,7 +1271,7 @@ fn parse_typed_struct_syntax_bigquery_and_generic() {
|
|||
&Expr::Struct {
|
||||
values: vec![Expr::TypedString {
|
||||
data_type: DataType::BigNumeric(ExactNumberInfo::None),
|
||||
value: "1".to_string()
|
||||
value: Value::SingleQuotedString("1".into())
|
||||
},],
|
||||
fields: vec![StructField {
|
||||
field_name: None,
|
||||
|
|
@ -1285,7 +1299,7 @@ fn parse_typed_struct_with_field_name_bigquery() {
|
|||
);
|
||||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Value(Value::DoubleQuotedString("foo".to_string())),],
|
||||
values: vec![Expr::Value(Value::DoubleQuotedString("foo".into())),],
|
||||
fields: vec![StructField {
|
||||
field_name: Some(Ident::from("y")),
|
||||
field_type: DataType::String(None)
|
||||
|
|
@ -1332,7 +1346,7 @@ fn parse_typed_struct_with_field_name_bigquery_and_generic() {
|
|||
);
|
||||
assert_eq!(
|
||||
&Expr::Struct {
|
||||
values: vec![Expr::Value(Value::SingleQuotedString("foo".to_string())),],
|
||||
values: vec![Expr::Value(Value::SingleQuotedString("foo".into())),],
|
||||
fields: vec![StructField {
|
||||
field_name: Some(Ident::from("y")),
|
||||
field_type: DataType::String(None)
|
||||
|
|
@ -2234,6 +2248,20 @@ fn test_select_as_value() {
|
|||
assert_eq!(Some(ValueTableMode::AsValue), select.value_table_mode);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_triple_quote_typed_strings() {
|
||||
bigquery().verified_expr(r#"JSON '''{"foo":"bar's"}'''"#);
|
||||
|
||||
let expr = bigquery().verified_expr(r#"JSON """{"foo":"bar's"}""""#);
|
||||
assert_eq!(
|
||||
Expr::TypedString {
|
||||
data_type: DataType::JSON,
|
||||
value: Value::TripleDoubleQuotedString(r#"{"foo":"bar's"}"#.into())
|
||||
},
|
||||
expr
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_array_agg() {
|
||||
bigquery_and_generic().verified_expr("ARRAY_AGG(state)");
|
||||
|
|
|
|||
|
|
@ -5409,7 +5409,7 @@ fn parse_literal_date() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::Date,
|
||||
value: "1999-01-01".into(),
|
||||
value: Value::SingleQuotedString("1999-01-01".into()),
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -5422,7 +5422,7 @@ fn parse_literal_time() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::Time(None, TimezoneInfo::None),
|
||||
value: "01:23:34".into(),
|
||||
value: Value::SingleQuotedString("01:23:34".into()),
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -5435,7 +5435,7 @@ fn parse_literal_datetime() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::Datetime(None),
|
||||
value: "1999-01-01 01:23:34.45".into(),
|
||||
value: Value::SingleQuotedString("1999-01-01 01:23:34.45".into()),
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -5448,7 +5448,7 @@ fn parse_literal_timestamp_without_time_zone() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::Timestamp(None, TimezoneInfo::None),
|
||||
value: "1999-01-01 01:23:34".into(),
|
||||
value: Value::SingleQuotedString("1999-01-01 01:23:34".into()),
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -5463,7 +5463,7 @@ fn parse_literal_timestamp_with_time_zone() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::Timestamp(None, TimezoneInfo::Tz),
|
||||
value: "1999-01-01 01:23:34Z".into(),
|
||||
value: Value::SingleQuotedString("1999-01-01 01:23:34Z".into()),
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -6015,7 +6015,8 @@ fn parse_json_keyword() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::JSON,
|
||||
value: r#"{
|
||||
value: Value::SingleQuotedString(
|
||||
r#"{
|
||||
"id": 10,
|
||||
"type": "fruit",
|
||||
"name": "apple",
|
||||
|
|
@ -6035,12 +6036,30 @@ fn parse_json_keyword() {
|
|||
]
|
||||
}
|
||||
}"#
|
||||
.into()
|
||||
.to_string()
|
||||
)
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_typed_strings() {
|
||||
let expr = verified_expr(r#"JSON '{"foo":"bar"}'"#);
|
||||
assert_eq!(
|
||||
Expr::TypedString {
|
||||
data_type: DataType::JSON,
|
||||
value: Value::SingleQuotedString(r#"{"foo":"bar"}"#.into())
|
||||
},
|
||||
expr
|
||||
);
|
||||
|
||||
if let Expr::TypedString { data_type, value } = expr {
|
||||
assert_eq!(DataType::JSON, data_type);
|
||||
assert_eq!(r#"{"foo":"bar"}"#, value.into_string().unwrap());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_bignumeric_keyword() {
|
||||
let sql = r#"SELECT BIGNUMERIC '0'"#;
|
||||
|
|
@ -6048,7 +6067,7 @@ fn parse_bignumeric_keyword() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::BigNumeric(ExactNumberInfo::None),
|
||||
value: r#"0"#.into()
|
||||
value: Value::SingleQuotedString(r#"0"#.into())
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -6059,7 +6078,7 @@ fn parse_bignumeric_keyword() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::BigNumeric(ExactNumberInfo::None),
|
||||
value: r#"123456"#.into()
|
||||
value: Value::SingleQuotedString(r#"123456"#.into())
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -6070,7 +6089,7 @@ fn parse_bignumeric_keyword() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::BigNumeric(ExactNumberInfo::None),
|
||||
value: r#"-3.14"#.into()
|
||||
value: Value::SingleQuotedString(r#"-3.14"#.into())
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -6081,7 +6100,7 @@ fn parse_bignumeric_keyword() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::BigNumeric(ExactNumberInfo::None),
|
||||
value: r#"-0.54321"#.into()
|
||||
value: Value::SingleQuotedString(r#"-0.54321"#.into())
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -6092,7 +6111,7 @@ fn parse_bignumeric_keyword() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::BigNumeric(ExactNumberInfo::None),
|
||||
value: r#"1.23456e05"#.into()
|
||||
value: Value::SingleQuotedString(r#"1.23456e05"#.into())
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
@ -6103,7 +6122,7 @@ fn parse_bignumeric_keyword() {
|
|||
assert_eq!(
|
||||
&Expr::TypedString {
|
||||
data_type: DataType::BigNumeric(ExactNumberInfo::None),
|
||||
value: r#"-9.876e-3"#.into()
|
||||
value: Value::SingleQuotedString(r#"-9.876e-3"#.into())
|
||||
},
|
||||
expr_from_projection(only(&select.projection)),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -4638,7 +4638,7 @@ fn parse_at_time_zone() {
|
|||
left: Box::new(Expr::AtTimeZone {
|
||||
timestamp: Box::new(Expr::TypedString {
|
||||
data_type: DataType::Timestamp(None, TimezoneInfo::None),
|
||||
value: "2001-09-28 01:00".to_owned(),
|
||||
value: Value::SingleQuotedString("2001-09-28 01:00".to_string()),
|
||||
}),
|
||||
time_zone: Box::new(Expr::Cast {
|
||||
kind: CastKind::DoubleColon,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue