GitHub-Proxy/sqlmodel-fix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fix pydantic EmailStr support and max_length in several String subclasses (#966)

Browse Source
This commit is contained in:
Esteban Maya 2024-06-03 21:47:40 -05:00 committed by GitHub
parent 9f3af8507e
commit 1d43bd8b1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sqlmodel/main.py
View File

@ -25,7 +25,7 @@ from typing import (
overload, overload,
) )
from pydantic import BaseModel from pydantic import BaseModel, EmailStr
from pydantic.fields import FieldInfo as PydanticFieldInfo from pydantic.fields import FieldInfo as PydanticFieldInfo
from sqlalchemy import ( from sqlalchemy import (
Boolean, Boolean,
@ -574,7 +574,18 @@ def get_sqlalchemy_type(field: Any) -> Any:
# Check enums first as an enum can also be a str, needed by Pydantic/FastAPI # Check enums first as an enum can also be a str, needed by Pydantic/FastAPI
if issubclass(type_, Enum): if issubclass(type_, Enum):
return sa_Enum(type_) return sa_Enum(type_)
if issubclass(type_, str): if issubclass(
type_,
(
str,
ipaddress.IPv4Address,
ipaddress.IPv4Network,
ipaddress.IPv6Address,
ipaddress.IPv6Network,
Path,
EmailStr,
),
):
max_length = getattr(metadata, "max_length", None) max_length = getattr(metadata, "max_length", None)
if max_length: if max_length:
return AutoString(length=max_length) return AutoString(length=max_length)
@ -600,16 +611,6 @@ def get_sqlalchemy_type(field: Any) -> Any:
precision=getattr(metadata, "max_digits", None), precision=getattr(metadata, "max_digits", None),
scale=getattr(metadata, "decimal_places", None), scale=getattr(metadata, "decimal_places", None),
) )
if issubclass(type_, ipaddress.IPv4Address):
return AutoString
if issubclass(type_, ipaddress.IPv4Network):
return AutoString
if issubclass(type_, ipaddress.IPv6Address):
return AutoString
if issubclass(type_, ipaddress.IPv6Network):
return AutoString
if issubclass(type_, Path):
return AutoString
if issubclass(type_, uuid.UUID): if issubclass(type_, uuid.UUID):
return GUID return GUID
raise ValueError(f"{type_} has no matching SQLAlchemy type") raise ValueError(f"{type_} has no matching SQLAlchemy type")