[BUGFIX] PlainDataResolver misses DeletedRestriction

The PlainDataResolver is used to find overlay id's of live id's in workspace context. One usage is the ReferenceIndex. In scenarios 'modify content, discard content, modify again' with relations, the PlainDataResolver sometimes fetches rows that have been set to deleted (discarded) already together with the rows that should be fetched. Depending on the order of the result rows - which depends on the DBMS - wrong overlay rows are calculated sometimes. The patch adds a database DeletedRestriction at 3 of 4 places in the PlainDataResolver to only fetch correct rows. The last place triggers another side-effect that needs to be tackled with another patch and is commented as @todo for now. The tests add missing sys_refindex rows to the 6 tests that failed on postgres before. Additionally, for some other IRRE/CSV workspace tests, the sys_refindex changes slightly and is more correct now. Resolves: #92190 Releases: master, 10.4 Change-Id: I14f5211b5996d7f53738b9e086c3866aa1a4eaeb Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/65599 Tested-by: TYPO3com <noreply@typo3.com> Tested-by: Oliver Bartsch <bo@cedev.de> Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Reviewed-by: Oliver Bartsch <bo@cedev.de> Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
TYPO3 · Sep 7, 2020 · a34df47 · a34df47
1 parent f1ff254
commit a34df47
Show file tree

Hide file tree

Showing 19 changed files with 212 additions and 52 deletions.
diff --git a/typo3/sysext/core/Classes/DataHandling/PlainDataResolver.php b/typo3/sysext/core/Classes/DataHandling/PlainDataResolver.php
@@ -18,6 +18,7 @@
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Versioning\VersionState;
@@ -176,7 +177,8 @@ public function processVersionOverlays(array $ids)
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($this->tableName);
 
-        $queryBuilder->getRestrictions()->removeAll();
+        $queryBuilder->getRestrictions()->removeAll()
+            ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
 
         $result = $queryBuilder
             ->select('uid', 't3ver_oid', 't3ver_state')
@@ -228,7 +230,8 @@ public function processVersionMovePlaceholders(array $ids)
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($this->tableName);
 
-        $queryBuilder->getRestrictions()->removeAll();
+        $queryBuilder->getRestrictions()->removeAll()
+            ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
 
         $result = $queryBuilder
             ->select('uid', 't3ver_move_id')
@@ -284,6 +287,11 @@ public function processSorting(array $ids)
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($this->tableName);
 
+        // @todo: DeletedRestriction should be added here, too. This however currently makes test
+        // workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest::modifyContentAndDeleteFileReference
+        // fail with postgres. Suspected reason: On publish, there seems to be a missing RefenenceIndex->updateRefIndexTable()
+        // call, so sys_refindex still has relations to workspace records that don't exist anymore after publish. If that
+        // is solved and old sys_refindex relations are correctly dropped, the DeletedRestriction should be added here.
         $queryBuilder->getRestrictions()->removeAll();
 
         $queryBuilder
@@ -327,7 +335,8 @@ public function applyLiveIds(array $ids)
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($this->tableName);
 
-        $queryBuilder->getRestrictions()->removeAll();
+        $queryBuilder->getRestrictions()->removeAll()
+            ->add(GeneralUtility::makeInstance(DeletedRestriction::class));
 
         $result = $queryBuilder
             ->select('uid', 't3ver_oid')

diff --git a/...ing/IRRE/CSV/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv b/...ing/IRRE/CSV/Modify/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
@@ -58,5 +58,5 @@
 ,"d0ddabffdc9362f732dc24b85caa4b0b","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,1,"tx_irretutorial_1ncsv_offer",10,,,,
 ,"106614bd47f56d221050651f2863c3bb","tx_irretutorial_1ncsv_hotel",9,"offers",0,0,1,"tx_irretutorial_1ncsv_offer",12,,,,
 ,"b21e9e5f7698c0d5e96369ce5b7c4139","tt_content",302,"tx_irretutorial_1ncsv_hotels",0,0,1,"tx_irretutorial_1ncsv_hotel",9,,,,
