Added straight_join to $reservedNewline (#134)

doctrine · Aug 5, 2024 · 7f83911 · 7f83911
1 parent 7c0096a
commit 7f83911
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 0 deletions.
diff --git a/src/Tokenizer.php b/src/Tokenizer.php
@@ -409,6 +409,7 @@ final class Tokenizer
         'OUTER JOIN',
         'RIGHT JOIN',
         'RIGHT OUTER JOIN',
+        'STRAIGHT_JOIN',
         'XOR',
     ];
 

diff --git a/tests/clihighlight.txt b/tests/clihighlight.txt
@@ -1036,3 +1036,9 @@ MY_NON_TOP_LEVEL_KEYWORD_FX_5[0m();[0m
   );[0m
 MY_NON_TOP_LEVEL_KEYWORD_FX_6[0m();[0m
 [37mEND[0m;[0m
+---
+[37mSELECT[0m
+  a[0m
+[37mFROM[0m
+  test[0m
+  [37mSTRAIGHT_JOIN[0m test2[0m [37mON[0m test[0m.[0mid[0m =[0m test2[0m.[0mid[0m
diff --git a/tests/compress.txt b/tests/compress.txt
@@ -97,3 +97,5 @@ SELECT a, GROUP_CONCAT(b, '.') OVER (ORDER BY c GROUPS BETWEEN UNBOUNDED PRECEDI
 SELECT 1::text;
 ---
 MY_NON_TOP_LEVEL_KEYWORD_FX_1(); MY_NON_TOP_LEVEL_KEYWORD_FX_2(); SELECT x FROM (SELECT 1 as x); MY_NON_TOP_LEVEL_KEYWORD_FX_3(); BEGIN MY_NON_TOP_LEVEL_KEYWORD_FX_4(); MY_NON_TOP_LEVEL_KEYWORD_FX_5(); END; BEGIN SELECT x FROM (SELECT 1 as x); MY_NON_TOP_LEVEL_KEYWORD_FX_6(); END;
+---
+SELECT a FROM test STRAIGHT_JOIN test2 ON test.id = test2.id
diff --git a/tests/format-highlight.html b/tests/format-highlight.html
@@ -1036,3 +1036,9 @@
   )<span >;</span>
 <span style="color: #333;">MY_NON_TOP_LEVEL_KEYWORD_FX_6</span>()<span >;</span>
 <span style="font-weight:bold;">END</span><span >;</span></pre>
+---
+<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span>
+  <span style="color: #333;">a</span>
+<span style="font-weight:bold;">FROM</span>
+  <span style="color: #333;">test</span>
+  <span style="font-weight:bold;">STRAIGHT_JOIN</span> <span style="color: #333;">test2</span> <span style="font-weight:bold;">ON</span> <span style="color: #333;">test</span><span >.</span><span style="color: #333;">id</span> <span >=</span> <span style="color: #333;">test2</span><span >.</span><span style="color: #333;">id</span></pre>
diff --git a/tests/format.txt b/tests/format.txt
@@ -1034,3 +1034,9 @@ FROM
   );
 MY_NON_TOP_LEVEL_KEYWORD_FX_6();
 END;
+---
+SELECT
+  a
+FROM
+  test
+  STRAIGHT_JOIN test2 ON test.id = test2.id
diff --git a/tests/highlight.html b/tests/highlight.html
@@ -324,3 +324,5 @@
     (<span style="font-weight:bold;">SELECT</span> <span style="color: green;">1</span> <span style="font-weight:bold;">as</span> <span style="color: #333;">x</span>)<span >;</span>
   <span style="color: #333;">MY_NON_TOP_LEVEL_KEYWORD_FX_6</span>()<span >;</span>
 <span style="font-weight:bold;">END</span><span >;</span></pre>
+---
+<pre style="color: black; background-color: white;"><span style="font-weight:bold;">SELECT</span> <span style="color: #333;">a</span> <span style="font-weight:bold;">FROM</span> <span style="color: #333;">test</span> <span style="font-weight:bold;">STRAIGHT_JOIN</span> <span style="color: #333;">test2</span> <span style="font-weight:bold;">ON</span> <span style="color: #333;">test</span><span >.</span><span style="color: #333;">id</span> <span >=</span> <span style="color: #333;">test2</span><span >.</span><span style="color: #333;">id</span></pre>
diff --git a/tests/sql.sql b/tests/sql.sql
@@ -324,3 +324,5 @@ BEGIN
     (SELECT 1 as x);
   MY_NON_TOP_LEVEL_KEYWORD_FX_6();
 END;
+---
+SELECT a FROM test STRAIGHT_JOIN test2 ON test.id = test2.id