Index: openacs-4/packages/acs-tcl/tcl/test/datamodel-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/datamodel-test-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-tcl/tcl/test/datamodel-test-procs.tcl	16 Sep 2007 18:42:57 -0000	1.11
+++ openacs-4/packages/acs-tcl/tcl/test/datamodel-test-procs.tcl	30 Nov 2010 13:40:10 -0000	1.12
@@ -53,6 +53,7 @@
 
 	    regsub {_[[:alpha:]]+$} $constraint_name "" name_without_type
 	    set standard_name "${name_without_type}_${constraint_type}"
+            set standard_name_alt "${name_without_type}_[ad_decode $constraint_type pk pkey fk fkey un key ck ck missing]"
 
 	    if { $db_is_pg_p } {
 		set columns_list [split [string range $conkey 1 end-1] ","]
@@ -83,7 +84,8 @@
 		set hint "hint: $standard_name"
 	    }
 
-	    if { $standard_name ne $constraint_name } {
+	    if { $standard_name ne $constraint_name 
+                 && $standard_name_alt ne $constraint_name } {
 		aa_log_result fail "Table $table_name constraint $constraint_name ($constraint_type) violates naming standard ($hint)"
 	    }
 	}