-,"cf7f9c313c377fb815f70643b2c795ad","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",12,,,,
-,"b33811518d7f63db87a6954c66ae3844","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",9,,,,
+,"606f3b303f6bd2f3165f763bbabda034","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",11,,,,
+,"6b0ef28c364572b85bb6fecc26bd1928","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",8,,,,
diff --git a/...ing/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv b/...ing/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
@@ -65,8 +65,8 @@
 ,"69238c4e26362c5c9da3f96f0e28d1f7","tx_irretutorial_1ncsv_offer",11,"l18n_parent",0,1,1,"tx_irretutorial_1ncsv_offer",9,,,,
 ,"8d1794f6d883175e18d2f72f3a9efe89","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",0,1,1,"sys_language",1,,,,
 ,"251bd90480955e8785f9275436361bf3","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",0,1,1,"tx_irretutorial_1ncsv_hotel",6,,,,
-,"cf7f9c313c377fb815f70643b2c795ad","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",12,,,,
-,"cb6773ad972e4b911685d072c131fa72","tx_irretutorial_1ncsv_hotel",6,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",10,,,,
+,"606f3b303f6bd2f3165f763bbabda034","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",11,,,,
+,"b8c04fcc3260db25f61a0cfa64751f9e","tx_irretutorial_1ncsv_hotel",6,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",9,,,,
 ,"2851fb69b057878a92dd28372754d363","tt_content",301,"l18n_parent",0,1,1,"tt_content",299,,,,
-,"b33811518d7f63db87a6954c66ae3844","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",9,,,,
-,"a9f45ff531f9816c9af6a9a94f7efc85","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",7,,,,
+,"6b0ef28c364572b85bb6fecc26bd1928","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",8,,,,
+,"da7c145e9bd57c6f7a7dd0cd9a82d654","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",6,,,,
diff --git a/...andling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/...andling/IRRE/CSV/Modify/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -67,6 +67,6 @@
 ,"69238c4e26362c5c9da3f96f0e28d1f7","tx_irretutorial_1ncsv_offer",11,"l18n_parent",0,1,1,"tx_irretutorial_1ncsv_offer",9,,,,
 ,"8d1794f6d883175e18d2f72f3a9efe89","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",0,1,1,"sys_language",1,,,,
 ,"251bd90480955e8785f9275436361bf3","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",0,1,1,"tx_irretutorial_1ncsv_hotel",6,,,,
-,"cf7f9c313c377fb815f70643b2c795ad","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",12,,,,
+,"606f3b303f6bd2f3165f763bbabda034","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",11,,,,
 ,"2851fb69b057878a92dd28372754d363","tt_content",301,"l18n_parent",0,1,1,"tt_content",299,,,,
