Arya Rizky cf3cfa307f Fix subqueryload losing .and_() criteria when combined with of_type() ...

Fixed issue where :func:`_orm.subqueryload` combined with
:meth:`.PropComparator.of_type` and :meth:`.PropComparator.and_` would
silently drop the additional filter criteria, causing all related objects
to be loaded instead of only those matching the filter.  The
:class:`.LoaderCriteriaOption` was being constructed against the base
entity rather than the effective entity indicated by
:meth:`.PropComparator.of_type`.  Pull request courtesy Arya Rizky.

Fixes: #13207

Closes: #13290
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/13290
Pull-request-sha: b7a8617cde

Change-Id: I2c24652ec112511deaf39dbb9d6197e2097904ed

2026-05-27 18:06:55 -04:00

..

declarative

resolve table names using MetaData.schema default in declarative registry

2026-05-18 10:53:07 -04:00

dml

fix typos (#13047)

2025-12-19 21:24:23 +01:00

inheritance

detect and accommodate reverse condition for loader strategy

2026-03-23 15:20:53 -04:00

__init__.py

…

_fixtures.py

update to black 26.3.1

2026-05-10 19:00:42 +02:00

test_ac_relationships.py

remove use of LABEL_STYLE_TABLENAME_PLUS_COL outside of Query

2025-11-10 14:57:35 -05:00

test_association.py

…

test_assorted_eager.py

Update black to 24.1.1

2024-01-31 21:54:59 +01:00

test_attributes.py

update to black 26.3.1

2026-05-10 19:00:42 +02:00

test_backref_mutations.py

Try running pyupgrade on the code

2022-11-16 23:03:04 +01:00

test_bind.py

apply underscores to ORM class and def names

2024-11-18 14:56:07 -05:00

test_bundle.py

Add DictBundle

2025-11-15 18:33:07 +00:00

test_cache_key.py

remove python 3.9 support since it's close to eol

2025-08-23 14:22:57 +02:00

test_cascade.py

remove use of LABEL_STYLE_TABLENAME_PLUS_COL outside of Query

2025-11-10 14:57:35 -05:00

test_collection.py

remove deprecated features

2025-03-18 09:17:07 -04:00

test_compile.py

Remove object in class definition

2021-11-22 15:03:17 +00:00

test_composites.py

support configurable None behavior for composites

2025-08-26 14:33:05 -04:00

test_core_compilation.py

filter_by works across multiple entities

2025-12-04 13:53:27 +00:00

test_cycles.py

apply correct pre-fetch params to post updated rows

2025-08-05 17:11:50 -04:00

test_dataclasses.py

remove _py3k suffixes from test files

2025-09-20 18:31:25 -04:00

test_default_strategies.py

fix typos (#13038)

2025-12-18 21:18:42 +01:00

test_defaults.py

update default driver for oracle, postgresql

2025-12-15 23:01:12 -05:00

test_deferred.py

remove use of LABEL_STYLE_TABLENAME_PLUS_COL outside of Query

2025-11-10 14:57:35 -05:00

test_deprecations.py

remove python 3.9 support since it's close to eol

2025-08-23 14:22:57 +02:00

test_descriptor.py

…

test_dynamic.py

fix typos (#13047)

2025-12-19 21:24:23 +01:00

test_eager_relations.py

test oracle 23c, mariadb12; reduce backend use

2025-11-25 14:50:56 -05:00

test_events.py

dont produce side effects for do_orm_execute

2026-05-24 11:22:40 -04:00

test_expire.py

The `noload` loader option is now deprecated.

2025-02-24 14:25:11 -05:00

test_froms.py

update to black 26.3.1

2026-05-10 19:00:42 +02:00

test_generative.py

Try running pyupgrade on the code

2022-11-16 23:03:04 +01:00

test_hasparent.py

additional followup to368f5ac6668456609cf5f862

2025-10-28 18:44:55 -04:00

test_immediate_load.py

implement join_depth for immediateload, fix expunged loading

2023-07-26 13:53:30 -04:00

test_inspect.py

Update black to v23.3.0 and flake8 to v6

2023-05-30 21:44:26 +02:00

test_instrumentation.py

apply underscores to ORM class and def names

2024-11-18 14:56:07 -05:00

test_joins.py

update to black 26.3.1

2026-05-10 19:00:42 +02:00

test_lambdas.py

test oracle 23c, mariadb12; reduce backend use

2025-11-25 14:50:56 -05:00

test_lazy_relations.py

test oracle 23c, mariadb12; reduce backend use

2025-11-25 14:50:56 -05:00

test_load_on_fks.py

cascade fixes revealed by the removal of cascade_backrefs

2023-07-11 11:34:04 -04:00

test_loading.py

implement RETURNING * for ORM DML

2023-08-07 11:56:58 -04:00

test_lockmode.py

test oracle 23c, mariadb12; reduce backend use

2025-11-25 14:50:56 -05:00

test_manytomany.py

Update black to v23.3.0 and flake8 to v6

2023-05-30 21:44:26 +02:00

test_mapper.py

fix typos (#13038)

2025-12-18 21:18:42 +01:00

test_merge.py

remove use of LABEL_STYLE_TABLENAME_PLUS_COL outside of Query

2025-11-10 14:57:35 -05:00

test_naturalpks.py

update to black 26.3.1

2026-05-10 19:00:42 +02:00

test_of_type.py

accommodate subclass mapper in post-loader entity_isa check

2026-03-29 13:46:39 -04:00

test_onetoone.py

…

test_options.py

consider propagate_to_loaders at application time

2024-04-18 19:22:18 -04:00

test_pickled.py

The `noload` loader option is now deprecated.

2025-02-24 14:25:11 -05:00

test_query.py

Block Result.unique() with Result.yield_per() for ORM results

2026-05-12 18:47:56 -04:00

test_recursive_loaders.py

remove loader depth warning, replace with logging message

2024-01-18 15:21:32 -05:00

test_rel_fn.py

apply underscores to ORM class and def names

2024-11-18 14:56:07 -05:00

test_relationship_criteria.py

Fix joinedload + of_type() + and_() invalid SQL for subclass columns

2026-05-20 19:26:16 +00:00

test_relationships.py

omit_join optimization for selectinload on many-to-many relationships

2026-05-27 13:23:10 -04:00

test_scoping.py

populate existing can be in exec option in session.get

2026-05-10 11:39:45 -04:00

test_selectable.py

update to black 26.3.1

2026-05-10 19:00:42 +02:00

test_selectin_relations.py

omit_join optimization for selectinload on many-to-many relationships

2026-05-27 13:23:10 -04:00

test_session_state_change.py

fix typos (#13047)

2025-12-19 21:24:23 +01:00

test_session.py

populate existing can be in exec option in session.get

2026-05-10 11:39:45 -04:00

test_subquery_relations.py

Fix subqueryload losing .and_() criteria when combined with of_type()

2026-05-27 18:06:55 -04:00

test_sync.py

apply underscores to ORM class and def names

2024-11-18 14:56:07 -05:00

test_syntax_extensions.py

syntax extensions (patch 1)

2025-03-05 16:03:16 -05:00

test_text.py

add TString support

2025-11-30 14:38:13 -05:00

test_transaction.py

test oracle 23c, mariadb12; reduce backend use

2025-11-25 14:50:56 -05:00

test_tstring_py314.py

add TString support

2025-11-30 14:38:13 -05:00

test_unitofwork.py

update to black 26.3.1

2026-05-10 19:00:42 +02:00

test_unitofworkv2.py

update default driver for oracle, postgresql

2025-12-15 23:01:12 -05:00

test_utils.py

implement _post_inspect for AliasedInsp

2026-05-20 16:30:28 -04:00

test_validators.py

Improve typing tests

2023-06-27 23:50:25 +02:00

test_versioning.py

stop using MyISAM; more oracle struggles

2025-11-26 22:24:28 -05:00