alamb commented on code in PR #1716:
URL:
https://github.com/apache/datafusion-sqlparser-rs/pull/1716#discussion_r1960475949
##########
tests/sqlparser_common.rs:
##########
@@ -12504,68 +12559,76 @@ fn test_try_convert() {
#[test]
fn parse_method_select() {
- let dialects = all_dialects_where(|d| d.supports_methods());
- let _ = dialects.verified_only_select(
+ let _ = verified_only_select(
"SELECT LEFT('abc', 1).value('.', 'NVARCHAR(MAX)').value('.',
'NVARCHAR(MAX)') AS T",
);
- let _ = dialects.verified_only_select("SELECT STUFF((SELECT ',' + name
FROM sys.objects FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '')
AS T");
- let _ = dialects
- .verified_only_select("SELECT CAST(column AS XML).value('.',
'NVARCHAR(MAX)') AS T");
+ let _ = verified_only_select("SELECT STUFF((SELECT ',' + name FROM
sys.objects FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS
T");
+ let _ = verified_only_select("SELECT CAST(column AS XML).value('.',
'NVARCHAR(MAX)') AS T");
// `CONVERT` support
- let dialects = all_dialects_where(|d| {
- d.supports_methods() && d.supports_try_convert() &&
d.convert_type_before_value()
- });
+ let dialects =
+ all_dialects_where(|d| d.supports_try_convert() &&
d.convert_type_before_value());
let _ = dialects.verified_only_select("SELECT CONVERT(XML,
'<Book>abc</Book>').value('.', 'NVARCHAR(MAX)').value('.', 'NVARCHAR(MAX)') AS
T");
}
#[test]
fn parse_method_expr() {
- let dialects = all_dialects_where(|d| d.supports_methods());
- let expr = dialects
- .verified_expr("LEFT('abc', 1).value('.', 'NVARCHAR(MAX)').value('.',
'NVARCHAR(MAX)')");
+ let expr =
+ verified_expr("LEFT('abc', 1).value('.', 'NVARCHAR(MAX)').value('.',
'NVARCHAR(MAX)')");
match expr {
- Expr::Method(Method { expr, method_chain }) => {
- assert!(matches!(*expr, Expr::Function(_)));
+ Expr::CompoundFieldAccess { root, access_chain } => {
+ assert!(matches!(*root, Expr::Function(_)));
assert!(matches!(
- method_chain[..],
- [Function { .. }, Function { .. }]
+ access_chain[..],
+ [
+ AccessExpr::Dot(Expr::Function(_)),
+ AccessExpr::Dot(Expr::Function(_))
+ ]
));
}
_ => unreachable!(),
}
- let expr = dialects.verified_expr(
+
+ let expr = verified_expr(
"(SELECT ',' + name FROM sys.objects FOR XML PATH(''),
TYPE).value('.', 'NVARCHAR(MAX)')",
);
match expr {
- Expr::Method(Method { expr, method_chain }) => {
- assert!(matches!(*expr, Expr::Subquery(_)));
- assert!(matches!(method_chain[..], [Function { .. }]));
+ Expr::CompoundFieldAccess { root, access_chain } => {
+ assert!(matches!(*root, Expr::Subquery(_)));
+ assert!(matches!(
+ access_chain[..],
+ [AccessExpr::Dot(Expr::Function(_))]
+ ));
}
_ => unreachable!(),
}
- let expr = dialects.verified_expr("CAST(column AS XML).value('.',
'NVARCHAR(MAX)')");
+ let expr = verified_expr("CAST(column AS XML).value('.',
'NVARCHAR(MAX)')");
match expr {
- Expr::Method(Method { expr, method_chain }) => {
- assert!(matches!(*expr, Expr::Cast { .. }));
- assert!(matches!(method_chain[..], [Function { .. }]));
+ Expr::CompoundFieldAccess { root, access_chain } => {
+ assert!(matches!(*root, Expr::Cast { .. }));
+ assert!(matches!(
+ access_chain[..],
+ [AccessExpr::Dot(Expr::Function(_))]
+ ));
}
_ => unreachable!(),
}
// `CONVERT` support
- let dialects = all_dialects_where(|d| {
- d.supports_methods() && d.supports_try_convert() &&
d.convert_type_before_value()
- });
+ let dialects =
+ all_dialects_where(|d| d.supports_try_convert() &&
d.convert_type_before_value());
let expr = dialects.verified_expr(
"CONVERT(XML, '<Book>abc</Book>').value('.',
'NVARCHAR(MAX)').value('.', 'NVARCHAR(MAX)')",
);
match expr {
- Expr::Method(Method { expr, method_chain }) => {
- assert!(matches!(*expr, Expr::Convert { .. }));
+ Expr::CompoundFieldAccess { root, access_chain } => {
Review Comment:
it is nice to have a unified AST representation here
--
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