-,"b33811518d7f63db87a6954c66ae3844","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",9,,,,
+,"6b0ef28c364572b85bb6fecc26bd1928","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",8,,,,
diff --git a/...unctional/DataHandling/IRRE/CSV/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/...unctional/DataHandling/IRRE/CSV/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -36,3 +36,35 @@
 ,17,89,32,0,0,0,1,0,0,10,0,"Price #1.2.1",
 ,18,89,16,0,0,0,1,0,0,11,0,"Price #1.2.2",
 ,19,89,8,0,0,0,1,0,0,12,0,"Price #2.1.1",
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,
+,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",0,0,0,"sys_workspace_stage",1,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",0,0,0,"be_users",3,,,,
+,"d20c2263100e9d49596ff592e2c63a45","tt_content",297,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",3,,,,
+,"71a59c39ec1c1ed56feb5754e55cbf59","tt_content",297,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",4,,,,
+,"d0ca54af87d14593218574e192943e83","tt_content",298,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,
+,"9c8b2401b26cba9644f6b33863aeaeba","tx_irretutorial_1ncsv_hotel",3,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",5,,,,
+,"b76c84527c9c517f0df8f673dae9d5c3","tx_irretutorial_1ncsv_hotel",3,"offers",1,0,0,"tx_irretutorial_1ncsv_offer",6,,,,
+,"79cce354f8b11b767b151bedd46bff8a","tx_irretutorial_1ncsv_hotel",4,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",7,,,,
+,"f53f77fc8381f03edd959636f10584d8","tx_irretutorial_1ncsv_hotel",5,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",8,,,,
+,"cd7a7d76d574a76c0f1247d751a298cb","tx_irretutorial_1ncsv_offer",5,"prices",0,0,0,"tx_irretutorial_1ncsv_price",7,,,,
+,"81a65308ffabb16bea0baae67935ccaa","tx_irretutorial_1ncsv_offer",5,"prices",1,0,0,"tx_irretutorial_1ncsv_price",8,,,,
+,"554b9d0d426f626819cb417514316c4f","tx_irretutorial_1ncsv_offer",5,"prices",2,0,0,"tx_irretutorial_1ncsv_price",9,,,,
+,"a4b561fbbe5a18e56a4994716b04e105","tx_irretutorial_1ncsv_offer",6,"prices",0,0,0,"tx_irretutorial_1ncsv_price",10,,,,
+,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",1,0,0,"tx_irretutorial_1ncsv_price",11,,,,
+,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",0,0,0,"tx_irretutorial_1ncsv_price",12,,,,
+,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",0,0,0,"tx_irretutorial_1ncsv_price",13,,,,
+,"cf01cfc89feaf0f5179c910286e7aa6e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,1,"tx_irretutorial_1ncsv_price",14,,,,
+,"b78a850a5cadf4135ef73ebdb82d7392","tx_irretutorial_1ncsv_offer",9,"prices",1,0,1,"tx_irretutorial_1ncsv_price",15,,,,
+,"e112bdccbeb754ba06a0e9c8e724f50f","tx_irretutorial_1ncsv_offer",9,"prices",2,0,1,"tx_irretutorial_1ncsv_price",16,,,,
+,"a242d7be5cda497194b2d114e241d1a2","tx_irretutorial_1ncsv_offer",10,"prices",0,0,1,"tx_irretutorial_1ncsv_price",17,,,,
+,"69fd2b578ea1e3140930145ae84897a6","tx_irretutorial_1ncsv_offer",10,"prices",1,0,1,"tx_irretutorial_1ncsv_price",18,,,,
+,"0128094550d73607c65746681a564c2e","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,1,"tx_irretutorial_1ncsv_offer",9,,,,
+,"357e3ff60333865bec0fca4b88c772cc","tx_irretutorial_1ncsv_hotel",6,"offers",1,0,1,"tx_irretutorial_1ncsv_offer",10,,,,
+,"13e1a2836f5dc051717247d039433a84","tx_irretutorial_1ncsv_offer",11,"prices",0,0,1,"tx_irretutorial_1ncsv_price",19,,,,
+,"139f156dc57e998907742e83b190de22","tx_irretutorial_1ncsv_hotel",7,"offers",0,0,1,"tx_irretutorial_1ncsv_offer",11,,,,
+,"a748994a013110920de5088cf1ce7df1","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,1,"tx_irretutorial_1ncsv_hotel",6,,,,
+,"d53037d72c30d03a2ca867a209163f76","tt_content",299,"tx_irretutorial_1ncsv_hotels",1,0,1,"tx_irretutorial_1ncsv_hotel",7,,,,
+,"bc32626bf55978df549a0f5cdd4f2372","tx_irretutorial_1ncsv_hotel",8,"offers",0,0,1,"tx_irretutorial_1ncsv_offer",11,,,,
+,"8ea5e9fd1e3f99cf6e8f819efdc99fe5","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,0,1,"tx_irretutorial_1ncsv_hotel",6,,,,
+,"edc1d5d7928119b23912804e55eca3cf","tt_content",300,"tx_irretutorial_1ncsv_hotels",1,0,1,"tx_irretutorial_1ncsv_hotel",8,,,,
diff --git a/...ional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageAndDiscard.csv b/...ional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageAndDiscard.csv
@@ -51,6 +51,6 @@
 ,"a748994a013110920de5088cf1ce7df1","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,1,"tx_irretutorial_1ncsv_hotel",6,,,,
 ,"75d0c58f2dfcc101ea36071e33533466","tx_irretutorial_1ncsv_offer",10,"prices",0,0,1,"tx_irretutorial_1ncsv_price",14,,,,
 ,"61f500aee7f2224a68940f17309e18bc","tx_irretutorial_1ncsv_hotel",7,"offers",0,0,1,"tx_irretutorial_1ncsv_offer",9,,,,
