[!!!][TASK] Remove column sys_file_reference.sorting

The column `sorting` has been removed from table `sys_file_reference` as
it was not used in TYPO3 core and lead to severe performance issues on
instances with many records in the table.

Releases: master
Resolves: #83160
Related: #80800
Change-Id: Ibff4e11f2ab3954a71cf0ef86e4a75ec4f39eb8c
Reviewed-on: https://review.typo3.org/54858


Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>

typo3/sysext/core/Classes/Database/RelationHandler.php

@@ -556,7 +556,7 @@ class RelationHandler
             // Default
             $uidLocal_field = 'uid_local';
             $uidForeign_field = 'uid_foreign';
-            $sorting_field = 'sorting';
+            $sorting_field = $tableName === 'sys_file_reference' ? '' : 'sorting';
         }
         if ($this->MM_table_where) {
             $queryBuilder->andWhere(
@@ -574,7 +574,9 @@ class RelationHandler
                 $queryBuilder->createNamedParameter((int)$uid, \PDO::PARAM_INT)
             )
         );
-        $queryBuilder->orderBy($sorting_field);
+        if (!empty($sorting_field)) {
+            $queryBuilder->orderBy($sorting_field);
+        }
         $statement = $queryBuilder->execute();
         while ($row = $statement->fetch()) {
             // Default
@@ -616,7 +618,7 @@ class RelationHandler
             // default
             $uidLocal_field = 'uid_local';
             $uidForeign_field = 'uid_foreign';
-            $sorting_field = 'sorting';
+            $sorting_field = $MM_tableName === 'sys_file_reference' ? '' : 'sorting';
         }
         // If there are tables...
         $tableC = count($this->tableArray);
@@ -652,9 +654,10 @@ class RelationHandler
                 ->where($queryBuilder->expr()->eq(
                     $uidLocal_field,
                     $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)
-                ))
-                ->orderBy($sorting_field);
-
+                ));
+            if (!empty($sorting_field)) {
+                $queryBuilder->orderBy($sorting_field);
+            }
             if ($prep) {
                 $queryBuilder->addSelect('tablenames');
             }
@@ -751,7 +754,9 @@ class RelationHandler
                     $insertFields = $this->MM_insert_fields;
                     $insertFields[$uidLocal_field] = $uid;
                     $insertFields[$uidForeign_field] = $val['id'];
