LGTM, Thank you 😄 . But on another note, is this the only piece of code that was lost in the rebase or were there other changes that might have been lost?

I have used the following git technique to figure this out. The commit that was rebased is be84310, so we want to figure out all changes on Schema.hs since the last common commit of be84310 until right before the merging of #6116, which got merged as fd8d51a. Using the commands: (note the triple periods in the commit range!)

$ git diff be84310...fd8d51a~ -- server/src-lib/Hasura/GraphQL/Schema.hs
# unfortunately we have to use a different syntax for git log, where ... means symmetric difference :-/
$ git log  $(git merge-base be84310 fd8d51a~)..fd8d51a~ -- server/src-lib/Hasura/GraphQL/Schema.hs

one obtains all the changes not included in be84310. The following commits are obtained:

• c6a03ea (part of Introduce safeSelectionSet to prevent conflicts in root fields #5694)
  This introduced safeSelectionSet, and uses it throughout Schema.hs.
• 25773a7 (part of Introduce safeSelectionSet to prevent conflicts in root fields #5694)
  Minor cleanup in how unauthenticated contexts are constructed
• 3ea611f (part of Server: Validate remote schema queries #5938)
  Replaced (RemoteSchemaInfo, G.Field G.NoFragments P.Variable) with RemoteField.
• f46f807 (part of clean SQL text functions #6017)
  Adjusts imports.
• 91d8a7a (part of clean SQL text functions #6017)
  Adjusts imports.
• 8d0afb6 (part of server: SQL that grows #6003)
  Adds the 'Postgres type parameter as required.
• a8ed6a8 (part of server: move Hasura.SQL to Hasura.Backends.Postgres #6053)
  Adjusts imports.
• 2cb08a8 (part of server: customize tracking tables with a custom name #5719)
  Implemented by this PR.

The current version does not contain the phrases RemoteSchemaInfo or selectionSet. So from a functional point of view, after this PR is merged, Schema.hs contains all the above changes.