-,"79ae831cee0cb52e708533abc611f0bd","tx_irretutorial_1ncsv_offer",9,"prices",0,1,1,"tx_irretutorial_1ncsv_price",14,,,,
-,"b8c04fcc3260db25f61a0cfa64751f9e","tx_irretutorial_1ncsv_hotel",6,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",9,,,,
-,"fbafe5668a404916240c6aac43ae31e5","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",6,,,,
+,"92af1b855b5461ac8d7be9e2186fbd18","tx_irretutorial_1ncsv_offer",9,"prices",0,1,1,"tx_irretutorial_1ncsv_price",13,,,,
+,"f78d8029018114f6a0ea8bc0cfbbbb78","tx_irretutorial_1ncsv_hotel",6,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",8,,,,
+,"d591ddbdd39d68c26a652057ca9d9475","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",5,,,,
diff --git a/...ng/IRRE/CSV/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv b/...ng/IRRE/CSV/Publish/DataSet/createNCopyParentNHotelNOfferChildrenNDiscardCopiedParent.csv
@@ -51,7 +51,7 @@
 ,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",0,0,0,"tx_irretutorial_1ncsv_price",13,,,,
 ,"106614bd47f56d221050651f2863c3bb","tx_irretutorial_1ncsv_hotel",9,"offers",0,0,1,"tx_irretutorial_1ncsv_offer",12,,,,
 ,"b21e9e5f7698c0d5e96369ce5b7c4139","tt_content",302,"tx_irretutorial_1ncsv_hotels",0,0,1,"tx_irretutorial_1ncsv_hotel",9,,,,
-,"cf7f9c313c377fb815f70643b2c795ad","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",12,,,,
-,"b33811518d7f63db87a6954c66ae3844","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",9,,,,
+,"606f3b303f6bd2f3165f763bbabda034","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",11,,,,
+,"6b0ef28c364572b85bb6fecc26bd1928","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",8,,,,
 ,"3505a7e805dbc377cf4446bd0d584ee9","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,
 ,"5805cc4ad76675f218bba6a9287e86c3","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",10,,,,
diff --git a/...ng/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv b/...ng/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardCreatedParent.csv
@@ -65,8 +65,8 @@
 ,"69238c4e26362c5c9da3f96f0e28d1f7","tx_irretutorial_1ncsv_offer",11,"l18n_parent",0,1,1,"tx_irretutorial_1ncsv_offer",9,,,,
 ,"8d1794f6d883175e18d2f72f3a9efe89","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",0,1,1,"sys_language",1,,,,
 ,"251bd90480955e8785f9275436361bf3","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",0,1,1,"tx_irretutorial_1ncsv_hotel",6,,,,
-,"cf7f9c313c377fb815f70643b2c795ad","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",12,,,,
-,"cb6773ad972e4b911685d072c131fa72","tx_irretutorial_1ncsv_hotel",6,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",10,,,,
+,"606f3b303f6bd2f3165f763bbabda034","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",11,,,,
+,"b8c04fcc3260db25f61a0cfa64751f9e","tx_irretutorial_1ncsv_hotel",6,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",9,,,,
 ,"2851fb69b057878a92dd28372754d363","tt_content",301,"l18n_parent",0,1,1,"tt_content",299,,,,
-,"b33811518d7f63db87a6954c66ae3844","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",9,,,,
-,"a9f45ff531f9816c9af6a9a94f7efc85","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",7,,,,
+,"6b0ef28c364572b85bb6fecc26bd1928","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",8,,,,
+,"da7c145e9bd57c6f7a7dd0cd9a82d654","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",6,,,,
diff --git a/...ndling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/...ndling/IRRE/CSV/Publish/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -60,8 +60,8 @@
 ,"69238c4e26362c5c9da3f96f0e28d1f7","tx_irretutorial_1ncsv_offer",11,"l18n_parent",0,1,1,"tx_irretutorial_1ncsv_offer",9,,,,
 ,"8d1794f6d883175e18d2f72f3a9efe89","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",0,1,1,"sys_language",1,,,,
 ,"251bd90480955e8785f9275436361bf3","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",0,1,1,"tx_irretutorial_1ncsv_hotel",6,,,,
