Index: openacs-4/packages/acs-subsite/tcl/plpgsql-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/plpgsql-utility-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/tcl/plpgsql-utility-procs.tcl	25 Jan 2019 23:49:04 -0000	1.11
+++ openacs-4/packages/acs-subsite/tcl/plpgsql-utility-procs.tcl	3 Sep 2024 15:37:33 -0000	1.12
@@ -5,55 +5,55 @@
     @author swoodcock@scholastic.co.uk
     @creation-date Sun Jul 22 13:51:26 BST 2001
     @cvs-id $Id$
-    
+
 }
 
 namespace eval plpgsql_utility {
 
-    ad_proc -public generate_attribute_parameter_call_from_attributes { 
-	{ -prepend "" }
-	function_name
-	attr_list 
+    ad_proc -public generate_attribute_parameter_call_from_attributes {
+        { -prepend "" }
+        function_name
+        attr_list
     } {
-	Wrapper for generate_attribute_parameter_call that formats
-	default attribute list to the right format.
+        Wrapper for generate_attribute_parameter_call that formats
+        default attribute list to the right format.
 
-	@author Michael Bryzek (mbryzek@arsdigita.com)
-	@creation-date 11/2000
+        @author Michael Bryzek (mbryzek@arsdigita.com)
+        @creation-date 11/2000
 
     } {
-	set the_list [list]
-	foreach row $attr_list {
-	    lappend the_list [list [lindex $row 1] [lindex $row 3]]
-	}
-	return [generate_attribute_parameter_call -prepend $prepend $function_name $the_list]
+        set the_list [list]
+        foreach row $attr_list {
+            lappend the_list [list [lindex $row 1] [lindex $row 3]]
+        }
+        return [generate_attribute_parameter_call -prepend $prepend $function_name $the_list]
     }
 
     ad_proc -private get_function_args {function_name} {
         uncached version returns list of lists args
         called from generate_attribute_parameter_call
-    } { 
+    } {
         return [db_list_of_lists get_function_args {}]
     }
 
     ad_proc -public generate_attribute_parameter_call {
-	{ -prepend "" }
-	function_name
-	pairs
+        { -prepend "" }
+        function_name
+        pairs
     } {
-	Generates the arg list for a call to a pl/pgsql function
+        Generates the arg list for a call to a pl/pgsql function
 
-	@author Steve Woodcock (swoodcock@scholastic.co.uk)
-	@creation-date 07/2001
+        @author Steve Woodcock (swoodcock@scholastic.co.uk)
+        @creation-date 07/2001
 
     } {
-	# Get the list of real args to the function
-	set real_args [util_memoize [list plpgsql_utility::get_function_args $function_name]]
+        # Get the list of real args to the function
+        set real_args [util_memoize [list plpgsql_utility::get_function_args $function_name]]
 
-	foreach row $pairs {
-	    set attr [string trim [lindex $row 0]]
-	    set user_supplied([string toupper $attr]) $attr
-	}
+        foreach row $pairs {
+            set attr [string trim [lindex $row 0]]
+            set user_supplied([string toupper $attr]) $attr
+        }
 
         # This list of reserved default values is needed so we don't
         # try to quote them. A better alternative might be to use some
@@ -65,114 +65,114 @@
             current_timestamp
         }
 
-	# For each real arg, append default or supplied arg value
-	set pieces [list]
-	foreach row $real_args {
-	    lassign $row arg_name arg_default
+        # For each real arg, append default or supplied arg value
+        set pieces [list]
+        foreach row $real_args {
+            lassign $row arg_name arg_default
 
-	    if { [info exists user_supplied($arg_name)] } {
-		lappend pieces "${prepend}$user_supplied($arg_name)"
-	    } elseif { $arg_default eq "" || $arg_default eq "null"} {
+            if { [info exists user_supplied($arg_name)] } {
+                lappend pieces "${prepend}$user_supplied($arg_name)"
+            } elseif { $arg_default eq "" || $arg_default eq "null"} {
                 lappend pieces "NULL"
             } elseif { [string tolower $arg_default] ni $reserved_default_values } {
-                lappend pieces "'[db_quote $arg_default]'"
-	    } else {
+                lappend pieces [ns_dbquotevalue $arg_default]
+            } else {
                 lappend pieces $arg_default
             }
-	}
+        }
 
-	return [join $pieces ","]
+        return [join $pieces ","]
     }
 
     ad_proc -deprecated table_column_type {
-	table
-	column
+        table
+        column
     } {
-	Returns the datatype for column in table
+        Returns the datatype for column in table
 
         @see db_column_type
 
-	@author Steve Woodcock (swoodcock@scholastic.co.uk)
-	@creation-date 07/2001
+        @author Steve Woodcock (swoodcock@scholastic.co.uk)
+        @creation-date 07/2001
 
     } {
         return [db_column_type -complain $table $column]
     }
 
-    ad_proc -public generate_attribute_parameters { 
-	{ -indent "4" }
-	attr_list 
+    ad_proc -public generate_attribute_parameters {
+        { -indent "4" }
+        attr_list
     } {
-	Generates the arg list to a pl/sql function or procedure
+        Generates the arg list to a pl/sql function or procedure
 
-	@author Michael Bryzek (mbryzek@arsdigita.com)
-	@creation-date 11/2000
+        @author Michael Bryzek (mbryzek@arsdigita.com)
+        @creation-date 11/2000
 
     } {
-	set pieces [list]
-	set arg_num 0
-	foreach triple $attr_list {
-	    incr arg_num
-	    set attr [string toupper [string trim [lindex $triple 1]]]
-	    lappend pieces [list "p_${attr}" "alias for \$${arg_num}"]
-	}
-	return [plsql_utility::format_pieces -indent $indent -line_term ";" $pieces]
+        set pieces [list]
+        set arg_num 0
+        foreach triple $attr_list {
+            incr arg_num
+            set attr [string toupper [string trim [lindex $triple 1]]]
+            lappend pieces [list "p_${attr}" "alias for \$${arg_num}"]
+        }
+        return [plsql_utility::format_pieces -indent $indent -line_term ";" $pieces]
 
     }
 
 
-    ad_proc -public generate_function_signature { 
-	attr_list 
+    ad_proc -public generate_function_signature {
+        attr_list
     } {
-	Generates the signature for a pl/sql function or procedure
+        Generates the signature for a pl/sql function or procedure
 
-	@author Steve Woodcock (swoodcock@scholastic.co.uk)
-	@creation-date 07/2001
+        @author Steve Woodcock (swoodcock@scholastic.co.uk)
+        @creation-date 07/2001
 
     } {
-	set pieces [list]
-	foreach triple $attr_list {
-	    set table [string toupper [string trim [lindex $triple 0]]]
-	    set attr [string toupper [string trim [lindex $triple 1]]]
-	    set datatype [db_column_type -complain $table $attr]
-	    lappend pieces $datatype
-	}
-	return [join $pieces ","]
+        set pieces [list]
+        foreach triple $attr_list {
+            set table [string toupper [string trim [lindex $triple 0]]]
+            set attr [string toupper [string trim [lindex $triple 1]]]
+            set datatype [db_column_type -complain $table $attr]
+            lappend pieces $datatype
+        }
+        return [join $pieces ","]
 
     }
 
-    ad_proc -public dollar { 
+    ad_proc -public dollar {
     } {
-	Return a literal dollar for use in .xql files.
+        Return a literal dollar for use in .xql files.
     } {
-	return "$"
+        return "$"
     }
 
 
-    ad_proc -public define_function_args { 
-	attr_list 
+    ad_proc -public define_function_args {
+        attr_list
     } {
-	Returns the attribute list as a string suitable for a call to define_function_args.
+        Returns the attribute list as a string suitable for a call to define_function_args.
 
-	@author Steve Woodcock (swoodcock@scholastic.co.uk)
-	@creation-date 07/2001
+        @author Steve Woodcock (swoodcock@scholastic.co.uk)
+        @creation-date 07/2001
 
     } {
-	set pieces [list]
-	foreach triple $attr_list {
-	    set attr  [string trim [lindex $triple 1]]
-	    set dft   [string trim [lindex $triple 2]]
-	    if { $dft eq "" || $dft eq "NULL" } {
-		set default ""
-	    } else {
-		if { [string index $dft 0] eq "'" } {
-		    set dft [string range $dft 1 [string length $dft]-2]
-		}
-		set default ";${dft}"
-	    }
-	    lappend pieces "${attr}${default}"
-	}
-	return [join $pieces ","]
+        set pieces [list]
+        foreach triple $attr_list {
+            set attr  [string trim [lindex $triple 1]]
+            set dft   [string trim [lindex $triple 2]]
+            if { $dft eq "" || $dft eq "NULL" } {
+                set default ""
+            } else {
+                if { [string index $dft 0] eq "'" } {
+                    set dft [string range $dft 1 [string length $dft]-2]
+                }
+                set default ";${dft}"
+            }
+            lappend pieces "${attr}${default}"
+        }
+        return [join $pieces ","]
 
     }