Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Selection set field and fragment type name conflicts #3041

Merged
merged 4 commits into from
May 25, 2023
Merged

fix: Selection set field and fragment type name conflicts #3041

merged 4 commits into from
May 25, 2023

Conversation

BobaFetters
Copy link
Member

@BobaFetters BobaFetters commented May 24, 2023 •
edited
Loading

  • Added new test cases to cover different scenarios of type name conflicts in selection set generation
  • Updated type conflict algorithm to cover all test cases for field and fragment types

Closes #2405

@BobaFetters
Adding more test cases
1b08e74 
Adding more tests cases for type name conflicts during selection set generation
@netlify
Copy link

netlify bot commented May 24, 2023 •
edited
Loading

✅ Deploy Preview for apollo-ios-docs canceled.

Name Link
🔨 Latest commit 853b978
🔍 Latest deploy log https://app.netlify.com/sites/apollo-ios-docs/deploys/646fc6cce0aa65000887f94f

@BobaFetters BobaFetters marked this pull request as ready for review May 25, 2023 18:48
@BobaFetters BobaFetters changed the title [WIP] Selection set field and fragment type name conflicts fix: Selection set field and fragment type name conflicts May 25, 2023
calvincestari
calvincestari reviewed May 25, 2023
View reviewed changes
Copy link
Member

@calvincestari calvincestari left a comment

Choose a reason for hiding this comment

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

Had one comment about the timing of combining the parent types.

Sources/ApolloCodegenLib/ApolloCodegen.swift Outdated Show resolved Hide resolved
Sources/ApolloCodegenLib/ApolloCodegen.swift Show resolved Hide resolved
@BobaFetters BobaFetters merged commit bafb3e9 into main May 25, 2023
@BobaFetters BobaFetters deleted the fix/selection-set-type-name-conflicts branch May 25, 2023 20:56
@AnthonyMDev AnthonyMDev mentioned this pull request Jun 2, 2023
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@calvincestari calvincestari calvincestari approved these changes

@AnthonyMDev AnthonyMDev Awaiting requested review from AnthonyMDev

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Apollo 1.0 Beta: Fragment name collisions with selection sets are easy
2 participants
@BobaFetters @calvincestari