@strapi/core 5.46.1 → 5.47.1

package/dist/migrations/database/5.0.0-discard-drafts.js

@@ -82,23 +82,39 @@ const DEFAULT_PRIMARY_KEY_COLUMN = 'id';
     return true;
 };
 /**
- * Copy all the published entries to draft entries, without it's components, dynamic zones or relations.
- * This ensures all necessary draft's exist before copying it's relations.
- */ async function copyPublishedEntriesToDraft({ db, trx, uid }) {
-    // Extract all scalar attributes to use in the insert query
-    const meta = db.metadata.get(uid);
-    // Get scalar attributes that will be copied over the new draft
-    const scalarAttributes = Object.values(meta.attributes).reduce((acc, attribute)=>{
-        if ([
-            'id'
-        ].includes(attribute.columnName)) {
-            return acc;
+ * Join-column relations that are persisted on the row (e.g. createdBy), excluding virtual
+ * relations such as i18n `localizations` which reuse `document_id` and are not DB-owned.
+ */ const isPersistedJoinColumnRelation = (attribute)=>attribute?.type === 'relation' && !attribute.unstable_virtual && attribute.joinColumn && !attribute.joinTable;
+/**
+ * Column names copied when cloning a published row into a draft (stage 1).
+ * Scalars plus persisted join-column FKs; deduped so virtual relations cannot repeat columns.
+ */ const getPublishedToDraftCloneColumns = (meta)=>{
+    const seen = new Set();
+    const columns = [];
+    const addColumn = (columnName)=>{
+        if (!columnName || columnName === 'id' || seen.has(columnName)) {
+            return;
         }
+        seen.add(columnName);
+        columns.push(columnName);
+    };
+    for (const attribute of Object.values(meta.attributes)){
         if (strapiUtils.contentTypes.isScalarAttribute(attribute)) {
-            acc.push(attribute.columnName);
+            addColumn(attribute.columnName);
+            continue;
         }
-        return acc;
-    }, []);
+        if (isPersistedJoinColumnRelation(attribute)) {
+            addColumn(attribute.joinColumn.name);
+        }
+    }
+    return columns;
+};
+/**
+ * Copy published entries to draft rows, cloning scalar fields and join-column foreign keys.
+ * Components, dynamic zones, and join-table relations are handled in later stages.
+ */ async function copyPublishedEntriesToDraft({ db, trx, uid }) {
+    const meta = db.metadata.get(uid);
+    const columnsToCopy = getPublishedToDraftCloneColumns(meta);
     /**
    * Query to copy the published entries into draft entries.
    *
@@ -106,12 +122,12 @@ const DEFAULT_PRIMARY_KEY_COLUMN = 'id';
    * SELECT columnName1, columnName2, columnName3, ...
    * FROM tableName
    */ await trx// INSERT INTO tableName (columnName1, columnName2, columnName3, ...)
-    .into(trx.raw(`?? (${scalarAttributes.map(()=>`??`).join(', ')})`, [
+    .into(trx.raw(`?? (${columnsToCopy.map(()=>`??`).join(', ')})`, [
         meta.tableName,
-        ...scalarAttributes
+        ...columnsToCopy
     ])).insert((subQb)=>{
         // SELECT columnName1, columnName2, columnName3, ...
-        subQb.select(...scalarAttributes.map((att)=>{
+        subQb.select(...columnsToCopy.map((att)=>{
             // NOTE: these literals reference Strapi's built-in system columns. They never get shortened by
             // the identifier migration (5.0.0-01-convert-identifiers-long-than-max-length) so we can safely
             // compare/use them directly here.
@@ -971,7 +987,7 @@ const debug = createDebug('strapi::migration::discard-drafts');
 /**
  * Builds a reverse map from draft IDs to published IDs for a target content type.
  * This is needed to check if a target ID is already a draft and find its published version.
- */ async function getDraftToPublishedMap(trx, targetUid, reverseMapCache) {
+ */ async function getDraftToPublishedMap(trx, targetUid, reverseMapCache, draftMapCache) {
     if (reverseMapCache.has(targetUid)) {
         return reverseMapCache.get(targetUid) ?? null;
     }
@@ -981,7 +997,7 @@ const debug = createDebug('strapi::migration::discard-drafts');
         return null;
     }
     const draftToPublishedMap = new Map();
-    const draftMap = await getDraftMapForTarget(trx, targetUid, new Map());
+    const draftMap = await getDraftMapForTarget(trx, targetUid, draftMapCache ?? new Map());
     if (draftMap) {
         // Reverse the published->draft map to get draft->published
         for (const [publishedId, draftId] of draftMap.entries()){
@@ -1023,7 +1039,7 @@ const debug = createDebug('strapi::migration::discard-drafts');
         }
         // For published entity, if we got a draft ID, find the published version
         const effectiveReverseCache = reverseMapCache ?? new Map();
-        const reverseMap = await getDraftToPublishedMap(trx, targetUid, effectiveReverseCache);
+        const reverseMap = await getDraftToPublishedMap(trx, targetUid, effectiveReverseCache, draftMapCache);
         if (reverseMap) {
             return reverseMap.get(Number(originalId)) ?? originalId;
         }
@@ -1050,7 +1066,7 @@ const debug = createDebug('strapi::migration::discard-drafts');
     // For published entities: map draft targets to published targets
     if (targetState === 'draft') {
         const effectiveReverseCache = reverseMapCache ?? new Map();
-        const reverseMap = await getDraftToPublishedMap(trx, targetUid, effectiveReverseCache);
+        const reverseMap = await getDraftToPublishedMap(trx, targetUid, effectiveReverseCache, draftMapCache);
         if (reverseMap) {
             return reverseMap.get(Number(originalId)) ?? originalId;
         }
@@ -1182,7 +1198,7 @@ const debug = createDebug('strapi::migration::discard-drafts');
         newComponentRow.created_at = resolveNowValue(trx);
     }
     for (const attribute of Object.values(componentMeta.attributes)){
-        if (attribute.type !== 'relation') {
+        if (!isPersistedJoinColumnRelation(attribute)) {
             continue;
         }
         const joinColumn = attribute.joinColumn;
@@ -1687,14 +1703,9 @@ const debug = createDebug('strapi::migration::discard-drafts');
     const targetMapCache = new Map();
     // Find all JoinColumn relations (oneToOne, manyToOne without joinTable)
     for (const attribute of Object.values(meta.attributes)){
-        if (attribute.type !== 'relation') {
-            continue;
-        }
-        // Skip relations with joinTable (handled by copyRelationsToOtherContentTypes)
-        if (attribute.joinTable) {
+        if (!isPersistedJoinColumnRelation(attribute)) {
             continue;
         }
-        // Only handle oneToOne and manyToOne relations that use joinColumn
         const joinColumn = attribute.joinColumn;
         if (!joinColumn) {
             continue;
@@ -2223,6 +2234,8 @@ const debug = createDebug('strapi::migration::discard-drafts');
     const publishedIds = Array.from(publishedToDraftMap.keys());
     // Process in batches to avoid MySQL query size limits and SQLite expression tree limits
     const publishedIdsChunks = chunkArray(publishedIds, getBatchSize(trx, 1000));
+    const componentTargetDraftMapCache = new Map();
+    const componentTargetReverseMapCache = new Map();
     for (const publishedIdsChunk of publishedIdsChunks){
         // Get component relations for published entries
         const componentRelations = await trx(joinTableName).select('*').whereIn(entityIdColumn, publishedIdsChunk);
@@ -2231,8 +2244,6 @@ const debug = createDebug('strapi::migration::discard-drafts');
         }
         const componentCloneCache = new Map();
         const clonedComponentPairsCache = new Map();
-        const componentTargetDraftMapCache = new Map();
-        const componentTargetReverseMapCache = new Map();
         const componentHierarchyCaches = {
             parentInstanceCache: new Map(),
             ancestorDpCache: new Map(),