Index: openacs-4/packages/workflow/sql/oracle/workflow-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/oracle/workflow-tables-create.sql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/workflow/sql/oracle/workflow-tables-create.sql	8 Jan 2004 13:23:08 -0000	1.11
+++ openacs-4/packages/workflow/sql/oracle/workflow-tables-create.sql	8 Jan 2004 16:00:40 -0000	1.12
@@ -167,6 +167,10 @@
  -- A value of 0 means immediately, null means never.
  -- Other values mean x amount of time after having become enabled
  timeout_seconds          integer,
+  child_workflow_id       integer
+                          constraint wf_acns_child_workflow_fk
+                          references workflows(workflow_id)
+                          on delete cascade,
   constraint wf_actions_short_name_un
   unique (workflow_id, short_name),
   constraint wf_actions_pretty_name_un
@@ -243,38 +247,23 @@
 );
 
 -- TODO: Test these
-create table workflow_action_children(
-  child_id                  integer
-                            constraint wf_action_children_pk
-                            primary key,
-  action_id                 integer
-                            constraint wf_action_children_nn
-                            not null
-                            constraint wf_action_children_action_fk
-                            references workflow_actions(action_id)
-                            on delete cascade,
-  child_workflow            integer
-                            constraint wf_action_children_workflow_fk
-                            references workflows(workflow_id)
-                            on delete cascade
-);
-
 create table workflow_action_child_role_map(
-  child_id                  integer
+  action_id                 integer
                             constraint wf_act_child_rl_map_child_fk
-                            references workflow_action_children(child_id),
-  parent_role               integer
-                            constraint wf_act_child_rl_map_prnt_rl_fk
-                            references workflow_roles(role_id),
-  child_role                integer
+                            references workflow_actions(action_id),
+  child_role_id             integer
                             constraint wf_act_child_rl_map_chld_rl_fk
                             references workflow_roles(role_id),
+  parent_role_id            integer
+                            constraint wf_act_child_rl_map_prnt_rl_fk
+                            references workflow_roles(role_id),
   mapping_type              char(40)
                             constraint wf_act_child_rl_map_type_ck
                             check (mapping_type in 
-                                ('per_role','per_user')),
+                                ('per_role','per_user'))
+                            default 'per_role',
   constraint wf_act_chld_rl_map_pk
-  primary key (child_id, parent_role)
+  primary key (action_id, child_role_id)
 );
 
 comment on column workflow_action_child_role_map.mapping_type is '
@@ -283,6 +272,8 @@
   If more than one child_role has a mapping_type other than per_role, the cartesian product of these roles will be created.
 ';
 
+
+
 ---------------------------------
 -- Workflow level, Finite State Machine Model
 ---------------------------------