Merge remote-tracking branch 'origin/2023.11' into 2024.11

tine-groupware · Jan 29, 2024 · 35328e5 · 35328e5
2 parents 1cc3d34 + 7029515
commit 35328e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tine20/Calendar/Setup/Update/16.php b/tine20/Calendar/Setup/Update/16.php
@@ -45,10 +45,10 @@ public function update000()
 
     public function update001()
     {
-        // yes, that is the... or at least a... way of doing it
-        Setup_SchemaTool::updateSchema([
-            Calendar_Model_Attender::class,
-        ]);
+        foreach ($this->_backend->getOwnForeignKeys(Calendar_Model_Attender::TABLE_NAME) as $fKey)
+        {
+            $this->_backend->dropForeignKey(Calendar_Model_Attender::TABLE_NAME, $fKey['constraint_name']);
+        }
         Setup_SchemaTool::updateSchema([
             Tinebase_Model_Container::class,
             Calendar_Model_Attender::class,

diff --git a/tine20/Setup/Backend/Mysql.php b/tine20/Setup/Backend/Mysql.php
@@ -196,7 +196,7 @@ public function getOwnForeignKeys($tableName)
 
         return $foreignKeyNames;
     }
-    
+
     /**
      * Get schema of existing table
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -196,7 +196,7 @@ public function getOwnForeignKeys($tableName) @@
             return $foreignKeyNames;
         }
         /**
          * Get schema of existing table
          *
@@ Expand Down @@