Changeset 3061 for sandbox/workflow/branches/1015/setup

Timestamp:

07/15/10 17:50:39 (14 years ago)

Author:

viani

Message:

Ticket #1015 - Merged 2466:3060 /sandbox/workflow/trunk/ em /sandbox/workflow/branches/1015

Location:

sandbox/workflow/branches/1015/setup

Files:

• default_records.inc.php (modified) (1 diff)
• setup.inc.php (modified) (2 diffs)
• tables_current.inc.php (modified) (1 diff)
• tables_update.inc.php (modified) (3 diffs)

sandbox/workflow/branches/1015/setup/default_records.inc.php

@@ -59 +59 @@
 $GLOBALS['phpgw']->ADOdb->query("INSERT INTO phpgw_config (config_app, config_name, config_value) VALUES(?, ?, ?)", array('workflow', 'log_type_file', 'True'));
 $GLOBALS['phpgw']->ADOdb->query("INSERT INTO phpgw_config (config_app, config_name, config_value) VALUES(?, ?, ?)", array('workflow', 'log_type_firebug', 'True'));
-$GLOBALS['phpgw']->ADOdb->query("INSERT INTO phpgw_config (config_app, config_name, config_value) VALUES(?, ?, ?)", array('workflow', 'log_level', '7'));
+$GLOBALS['phpgw']->ADOdb->query("INSERT INTO phpgw_config (config_app, config_name, config_value) VALUES(?, ?, ?)", array('workflow', 'log_level', '0'));
 
 /* connect to the new database */

sandbox/workflow/branches/1015/setup/setup.inc.php

@@ -16 +16 @@
         $setup_info['workflow']['app_order']    = 10;
         $setup_info['workflow']['enable']               = 1;
-        $setup_info['workflow']['author']               = 'Ported from tikiwiki, modified by regis_glc alpeb & mbartz<br>Customized to ExpressoLivre by viani, rodrigolira, mariceli, drovetto, carloseduardo, rufino, asaikawa, gbisotto, julianadelgado & rodsouza<br>See changeLog for full names.';
-        $setup_info['workflow']['note']                 = 'Workflow engine';
+        $setup_info['workflow']['author']               = 'See changeLog for complete list of developers.';
+        $setup_info['workflow']['note']                 = 'Workflow Engine';
         $setup_info['workflow']['license']              = 'GPL';
         $setup_info['workflow']['description']          = 'Workflow Management';
@@ -59 +59 @@
         $setup_info['workflow']['depends'][] = array(
                 'appname' => 'phpgwapi',
-                'versions' => Array('1.0.0','1.0.1','1.2', '2.0', '2.1')
+                'versions' => Array('1.0.0','1.0.1','1.2', '2.0', '2.1', '2.2')
         );
         $setup_info['workflow']['depends'][] = array(
                 'appname' => 'preferences',
-                'versions' => Array('1.0.0', '0.9.13.002', '2.0', '2.1')
+                'versions' => Array('1.0.0', '0.9.13.002', '2.0', '2.1', '2.2')
         );
 ?>

sandbox/workflow/branches/1015/setup/tables_current.inc.php

@@ -190 +190 @@
                                 'fd' => array(
                                         'wf_parent_instance_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
-                                        'wf_parent_activity_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
                                         'wf_child_instance_id'  => array('type' => 'int', 'precision' => '4', 'nullable' => False),
                                         'wf_parent_lock'                => array('type' => 'int', 'precision' => '2', 'nullable' => True)
                                 ),
-                                'pk' => array('wf_parent_instance_id', 'wf_parent_activity_id', 'wf_child_instance_id'),
+                                'pk' => array('wf_parent_instance_id', 'wf_child_instance_id'),
                                 'fk' => array(),
                                 'ix' => array(),

sandbox/workflow/branches/1015/setup/tables_update.inc.php

@@ -1216 +1216 @@
         {
                 #updating the current version
+                $GLOBALS['setup_info']['workflow']['currentver'] = '2.0.003';
+                return $GLOBALS['setup_info']['workflow']['currentver'];
+        }
+        $test[] = '2.0.003';
+        function workflow_upgrade2_0_003()
+        {
+                #updating the current version
+                $GLOBALS['setup_info']['workflow']['currentver'] = '2.0.004';
+                return $GLOBALS['setup_info']['workflow']['currentver'];
+        }
+        $test[] = '2.0.004';
+        function workflow_upgrade2_0_004()
+        {
+                #updating the current version
                 $GLOBALS['setup_info']['workflow']['currentver'] = '2.1.000';
                 return $GLOBALS['setup_info']['workflow']['currentver'];
@@ -1224 +1238 @@
                 if (!$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly)
                 {
+                        /* updating log level */
+                        $values = array('0', 'workflow', 'log_level');
+                        $GLOBALS['phpgw']->ADOdb->query('UPDATE phpgw_config SET config_value=? WHERE config_app=? AND config_name=?', $values);
+
                         $workflowHostInfo = extractDatabaseParameters();
 
@@ -1260 +1278 @@
                         /* reconnect to the previous database */
                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);
+
+                        /* removing primary key of egw_wf_interinstance_relations */
+                        $GLOBALS['phpgw']->ADOdb->query('ALTER TABLE egw_wf_interinstance_relations DROP CONSTRAINT egw_wf_interinstance_relations_pkey');
+
+                        /* removing wf_parent_activity_id column from egw_wf_interinstance_relations table */
+                        $GLOBALS['phpgw']->ADOdb->query('ALTER TABLE egw_wf_interinstance_relations DROP COLUMN wf_parent_activity_id');
+
+                        /* adding primary key without the column removed */
+                        $GLOBALS['phpgw']->ADOdb->query('ALTER TABLE egw_wf_interinstance_relations ADD CONSTRAINT egw_wf_interinstance_relations_pkey PRIMARY KEY (wf_parent_instance_id, wf_child_instance_id)');
                 }