Bump up sqlparser crate version from 0.11 to 0.13 (gluesql#479)

Most of the changes are in SqlStatement::Update part, - table field is now TableWithJoin type, so I had to take relation field out of it and converted into ObjectName. - SqlAssignment's id is now Vec<Ident> type, so I took only the first element's value.
ever0de · Mar 6, 2022 · 6653684 · 6653684
1 parent 305ea04
commit 6653684
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 4 deletions.
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -23,7 +23,7 @@ iter-enum = "1"
 itertools = "0.10"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-sqlparser = { version = "0.11", features = ["serde", "bigdecimal"] }
+sqlparser = { version = "0.13", features = ["serde", "bigdecimal"] }
 thiserror = "1.0"
 strum_macros = "0.23"
 uuid = { version = "0.8", features = ["v4"] }

diff --git a/core/src/translate/error.rs b/core/src/translate/error.rs
@@ -11,6 +11,12 @@ pub enum TranslateError {
     #[error("unimplemented - composite index is not supported")]
     CompositeIndexNotSupported,
 
+    #[error("unimplemented - join on update not supported")]
+    JoinOnUpdateNotSupported,
+
+    #[error("unimplemented - compound identifier on update not supported: {0}")]
+    CompoundIdentOnUpdateNotSupported(String),
+
     #[error("too many params in drop index")]
     TooManyParamsInDropIndex,
 
@@ -59,6 +65,9 @@ pub enum TranslateError {
     #[error("unreachable unary operator: {0}")]
     UnreachableUnaryOperator(String),
 
+    #[error("unreachable empty ident")]
+    UnreachableEmptyIdent,
+
     #[error("unsupported binary operator: {0}")]
     UnsupportedBinaryOperator(String),
 
@@ -79,4 +88,7 @@ pub enum TranslateError {
 
     #[error("unsupported alter table operation: {0}")]
     UnsupportedAlterTableOperation(String),
+
+    #[error("unsupported table factor: {0}")]
+    UnsupportedTableFactor(String),
 }
diff --git a/core/src/translate/mod.rs b/core/src/translate/mod.rs
@@ -14,6 +14,7 @@ pub use self::{
 
 #[cfg(feature = "alter-table")]
 use ddl::translate_alter_table_operation;
+use sqlparser::ast::{TableFactor, TableWithJoins};
 
 #[cfg(feature = "metadata")]
 use crate::ast::Variable;
@@ -44,12 +45,12 @@ pub fn translate(sql_statement: &SqlStatement) -> Result<Statement> {
             source: translate_query(source).map(Box::new)?,
         }),
         SqlStatement::Update {
-            table_name,
+            table,
             assignments,
             selection,
             ..
         } => Ok(Statement::Update {
-            table_name: translate_object_name(table_name),
+            table_name: translate_table_with_join(table)?,
             assignments: assignments
                 .iter()
                 .map(translate_assignment)
@@ -155,12 +156,32 @@ pub fn translate(sql_statement: &SqlStatement) -> Result<Statement> {
 fn translate_assignment(sql_assignment: &SqlAssignment) -> Result<Assignment> {
     let SqlAssignment { id, value } = sql_assignment;
 
+    if id.len() > 1 {
+        return Err(
+            TranslateError::CompoundIdentOnUpdateNotSupported(sql_assignment.to_string()).into(),
+        );
+    }
+
     Ok(Assignment {
-        id: id.value.to_owned(),
+        id: id
+            .get(0)
+            .ok_or(TranslateError::UnreachableEmptyIdent)?
+            .value
+            .to_owned(),
         value: translate_expr(value)?,
     })
 }
 
+fn translate_table_with_join(table: &TableWithJoins) -> Result<ObjectName> {
+    if !table.joins.is_empty() {
+        return Err(TranslateError::JoinOnUpdateNotSupported.into());
+    }
+    match &table.relation {
+        TableFactor::Table { name, .. } => Ok(translate_object_name(name)),
+        t => Err(TranslateError::UnsupportedTableFactor(t.to_string()).into()),
+    }
+}
+
 fn translate_object_name(sql_object_name: &SqlObjectName) -> ObjectName {
     ObjectName(translate_idents(&sql_object_name.0))
 }

diff --git a/test-suite/src/error.rs b/test-suite/src/error.rs
@@ -70,6 +70,18 @@ test_case!(error, async move {
             TranslateError::UnsupportedJoinOperator("CrossJoin".to_owned()).into(),
             "SELECT * FROM TableA CROSS JOIN TableA as A;",
         ),
+        (
+            TranslateError::JoinOnUpdateNotSupported.into(),
+            "UPDATE TableA INNER JOIN TableA ON 1 = 1 SET 1 = 1",
+        ),
+        (
+            TranslateError::UnsupportedTableFactor("(SELECT * FROM TableA)".to_owned()).into(),
+            "UPDATE (SELECT * FROM TableA) SET 1 = 1",
+        ),
+        (
+            TranslateError::CompoundIdentOnUpdateNotSupported("TableA.id = 1".to_owned()).into(),
+            "UPDATE TableA SET TableA.id = 1 WHERE id = 1",
+        ),
         (
             EvaluateError::NestedSelectRowNotFound.into(),
             "SELECT * FROM TableA WHERE id = (SELECT id FROM TableA WHERE id = 2);",