From dd68f71403cb877cfa0ec9d7efc3eecde53e7df8 Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Thu, 9 Apr 2026 11:11:35 +0100 Subject: [PATCH 1/3] Make pass regardless of build setup and dependencies --- datafusion/expr/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/datafusion/expr/Cargo.toml b/datafusion/expr/Cargo.toml index 265651cfe0eb0..8cec01feb30b5 100644 --- a/datafusion/expr/Cargo.toml +++ b/datafusion/expr/Cargo.toml @@ -66,3 +66,6 @@ sqlparser = { workspace = true, optional = true } ctor = { workspace = true } env_logger = { workspace = true } insta = { workspace = true } +# Makes sure `test_display_pg_json` behaves in a consistent way regardless of +# feature unification with dependencies +serde_json = { workspace = true, features = ["preserve_order"] } From f7919b4dc7eb3b7472d4d02ca2054a4d0300b557 Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Thu, 9 Apr 2026 13:12:02 +0100 Subject: [PATCH 2/3] Add sqllogictest fix --- Cargo.lock | 1 + datafusion/sqllogictest/Cargo.toml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 983a74ed3cf03..f71c37f29a75f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2659,6 +2659,7 @@ dependencies = [ "object_store", "postgres-types", "regex", + "serde_json", "sqllogictest", "sqlparser", "tempfile", diff --git a/datafusion/sqllogictest/Cargo.toml b/datafusion/sqllogictest/Cargo.toml index d7bb2583c9d8c..d4da9172c9c33 100644 --- a/datafusion/sqllogictest/Cargo.toml +++ b/datafusion/sqllogictest/Cargo.toml @@ -84,6 +84,9 @@ substrait = ["datafusion-substrait"] [dev-dependencies] env_logger = { workspace = true } regex = { workspace = true } +# Required to make sure tests for pg display behaves consistently +# regardless of feature unification with dependencies +serde_json = { workspace = true, features = ["preserve_order"] } tokio = { workspace = true, features = ["rt-multi-thread"] } [[test]] From ed4943a52c673d06edb24e7829b544e8fbdafb3b Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Mon, 13 Apr 2026 10:39:27 +0100 Subject: [PATCH 3/3] Fix machete error Signed-off-by: Adam Gutglick --- datafusion/sqllogictest/Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/datafusion/sqllogictest/Cargo.toml b/datafusion/sqllogictest/Cargo.toml index d4da9172c9c33..1159b7f3b703a 100644 --- a/datafusion/sqllogictest/Cargo.toml +++ b/datafusion/sqllogictest/Cargo.toml @@ -93,3 +93,8 @@ tokio = { workspace = true, features = ["rt-multi-thread"] } harness = false name = "sqllogictests" path = "bin/sqllogictests.rs" + +# Required because we pull serde_json with a feature to get consistent pg display, +# but its not directly used. +[package.metadata.cargo-machete] +ignored = "serde_json"