Support join clause in UPDATE statement (#30)

future-architect · Oct 25, 2023 · b93cb59 · b93cb59
1 parent 857b29d
commit b93cb59
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/uroborosql-fmt/src/visitor/clause/join.rs b/crates/uroborosql-fmt/src/visitor/clause/join.rs
@@ -9,7 +9,7 @@ use crate::{
 
 impl Visitor {
     /// JOIN句
-    pub(crate) fn visit_join_cluase(
+    pub(crate) fn visit_join_clause(
         &mut self,
         cursor: &mut TreeCursor,
         src: &str,

diff --git a/crates/uroborosql-fmt/src/visitor/statement/select.rs b/crates/uroborosql-fmt/src/visitor/statement/select.rs
@@ -61,7 +61,7 @@ impl Visitor {
                     statement.add_clause(clause);
                 }
                 "join_clause" => {
-                    let clauses = self.visit_join_cluase(cursor, src)?;
+                    let clauses = self.visit_join_clause(cursor, src)?;
                     clauses.into_iter().for_each(|c| statement.add_clause(c));
                 }
                 "UNION" | "INTERSECT" | "EXCEPT" => {

diff --git a/crates/uroborosql-fmt/src/visitor/statement/update.rs b/crates/uroborosql-fmt/src/visitor/statement/update.rs
@@ -69,6 +69,10 @@ impl Visitor {
                     let clause = self.visit_from_clause(cursor, src)?;
                     statement.add_clause(clause);
                 }
+                "join_clause" => {
+                    let clause = self.visit_join_clause(cursor, src)?;
+                    statement.add_clauses(clause);
+                }
                 "where_clause" => {
                     let clause = self.visit_where_clause(cursor, src)?;
                     statement.add_clause(clause);

diff --git a/crates/uroborosql-fmt/testfiles/dst/update/join.sql b/crates/uroborosql-fmt/testfiles/dst/update/join.sql
@@ -0,0 +1,13 @@
+update /* _SQL_ID_ */
+	tbl	t
+set
+	t.col2	=	a.col2
+,	t.col3	=	a.col3
+from
+	tbl_a	a
+left outer join
+	tbl_b	b
+on
+	a.col1	=	b.col1
+where
+	t.id	=	a.id
diff --git a/crates/uroborosql-fmt/testfiles/src/update/join.sql b/crates/uroborosql-fmt/testfiles/src/update/join.sql
@@ -0,0 +1,4 @@
+update /* _SQL_ID_ */
+	tbl	t set t.col2	=	a.col2, t.col3	=	a.col3
+from tbl_a	a
+left outer join tbl_b	b on a.col1	=	b.col1 where t.id = a.id