-                    $insertFields[$sorting_field] = $c;
+                    if (!empty($sorting_field)) {
+                        $insertFields[$sorting_field] = $c;
+                    }
                     if ($tablename) {
                         $insertFields['tablenames'] = $tablename;
                         $insertFields = $this->completeOppositeUsageValues($tablename, $insertFields);

typo3/sysext/core/Documentation/Changelog/master/Breaking-83160-RemovedSortingColumnFromTableSysFileReference.rst

+.. include:: ../../Includes.txt
+
+===========================================================================
+Breaking: #83160 - Removed 'sorting' column from table 'sys_file_reference'
+===========================================================================
+
+See :issue:`83160`
+
+Description
+===========
+
+The column :php:`sorting` has been removed from table :php:`sys_file_reference` as it was not used in TYPO3 core and lead to severe performance issues on
+instances with many records in the table.
+
+Impact
+======
+
+Custom queries (e.g. from extensions) on table :php:`sys_file_reference` containing the column :php:`sorting` will lead to an SQL error.
+
+
+Affected Installations
+======================
+
+All instances which use custom queries containing the mentioned column.
+
+.. index:: Database, NotScanned

typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv

@@ -17,11 +17,11 @@
 ,1,0,0,0,0,0,0,0,0,0,1,"Image Kasper",401,600,,,0,,,,,,
 ,21,0,0,0,0,0,0,0,0,0,21,"Image T3BOARD",1024,683,,,0,,,,,,
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link","l10n_diffsource"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link","l10n_diffsource"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
 "tt_content",,,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,768,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-,130,89,0,0,0,0,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,131,89,0,0,0,0,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,130,89,0,0,0,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,131,89,0,0,0,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv

-sys_file_reference,,,,,,,,,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,Taken at T3BOARD,,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,This is Kasper,,,
-,130,89,0,0,1,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,[Translate to Dansk:] Taken at T3BOARD,,,
-,131,89,0,0,1,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,[Translate to Dansk:] This is Kasper,,,
-tt_content,,,,,,,,,,,,,,,,,,,,,,
+sys_file_reference
+,uid,pid,deleted,sys_language_uid,l10n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,Taken at T3BOARD,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,This is Kasper,,,
+,130,89,0,1,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,[Translate to Dansk:] Taken at T3BOARD,,,
+,131,89,0,1,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,[Translate to Dansk:] This is Kasper,,,
+tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,Regular Element #1,2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,Regular Element #2,2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-,130,89,0,0,0,0,0,0,0,0,0,0,1,332,"tt_content","image",1,"sys_file","Image #1",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,130,89,0,0,0,0,0,0,0,0,0,1,332,"tt_content","image",1,"sys_file","Image #1",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,1,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,1,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,1000000000,1,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-,130,89,0,0,1,128,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","[Translate to Dansk:] Taken at T3BOARD",,,
-,131,89,0,0,1,129,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","[Translate to Dansk:] This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid",,"deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,130,89,0,1,128,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","[Translate to Dansk:] Taken at T3BOARD",,,
+,131,89,0,1,129,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","[Translate to Dansk:] This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Testing #1",2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-,130,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",3,"sys_file","Image #3",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,130,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",3,"sys_file","Image #3",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",3,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,1,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,1,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",1,"sys_file","This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",1,"sys_file","This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","Image #1",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","Image #1",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,89,512,0,0,0,0,0,0,0,0,0,"Testing #1",2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,90,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,90,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,89,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,90,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,90,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,

typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv

-"sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,90,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,90,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,90,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,90,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-"tt_content",,,,,,,,,,,,,,,,,,,,,,
+"sys_file_reference"
+,"uid","pid","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
+,126,90,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,90,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,90,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,90,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+"tt_content"
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,,
 ,330,90,512,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
 ,331,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,,

typo3/sysext/core/ext_tables.sql

@@ -380,7 +380,6 @@ CREATE TABLE sys_file_reference (
 	tstamp int(11) DEFAULT '0' NOT NULL,
 	crdate int(11) DEFAULT '0' NOT NULL,
 	cruser_id int(11) DEFAULT '0' NOT NULL,
-	sorting int(10) DEFAULT '0' NOT NULL,
 	deleted tinyint(4) DEFAULT '0' NOT NULL,
 	hidden tinyint(4) DEFAULT '0' NOT NULL,
 

typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv

@@ -31,11 +31,11 @@ sys_file_metadata,,,,,,,,,,,,,,,,,,,,,,,
 ,uid,pid,sys_language_uid,l10n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,file,title,width,height,description,alternative,categories,l10n_diffsource,,,,,
 ,1,0,0,0,0,0,0,0,0,0,1,Image Kasper,401,600,,,0,,,,,,
 ,21,0,0,0,0,0,0,0,0,0,21,Image T3BOARD,1024,683,,,0,,,,,,
-sys_file_reference,,,,,,,,,,,,,,,,,,,,,,,
-,uid,pid,title,uid_local,uid_foreign,sys_language_uid,l10n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,sorting,deleted,tablenames,fieldname,sorting_foreign,table_local,description,alternative,link,l10n_diffsource
-,126,89,T3BOARD,1,297,0,0,0,0,0,0,0,0,0,0,tt_content,image,2,sys_file,,,,
-,127,89,Kasper,21,298,0,0,0,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
-,128,89,[Kasper] Image translated to Dansk,21,300,1,127,127,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
-,129,89,[T3BOARD] Image added in Dansk (without parent),1,300,1,0,0,0,0,0,0,0,0,0,tt_content,image,2,sys_file,,,,
-,130,89,[T3BOARD] Image added to DK element without default language,1,303,1,0,0,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
-,131,89,[T3BOARD] image translated to DE from DK,1,302,2,0,0,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
+sys_file_reference
+,uid,pid,title,uid_local,uid_foreign,sys_language_uid,l10n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,deleted,tablenames,fieldname,sorting_foreign,table_local,description,alternative,link,l10n_diffsource
+,126,89,T3BOARD,1,297,0,0,0,0,0,0,0,0,0,tt_content,image,2,sys_file,,,,
+,127,89,Kasper,21,298,0,0,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
+,128,89,[Kasper] Image translated to Dansk,21,300,1,127,127,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
+,129,89,[T3BOARD] Image added in Dansk (without parent),1,300,1,0,0,0,0,0,0,0,0,tt_content,image,2,sys_file,,,,
+,130,89,[T3BOARD] Image added to DK element without default language,1,303,1,0,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
+,131,89,[T3BOARD] image translated to DE from DK,1,302,2,0,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,

typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv

@@ -24,11 +24,11 @@ sys_file_metadata
 ,1,0,0,0,0,0,0,0,0,1,"Image Kasper",401,600,,,0,
 ,21,0,0,0,0,0,0,0,0,21,"Image T3BOARD",1024,683,,,0,
 sys_file_reference
-,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,l10n_diffsource
-,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,"T3BOARD",,,,,
-,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,"Kasper",,,,,
-,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,,
-,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,,
+,uid,pid,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,l10n_diffsource
+,126,89,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,"T3BOARD",,,,,
+,127,89,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,"Kasper",,,,,
+,128,89,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,,
+,129,89,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2

typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv

 sys_file_reference
-,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,0,0,0,0,1,4,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,131,-1,0,0,0,0,1,4,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,132,89,0,0,0,0,1,3,0,0,127,0,330,tt_content,image,0,sys_file,,,,,
-,133,89,0,0,0,0,1,3,0,0,126,0,330,tt_content,image,0,sys_file,,,,,
+,uid,pid,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
+,126,89,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,1,4,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,131,-1,0,0,0,1,4,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,132,89,0,0,0,1,3,0,0,127,0,330,tt_content,image,0,sys_file,,,,,
+,133,89,0,0,0,1,3,0,0,126,0,330,tt_content,image,0,sys_file,,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2