From ad48c4a6bc3bf8a07cbcb0b10c796c379be552c0 Mon Sep 17 00:00:00 2001
From: lovasoa <contact@ophir.dev>
Date: Wed, 24 Sep 2025 15:36:29 +0200
Subject: [PATCH] Add small SQL parser improvements

---
 CHANGELOG.md | 3 +++
 Cargo.lock   | 4 ++--
 Cargo.toml   | 5 +----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59febcc6..ed763f1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
  - Enable submenu autoclosing (on click) in the shell. This is not ideal, but this prevents a bug introduced in v0.36.0 where the page would scroll back to the top when clicking anywhere on the page after navigating from a submenu. The next version will fix this properly. See https://github.com/sqlpage/SQLPage/issues/1011
  - Adopt the new nice visual errors introduced in v0.37.1 for "403 Forbidden" and "429 Too Many Requests" errors.
  - Fix a bug in oidc login flows. When two tabs in the same browser initiated a login at the same time, an infinite redirect loop could be triggered. This mainly occured when restoring open tabs after a period of inactivity, often in mobile browsers.
+ - Multiple small sql parser improvements.
+   - Adds support for MERGE queries inside CTEs, and MERGE queries with a RETURNING clause.
+   -  https://github.com/apache/datafusion-sqlparser-rs/blob/main/changelog/0.59.0.md
 
 ## v0.37.0
  - We now cryptographically sign the Windows app during releases, which proves the file hasn’t been tampered with. Once the production certificate is active, Windows will show a "verified publisher" and should stop showing screens saying "This app might harm your device", "Windows protected your PC" or "Are you sure you want to run this application ?". 
diff --git a/Cargo.lock b/Cargo.lock
index bade9f1e..8c519785 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3732,9 +3732,9 @@ dependencies = [
 
 [[package]]
 name = "sqlparser"
-version = "0.58.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec4b661c54b1e4b603b37873a18c59920e4c51ea8ea2cf527d925424dbd4437c"
+checksum = "4591acadbcf52f0af60eafbb2c003232b2b4cd8de5f0e9437cb8b1b59046cc0f"
 dependencies = [
  "log",
  "sqlparser_derive",
diff --git a/Cargo.toml b/Cargo.toml
index ef08d120..6f0c89c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,10 +49,7 @@ anyhow = "1"
 serde = "1"
 serde_json = { version = "1.0.82", features = ["preserve_order", "raw_value"] }
 lambda-web = { version = "0.2.1", features = ["actix4"], optional = true }
-sqlparser = { version = "0.58.0", default-features = false, features = [
-    "std",
-    "visitor",
-] }
+sqlparser = { version = "0.59.0", default-features = false, features = ["std", "visitor",] }
 async-stream = "0.3"
 async-trait = "0.1.61"
 async-recursion = "1.0.0"