ferrum-orm 0.1.4__tar.gz → 0.1.6__tar.gz

{ferrum_orm-0.1.4 → ferrum_orm-0.1.6}/Cargo.lock

@@ -223,7 +223,7 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "ferrum-core"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "criterion",
  "proptest",
@@ -234,7 +234,7 @@ dependencies = [
 
 [[package]]
 name = "ferrum-migrate"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "ferrum-core",
  "serde",
@@ -243,7 +243,7 @@ dependencies = [
 
 [[package]]
 name = "ferrum-pyo3"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "ferrum-core",
  "ferrum-sql",
@@ -255,7 +255,7 @@ dependencies = [
 
 [[package]]
 name = "ferrum-sql"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "criterion",
  "ferrum-core",

{ferrum_orm-0.1.4 → ferrum_orm-0.1.6}/Cargo.toml

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

{ferrum_orm-0.1.4 → ferrum_orm-0.1.6}/PKG-INFO

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

{ferrum_orm-0.1.4 → ferrum_orm-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ferrum-orm"
-version = "0.1.4"
+version = "0.1.6"
 description = "Next-generation async ORM for Python with a Rust-powered core"
 license = { text = "Apache-2.0" }
 readme = "README.md"

{ferrum_orm-0.1.4 → ferrum_orm-0.1.6}/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.4"
+__version__ = "0.1.6"
 __all__ = [
     "CreateExtension",
     "CreateFunction",

{ferrum_orm-0.1.4 → ferrum_orm-0.1.6}/python/ferrum/cli/inspectdb_cmd.py

@@ -35,7 +35,7 @@ _HEADER = textwrap.dedent("""\
     from __future__ import annotations
     from datetime import date, datetime, time
     from decimal import Decimal
-    from typing import Annotated
+    from typing import Annotated, ClassVar
     from uuid import UUID
 
     import ferrum
@@ -237,12 +237,18 @@ def _render_class(
             fk = fk_map[col_name]
             target_class = _to_class_name(fk["foreign_table_name"])
             delete_rule = fk["delete_rule"].upper()
-            # Strip the trailing ``_id`` suffix for the field name if present.
-            field_name = col_name[:-3] if col_name.endswith("_id") else col_name
-            lines.append(
-                f'    {field_name}: ForeignKey = ForeignKey(to="{target_class}",'
-                f' on_delete="{delete_rule}")'
-            )
+            annotation = _pg_type_to_ferrum(pg_type, max_len, precision, scale, is_pk, is_nullable)
+            if "Field(" in annotation:
+                lines.append(f"    {col_name}: {annotation}")
+            else:
+                lines.append(f"    {col_name}: {annotation}")
+            # Relation descriptor (ClassVar) — only when the column follows {name}_id.
+            if col_name.endswith("_id"):
+                rel_name = col_name[:-3]
+                lines.append(
+                    f"    {rel_name}: ClassVar[ForeignKey] = ForeignKey("
+                    f'to="{target_class}", on_delete="{delete_rule}")'
+                )
             continue
 
         annotation = _pg_type_to_ferrum(pg_type, max_len, precision, scale, is_pk, is_nullable)
@@ -291,14 +297,9 @@ async def run_inspectdb(
             if conn.dialect != "postgres":
                 print("inspectdb currently supports PostgreSQL only.")
                 return 2
-            pool = getattr(driver, "_pool", None)
-            if pool is None:
-                print("Connection error: pool not open [FERR-E101]")
-                return 2
-            async with pool.acquire() as db_conn:
-                col_rows = await db_conn.fetch(_COL_QUERY, schema)
-                fk_rows = await db_conn.fetch(_FK_QUERY, schema)
-                pk_rows = await db_conn.fetch(_PK_QUERY, schema)
+            col_rows = await driver.fetch(_COL_QUERY, schema)
+            fk_rows = await driver.fetch(_FK_QUERY, schema)
+            pk_rows = await driver.fetch(_PK_QUERY, schema)
     except FerrumConfigError as exc:
         print(f"Configuration error: {exc}")
         return 2