feat(drizzle): include collection and global slugs in validation errors (#15147)

AlessioGr · web-flow · commit 910d27415bed · 2026-01-09T20:22:01.000+02:00
Unique constraint `ValidationError`s now include `data.collection` or
`data.global` for better error context.

**Changes:**

- Added optional `collectionSlug` and `globalSlug` parameters to
`upsertRow`
- Passed slugs through to `handleUpsertError` → `ValidationError`
- Updated all callers: `create`, `updateOne`, `updateMany`,
`updateJobs`, `createGlobal`, `updateGlobal`, `createVersion`,
`updateVersion`, `createGlobalVersion`, `updateGlobalVersion`,
`fetchAndResave`
- Updated test to verify `error.data.collection` is populated
diff --git a/packages/drizzle/src/create.ts b/packages/drizzle/src/create.ts
@@ -19,6 +19,7 @@ export const create: Create = async function create(
 
   const result = await upsertRow({
     adapter: this,
+    collectionSlug,
     data,
     db,
     fields: collection.flattenedFields,
diff --git a/packages/drizzle/src/createGlobal.ts b/packages/drizzle/src/createGlobal.ts
@@ -24,6 +24,7 @@ export async function createGlobal<T extends Record<string, unknown>>(
     data,
     db,
     fields: globalConfig.flattenedFields,
+    globalSlug: slug,
     ignoreResult: returning === false,
     operation: 'create',
     req,
diff --git a/packages/drizzle/src/createGlobalVersion.ts b/packages/drizzle/src/createGlobalVersion.ts
@@ -44,6 +44,7 @@ export async function createGlobalVersion<T extends JsonObject = JsonObject>(
     },
     db,
     fields: buildVersionGlobalFields(this.payload.config, global, true),
+    globalSlug,
     ignoreResult: returning === false ? 'idOnly' : false,
     operation: 'create',
     req,
diff --git a/packages/drizzle/src/createVersion.ts b/packages/drizzle/src/createVersion.ts
@@ -56,6 +56,7 @@ export async function createVersion<T extends JsonObject = JsonObject>(
 
   const result = await upsertRow<TypeWithVersion<T>>({
     adapter: this,
+    collectionSlug,
     data,
     db,
     fields: buildVersionCollectionFields(this.payload.config, collection, true),
diff --git a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/fetchAndResave/index.ts b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/fetchAndResave/index.ts
@@ -66,6 +66,7 @@ export const fetchAndResave = async ({
             await upsertRow({
               id: doc.id,
               adapter,
+              collectionSlug,
               data: doc,
               db,
               fields,
@@ -115,6 +116,7 @@ export const fetchAndResave = async ({
             await upsertRow({
               id: doc.id,
               adapter,
+              collectionSlug,
               data: doc,
               db,
               fields,
@@ -174,6 +176,7 @@ export const fetchAndResave = async ({
                 data: doc,
                 db,
                 fields,
+                globalSlug,
                 ignoreResult: true,
                 operation: 'update',
                 req,
@@ -214,6 +217,7 @@ export const fetchAndResave = async ({
               data: doc,
               db,
               fields,
+              globalSlug,
               ignoreResult: true,
               operation: 'update',
               req,
diff --git a/packages/drizzle/src/updateGlobal.ts b/packages/drizzle/src/updateGlobal.ts
@@ -23,6 +23,7 @@ export async function updateGlobal<T extends Record<string, unknown>>(
     data,
     db,
     fields: globalConfig.flattenedFields,
+    globalSlug: slug,
     ignoreResult: returning === false,
     req,
     select,
diff --git a/packages/drizzle/src/updateGlobalVersion.ts b/packages/drizzle/src/updateGlobalVersion.ts
@@ -54,6 +54,7 @@ export async function updateGlobalVersion<T extends JsonObject = JsonObject>(
     data: versionData,
     db,
     fields,
+    globalSlug: global,
     ignoreResult: returning === false,
     operation: 'update',
     req,
diff --git a/packages/drizzle/src/updateJobs.ts b/packages/drizzle/src/updateJobs.ts
@@ -38,6 +38,7 @@ export const updateJobs: UpdateJobs = async function updateMany(
     const result = await upsertRow({
       id,
       adapter: this,
+      collectionSlug: 'payload-jobs',
       data,
       db,
       fields: collection.flattenedFields,
@@ -81,6 +82,7 @@ export const updateJobs: UpdateJobs = async function updateMany(
     const result = await upsertRow({
       id: job.id,
       adapter: this,
+      collectionSlug: 'payload-jobs',
       data: updateData,
       db,
       fields: collection.flattenedFields,
diff --git a/packages/drizzle/src/updateMany.ts b/packages/drizzle/src/updateMany.ts
@@ -89,6 +89,7 @@ export const updateMany: UpdateMany = async function updateMany(
     const result = await upsertRow({
       id: idToUpdate,
       adapter: this,
+      collectionSlug,
       data,
       db,
       fields: collection.flattenedFields,
diff --git a/packages/drizzle/src/updateOne.ts b/packages/drizzle/src/updateOne.ts
@@ -78,6 +78,7 @@ export const updateOne: UpdateOne = async function updateOne(
   const result = await upsertRow({
     id: idToUpdate,
     adapter: this,
+    collectionSlug,
     data,
     db,
     fields: collection.flattenedFields,
diff --git a/packages/drizzle/src/updateVersion.ts b/packages/drizzle/src/updateVersion.ts
@@ -48,6 +48,7 @@ export async function updateVersion<T extends JsonObject = JsonObject>(
   const result = await upsertRow<TypeWithVersion<T>>({
     id,
     adapter: this,
+    collectionSlug: collection,
     data: versionData,
     db,
     fields,
diff --git a/packages/drizzle/src/upsertRow/handleUpsertError.ts b/packages/drizzle/src/upsertRow/handleUpsertError.ts
@@ -6,7 +6,9 @@ import type { DrizzleAdapter } from '../types.js'
 
 type HandleUpsertErrorArgs = {
   adapter: DrizzleAdapter
+  collectionSlug?: string
   error: unknown
+  globalSlug?: string
   id?: number | string
   req?: Partial<PayloadRequest>
   tableName: string
@@ -20,7 +22,9 @@ type HandleUpsertErrorArgs = {
 export const handleUpsertError = ({
   id,
   adapter,
+  collectionSlug,
   error: caughtError,
+  globalSlug,
   req,
   tableName,
 }: HandleUpsertErrorArgs): never => {
@@ -72,12 +76,14 @@ export const handleUpsertError = ({
     throw new ValidationError(
       {
         id,
+        collection: collectionSlug,
         errors: [
           {
             message: req?.t ? req.t('error:valueMustBeUnique') : 'Value must be unique',
             path: fieldName,
           },
         ],
+        global: globalSlug,
         req,
       },
       req?.t,
diff --git a/packages/drizzle/src/upsertRow/index.ts b/packages/drizzle/src/upsertRow/index.ts
@@ -35,9 +35,11 @@ import { shouldUseOptimizedUpsertRow } from './shouldUseOptimizedUpsertRow.js'
 export const upsertRow = async <T extends Record<string, unknown> | TypeWithID>({
   id,
   adapter,
+  collectionSlug,
   data,
   db,
   fields,
+  globalSlug,
   ignoreResult,
   // TODO:
   // When we support joins for write operations (create/update) - pass collectionSlug to the buildFindManyArgs
@@ -180,7 +182,7 @@ export const upsertRow = async <T extends Record<string, unknown> | TypeWithID>(
         tableName,
       })
     } catch (error) {
-      handleUpsertError({ id, adapter, error, req, tableName })
+      handleUpsertError({ id, adapter, collectionSlug, error, globalSlug, req, tableName })
     }
   }
   // Split out the incoming data into the corresponding:
@@ -722,7 +724,7 @@ export const upsertRow = async <T extends Record<string, unknown> | TypeWithID>(
       }
     }
   } catch (error) {
-    handleUpsertError({ id, adapter, error, req, tableName })
+    handleUpsertError({ id, adapter, collectionSlug, error, globalSlug, req, tableName })
   }
 
   if (ignoreResult === 'idOnly') {
diff --git a/packages/drizzle/src/upsertRow/types.ts b/packages/drizzle/src/upsertRow/types.ts
@@ -5,9 +5,17 @@ import type { DrizzleAdapter, DrizzleTransaction, GenericColumn } from '../types
 
 type BaseArgs = {
   adapter: DrizzleAdapter
+  /**
+   * Collection slug for error reporting
+   */
+  collectionSlug?: string
   data: Record<string, unknown>
   db: DrizzleAdapter['drizzle'] | DrizzleTransaction
   fields: FlattenedField[]
+  /**
+   * Collection slug for error reporting
+   */
+  globalSlug?: string
   /**
    * When true, skips reading the data back from the database and returns the input data
    * @default false
diff --git a/test/database/int.spec.ts b/test/database/int.spec.ts
@@ -3867,7 +3867,9 @@ describe('database', () => {
         },
       })
     } catch (e) {
-      expect((e as ValidationError).message).toEqual('The following field is invalid: slugField')
+      const error = e as ValidationError
+      expect(error.message).toEqual('The following field is invalid: slugField')
+      expect(error.data.collection).toEqual('unique-fields')
     }
   })
 
@@ -3897,7 +3899,9 @@ describe('database', () => {
         },
       })
     } catch (e) {
-      expect((e as ValidationError).message).toEqual('The following field is invalid: slugField')
+      const error = e as ValidationError
+      expect(error.message).toEqual('The following field is invalid: slugField')
+      expect(error.data.collection).toEqual('unique-fields')
     }
   })
 
