Skip to content

Apache DataFusion SQL Query Engine

fix: Unparse `random` as `rand` for some dialects (#26009)

Nuno Faria2951e1271e94
diff --git a/datafusion/core/tests/sql/unparser.rs b/datafusion/core/tests/sql/unparser.rs
index 14c04789e2..345070e514 100644
--- a/datafusion/core/tests/sql/unparser.rs
+++ b/datafusion/core/tests/sql/unparser.rs
@@ -889,7 +889,7 @@ async fn optimized_filter_after_projection() -> Result<()> {
let sql = unparser.plan_to_sql(&plan)?.to_string();
assert_eq!(
sql,
- "SELECT * FROM (SELECT `t`.`a`, random() AS `x` FROM `t`) AS `derived_projection` WHERE (`x` > CAST(`derived_projection`.`a` AS DOUBLE))"
+ "SELECT * FROM (SELECT `t`.`a`, rand() AS `x` FROM `t`) AS `derived_projection` WHERE (`x` > CAST(`derived_projection`.`a` AS DOUBLE))"
);
Ok(())
diff --git a/datafusion/sql/src/unparser/dialect.rs b/datafusion/sql/src/unparser/dialect.rs
index bea4e35300..fbe7323bc9 100644
--- a/datafusion/sql/src/unparser/dialect.rs
+++ b/datafusion/sql/src/unparser/dialect.rs
@@ -620,6 +620,11 @@ impl Dialect for MySqlDialect {
return date_part_to_sql(unparser, self.date_field_extract_style(), args);
}
+ // https://dev.mysql.com/doc/refman/9.7/en/mathematical-functions.html#function_rand
+ if func_name == "random" {
+ return Ok(Some(unparser.scalar_function_to_sql("rand", args)?));
+ }
+
Ok(None)
}
}
@@ -760,6 +765,11 @@ impl Dialect for BigQueryDialect {
return date_part_to_sql(unparser, self.date_field_extract_style(), args);
}
+ // https://docs.cloud.google.com/bigquery/docs/reference/standard-sql/mathematical_functions#rand
+ if func_name == "random" {
+ return Ok(Some(unparser.scalar_function_to_sql("rand", args)?));
+ }
+
Ok(None)
}
}
diff --git a/datafusion/sql/src/unparser/expr.rs b/datafusion/sql/src/unparser/expr.rs
index c590c89d66..c1a8c921a4 100644
--- a/datafusion/sql/src/unparser/expr.rs
+++ b/datafusion/sql/src/unparser/expr.rs
@@ -1964,7 +1964,7 @@ mod tests {
use std::ops::{Add, Sub};
use std::{sync::Arc, vec};
- use crate::unparser::dialect::{MySqlDialect, SqliteDialect};
+ use crate::unparser::dialect::{MySqlDialect, SnowflakeDialect, SqliteDialect};
use arrow::array::{LargeListArray, LargeListViewArray, ListArray, ListViewArray};
use arrow::datatypes::{DataType::Int8, Field, Int32Type, Schema, TimeUnit};
use ast::ObjectName;
@@ -3974,6 +3974,33 @@ mod tests {
);
}
+ #[test]
+ fn test_random_function() -> Result<()> {
+ let duckdb_dialect = DuckDBDialect::new();
+ let dialects = vec![
+ (Unparser::new(&DefaultDialect {}), "random()"),
+ (Unparser::new(&PostgreSqlDialect {}), "random()"),
+ (Unparser::new(&duckdb_dialect), "random()"),
+ (Unparser::new(&MySqlDialect {}), "rand()"),
+ (Unparser::new(&SqliteDialect {}), "random()"),
+ (Unparser::new(&BigQueryDialect {}), "rand()"),
+ (Unparser::new(&SnowflakeDialect {}), "random()"),
+ ];
+
+ let expr = Expr::ScalarFunction(ScalarFunction {
+ func: Arc::new(ScalarUDF::from(
+ datafusion_functions::math::random::RandomFunc::new(),
+ )),
+ args: vec![],
+ });
+
+ for (unparser, result) in dialects {
+ assert_eq!(unparser.expr_to_sql(&expr)?.to_string(), result);
+ }
+
+ Ok(())
+ }
+
#[test]
fn test_unparse_null_treatment_window_and_aggregate() -> Result<()> {
use datafusion_expr::expr::NullTreatment;