@payloadcms/drizzle 4.0.0-internal.e55ccef → 4.0.0-internal.ea6e8f8

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<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,CAAC,CAotBlB,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();
     }
@@ -40,6 +41,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
             const { row } = transformedForWrite;
             const { arraysToPush } = transformedForWrite;
             const drizzle = db;
+            const updateWhere = where ? and(eq(adapter.tables[tableName].id, id), where) : eq(adapter.tables[tableName].id, id);
             // First, handle $push arrays
             if (arraysToPush && Object.keys(arraysToPush)?.length) {
                 await insertArrays({
@@ -65,7 +67,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                 if (hasDataToUpdate) {
                     // Only update row if there is something to update.
                     // Example: if the data only consists of a single $push, calling insertArrays is enough - we don't need to update the row.
-                    await drizzle.update(adapter.tables[tableName]).set(row).where(eq(adapter.tables[tableName].id, id));
+                    await drizzle.update(adapter.tables[tableName]).set(row).where(updateWhere);
                 }
                 return ignoreResult === 'idOnly' ? {
                     id
@@ -83,8 +85,11 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
             const hasOnlyColumns = Object.keys(findManyArgs.columns || {}).length > 0;
             if (!hasDataToUpdate) {
                 // Nothing to update => just fetch current row and return
-                findManyArgs.where = eq(adapter.tables[tableName].id, insertedRow.id);
+                findManyArgs.where = updateWhere;
                 const doc = await db.query[tableName].findFirst(findManyArgs);
+                if (!doc) {
+                    return null;
+                }
                 return transform({
                     adapter,
                     config: adapter.payload.config,
@@ -105,7 +110,10 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                         }
                     }
                 }
-                const docs = await drizzle.update(adapter.tables[tableName]).set(row).where(eq(adapter.tables[tableName].id, id)).returning(Object.keys(selectedFields).length ? selectedFields : undefined);
+                const docs = await drizzle.update(adapter.tables[tableName]).set(row).where(updateWhere).returning(Object.keys(selectedFields).length ? selectedFields : undefined);
+                if (!docs[0]) {
+                    return null;
+                }
                 return transform({
                     adapter,
                     config: adapter.payload.config,
@@ -116,7 +124,13 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                 });
             }
             // DB Update that needs the result, potentially with joins => need to update first, then find. returning() does not work with joins.
-            await drizzle.update(adapter.tables[tableName]).set(row).where(eq(adapter.tables[tableName].id, id));
+            const docs = await drizzle.update(adapter.tables[tableName]).set(row).where(updateWhere).returning({
+                id: adapter.tables[tableName].id
+            });
+            if (!docs[0]) {
+                return null;
+            }
+            insertedRow = docs[0];
             findManyArgs.where = eq(adapter.tables[tableName].id, insertedRow.id);
             const doc = await db.query[tableName].findFirst(findManyArgs);
             return transform({
@@ -149,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;
     }
@@ -168,19 +192,59 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                     rowToInsert.row.id = id;
                     [insertedRow] = await adapter.insert({
                         db,
-                        onConflictDoUpdate: {
-                            set: rowToInsert.row,
+                        onConflictDoUpdate: where ? {
+                            set: conflictWrite.row,
+                            target,
+                            where
+                        } : {
+                            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
                         },
@@ -188,6 +252,9 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                         values: rowToInsert.row
                     });
                 }
+                if (!insertedRow) {
+                    return null;
+                }
             } else {
                 // No main row data to update, just use the existing ID
                 insertedRow = {
@@ -211,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') {
@@ -255,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] = [];
@@ -271,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
@@ -292,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,
@@ -317,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,
@@ -417,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;
@@ -474,7 +562,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                 pathColumnName: 'path',
                 rows: [
                     ...textsToInsert,
-                    ...rowToInsert.textsToDelete
+                    ...nestedWrite.textsToDelete
                 ],
                 tableName: textsTableName
             });
@@ -500,7 +588,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                 pathColumnName: 'path',
                 rows: [
                     ...numbersToInsert,
-                    ...rowToInsert.numbersToDelete
+                    ...nestedWrite.numbersToDelete
                 ],
                 tableName: numbersTableName
             });
@@ -517,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,
@@ -573,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,
@@ -585,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: [
@@ -598,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)=>{