Changeset 3060 for sandbox/workflow/trunk/setup

Timestamp:

07/15/10 17:30:07 (14 years ago)

Author:

viani

Message:

Ticket #950 - Merged 2838:3056 /trunk/workflow em /sandbox/workflow/trunk

Location:

sandbox/workflow/trunk/setup

Files:

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

sandbox/workflow/trunk/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/trunk/setup/tables_update.inc.php

@@ -1278 +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)');
                 }