ferrum-orm 0.1.19__tar.gz → 0.1.20__tar.gz

{ferrum_orm-0.1.19 → ferrum_orm-0.1.20}/Cargo.lock

@@ -223,7 +223,7 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "ferrum-core"
-version = "0.1.19"
+version = "0.1.20"
 dependencies = [
  "criterion",
  "proptest",
@@ -234,7 +234,7 @@ dependencies = [
 
 [[package]]
 name = "ferrum-migrate"
-version = "0.1.19"
+version = "0.1.20"
 dependencies = [
  "ferrum-core",
  "serde",
@@ -243,7 +243,7 @@ dependencies = [
 
 [[package]]
 name = "ferrum-pyo3"
-version = "0.1.19"
+version = "0.1.20"
 dependencies = [
  "ferrum-core",
  "ferrum-sql",
@@ -255,7 +255,7 @@ dependencies = [
 
 [[package]]
 name = "ferrum-sql"
-version = "0.1.19"
+version = "0.1.20"
 dependencies = [
  "criterion",
  "ferrum-core",
@@ -750,9 +750,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.1.4"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa"
 dependencies = [
  "bitflags",
  "errno",

{ferrum_orm-0.1.19 → ferrum_orm-0.1.20}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/ferrum-core", "crates/ferrum-sql", "crates/ferrum-pyo3"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.19"
+version = "0.1.20"
 edition = "2021"
 authors = ["Ferrum Contributors"]
 license = "Apache-2.0"

{ferrum_orm-0.1.19 → ferrum_orm-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ferrum-orm
-Version: 0.1.19
+Version: 0.1.20
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: AsyncIO
 Classifier: Intended Audience :: Developers

{ferrum_orm-0.1.19 → ferrum_orm-0.1.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ferrum-orm"
-version = "0.1.19"
+version = "0.1.20"
 description = "Next-generation async ORM for Python with a Rust-powered core"
 license = { text = "Apache-2.0" }
 readme = "README.md"
@@ -180,10 +180,4 @@ markers = [
 # Do not run integration/security by default locally; require explicit -m flag.
 addopts = "-m 'not integration and not security'"
 
-# ---------------------------------------------------------------------------
-# import-linter
-# ---------------------------------------------------------------------------
-[tool.importlinter]
-root_packages = ["ferrum"]
-include_external_packages = true
-contracts_file = ".importlinter"
+# import-linter is configured in .importlinter.

{ferrum_orm-0.1.19 → ferrum_orm-0.1.20}/python/ferrum/__init__.py

@@ -6,7 +6,7 @@ Import paths are stable API; internal module paths are not.
 
 from __future__ import annotations
 
-__version__ = "0.1.19"
+__version__ = "0.1.20"
 __all__ = [
     "Aggregate",
     "ConnectionRegistry",

{ferrum_orm-0.1.19 → ferrum_orm-0.1.20}/python/ferrum/contrib/fastapi.py

@@ -373,7 +373,7 @@ def _import_fastapi_users_db_protocol() -> Any:  # noqa: ANN401 — soft import
             without a new Ferrum-side hard dependency.
     """
     try:
-        from fastapi_users.db.base import BaseUserDatabase  # ty: ignore[unresolved-import]
+        from fastapi_users.db.base import BaseUserDatabase  # ty: ignore[import-not-found]
     except ImportError as exc:  # pragma: no cover — exercised by unit test
         raise ImportError(
             "FerrumUserDatabase requires the optional 'fastapi-users' package. "
@@ -545,7 +545,7 @@ class FerrumUserDatabase:
     def _raise_user_already_exists(exc: FerrumIntegrityError) -> None:
         """Translate a Ferrum unique/integrity error into UserAlreadyExists."""
         try:
-            from fastapi_users.exceptions import UserAlreadyExists  # ty: ignore[unresolved-import]
+            from fastapi_users.exceptions import UserAlreadyExists  # ty: ignore[import-not-found]
         except ImportError:  # pragma: no cover — exercised by unit test
             # Without fastapi-users installed there is no UserAlreadyExists
             # to raise; re-raise the Ferrum error so the caller still sees

{ferrum_orm-0.1.19 → ferrum_orm-0.1.20}/python/ferrum/migrations/orchestrator.py

@@ -196,6 +196,13 @@ def _validate_timeout(value: str | None, name: str) -> None:
         )
 
 
+# Serial pseudo-types carry an implicit sequence DEFAULT; PostgreSQL rejects a
+# second DEFAULT on the same column (SQLSTATE 42601).
+_SERIAL_SQL_TYPES: frozenset[str] = frozenset(
+    {"SMALLSERIAL", "SERIAL2", "SERIAL", "SERIAL4", "BIGSERIAL", "SERIAL8"}
+)
+
+
 # SQL type allowlist — only these tokens may appear in DDL type position.
 # Prevents DDL injection if upstream metadata validation is bypassed.
 _SQL_TYPE_ALLOWLIST: frozenset[str] = frozenset(
@@ -426,7 +433,13 @@ def _col_def(col: dict[str, Any], *, dialect: str = "postgres") -> str:
     For composite-PK tables ``primary_key`` may be ``False`` on individual columns
     (the table-level constraint is emitted by ``_op_to_sql`` for ``create_table``).
     """
-    sql_type = _map_sql_type(col.get("sql_type", "TEXT"), dialect)
+    source_type = str(col.get("sql_type", "TEXT"))
+    if col.get("default") is not None and source_type.strip().upper() in _SERIAL_SQL_TYPES:
+        raise FerrumMigrationError(
+            f"Column {col['name']!r} is {source_type.upper()}, which already has a "
+            "sequence DEFAULT. Remove default= from this column. [FERR-M001]"
+        )
+    sql_type = _map_sql_type(source_type, dialect)
     base_type = sql_type.split("(")[0].upper()
     # Array types end with "[]"; strip that suffix before allowlist check.
     base_type_check = base_type.rstrip("[]") if base_type.endswith("[]") else base_type
@@ -841,12 +854,15 @@ def _field_to_col_def(field_meta: FieldMeta, *, is_pk: bool) -> dict[str, Any]:
     parameterised column types (``VARCHAR(n)``, ``NUMERIC(p,s)``) are emitted
     correctly.
     """
+    sql_type = field_meta.sql_type
     default = field_meta.db_default
-    if default is None:
+    # A Python-side default on a serial PK (e.g. ``id: int = 0``) is an
+    # insert-time value, not a DB default: the sequence owns the DB default.
+    if default is None and sql_type.upper() not in _SERIAL_SQL_TYPES:
         default = _python_default_to_sql(value=field_meta.python_default, field_meta=field_meta)
     return {
         "name": field_meta.column_name,
-        "sql_type": field_meta.sql_type,
+        "sql_type": sql_type,
         "not_null": not field_meta.nullable,
         "default": default,
         "primary_key": is_pk,