iffyio commented on code in PR #1679:
URL:
https://github.com/apache/datafusion-sqlparser-rs/pull/1679#discussion_r1927412763
##########
tests/sqlparser_bigquery.rs:
##########
@@ -48,34 +48,34 @@ fn parse_literal_string() {
let select = dialect.verified_only_select(sql);
assert_eq!(10, select.projection.len());
assert_eq!(
- &Expr::Value(Value::SingleQuotedString("single".to_string())),
+ &Expr::Value(Value::SingleQuotedString("single".into())),
Review Comment:
not sure I followed the intent behind the changes from `into()` to
`to_string()`, I figure they should be equivalent?
##########
tests/sqlparser_bigquery.rs:
##########
@@ -2214,6 +2214,30 @@ fn test_select_as_value() {
assert_eq!(Some(ValueTableMode::AsValue), select.value_table_mode);
}
+#[test]
+fn test_typed_strings() {
+ 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
+ );
+
+ let expr = bigquery().verified_expr(r#"JSON '''{"foo":"bar's"}'''"#);
+ if let Expr::TypedString { data_type, value } = expr {
+ assert_eq!(DataType::JSON, data_type);
+ let string_value: String = value.into();
+ assert_eq!(r#"{"foo":"bar's"}"#, string_value);
+ }
+
+ // SingleQuotedString and DoubleQuotedString are currently not correctly
formatted by `fmt::Display for Value`.
+ // BigQuery does not support double escaping, should be \' or \" instead.
+ //bigquery().verified_expr(r#"JSON '{"foo":"bar\'s"}'"#);
+ //bigquery().verified_expr(r#"JSON "{\"foo\":\"bar's\"}""#);
Review Comment:
is this part a TODO for this PR?
##########
src/ast/value.rs:
##########
@@ -97,6 +97,32 @@ pub enum Value {
Placeholder(String),
}
+impl Into<String> for Value {
+ fn into(self) -> String {
+ match self {
+ Value::SingleQuotedString(s) => s,
+ Value::TripleSingleQuotedString(s) => s,
+ Value::TripleDoubleQuotedString(s) => s,
+ Value::EscapedStringLiteral(s) => s,
+ Value::UnicodeStringLiteral(s) => s,
+ Value::SingleQuotedByteStringLiteral(s) => s,
+ Value::DoubleQuotedByteStringLiteral(s) => s,
+ Value::TripleSingleQuotedByteStringLiteral(s) => s,
+ Value::TripleDoubleQuotedByteStringLiteral(s) => s,
+ Value::SingleQuotedRawStringLiteral(s) => s,
+ Value::DoubleQuotedRawStringLiteral(s) => s,
+ Value::TripleSingleQuotedRawStringLiteral(s) => s,
+ Value::TripleDoubleQuotedRawStringLiteral(s) => s,
+ Value::NationalStringLiteral(s) => s,
+ Value::HexStringLiteral(s) => s,
+ Value::DoubleQuotedString(s) => s,
+ Value::Placeholder(s) => s,
+ Value::DollarQuotedString(s) => s.value,
+ _ => panic!("not a string value"),
Review Comment:
it wasn't clear to me in the PR why the `Into<String>` for `Value` was
needed, did we need it for something in this PR?
##########
tests/sqlparser_bigquery.rs:
##########
@@ -39,7 +39,7 @@ fn parse_literal_string() {
r#"'''triple-single'unescaped''', "#,
r#""double\"escaped", "#,
r#""""triple-double\"escaped""", "#,
- r#""""triple-double"unescaped""""#,
+ r#""""triple-double"un'escaped""""#,
Review Comment:
was this change intentional?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
