Merge pull request #218 from praxisdigital/fmp_fix_upgrade_script

Fix upgrade script
donhinkelman · Sep 17, 2024 · c4c289a · c4c289a
2 parents c72dc00 + b63fabf
commit c4c289a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/db/upgrade.php b/db/upgrade.php
@@ -249,7 +249,7 @@ function xmldb_block_sharing_cart_upgrade($oldversion = 0): bool
         upgrade_block_savepoint(true, 2024011800, 'sharing_cart');
     }
 
-    if ($oldversion < 2024032100) {
+    if ($oldversion < 2024072900) {
         /**
          * Create block_sharing_cart_items table.
          */
@@ -462,17 +462,22 @@ function xmldb_block_sharing_cart_upgrade($oldversion = 0): bool
             $dbman->drop_table($table);
         }
 
-        upgrade_block_savepoint(true, 2024032100, 'sharing_cart');
+        upgrade_block_savepoint(true, 2024072900, 'sharing_cart');
     }
 
-    if ($oldversion < 2024032101) {
+    if ($oldversion < 2024072900) {
         $xmldb_table = new xmldb_table('block_sharing_cart_items');
-        $dbman->add_field(
-            $xmldb_table,
-            new xmldb_field(
-                'sortorder', XMLDB_TYPE_INTEGER, '10', notnull: false
-            )
-        );
+
+        if (!$dbman->field_exists($xmldb_table, 'sortorder')) {
+            $dbman->add_field(
+                $xmldb_table,
+                new xmldb_field(
+                    'sortorder', XMLDB_TYPE_INTEGER, '10', notnull: false
+                )
+            );
+        }
+
+        upgrade_block_savepoint(true, 2024072900, 'sharing_cart');
     }
 
     return true;

diff --git a/version.php b/version.php
@@ -6,7 +6,7 @@
 
 /** @var object $plugin */
 $plugin->component = 'block_sharing_cart';
-$plugin->version = 2024081900;
+$plugin->version = 2024081901;
 $plugin->requires = 2023042400; // Moodle 4.2.0
 $plugin->release = '5.0, release 1';
 $plugin->maturity = MATURITY_STABLE;