From 996b65f479d22fe372386d258f2b8402bd8bf6fe Mon Sep 17 00:00:00 2001
From: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
Date: Fri, 24 Oct 2025 09:23:42 -0500
Subject: [PATCH 1/2] Add entry to upgrade guide for #18231

Generated by Claude
---
 docs/source/library-user-guide/upgrading.md | 33 +++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/docs/source/library-user-guide/upgrading.md b/docs/source/library-user-guide/upgrading.md
index 8b03193e7f992..4ef95ef418ef5 100644
--- a/docs/source/library-user-guide/upgrading.md
+++ b/docs/source/library-user-guide/upgrading.md
@@ -116,6 +116,39 @@ Users may need to update their paths to account for these changes.
 
 See [issue #17713] for more details.
 
+### `FileScanConfigBuilder` now uses `TableSchema` internally
+
+The `FileScanConfigBuilder` has been refactored to use `TableSchema` directly instead of managing `file_schema` and `table_partition_cols` separately. This simplifies the builder's internal state management and makes the API more consistent.
+
+**Impact:** This change is mostly internal and should not affect most users. The public API of `FileScanConfigBuilder` remains the same - you still use `with_table_partition_cols()` to set partition columns.
+
+However, if you were directly constructing `FileScanConfigBuilder` from a `FileScanConfig` (via the `From` trait) or accessing its internal fields, you may need to update your code.
+
+**Before:**
+
+```rust
+# /* comment to avoid running
+let builder = FileScanConfigBuilder {
+    file_schema: my_schema,
+    table_partition_cols: partition_cols,
+    ...
+};
+# */
+```
+
+**After:**
+
+```rust
+# /* comment to avoid running
+let builder = FileScanConfigBuilder::new(url, my_schema, file_source)
+    .with_table_partition_cols(partition_cols);
+# */
+```
+
+See [#18231] for details.
+
+[#18231]: https://github.com/apache/datafusion/pull/18231
+
 ## DataFusion `50.0.0`
 
 ### ListingTable automatically detects Hive Partitioned tables

From 2a6cb31a5a819ba6ee224f2a4c8f38b53b589951 Mon Sep 17 00:00:00 2001
From: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
Date: Fri, 24 Oct 2025 09:34:15 -0500
Subject: [PATCH 2/2] use ignore

---
 docs/source/library-user-guide/upgrading.md | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/source/library-user-guide/upgrading.md b/docs/source/library-user-guide/upgrading.md
index 4ef95ef418ef5..da62deb3bf7a4 100644
--- a/docs/source/library-user-guide/upgrading.md
+++ b/docs/source/library-user-guide/upgrading.md
@@ -126,23 +126,19 @@ However, if you were directly constructing `FileScanConfigBuilder` from a `FileS
 
 **Before:**
 
-```rust
-# /* comment to avoid running
+```rust,ignore
 let builder = FileScanConfigBuilder {
     file_schema: my_schema,
     table_partition_cols: partition_cols,
     ...
 };
-# */
 ```
 
 **After:**
 
-```rust
-# /* comment to avoid running
-let builder = FileScanConfigBuilder::new(url, my_schema, file_source)
-    .with_table_partition_cols(partition_cols);
-# */
+```rust,ignore
+let table_schema = TableSchema::new(my_schema, partition_cols);
+let builder = FileScanConfigBuilder::new(url, table_schema, file_source);
 ```
 
 See [#18231] for details.