[Fmsystem-commits] [7481] Author: Marcus Larsson <address@hidden>

[Thomas Lundquist]

Revision: 7481
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7481
Author:   thomasez
Date:     2011-08-01 13:35:32 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
Author: Marcus Larsson <address@hidden>
Date:   Tue Oct 5 10:48:12 2010 +0200

    made sort nullable in bb_resource

Modified Paths:
--------------
    branches/dev-thomasez/booking/setup/tables_current.inc.php
    branches/dev-thomasez/booking/setup/tables_update.inc.php

Modified: branches/dev-thomasez/booking/setup/tables_current.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/tables_current.inc.php  2011-08-01 
12:48:57 UTC (rev 7480)
+++ branches/dev-thomasez/booking/setup/tables_current.inc.php  2011-08-01 
13:35:32 UTC (rev 7481)
@@ -104,7 +104,7 @@
                                'type' => array('type' => 'varchar', 
'precision' => '50', 'nullable' => False),
                                'description' => array('type' => 'text', 
'nullable' => True),
                                'activity_id' => array('type' => 
'int','precision' => '4','nullable' => False),
-                               'sort' => array('type' => 'int','precision' => 
'4','nullable' => False,'default' => 0),
+                               'sort' => array('type' => 'int','precision' => 
'4','nullable' => True,'default' => 0),
                        ),
                        'pk' => array('id'),
                        'fk' => array(

Modified: branches/dev-thomasez/booking/setup/tables_update.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/tables_update.inc.php   2011-08-01 
12:48:57 UTC (rev 7480)
+++ branches/dev-thomasez/booking/setup/tables_update.inc.php   2011-08-01 
13:35:32 UTC (rev 7481)
@@ -2617,3 +2617,21 @@
 
 
 
+       /**
+       * Update booking version from 0.2.08 to 0.2.09
+       * Set bb_resource.sort to nullable.
+       * 
+       */
+  $test[] = '0.2.08';
+       function booking_upgrade0_2_08()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+               $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE 
bb_resource ALTER COLUMN sort DROP NOT NULL");
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.09';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+       }
+