Merge branch 'main' into self-group-typing

# Conflicts:
#	lib/sqlalchemy/sql/elements.py

diff --cc lib/sqlalchemy/sql/elements.py
index bd47cf3bfd2b9bcbda3fd6e46a7235b8f18b29ca,bf7e9438d9b99ea71583363b0bf5eabd8e99aec6..d5f2c3ea16a63cce0982bb67d80ffc9c7cc53996
--- 1/lib/sqlalchemy/sql/elements.py
--- 2/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@@ -2537,11 -2574,11 +2574,13 @@@ class TextClause
  
      @property
      def comparator(self):
-         return self.type.comparator_factory(self)
+         # TODO: this seems wrong, it seems like we might not
+         # be using this method.
+         return self.type.comparator_factory(self)  # type: ignore
  
 -    def self_group(self, against=None):
 +    def self_group(
 +        self, against: Optional[OperatorType] = None
 +    ) -> ClauseElement:
          if against is operators.in_op:
              return Grouping(self)
          else: