@payloadcms/drizzle 4.0.0-internal.77191e5 → 4.0.0-internal.7b53b6d

package/dist/updateOne.js

@@ -1,3 +1,5 @@
+import { and, eq } from 'drizzle-orm';
+import { applyBranchIDProjection, resolveBranchRowID, withBranchIDSelect } from 'payload';
 import toSnakeCase from 'to-snake-case';
 import { buildQuery } from './queries/buildQuery.js';
 import { selectDistinct } from './queries/selectDistinct.js';
@@ -8,12 +10,17 @@ import { shouldUseOptimizedUpsertRow } from './upsertRow/shouldUseOptimizedUpser
 import { getPrimaryDb } from './utilities/getPrimaryDb.js';
 import { getTransaction } from './utilities/getTransaction.js';
 import { markWrite } from './utilities/readAfterWrite.js';
-export const updateOne = async function updateOne({ id, collection: collectionSlug, data, joins: joinQuery, locale, options = {
+export const updateOne = async function updateOne({ id, branch, collection: collectionSlug, data, joins: joinQuery, locale, options = {
     upsert: false
 }, req, returning, select, where: whereArg }) {
     const collection = this.payload.collections[collectionSlug].config;
     const tableName = this.tableNameMap.get(toSnakeCase(collection.slug));
-    let idToUpdate = id;
+    let idToUpdate = id === undefined || id === null ? id : await resolveBranchRowID({
+        id,
+        branch,
+        collectionSlug,
+        req
+    });
     let whereToUpdate;
     const db = getPrimaryDb(this, await getTransaction(this, req));
     if (!idToUpdate) {
@@ -28,6 +35,9 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
         // queries keep resolving a matching id first and then update that row unconditionally
         whereToUpdate = joins.length === 0 ? where : undefined;
         if (options.atomic === true) {
+            if (joins.length > 0) {
+                throw new Error('Atomic where updates do not support predicates that require joins');
+            }
             if (!shouldUseOptimizedUpsertRow({
                 data,
                 fields: collection.flattenedFields
@@ -44,12 +54,20 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
             if (arraysToPush && Object.keys(arraysToPush).length) {
                 throw new Error('Atomic where updates do not support array operations');
             }
+            const table = this.tables[tableName];
+            const matchingRowQuery = db.select({
+                id: table.id
+            }).from(table).where(where).limit(1);
+            // PostgreSQL must lock the candidate before applying LIMIT so a waiting caller can
+            // continue to another match if a concurrent update makes the first row ineligible.
+            // SQLite serializes writers and does not support SELECT ... FOR UPDATE.
+            const matchingRow = this.name === 'postgres' ? matchingRowQuery.for('update') : matchingRowQuery;
             markWrite(this);
-            const docs = await db.update(this.tables[tableName]).set(row).where(where).returning();
+            const docs = await db.update(table).set(row).where(and(eq(table.id, matchingRow), where)).returning();
             if (!docs[0]) {
                 return null;
             }
-            return transform({
+            const result = transform({
                 adapter: this,
                 config: this.payload.config,
                 data: docs[0],
@@ -57,6 +75,15 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
                 joinQuery: false,
                 tableName
             });
+            applyBranchIDProjection({
+                branch,
+                collectionSlug,
+                docs: [
+                    result
+                ],
+                req
+            });
+            return result;
         }
         // selectDistinct will only return if there are joins
         const selectDistinctResult = await selectDistinct({
@@ -96,13 +123,28 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
         joinQuery,
         operation: 'update',
         req,
-        select,
+        select: withBranchIDSelect({
+            branch,
+            collectionSlug,
+            req,
+            select
+        }),
         tableName,
         where: whereToUpdate
     });
     if (returning === false) {
         return null;
     }
+    // The row written on a branch is the shadow row, so the document it returns
+    // carries that row's primary key rather than the document's canonical ID.
+    applyBranchIDProjection({
+        branch,
+        collectionSlug,
+        docs: [
+            result
+        ],
+        req
+    });
     return result;
 };
 

package/dist/updateOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateOne.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { UpdateOne } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { transform } from './transform/read/index.js'\nimport { transformForWrite } from './transform/write/index.js'\nimport { upsertRow } from './upsertRow/index.js'\nimport { shouldUseOptimizedUpsertRow } from './upsertRow/shouldUseOptimizedUpsertRow.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { markWrite } from './utilities/readAfterWrite.js'\n\nexport const updateOne: UpdateOne = async function updateOne(\n  this: DrizzleAdapter,\n  {\n    id,\n    collection: collectionSlug,\n    data,\n    joins: joinQuery,\n    locale,\n    options = { upsert: false },\n    req,\n    returning,\n    select,\n    where: whereArg,\n  },\n) {\n  const collection = this.payload.collections[collectionSlug].config\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n  let idToUpdate = id\n  let whereToUpdate: SQL<unknown> | undefined\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  if (!idToUpdate) {\n    const { joins, selectFields, where } = buildQuery({\n      adapter: this,\n      fields: collection.flattenedFields,\n      locale,\n      tableName,\n      where: whereArg,\n    })\n    // A `where` that needs joins cannot be applied to the UPDATE statement itself, so those\n    // queries keep resolving a matching id first and then update that row unconditionally\n    whereToUpdate = joins.length === 0 ? where : undefined\n\n    if (options.atomic === true) {\n      if (!shouldUseOptimizedUpsertRow({ data, fields: collection.flattenedFields })) {\n        throw new Error('Atomic where updates only support fields stored on the main table')\n      }\n\n      const { arraysToPush, row } = transformForWrite({\n        adapter: this,\n        data,\n        enableAtomicWrites: true,\n        fields: collection.flattenedFields,\n        tableName,\n      })\n\n      if (arraysToPush && Object.keys(arraysToPush).length) {\n        throw new Error('Atomic where updates do not support array operations')\n      }\n\n      markWrite(this)\n\n      const docs = await (db as LibSQLDatabase)\n        .update(this.tables[tableName])\n        .set(row)\n        .where(where)\n        .returning()\n\n      if (!docs[0]) {\n        return null\n      }\n\n      return transform({\n        adapter: this,\n        config: this.payload.config,\n        data: docs[0],\n        fields: collection.flattenedFields,\n        joinQuery: false,\n        tableName,\n      })\n    }\n\n    // selectDistinct will only return if there are joins\n    const selectDistinctResult = await selectDistinct({\n      adapter: this,\n      db,\n      joins,\n      query: ({ query }) => query.limit(1),\n      selectFields,\n      tableName,\n      where,\n    })\n\n    if (selectDistinctResult?.[0]?.id) {\n      idToUpdate = selectDistinctResult?.[0]?.id\n      // If id wasn't passed but `where` without any joins, retrieve it with findFirst\n    } else if (whereArg && !joins.length) {\n      const table = this.tables[tableName]\n\n      const docsToUpdate = await (db as LibSQLDatabase)\n        .select({\n          id: table.id,\n        })\n        .from(table)\n        .where(where)\n        .limit(1)\n      idToUpdate = docsToUpdate?.[0]?.id\n    }\n  }\n\n  if (!idToUpdate && !options.upsert) {\n    // TODO: In 4.0, if returning === false, we should differentiate between:\n    // - No document found to update\n    // - Document found, but returning === false\n    return null\n  }\n\n  const result = await upsertRow({\n    id: idToUpdate,\n    adapter: this,\n    collectionSlug,\n    data,\n    db,\n    fields: collection.flattenedFields,\n    ignoreResult: returning === false,\n    joinQuery,\n    operation: 'update',\n    req,\n    select,\n    tableName,\n    where: whereToUpdate,\n  })\n\n  if (returning === false) {\n    return null\n  }\n\n  return result\n}\n"],"names":["toSnakeCase","buildQuery","selectDistinct","transform","transformForWrite","upsertRow","shouldUseOptimizedUpsertRow","getPrimaryDb","getTransaction","markWrite","updateOne","id","collection","collectionSlug","data","joins","joinQuery","locale","options","upsert","req","returning","select","where","whereArg","payload","collections","config","tableName","tableNameMap","get","slug","idToUpdate","whereToUpdate","db","selectFields","adapter","fields","flattenedFields","length","undefined","atomic","Error","arraysToPush","row","enableAtomicWrites","Object","keys","docs","update","tables","set","selectDistinctResult","query","limit","table","docsToUpdate","from","result","ignoreResult","operation"],"mappings":"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"}
+{"version":3,"sources":["../src/updateOne.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { UpdateOne } from 'payload'\n\nimport { and, eq } from 'drizzle-orm'\nimport { applyBranchIDProjection, resolveBranchRowID, withBranchIDSelect } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, PostgresDB } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { transform } from './transform/read/index.js'\nimport { transformForWrite } from './transform/write/index.js'\nimport { upsertRow } from './upsertRow/index.js'\nimport { shouldUseOptimizedUpsertRow } from './upsertRow/shouldUseOptimizedUpsertRow.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { markWrite } from './utilities/readAfterWrite.js'\n\nexport const updateOne: UpdateOne = async function updateOne(\n  this: DrizzleAdapter,\n  {\n    id,\n    branch,\n    collection: collectionSlug,\n    data,\n    joins: joinQuery,\n    locale,\n    options = { upsert: false },\n    req,\n    returning,\n    select,\n    where: whereArg,\n  },\n) {\n  const collection = this.payload.collections[collectionSlug].config\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n  let idToUpdate =\n    id === undefined || id === null\n      ? id\n      : await resolveBranchRowID({ id, branch, collectionSlug, req })\n  let whereToUpdate: SQL<unknown> | undefined\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  if (!idToUpdate) {\n    const { joins, selectFields, where } = buildQuery({\n      adapter: this,\n      fields: collection.flattenedFields,\n      locale,\n      tableName,\n      where: whereArg,\n    })\n    // A `where` that needs joins cannot be applied to the UPDATE statement itself, so those\n    // queries keep resolving a matching id first and then update that row unconditionally\n    whereToUpdate = joins.length === 0 ? where : undefined\n\n    if (options.atomic === true) {\n      if (joins.length > 0) {\n        throw new Error('Atomic where updates do not support predicates that require joins')\n      }\n\n      if (!shouldUseOptimizedUpsertRow({ data, fields: collection.flattenedFields })) {\n        throw new Error('Atomic where updates only support fields stored on the main table')\n      }\n\n      const { arraysToPush, row } = transformForWrite({\n        adapter: this,\n        data,\n        enableAtomicWrites: true,\n        fields: collection.flattenedFields,\n        tableName,\n      })\n\n      if (arraysToPush && Object.keys(arraysToPush).length) {\n        throw new Error('Atomic where updates do not support array operations')\n      }\n\n      const table = this.tables[tableName]\n      const matchingRowQuery = (db as PostgresDB)\n        .select({ id: table.id })\n        .from(table)\n        .where(where)\n        .limit(1)\n\n      // PostgreSQL must lock the candidate before applying LIMIT so a waiting caller can\n      // continue to another match if a concurrent update makes the first row ineligible.\n      // SQLite serializes writers and does not support SELECT ... FOR UPDATE.\n      const matchingRow =\n        this.name === 'postgres' ? matchingRowQuery.for('update') : matchingRowQuery\n\n      markWrite(this)\n\n      const docs = await (db as LibSQLDatabase)\n        .update(table)\n        .set(row)\n        .where(and(eq(table.id, matchingRow), where))\n        .returning()\n\n      if (!docs[0]) {\n        return null\n      }\n\n      const result = transform({\n        adapter: this,\n        config: this.payload.config,\n        data: docs[0],\n        fields: collection.flattenedFields,\n        joinQuery: false,\n        tableName,\n      })\n\n      applyBranchIDProjection({\n        branch,\n        collectionSlug,\n        docs: [result as Record<string, unknown>],\n        req,\n      })\n\n      return result\n    }\n\n    // selectDistinct will only return if there are joins\n    const selectDistinctResult = await selectDistinct({\n      adapter: this,\n      db,\n      joins,\n      query: ({ query }) => query.limit(1),\n      selectFields,\n      tableName,\n      where,\n    })\n\n    if (selectDistinctResult?.[0]?.id) {\n      idToUpdate = selectDistinctResult?.[0]?.id\n      // If id wasn't passed but `where` without any joins, retrieve it with findFirst\n    } else if (whereArg && !joins.length) {\n      const table = this.tables[tableName]\n\n      const docsToUpdate = await (db as LibSQLDatabase)\n        .select({\n          id: table.id,\n        })\n        .from(table)\n        .where(where)\n        .limit(1)\n      idToUpdate = docsToUpdate?.[0]?.id\n    }\n  }\n\n  if (!idToUpdate && !options.upsert) {\n    // TODO: In 4.0, if returning === false, we should differentiate between:\n    // - No document found to update\n    // - Document found, but returning === false\n    return null\n  }\n\n  const result = await upsertRow({\n    id: idToUpdate,\n    adapter: this,\n    collectionSlug,\n    data,\n    db,\n    fields: collection.flattenedFields,\n    ignoreResult: returning === false,\n    joinQuery,\n    operation: 'update',\n    req,\n    select: withBranchIDSelect({ branch, collectionSlug, req, select }),\n    tableName,\n    where: whereToUpdate,\n  })\n\n  if (returning === false) {\n    return null\n  }\n\n  // The row written on a branch is the shadow row, so the document it returns\n  // carries that row's primary key rather than the document's canonical ID.\n  applyBranchIDProjection({\n    branch,\n    collectionSlug,\n    docs: [result as Record<string, unknown>],\n    req,\n  })\n\n  return result\n}\n"],"names":["and","eq","applyBranchIDProjection","resolveBranchRowID","withBranchIDSelect","toSnakeCase","buildQuery","selectDistinct","transform","transformForWrite","upsertRow","shouldUseOptimizedUpsertRow","getPrimaryDb","getTransaction","markWrite","updateOne","id","branch","collection","collectionSlug","data","joins","joinQuery","locale","options","upsert","req","returning","select","where","whereArg","payload","collections","config","tableName","tableNameMap","get","slug","idToUpdate","undefined","whereToUpdate","db","selectFields","adapter","fields","flattenedFields","length","atomic","Error","arraysToPush","row","enableAtomicWrites","Object","keys","table","tables","matchingRowQuery","from","limit","matchingRow","name","for","docs","update","set","result","selectDistinctResult","query","docsToUpdate","ignoreResult","operation"],"mappings":"AAIA,SAASA,GAAG,EAAEC,EAAE,QAAQ,cAAa;AACrC,SAASC,uBAAuB,EAAEC,kBAAkB,EAAEC,kBAAkB,QAAQ,UAAS;AACzF,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,SAAS,QAAQ,4BAA2B;AACrD,SAASC,iBAAiB,QAAQ,6BAA4B;AAC9D,SAASC,SAAS,QAAQ,uBAAsB;AAChD,SAASC,2BAA2B,QAAQ,6CAA4C;AACxF,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,SAAS,QAAQ,gCAA+B;AAEzD,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EACEC,EAAE,EACFC,MAAM,EACNC,YAAYC,cAAc,EAC1BC,IAAI,EACJC,OAAOC,SAAS,EAChBC,MAAM,EACNC,UAAU;IAAEC,QAAQ;AAAM,CAAC,EAC3BC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,OAAOC,QAAQ,EAChB;IAED,MAAMZ,aAAa,IAAI,CAACa,OAAO,CAACC,WAAW,CAACb,eAAe,CAACc,MAAM;IAClE,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC/B,YAAYa,WAAWmB,IAAI;IACnE,IAAIC,aACFtB,OAAOuB,aAAavB,OAAO,OACvBA,KACA,MAAMb,mBAAmB;QAAEa;QAAIC;QAAQE;QAAgBO;IAAI;IACjE,IAAIc;IAEJ,MAAMC,KAAK7B,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEa;IAEzD,IAAI,CAACY,YAAY;QACf,MAAM,EAAEjB,KAAK,EAAEqB,YAAY,EAAEb,KAAK,EAAE,GAAGvB,WAAW;YAChDqC,SAAS,IAAI;YACbC,QAAQ1B,WAAW2B,eAAe;YAClCtB;YACAW;YACAL,OAAOC;QACT;QACA,wFAAwF;QACxF,sFAAsF;QACtFU,gBAAgBnB,MAAMyB,MAAM,KAAK,IAAIjB,QAAQU;QAE7C,IAAIf,QAAQuB,MAAM,KAAK,MAAM;YAC3B,IAAI1B,MAAMyB,MAAM,GAAG,GAAG;gBACpB,MAAM,IAAIE,MAAM;YAClB;YAEA,IAAI,CAACrC,4BAA4B;gBAAES;gBAAMwB,QAAQ1B,WAAW2B,eAAe;YAAC,IAAI;gBAC9E,MAAM,IAAIG,MAAM;YAClB;YAEA,MAAM,EAAEC,YAAY,EAAEC,GAAG,EAAE,GAAGzC,kBAAkB;gBAC9CkC,SAAS,IAAI;gBACbvB;gBACA+B,oBAAoB;gBACpBP,QAAQ1B,WAAW2B,eAAe;gBAClCX;YACF;YAEA,IAAIe,gBAAgBG,OAAOC,IAAI,CAACJ,cAAcH,MAAM,EAAE;gBACpD,MAAM,IAAIE,MAAM;YAClB;YAEA,MAAMM,QAAQ,IAAI,CAACC,MAAM,CAACrB,UAAU;YACpC,MAAMsB,mBAAmB,AAACf,GACvBb,MAAM,CAAC;gBAAEZ,IAAIsC,MAAMtC,EAAE;YAAC,GACtByC,IAAI,CAACH,OACLzB,KAAK,CAACA,OACN6B,KAAK,CAAC;YAET,mFAAmF;YACnF,mFAAmF;YACnF,wEAAwE;YACxE,MAAMC,cACJ,IAAI,CAACC,IAAI,KAAK,aAAaJ,iBAAiBK,GAAG,CAAC,YAAYL;YAE9D1C,UAAU,IAAI;YAEd,MAAMgD,OAAO,MAAM,AAACrB,GACjBsB,MAAM,CAACT,OACPU,GAAG,CAACd,KACJrB,KAAK,CAAC7B,IAAIC,GAAGqD,MAAMtC,EAAE,EAAE2C,cAAc9B,QACrCF,SAAS;YAEZ,IAAI,CAACmC,IAAI,CAAC,EAAE,EAAE;gBACZ,OAAO;YACT;YAEA,MAAMG,SAASzD,UAAU;gBACvBmC,SAAS,IAAI;gBACbV,QAAQ,IAAI,CAACF,OAAO,CAACE,MAAM;gBAC3Bb,MAAM0C,IAAI,CAAC,EAAE;gBACblB,QAAQ1B,WAAW2B,eAAe;gBAClCvB,WAAW;gBACXY;YACF;YAEAhC,wBAAwB;gBACtBe;gBACAE;gBACA2C,MAAM;oBAACG;iBAAkC;gBACzCvC;YACF;YAEA,OAAOuC;QACT;QAEA,qDAAqD;QACrD,MAAMC,uBAAuB,MAAM3D,eAAe;YAChDoC,SAAS,IAAI;YACbF;YACApB;YACA8C,OAAO,CAAC,EAAEA,KAAK,EAAE,GAAKA,MAAMT,KAAK,CAAC;YAClChB;YACAR;YACAL;QACF;QAEA,IAAIqC,sBAAsB,CAAC,EAAE,EAAElD,IAAI;YACjCsB,aAAa4B,sBAAsB,CAAC,EAAE,EAAElD;QACxC,gFAAgF;QAClF,OAAO,IAAIc,YAAY,CAACT,MAAMyB,MAAM,EAAE;YACpC,MAAMQ,QAAQ,IAAI,CAACC,MAAM,CAACrB,UAAU;YAEpC,MAAMkC,eAAe,MAAM,AAAC3B,GACzBb,MAAM,CAAC;gBACNZ,IAAIsC,MAAMtC,EAAE;YACd,GACCyC,IAAI,CAACH,OACLzB,KAAK,CAACA,OACN6B,KAAK,CAAC;YACTpB,aAAa8B,cAAc,CAAC,EAAE,EAAEpD;QAClC;IACF;IAEA,IAAI,CAACsB,cAAc,CAACd,QAAQC,MAAM,EAAE;QAClC,yEAAyE;QACzE,gCAAgC;QAChC,4CAA4C;QAC5C,OAAO;IACT;IAEA,MAAMwC,SAAS,MAAMvD,UAAU;QAC7BM,IAAIsB;QACJK,SAAS,IAAI;QACbxB;QACAC;QACAqB;QACAG,QAAQ1B,WAAW2B,eAAe;QAClCwB,cAAc1C,cAAc;QAC5BL;QACAgD,WAAW;QACX5C;QACAE,QAAQxB,mBAAmB;YAAEa;YAAQE;YAAgBO;YAAKE;QAAO;QACjEM;QACAL,OAAOW;IACT;IAEA,IAAIb,cAAc,OAAO;QACvB,OAAO;IACT;IAEA,4EAA4E;IAC5E,0EAA0E;IAC1EzB,wBAAwB;QACtBe;QACAE;QACA2C,MAAM;YAACG;SAAkC;QACzCvC;IACF;IAEA,OAAOuC;AACT,EAAC"}

package/dist/upsertBranchGlobalChange.d.ts

@@ -0,0 +1,3 @@
+import type { UpsertBranchGlobalChange } from 'payload';
+export declare const upsertBranchGlobalChange: UpsertBranchGlobalChange;
+//# sourceMappingURL=upsertBranchGlobalChange.d.ts.map

package/dist/upsertBranchGlobalChange.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upsertBranchGlobalChange.d.ts","sourceRoot":"","sources":["../src/upsertBranchGlobalChange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAWvD,eAAO,MAAM,wBAAwB,EAAE,wBAyBpC,CAAA"}

package/dist/upsertBranchGlobalChange.js

@@ -0,0 +1,35 @@
+import { branchChangesCollectionSlug } from 'payload';
+import toSnakeCase from 'to-snake-case';
+import { getPrimaryDb } from './utilities/getPrimaryDb.js';
+import { getTransaction } from './utilities/getTransaction.js';
+import { markWrite } from './utilities/readAfterWrite.js';
+export const upsertBranchGlobalChange = async function upsertBranchGlobalChange({ branch, globalSlug, req }) {
+    const tableName = this.tableNameMap.get(toSnakeCase(branchChangesCollectionSlug));
+    const table = this.tables[tableName];
+    const db = getPrimaryDb(this, await getTransaction(this, req));
+    const now = new Date().toISOString();
+    await this.insert({
+        db,
+        onConflictDoUpdate: {
+            set: {
+                globalSlug
+            },
+            target: [
+                table.branch,
+                table.globalSlug
+            ]
+        },
+        tableName,
+        values: {
+            branch,
+            createdAt: now,
+            entityType: 'global',
+            globalSlug,
+            operation: 'update',
+            updatedAt: now
+        }
+    });
+    markWrite(this);
+};
+
+//# sourceMappingURL=upsertBranchGlobalChange.js.map

package/dist/upsertBranchGlobalChange.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/upsertBranchGlobalChange.ts"],"sourcesContent":["import type { UpsertBranchGlobalChange } from 'payload'\n\nimport { branchChangesCollectionSlug } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { markWrite } from './utilities/readAfterWrite.js'\n\nexport const upsertBranchGlobalChange: UpsertBranchGlobalChange =\n  async function upsertBranchGlobalChange(this: DrizzleAdapter, { branch, globalSlug, req }) {\n    const tableName = this.tableNameMap.get(toSnakeCase(branchChangesCollectionSlug))\n    const table = this.tables[tableName]\n    const db = getPrimaryDb(this, await getTransaction(this, req))\n    const now = new Date().toISOString()\n\n    await this.insert({\n      db,\n      onConflictDoUpdate: {\n        set: { globalSlug },\n        target: [table.branch, table.globalSlug],\n      },\n      tableName,\n      values: {\n        branch,\n        createdAt: now,\n        entityType: 'global',\n        globalSlug,\n        operation: 'update',\n        updatedAt: now,\n      },\n    })\n\n    markWrite(this)\n  }\n"],"names":["branchChangesCollectionSlug","toSnakeCase","getPrimaryDb","getTransaction","markWrite","upsertBranchGlobalChange","branch","globalSlug","req","tableName","tableNameMap","get","table","tables","db","now","Date","toISOString","insert","onConflictDoUpdate","set","target","values","createdAt","entityType","operation","updatedAt"],"mappings":"AAEA,SAASA,2BAA2B,QAAQ,UAAS;AACrD,OAAOC,iBAAiB,gBAAe;AAIvC,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,SAAS,QAAQ,gCAA+B;AAEzD,OAAO,MAAMC,2BACX,eAAeA,yBAA+C,EAAEC,MAAM,EAAEC,UAAU,EAAEC,GAAG,EAAE;IACvF,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAACV,YAAYD;IACpD,MAAMY,QAAQ,IAAI,CAACC,MAAM,CAACJ,UAAU;IACpC,MAAMK,KAAKZ,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEK;IACzD,MAAMO,MAAM,IAAIC,OAAOC,WAAW;IAElC,MAAM,IAAI,CAACC,MAAM,CAAC;QAChBJ;QACAK,oBAAoB;YAClBC,KAAK;gBAAEb;YAAW;YAClBc,QAAQ;gBAACT,MAAMN,MAAM;gBAAEM,MAAML,UAAU;aAAC;QAC1C;QACAE;QACAa,QAAQ;YACNhB;YACAiB,WAAWR;YACXS,YAAY;YACZjB;YACAkB,WAAW;YACXC,WAAWX;QACb;IACF;IAEAX,UAAU,IAAI;AAChB,EAAC"}

package/dist/upsertRow/deleteExistingRowsByPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteExistingRowsByPath.d.ts","sourceRoot":"","sources":["../../src/upsertRow/deleteExistingRowsByPath.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErE,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAClD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IAC/B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,wBAAwB,oGASlC,IAAI,KAAG,OAAO,CAAC,IAAI,CA4CrB,CAAA"}
+{"version":3,"file":"deleteExistingRowsByPath.d.ts","sourceRoot":"","sources":["../../src/upsertRow/deleteExistingRowsByPath.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErE,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAClD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IAC/B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,wBAAwB,oGASlC,IAAI,KAAG,OAAO,CAAC,IAAI,CAmDrB,CAAA"}

package/dist/upsertRow/deleteExistingRowsByPath.js

@@ -1,6 +1,6 @@
 import { and, eq, inArray } from 'drizzle-orm';
 export const deleteExistingRowsByPath = async ({ adapter, db, localeColumnName = '_locale', parentColumnName = '_parentID', parentID, pathColumnName = '_path', rows, tableName })=>{
-    const localizedPathsToDelete = new Set();
+    const localizedPathsToDelete = new Map();
     const pathsToDelete = new Set();
     const table = adapter.tables[tableName];
     rows.forEach((row)=>{
@@ -8,24 +8,29 @@ export const deleteExistingRowsByPath = async ({ adapter, db, localeColumnName =
         const localeData = row[localeColumnName];
         if (typeof path === 'string') {
             if (typeof localeData === 'string') {
-                localizedPathsToDelete.add(path);
+                const localePaths = localizedPathsToDelete.get(localeData) ?? new Set();
+                localePaths.add(path);
+                localizedPathsToDelete.set(localeData, localePaths);
             } else {
                 pathsToDelete.add(path);
             }
         }
     });
     if (localizedPathsToDelete.size > 0) {
-        const whereConstraints = [
-            eq(table[parentColumnName], parentID)
-        ];
-        if (pathColumnName) {
-            whereConstraints.push(inArray(table[pathColumnName], Array.from(localizedPathsToDelete)));
+        for (const [locale, localePaths] of localizedPathsToDelete){
+            const whereConstraints = [
+                eq(table[parentColumnName], parentID)
+            ];
+            if (pathColumnName) {
+                whereConstraints.push(inArray(table[pathColumnName], Array.from(localePaths)));
+            }
+            whereConstraints.push(eq(table[localeColumnName], locale));
+            await adapter.deleteWhere({
+                db,
+                tableName,
+                where: and(...whereConstraints)
+            });
         }
-        await adapter.deleteWhere({
-            db,
-            tableName,
-            where: and(...whereConstraints)
-        });
     }
     if (pathsToDelete.size > 0) {
         const whereConstraints = [

package/dist/upsertRow/deleteExistingRowsByPath.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/upsertRow/deleteExistingRowsByPath.ts"],"sourcesContent":["import { and, eq, inArray } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, DrizzleTransaction } from '../types.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  db: DrizzleAdapter['drizzle'] | DrizzleTransaction\n  localeColumnName?: string\n  parentColumnName?: string\n  parentID: unknown\n  pathColumnName?: string\n  rows: Record<string, unknown>[]\n  tableName: string\n}\n\nexport const deleteExistingRowsByPath = async ({\n  adapter,\n  db,\n  localeColumnName = '_locale',\n  parentColumnName = '_parentID',\n  parentID,\n  pathColumnName = '_path',\n  rows,\n  tableName,\n}: Args): Promise<void> => {\n  const localizedPathsToDelete = new Set<string>()\n  const pathsToDelete = new Set<string>()\n  const table = adapter.tables[tableName]\n\n  rows.forEach((row) => {\n    const path = row[pathColumnName]\n    const localeData = row[localeColumnName]\n    if (typeof path === 'string') {\n      if (typeof localeData === 'string') {\n        localizedPathsToDelete.add(path)\n      } else {\n        pathsToDelete.add(path)\n      }\n    }\n  })\n\n  if (localizedPathsToDelete.size > 0) {\n    const whereConstraints = [eq(table[parentColumnName], parentID)]\n\n    if (pathColumnName) {\n      whereConstraints.push(inArray(table[pathColumnName], Array.from(localizedPathsToDelete)))\n    }\n\n    await adapter.deleteWhere({\n      db,\n      tableName,\n      where: and(...whereConstraints),\n    })\n  }\n\n  if (pathsToDelete.size > 0) {\n    const whereConstraints = [eq(table[parentColumnName], parentID)]\n\n    if (pathColumnName) {\n      whereConstraints.push(inArray(table[pathColumnName], Array.from(pathsToDelete)))\n    }\n\n    await adapter.deleteWhere({\n      db,\n      tableName,\n      where: and(...whereConstraints),\n    })\n  }\n}\n"],"names":["and","eq","inArray","deleteExistingRowsByPath","adapter","db","localeColumnName","parentColumnName","parentID","pathColumnName","rows","tableName","localizedPathsToDelete","Set","pathsToDelete","table","tables","forEach","row","path","localeData","add","size","whereConstraints","push","Array","from","deleteWhere","where"],"mappings":"AAAA,SAASA,GAAG,EAAEC,EAAE,EAAEC,OAAO,QAAQ,cAAa;AAe9C,OAAO,MAAMC,2BAA2B,OAAO,EAC7CC,OAAO,EACPC,EAAE,EACFC,mBAAmB,SAAS,EAC5BC,mBAAmB,WAAW,EAC9BC,QAAQ,EACRC,iBAAiB,OAAO,EACxBC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,yBAAyB,IAAIC;IACnC,MAAMC,gBAAgB,IAAID;IAC1B,MAAME,QAAQX,QAAQY,MAAM,CAACL,UAAU;IAEvCD,KAAKO,OAAO,CAAC,CAACC;QACZ,MAAMC,OAAOD,GAAG,CAACT,eAAe;QAChC,MAAMW,aAAaF,GAAG,CAACZ,iBAAiB;QACxC,IAAI,OAAOa,SAAS,UAAU;YAC5B,IAAI,OAAOC,eAAe,UAAU;gBAClCR,uBAAuBS,GAAG,CAACF;YAC7B,OAAO;gBACLL,cAAcO,GAAG,CAACF;YACpB;QACF;IACF;IAEA,IAAIP,uBAAuBU,IAAI,GAAG,GAAG;QACnC,MAAMC,mBAAmB;YAACtB,GAAGc,KAAK,CAACR,iBAAiB,EAAEC;SAAU;QAEhE,IAAIC,gBAAgB;YAClBc,iBAAiBC,IAAI,CAACtB,QAAQa,KAAK,CAACN,eAAe,EAAEgB,MAAMC,IAAI,CAACd;QAClE;QAEA,MAAMR,QAAQuB,WAAW,CAAC;YACxBtB;YACAM;YACAiB,OAAO5B,OAAOuB;QAChB;IACF;IAEA,IAAIT,cAAcQ,IAAI,GAAG,GAAG;QAC1B,MAAMC,mBAAmB;YAACtB,GAAGc,KAAK,CAACR,iBAAiB,EAAEC;SAAU;QAEhE,IAAIC,gBAAgB;YAClBc,iBAAiBC,IAAI,CAACtB,QAAQa,KAAK,CAACN,eAAe,EAAEgB,MAAMC,IAAI,CAACZ;QAClE;QAEA,MAAMV,QAAQuB,WAAW,CAAC;YACxBtB;YACAM;YACAiB,OAAO5B,OAAOuB;QAChB;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/upsertRow/deleteExistingRowsByPath.ts"],"sourcesContent":["import { and, eq, inArray } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, DrizzleTransaction } from '../types.js'\n\ntype Args = {\n  adapter: DrizzleAdapter\n  db: DrizzleAdapter['drizzle'] | DrizzleTransaction\n  localeColumnName?: string\n  parentColumnName?: string\n  parentID: unknown\n  pathColumnName?: string\n  rows: Record<string, unknown>[]\n  tableName: string\n}\n\nexport const deleteExistingRowsByPath = async ({\n  adapter,\n  db,\n  localeColumnName = '_locale',\n  parentColumnName = '_parentID',\n  parentID,\n  pathColumnName = '_path',\n  rows,\n  tableName,\n}: Args): Promise<void> => {\n  const localizedPathsToDelete = new Map<string, Set<string>>()\n  const pathsToDelete = new Set<string>()\n  const table = adapter.tables[tableName]\n\n  rows.forEach((row) => {\n    const path = row[pathColumnName]\n    const localeData = row[localeColumnName]\n    if (typeof path === 'string') {\n      if (typeof localeData === 'string') {\n        const localePaths = localizedPathsToDelete.get(localeData) ?? new Set<string>()\n\n        localePaths.add(path)\n        localizedPathsToDelete.set(localeData, localePaths)\n      } else {\n        pathsToDelete.add(path)\n      }\n    }\n  })\n\n  if (localizedPathsToDelete.size > 0) {\n    for (const [locale, localePaths] of localizedPathsToDelete) {\n      const whereConstraints = [eq(table[parentColumnName], parentID)]\n\n      if (pathColumnName) {\n        whereConstraints.push(inArray(table[pathColumnName], Array.from(localePaths)))\n      }\n\n      whereConstraints.push(eq(table[localeColumnName], locale))\n\n      await adapter.deleteWhere({\n        db,\n        tableName,\n        where: and(...whereConstraints),\n      })\n    }\n  }\n\n  if (pathsToDelete.size > 0) {\n    const whereConstraints = [eq(table[parentColumnName], parentID)]\n\n    if (pathColumnName) {\n      whereConstraints.push(inArray(table[pathColumnName], Array.from(pathsToDelete)))\n    }\n\n    await adapter.deleteWhere({\n      db,\n      tableName,\n      where: and(...whereConstraints),\n    })\n  }\n}\n"],"names":["and","eq","inArray","deleteExistingRowsByPath","adapter","db","localeColumnName","parentColumnName","parentID","pathColumnName","rows","tableName","localizedPathsToDelete","Map","pathsToDelete","Set","table","tables","forEach","row","path","localeData","localePaths","get","add","set","size","locale","whereConstraints","push","Array","from","deleteWhere","where"],"mappings":"AAAA,SAASA,GAAG,EAAEC,EAAE,EAAEC,OAAO,QAAQ,cAAa;AAe9C,OAAO,MAAMC,2BAA2B,OAAO,EAC7CC,OAAO,EACPC,EAAE,EACFC,mBAAmB,SAAS,EAC5BC,mBAAmB,WAAW,EAC9BC,QAAQ,EACRC,iBAAiB,OAAO,EACxBC,IAAI,EACJC,SAAS,EACJ;IACL,MAAMC,yBAAyB,IAAIC;IACnC,MAAMC,gBAAgB,IAAIC;IAC1B,MAAMC,QAAQZ,QAAQa,MAAM,CAACN,UAAU;IAEvCD,KAAKQ,OAAO,CAAC,CAACC;QACZ,MAAMC,OAAOD,GAAG,CAACV,eAAe;QAChC,MAAMY,aAAaF,GAAG,CAACb,iBAAiB;QACxC,IAAI,OAAOc,SAAS,UAAU;YAC5B,IAAI,OAAOC,eAAe,UAAU;gBAClC,MAAMC,cAAcV,uBAAuBW,GAAG,CAACF,eAAe,IAAIN;gBAElEO,YAAYE,GAAG,CAACJ;gBAChBR,uBAAuBa,GAAG,CAACJ,YAAYC;YACzC,OAAO;gBACLR,cAAcU,GAAG,CAACJ;YACpB;QACF;IACF;IAEA,IAAIR,uBAAuBc,IAAI,GAAG,GAAG;QACnC,KAAK,MAAM,CAACC,QAAQL,YAAY,IAAIV,uBAAwB;YAC1D,MAAMgB,mBAAmB;gBAAC3B,GAAGe,KAAK,CAACT,iBAAiB,EAAEC;aAAU;YAEhE,IAAIC,gBAAgB;gBAClBmB,iBAAiBC,IAAI,CAAC3B,QAAQc,KAAK,CAACP,eAAe,EAAEqB,MAAMC,IAAI,CAACT;YAClE;YAEAM,iBAAiBC,IAAI,CAAC5B,GAAGe,KAAK,CAACV,iBAAiB,EAAEqB;YAElD,MAAMvB,QAAQ4B,WAAW,CAAC;gBACxB3B;gBACAM;gBACAsB,OAAOjC,OAAO4B;YAChB;QACF;IACF;IAEA,IAAId,cAAcY,IAAI,GAAG,GAAG;QAC1B,MAAME,mBAAmB;YAAC3B,GAAGe,KAAK,CAACT,iBAAiB,EAAEC;SAAU;QAEhE,IAAIC,gBAAgB;YAClBmB,iBAAiBC,IAAI,CAAC3B,QAAQc,KAAK,CAACP,eAAe,EAAEqB,MAAMC,IAAI,CAACjB;QAClE;QAEA,MAAMV,QAAQ4B,WAAW,CAAC;YACxB3B;YACAM;YACAsB,OAAOjC,OAAO4B;QAChB;IACF;AACF,EAAC"}

package/dist/upsertRow/index.d.ts

@@ -7,5 +7,5 @@ import type { Args } from './types.js';
  *
  * adapter function replaces the entire row and does not support partial updates.
  */
-export declare const upsertRow: <T extends Record<string, unknown> | TypeWithID>({ id, adapter, collectionSlug, data, db, fields, globalSlug, ignoreResult, customID, joinQuery: _joinQuery, operation, path, req, select, tableName, upsertTarget, where, }: Args) => Promise<null | T>;
+export declare const upsertRow: <T extends Record<string, unknown> | TypeWithID>({ id, adapter, collectionSlug, data, db, fields, globalSlug, ignoreResult, customID, joinQuery: _joinQuery, operation, path, req, select, tableName, upsertConflictData, upsertTarget, where, }: Args) => Promise<null | T>;
 //# sourceMappingURL=index.d.ts.map

package/dist/upsertRow/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/upsertRow/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAKzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAqBtC;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,GAAU,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,+KAqB3E,IAAI,KAAG,OAAO,CAAC,IAAI,GAAG,CAAC,CA2uBzB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/upsertRow/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAMzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAqBtC;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,GAAU,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,mMAsB3E,IAAI,KAAG,OAAO,CAAC,IAAI,GAAG,CAAC,CA01BzB,CAAA"}

package/dist/upsertRow/index.js

@@ -1,4 +1,5 @@
 import { and, desc, eq, isNull, or } from 'drizzle-orm';
+import { branchField, MAIN_BRANCH } from 'payload';
 import { buildFindManyArgs } from '../find/buildFindManyArgs.js';
 import { transform } from '../transform/read/index.js';
 import { transformForWrite } from '../transform/write/index.js';
@@ -17,7 +18,7 @@ import { shouldUseOptimizedUpsertRow } from './shouldUseOptimizedUpsertRow.js';
  */ export const upsertRow = async ({ id, adapter, collectionSlug, data, db, fields, globalSlug, ignoreResult, // TODO:
 // When we support joins for write operations (create/update) - pass collectionSlug to the buildFindManyArgs
 // Make a new argument in upsertRow.ts and pass the slug from every operation.
-customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, upsertTarget, where })=>{
+customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, upsertConflictData, upsertTarget, where })=>{
     if (operation === 'create' && !data.createdAt) {
         data.createdAt = new Date().toISOString();
     }
@@ -162,6 +163,16 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         path,
         tableName
     });
+    const conflictWrite = upsertConflictData ? transformForWrite({
+        adapter,
+        data: upsertConflictData,
+        enableAtomicWrites: false,
+        fields,
+        path,
+        tableName
+    }) : rowToInsert;
+    let nestedWrite = rowToInsert;
+    let isUpdatingAfterInsertConflict = false;
     if (customID) {
         rowToInsert.row.id = customID;
     }
@@ -182,22 +193,58 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                     [insertedRow] = await adapter.insert({
                         db,
                         onConflictDoUpdate: where ? {
-                            set: rowToInsert.row,
+                            set: conflictWrite.row,
                             target,
                             where
                         } : {
-                            set: rowToInsert.row,
+                            set: conflictWrite.row,
                             target
                         },
                         tableName,
                         values: rowToInsert.row
                     });
+                } else if (upsertConflictData && upsertTarget) {
+                    // The parent conflict is atomic. Child-table replacements are serialized only
+                    // when the caller's transaction spans this complete upsert.
+                    const targetKey = Object.entries(adapter.tables[tableName]).find(([, column])=>column === target)?.[0];
+                    const targetValue = targetKey ? rowToInsert.row[targetKey] : undefined;
+                    if (!targetKey || typeof targetValue === 'undefined') {
+                        throw new Error(`Could not resolve the upsert target value for table "${tableName}".`);
+                    }
+                    for(let attempt = 0; attempt < 10; attempt++){
+                        ;
+                        [insertedRow] = await adapter.insert({
+                            db,
+                            onConflictDoNothing: {
+                                target
+                            },
+                            tableName,
+                            values: rowToInsert.row
+                        });
+                        if (insertedRow) {
+                            break;
+                        }
+                        const updateWhere = where ? and(eq(target, targetValue), where) : eq(target, targetValue);
+                        const updatedRows = await db.update(adapter.tables[tableName]).set(conflictWrite.row).where(updateWhere).returning();
+                        if (updatedRows[0]) {
+                            insertedRow = updatedRows[0];
+                            nestedWrite = conflictWrite;
+                            isUpdatingAfterInsertConflict = true;
+                            break;
+                        }
+                        if (where) {
+                            return null;
+                        }
+                    }
+                    if (!insertedRow) {
+                        throw new Error(`Could not upsert a stable row in table "${tableName}".`);
+                    }
                 } else {
                     ;
                     [insertedRow] = await adapter.insert({
                         db,
                         onConflictDoUpdate: {
-                            set: rowToInsert.row,
+                            set: conflictWrite.row,
                             target,
                             where
                         },
@@ -231,39 +278,44 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         const numbersToInsert = [];
         const blocksToInsert = {};
         const selectsToInsert = {};
+        const localeTableName = `${tableName}${adapter.localesSuffix}`;
+        const shouldStampLocaleBranch = Boolean(adapter.rawTables[localeTableName]?.columns[branchField]);
         // If there are locale rows with data, add the parent and locale to each
-        if (Object.keys(rowToInsert.locales).length > 0) {
-            Object.entries(rowToInsert.locales).forEach(([locale, localeRow])=>{
+        if (Object.keys(nestedWrite.locales).length > 0) {
+            Object.entries(nestedWrite.locales).forEach(([locale, localeRow])=>{
                 localeRow._parentID = insertedRow.id;
                 localeRow._locale = locale;
+                if (shouldStampLocaleBranch) {
+                    localeRow[branchField] = insertedRow[branchField] ?? data[branchField] ?? MAIN_BRANCH;
+                }
                 localesToInsert.push(localeRow);
             });
         }
         // If there are relationships, add parent to each
-        if (rowToInsert.relationships.length > 0) {
-            rowToInsert.relationships.forEach((relation)=>{
+        if (nestedWrite.relationships.length > 0) {
+            nestedWrite.relationships.forEach((relation)=>{
                 relation.parent = insertedRow.id;
                 relationsToInsert.push(relation);
             });
         }
         // If there are texts, add parent to each
-        if (rowToInsert.texts.length > 0) {
-            rowToInsert.texts.forEach((textRow)=>{
+        if (nestedWrite.texts.length > 0) {
+            nestedWrite.texts.forEach((textRow)=>{
                 textRow.parent = insertedRow.id;
                 textsToInsert.push(textRow);
             });
         }
         // If there are numbers, add parent to each
-        if (rowToInsert.numbers.length > 0) {
-            rowToInsert.numbers.forEach((numberRow)=>{
+        if (nestedWrite.numbers.length > 0) {
+            nestedWrite.numbers.forEach((numberRow)=>{
                 numberRow.parent = insertedRow.id;
                 numbersToInsert.push(numberRow);
             });
         }
         // If there are selects, add parent to each, and then
         // store by table name and rows
-        if (Object.keys(rowToInsert.selects).length > 0) {
-            Object.entries(rowToInsert.selects).forEach(([selectTableName, selectRows])=>{
+        if (Object.keys(nestedWrite.selects).length > 0) {
+            Object.entries(nestedWrite.selects).forEach(([selectTableName, selectRows])=>{
                 selectsToInsert[selectTableName] = [];
                 selectRows.forEach((row)=>{
                     if (typeof row.parent === 'undefined') {
@@ -275,8 +327,8 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         }
         // If there are blocks, add parent to each, and then
         // store by table name and rows
-        Object.keys(rowToInsert.blocks).forEach((tableName)=>{
-            rowToInsert.blocks[tableName].forEach((blockRow)=>{
+        Object.keys(nestedWrite.blocks).forEach((tableName)=>{
+            nestedWrite.blocks[tableName].forEach((blockRow)=>{
                 blockRow.row._parentID = insertedRow.id;
                 if (!blocksToInsert[tableName]) {
                     blocksToInsert[tableName] = [];
@@ -291,20 +343,36 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         // INSERT LOCALES
         // //////////////////////////////////
         if (localesToInsert.length > 0) {
-            const localeTableName = `${tableName}${adapter.localesSuffix}`;
             const localeTable = adapter.tables[`${tableName}${adapter.localesSuffix}`];
-            if (operation === 'update') {
-                await adapter.deleteWhere({
+            if (operation === 'update' && isUpdatingAfterInsertConflict) {
+                for (const localeRow of localesToInsert){
+                    await adapter.insert({
+                        db,
+                        onConflictDoUpdate: {
+                            set: localeRow,
+                            target: [
+                                localeTable._locale,
+                                localeTable._parentID
+                            ]
+                        },
+                        tableName: localeTableName,
+                        values: localeRow
+                    });
+                }
+            } else {
+                if (operation === 'update') {
+                    await adapter.deleteWhere({
+                        db,
+                        tableName: localeTableName,
+                        where: eq(localeTable._parentID, insertedRow.id)
+                    });
+                }
+                await adapter.insert({
                     db,
                     tableName: localeTableName,
-                    where: eq(localeTable._parentID, insertedRow.id)
+                    values: localesToInsert
                 });
             }
-            await adapter.insert({
-                db,
-                tableName: localeTableName,
-                values: localesToInsert
-            });
         }
         // //////////////////////////////////
         // INSERT RELATIONSHIPS
@@ -312,7 +380,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         const relationshipsTableName = `${tableName}${adapter.relationshipsSuffix}`;
         if (operation === 'update') {
             // Filter out specific item deletions (those with itemToRemove) from general path deletions
-            const generalRelationshipDeletes = rowToInsert.relationshipsToDelete.filter((rel)=>!('itemToRemove' in rel));
+            const generalRelationshipDeletes = nestedWrite.relationshipsToDelete.filter((rel)=>!('itemToRemove' in rel));
             await deleteExistingRowsByPath({
                 adapter,
                 db,
@@ -337,9 +405,9 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         // //////////////////////////////////
         // HANDLE RELATIONSHIP $push OPERATIONS
         // //////////////////////////////////
-        if (rowToInsert.relationshipsToAppend.length > 0) {
+        if (nestedWrite.relationshipsToAppend.length > 0) {
             // Prepare all relationships for batch insert (order will be set after max query)
-            const relationshipsToInsert = rowToInsert.relationshipsToAppend.map((rel)=>{
+            const relationshipsToInsert = nestedWrite.relationshipsToAppend.map((rel)=>{
                 const parentId = id || insertedRow.id;
                 const row = {
                     parent: parentId,
@@ -437,10 +505,10 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         // //////////////////////////////////
         // HANDLE RELATIONSHIP $remove OPERATIONS
         // //////////////////////////////////
-        if (rowToInsert.relationshipsToDelete.some((rel)=>'itemToRemove' in rel)) {
+        if (nestedWrite.relationshipsToDelete.some((rel)=>'itemToRemove' in rel)) {
             const relationshipTable = adapter.tables[relationshipsTableName];
             if (relationshipTable) {
-                for (const relToDelete of rowToInsert.relationshipsToDelete){
+                for (const relToDelete of nestedWrite.relationshipsToDelete){
                     if ('itemToRemove' in relToDelete && relToDelete.itemToRemove) {
                         const item = relToDelete.itemToRemove;
                         const parentId = id || insertedRow.id;
@@ -494,7 +562,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                 pathColumnName: 'path',
                 rows: [
                     ...textsToInsert,
-                    ...rowToInsert.textsToDelete
+                    ...nestedWrite.textsToDelete
                 ],
                 tableName: textsTableName
             });
@@ -520,7 +588,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                 pathColumnName: 'path',
                 rows: [
                     ...numbersToInsert,
-                    ...rowToInsert.numbersToDelete
+                    ...nestedWrite.numbersToDelete
                 ],
                 tableName: numbersTableName
             });
@@ -537,7 +605,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         // //////////////////////////////////
         const insertedBlockRows = {};
         if (operation === 'update') {
-            for (const tableName of rowToInsert.blocksToDelete){
+            for (const tableName of nestedWrite.blocksToDelete){
                 const blockTable = adapter.tables[tableName];
                 await adapter.deleteWhere({
                     db,
@@ -593,7 +661,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         // INSERT ARRAYS RECURSIVELY
         // //////////////////////////////////
         if (operation === 'update') {
-            for (const arrayTableName of Object.keys(rowToInsert.arrays)){
+            for (const arrayTableName of Object.keys(nestedWrite.arrays)){
                 await deleteExistingArrayRows({
                     adapter,
                     db,
@@ -605,8 +673,8 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         await insertArrays({
             adapter,
             arrays: [
-                rowToInsert.arrays,
-                rowToInsert.arraysToPush
+                nestedWrite.arrays,
+                nestedWrite.arraysToPush
             ],
             db,
             parentRows: [
@@ -618,14 +686,36 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
         // //////////////////////////////////
         // INSERT hasMany SELECTS
         // //////////////////////////////////
-        for (const [selectTableName, tableRows] of Object.entries(selectsToInsert)){
+        const selectTableNames = new Set([
+            ...Object.keys(nestedWrite.selectsToDelete),
+            ...Object.keys(selectsToInsert)
+        ]);
+        for (const selectTableName of selectTableNames){
+            const tableRows = selectsToInsert[selectTableName] ?? [];
             const selectTable = adapter.tables[selectTableName];
             if (operation === 'update') {
-                await adapter.deleteWhere({
-                    db,
-                    tableName: selectTableName,
-                    where: eq(selectTable.parent, insertedRow.id)
-                });
+                for (const selectToDelete of nestedWrite.selectsToDelete[selectTableName] ?? []){
+                    let selectParent = selectToDelete.parent ?? insertedRow.id;
+                    if ((typeof selectParent === 'number' || typeof selectParent === 'string') && selectParent in arraysBlocksUUIDMap) {
+                        selectParent = arraysBlocksUUIDMap[selectParent];
+                    }
+                    const deleteConstraints = [
+                        eq(selectTable.parent, selectParent)
+                    ];
+                    if (typeof selectToDelete.locale === 'string') {
+                        if (!selectTable.locale) {
+                            throw new Error(`Could not limit the select replacement for table "${selectTableName}" to locale "${selectToDelete.locale}".`);
+                        }
+                        deleteConstraints.push(eq(selectTable.locale, selectToDelete.locale));
+                    } else if (selectTable.locale) {
+                        deleteConstraints.push(isNull(selectTable.locale));
+                    }
+                    await adapter.deleteWhere({
+                        db,
+                        tableName: selectTableName,
+                        where: and(...deleteConstraints)
+                    });
+                }
             }
             if (Object.keys(arraysBlocksUUIDMap).length > 0) {
                 tableRows.forEach((row)=>{