Merge branch 'develop' of github.com:tortoise/tortoise-orm into sort-imports

Author: waketzheng

CHANGELOG.rst

@@ -21,6 +21,10 @@ Added
 Fixed
 ^^^^^
 - ``MigrationRecorder`` now uses parameterized queries; fixes MariaDB/MySQL rejecting ISO-8601 ``applied_at`` values. (#2132)
+- ``db_default`` on ``ForeignKeyField``/``OneToOneField`` now propagates to the underlying ``<fk>_id`` column, so ``CREATE TABLE`` emits the ``DEFAULT`` clause for FK columns. (#2199)
+- ``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/migrations/test_recorder.py

@@ -1,3 +1,5 @@
+import warnings
+
 import pytest
 
 from tortoise.backends.base.client import Capabilities
@@ -126,6 +128,22 @@ async def test_recorder_sqlite_placeholders() -> None:
     assert '"name" = ?' in delete_query
 
 
+def test_recorder_model_emits_no_field_deprecation_warnings() -> None:
+    """Regression: the migration recorder must not trip tortoise's own
+    ``pk``/``index`` field deprecation warnings. It builds its bookkeeping
+    model internally, so downstream projects can't silence them.
+    """
+    with warnings.catch_warnings(record=True) as caught:
+        # Reset filters so the repo-wide ``ignore:`pk` deprecation`` filter in
+        # pyproject.toml doesn't mask a regression here.
+        warnings.simplefilter("always")
+        MigrationRecorder(FakeConnection("sqlite"))
+
+    messages = [str(w.message) for w in caught if issubclass(w.category, DeprecationWarning)]
+    assert not any("`pk` is deprecated" in m for m in messages), messages
+    assert not any("`index` is deprecated" in m for m in messages), messages
+
+
 @pytest.mark.asyncio
 async def test_recorder_oracle_placeholders() -> None:
     connection = FakeConnection("oracle")

tests/migrations/test_schema_editor_sql.py

@@ -249,3 +249,36 @@ class Meta:
     sql = client.executed[0]
     assert 'CREATE TABLE "widget"' in sql
     assert "DEFAULT 'active'" in sql
+
+
+@pytest.mark.asyncio
+async def test_create_model_includes_db_default_on_fk() -> None:
+    """CreateModel should include DEFAULT clause for FK columns with db_default."""
+
+    class Dc(Model):
+        id = fields.IntField(primary_key=True)
+
+        class Meta:
+            table = "dc"
+            app = "models"
+
+    class App(Model):
+        id = fields.IntField(primary_key=True)
+        dc: fields.ForeignKeyRelation[Dc] = fields.ForeignKeyField("models.Dc", db_default=2)
+
+        class Meta:
+            table = "app"
+            app = "models"
+
+    init_apps(Dc, App)
+
+    client = FakeClient("sql")
+    editor = TestSchemaEditor(client)
+
+    await editor.create_model(App)
+
+    assert len(client.executed) == 1
+    sql = client.executed[0]
+    assert 'CREATE TABLE "app"' in sql
+    assert '"dc_id"' in sql
+    assert "DEFAULT 2" in sql

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/apps.py

@@ -192,7 +192,7 @@ def init_fk_o2o_field(model: type[Model], field: str, is_o2o: bool = False) -> N
             key_field = f"{field}_id"
             key_fk_object.reference = fk_object
             key_fk_object.source_field = fk_object.source_field or key_field
-            for attr in ("index", "default", "null", "generated", "description"):
+            for attr in ("index", "default", "null", "generated", "description", "db_default"):
                 setattr(key_fk_object, attr, getattr(fk_object, attr))
             if is_o2o:
                 key_fk_object.pk = fk_object.pk

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/migrations/recorder.py

@@ -35,7 +35,7 @@ def _placeholder(self, pos: int) -> str:
 
     def _make_model(self, table_name: str) -> type[Model]:
         class MigrationRecord(Model):
-            id = fields.IntField(pk=True)
+            id = fields.IntField(primary_key=True)
             app = fields.CharField(max_length=255)
             name = fields.CharField(max_length=255)
             applied_at = fields.DatetimeField()