This is an automated email from the ASF dual-hosted git repository.
jonah pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 41487297d7 Support sqllogictest --complete with postgres (#13746)
41487297d7 is described below
commit 41487297d757b0f71bdea98fa3e035169c555af7
Author: Piotr Findeisen <[email protected]>
AuthorDate: Fri Dec 13 03:01:25 2024 +0100
Support sqllogictest --complete with postgres (#13746)
Before the change, the request to use PostgreSQL was simply ignored when
`--complete` flag was present.
---
datafusion/sqllogictest/bin/sqllogictests.rs | 46 ++++++++++++++++++++++++----
1 file changed, 40 insertions(+), 6 deletions(-)
diff --git a/datafusion/sqllogictest/bin/sqllogictests.rs
b/datafusion/sqllogictest/bin/sqllogictests.rs
index 176bd32291..be3f1cb251 100644
--- a/datafusion/sqllogictest/bin/sqllogictests.rs
+++ b/datafusion/sqllogictest/bin/sqllogictests.rs
@@ -101,12 +101,11 @@ async fn run_tests() -> Result<()> {
SpawnedTask::spawn(async move {
let file_path = test_file.relative_path.clone();
let start = datafusion::common::instant::Instant::now();
- if options.complete {
- run_complete_file(test_file).await?;
- } else if options.postgres_runner {
- run_test_file_with_postgres(test_file).await?;
- } else {
- run_test_file(test_file).await?;
+ match (options.postgres_runner, options.complete) {
+ (false, false) => run_test_file(test_file).await?,
+ (false, true) => run_complete_file(test_file).await?,
+ (true, false) =>
run_test_file_with_postgres(test_file).await?,
+ (true, true) =>
run_complete_file_with_postgres(test_file).await?,
}
println!("Executed {:?}. Took {:?}", file_path,
start.elapsed());
Ok(()) as Result<()>
@@ -227,6 +226,41 @@ async fn run_complete_file(test_file: TestFile) ->
Result<()> {
})
}
+#[cfg(feature = "postgres")]
+async fn run_complete_file_with_postgres(test_file: TestFile) -> Result<()> {
+ use datafusion_sqllogictest::Postgres;
+ let TestFile {
+ path,
+ relative_path,
+ } = test_file;
+ info!(
+ "Using complete mode to complete with Postgres runner: {}",
+ path.display()
+ );
+ setup_scratch_dir(&relative_path)?;
+ let mut runner =
+ sqllogictest::Runner::new(|| Postgres::connect(relative_path.clone()));
+ let col_separator = " ";
+ runner
+ .update_test_file(
+ path,
+ col_separator,
+ value_validator,
+ strict_column_validator,
+ )
+ .await
+ // Can't use e directly because it isn't marked Send, so turn it into
a string.
+ .map_err(|e| {
+ DataFusionError::Execution(format!("Error completing
{relative_path:?}: {e}"))
+ })
+}
+
+#[cfg(not(feature = "postgres"))]
+async fn run_complete_file_with_postgres(_test_file: TestFile) -> Result<()> {
+ use datafusion_common::plan_err;
+ plan_err!("Can not run with postgres as postgres feature is not enabled")
+}
+
/// Represents a parsed test file
#[derive(Debug)]
struct TestFile {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
