From 024f3b72568b89d3a07f86a17d51c33b83d851e9 Mon Sep 17 00:00:00 2001
From: Shehab <11789402+shehabgamin@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:06:56 -0800
Subject: [PATCH 1/4] Downgrade Jitter to 0.7.1

---
 Cargo.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6548081..0c5426b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,8 @@ rust-version = "1.80.1"
 
 [dependencies]
 datafusion = { version = "44", default-features = false }
-jiter = "0.8"
+# Jitter has a dependency on pyo3, which needs to match the version used in DataFusion
+jiter = "0.7.1"
 paste = "1"
 log = "0.4"
 

From 93b8fb6bce0fd504115ff9b5630936956600a556 Mon Sep 17 00:00:00 2001
From: Shehab <11789402+shehabgamin@users.noreply.github.com>
Date: Wed, 22 Jan 2025 01:59:10 -0800
Subject: [PATCH 2/4] jitter 0.8

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index d6e7449..5e4e4d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ rust-version = "1.80.1"
 [dependencies]
 datafusion = { version = "44", default-features = false }
 # Jitter has a dependency on pyo3, which needs to match the version used in DataFusion
-jiter = "0.7.1"
+jiter = "0.8"
 paste = "1"
 log = "0.4"
 

From 99a1a99c28abe80d215bbcda5c8b0e0a7bf08951 Mon Sep 17 00:00:00 2001
From: Shehab <11789402+shehabgamin@users.noreply.github.com>
Date: Fri, 7 Feb 2025 22:04:29 -0800
Subject: [PATCH 3/4] df 45

---
 Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 234923c..53d38fc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,14 +11,14 @@ repository = "https://github.com/datafusion-contrib/datafusion-functions-json/"
 rust-version = "1.80.1"
 
 [dependencies]
-datafusion = { version = "44", default-features = false }
+datafusion = { version = "45", default-features = false }
 # Jitter has a dependency on pyo3, which needs to match the version used in DataFusion
 jiter = "0.8"
 paste = "1"
 log = "0.4"
 
 [dev-dependencies]
-datafusion = { version = "44", default-features = false, features = ["nested_expressions"] }
+datafusion = { version = "45", default-features = false, features = ["nested_expressions"] }
 codspeed-criterion-compat = "2.6"
 criterion = "0.5.1"
 clap = "4"

From 6c0946800862363bf5346d5e5ad62de496f7441c Mon Sep 17 00:00:00 2001
From: Shehab <11789402+shehabgamin@users.noreply.github.com>
Date: Fri, 7 Feb 2025 22:28:23 -0800
Subject: [PATCH 4/4] DF 45 Patch

---
 Cargo.toml     | 4 ++--
 src/rewrite.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 53d38fc..8eff93f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,14 +11,14 @@ repository = "https://github.com/datafusion-contrib/datafusion-functions-json/"
 rust-version = "1.80.1"
 
 [dependencies]
-datafusion = { version = "45", default-features = false }
+datafusion = { git = "https://github.com/apache/datafusion.git", rev = "a9fb58c", default-features = false }
 # Jitter has a dependency on pyo3, which needs to match the version used in DataFusion
 jiter = "0.8"
 paste = "1"
 log = "0.4"
 
 [dev-dependencies]
-datafusion = { version = "45", default-features = false, features = ["nested_expressions"] }
+datafusion = { git = "https://github.com/apache/datafusion.git", rev = "a9fb58c", features = ["nested_expressions"] }
 codspeed-criterion-compat = "2.6"
 criterion = "0.5.1"
 clap = "4"
diff --git a/src/rewrite.rs b/src/rewrite.rs
index 72637a4..fd3d056 100644
--- a/src/rewrite.rs
+++ b/src/rewrite.rs
@@ -141,7 +141,7 @@ impl std::fmt::Display for JsonOperator {
 /// Convert an Expr to a String representatiion for use in alias names.
 fn expr_to_sql_repr(expr: &Expr) -> String {
     match expr {
-        Expr::Column(Column { name, relation }) => relation
+        Expr::Column(Column { name, relation, spans: _ }) => relation
             .as_ref()
             .map_or_else(|| name.clone(), |r| format!("{r}.{name}")),
         Expr::Alias(alias) => alias.name.clone(),