Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Nov 2015 13:55:14 +0000 (14:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Nov 2015 13:55:14 +0000 (14:55 +0100)
1  2 
tine20/Tinebase/Setup/Update/Release8.php

@@@ -549,19 -508,24 +549,24 @@@ class Tinebase_Setup_Update_Release8 ex
          $tableVersion = $this->getTableVersion('relations');
  
          if ($tableVersion < 8) {
-             $declaration = new Setup_Backend_Schema_Index_Xml('
-                     <index>
-                         <name>own_id</name>
-                         <field>
+             try {
+                 $declaration = new Setup_Backend_Schema_Index_Xml('
+                         <index>
                              <name>own_id</name>
-                         </field>
-                     </index>
-                 ');
-             $this->_backend->addIndex('relations', $declaration);
-             $this->setTableVersion('relations', '8');
+                             <field>
+                                 <name>own_id</name>
+                             </field>
+                         </index>
+                     ');
+     
+                 $this->_backend->addIndex('relations', $declaration);
+                 $this->setTableVersion('relations', '8');
+             } catch (Zend_Db_Statement_Exception $zdse) {
+                 if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ .
+                         ' Index own_id already exists.');
+             }
          }
  
 -        $this->setApplicationVersion('Tinebase', '8.11');
 +        $this->setApplicationVersion('Tinebase', '8.13');
      }
  }