-,"cf7f9c313c377fb815f70643b2c795ad","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",12,,,,
+,"606f3b303f6bd2f3165f763bbabda034","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",11,,,,
 ,"2851fb69b057878a92dd28372754d363","tt_content",301,"l18n_parent",0,1,1,"tt_content",299,,,,
-,"b33811518d7f63db87a6954c66ae3844","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",9,,,,
+,"6b0ef28c364572b85bb6fecc26bd1928","tt_content",301,"tx_irretutorial_1ncsv_hotels",0,1,1,"tx_irretutorial_1ncsv_hotel",8,,,,
 ,"3505a7e805dbc377cf4446bd0d584ee9","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,
 ,"5805cc4ad76675f218bba6a9287e86c3","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",10,,,,
diff --git a/...3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv b/...3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/deletePage.csv
@@ -60,14 +60,14 @@
 ,"b3963a4f186e2a6a9f99f8bc56032e5b","tx_irretutorial_1ncsv_offer",6,"prices",1,0,0,"tx_irretutorial_1ncsv_price",11,,,,
 ,"fe803b6ecad9e2f344d769915bef71b6","tx_irretutorial_1ncsv_offer",7,"prices",0,0,0,"tx_irretutorial_1ncsv_price",12,,,,
 ,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",0,0,0,"tx_irretutorial_1ncsv_price",13,,,,
-,"79ae831cee0cb52e708533abc611f0bd","tx_irretutorial_1ncsv_offer",9,"prices",0,1,1,"tx_irretutorial_1ncsv_price",14,,,,
-,"7324559b6828bd9a7b7dd88215d163e8","tx_irretutorial_1ncsv_offer",9,"prices",1,1,1,"tx_irretutorial_1ncsv_price",15,,,,
-,"421f259643e66596ade5945be976bc09","tx_irretutorial_1ncsv_offer",9,"prices",2,1,1,"tx_irretutorial_1ncsv_price",16,,,,
-,"08d1258e1ab60e72df848db2f6f1a4e2","tx_irretutorial_1ncsv_offer",10,"prices",0,1,1,"tx_irretutorial_1ncsv_price",17,,,,
-,"b6c635f9e546248713d55310e9da9e30","tx_irretutorial_1ncsv_offer",10,"prices",1,1,1,"tx_irretutorial_1ncsv_price",18,,,,
-,"b8c04fcc3260db25f61a0cfa64751f9e","tx_irretutorial_1ncsv_hotel",6,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",9,,,,
-,"78036c2845161a9df5669093848632c2","tx_irretutorial_1ncsv_hotel",6,"offers",1,1,1,"tx_irretutorial_1ncsv_offer",10,,,,
-,"b5beeaef52484308fec26d1e78f0670f","tx_irretutorial_1ncsv_offer",11,"prices",0,1,1,"tx_irretutorial_1ncsv_price",19,,,,
-,"3480db201be0803d0da615d4747ef4d5","tx_irretutorial_1ncsv_hotel",7,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",11,,,,
-,"97bc666d7dc30e43766b43f77c98ddf1","tx_irretutorial_1ncsv_offer",12,"prices",0,1,1,"tx_irretutorial_1ncsv_price",20,,,,
-,"cf7f9c313c377fb815f70643b2c795ad","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",12,,,,
+,"0f89c87b0e1abaa31318098e5d1bbfc2","tx_irretutorial_1ncsv_offer",12,"prices",0,1,1,"tx_irretutorial_1ncsv_price",13,,,,
+,"dc0c58068a5508e674377c2125be5678","tx_irretutorial_1ncsv_hotel",8,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",8,,,,
+,"4352d0f914838bc69d0ba4db39630fe2","tx_irretutorial_1ncsv_offer",11,"prices",0,1,1,"tx_irretutorial_1ncsv_price",12,,,,
+,"c15ab860bf7bea1be4075b42f268403d","tx_irretutorial_1ncsv_hotel",7,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",7,,,,
+,"3a031f8e07bae7645b761635ea389593","tx_irretutorial_1ncsv_offer",9,"prices",0,1,1,"tx_irretutorial_1ncsv_price",7,,,,
+,"edf50e21bb12435523856e3c23d0d8c0","tx_irretutorial_1ncsv_offer",9,"prices",1,1,1,"tx_irretutorial_1ncsv_price",8,,,,
+,"b96e00cd4983fb11a60adde171411fba","tx_irretutorial_1ncsv_offer",9,"prices",2,1,1,"tx_irretutorial_1ncsv_price",9,,,,
+,"d78befb4d52de34aaa5b817f315107b7","tx_irretutorial_1ncsv_offer",10,"prices",0,1,1,"tx_irretutorial_1ncsv_price",10,,,,
+,"e55c96765a8e4fe99da7b0ccd0605aef","tx_irretutorial_1ncsv_offer",10,"prices",1,1,1,"tx_irretutorial_1ncsv_price",11,,,,
+,"1e3e4d7629eb4b154fcf050427e1c19d","tx_irretutorial_1ncsv_hotel",6,"offers",0,1,1,"tx_irretutorial_1ncsv_offer",5,,,,
+,"5d82f76d68aa8333c4c09029ed4f5fc1","tx_irretutorial_1ncsv_hotel",6,"offers",1,1,1,"tx_irretutorial_1ncsv_offer",6,,,,
diff --git a/...nctional/DataHandling/IRRE/CSV/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/...nctional/DataHandling/IRRE/CSV/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -24,3 +24,24 @@
 ,11,89,16,0,0,0,0,0,0,0,0,"Price #1.2.2",
 ,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
 ,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,
