fix(gatsby): write out sq files when result doesn't change but query hash changes (#36997) (#37004)

Co-authored-by: Lennart <lekoarts@gmail.com>
(cherry picked from commit 3e87026)

Co-authored-by: Michal Piechowiak <misiek.piechowiak@gmail.com>

Author: gatsbybot

packages/gatsby/src/query/query-runner.ts

@@ -183,12 +183,22 @@ export async function queryRunner(
     .digest(`base64`)
 
   const resultHashCache = getResultHashCache()
+
+  let resultHashCacheKey = queryJob.id
+  if (queryJob.queryType === `static`) {
+    // For static queries we use hash for a file path we output results to.
+    // With automatic sort and aggregation graphql codemod it is possible
+    // to have same result, but different query text hashes which would skip
+    // writing out file to disk if we don't check query hash as well
+    resultHashCacheKey += `-${queryJob.hash}`
+  }
+
   if (
-    resultHash !== (await resultHashCache.get(queryJob.id)) ||
+    resultHash !== (await resultHashCache.get(resultHashCacheKey)) ||
     (queryJob.queryType === `page` &&
       !pageDataExists(path.join(program.directory, `public`), queryJob.id))
   ) {
-    await resultHashCache.set(queryJob.id, resultHash)
+    await resultHashCache.set(resultHashCacheKey, resultHash)
 
     if (queryJob.queryType === `page` || queryJob.queryType === `slice`) {
       // We need to save this temporarily in cache because