Changeset 6111 for trunk/expressoCalendar

Timestamp:

05/04/12 18:38:56 (12 years ago)

Author:

natan

Message:

Ticket #2141 - Eventos com repeticao nao dispara notificacao nos alarmes - implementação final

Location:

trunk/expressoCalendar/setup

Files:

• setup.inc.php (modified) (1 diff)
• tables_current.inc.php (modified) (1 diff)
• tables_update.inc.php (modified) (1 diff)

trunk/expressoCalendar/setup/setup.inc.php

@@ -13 +13 @@
         $setup_info['expressoCalendar']['title']        = 'Expresso Calendar';
         /* Ao incrementar versão, não esquecer de declarar função do tables_update.inc.php*/
-        $setup_info['expressoCalendar']['version']      = '1.005';
+        $setup_info['expressoCalendar']['version']      = '1.006';
         $setup_info['expressoCalendar']['app_order']    = 10;
 

trunk/expressoCalendar/setup/tables_current.inc.php

@@ -152 +152 @@
                 'id' => array( 'type' => 'auto', 'nullable' => False),
                 'action_id' => array( 'type' => 'int', 'precision' => '8', 'nullable' => False),
-                'range_end' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => True),
-                'range_start' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => True),
-                'unit' => array('type' => 'varchar','precision' => '20','nullable' => True),
+                'alarm_offset' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => False),
                 'time' => array('type' => 'varchar','precision' => '50','nullable' => True),
                 'participant_id' => array('type' => 'int', 'precision' => '8','nullable' => True),

trunk/expressoCalendar/setup/tables_update.inc.php

@@ -107 +107 @@
         };
         
-        
+        $test[] = '1.005';
+        function expressoCalendar_upgrade1_005() {
+            $oProc = $GLOBALS['phpgw_setup']->oProc;
+            $oProc->query("ALTER TABLE calendar_alarm ADD COLUMN alarm_offset bigint;");
+            $oProc->query("UPDATE calendar_alarm SET alarm_offset = obj.range_start - calendar_alarm.range_start FROM calendar_object as obj WHERE obj.id = object_id;");
+            $oProc->query("ALTER TABLE calendar_alarm DROP COLUMN range_start;");
+            $oProc->query("ALTER TABLE calendar_alarm DROP COLUMN range_end;");
+            $GLOBALS['setup_info']['expressoCalendar']['currentver'] = '1.006';
+            return $GLOBALS['setup_info']['expressoCalendar']['currentver'];
+        };
         
 ?>