Merging upstream version 16.7.3.

Signed-off-by: Daniel Baumann <daniel@debian.org>

docs/sqlglot/optimizer/merge_subqueries.html

@@ -542,7 +542,7 @@ queries if it would result in multiple table selects in a single query:</p>
                     <div class="attr variable">
             <span class="name">UNMERGABLE_ARGS</span>        =
 <input id="UNMERGABLE_ARGS-view-value" class="view-value-toggle-state" type="checkbox" aria-hidden="true" tabindex="-1">
-            <label class="view-value-button pdoc-button" for="UNMERGABLE_ARGS-view-value"></label><span class="default_value">{&#39;match&#39;, &#39;sample&#39;, &#39;having&#39;, &#39;settings&#39;, &#39;into&#39;, &#39;offset&#39;, &#39;group&#39;, &#39;pivots&#39;, &#39;with&#39;, &#39;laterals&#39;, &#39;kind&#39;, &#39;locks&#39;, &#39;distinct&#39;, &#39;cluster&#39;, &#39;format&#39;, &#39;limit&#39;, &#39;sort&#39;, &#39;windows&#39;, &#39;distribute&#39;, &#39;qualify&#39;}</span>
+            <label class="view-value-button pdoc-button" for="UNMERGABLE_ARGS-view-value"></label><span class="default_value">{&#39;into&#39;, &#39;sample&#39;, &#39;limit&#39;, &#39;settings&#39;, &#39;windows&#39;, &#39;with&#39;, &#39;qualify&#39;, &#39;distinct&#39;, &#39;format&#39;, &#39;locks&#39;, &#39;offset&#39;, &#39;laterals&#39;, &#39;cluster&#39;, &#39;group&#39;, &#39;pivots&#39;, &#39;having&#39;, &#39;match&#39;, &#39;kind&#39;, &#39;distribute&#39;, &#39;sort&#39;}</span>
 
         
     </div>

docs/sqlglot/optimizer/qualify.html

@@ -118,8 +118,8 @@
 </span><span id="L-60"><a href="#L-60"><span class="linenos">60</span></a><span class="sd">        The qualified expression.</span>
 </span><span id="L-61"><a href="#L-61"><span class="linenos">61</span></a><span class="sd">    &quot;&quot;&quot;</span>
 </span><span id="L-62"><a href="#L-62"><span class="linenos">62</span></a>    <span class="n">schema</span> <span class="o">=</span> <span class="n">ensure_schema</span><span class="p">(</span><span class="n">schema</span><span class="p">,</span> <span class="n">dialect</span><span class="o">=</span><span class="n">dialect</span><span class="p">)</span>
-</span><span id="L-63"><a href="#L-63"><span class="linenos">63</span></a>    <span class="n">expression</span> <span class="o">=</span> <span class="n">normalize_identifiers</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">dialect</span><span class="o">=</span><span class="n">dialect</span><span class="p">)</span>
-</span><span id="L-64"><a href="#L-64"><span class="linenos">64</span></a>    <span class="n">expression</span> <span class="o">=</span> <span class="n">qualify_tables</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">db</span><span class="o">=</span><span class="n">db</span><span class="p">,</span> <span class="n">catalog</span><span class="o">=</span><span class="n">catalog</span><span class="p">,</span> <span class="n">schema</span><span class="o">=</span><span class="n">schema</span><span class="p">)</span>
+</span><span id="L-63"><a href="#L-63"><span class="linenos">63</span></a>    <span class="n">expression</span> <span class="o">=</span> <span class="n">qualify_tables</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">db</span><span class="o">=</span><span class="n">db</span><span class="p">,</span> <span class="n">catalog</span><span class="o">=</span><span class="n">catalog</span><span class="p">,</span> <span class="n">schema</span><span class="o">=</span><span class="n">schema</span><span class="p">)</span>
+</span><span id="L-64"><a href="#L-64"><span class="linenos">64</span></a>    <span class="n">expression</span> <span class="o">=</span> <span class="n">normalize_identifiers</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">dialect</span><span class="o">=</span><span class="n">dialect</span><span class="p">)</span>
 </span><span id="L-65"><a href="#L-65"><span class="linenos">65</span></a>
 </span><span id="L-66"><a href="#L-66"><span class="linenos">66</span></a>    <span class="k">if</span> <span class="n">isolate_tables</span><span class="p">:</span>
 </span><span id="L-67"><a href="#L-67"><span class="linenos">67</span></a>        <span class="n">expression</span> <span class="o">=</span> <span class="n">isolate_table_selects</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">schema</span><span class="o">=</span><span class="n">schema</span><span class="p">)</span>
@@ -196,8 +196,8 @@
 </span><span id="qualify-61"><a href="#qualify-61"><span class="linenos">61</span></a><span class="sd">        The qualified expression.</span>
 </span><span id="qualify-62"><a href="#qualify-62"><span class="linenos">62</span></a><span class="sd">    &quot;&quot;&quot;</span>
 </span><span id="qualify-63"><a href="#qualify-63"><span class="linenos">63</span></a>    <span class="n">schema</span> <span class="o">=</span> <span class="n">ensure_schema</span><span class="p">(</span><span class="n">schema</span><span class="p">,</span> <span class="n">dialect</span><span class="o">=</span><span class="n">dialect</span><span class="p">)</span>
-</span><span id="qualify-64"><a href="#qualify-64"><span class="linenos">64</span></a>    <span class="n">expression</span> <span class="o">=</span> <span class="n">normalize_identifiers</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">dialect</span><span class="o">=</span><span class="n">dialect</span><span class="p">)</span>
-</span><span id="qualify-65"><a href="#qualify-65"><span class="linenos">65</span></a>    <span class="n">expression</span> <span class="o">=</span> <span class="n">qualify_tables</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">db</span><span class="o">=</span><span class="n">db</span><span class="p">,</span> <span class="n">catalog</span><span class="o">=</span><span class="n">catalog</span><span class="p">,</span> <span class="n">schema</span><span class="o">=</span><span class="n">schema</span><span class="p">)</span>
+</span><span id="qualify-64"><a href="#qualify-64"><span class="linenos">64</span></a>    <span class="n">expression</span> <span class="o">=</span> <span class="n">qualify_tables</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">db</span><span class="o">=</span><span class="n">db</span><span class="p">,</span> <span class="n">catalog</span><span class="o">=</span><span class="n">catalog</span><span class="p">,</span> <span class="n">schema</span><span class="o">=</span><span class="n">schema</span><span class="p">)</span>
+</span><span id="qualify-65"><a href="#qualify-65"><span class="linenos">65</span></a>    <span class="n">expression</span> <span class="o">=</span> <span class="n">normalize_identifiers</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">dialect</span><span class="o">=</span><span class="n">dialect</span><span class="p">)</span>
 </span><span id="qualify-66"><a href="#qualify-66"><span class="linenos">66</span></a>
 </span><span id="qualify-67"><a href="#qualify-67"><span class="linenos">67</span></a>    <span class="k">if</span> <span class="n">isolate_tables</span><span class="p">:</span>
 </span><span id="qualify-68"><a href="#qualify-68"><span class="linenos">68</span></a>        <span class="n">expression</span> <span class="o">=</span> <span class="n">isolate_table_selects</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">schema</span><span class="o">=</span><span class="n">schema</span><span class="p">)</span>