Merge branch 'main' into fix/error-logging

packages/client/package.json

@@ -149,7 +149,7 @@
     }
   },
   "dependencies": {
-    "@prisma/engines-version": "4.7.0-44.13aac41f99aacedd4786208ed0b9dabcfa7493b8"
+    "@prisma/engines-version": "4.7.0-47.ff00e0ed8be197c2d168ee7dd9e70867c6fd55a9"
   },
   "sideEffects": false
 }

packages/engine-core/src/binary/BinaryEngine.ts

@@ -43,7 +43,6 @@ import type {
 } from '../common/types/QueryEngine'
 import type * as Tx from '../common/types/Transaction'
 import { printGeneratorConfig } from '../common/utils/printGeneratorConfig'
-import { runtimeHeadersToHttpHeaders } from '../common/utils/runtimeHeadersToHttpHeaders'
 import { fixBinaryTargets, plusX } from '../common/utils/util'
 import byline from '../tools/byline'
 import { omit } from '../tools/omit'
@@ -1216,6 +1215,18 @@ function stringifyQuery(q: string) {
   return `{"variables":{},"query":${JSON.stringify(q)}}`
 }
 
+/**
+ * Convert runtime headers to HTTP headers expected by the Query Engine.
+ */
+function runtimeHeadersToHttpHeaders(headers: QueryEngineRequestHeaders): Record<string, string | undefined> {
+  if (headers.transactionId) {
+    const { transactionId, ...httpHeaders } = headers
+    httpHeaders['X-transaction-id'] = transactionId
+    return httpHeaders
+  }
+  return headers
+}
+
 function hookProcess(handler: string, exit = false) {
   process.once(handler as any, async () => {
     for (const engine of engines) {

packages/engine-core/src/data-proxy/DataProxyEngine.ts

@@ -16,7 +16,6 @@ import { EventEmitter } from '../common/types/Events'
 import { EngineMetricsOptions, Metrics, MetricsOptionsJson, MetricsOptionsPrometheus } from '../common/types/Metrics'
 import { QueryEngineBatchRequest, QueryEngineRequestHeaders, QueryEngineResult } from '../common/types/QueryEngine'
 import type * as Tx from '../common/types/Transaction'
-import { runtimeHeadersToHttpHeaders } from '../common/utils/runtimeHeadersToHttpHeaders'
 import { DataProxyError } from './errors/DataProxyError'
 import { ForcedRetryError } from './errors/ForcedRetryError'
 import { InvalidDatasourceError } from './errors/InvalidDatasourceError'
@@ -419,3 +418,15 @@ export class DataProxyEngine extends Engine {
     }
   }
 }
+
+/**
+ * Convert runtime headers to HTTP headers expected by the Data Proxy by removing the transactionId runtime header.
+ */
+function runtimeHeadersToHttpHeaders(headers: QueryEngineRequestHeaders): Record<string, string | undefined> {
+  if (headers.transactionId) {
+    const httpHeaders = { ...headers }
+    delete httpHeaders.transactionId
+    return httpHeaders
+  }
+  return headers
+}

packages/engines/package.json

@@ -8,7 +8,7 @@
   "author": "Tim Suchanek <suchanek@prisma.io>",
   "devDependencies": {
     "@prisma/debug": "workspace:*",
-    "@prisma/engines-version": "4.7.0-44.13aac41f99aacedd4786208ed0b9dabcfa7493b8",
+    "@prisma/engines-version": "4.7.0-47.ff00e0ed8be197c2d168ee7dd9e70867c6fd55a9",
     "@prisma/fetch-engine": "workspace:*",
     "@prisma/get-platform": "workspace:*",
     "@swc/core": "1.3.14",

packages/fetch-engine/package.json

@@ -15,7 +15,7 @@
   "bugs": "https://github.com/prisma/prisma/issues",
   "enginesOverride": {},
   "devDependencies": {
-    "@prisma/engines-version": "4.7.0-44.13aac41f99aacedd4786208ed0b9dabcfa7493b8",
+    "@prisma/engines-version": "4.7.0-47.ff00e0ed8be197c2d168ee7dd9e70867c6fd55a9",
     "@swc/core": "1.3.14",
     "@swc/jest": "0.2.23",
     "@types/jest": "28.1.8",

packages/internals/package.json

@@ -45,7 +45,7 @@
     "@prisma/fetch-engine": "workspace:*",
     "@prisma/generator-helper": "workspace:*",
     "@prisma/get-platform": "workspace:*",
-    "@prisma/prisma-fmt-wasm": "4.7.0-44.13aac41f99aacedd4786208ed0b9dabcfa7493b8",
+    "@prisma/prisma-fmt-wasm": "4.7.0-47.ff00e0ed8be197c2d168ee7dd9e70867c6fd55a9",
     "archiver": "5.3.1",
     "arg": "5.0.2",
     "chalk": "4.1.2",

packages/migrate/package.json

@@ -17,7 +17,7 @@
     "version": "latest"
   },
   "devDependencies": {
-    "@prisma/engines-version": "4.7.0-44.13aac41f99aacedd4786208ed0b9dabcfa7493b8",
+    "@prisma/engines-version": "4.7.0-47.ff00e0ed8be197c2d168ee7dd9e70867c6fd55a9",
     "@prisma/generator-helper": "workspace:*",
     "@prisma/internals": "workspace:*",
     "@swc/core": "1.3.14",