Simplify

Author: YuriiMotov

pyproject.toml

@@ -109,7 +109,6 @@ disallow_untyped_defs = false
 disallow_untyped_calls = false
 
 [tool.ruff.lint]
-typing-modules = ["sqlmodel._compat"]
 select = [
     "E",  # pycodestyle errors
     "W",  # pycodestyle warnings

sqlmodel/_compat.py

@@ -24,8 +24,6 @@
 from pydantic.fields import FieldInfo
 from typing_extensions import Annotated, get_args, get_origin
 
-from .sql.sqltypes import AutoString
-
 # Reassign variable to make it reexported for mypy
 PYDANTIC_VERSION = P_VERSION
 PYDANTIC_MINOR_VERSION = tuple(int(i) for i in P_VERSION.split(".")[:2])
@@ -469,8 +467,8 @@ def is_field_noneable(field: "FieldInfo") -> bool:
 
     def get_sa_type_from_field(field: Any) -> Any:
         if get_origin(field.type_) is Literal:
-            return AutoString
-        elif isinstance(field.type_, type) and field.shape == SHAPE_SINGLETON:
+            return Literal
+        if isinstance(field.type_, type) and field.shape == SHAPE_SINGLETON:
             return field.type_
         raise ValueError(f"The field {field.name} has no matching SQLAlchemy type")
 

sqlmodel/main.py

@@ -40,7 +40,6 @@
     inspect,
 )
 from sqlalchemy import Enum as sa_Enum
-from sqlalchemy import types as sa_types
 from sqlalchemy.orm import (
     Mapped,
     RelationshipProperty,
@@ -53,13 +52,12 @@
 from sqlalchemy.orm.instrumentation import is_instrumented
 from sqlalchemy.sql.schema import MetaData
 from sqlalchemy.sql.sqltypes import LargeBinary, Time, Uuid
-from typing_extensions import TypeAlias, deprecated, get_origin
+from typing_extensions import Literal, TypeAlias, deprecated, get_origin
 
 from ._compat import (  # type: ignore[attr-defined]
     IS_PYDANTIC_V2,
     PYDANTIC_MINOR_VERSION,
     BaseConfig,
-    Literal,
     ModelField,
     ModelMetaclass,
     Representation,
@@ -657,16 +655,12 @@ def get_sqlalchemy_type(field: Any) -> Any:
     type_ = get_sa_type_from_field(field)
     metadata = get_field_metadata(field)
 
-    # If it's already an SQLAlchemy type (eg. AutoString), use it directly
-    if isinstance(type_, type) and issubclass(type_, sa_types.TypeEngine):
-        return type_
-
     # Checks for `Literal` type annotation
     if type_ is Literal:
         return AutoString
     # Check enums first as an enum can also be a str, needed by Pydantic/FastAPI
     if issubclass(type_, Enum):
-        return sa_Enum(cast(Type[Enum], type_))
+        return sa_Enum(type_)
     if issubclass(
         type_,
         (

tests/test_main.py

@@ -4,7 +4,7 @@
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import RelationshipProperty
 from sqlmodel import Field, Relationship, Session, SQLModel, create_engine, select
-from sqlmodel._compat import Literal
+from typing_extensions import Literal
 
 
 def test_should_allow_duplicate_row_if_unique_constraint_is_not_passed(clear_sqlmodel):