From: Mark Wine <marcoxwine@gmail.com>
Date: Tue, 20 Feb 2024 02:45:18 +0000 (-0800)
Subject: Merge branch 'main' into self-group-typing
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1047e7a7f7e4d48d1a87e24677c31c2c6e960ebf;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'main' into self-group-typing

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

1047e7a7f7e4d48d1a87e24677c31c2c6e960ebf
diff --cc lib/sqlalchemy/sql/elements.py
index bd47cf3bfd,bf7e9438d9..d5f2c3ea16
--- a/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: