Revert #2639, an attempt to fix query fragment reuse (#2681)

Author: trevor-scheer

.changeset/metal-cheetahs-add.md

@@ -0,0 +1,10 @@
+---
+"@apollo/query-planner": patch
+"@apollo/federation-internals": patch
+"@apollo/gateway": patch
+---
+
+Revert #2639 from v2.4.9
+
+PR #2639 attempts to resolve issues with query fragment reuse, but we've since turned up multiple issues (at least 1 of which is a regression - see #2680. For now, this reverts it until we resolve the regression for a future patch release.
+ 

gateway-js/src/__tests__/buildQueryPlan.test.ts

@@ -744,21 +744,18 @@ describe('buildQueryPlan', () => {
 
  it(`should not get confused by a fragment spread multiple times`, () => {
  const operationString = `#graphql
- fragment PriceAndCountry on Product {
+ fragment Price on Product {
  price
- details {
- country
- }
  }
 
  query {
  topProducts {
  __typename
  ... on Book {
- ...PriceAndCountry
+ ...Price
  }
  ... on Furniture {
- ...PriceAndCountry
+ ...Price
  }
  }
  }
@@ -773,20 +770,16 @@ describe('buildQueryPlan', () => {
  topProducts {
  __typename
  ... on Book {
- ...PriceAndCountry
+ ...Price
  }
  ... on Furniture {
- ...PriceAndCountry
+ ...Price
  }
  }
  }
  
- fragment PriceAndCountry on Product {
+ fragment Price on Product {
  price
- details {
- __typename
- country
- }
  }
  },
  }