Index: openacs-4/packages/curriculum/sql/postgresql/curriculum-curriculum-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/sql/postgresql/curriculum-curriculum-package-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum/sql/postgresql/curriculum-curriculum-package-create.sql	3 Jun 2003 10:45:44 -0000	1.2
+++ openacs-4/packages/curriculum/sql/postgresql/curriculum-curriculum-package-create.sql	3 Jun 2003 18:51:49 -0000	1.3
@@ -42,7 +42,7 @@
         p_creation_date,
         p_creation_user,
         p_creation_ip,
-        p_context_id
+        coalesce(p_context_id, p_package_id)
     );  
 
     if p_sort_key is null then
Index: openacs-4/packages/curriculum/sql/postgresql/curriculum-element-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/sql/postgresql/curriculum-element-package-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/sql/postgresql/curriculum-element-package-create.sql	26 May 2003 17:42:18 -0000	1.1
+++ openacs-4/packages/curriculum/sql/postgresql/curriculum-element-package-create.sql	3 Jun 2003 18:51:49 -0000	1.2
@@ -44,7 +44,7 @@
         p_creation_date,
         p_creation_user,
         p_creation_ip,
-        p_context_id
+        coalesce(p_context_id, p_curriculum_id)
     );  
 
     if p_sort_key is null then
Index: openacs-4/packages/curriculum/sql/postgresql/upgrade/upgrade-0.1d-0.2d.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/sql/postgresql/upgrade/upgrade-0.1d-0.2d.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum/sql/postgresql/upgrade/upgrade-0.1d-0.2d.sql	3 Jun 2003 18:52:17 -0000	1.1
@@ -0,0 +1,9 @@
+-- Upgrade script: Do the right thing when no context_id is provided
+-- with the curriculum and element *new* functions, by using coalesce().
+-- The Oracle equivalent was already using nvl().
+--
+-- Since we are using *create or replace* everywhere, it is perfectly
+-- alright to simply rerun the two scripts involved.
+
+\i curriculum-curriculum-package-create.sql
+\i curriculum-element-package-create.sql