summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2023-01-28 22:20:00 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2023-01-28 22:20:00 +0000
commitb99b0c522ddb94468da27867ddfa1f7e2633c920 (patch)
tree6fa48970b59e219a743eeb73e2ba0568ca16d49f /lib/sqlalchemy/orm
parentfcbcda44cad9c9dddd94ccba8c266dc3b2988fb7 (diff)
parent4cae82d51f80c8a7e1a23b26c74b07e01059b804 (diff)
downloadsqlalchemy-b99b0c522ddb94468da27867ddfa1f7e2633c920.tar.gz
Merge "Place DDLConstraintColumn Role in Mapped" into main
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/attributes.py1
-rw-r--r--lib/sqlalchemy/orm/base.py2
-rw-r--r--lib/sqlalchemy/orm/properties.py2
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 261a633a3..cdc729f73 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -135,7 +135,6 @@ class QueryableAttribute(
interfaces.PropComparator[_T],
roles.JoinTargetRole,
roles.OnClauseRole,
- roles.DDLConstraintColumnRole,
sql_base.Immutable,
cache_key.SlotsMemoizedHasCacheKey,
util.MemoizedSlots,
diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py
index 331464cf8..5b6675365 100644
--- a/lib/sqlalchemy/orm/base.py
+++ b/lib/sqlalchemy/orm/base.py
@@ -31,6 +31,7 @@ from ._typing import insp_is_mapper
from .. import exc as sa_exc
from .. import inspection
from .. import util
+from ..sql import roles
from ..sql.elements import SQLColumnExpression
from ..sql.elements import SQLCoreOperations
from ..util import FastIntFlag
@@ -775,6 +776,7 @@ class Mapped(
SQLORMExpression[_T],
ORMDescriptor[_T],
_MappedAnnotationBase[_T],
+ roles.DDLConstraintColumnRole,
):
"""Represent an ORM mapped attribute on a mapped class.
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index baaa0291b..9feb72e40 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -47,7 +47,6 @@ from .. import util
from ..sql import coercions
from ..sql import roles
from ..sql.base import _NoArg
-from ..sql.roles import DDLConstraintColumnRole
from ..sql.schema import Column
from ..sql.schema import SchemaConst
from ..sql.type_api import TypeEngine
@@ -504,7 +503,6 @@ class MappedSQLExpression(ColumnProperty[_T], _DeclarativeMapped[_T]):
class MappedColumn(
- DDLConstraintColumnRole,
_IntrospectsAnnotations,
_MapsColumns[_T],
_DeclarativeMapped[_T],