Merging upstream version 16.4.0.

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

sqlglot/optimizer/annotate_types.py

@@ -187,7 +187,7 @@ class TypeAnnotator(metaclass=_TypeAnnotator):
         },
     }
 
-    ANNOTATORS = {
+    ANNOTATORS: t.Dict = {
         **{
             expr_type: lambda self, e: self._annotate_unary(e)
             for expr_type in subclasses(exp.__name__, (exp.Unary, exp.Alias))

sqlglot/optimizer/normalize_identifiers.py

@@ -1,12 +1,15 @@
-from sqlglot import exp
 from sqlglot._typing import E
-from sqlglot.dialects.dialect import RESOLVES_IDENTIFIERS_AS_UPPERCASE, DialectType
+from sqlglot.dialects.dialect import Dialect, DialectType
 
 
 def normalize_identifiers(expression: E, dialect: DialectType = None) -> E:
     """
-    Normalize all unquoted identifiers to either lower or upper case, depending on
-    the dialect. This essentially makes those identifiers case-insensitive.
+    Normalize all unquoted identifiers to either lower or upper case, depending
+    on the dialect. This essentially makes those identifiers case-insensitive.
+
+    Note:
+        Some dialects (e.g. BigQuery) treat identifiers as case-insensitive even
+        when they're quoted, so in these cases all identifiers are normalized.
 
     Example:
         >>> import sqlglot
@@ -21,16 +24,4 @@ def normalize_identifiers(expression: E, dialect: DialectType = None) -> E:
     Returns:
         The transformed expression.
     """
-    return expression.transform(_normalize, dialect, copy=False)
-
-
-def _normalize(node: exp.Expression, dialect: DialectType = None) -> exp.Expression:
-    if isinstance(node, exp.Identifier) and not node.quoted:
-        node.set(
-            "this",
-            node.this.upper()
-            if dialect in RESOLVES_IDENTIFIERS_AS_UPPERCASE
-            else node.this.lower(),
-        )
-
-    return node
+    return expression.transform(Dialect.get_or_raise(dialect).normalize_identifier, copy=False)

sqlglot/optimizer/qualify_columns.py

@@ -5,9 +5,9 @@ import typing as t
 
 from sqlglot import alias, exp
 from sqlglot._typing import E
-from sqlglot.dialects.dialect import DialectType
+from sqlglot.dialects.dialect import Dialect, DialectType
 from sqlglot.errors import OptimizeError
-from sqlglot.helper import case_sensitive, seq_get
+from sqlglot.helper import seq_get
 from sqlglot.optimizer.scope import Scope, traverse_scope, walk_in_scope
 from sqlglot.schema import Schema, ensure_schema
 
@@ -417,19 +417,9 @@ def _qualify_outputs(scope):
 
 def quote_identifiers(expression: E, dialect: DialectType = None, identify: bool = True) -> E:
     """Makes sure all identifiers that need to be quoted are quoted."""
-
-    def _quote(expression: E) -> E:
-        if isinstance(expression, exp.Identifier):
-            name = expression.this
-            expression.set(
-                "quoted",
-                identify
-                or case_sensitive(name, dialect=dialect)
-                or not exp.SAFE_IDENTIFIER_RE.match(name),
-            )
-        return expression
-
-    return expression.transform(_quote, copy=False)
+    return expression.transform(
+        Dialect.get_or_raise(dialect).quote_identifier, identify=identify, copy=False
+    )
 
 
 class Resolver:

sqlglot/optimizer/simplify.py

@@ -408,9 +408,14 @@ def remove_where_true(expression):
         if always_true(where.this):
             where.parent.set("where", None)
     for join in expression.find_all(exp.Join):
-        if always_true(join.args.get("on")):
-            join.set("kind", "CROSS")
+        if (
+            always_true(join.args.get("on"))
+            and not join.args.get("using")
+            and not join.args.get("method")
+        ):
             join.set("on", None)
+            join.set("side", None)
+            join.set("kind", "CROSS")
 
 
 def always_true(expression):