diff --git a/codex/librarian/scribe/importer/const.py b/codex/librarian/scribe/importer/const.py index 4808a38b1..68c0437b9 100644 --- a/codex/librarian/scribe/importer/const.py +++ b/codex/librarian/scribe/importer/const.py @@ -334,23 +334,6 @@ def _metron_fts_values(values: tuple) -> tuple: Universe: ((NAME_FIELD_NAME,), _IDENTIFIER_RELS, DESIGNATION_FIELD_NAME), } ) -_IDENTIFIED_SELECT_RELATED = ("identifier", "identifier__source") -MODEL_SELECT_RELATED: MappingProxyType[type[BaseModel], tuple[str, ...]] = ( - MappingProxyType( - { - **dict.fromkeys(IDENTIFIED_MODELS, _IDENTIFIED_SELECT_RELATED), - Identifier: (IDENTIFIER_SOURCE_FIELD_NAME,), - Publisher: _IDENTIFIED_SELECT_RELATED, - Imprint: ("publisher",), - Series: ("publisher", "imprint"), - Volume: ("publisher", "imprint", "series"), - Credit: (CREDIT_PERSON_FIELD_NAME, CREDIT_ROLE_FIELD_NAME), - Reprint: _IDENTIFIED_SELECT_RELATED, - StoryArcNumber: (STORY_ARC_FIELD_NAME,), - Universe: _IDENTIFIED_SELECT_RELATED, - } - ) -) FIELD_NAME_KEYS_REL_MAP = MappingProxyType( { # ``related_model`` is typed ``type[Model] | Literal['self'] diff --git a/codex/librarian/scribe/importer/query/foreign_keys.py b/codex/librarian/scribe/importer/query/foreign_keys.py index 010588395..b2bfadc02 100644 --- a/codex/librarian/scribe/importer/query/foreign_keys.py +++ b/codex/librarian/scribe/importer/query/foreign_keys.py @@ -4,7 +4,6 @@ CREATE_FKS, FK_KEYS, MODEL_REL_MAP, - MODEL_SELECT_RELATED, QUERY_MODELS, TOTAL, UPDATE_FKS, @@ -37,13 +36,10 @@ def query_existing_mds( batch_proposed_key_tuples, ) rels = MODEL_REL_MAP[model] - select_related = MODEL_SELECT_RELATED.get(model, ()) # A comprehension, not filter(bool, ...): bool's signature widens the # element type to object, which values_list refuses. fields = tuple(field for field in flatten(rels) if field) - qs = model.objects - qs = qs.select_related(*select_related) - qs = qs.filter(fk_filter).distinct().values_list(*fields) + qs = model.objects.filter(fk_filter).distinct().values_list(*fields) extra_index = get_key_index(model) has_id = bool(rels[1]) existing_mds = {}