From 1b8eb0bfe3ea2b2eb83b4f9c75369b59ef734c47 Mon Sep 17 00:00:00 2001
From: Roman Borschel <roman@cluvio.com>
Date: Wed, 9 Apr 2025 15:10:46 +0200
Subject: [PATCH 1/2] Add support for MySQL's STRAIGHT_JOIN join operator.

---
 src/ast/query.rs         | 5 +++++
 src/ast/spans.rs         | 1 +
 src/keywords.rs          | 1 +
 src/parser/mod.rs        | 4 ++++
 tests/sqlparser_mysql.rs | 7 +++++++
 5 files changed, 18 insertions(+)

diff --git a/src/ast/query.rs b/src/ast/query.rs
index 1b30dcf17..ed6fdb713 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -2157,6 +2157,9 @@ impl fmt::Display for Join {
                 self.relation,
                 suffix(constraint)
             ),
+            JoinOperator::StraightJoin(constraint) => {
+                write!(f, " STRAIGHT_JOIN {}{}", self.relation, suffix(constraint))
+            }
         }
     }
 }
@@ -2197,6 +2200,8 @@ pub enum JoinOperator {
         match_condition: Expr,
         constraint: JoinConstraint,
     },
+    /// STRAIGHT_JOIN (non-standard)
+    StraightJoin(JoinConstraint),
 }
 
 #[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
diff --git a/src/ast/spans.rs b/src/ast/spans.rs
index d253f8914..9ff83b760 100644
--- a/src/ast/spans.rs
+++ b/src/ast/spans.rs
@@ -2128,6 +2128,7 @@ impl Spanned for JoinOperator {
             } => match_condition.span().union(&constraint.span()),
             JoinOperator::Anti(join_constraint) => join_constraint.span(),
             JoinOperator::Semi(join_constraint) => join_constraint.span(),
+            JoinOperator::StraightJoin(join_constraint) => join_constraint.span(),
         }
     }
 }
diff --git a/src/keywords.rs b/src/keywords.rs
index 73c244261..0b947b61c 100644
--- a/src/keywords.rs
+++ b/src/keywords.rs
@@ -840,6 +840,7 @@ define_keywords!(
     STORAGE_INTEGRATION,
     STORAGE_SERIALIZATION_POLICY,
     STORED,
+    STRAIGHT_JOIN,
     STRICT,
     STRING,
     STRUCT,
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index b9076bb77..0ccf10d7a 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -11826,6 +11826,10 @@ impl<'a> Parser<'a> {
                     Keyword::OUTER => {
                         return self.expected("LEFT, RIGHT, or FULL", self.peek_token());
                     }
+                    Keyword::STRAIGHT_JOIN => {
+                        let _ = self.next_token(); // consume STRAIGHT_JOIN
+                        JoinOperator::StraightJoin
+                    }
                     _ if natural => {
                         return self.expected("a join type after NATURAL", self.peek_token());
                     }
diff --git a/tests/sqlparser_mysql.rs b/tests/sqlparser_mysql.rs
index 1d4fd6a0d..c60936ca8 100644
--- a/tests/sqlparser_mysql.rs
+++ b/tests/sqlparser_mysql.rs
@@ -3587,3 +3587,10 @@ fn test_variable_assignment_using_colon_equal() {
         _ => panic!("Unexpected statement {stmt}"),
     }
 }
+
+#[test]
+fn parse_straight_join() {
+    mysql().verified_stmt(
+        "SELECT a.*, b.* FROM table_a AS a STRAIGHT_JOIN table_b AS b ON a.b_id = b.id",
+    );
+}

From ff35dd057b0730d80061e5e9aeed77cb8b5d9921 Mon Sep 17 00:00:00 2001
From: Roman Borschel <roman@cluvio.com>
Date: Thu, 10 Apr 2025 09:03:44 +0200
Subject: [PATCH 2/2] Add link to mysql join docs.

---
 src/ast/query.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ast/query.rs b/src/ast/query.rs
index ed6fdb713..abc115a0d 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -2201,6 +2201,8 @@ pub enum JoinOperator {
         constraint: JoinConstraint,
     },
     /// STRAIGHT_JOIN (non-standard)
+    ///
+    /// See <https://dev.mysql.com/doc/refman/8.4/en/join.html>.
     StraightJoin(JoinConstraint),
 }