Merge pull request #267 from Deutscher-Tischfussballbund/sportsmanager2-stage

stage to prod

src/structure/components/com_sportsmanager/database/update.php

@@ -5503,12 +5503,10 @@ function updateDatabase(): void
         $db->setQuery($query);
         if (!$db->execute()) { die($db->stderr(true)); }
 
-        $columns = $db->getTableColumns('#__sportsmanager_veranstaltung');
+		$query = "ALTER TABLE `#__sportsmanager_veranstaltung` ADD COLUMN IF NOT EXISTS `regelwerke_id` INT(11) NOT NULL DEFAULT '0' AFTER `bezeichnung`;";
-        if (!array_key_exists('regelwerke_id', $columns)) {
+		$db->setQuery($query);
-            $query = "ALTER TABLE `#__sportsmanager_veranstaltung` ADD COLUMN `regelwerke_id` INT(11) NOT NULL DEFAULT '0' AFTER `bezeichnung`;";
+		if (!$db->execute()) { die($db->stderr(true)); }
-            $db->setQuery($query);
+
-            if (!$db->execute()) { die($db->stderr(true)); }
-        }
         $query = "UPDATE #__sportsmanager_einstellungen"
             . "\n SET wert = '114'"
             . "\n WHERE name = 'datenbank_version'";
@@ -5521,24 +5519,19 @@ function updateDatabase(): void
     if ($datenbank_version < 115) {
 
 		// Erweiterung Tabelle #__sportsmanager_verschieberegel
-        $columns = $db->getTableColumns('#__sportsmanager_verschieberegel');
+		$query = "ALTER TABLE `#__sportsmanager_verschieberegel`"
-        if (!array_key_exists('begruendung_erforderlich', $columns)
+				."\n ADD COLUMN IF NOT EXISTS `begruendung_erforderlich` INT(1) NOT NULL DEFAULT 0 AFTER `ablehnen`,"
-            || !array_key_exists('vereine_berechtigt', $columns)
+				."\n ADD COLUMN IF NOT EXISTS `vereine_berechtigt`       INT(1) NOT NULL DEFAULT 1 AFTER `begruendung_erforderlich`,"
-            || !array_key_exists('verband_berechtigt', $columns)) {
+				."\n ADD COLUMN IF NOT EXISTS `verband_berechtigt`       INT(1) NOT NULL DEFAULT 0 AFTER `vereine_berechtigt`;";
-            $query = "ALTER TABLE `#__sportsmanager_verschieberegel`"
+        $db->setQuery($query);
-                . "\n ADD COLUMN `begruendung_erforderlich` INT(1) NOT NULL DEFAULT 0 AFTER `ablehnen`,"
+        if (!$db->execute()) {
-                . "\n ADD COLUMN `vereine_berechtigt`       INT(1) NOT NULL DEFAULT 1 AFTER `begruendung_erforderlich`,"
+            die($db->stderr(true));
-                . "\n ADD COLUMN `verband_berechtigt`       INT(1) NOT NULL DEFAULT 0 AFTER `vereine_berechtigt`;";
-            $db->setQuery($query);
-            if (!$db->execute()) {
-                die($db->stderr(true));
-            }
         }
-
+		
 		$query = "INSERT IGNORE INTO `#__sportsmanager_email_vorlagen` (`email_vorlagen_id`, `vorlage`) VALUES (NULL, 'Spielverlegung');";
         $db->setQuery($query);
         if (!$db->execute()) { die($db->stderr(true)); }
-
+		
         $query = "UPDATE #__sportsmanager_einstellungen"
             . "\n SET wert = '115'"
             . "\n WHERE name = 'datenbank_version'";
@@ -5547,33 +5540,25 @@ function updateDatabase(): void
             die($db->stderr(true));
         }
     }
