Merge branch 'develop' into fix/recorder-pk-deprecation-warning

Author: waketzheng

CHANGELOG.rst

@@ -21,7 +21,9 @@ Added
 Fixed
 ^^^^^
 - ``MigrationRecorder`` now uses parameterized queries; fixes MariaDB/MySQL rejecting ISO-8601 ``applied_at`` values. (#2132)
-- ``MigrationRecorder`` no longer emits tortoise's own ``pk`` field ``DeprecationWarning`` when applying migrations; it now builds its bookkeeping model with ``primary_key=True``.
+- ``MigrationRecorder`` no longer emits tortoise's own ``pk`` field ``DeprecationWarning`` when applying migrations; it now builds its bookkeeping model with ``primary_key=True``. (#2203)
+- ``QuerySet.count()`` now matches the limited query result for the LIMIT/OFFSET edge cases: it returns ``0`` (instead of a negative number) when ``offset()`` exceeds the total row count, and ``0`` (instead of the total) for ``limit(0)``. (#2208)
+- Field declarations on models now resolve to their concrete type (e.g. ``CharField[str]``) in Pyright/Pylance instead of ``Field[Unknown]``; the ``Field.__new__`` type-check stub now returns ``Self``. (#2216)
 
 1.1.7
 -----

tests/backends/test_db_url.py

@@ -7,6 +7,7 @@
 
 _postgres_scheme_engines = {
     "postgres": "tortoise.backends.asyncpg",
+    "postgresql": "tortoise.backends.asyncpg",
     "asyncpg": "tortoise.backends.asyncpg",
     "psycopg": "tortoise.backends.psycopg",
 }

tests/test_q.py

@@ -129,6 +129,17 @@ def test_q_equality():
     assert complex_q1 == complex_q2
 
 
+def test_q_inequality():
+    assert Q(moo="cow") != Q(moo="bull")
+    assert Q(moo="cow") != Q(moo="cow", join_type=Q.OR)
+    assert Q(moo="cow") != "not a q"
+
+
+def test_q_unhashable():
+    with pytest.raises(TypeError, match="unhashable type"):
+        hash(Q(moo="cow"))
+
+
 # =============================================================================
 # Tests for Q object resolution (requires database for model resolution)
 # =============================================================================

tests/test_queryset.py

@@ -88,6 +88,14 @@ async def test_limit_count(db, intfields_data):
     assert await IntFields.all().limit(10).count() == 10
 
 
+@pytest.mark.asyncio
+async def test_limit_zero_count(db, intfields_data):
+    # limit(0) means zero rows, so count() must be 0 (not the total), matching
+    # the actual limited query.
+    assert await IntFields.all().limit(0).count() == 0
+    assert await IntFields.all().limit(0).count() == len(await IntFields.all().limit(0))
+
+
 @pytest.mark.asyncio
 async def test_limit_negative(db, intfields_data):
     with pytest.raises(ParamsError, match="Limit should be non-negative number"):
@@ -106,6 +114,14 @@ async def test_offset_count(db, intfields_data):
     assert await IntFields.all().offset(10).count() == 20
 
 
+@pytest.mark.asyncio
+async def test_offset_count_beyond_total(db, intfields_data):
+    # An offset past the total must report 0, not a negative count (the SQL
+    # LIMIT/OFFSET would return zero rows).
+    assert await IntFields.all().offset(100).count() == 0
+    assert await IntFields.all().offset(100).count() == len(await IntFields.all().offset(100))
+
+
 @pytest.mark.asyncio
 async def test_offset_negative(db, intfields_data):
     with pytest.raises(ParamsError, match="Offset should be non-negative number"):

tortoise/backends/base/config_generator.py

@@ -9,6 +9,7 @@
 from tortoise.exceptions import ConfigurationError
 
 urlparse.uses_netloc.append("postgres")
+urlparse.uses_netloc.append("postgresql")
 urlparse.uses_netloc.append("asyncpg")
 urlparse.uses_netloc.append("psycopg")
 urlparse.uses_netloc.append("sqlite")
@@ -127,6 +128,8 @@
 }
 # Create an alias for backwards compatibility
 DB_LOOKUP["postgres"] = DB_LOOKUP["asyncpg"]
+# "postgresql" is the scheme accepted by libpq and pydantic's PostgresDsn
+DB_LOOKUP["postgresql"] = DB_LOOKUP["asyncpg"]
 
 
 def _quote_url_userinfo(db_url: str) -> str:
@@ -211,7 +214,7 @@ def expand_db_url(db_url: str, testing: bool = False) -> dict:
         # asyncpg accepts None for password, but aiomysql not
         params[vmap["password"]] = (
             None
-            if (not url.password and db_backend in {"postgres", "asyncpg", "psycopg"})
+            if (not url.password and db_backend in {"postgres", "postgresql", "asyncpg", "psycopg"})
             else urlparse.unquote(url.password or "")
         )
 

tortoise/fields/base.py

@@ -19,7 +19,9 @@
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
+    from typing import Self
 else:  # pragma: no cover
+    from typing_extensions import Self
 
     class StrEnum(str, Enum):
         __str__ = str.__str__
@@ -202,7 +204,7 @@ def function_cast(self, term: Term) -> Term:
     # These methods are just to make IDE/Linters happy:
     if TYPE_CHECKING:
 
-        def __new__(cls, *args: Any, **kwargs: Any) -> Field[VALUE]:
+        def __new__(cls, *args: Any, **kwargs: Any) -> Self:
             return super().__new__(cls)
 
         @overload

tortoise/queryset.py

@@ -1571,8 +1571,13 @@ async def _execute(self) -> int:
         _, result = await self._db.execute_query(*self.query.get_parameterized_sql())
         if not result:
             return 0
-        count = list(dict(result[0]).values())[0] - self._offset
-        if self._limit and count > self._limit:
+        # COUNT(*) ignores LIMIT/OFFSET, so the offset is applied here. Clamp at
+        # 0: when the offset is past the total, SQL would return 0 rows, not a
+        # negative count.
+        count = max(0, list(dict(result[0]).values())[0] - self._offset)
+        # Use ``is not None`` so an explicit ``limit(0)`` clamps to 0 instead of
+        # being treated as "no limit" by a truthiness check.
+        if self._limit is not None and count > self._limit:
             return self._limit
         return count