diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-06-18 18:59:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-06-18 18:59:48 +0000 |
| commit | 84183b19795a8ccdcbf4adbd9951ff3d60d161fe (patch) | |
| tree | 5566b601ef945142c5b6a590a25ba4fb4da67089 /lib/sqlalchemy/sql | |
| parent | c3102b85c40ab4578a0f56ee1e8eee4a6e0aed55 (diff) | |
| parent | a134956c4e4564844c33302ddf27a70102fe00a8 (diff) | |
| download | sqlalchemy-84183b19795a8ccdcbf4adbd9951ff3d60d161fe.tar.gz | |
Merge "Allow NUMERIC()/DECIMAL() IDENTITY columns" into main
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/schema.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/sqltypes.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/type_api.py | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index c37b60003..2414d9235 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -4540,7 +4540,11 @@ class PrimaryKeyConstraint(ColumnCollectionConstraint): def _autoincrement_column(self) -> Optional[Column[Any]]: def _validate_autoinc(col: Column[Any], autoinc_true: bool) -> bool: if col.type._type_affinity is None or not issubclass( - col.type._type_affinity, type_api.INTEGERTYPE._type_affinity + col.type._type_affinity, + ( + type_api.INTEGERTYPE._type_affinity, + type_api.NUMERICTYPE._type_affinity, + ), ): if autoinc_true: raise exc.ArgumentError( diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py index b4b444f23..8d796566d 100644 --- a/lib/sqlalchemy/sql/sqltypes.py +++ b/lib/sqlalchemy/sql/sqltypes.py @@ -459,6 +459,12 @@ class Numeric(HasExpressionLookup, TypeEngine[_N]): __visit_name__ = "numeric" + if TYPE_CHECKING: + + @util.ro_memoized_property + def _type_affinity(self) -> Type[Numeric[_N]]: + ... + _default_decimal_return_scale = 10 def __init__( @@ -3611,6 +3617,7 @@ NULLTYPE = NullType() BOOLEANTYPE = Boolean() STRINGTYPE = String() INTEGERTYPE = Integer() +NUMERICTYPE: Numeric[decimal.Decimal] = Numeric() MATCHTYPE = MatchType() TABLEVALUE = TableValueType() DATETIME_TIMEZONE = DateTime(timezone=True) @@ -3668,6 +3675,7 @@ type_api.BOOLEANTYPE = BOOLEANTYPE type_api.STRINGTYPE = STRINGTYPE type_api.INTEGERTYPE = INTEGERTYPE type_api.NULLTYPE = NULLTYPE +type_api.NUMERICTYPE = NUMERICTYPE type_api.MATCHTYPE = MATCHTYPE type_api.INDEXABLE = INDEXABLE = Indexable type_api.TABLEVALUE = TABLEVALUE diff --git a/lib/sqlalchemy/sql/type_api.py b/lib/sqlalchemy/sql/type_api.py index 00bae17bc..d8f1e92c4 100644 --- a/lib/sqlalchemy/sql/type_api.py +++ b/lib/sqlalchemy/sql/type_api.py @@ -50,6 +50,7 @@ if typing.TYPE_CHECKING: from .sqltypes import INTEGERTYPE as INTEGERTYPE # noqa: F401 from .sqltypes import MATCHTYPE as MATCHTYPE # noqa: F401 from .sqltypes import NULLTYPE as NULLTYPE + from .sqltypes import NUMERICTYPE as NUMERICTYPE # noqa: F401 from .sqltypes import STRINGTYPE as STRINGTYPE # noqa: F401 from .sqltypes import TABLEVALUE as TABLEVALUE # noqa: F401 from ..engine.interfaces import Dialect |