[Fmsystem-commits] [9743]

[Torstein]

Revision: 9743
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9743
Author:   vator
Date:     2012-07-05 06:47:53 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/setup/setup.inc.php
    trunk/controller/setup/tables_current.inc.php
    trunk/controller/setup/tables_update.inc.php

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2012-07-05 06:43:09 UTC (rev 
9742)
+++ trunk/controller/setup/setup.inc.php        2012-07-05 06:47:53 UTC (rev 
9743)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.40';
+       $setup_info['controller']['version'] = '0.1.41';
        $setup_info['controller']['app_order'] = 100;
        $setup_info['controller']['enable'] = 1;
        $setup_info['controller']['app_group']  = 'office';

Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php       2012-07-05 06:43:09 UTC 
(rev 9742)
+++ trunk/controller/setup/tables_current.inc.php       2012-07-05 06:47:53 UTC 
(rev 9743)
@@ -163,7 +163,7 @@
                                'fd' => array(
                                        'id'                                    
                        => array('type' => 'auto', 'nullable' => false),
                                        'control_group_id'      => array('type' 
=> 'int', 'precision' => '4', 'nullable' => false),
-                                       'component_id'                  => 
array('type' => 'int', 'precision' => '4', 'nullable' => false)
+                                       'location_id'                   => 
array('type' => 'int', 'precision' => '4', 'nullable' => false)
                                ),
                        'pk' => array('id'),
                        'fk' => array(),

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2012-07-05 06:43:09 UTC 
(rev 9742)
+++ trunk/controller/setup/tables_update.inc.php        2012-07-05 06:47:53 UTC 
(rev 9743)
@@ -807,3 +807,17 @@
                        return 
$GLOBALS['setup_info']['controller']['currentver'];
                }
        }
+       
+       $test[] = '0.1.40';
+       function controller_upgrade0_1_40()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+               
+       $GLOBALS['phpgw_setup']->oProc->DropTable('controller_control_area');
+               
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['controller']['currentver'] = 
'0.1.41';
+                       return 
$GLOBALS['setup_info']['controller']['currentver'];
+               }
+       }