Merge remote-tracking branch 'apache/main' into 12736/union-schema-handling

Author: alamb

Cargo.lock

@@ -78,7 +78,7 @@ repository = "https://github.com/apache/datafusion"
 # Define Minimum Supported Rust Version (MSRV)
 rust-version = "1.86.0"
 # Define DataFusion version
-version = "49.0.1"
+version = "49.0.2"
 
 [workspace.dependencies]
 # We turn off default-features for some dependencies here so the workspaces which inherit them can
@@ -173,12 +173,12 @@ recursive = "0.1.1"
 regex = "1.8"
 rstest = "0.25.0"
 serde_json = "1"
-sqlparser = { version = "0.55.0", default-features = false, features = ["std", "visitor"] }
+sqlparser = { version = "0.58.0", default-features = false, features = ["std", "visitor"] }
 tempfile = "3"
 testcontainers = { version = "0.24", features = ["default"] }
 testcontainers-modules = { version = "0.12" }
 tokio = { version = "1.47", features = ["macros", "rt", "sync"] }
-url = "2.5.4"
+url = "2.5.6"
 
 [profile.release]
 codegen-units = 1

Cargo.toml

@@ -340,6 +340,7 @@ SELECT COUNT(*) FROM hits;
 #[rstest]
 #[case("SELECT pow(1,'foo')")]
 #[case("SELECT CAST('not_a_number' AS INTEGER);")]
+#[cfg(feature = "backtrace")]
 fn test_backtrace_output(#[case] query: &str) {
     let mut cmd = cli();
     // Use a command that will cause an error and trigger backtrace

datafusion-cli/tests/cli_integration.rs

@@ -24,8 +24,10 @@ pub use parquet::encryption::decrypt::FileDecryptionProperties;
 pub use parquet::encryption::encrypt::FileEncryptionProperties;
 
 #[cfg(not(feature = "parquet_encryption"))]
+#[derive(Default, Debug)]
 pub struct FileDecryptionProperties;
 #[cfg(not(feature = "parquet_encryption"))]
+#[derive(Default, Debug)]
 pub struct FileEncryptionProperties;
 
 pub use crate::config::{ConfigFileDecryptionProperties, ConfigFileEncryptionProperties};

datafusion/common/src/encryption.rs

@@ -255,7 +255,14 @@ pub fn arrow_test_data() -> String {
 #[cfg(feature = "parquet")]
 pub fn parquet_test_data() -> String {
     match get_data_dir("PARQUET_TEST_DATA", "../../parquet-testing/data") {
-        Ok(pb) => pb.display().to_string(),
+        Ok(pb) => {
+            let mut path = pb.display().to_string();
+            if cfg!(target_os = "windows") {
+                // Replace backslashes (Windows paths; avoids some test issues).
+                path = path.replace("\\", "/");
+            }
+            path
+        }
         Err(err) => panic!("failed to get parquet data dir: {err}"),
     }
 }