+,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",0,0,0,"sys_workspace_stage",1,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",0,0,0,"be_users",3,,,,
+,"d0ca54af87d14593218574e192943e83","tt_content",298,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,
+,"f53f77fc8381f03edd959636f10584d8","tx_irretutorial_1ncsv_hotel",5,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",8,,,,
+,"4f04e32221eb9407dca98a1b356e3b25","tx_irretutorial_1ncsv_offer",8,"prices",0,0,0,"tx_irretutorial_1ncsv_price",13,,,,
+,"139f156dc57e998907742e83b190de22","tx_irretutorial_1ncsv_hotel",7,"offers",0,0,1,"tx_irretutorial_1ncsv_offer",11,,,,
+,"a748994a013110920de5088cf1ce7df1","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,1,"tx_irretutorial_1ncsv_hotel",6,,,,
+,"d53037d72c30d03a2ca867a209163f76","tt_content",299,"tx_irretutorial_1ncsv_hotels",1,0,1,"tx_irretutorial_1ncsv_hotel",7,,,,
+,"8b8db3d44ef3d4b8807d946c130f6cc6","tt_content",297,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,
+,"0e56ebc23a4e22404018c21ffd616c5d","tt_content",297,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,
+,"18583e5bd662f4ad5e6340674a39bce6","tx_irretutorial_1ncsv_hotel",3,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,
+,"3aa547e4a08c4baf5d59a2ff687fcd60","tx_irretutorial_1ncsv_hotel",3,"offers",1,0,0,"tx_irretutorial_1ncsv_offer",10,,,,
+,"4aa3802f45dc184b9f2003c4424079d6","tx_irretutorial_1ncsv_hotel",4,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",11,,,,
+,"cbb4976361212157036b69912999ebff","tx_irretutorial_1ncsv_offer",5,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,
+,"d24ae0931b2de8618664939b7e2f94bf","tx_irretutorial_1ncsv_offer",5,"prices",1,0,0,"tx_irretutorial_1ncsv_price",15,,,,
+,"6b2097e3fe8722e298ba87597a58abe8","tx_irretutorial_1ncsv_offer",5,"prices",2,0,0,"tx_irretutorial_1ncsv_price",16,,,,
+,"08aca0afc76791ef42dc61ef89966437","tx_irretutorial_1ncsv_offer",6,"prices",0,0,0,"tx_irretutorial_1ncsv_price",17,,,,
+,"ea4e114ffb533c5c6a655d318e155a98","tx_irretutorial_1ncsv_offer",6,"prices",1,0,0,"tx_irretutorial_1ncsv_price",18,,,,
+,"f612b97e039e7b82e2202b5c749243a3","tx_irretutorial_1ncsv_offer",7,"prices",0,0,0,"tx_irretutorial_1ncsv_price",19,,,,