diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/warnings.py | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index 67be165f6..0e8449068 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -1359,6 +1359,14 @@ def with_polymorphic( result in their table being appended directly to the FROM clause which will usually lead to incorrect results. + When left at its default value of ``False``, the polymorphic + selectable assigned to the base mapper is used for selecting rows. + However, it may also be passed as ``None``, which will bypass the + configured polymorphic selectable and instead construct an ad-hoc + selectable for the target classes given; for joined table inheritance + this will be a join that includes all target mappers and their + subclasses. + :param polymorphic_on: a column to be used as the "discriminator" column for the given selectable. If not given, the polymorphic_on attribute of the base classes' mapper will be used, if any. This diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py index ae2c7916d..2a0c486d2 100644 --- a/lib/sqlalchemy/testing/warnings.py +++ b/lib/sqlalchemy/testing/warnings.py @@ -66,11 +66,6 @@ def setup_filters(): # we are moving one at a time for msg in [ # - # ORM Query - # - r"The Query.with_polymorphic\(\) method is considered " - "legacy as of the 1.x series", - # # ORM Session # r"The Session.autocommit parameter is deprecated ", |