diff --git a/Cargo.lock b/Cargo.lock
index cc5b62125a8..99fe711fcfd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -378,6 +378,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73a47aa0c771b5381de2b7f16998d351a6f4eb839f1e13d48353e17e873d969b"
 dependencies = [
  "bitflags",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
@@ -441,7 +443,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -458,7 +460,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -587,7 +589,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -643,7 +645,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -799,7 +801,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "syn 2.0.101",
+ "syn 2.0.103",
  "tempfile",
  "toml",
 ]
@@ -931,7 +933,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -984,7 +986,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1165,7 +1167,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1491,7 +1493,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1502,7 +1504,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -1521,9 +1523,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe060b978f74ab446be722adb8a274e052e005bf6dfd171caadc3abaad10080"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "arrow-ipc",
@@ -1546,7 +1547,6 @@ dependencies = [
  "datafusion-functions-aggregate",
  "datafusion-functions-table",
  "datafusion-functions-window",
- "datafusion-macros",
  "datafusion-optimizer",
  "datafusion-physical-expr",
  "datafusion-physical-expr-common",
@@ -1560,7 +1560,7 @@ dependencies = [
  "object_store",
  "parking_lot",
  "parquet",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "sqlparser",
  "tempfile",
@@ -1571,9 +1571,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-catalog"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fe34f401bd03724a1f96d12108144f8cd495a3cdda2bf5e091822fb80b7e66"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1597,9 +1596,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-catalog-listing"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4411b8e3bce5e0fc7521e44f201def2e2d5d1b5f176fb56e8cdc9942c890f00"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1620,9 +1618,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-common"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0734015d81c8375eb5d4869b7f7ecccc2ee8d6cb81948ef737cd0e7b743bd69c"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "ahash 0.8.12",
  "arrow",
@@ -1643,9 +1640,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-common-runtime"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5167bb1d2ccbb87c6bc36c295274d7a0519b14afcfdaf401d53cbcaa4ef4968b"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "futures",
  "log",
@@ -1654,9 +1650,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-datasource"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e602dcdf2f50c2abf297cc2203c73531e6f48b29516af7695d338cf2a778b1"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1676,7 +1671,7 @@ dependencies = [
  "log",
  "object_store",
  "parquet",
- "rand 0.8.5",
+ "rand 0.9.1",
  "tempfile",
  "tokio",
  "url",
@@ -1684,9 +1679,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-datasource-csv"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bb2253952dc32296ed5b84077cb2e0257fea4be6373e1c376426e17ead4ef6"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1709,9 +1703,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-datasource-json"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8c7f47a5d2fe03bfa521ec9bafdb8a5c82de8377f60967c3663f00c8790352"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1734,9 +1727,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-datasource-parquet"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27d15868ea39ed2dc266728b554f6304acd473de2142281ecfa1294bb7415923"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1759,21 +1751,19 @@ dependencies = [
  "object_store",
  "parking_lot",
  "parquet",
- "rand 0.8.5",
+ "rand 0.9.1",
  "tokio",
 ]
 
 [[package]]
 name = "datafusion-doc"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91f8c2c5788ef32f48ff56c68e5b545527b744822a284373ac79bba1ba47292"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 
 [[package]]
 name = "datafusion-execution"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06f004d100f49a3658c9da6fb0c3a9b760062d96cd4ad82ccc3b7b69a9fb2f84"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "dashmap",
@@ -1783,16 +1773,15 @@ dependencies = [
  "log",
  "object_store",
  "parking_lot",
- "rand 0.8.5",
+ "rand 0.9.1",
  "tempfile",
  "url",
 ]
 
 [[package]]
 name = "datafusion-expr"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a4e4ce3802609be38eeb607ee72f6fe86c3091460de9dbfae9e18db423b3964"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "chrono",
@@ -1810,9 +1799,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-expr-common"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ac9cf3b22bbbae8cdf8ceb33039107fde1b5492693168f13bd566b1bcc839"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "datafusion-common",
@@ -1823,9 +1811,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ddf0a0a2db5d2918349c978d42d80926c6aa2459cd8a3c533a84ec4bb63479e"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "arrow-buffer",
@@ -1840,7 +1827,7 @@ dependencies = [
  "hex",
  "itertools 0.14.0",
  "log",
- "rand 0.8.5",
+ "rand 0.9.1",
  "regex",
  "unicode-segmentation",
  "uuid",
@@ -1848,9 +1835,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-aggregate"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "408a05dafdc70d05a38a29005b8b15e21b0238734dab1e98483fcb58038c5aba"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "ahash 0.8.12",
  "arrow",
@@ -1869,9 +1855,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-aggregate-common"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "756d21da2dd6c9bef97af1504970ff56cbf35d03fbd4ffd62827f02f4d2279d4"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "ahash 0.8.12",
  "arrow",
@@ -1882,9 +1867,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-table"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9a97220736c8fff1446e936be90d57216c06f28969f9ffd3b72ac93c958c8a"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1898,10 +1882,10 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-window"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cefc2d77646e1aadd1d6a9c40088937aedec04e68c5f0465939912e1291f8193"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
+ "arrow",
  "datafusion-common",
  "datafusion-doc",
  "datafusion-expr",
@@ -1915,9 +1899,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-window-common"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4aff082c42fa6da99ce0698c85addd5252928c908eb087ca3cfa64ff16b313"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "datafusion-common",
  "datafusion-physical-expr-common",
@@ -1925,20 +1908,18 @@ dependencies = [
 
 [[package]]
 name = "datafusion-macros"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df6f88d7ee27daf8b108ba910f9015176b36fbc72902b1ca5c2a5f1d1717e1a1"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "datafusion-expr",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
 name = "datafusion-optimizer"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084d9f979c4b155346d3c34b18f4256e6904ded508e9554d90fed416415c3515"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "chrono",
@@ -1954,9 +1935,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-expr"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c536062b0076f4e30084065d805f389f9fe38af0ca75bcbac86bc5e9fbab65"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "ahash 0.8.12",
  "arrow",
@@ -1971,14 +1951,13 @@ dependencies = [
  "itertools 0.14.0",
  "log",
  "paste",
- "petgraph",
+ "petgraph 0.8.2",
 ]
 
 [[package]]
 name = "datafusion-physical-expr-common"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a92b53b3193fac1916a1c5b8e3f4347c526f6822e56b71faa5fb372327a863"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "ahash 0.8.12",
  "arrow",
@@ -1990,9 +1969,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-optimizer"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa0a5ac94c7cf3da97bedabd69d6bbca12aef84b9b37e6e9e8c25286511b5e2"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "datafusion-common",
@@ -2008,9 +1986,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-plan"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "690c615db468c2e5fe5085b232d8b1c088299a6c63d87fd960a354a71f7acb55"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "ahash 0.8.12",
  "arrow",
@@ -2038,9 +2015,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-session"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad229a134c7406c057ece00c8743c0c34b97f4e72f78b475fe17b66c5e14fa4f"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "async-trait",
@@ -2062,9 +2038,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-sql"
-version = "47.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f6ab28b72b664c21a27b22a2ff815fd390ed224c26e89a93b5a8154a4e8607"
+version = "48.0.0"
+source = "git+https://github.com/adamgs/arrow-datafusion.git?rev=4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0#4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0"
 dependencies = [
  "arrow",
  "bigdecimal",
@@ -2099,7 +2074,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2121,7 +2096,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2132,7 +2107,7 @@ checksum = "8dc51d98e636f5e3b0759a39257458b22619cac7e96d932da6eeb052891bb67c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2224,7 +2199,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -2497,7 +2472,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -3036,7 +3011,7 @@ dependencies = [
  "indoc",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -3143,7 +3118,7 @@ checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -3302,9 +3277,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libduckdb-sys"
@@ -3807,7 +3782,7 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4132,6 +4107,18 @@ dependencies = [
  "indexmap",
 ]
 
+[[package]]
+name = "petgraph"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca"
+dependencies = [
+ "fixedbitset",
+ "hashbrown 0.15.4",
+ "indexmap",
+ "serde",
+]
+
 [[package]]
 name = "phf"
 version = "0.11.3"
@@ -4187,7 +4174,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4275,7 +4262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4312,17 +4299,17 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
- "heck 0.5.0",
- "itertools 0.14.0",
+ "heck 0.4.1",
+ "itertools 0.13.0",
  "log",
  "multimap",
  "once_cell",
- "petgraph",
+ "petgraph 0.7.1",
  "prettyplease",
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.101",
+ "syn 2.0.103",
  "tempfile",
 ]
 
@@ -4333,10 +4320,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4435,7 +4422,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4448,7 +4435,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4673,7 +4660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
 dependencies = [
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -4877,7 +4864,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.101",
+ "syn 2.0.103",
  "unicode-ident",
 ]
 
@@ -4889,7 +4876,7 @@ checksum = "b3a8fb4672e840a587a66fc577a5491375df51ddb88f2a2c2a792598c326fe14"
 dependencies = [
  "quote",
  "rand 0.8.5",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5143,7 +5130,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5367,7 +5354,7 @@ checksum = "da5fc6819faabb412da764b99d3b713bb55083c11e7e0c00144d386cd6a1939c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5429,7 +5416,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5442,7 +5429,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5464,9 +5451,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5490,7 +5477,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5632,7 +5619,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5643,7 +5630,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5760,7 +5747,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -5923,7 +5910,7 @@ checksum = "1b1ffbcf9c6f6b99d386e7444eb608ba646ae452a36b39737deb9663b610f662"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -6922,7 +6909,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "wasm-bindgen-shared",
 ]
 
@@ -6957,7 +6944,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -7126,7 +7113,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7137,7 +7124,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7148,7 +7135,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7159,7 +7146,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7523,7 +7510,7 @@ dependencies = [
  "async-trait",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-macro-support",
@@ -7618,7 +7605,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "synstructure",
 ]
 
@@ -7639,7 +7626,7 @@ checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7659,7 +7646,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
  "synstructure",
 ]
 
@@ -7680,7 +7667,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
@@ -7713,7 +7700,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.103",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 2e52ffd5b28..9754ce36b90 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,16 +58,16 @@ anyhow = "1.0.95"
 arbitrary = "1.3.2"
 arcref = "0.2.0"
 arrayref = "0.3.7"
-arrow = { version = "55", default-features = false }
-arrow-arith = "55"
-arrow-array = "55"
-arrow-buffer = "55"
-arrow-cast = "55"
-arrow-data = "55"
-arrow-ord = "55"
-arrow-schema = "55"
-arrow-select = "55"
-arrow-string = "55"
+arrow = { version = "55.1", default-features = false }
+arrow-arith = "55.1"
+arrow-array = "55.1"
+arrow-buffer = "55.1"
+arrow-cast = "55.1"
+arrow-data = "55.1"
+arrow-ord = "55.1"
+arrow-schema = "55.1"
+arrow-select = "55.1"
+arrow-string = "55.1"
 async-stream = "0.3.6"
 async-trait = "0.1.88"
 bindgen = "0.71.1"
@@ -78,15 +78,15 @@ bzip2 = "0.5.0"
 cbindgen = "0.29.0"
 cc = "1.2"
 cfg-if = "1"
-chrono = "0.4.40"
+chrono = "0.4.41"
 clap = "4.5"
 compio = { version = "0.14", features = ["io-uring"], default-features = false }
 crossbeam-queue = "0.3"
 crossterm = "0.28"
 dashmap = "6.1.0"
-datafusion = { version = "47", default-features = false }
-datafusion-common = { version = "47" }
-datafusion-physical-plan = { version = "47" }
+datafusion = { version = "48", default-features = false, git = "https://github.com/adamgs/arrow-datafusion.git", rev = "4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0" }
+datafusion-common = { version = "48", git = "https://github.com/adamgs/arrow-datafusion.git", rev = "4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0" }
+datafusion-physical-plan = { version = "48", git = "https://github.com/adamgs/arrow-datafusion.git", rev = "4deefb1cb3f25b277a5c2f48c19fb8ac4767d8e0" }
 divan = { package = "codspeed-divan-compat", version = "2.8.0" }
 duckdb = { path = "duckdb-vortex/duckdb-rs/crates/duckdb", features = [
     "vtab-full",
@@ -102,7 +102,7 @@ futures = { version = "0.3.31", default-features = false }
 futures-util = "0.3.31"
 glob = "0.3.2"
 goldenfile = "1"
-half = { version = "2.5", features = ["std", "num-traits"] }
+half = { version = "2.6", features = ["std", "num-traits"] }
 hashbrown = "0.15.1"
 homedir = "0.3.3"
 humansize = "2.1.3"
@@ -124,7 +124,7 @@ once_cell = "1.21"
 opentelemetry = "0.29.0"
 opentelemetry-otlp = "0.29.0"
 opentelemetry_sdk = "0.29.0"
-parquet = "55"
+parquet = "55.1"
 paste = "1.0.15"
 pco = "0.4.4"
 pin-project = "1.1.5"
@@ -163,14 +163,14 @@ taffy = "0.8.0"
 tar = "0.4"
 tempfile = "3"
 thiserror = "2.0.3"
-tokio = "1.44.2"
+tokio = "1.45.1"
 tokio-stream = "0.1.17"
 tracing = { version = "0.1.41" }
 tracing-chrome = "0.7.2"
 tracing-futures = "0.2.5"
 tracing-subscriber = "0.3.19"
 url = "2.5.4"
-uuid = { version = "1.16", features = ["js"] }
+uuid = { version = "1.17", features = ["js"] }
 walkdir = "2.5.0"
 wasm-bindgen-futures = "0.4.39"
 witchcraft-metrics = "1.0.1"
diff --git a/bench-vortex/src/clickbench.rs b/bench-vortex/src/clickbench.rs
index 6842d45afdc..d2edc4a7849 100644
--- a/bench-vortex/src/clickbench.rs
+++ b/bench-vortex/src/clickbench.rs
@@ -216,8 +216,9 @@ pub async fn register_vortex_files(
 
     let table_url = ListingTableUrl::parse(vortex_path)?;
 
-    let config =
-        ListingTableConfig::new(table_url).with_listing_options(ListingOptions::new(format));
+    let config = ListingTableConfig::new(table_url).with_listing_options(
+        ListingOptions::new(format).with_session_config_options(session.state().config()),
+    );
 
     let config = if let Some(schema) = schema {
         config.with_schema(schema.into())
@@ -248,7 +249,9 @@ pub fn register_parquet_files(
     let table_url = ListingTableUrl::parse(table_path)?;
 
     let config = ListingTableConfig::new(table_url)
-        .with_listing_options(ListingOptions::new(format))
+        .with_listing_options(
+            ListingOptions::new(format).with_session_config_options(session.state().config()),
+        )
         .with_schema(schema.clone().into());
 
     let listing_table = Arc::new(ListingTable::try_new(config)?);
diff --git a/bench-vortex/src/datasets/file.rs b/bench-vortex/src/datasets/file.rs
index 0442eec8307..bd57429b2d1 100644
--- a/bench-vortex/src/datasets/file.rs
+++ b/bench-vortex/src/datasets/file.rs
@@ -66,8 +66,9 @@ pub async fn register_parquet_files(
             info!("Registering table from {}", &parquet_path);
             let table_url = ListingTableUrl::parse(parquet_path)?;
 
-            let config = ListingTableConfig::new(table_url)
-                .with_listing_options(ListingOptions::new(format));
+            let config = ListingTableConfig::new(table_url).with_listing_options(
+                ListingOptions::new(format).with_session_config_options(session.state().config()),
+            );
 
             let config = if let Some(schema) = schema {
                 config.with_schema(schema.into())
@@ -97,8 +98,9 @@ pub async fn register_vortex_files(
             // Register the Vortex file
             let format = Arc::new(VortexFormat::default());
             let table_url = ListingTableUrl::parse(file_url.as_str())?;
-            let config = ListingTableConfig::new(table_url)
-                .with_listing_options(ListingOptions::new(format));
+            let config = ListingTableConfig::new(table_url).with_listing_options(
+                ListingOptions::new(format).with_session_config_options(session.state().config()),
+            );
 
             let config = if let Some(schema) = schema {
                 config.with_schema(schema.into())
diff --git a/bench-vortex/src/public_bi.rs b/bench-vortex/src/public_bi.rs
index 48dfc85b641..b77e3e8ed31 100644
--- a/bench-vortex/src/public_bi.rs
+++ b/bench-vortex/src/public_bi.rs
@@ -393,7 +393,10 @@ impl PBIData {
             let path = self.get_file_path(&table.name, file_type);
             let table_url = ListingTableUrl::parse(path.to_str().expect("unicode"))?;
             let config = ListingTableConfig::new(table_url)
-                .with_listing_options(ListingOptions::new(df_format))
+                .with_listing_options(
+                    ListingOptions::new(df_format)
+                        .with_session_config_options(session.state().config()),
+                )
                 .with_schema(schema.into());
 
             let listing_table = Arc::new(ListingTable::try_new(config)?);
diff --git a/vortex-datafusion/examples/vortex_table.rs b/vortex-datafusion/examples/vortex_table.rs
index ce5840ea139..f43204da2bf 100644
--- a/vortex-datafusion/examples/vortex_table.rs
+++ b/vortex-datafusion/examples/vortex_table.rs
@@ -57,7 +57,9 @@ async fn main() -> anyhow::Result<()> {
             .ok_or_else(|| vortex_err!("Path is not valid UTF-8"))?,
     )?;
     let config = ListingTableConfig::new(table_url)
-        .with_listing_options(ListingOptions::new(format))
+        .with_listing_options(
+            ListingOptions::new(format).with_session_config_options(ctx.state().config()),
+        )
         .infer_schema(&ctx.state())
         .await?;
 
diff --git a/vortex-datafusion/src/lib.rs b/vortex-datafusion/src/lib.rs
index f6db570376e..4a4f94cf164 100644
--- a/vortex-datafusion/src/lib.rs
+++ b/vortex-datafusion/src/lib.rs
@@ -4,7 +4,9 @@ use std::fmt::Debug;
 
 use datafusion::arrow::datatypes::{DataType, Schema};
 use datafusion::common::stats::Precision as DFPrecision;
-use datafusion::logical_expr::{Expr, Operator};
+use datafusion::logical_expr::Operator;
+use datafusion::physical_expr::PhysicalExprRef;
+use datafusion::physical_plan::expressions::{BinaryExpr, Column, LikeExpr, Literal};
 use vortex::stats::Precision;
 
 mod convert;
@@ -47,26 +49,24 @@ fn supported_data_types(dt: DataType) -> bool {
     is_supported
 }
 
-fn can_be_pushed_down(expr: &Expr, schema: &Schema) -> bool {
-    match expr {
-        Expr::BinaryExpr(expr)
-            if expr.op.is_logic_operator() || SUPPORTED_BINARY_OPS.contains(&expr.op) =>
-        {
-            can_be_pushed_down(expr.left.as_ref(), schema)
-                & can_be_pushed_down(expr.right.as_ref(), schema)
-        }
-        Expr::Column(col) => match schema.column_with_name(col.name()) {
-            Some((_, field)) => supported_data_types(field.data_type().clone()),
-            _ => false,
-        },
-        Expr::Like(like) => {
-            can_be_pushed_down(&like.expr, schema) && can_be_pushed_down(&like.pattern, schema)
-        }
-        Expr::Literal(lit) => supported_data_types(lit.data_type()),
-        _ => {
-            log::debug!("DataFusion expression can't be pushed down: {expr:?}");
-            false
-        }
+fn can_be_pushed_down(expr: &PhysicalExprRef, schema: &Schema) -> bool {
+    let expr = expr.as_any();
+    if let Some(binary) = expr.downcast_ref::<BinaryExpr>() {
+        (binary.op().is_logic_operator() || SUPPORTED_BINARY_OPS.contains(binary.op()))
+            && can_be_pushed_down(binary.left(), schema)
+            && can_be_pushed_down(binary.right(), schema)
+    } else if let Some(col) = expr.downcast_ref::<Column>() {
+        schema
+            .column_with_name(col.name())
+            .map(|(_, field)| supported_data_types(field.data_type().clone()))
+            .unwrap_or(false)
+    } else if let Some(like) = expr.downcast_ref::<LikeExpr>() {
+        can_be_pushed_down(like.expr(), schema) && can_be_pushed_down(like.pattern(), schema)
+    } else if let Some(lit) = expr.downcast_ref::<Literal>() {
+        supported_data_types(lit.value().data_type())
+    } else {
+        log::debug!("DataFusion expression can't be pushed down: {expr:?}");
+        false
     }
 }
 
diff --git a/vortex-datafusion/src/persistent/format.rs b/vortex-datafusion/src/persistent/format.rs
index 72dc4465c7b..d8ab52e1de8 100644
--- a/vortex-datafusion/src/persistent/format.rs
+++ b/vortex-datafusion/src/persistent/format.rs
@@ -12,15 +12,14 @@ use datafusion::common::{
     config_datafusion_err, not_impl_err,
 };
 use datafusion::datasource::file_format::file_compression_type::FileCompressionType;
-use datafusion::datasource::file_format::{FileFormat, FileFormatFactory, FilePushdownSupport};
+use datafusion::datasource::file_format::{FileFormat, FileFormatFactory};
 use datafusion::datasource::physical_plan::{
     FileScanConfig, FileScanConfigBuilder, FileSinkConfig, FileSource,
 };
 use datafusion::datasource::sink::DataSinkExec;
 use datafusion::datasource::source::DataSourceExec;
-use datafusion::logical_expr::Expr;
 use datafusion::logical_expr::dml::InsertOp;
-use datafusion::physical_expr::{LexRequirement, PhysicalExpr};
+use datafusion::physical_expr::LexRequirement;
 use datafusion::physical_plan::ExecutionPlan;
 use futures::{FutureExt, StreamExt as _, TryStreamExt as _, stream};
 use itertools::Itertools;
@@ -28,7 +27,6 @@ use object_store::{ObjectMeta, ObjectStore};
 use vortex::dtype::DType;
 use vortex::dtype::arrow::FromArrowType;
 use vortex::error::{VortexExpect, VortexResult, vortex_err};
-use vortex::expr::{ExprRef, VortexExpr, and};
 use vortex::file::VORTEX_FILE_EXTENSION;
 use vortex::metrics::VortexMetrics;
 use vortex::session::VortexSession;
@@ -38,8 +36,8 @@ use vortex::stats::{Stat, StatsProviderExt, StatsSet};
 use super::cache::VortexFileCache;
 use super::sink::VortexSink;
 use super::source::VortexSource;
-use crate::convert::{TryFromDataFusion, TryToDataFusion};
-use crate::{PrecisionExt as _, can_be_pushed_down};
+use crate::PrecisionExt as _;
+use crate::convert::TryToDataFusion;
 
 /// Vortex implementation of a DataFusion [`FileFormat`].
 pub struct VortexFormat {
@@ -298,7 +296,6 @@ impl FileFormat for VortexFormat {
         &self,
         _state: &dyn Session,
         file_scan_config: FileScanConfig,
-        filters: Option<&Arc<dyn PhysicalExpr>>,
     ) -> DFResult<Arc<dyn ExecutionPlan>> {
         if file_scan_config
             .file_groups
@@ -317,11 +314,7 @@ impl FileFormat for VortexFormat {
             return not_impl_err!("Vortex doesn't support output ordering");
         }
 
-        let mut source = VortexSource::new(self.file_cache.clone(), self.session.metrics().clone());
-        if let Some(predicate) = make_vortex_predicate(filters) {
-            source = source.with_predicate(predicate);
-        }
-
+        let source = VortexSource::new(self.file_cache.clone(), self.session.metrics().clone());
         Ok(DataSourceExec::from_data_source(
             FileScanConfigBuilder::from(file_scan_config)
                 .with_source(Arc::new(source))
@@ -350,23 +343,6 @@ impl FileFormat for VortexFormat {
         Ok(Arc::new(DataSinkExec::new(input, sink, order_requirements)) as _)
     }
 
-    fn supports_filters_pushdown(
-        &self,
-        _file_schema: &Schema,
-        table_schema: &Schema,
-        filters: &[&Expr],
-    ) -> DFResult<FilePushdownSupport> {
-        let is_pushdown = filters
-            .iter()
-            .all(|expr| can_be_pushed_down(expr, table_schema));
-
-        if is_pushdown {
-            Ok(FilePushdownSupport::Supported)
-        } else {
-            Ok(FilePushdownSupport::NotSupportedForFilter)
-        }
-    }
-
     fn file_source(&self) -> Arc<dyn FileSource> {
         Arc::new(VortexSource::new(
             self.file_cache.clone(),
@@ -375,22 +351,6 @@ impl FileFormat for VortexFormat {
     }
 }
 
-pub(crate) fn make_vortex_predicate(
-    predicate: Option<&Arc<dyn PhysicalExpr>>,
-) -> Option<Arc<dyn VortexExpr>> {
-    predicate
-        // If we cannot convert an expr to a vortex expr, we run no filter, since datafusion
-        // will rerun the filter expression anyway.
-        .and_then(|expr| {
-            // This splits expressions into conjunctions and converts them to vortex expressions.
-            // Any inconvertible expressions are dropped since true /\ a == a.
-            datafusion::physical_expr::split_conjunction(expr)
-                .into_iter()
-                .filter_map(|e| ExprRef::try_from_df(e.as_ref()).ok())
-                .reduce(and)
-        })
-}
-
 #[cfg(test)]
 mod tests {
     use datafusion::execution::SessionStateBuilder;
diff --git a/vortex-datafusion/src/persistent/mod.rs b/vortex-datafusion/src/persistent/mod.rs
index 78f9f3e025b..f739255763b 100644
--- a/vortex-datafusion/src/persistent/mod.rs
+++ b/vortex-datafusion/src/persistent/mod.rs
@@ -96,7 +96,9 @@ mod tests {
         assert!(table_url.is_collection());
 
         let config = ListingTableConfig::new(table_url)
-            .with_listing_options(ListingOptions::new(format))
+            .with_listing_options(
+                ListingOptions::new(format).with_session_config_options(ctx.state().config()),
+            )
             .infer_schema(&ctx.state())
             .await?;
 
diff --git a/vortex-datafusion/src/persistent/sink.rs b/vortex-datafusion/src/persistent/sink.rs
index 108c247108c..18109837b71 100644
--- a/vortex-datafusion/src/persistent/sink.rs
+++ b/vortex-datafusion/src/persistent/sink.rs
@@ -127,6 +127,7 @@ mod tests {
     use datafusion::execution::SessionStateBuilder;
     use datafusion::logical_expr::{Expr, LogicalPlan, LogicalPlanBuilder, Values};
     use datafusion::prelude::SessionContext;
+    use datafusion::scalar::ScalarValue;
     use tempfile::TempDir;
 
     use crate::persistent::{VortexFormatFactory, register_vortex_format_factory};
@@ -157,8 +158,8 @@ mod tests {
         let values = Values {
             schema: Arc::new(my_tbl.schema().clone()),
             values: vec![vec![
-                Expr::Literal("hello".into()),
-                Expr::Literal(42_i32.into()),
+                Expr::Literal(ScalarValue::new_utf8view("hello"), None),
+                Expr::Literal(42_i32.into(), None),
             ]],
         };
 
diff --git a/vortex-datafusion/src/persistent/source.rs b/vortex-datafusion/src/persistent/source.rs
index 66dc0a74188..8ed8f061244 100644
--- a/vortex-datafusion/src/persistent/source.rs
+++ b/vortex-datafusion/src/persistent/source.rs
@@ -4,12 +4,17 @@ use std::sync::{Arc, Weak};
 use dashmap::DashMap;
 use datafusion::arrow::datatypes::SchemaRef;
 use datafusion::common::{Result as DFResult, Statistics};
+use datafusion::config::ConfigOptions;
 use datafusion::datasource::physical_plan::{FileOpener, FileScanConfig, FileSource};
+use datafusion::physical_plan::PhysicalExpr;
+use datafusion::physical_plan::filter_pushdown::{
+    FilterPushdownPropagation, PredicateSupport, PredicateSupports,
+};
 use datafusion::physical_plan::metrics::ExecutionPlanMetricsSet;
 use object_store::ObjectStore;
 use object_store::path::Path;
 use vortex::error::VortexExpect as _;
-use vortex::expr::{VortexExpr, root};
+use vortex::expr::{ExprRef, VortexExpr, and, root};
 use vortex::file::VORTEX_FILE_EXTENSION;
 use vortex::layout::LayoutReader;
 use vortex::metrics::VortexMetrics;
@@ -18,6 +23,8 @@ use super::cache::VortexFileCache;
 use super::config::{ConfigProjection, FileScanConfigExt};
 use super::metrics::PARTITION_LABEL;
 use super::opener::VortexFileOpener;
+use crate::can_be_pushed_down;
+use crate::convert::TryFromDataFusion as _;
 
 /// A config for [`VortexFileOpener`]. Used to create [`DataSourceExec`] based physical plans.
 ///
@@ -158,4 +165,49 @@ impl FileSource for VortexSource {
     fn file_type(&self) -> &str {
         VORTEX_FILE_EXTENSION
     }
+
+    fn try_pushdown_filters(
+        &self,
+        filters: Vec<Arc<dyn PhysicalExpr>>,
+        _config: &ConfigOptions,
+    ) -> DFResult<FilterPushdownPropagation<Arc<dyn FileSource>>> {
+        let Some(schema) = self.arrow_schema.as_ref() else {
+            return Ok(FilterPushdownPropagation::unsupported(filters));
+        };
+        let (supported, unsupported): (Vec<_>, Vec<_>) = filters
+            .iter()
+            .partition(|expr| can_be_pushed_down(expr, schema));
+
+        match make_vortex_predicate(&supported) {
+            Some(predicate) => {
+                let supports = PredicateSupports::new(
+                    supported
+                        .into_iter()
+                        .map(|expr| PredicateSupport::Supported(expr.clone()))
+                        .chain(
+                            unsupported
+                                .into_iter()
+                                .map(|expr| PredicateSupport::Unsupported(expr.clone())),
+                        )
+                        .collect(),
+                );
+                Ok(FilterPushdownPropagation::with_filters(supports)
+                    .with_updated_node(Arc::new(self.with_predicate(predicate))))
+            }
+            None => Ok(FilterPushdownPropagation::unsupported(filters)),
+        }
+    }
+}
+
+// If we cannot convert an expr to a vortex expr, we run no filter, since datafusion
+// will rerun the filter expression anyway.
+pub(crate) fn make_vortex_predicate(
+    predicate: &[&Arc<dyn PhysicalExpr>],
+) -> Option<Arc<dyn VortexExpr>> {
+    // This splits expressions into conjunctions and converts them to vortex expressions.
+    // Any inconvertible expressions are dropped since true /\ a == a.
+    predicate
+        .iter()
+        .filter_map(|e| ExprRef::try_from_df(e.as_ref()).ok())
+        .reduce(and)
 }