update sql parser

Author: lovasoa

CHANGELOG.md

@@ -7,6 +7,10 @@ This is a bugfix release.
 - Fix a bug where the form component would not display the right checked state in radio buttons and checkboxes.
  - https://github.com/sqlpage/SQLPage/issues/751
 - Fix a bug in the [link](https://sql-page.com/component.sql?component=link) component where the properties `view_link`, `edit_link`, and `delete_link` had become incompatible with the main `link` property.
+- Updated sqlparser to [v0.53](https://github.com/apache/datafusion-sqlparser-rs/blob/main/changelog/0.53.0.md) which fixes parse errors when using some advanced SQL syntax
+  - adds support for SQLite's `UPDATE OR REPLACE` syntax
+  - adds support for MSSQL's `JSON_ARRAY` and `JSON_OBJECT` functions
+  - adds support for PostgreSQL's `JSON_OBJECT(key : value)` and `JSON_OBJECT(key VALUE value)` syntax
 
 ## 0.32.0 (2024-12-29)
 

Cargo.lock

@@ -42,7 +42,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.52.0", features = ["visitor"] }
+sqlparser = { version = "0.53.0", features = ["visitor"] }
 async-stream = "0.3"
 async-trait = "0.1.61"
 async-recursion = "1.0.0"

Cargo.toml

@@ -6,15 +6,16 @@ use crate::file_cache::AsyncFromStrWithState;
 use crate::webserver::database::error_highlighting::quote_source_with_highlight;
 use crate::{AppState, Database};
 use async_trait::async_trait;
+use sqlparser::ast::helpers::attached_token::AttachedToken;
 use sqlparser::ast::{
     BinaryOperator, CastKind, CharacterLength, DataType, Expr, Function, FunctionArg,
     FunctionArgExpr, FunctionArgumentList, FunctionArguments, Ident, ObjectName,
-    OneOrManyWithParens, SelectItem, SetExpr, Statement, Value, VisitMut, VisitorMut,
+    OneOrManyWithParens, SelectItem, SetExpr, Spanned, Statement, Value, VisitMut, VisitorMut,
 };
 use sqlparser::dialect::{Dialect, MsSqlDialect, MySqlDialect, PostgreSqlDialect, SQLiteDialect};
 use sqlparser::parser::{Parser, ParserError};
-use sqlparser::tokenizer::Token::{SemiColon, EOF};
-use sqlparser::tokenizer::Tokenizer;
+use sqlparser::tokenizer::Token::{self, SemiColon, EOF};
+use sqlparser::tokenizer::{TokenWithSpan, Tokenizer};
 use sqlx::any::AnyKind;
 use std::ops::ControlFlow;
 use std::path::{Path, PathBuf};
@@ -171,10 +172,10 @@ fn parse_single_statement(
 }
 
 fn syntax_error(err: ParserError, parser: &Parser, sql: &str) -> ParsedStatement {
-    let location = parser.peek_token_no_skip().location;
+    let location = parser.peek_token_no_skip().span;
     ParsedStatement::Error(anyhow::Error::from(err).context(format!(
         "Parsing failed: SQLPage couldn't understand the SQL file. Please check for syntax errors:\n\n{}",
-        quote_source_with_highlight(sql, location.line, location.column)
+        quote_source_with_highlight(sql, location.start.line, location.start.column)
     )))
 }
 
@@ -769,6 +770,7 @@ impl VisitorMut for ParameterExtractor {
                     filter: None,
                     null_treatment: None,
                     within_group: Vec::new(),
+                    uses_odbc_syntax: false,
                 });
             }
             Expr::Cast {
@@ -884,6 +886,10 @@ fn expr_to_statement(expr: Expr) -> Statement {
         with: None,
         body: Box::new(sqlparser::ast::SetExpr::Select(Box::new(
             sqlparser::ast::Select {
+                select_token: AttachedToken(TokenWithSpan::new(
+                    Token::make_keyword("SELECT"),
+                    expr.span(),
+                )),
                 distinct: None,
                 top: None,
                 projection: vec![SelectItem::ExprWithAlias {