Fixed ambagious id field error when using the append to top in some cases

Author: UndefinedOffset

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [2.2.1](https://github.com/UndefinedOffset/SortableGridField/tree/2.2.1) (2023-05-08)
+[Full Changelog](https://github.com/UndefinedOffset/SortableGridField/compare/2.2.0...2.2.1)
+
 ## [2.2.0](https://github.com/UndefinedOffset/SortableGridField/tree/2.2.0) (2023-05-08)
 [Full Changelog](https://github.com/UndefinedOffset/SortableGridField/compare/2.1.0...2.2.0)
 

src/Forms/GridFieldSortableRows.php

@@ -335,7 +335,7 @@ protected function fixSortColumn($gridField, SS_List $dataList)
                 } else if ($this->append_to_top) {
                     if ($hasVersioned) {
                         // For versioned objects, modify them with the ORM so that the *_versions table is updated
-                        $itemsToUpdate = $modelClass::get()->where(($list instanceof RelationList ? '"' . $list->foreignKey . '" = ' . $owner->ID : $idCondition) . (!empty($topIncremented) ? ' AND "ID" NOT IN(\'' . implode('\',\'', $topIncremented) . '\')' : ''));
+                        $itemsToUpdate = $modelClass::get()->where(($list instanceof RelationList ? '"' . $list->foreignKey . '" = ' . $owner->ID : '"' . $table . '".' . $idCondition) . (!empty($topIncremented) ? ' AND "ID" NOT IN(\'' . implode('\',\'', $topIncremented) . '\')' : ''));
                         if ($itemsToUpdate->exists()) {
                             foreach ($itemsToUpdate as $item) {
                                 $item->$sortColumn = $item->$sortColumn + 1;
@@ -346,13 +346,13 @@ protected function fixSortColumn($gridField, SS_List $dataList)
                         //Upgrade all the records (including the last inserted from 0 to 1)
                         DB::query('UPDATE "' . $table
                             . '" SET "' . $sortColumn . '" = "' . $sortColumn . '"+1'
-                            . ' WHERE ' . ($list instanceof RelationList ? '"' . $list->foreignKey . '" = ' . $owner->ID : $idCondition) . (!empty($topIncremented) ? ' AND "ID" NOT IN(\'' . implode('\',\'', $topIncremented) . '\')' : ''));
+                            . ' WHERE ' . ($list instanceof RelationList ? '"' . $list->foreignKey . '" = ' . $owner->ID : '"' . $table . '".' . $idCondition) . (!empty($topIncremented) ? ' AND "ID" NOT IN(\'' . implode('\',\'', $topIncremented) . '\')' : ''));
                     }
 
                     if ($this->update_versioned_stage && $this->hasVersionedExtension($gridField->getModelClass())) {
                         DB::query('UPDATE "' . $table . '_' . $this->update_versioned_stage
                             . '" SET "' . $sortColumn . '" = "' . $sortColumn . '"+1'
-                            . ' WHERE ' . ($list instanceof RelationList ? '"' . $list->foreignKey . '" = ' . $owner->ID : $idCondition) . (!empty($topIncremented) ? ' AND "ID" NOT IN(\'' . implode('\',\'', $topIncremented) . '\')' : ''));
+                            . ' WHERE ' . ($list instanceof RelationList ? '"' . $list->foreignKey . '" = ' . $owner->ID : '"' . $table . '_' . $this->update_versioned_stage . '".' . $idCondition) . (!empty($topIncremented) ? ' AND "ID" NOT IN(\'' . implode('\',\'', $topIncremented) . '\')' : ''));
                     }
 
                     $topIncremented[] = $obj->ID;