📝 Update type alias handling for Python 3.12 compatibility

Author: stickm4n

sqlmodel/_compat.py

@@ -15,7 +15,6 @@
     Optional,
     Set,
     Type,
-    TypeAliasType,
     TypeVar,
     Union,
 )
@@ -75,6 +74,9 @@ def partial_init() -> Generator[None, None, None]:
 
 
 if IS_PYDANTIC_V2:
+    if sys.version_info >= (3, 12):
+        from typing import TypeAliasType
+
     from annotated_types import MaxLen
     from pydantic import ConfigDict as BaseConfig
     from pydantic._internal._fields import PydanticMetadata
@@ -204,7 +206,7 @@ def get_sa_type_from_type_annotation(annotation: Any) -> Any:
         # Resolve Optional fields
         if annotation is None:
             raise ValueError("Missing field type")
-        if isinstance(annotation, TypeAliasType):
+        if sys.version_info >= (3, 12) and isinstance(annotation, TypeAliasType):
             annotation = annotation.__value__
         origin = get_origin(annotation)
         if origin is None:

tests/conftest.py

@@ -93,3 +93,6 @@ def print_mock_fixture() -> Generator[PrintMock, None, None]:
 needs_py310 = pytest.mark.skipif(
     sys.version_info < (3, 10), reason="requires python3.10+"
 )
+needs_py312 = pytest.mark.skipif(
+    sys.version_info < (3, 12), reason="requires python3.12+"
+)

tests/test_field_sa_type.py

@@ -1,11 +1,11 @@
-from sys import version_info
 from typing import Annotated, TypeAlias
 
-import pytest
 from sqlmodel import Field, SQLModel
 
+from tests.conftest import needs_py312
 
-@pytest.mark.skipif(version_info[1] < 12, reason="Language feature of Python 3.12+")
+
+@needs_py312
 def test_sa_type_1() -> None:
     Type1 = str
 
@@ -14,7 +14,7 @@ class Hero1(SQLModel, table=True):
         weapon: Type1 = "sword"
 
 
-@pytest.mark.skipif(version_info[1] < 12, reason="Language feature of Python 3.12+")
+@needs_py312
 def test_sa_type_2() -> None:
     Type2 = Annotated[str, "Just a comment"]
 
@@ -26,7 +26,7 @@ class Hero(SQLModel, table=True):
 Type3: TypeAlias = str
 
 
-@pytest.mark.skipif(version_info[1] < 12, reason="Language feature of Python 3.12+")
+@needs_py312
 def test_sa_type_3() -> None:
     class Hero(SQLModel, table=True):
         pk: int = Field(primary_key=True)
@@ -36,14 +36,14 @@ class Hero(SQLModel, table=True):
 Type4: TypeAlias = Annotated[str, "Just a comment"]
 
 
-@pytest.mark.skipif(version_info[1] < 12, reason="Language feature of Python 3.12+")
+@needs_py312
 def test_sa_type_4() -> None:
     class Hero(SQLModel, table=True):
         pk: int = Field(primary_key=True)
         weapon: Type4 = "sword"
 
 
-@pytest.mark.skipif(version_info[1] < 12, reason="Language feature of Python 3.12+")
+@needs_py312
 def test_sa_type_5() -> None:
     type Type5 = str
 
@@ -52,7 +52,7 @@ class Hero(SQLModel, table=True):
         weapon: Type5 = "sword"
 
 
-@pytest.mark.skipif(version_info[1] < 12, reason="Language feature of Python 3.12+")
+@needs_py312
 def test_sa_type_6() -> None:
     type Type6 = Annotated[str, "Just a comment"]