Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v diff -u -r1.44 -r1.45 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 10 Nov 2003 13:35:02 -0000 1.44 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 11 Dec 2003 21:39:56 -0000 1.45 @@ -783,12 +783,11 @@ ' language 'plpgsql'" set ret_val [ns_db 0or1row $db "select $function_name ()"] + # drop the anonymous function (OpenACS - Dan) + # JCD: ignore return code -- maybe we should be smarter about this though. + catch {ns_db dml $db "drop function $function_name ()"} - # bartt: Wait a second to workaround a problem in PostgreSQL 7.3. - # The problem only occured here. Couldn't reproduce it elsewhere. - after 1000 {ns_db dml $db "drop function $function_name ()"} - return $ret_val } error] @@ -2584,13 +2583,13 @@ postgresql { set sql_table_names_with_pattern { - select relname + select relname as table_name from pg_class where relname like lower(:pattern) and relname !~ '^pg_' and relkind = 'r' } set sql_table_names_without_pattern { - select relname + select relname as table_name from pg_class where relname !~ '^pg_' and relkind = 'r' }