Merge pull request #9047 from annando/no-item-delivery-data

The table "item-delivery-data" does not exist on newer systems

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 6a8d663..a418a79 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -456,6 +456,11 @@ class PostUpdate
                        return true;
                }
 
+               if (!DBStructure::existsTable('item-delivery-data')) {
+                       DI::config()->set('system', 'post_update_version', 1297);
+                       return true;
+               }
+
                $max_item_delivery_data = DBA::selectFirst('item-delivery-data', ['iid'], ['queue_count > 0 OR queue_done > 0'], ['order' => ['iid']]);
                $max_iid = $max_item_delivery_data['iid'];
 
@@ -700,6 +705,11 @@ class PostUpdate
                        return true;
                }
 
+               if (!DBStructure::existsTable('item-delivery-data')) {
+                       DI::config()->set('system', 'post_update_version', 1345);
+                       return true;
+               }
+
                $id = DI::config()->get('system', 'post_update_version_1345_id', 0);
 
                Logger::info('Start', ['item' => $id]);

diff --git a/update.php b/update.php
index 6152e2b..8414ce4 100644 (file)
--- a/update.php
+++ b/update.php
@@ -348,7 +348,9 @@ function update_1309()
 
 function update_1315()
 {
-       DBA::delete('item-delivery-data', ['postopts' => '', 'inform' => '', 'queue_count' => 0, 'queue_done' => 0]);
+       if (DBStructure::existsTable('item-delivery-data')) {
+               DBA::delete('item-delivery-data', ['postopts' => '', 'inform' => '', 'queue_count' => 0, 'queue_done' => 0]);
+       }
        return Update::SUCCESS;
 }