Index: openacs-4/packages/layout-manager/sql/oracle/pages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/oracle/pages-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/layout-manager/sql/oracle/pages-create.sql	19 Jan 2010 22:52:47 -0000	1.2
+++ openacs-4/packages/layout-manager/sql/oracle/pages-create.sql	4 Feb 2010 22:28:42 -0000	1.3
@@ -35,7 +35,9 @@
     constraint l_pages_pageset_id_sort_key_un
     unique (pageset_id, sort_key),
     constraint l_pages_pageset_id_name_un
-    unique (url_name, name, pageset_id)
+    unique (name, pageset_id),
+    constraint l_pages_pageset_id_url_name_un
+    unique (url_name, pageset_id)
 );
 
 create index layout_pages_page_idx on layout_pages (pageset_id, page_id);
Index: openacs-4/packages/layout-manager/sql/postgresql/pages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/sql/postgresql/pages-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/layout-manager/sql/postgresql/pages-create.sql	19 Jan 2010 22:52:47 -0000	1.2
+++ openacs-4/packages/layout-manager/sql/postgresql/pages-create.sql	4 Feb 2010 22:28:42 -0000	1.3
@@ -34,8 +34,10 @@
                                     not null,
     constraint l_pages_pageset_id_sort_key_un
     unique (pageset_id, sort_key),
+    constraint l_pages_pageset_id_url_name_un
+    unique (url_name, pageset_id),
     constraint l_pages_pageset_id_name_un
-    unique (url_name, name, pageset_id)
+    unique (name, pageset_id)
 );
 
 create index layout_pages_page_idx on layout_pages (pageset_id, page_id);
Index: openacs-4/packages/layout-manager/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/tcl/apm-callback-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/layout-manager/tcl/apm-callback-procs.tcl	20 Jan 2010 02:11:57 -0000	1.4
+++ openacs-4/packages/layout-manager/tcl/apm-callback-procs.tcl	4 Feb 2010 22:28:42 -0000	1.5
@@ -76,6 +76,8 @@
                     db_dml update_url_name {}
                 }
                 db_dml add_url_name_nn {}
+                db_dml add_unique_constraint {}
+                db_dml add_unique_constraint_2 {}
             }
         }
 }
Index: openacs-4/packages/layout-manager/tcl/apm-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/tcl/apm-callback-procs.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/layout-manager/tcl/apm-callback-procs.xql	19 Jan 2010 22:52:47 -0000	1.1
+++ openacs-4/packages/layout-manager/tcl/apm-callback-procs.xql	4 Feb 2010 22:28:42 -0000	1.2
@@ -26,9 +26,17 @@
   <fullquery name="layout_manager::install::after_upgrade.add_unique_constraint">
     <querytext>
       alter table layout_pages
-      constraint l_pages_pageset_id_name_un
-      unique (url_name, name, pageset_id)
+      add constraint l_pages_pageset_id_name_un
+      unique (name, pageset_id)
     </querytext>
   </fullquery>
 
+  <fullquery name="layout_manager::install::after_upgrade.add_unique_constraint_2">
+    <querytext>
+      alter table layout_pages
+      add constraint l_pages_pageset_id_url_name_un
+      unique (url_name, pageset_id)
+    </querytext>
+  </fullquery>
+
 </queryset>