Skip to content

Revert "Revert "fix(query-planner): Fix bug where subgraph jump key fields are fetched from the wrong group""#3307

Merged
sachindshinde merged 1 commit intomainfrom
revert-3300-revert-3293-sachin/fix-inapplicable-key-during-requires-subgraph-jump
Oct 1, 2025
Merged

Revert "Revert "fix(query-planner): Fix bug where subgraph jump key fields are fetched from the wrong group""#3307
sachindshinde merged 1 commit intomainfrom
revert-3300-revert-3293-sachin/fix-inapplicable-key-during-requires-subgraph-jump

Conversation

@sachindshinde
Copy link
Contributor

Reverts #3300 (which reverted #3293), as we're finishing up testing and the original PR should be fine to merge soon.

@sachindshinde sachindshinde requested a review from a team as a code owner September 30, 2025 00:05
@changeset-bot
Copy link

changeset-bot bot commented Sep 30, 2025

🦋 Changeset detected

Latest commit: d4616c0

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 7 packages
Name Type
@apollo/query-planner Patch
@apollo/gateway Patch
@apollo/federation-internals Patch
@apollo/composition Patch
@apollo/query-graphs Patch
@apollo/subgraph Patch
apollo-federation-integration-testsuite Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@apollo-librarian
Copy link

apollo-librarian bot commented Sep 30, 2025

❌ Docs preview failed

The preview failed to build.

Build ID: c5986642a395ac3c1da0bdbd
Build Logs: View logs

Errors

General: ENOSPC: no space left on device, mkdir '/tmp/librarian/remote-sources/apollographql/rover/main'

@codesandbox-ci
Copy link

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Copy link
Contributor

@duckki duckki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. (This was once approved and merged before.)

The results from the Rust version of this fix looked good (improved planning with no regression). So, I expect this PR will be positive as well.

@sachindshinde sachindshinde merged commit 4faa114 into main Oct 1, 2025
16 of 17 checks passed
@sachindshinde sachindshinde deleted the revert-3300-revert-3293-sachin/fix-inapplicable-key-during-requires-subgraph-jump branch October 1, 2025 16:17
@github-actions github-actions bot mentioned this pull request Oct 1, 2025
dariuszkuc pushed a commit that referenced this pull request Oct 9, 2025
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @apollo/composition@2.11.3

### Patch Changes

- Updated dependencies
\[[`8c7a2cd655ad3060e9f5c3b106cfbdb59251701c`](8c7a2cd)]:
    -   @apollo/federation-internals@2.11.3
    -   @apollo/query-graphs@2.11.3

## @apollo/gateway@2.11.3

### Patch Changes

- Updated dependencies
\[[`4faa114215200daf7ad7518be8e50071fcde783c`](4faa114),
[`8c7a2cd655ad3060e9f5c3b106cfbdb59251701c`](8c7a2cd)]:
    -   @apollo/query-planner@2.11.3
    -   @apollo/federation-internals@2.11.3
    -   @apollo/composition@2.11.3

## @apollo/federation-internals@2.11.3

### Patch Changes

- Update connector spec to allow re-entry
([#3312](#3312))

Updates connector spec to follow the same patterns as other federation
spec blueprints (i.e. register types/directives in the constructor and
use default logic for adding them to the schema that checks whether they
need to be added or not).

NOTE: Support for handling input objects in the spec is severely limited
and only handles `@connect` spec. For additional details on limitations
see #3311.

## @apollo/query-graphs@2.11.3

### Patch Changes

- Updated dependencies
\[[`8c7a2cd655ad3060e9f5c3b106cfbdb59251701c`](8c7a2cd)]:
    -   @apollo/federation-internals@2.11.3

## @apollo/query-planner@2.11.3

### Patch Changes

- Fix bug in query planning where a subgraph jump for `@requires` can
sometimes try to fetch `@key` fields from a subgraph that doesn't have
them. This bug would previously cause query planning to error with a
message that looks like "Cannot add selection of field `T.id` to
selection set of parent type `T`".
([#3307](#3307))

- Updated dependencies
\[[`8c7a2cd655ad3060e9f5c3b106cfbdb59251701c`](8c7a2cd)]:
    -   @apollo/federation-internals@2.11.3
    -   @apollo/query-graphs@2.11.3

## @apollo/subgraph@2.11.3

### Patch Changes

- When a `GraphQLScalarType` resolver is provided to
`buildSubgraphSchema()`, omitted configuration options in the
`GraphQLScalarType` no longer cause the corresponding properties in the
GraphQL document/AST to be cleared. To explicitly clear these
properties, use `null` for the configuration option instead.
([#3285](#3285))
([#3285](#3285))

- Updated dependencies
\[[`8c7a2cd655ad3060e9f5c3b106cfbdb59251701c`](8c7a2cd)]:
    -   @apollo/federation-internals@2.11.3

## apollo-federation-integration-testsuite@2.11.3

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants