Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pynamodb/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,8 @@ def query(
# If this class has a discriminator attribute, filter the query to only return instances of this class.
discriminator_attr = cls._get_discriminator_attribute()
if discriminator_attr:
filter_condition &= discriminator_attr.is_in(*discriminator_attr.get_registered_subclasses(cls))
if index_name and discriminator_attr.attr_name != cls._indexes[index_name]._hash_key_attribute().attr_name: # Don't filter if discriminator is indexes hash key.
filter_condition &= discriminator_attr.is_in(*discriminator_attr.get_registered_subclasses(cls))

if page_size is None:
page_size = limit
Expand Down