-
+	
     if ($datenbank_version < 116) {
 
-        $columns = $db->getTableColumns('#__sportsmanager_spielort');
+		$query = "ALTER TABLE `#__sportsmanager_spielort`"
-        if (!array_key_exists('telefon', $columns)
+			. "\n ADD IF NOT EXISTS `telefon` VARCHAR(64) NULL DEFAULT NULL AFTER `url`,"
-            || !array_key_exists('email', $columns)
+			. "\n ADD IF NOT EXISTS `email` VARCHAR(64) NULL DEFAULT NULL AFTER `telefon`,"
-            || !array_key_exists('ruhetage', $columns)) {
+			. "\n ADD IF NOT EXISTS `ruhetage` VARCHAR(64) NULL DEFAULT NULL AFTER `email`;";
-            $query = "ALTER TABLE `#__sportsmanager_spielort`"
+        $db->setQuery($query);
-                . "\n ADD `telefon` VARCHAR(64) NULL DEFAULT NULL AFTER `url`,"
+        if (!$db->execute()) {
-                . "\n ADD `email` VARCHAR(64) NULL DEFAULT NULL AFTER `telefon`,"
+            die($db->stderr(true));
-                . "\n ADD `ruhetage` VARCHAR(64) NULL DEFAULT NULL AFTER `email`;";
-            $db->setQuery($query);
-            if (!$db->execute()) {
-                die($db->stderr(true));
-            }
         }
-
+		
-        $columns = $db->getTableColumns('#__sportsmanager_team');
+        $query = "ALTER TABLE `#__sportsmanager_team`"
-        if (!array_key_exists('trainingstage', $columns)){
+			. "\n ADD IF NOT EXISTS `trainingstage` VARCHAR(64) NULL DEFAULT NULL AFTER `heimspielort_id`;";
-            $query = "ALTER TABLE `#__sportsmanager_team`"
+        $db->setQuery($query);
-                . "\n ADD `trainingstage` VARCHAR(64) NULL DEFAULT NULL AFTER `heimspielort_id`;";
+        if (!$db->execute()) {
-            $db->setQuery($query);
+            die($db->stderr(true));
-            if (!$db->execute()) {
-                die($db->stderr(true));
-            }
         }
-
+		
         $query = "UPDATE #__sportsmanager_einstellungen"
             . "\n SET wert = '116'"
             . "\n WHERE name = 'datenbank_version'";
@@ -5596,15 +5581,10 @@ function updateDatabase(): void
         $db->setQuery( $query );
         if (!$db->execute()) { die($db->stderr(true)); }
 
-        $columns = $db->getTableColumns('#__sportsmanager_veranstaltung');
+        $query = "ALTER TABLE #__sportsmanager_veranstaltung"
-        if (!array_key_exists('explizite_strafen', $columns)) {
+			. "\n ADD IF NOT EXISTS explizite_strafen tinyint(4) DEFAULT '0' AFTER elo_wertung";
-            $query = "ALTER TABLE #__sportsmanager_veranstaltung"
+        $db->setQuery($query);
-                . "\n ADD explizite_strafen tinyint(4) DEFAULT '0' AFTER elo_wertung";
+        if (!$db->execute()) { die($db->stderr(true)); }
-            $db->setQuery($query);
-            if (!$db->execute()) {
-                die($db->stderr(true));
-            }
-        }
 
         $query = "UPDATE #__sportsmanager_einstellungen SET wert = '117' WHERE name = 'datenbank_version'";
         $db->setQuery($query);
@@ -5628,7 +5608,7 @@ function updateDatabase(): void
         if (!$db->execute()) {
             die($db->stderr(true));
         }
-
+		
         $query = "CREATE TABLE IF NOT EXISTS `#__sportsmanager_mitglied_von_verbandsorgan` ("
           . "\n `mitglied_von_verbandsorgan_id` int(11) NOT NULL AUTO_INCREMENT,"
           . "\n `verbandsorgane_id` int(11) DEFAULT NULL,"
@@ -5649,7 +5629,7 @@ function updateDatabase(): void
         if (!$db->execute()) {
             die($db->stderr(true));
         }
-
+		
         $query = "UPDATE #__sportsmanager_einstellungen"
             . "\n SET wert = '118'"
             . "\n WHERE name = 'datenbank_version'";
@@ -5698,7 +5678,7 @@ function updateDatabase(): void
         if (!$db->execute()) {
             die($db->stderr(true));
         }
-
+		
         $query = "UPDATE #__sportsmanager_einstellungen"
             . "\n SET wert = '119'"
             . "\n WHERE name = 'datenbank_version'";