Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl 12 Feb 2003 15:16:32 -0000 1.2 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl 17 May 2003 09:45:46 -0000 1.3 @@ -7,13 +7,26 @@ # Make sure we do the setup only once if { ![nsv_exists ds_properties enabled_p] } { ad_register_filter -critical t -priority 999999 trace * /* ds_trace_filter - ad_schedule_proc [ad_parameter -package_id [ds_instance_id] DataSweepInterval "developer-support" 900] ds_sweep_data + ad_schedule_proc [ad_parameter -package_id [ds_instance_id] DataSweepInterval acs-developer-support 900] ds_sweep_data nsv_array set ds_request [list] nsv_set ds_properties enabled_p [ad_parameter -package_id [ds_instance_id] EnabledOnStartupP acs-developer-support 0] - nsv_set ds_properties enabled_ips * - nsv_set ds_properties database_enabled_p [ad_parameter -package_id [ds_instance_id] \ - DatabaseEnabledP developer-support 0] + + # Take the IP list (space or comma seperated) and turn it into a tcl list. + set IPs [list] + foreach ip [split [ad_parameter -package_id [ds_instance_id] EnabledIPs acs-developer-support *] { ,}] { + if {[string equal $ip "*"]} { + # a star means anything will match so just use the * instead + set IPs "*" + break + } elseif {![empty_string_p $ip]} { + lappend IPs $ip + } + } + nsv_set ds_properties enabled_ips $IPs + + + nsv_set ds_properties database_enabled_p [ad_parameter -package_id [ds_instance_id] DatabaseEnabledP developer-support 0] ds_set_user_switching_enabled [ad_parameter -package_id [ds_instance_id] UserSwitchingEnabledP acs-developer-support 0] } Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 12 Feb 2003 16:32:43 -0000 1.11 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 17 May 2003 09:45:46 -0000 1.12 @@ -53,9 +53,6 @@ ad_proc ds_collection_enabled_p {} { Returns whether we're collecting information about this request } { - if { ![ds_enabled_p] } { - return 0 - } global ad_conn if { ![info exists ad_conn(request)] } { return 0 @@ -71,18 +68,13 @@ ad_proc ds_user_switching_enabled_p {} { Returns whether user-switching is enabled. } { - if { ![ds_enabled_p] } { - return 0 - } - return [nsv_get ds_properties user_switching_enabled_p] + return [expr {[nsv_exists ds_properties user_switching_enabled_p] && + [nsv_get ds_properties user_switching_enabled_p]}] } ad_proc ds_database_enabled_p {} { Returns true if developer-support database facilities are enabled. } { - if { ![ds_enabled_p] } { - return 0 - } return [nsv_get ds_properties database_enabled_p] } @@ -152,7 +144,7 @@ } } - if { [ad_parameter -package_id [ds_instance_id] ShowCommentsInlineP "developer-support" 0] } { + if { [ad_parameter -package_id [ds_instance_id] ShowCommentsInlineP acs-developer-support 0] } { if { [nsv_exists ds_request "$ad_conn(request).comment"] } { append out "
" foreach comment [nsv_get ds_request "$ad_conn(request).comment"] { @@ -179,7 +171,7 @@ ds_replace_get_user_procs [ds_user_switching_enabled_p] ds_add start [ns_time] - ds_add conn startclicks [clock clicks] + ds_add conn startclicks [ad_conn start_clicks] for { set i 0 } { $i < [ns_set size [ad_conn headers]] } { incr i } { ds_add headers [ns_set key [ad_conn headers] $i] [ns_set value [ad_conn headers] $i] } @@ -191,43 +183,48 @@ proc_doc ds_collect_db_call { db command statement_name sql start_time errno error } { if { [ds_enabled_p] && [ds_collection_enabled_p] && [ds_database_enabled_p] } { + set bound_sql $sql - set bound_sql $sql + # It is very useful to be able to see the bind variable values displayed in the + # ds output. For postgresql we have a way of doing this with the proc db_bind_var_substitution + # but this proc does not work for Oracle + if { [string equal [db_type] "postgresql"] } { + upvar bind bind + set errno [catch { + if { [info exists bind] && [llength $bind] != 0 } { + if { [llength $bind] == 1 } { + set bind_vars [list] + set len [ns_set size $bind] + for {set i 0} {$i < $len} {incr i} { + lappend bind_vars [ns_set key $bind $i] \ + [ns_set value $bind $i] + } + set bound_sql [db_bind_var_substitution $sql $bind_vars] + } else { + set bound_sql [db_bind_var_substitution $sql $bind] + } + } else { + set bound_sql [uplevel 4 [list db_bind_var_substitution $sql]] + } + } error] - # It is very useful to be able to see the bind variable values displayed in the - # ds output. For postgresql we have a way of doing this with the proc db_bind_var_substitution - # but this proc does not work for Oracle - if { [string equal [db_type] "postgresql"] } { - upvar bind bind - set errno [catch { - if { [info exists bind] && [llength $bind] != 0 } { - if { [llength $bind] == 1 } { - set bind_vars [list] - set len [ns_set size $bind] - for {set i 0} {$i < $len} {incr i} { - lappend bind_vars [ns_set key $bind $i] \ - [ns_set value $bind $i] - } - set bound_sql [db_bind_var_substitution $sql $bind_vars] - } else { - set bound_sql [db_bind_var_substitution $sql $bind] - } - } else { - set bound_sql [uplevel 4 [list db_bind_var_substitution $sql]] + if { $errno } { + ns_log Error "ds_collect_db_call: $error" } - } error] + } - if { $errno } { - ns_log Error "ds_collect_db_call: $error" - } - } - - ds_add db $db $command $statement_name $bound_sql $start_time [clock clicks] $errno $error + ds_add db $db $command $statement_name $bound_sql $start_time [clock clicks] $errno $error } } proc_doc ds_add { name args } { Sets a developer-support property for the current request. Should never be used except by elements of the request processor (e.g., security filters or abstract URLs). } { - if { [ds_enabled_p] } { + + if { [ds_enabled_p] && [ds_collection_enabled_p] } { + if { [catch { nsv_exists ds_request . }] } { + ns_log "Warning" "ds_request NSVs not initialized" + return + } + global ad_conn if { ![info exists ad_conn(request)] } { set ad_conn(request) [nsv_incr rp_properties request_count] @@ -238,37 +235,40 @@ proc_doc ds_comment { value } { Adds a comment to the developer-support information for the current request. } { - if { [ds_enabled_p] } { - ds_add comment $value - } + if { [ds_enabled_p] } { + ds_add comment $value + } } proc ds_sweep_data {} { - if { [ds_enabled_p] } { - set now [ns_time] - set lifetime [ad_parameter -package_id [ds_instance_id] DataLifetime "developer-support" 900] - - # kill_requests is an array of request numbers to kill - array set kill_requests [list] - - set names [nsv_array names ds_request] - foreach name $names { - if { [regexp {^([0-9]+)\.start$} $name "" request] && \ - $now - [lindex [nsv_get ds_request $name] 0] > $lifetime } { - set kill_requests($request) 1 + set now [ns_time] + set lifetime [ad_parameter -package_id [ds_instance_id] DataLifetime acs-developer-support 900] + + # Find the last request before the DataLifetime cutoff + + set names [nsv_array names ds_request] + set max_request 0 + foreach name $names { + if { [regexp {^([0-9]+)\.start$} $name match request] + && $now - [lindex [nsv_get ds_request $name] 0] > $lifetime } { + if {[expr {$request > $max_request}]} { + set max_request $request } } - set kill_count 0 - foreach name $names { - if { [regexp {^([0-9]+)\.} $name "" request] && \ - [info exists kill_requests($request)] } { - incr kill_count - nsv_unset ds_request $name - } - } - - ns_log "Notice" "Swept developer support information for [array size kill_requests] requests ($kill_count nsv elements)" } + + # kill any request older than last request. + + set kill_count 0 + foreach name $names { + if { [regexp {^([0-9]+)\.} $name "" request] + && [expr {$request <= $max_request}] } { + incr kill_count + nsv_unset ds_request $name + } + } + + ns_log "Notice" "Swept developer support information for [array size kill_requests] requests ($kill_count nsv elements)" } proc_doc ds_trace_filter { conn args why } { Adds developer-support information about the end of sessions.} { Index: openacs-4/packages/acs-developer-support/www/request-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-developer-support/www/request-info.tcl 7 Jul 2002 12:11:38 -0000 1.3 +++ openacs-4/packages/acs-developer-support/www/request-info.tcl 17 May 2003 09:46:09 -0000 1.4 @@ -32,7 +32,7 @@
-
Request Start Time: [ns_fmttime [lindex $property(start) 0]]\n" +
Request Start Time: [clock format [lindex $property(start) 0] -format "%Y-%m-%d %H:%M:%S"]\n" } else { doc_body_append "The information for this request is gone - either the server has been restarted, or the request is more than [ad_parameter DeveloperSupportLifetime "" 900] seconds old. @@ -66,7 +66,7 @@ set value "[format "%.f" [expr { ($conn(endclicks) - $conn(startclicks)) / 1000 }]] ms" } end { - set value [ns_fmttime $conn($key)] + set value [clock format $conn($key) -format "%Y-%m-%d %H:%M:%S" ] } user_id { if { [db_0or1row user_info " Index: openacs-4/packages/acs-events/acs-events.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/acs-events.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-events/acs-events.info 30 Nov 2002 17:18:19 -0000 1.6 +++ openacs-4/packages/acs-events/acs-events.info 17 May 2003 09:46:30 -0000 1.7 @@ -19,40 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql 13 Aug 2002 19:03:33 -0000 1.5 +++ openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql 17 May 2003 09:46:57 -0000 1.6 @@ -451,7 +451,7 @@ integer, -- acs_events.activity_id%TYPE, integer, -- acs_events.recurrence_id%TYPE, varchar, -- acs_object_types.object_type%TYPE, - timestamp, -- acs_objects.creation_date%TYPE, + timestamptz, -- acs_objects.creation_date%TYPE, integer, -- acs_objects.creation_user%TYPE, varchar, -- acs_objects.creation_ip%TYPE, integer -- acs_objects.context_id%TYPE, @@ -741,16 +741,16 @@ create function acs_event__recurrence_timespan_edit ( integer, - timestamp, - timestamp + timestamptz, + timestamptz ) returns integer as ' DECLARE p_event_id alias for $1; p_start_date alias for $2; p_end_date alias for $3; v_timespan RECORD; - v_one_start_date timestamp; - v_one_end_date timestamp; + v_one_start_date timestamptz; + v_one_end_date timestamptz; BEGIN -- get the initial offsets select start_date, @@ -1064,7 +1064,7 @@ -- @return 0 (procedure dummy) -- integer, -- acs_events.event_id%TYPE, - timestamp -- default null + timestamptz -- default null ) returns integer as ' declare @@ -1076,14 +1076,14 @@ v_interval_name recurrence_interval_types.interval_name%TYPE; v_n_intervals recurrences.every_nth_interval%TYPE; v_days_of_week recurrences.days_of_week%TYPE; - v_last_date_done timestamp; - v_stop_date timestamp; - v_start_date timestamp; - v_event_date timestamp; + v_last_date_done timestamptz; + v_stop_date timestamptz; + v_start_date timestamptz; + v_event_date timestamptz; v_diff integer; - v_current_date timestamp; - v_last_day timestamp; - v_week_date timestamp; + v_current_date timestamptz; + v_last_day timestamptz; + v_week_date timestamptz; v_instance_count integer; v_days_length integer; v_days_index integer; Index: openacs-4/packages/acs-events/sql/postgresql/activity-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/activity-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-events/sql/postgresql/activity-create.sql 8 Mar 2002 22:30:11 -0000 1.2 +++ openacs-4/packages/acs-events/sql/postgresql/activity-create.sql 17 May 2003 09:46:57 -0000 1.3 @@ -173,7 +173,7 @@ boolean, -- in acs_activities.html_p%TYPE text, -- in acs_activities.status_summary%TYPE varchar, -- in acs_object_types.object_type%TYPE - timestamp, -- in acs_objects.creation_date%TYPE + timestamptz, -- in acs_objects.creation_date%TYPE integer, -- in acs_objects.creation_user%TYPE varchar, -- in acs_objects.creation_ip%TYPE integer -- in acs_objects.context_id%TYPE Index: openacs-4/packages/acs-events/sql/postgresql/oracle-compat-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/oracle-compat-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-events/sql/postgresql/oracle-compat-create.sql 21 Dec 2002 22:32:10 -0000 1.3 +++ openacs-4/packages/acs-events/sql/postgresql/oracle-compat-create.sql 17 May 2003 09:46:57 -0000 1.4 @@ -101,10 +101,10 @@ -- -- @return The date of the next weekday that is later than somedate -- - timestamp, -- somedate + timestamptz, -- somedate varchar -- weekday ) -returns timestamp as ' +returns timestamptz as ' declare next_day__somedate alias for $1; next_day__weekday alias for $2; @@ -143,10 +143,10 @@ -- -- @return The date plus n_months full months -- - timestamp, + timestamptz, integer ) -returns timestamp as ' +returns timestamptz as ' declare add_months__somedate alias for $1; add_months__n_months alias for $2; @@ -167,15 +167,15 @@ -- -- @return The last day of the month containing somedate -- - timestamp + timestamptz ) -returns timestamp as ' +returns timestamptz as ' declare last_day__somedate alias for $1; v_month integer; v_targetmonth integer; - v_date timestamp; - v_targetdate timestamp; + v_date timestamptz; + v_targetdate timestamptz; begin -- Initial values Index: openacs-4/packages/acs-events/sql/postgresql/oracle-compat-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/oracle-compat-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-events/sql/postgresql/oracle-compat-drop.sql 13 Jul 2001 02:48:51 -0000 1.1 +++ openacs-4/packages/acs-events/sql/postgresql/oracle-compat-drop.sql 17 May 2003 09:46:57 -0000 1.2 @@ -8,8 +8,8 @@ -- $Id$ drop function dow_to_int(varchar); -drop function next_day(timestamp,varchar); -drop function add_months(timestamp,integer); -drop function last_day(timestamp); +drop function next_day(timestamptz,varchar); +drop function add_months(timestamptz,integer); +drop function last_day(timestamptz); drop function to_interval(integer,varchar); Index: openacs-4/packages/acs-events/sql/postgresql/recurrence-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/recurrence-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-events/sql/postgresql/recurrence-create.sql 13 Jul 2001 02:51:01 -0000 1.1 +++ openacs-4/packages/acs-events/sql/postgresql/recurrence-create.sql 17 May 2003 09:46:57 -0000 1.2 @@ -65,7 +65,7 @@ -- Indicates when this event should stop recurring. Null indicates -- recur indefinitely. -- - recur_until timestamp, + recur_until timestamptz, -- -- Recurring events can be only partially populated if fully populating -- the events would require inserting too many instances. This @@ -75,7 +75,7 @@ -- then this column will always be prior to or the same as recur_until. -- This column will be null until some recurrences have been added. -- - db_populated_until timestamp, + db_populated_until timestamptz, -- -- This column holds the name of a PL/SQL function that will be called -- to generate dates of recurrences if interval_type is 'custom' @@ -140,7 +140,7 @@ varchar, -- recurrence_interval_types.interval_name%TYPE, integer, -- recurrences.every_nth_interval%TYPE, varchar, -- recurrences.days_of_week%TYPE default null, - timestamp, -- recurrences.recur_until%TYPE default null, + timestamptz, -- recurrences.recur_until%TYPE default null, varchar -- recurrences.custom_func%TYPE default null ) returns integer as ' -- recurrences.recurrence_id%TYPE Index: openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql 13 Jul 2001 03:13:29 -0000 1.1 +++ openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql 17 May 2003 09:46:57 -0000 1.2 @@ -24,8 +24,8 @@ interval_id integer constraint time_intervals_pk primary key, - start_date timestamp, - end_date timestamp, + start_date timestamptz, + end_date timestamptz, constraint time_interval_date_order_ck check(start_date <= end_date) ); @@ -59,8 +59,8 @@ -- -- @return id of new time interval -- - timestamp, -- time_intervals.start_date%TYPE default null, - timestamp -- time_intervals.end_date%TYPE default null + timestamptz, -- time_intervals.start_date%TYPE default null, + timestamptz -- time_intervals.end_date%TYPE default null ) returns integer as ' -- time_intervals.interval_id%TYPE declare @@ -120,8 +120,8 @@ -- @return 0 (procedure dummy) -- integer, -- time_intervals.interval_id%TYPE, - timestamp, -- time_intervals.start_date%TYPE default null, - timestamp -- time_intervals.end_date%TYPE default null + timestamptz, -- time_intervals.start_date%TYPE default null, + timestamptz -- time_intervals.end_date%TYPE default null ) returns integer as ' declare @@ -252,10 +252,10 @@ declare overlaps_p__interval_id_1 alias for $1; overlaps_p__interval_id_2 alias for $2; - v_start_1 timestamp; - v_start_2 timestamp; - v_end_1 timestamp; - v_end_2 timestamp; + v_start_1 timestamptz; + v_start_2 timestamptz; + v_end_1 timestamptz; + v_end_2 timestamptz; begin -- Pull out the start and end dates and call the main overlaps_p. select start_date, end_date @@ -291,8 +291,8 @@ -- @return true if the interval bounded by start_date through end_date, false otherwise. -- integer, -- time_intervals.interval_id%TYPE, - timestamp, -- time_intervals.start_date%TYPE default null, - timestamp -- time_intervals.end_date%TYPE default null + timestamptz, -- time_intervals.start_date%TYPE default null, + timestamptz -- time_intervals.end_date%TYPE default null ) returns boolean as ' declare @@ -331,10 +331,10 @@ -- -- @return true if intervals overlap, otherwise false. -- - timestamp, -- time_intervals.start_date%TYPE, - timestamp, -- time_intervals.end_date%TYPE, - timestamp, -- time_intervals.start_date%TYPE, - timestamp -- time_intervals.end_date%TYPE + timestamptz, -- time_intervals.start_date%TYPE, + timestamptz, -- time_intervals.end_date%TYPE, + timestamptz, -- time_intervals.start_date%TYPE, + timestamptz -- time_intervals.end_date%TYPE ) returns boolean as ' declare @@ -692,8 +692,8 @@ -- -- @return Id of new timespan -- - timestamp, -- time_intervals.start_date%TYPE default null, - timestamp -- time_intervals.end_date%TYPE default null + timestamptz, -- time_intervals.start_date%TYPE default null, + timestamptz -- time_intervals.end_date%TYPE default null ) returns integer as ' -- timespans.timespan_id%TYPE declare @@ -801,8 +801,8 @@ -- @return Id of interval being joined -- integer, -- timespans.timespan_id%TYPE, - timestamp, -- time_intervals.start_date%TYPE - timestamp -- time_intervals.end_date%TYPE + timestamptz, -- time_intervals.start_date%TYPE + timestamptz -- time_intervals.end_date%TYPE ) returns integer as ' -- time_intervals.interval_id%TYPE declare @@ -984,8 +984,8 @@ declare overlaps_interval_p__timespan_id alias for $1; overlaps_interval_p__interval_id alias for $2; -- default null - v_start_date timestamp; - v_end_date timestamp; + v_start_date timestamptz; + v_end_date timestamptz; begin select start_date, end_date into v_start_date, v_end_date @@ -1057,8 +1057,8 @@ -- @return true if interval with start and end dates overlaps with second timespan, otherwise false. -- integer, -- timespans.timespan_id%TYPE, - timestamp, -- time_intervals.start_date%TYPE - timestamp -- time_intervals.end_date%TYPE + timestamptz, -- time_intervals.start_date%TYPE + timestamptz -- time_intervals.end_date%TYPE ) returns boolean as ' declare Index: openacs-4/packages/acs-events/sql/postgresql/test/acs-events-test.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/test/acs-events-test.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-events/sql/postgresql/test/acs-events-test.sql 21 Dec 2002 22:31:46 -0000 1.3 +++ openacs-4/packages/acs-events/sql/postgresql/test/acs-events-test.sql 17 May 2003 09:47:26 -0000 1.4 @@ -60,8 +60,8 @@ end;' language 'plpgsql'; -- This is an example of a simple custom recurrence function: recur every three days -create function recur_every3(timestamp with time zone,integer) -returns timestamp as ' +create function recur_every3(timestamptz,integer) +returns timestamptz as ' declare recur_every3__date alias for $1; recur_every3__interval alias for $2; @@ -79,8 +79,8 @@ create function ut__insert_instances() returns integer as ' declare - date1 timestamp := ''2000-03-23 13:00''; - date2 timestamp := ''2000-03-23 14:00''; + date1 timestamptz := ''2000-03-23 13:00''; + date2 timestamptz := ''2000-03-23 14:00''; insert_instances__timespan_id acs_events.timespan_id%TYPE; insert_instances__activity_id acs_events.activity_id%TYPE; insert_instances__recurrence_id acs_events.recurrence_id%TYPE; @@ -281,7 +281,7 @@ -- Insert instances PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2000-06-02'' + timestamptz ''2000-06-02'' ); -- Test for instances @@ -340,8 +340,8 @@ -- Another test of weekly recurrence - insert_instances__timespan_id := timespan__new(timestamp ''2001-10-21 09:00:00'', - timestamp ''2001-10-23 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-10-21 09:00:00'', + timestamptz ''2001-10-23 10:00:00''); -- Check month by date (recur for the same date of the month specified in time interval) insert_instances__recurrence_id := recurrence__new(''week'', @@ -360,7 +360,7 @@ PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2001-12-25'' + timestamptz ''2001-12-25'' ); -- There should be 13 instances of the weekly event @@ -386,8 +386,8 @@ -- Test month_by_date recurrence - insert_instances__timespan_id := timespan__new(timestamp ''2001-03-21 09:00:00'', - timestamp ''2001-03-23 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-03-21 09:00:00'', + timestamptz ''2001-03-23 10:00:00''); -- Check month by date (recur for the same date of the month specified in time interval) insert_instances__recurrence_id := recurrence__new(''month_by_date'', @@ -406,7 +406,7 @@ PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2001-04-25 00:00:00'' + timestamptz ''2001-04-25 00:00:00'' ); -- There should be two instances (including the original), even if the cut-off date is between @@ -430,8 +430,8 @@ end loop; -- Test month_by_date recurrence - insert_instances__timespan_id := timespan__new(timestamp ''2001-10-21 09:00:00'', - timestamp ''2001-10-23 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-10-21 09:00:00'', + timestamptz ''2001-10-23 10:00:00''); -- Check month by date (recur for the same date of the month specified in time interval) insert_instances__recurrence_id := recurrence__new(''month_by_date'', @@ -450,7 +450,7 @@ PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2002-04-25 00:00:00'' + timestamptz ''2002-04-25 00:00:00'' ); -- There should be four instances (including the original), even if the cut-off date is between @@ -480,8 +480,8 @@ -- Check another recurrence type (daily recurrence) -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-03-26 09:00:00'', - timestamp ''2001-03-26 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-03-26 09:00:00'', + timestamptz ''2001-03-26 10:00:00''); -- Check month by date (recur every day, skip every second interval) insert_instances__recurrence_id := recurrence__new(''day'', @@ -501,7 +501,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2001-04-05 00:00:00'' + timestamptz ''2001-04-05 00:00:00'' ); -- There should be six instances (including the original) @@ -530,8 +530,8 @@ -- Check another recurrence type (daily recurrence) -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-10-26 09:00:00'', - timestamp ''2001-10-26 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-10-26 09:00:00'', + timestamptz ''2001-10-26 10:00:00''); -- Check month by date (recur every day, skip every second interval) insert_instances__recurrence_id := recurrence__new(''day'', @@ -551,7 +551,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2001-11-05 00:00:00'' + timestamptz ''2001-11-05 00:00:00'' ); -- There should be five instances (including the original) @@ -580,8 +580,8 @@ -- Check another recurrence type (same date every year) -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-04-01 09:00:00'', - timestamp ''2001-04-01 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-04-01 09:00:00'', + timestamptz ''2001-04-01 10:00:00''); -- Check month by date (recur every day, skip every second interval) insert_instances__recurrence_id := recurrence__new(''year'', @@ -601,7 +601,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2002-04-05 00:00:00'' + timestamptz ''2002-04-05 00:00:00'' ); -- There should be two instance (including the original). @@ -623,8 +623,8 @@ -- Check another recurrence type (same date every year) -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-04-03 09:00:00'', - timestamp ''2001-04-03 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-04-03 09:00:00'', + timestamptz ''2001-04-03 10:00:00''); -- Check month by date (recur every day, skip every second interval) insert_instances__recurrence_id := recurrence__new(''year'', @@ -644,7 +644,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2002-04-05 00:00:00'' + timestamptz ''2002-04-05 00:00:00'' ); -- There should be two instance (including the original). @@ -667,8 +667,8 @@ -- Check another recurrence type (same date every year) -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-10-28 09:00:00'', - timestamp ''2001-10-28 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-10-28 09:00:00'', + timestamptz ''2001-10-28 10:00:00''); -- Check month by date (recur every day, skip every second interval) insert_instances__recurrence_id := recurrence__new(''year'', @@ -688,7 +688,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2002-10-30 00:00:00'' + timestamptz ''2002-10-30 00:00:00'' ); -- There should be two instance (including the original). @@ -710,8 +710,8 @@ -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-02-06 09:00:00'', - timestamp ''2001-02-07 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-02-06 09:00:00'', + timestamptz ''2001-02-07 10:00:00''); insert_instances__recurrence_id := recurrence__new(''last_of_month'', 1, @@ -730,7 +730,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2001-12-10 00:00:00'' + timestamptz ''2001-12-10 00:00:00'' ); -- There should be three instances (including the original). @@ -756,8 +756,8 @@ -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-08-06 09:00:00'', - timestamp ''2001-08-07 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-08-06 09:00:00'', + timestamptz ''2001-08-07 10:00:00''); insert_instances__recurrence_id := recurrence__new(''last_of_month'', 1, @@ -776,7 +776,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2002-05-20 00:00:00'' + timestamptz ''2002-05-20 00:00:00'' ); -- There should be three instances (including the original). @@ -802,8 +802,8 @@ ---------------------------------------------------------------------------------------------------------- -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-08-06 09:00:00'', - timestamp ''2001-08-07 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-08-06 09:00:00'', + timestamptz ''2001-08-07 10:00:00''); insert_instances__recurrence_id := recurrence__new(''custom'', 1, @@ -822,7 +822,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2001-08-30 00:00:00'' + timestamptz ''2001-08-30 00:00:00'' ); -- There should be three instances (including the original). @@ -849,8 +849,8 @@ ---------------------------------------------------------------------------------------------------------- -- First, we need a new timespan,recurrence and activity - insert_instances__timespan_id := timespan__new(timestamp ''2001-02-06 09:00:00'', - timestamp ''2001-02-07 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-02-06 09:00:00'', + timestamptz ''2001-02-07 10:00:00''); insert_instances__recurrence_id := recurrence__new(''month_by_day'', 1, @@ -869,7 +869,7 @@ -- Cut-off date should have no effect PERFORM acs_event__insert_instances (insert_instances__event_id, - timestamp ''2001-12-20 00:00:00'' + timestamptz ''2001-12-20 00:00:00'' ); -- There should be three instances (including the original). @@ -914,8 +914,8 @@ ---------------------------------------------------------------------------------------------------------- -- Timespan to shift - insert_instances__timespan_id := timespan__new(timestamp ''2001-02-06 09:00:00'', - timestamp ''2001-02-07 10:00:00''); + insert_instances__timespan_id := timespan__new(timestamptz ''2001-02-06 09:00:00'', + timestamptz ''2001-02-07 10:00:00''); -- Insert one recurrence so that recurrence__delete will have something to delete (since recurrences Index: openacs-4/packages/acs-events/sql/postgresql/test/time_intervals-test.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/test/time_intervals-test.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-events/sql/postgresql/test/time_intervals-test.sql 13 Jul 2001 03:16:32 -0000 1.1 +++ openacs-4/packages/acs-events/sql/postgresql/test/time_intervals-test.sql 17 May 2003 09:47:26 -0000 1.2 @@ -67,8 +67,8 @@ -- We test the creation of a time interval entry create function ut__new( - timestamp, - timestamp + timestamptz, + timestamptz ) returns integer as ' declare @@ -135,8 +135,8 @@ create function ut__edit ( integer, -- time_intervals.interval_id%TYPE; - timestamp, - timestamp + timestamptz, + timestamptz ) returns integer as ' declare @@ -209,8 +209,8 @@ integer, -- in time_intervals.interval_id%TYPE; integer, integer, - timestamp, - timestamp + timestamptz, + timestamptz ) returns integer as ' declare @@ -268,8 +268,8 @@ create function ut__overlaps_p( varchar, integer, -- time_intervals.interval_id%TYPE; - timestamp, -- time_intervals.start_date%TYPE; - timestamp, -- time_intervals.end_date%TYPE; + timestamptz, -- time_intervals.start_date%TYPE; + timestamptz, -- time_intervals.end_date%TYPE; boolean ) returns integer as ' @@ -294,10 +294,10 @@ create function ut__overlaps_p( varchar, - timestamp, - timestamp, - timestamp, -- time_intervals.start_date%TYPE; - timestamp, -- time_intervals.end_date%TYPE; + timestamptz, + timestamptz, + timestamptz, -- time_intervals.start_date%TYPE; + timestamptz, -- time_intervals.end_date%TYPE; boolean ) returns integer as ' @@ -372,46 +372,46 @@ raise notice ''Regression test, part 1 (creates and edits).''; -- We first check if the creation of time intervals work - v_interval_id := ut__new(timestamp ''2001-01-01'',timestamp ''2001-01-02''); + v_interval_id := ut__new(timestamptz ''2001-01-01'',timestamptz ''2001-01-02''); -- Try to edit, putting new values for start date and end dates - PERFORM ut__edit(v_interval_id,timestamp ''2001-01-02'',timestamp ''2001-01-30''); + PERFORM ut__edit(v_interval_id,timestamptz ''2001-01-02'',timestamptz ''2001-01-30''); -- Edit, but this time, change only the start date - PERFORM ut__edit(v_interval_id,timestamp ''2001-01-07'',null); + PERFORM ut__edit(v_interval_id,timestamptz ''2001-01-07'',null); -- Edit, but this time, change only the end date - PERFORM ut__edit(v_interval_id,null,timestamp ''2001-01-08''); + PERFORM ut__edit(v_interval_id,null,timestamptz ''2001-01-08''); -- We now test equality of (identical) intervals PERFORM ut__eq(''Equal (same) intervals'',v_interval_id,v_interval_id,true); -- Create another interval for comparison - v_interval_id_ck := ut__new(timestamp ''2001-01-07'',timestamp ''2001-01-08''); + v_interval_id_ck := ut__new(timestamptz ''2001-01-07'',timestamptz ''2001-01-08''); -- We now test equality of (nonidentical) intervals PERFORM ut__eq(''Equal (distinct) intervals'',v_interval_id,v_interval_id_ck,true); -- Shift the second interval start date by one day, the end date by two days - PERFORM ut__shift(v_interval_id_ck,1,2,timestamp ''2001-01-08'', timestamp ''2001-01-10''); + PERFORM ut__shift(v_interval_id_ck,1,2,timestamptz ''2001-01-08'', timestamptz ''2001-01-10''); -- Now test inequality of time intervals PERFORM ut__eq(''Unequal (distinct) intervals'',v_interval_id,v_interval_id_ck,false); -- Shift the second interval start date BACK by one day, the end date same - PERFORM ut__shift(v_interval_id_ck,-1,0,timestamp ''2001-01-07'', timestamp ''2001-01-10''); + PERFORM ut__shift(v_interval_id_ck,-1,0,timestamptz ''2001-01-07'', timestamptz ''2001-01-10''); -- Now test inequality of time intervals PERFORM ut__eq(''Unequal (distinct) intervals: start date equal'',v_interval_id,v_interval_id_ck,false); -- Shift the second interval, start date same, but the end date BACK by two days - PERFORM ut__shift(v_interval_id_ck,0,-2,timestamp ''2001-01-07'', timestamp ''2001-01-08''); + PERFORM ut__shift(v_interval_id_ck,0,-2,timestamptz ''2001-01-07'', timestamptz ''2001-01-08''); -- Should be equal again PERFORM ut__eq(''Equal again, (distinct) intervals'',v_interval_id,v_interval_id_ck,true); -- For fun, shift start date BACK by two days, the end date BACK by 1 day - PERFORM ut__shift(v_interval_id_ck,-2,-1,timestamp ''2001-01-05'', timestamp ''2001-01-07''); + PERFORM ut__shift(v_interval_id_ck,-2,-1,timestamptz ''2001-01-05'', timestamptz ''2001-01-07''); -- Should be unequal again PERFORM ut__eq(''For fun, unequal (distinct) intervals'',v_interval_id,v_interval_id_ck,false); @@ -422,7 +422,7 @@ PERFORM ut__overlaps_p(''Overlapping intervals'',v_interval_id,v_interval_id_ck,true); -- Ok, shift the dtart and end dates by one so that intervals do not overlap - PERFORM ut__shift(v_interval_id_ck,-1,-1,timestamp ''2001-01-04'', timestamp ''2001-01-06''); + PERFORM ut__shift(v_interval_id_ck,-1,-1,timestamptz ''2001-01-04'', timestamptz ''2001-01-06''); -- They should not overlap now. PERFORM ut__overlaps_p(''Non-overlapping intervals'',v_interval_id,v_interval_id_ck,false); @@ -432,84 +432,84 @@ -- Note that we are comparing with 2001-01-07 through 2001-01-08 PERFORM ut__overlaps_p(''Overlapping intervals'', v_interval_id, - timestamp ''2001-01-06'', - timestamp ''2001-01-09'', + timestamptz ''2001-01-06'', + timestamptz ''2001-01-09'', true); -- How about an interval next month? PERFORM ut__overlaps_p(''Non-overlapping intervals'', v_interval_id, - timestamp ''2001-02-06'', - timestamp ''2001-02-09'', + timestamptz ''2001-02-06'', + timestamptz ''2001-02-09'', false); -- Try a null starting interval PERFORM ut__overlaps_p(''Overlapping intervals (null start)'', v_interval_id, null, - timestamp ''2001-01-09'', + timestamptz ''2001-01-09'', true); -- Try a null starting interval PERFORM ut__overlaps_p(''Overlapping intervals (null end)'', v_interval_id, - timestamp ''2001-01-06'', + timestamptz ''2001-01-06'', null, true); -- What if the interval is not an allowable interval? -- By definition, any interval should be non-overlapping with a non-existent interval PERFORM ut__overlaps_p(''Non-overlapping intervals (non-allowed interval, outside month)'', v_interval_id, - timestamp ''2001-02-09'', - timestamp ''2001-02-06'', + timestamptz ''2001-02-09'', + timestamptz ''2001-02-06'', false); -- What if the interval is not an allowable interval? -- By definition, any interval should be non-overlapping with a non-existent interval PERFORM ut__overlaps_p(''Non-overlapping intervals (non-allowed interval, in month)'', v_interval_id, - timestamp ''2001-01-09'', - timestamp ''2001-01-06'', + timestamptz ''2001-01-09'', + timestamptz ''2001-01-06'', false); -- Yet another overloaded definition PERFORM ut__overlaps_p(''Overlapping intervals (not in time_intervals)'', - timestamp ''2001-01-06'', - timestamp ''2001-01-09'', - timestamp ''2001-01-07'', - timestamp ''2001-01-08'', + timestamptz ''2001-01-06'', + timestamptz ''2001-01-09'', + timestamptz ''2001-01-07'', + timestamptz ''2001-01-08'', true); -- Yet another overloaded definition PERFORM ut__overlaps_p(''Overlapping intervals (not in time_intervals)'', - timestamp ''2001-01-06'', - timestamp ''2001-01-09'', - timestamp ''2001-01-09'', - timestamp ''2001-01-10'', + timestamptz ''2001-01-06'', + timestamptz ''2001-01-09'', + timestamptz ''2001-01-09'', + timestamptz ''2001-01-10'', true); -- Yet another overloaded definition PERFORM ut__overlaps_p(''Overlapping intervals (not in time_intervals)'', - timestamp ''2001-01-06'', - timestamp ''2001-01-09'', + timestamptz ''2001-01-06'', + timestamptz ''2001-01-09'', null, - timestamp ''2001-01-10'', + timestamptz ''2001-01-10'', true); PERFORM ut__overlaps_p(''Overlapping intervals (not in time_intervals)'', - timestamp ''2001-01-06'', - timestamp ''2001-01-09'', - timestamp ''2001-01-10'', + timestamptz ''2001-01-06'', + timestamptz ''2001-01-09'', + timestamptz ''2001-01-10'', null, false); -- Yet another overloaded definition PERFORM ut__overlaps_p(''Non-overlapping intervals (not in time_intervals)'', - timestamp ''2001-02-06'', - timestamp ''2001-02-09'', - timestamp ''2001-01-07'', - timestamp ''2001-01-08'', + timestamptz ''2001-02-06'', + timestamptz ''2001-02-09'', + timestamptz ''2001-01-07'', + timestamptz ''2001-01-08'', false); Index: openacs-4/packages/acs-events/sql/postgresql/test/timespan-test.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/test/timespan-test.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-events/sql/postgresql/test/timespan-test.sql 13 Jul 2001 03:16:32 -0000 1.1 +++ openacs-4/packages/acs-events/sql/postgresql/test/timespan-test.sql 17 May 2003 09:47:26 -0000 1.2 @@ -117,8 +117,8 @@ -- We test the creation of a time interval entry create function ut__new( - timestamp, - timestamp + timestamptz, + timestamptz ) returns integer as ' declare @@ -261,8 +261,8 @@ create function ut__join( integer, -- timespans.timespan_id%TYPE; - timestamp, -- time_intervals.start_date%TYPE; - timestamp -- time_intervals.end_date%TYPE; + timestamptz, -- time_intervals.start_date%TYPE; + timestamptz -- time_intervals.end_date%TYPE; ) returns integer as ' declare @@ -404,8 +404,8 @@ create function ut__overlaps_p( integer, -- timespans.timespan_id%TYPE; - timestamp, -- time_intervals.start_date%TYPE; - timestamp, -- time_intervals.end_date%TYPE; + timestamptz, -- time_intervals.start_date%TYPE; + timestamptz, -- time_intervals.end_date%TYPE; boolean ) returns integer as ' @@ -462,14 +462,14 @@ raise notice ''Regression test, part 1 (creates and edits).''; -- First create an interval - v_interval_id := time_interval__new(timestamp ''2001-01-01'',timestamp ''2001-01-20''); + v_interval_id := time_interval__new(timestamptz ''2001-01-01'',timestamptz ''2001-01-20''); --Check if creation of timespans work by supplying an interval id to be copied PERFORM ut__new(v_interval_id); -- We first check if the creation of timespans work -- This should be equivalent to what we have above - v_timespan_id := ut__new(timestamp ''2001-01-25'',timestamp ''2001-02-02''); + v_timespan_id := ut__new(timestamptz ''2001-01-25'',timestamptz ''2001-02-02''); -- Test if timespan exists PERFORM ut__exists_p(v_timespan_id,true); @@ -494,20 +494,20 @@ PERFORM ut__overlaps_interval_p(v_timespan_id,v_interval_id,true); -- A new timespans - v_timespan_id := ut__new(timestamp ''2001-03-05'',timestamp ''2001-03-31''); - v_timespan_id_ck := ut__new(timestamp ''2001-06-05'',timestamp ''2001-06-30''); + v_timespan_id := ut__new(timestamptz ''2001-03-05'',timestamptz ''2001-03-31''); + v_timespan_id_ck := ut__new(timestamptz ''2001-06-05'',timestamptz ''2001-06-30''); -- These timespans should not overlap PERFORM ut__overlaps_p(v_timespan_id,v_timespan_id_ck,false); -- Check overlaps against these known dates - PERFORM ut__overlaps_p(v_timespan_id,timestamp ''2001-02-06'',timestamp ''2001-03-25'',true); - PERFORM ut__overlaps_p(v_timespan_id,timestamp ''2001-03-07'',timestamp ''2001-04-01'',true); - PERFORM ut__overlaps_p(v_timespan_id,timestamp ''2001-01-01'',timestamp ''2001-03-20'',true); - PERFORM ut__overlaps_p(v_timespan_id,timestamp ''2001-01-01'',null,true); - PERFORM ut__overlaps_p(v_timespan_id,null,timestamp ''2001-04-01'',true); - PERFORM ut__overlaps_p(v_timespan_id,timestamp ''2001-04-01'',timestamp ''2001-04-30'',false); - PERFORM ut__overlaps_p(v_timespan_id,timestamp ''2001-02-01'',timestamp ''2001-02-27'',false); + PERFORM ut__overlaps_p(v_timespan_id,timestamptz ''2001-02-06'',timestamptz ''2001-03-25'',true); + PERFORM ut__overlaps_p(v_timespan_id,timestamptz ''2001-03-07'',timestamptz ''2001-04-01'',true); + PERFORM ut__overlaps_p(v_timespan_id,timestamptz ''2001-01-01'',timestamptz ''2001-03-20'',true); + PERFORM ut__overlaps_p(v_timespan_id,timestamptz ''2001-01-01'',null,true); + PERFORM ut__overlaps_p(v_timespan_id,null,timestamptz ''2001-04-01'',true); + PERFORM ut__overlaps_p(v_timespan_id,timestamptz ''2001-04-01'',timestamptz ''2001-04-30'',false); + PERFORM ut__overlaps_p(v_timespan_id,timestamptz ''2001-02-01'',timestamptz ''2001-02-27'',false); -- Join the first interval with the second, making a copy @@ -520,7 +520,7 @@ PERFORM ut__overlaps_p(v_timespan_id,v_timespan_id_ck,true); -- Join an interval instead - PERFORM ut__join(v_timespan_id_ck,timestamp ''2001-12-01'',timestamp ''2001-12-31''); + PERFORM ut__join(v_timespan_id_ck,timestamptz ''2001-12-01'',timestamptz ''2001-12-31''); -- Copy a timespan (will only contain two) PERFORM ut__copy(v_timespan_id,interval ''0 days''); Index: openacs-4/packages/acs-events/sql/postgresql/test/utest-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/test/utest-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-events/sql/postgresql/test/utest-create.sql 13 Jul 2001 03:16:32 -0000 1.1 +++ openacs-4/packages/acs-events/sql/postgresql/test/utest-create.sql 17 May 2003 09:47:26 -0000 1.2 @@ -223,8 +223,8 @@ create function ut_assert__eq ( varchar, - timestamp, - timestamp, + timestamptz, + timestamptz, boolean, boolean ) @@ -255,8 +255,8 @@ -- Overload for calls with default values create function ut_assert__eq ( varchar, -- IN VARCHAR2, - timestamp, - timestamp + timestamptz, + timestamptz ) returns integer as ' declare Index: openacs-4/packages/acs-interface/acs-interface.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-interface/acs-interface.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-interface/acs-interface.info 16 Jan 2003 13:32:47 -0000 1.6 +++ openacs-4/packages/acs-interface/acs-interface.info 17 May 2003 09:47:49 -0000 1.7 @@ -17,7 +17,7 @@ Define interfaces for object types. Used by Site Wide Search. - + Index: openacs-4/packages/acs-lang/acs-lang.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v diff -u -r1.22 -r1.23 --- openacs-4/packages/acs-lang/acs-lang.info 26 Feb 2003 09:43:34 -0000 1.22 +++ openacs-4/packages/acs-lang/acs-lang.info 17 May 2003 09:48:12 -0000 1.23 @@ -24,10 +24,6 @@ - - - - Index: openacs-4/packages/acs-lang/tcl/locale-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/Attic/locale-procs-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/tcl/locale-procs-postgresql.xql 7 Oct 2002 14:32:46 -0000 1.3 +++ openacs-4/packages/acs-lang/tcl/locale-procs-postgresql.xql 17 May 2003 09:48:30 -0000 1.4 @@ -6,7 +6,7 @@ - select ( (current_time - timezone__local_to_utc (:system_timezone, current_time)) * 24 ) + select timezone__get_offset (timezone__get_id(:system_timezone), current_timestamp) Index: openacs-4/packages/acs-lang/tcl/localization-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/localization-procs.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/tcl/localization-procs.xql 21 Nov 2002 23:15:39 -0000 1.3 +++ openacs-4/packages/acs-lang/tcl/localization-procs.xql 17 May 2003 09:48:30 -0000 1.4 @@ -15,9 +15,7 @@ - - select distinct tz, gmt_offset from timezones order by tz - + select distinct tz, gmt_offset from timezones order by tz Index: openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info 23 Sep 2002 23:32:04 -0000 1.3 +++ openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info 17 May 2003 09:49:06 -0000 1.4 @@ -15,7 +15,7 @@ 2001-02-06 ArsDigita Corporation - + Index: openacs-4/packages/acs-ldap-authentication/sql/oracle/acs-ldap-authentication-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/sql/oracle/acs-ldap-authentication-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-ldap-authentication/sql/oracle/acs-ldap-authentication-create.sql 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/acs-ldap-authentication/sql/oracle/acs-ldap-authentication-create.sql 17 May 2003 09:49:55 -0000 1.2 @@ -26,7 +26,7 @@ attr_id := acs_attribute.create_attribute ( object_type => 'acs_object', - attribute_name => 'ldap dn', + attribute_name => 'ldap_dn', datatype => 'string', pretty_name => 'LDAP Distinguished Name (dn)', pretty_plural => 'LDAP Distinguished Names', Index: openacs-4/packages/acs-ldap-authentication/sql/oracle/acs-ldap-authentication-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/sql/oracle/acs-ldap-authentication-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-ldap-authentication/sql/oracle/acs-ldap-authentication-drop.sql 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/acs-ldap-authentication/sql/oracle/acs-ldap-authentication-drop.sql 17 May 2003 09:49:56 -0000 1.2 @@ -10,7 +10,7 @@ begin - acs_attribute.drop_attribute ('acs_object', 'ldap dn'); + acs_attribute.drop_attribute ('acs_object', 'ldap_dn'); delete from acs_object_type_tables where table_name = 'LDAP_ATTRIBUTES'; Index: openacs-4/packages/acs-mail/acs-mail.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/acs-mail.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-mail/acs-mail.info 17 Jan 2003 14:32:30 -0000 1.10 +++ openacs-4/packages/acs-mail/acs-mail.info 17 May 2003 09:50:29 -0000 1.11 @@ -7,7 +7,7 @@ t t - + oracle postgresql @@ -19,41 +19,10 @@ OpenACS Provides generic message services, with email sending. - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/acs-mail/sql/oracle/acs-mail-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/acs-mail-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-mail/sql/oracle/acs-mail-create.sql 13 Aug 2001 16:18:45 -0000 1.2 +++ openacs-4/packages/acs-mail/sql/oracle/acs-mail-create.sql 17 May 2003 09:51:08 -0000 1.3 @@ -196,6 +196,11 @@ references acs_objects on delete cascade ); +-- RI Indexes +create index acs_mail_bodies_item_id_idx ON acs_mail_bodies(content_item_id); +create index acs_mail_bodies_body_from_idx ON acs_mail_bodies(body_from); +create index acs_mail_bodies_body_reply_idx ON acs_mail_bodies(body_reply_to); + create table acs_mail_body_headers ( body_id integer constraint acs_mail_body_heads_body_id_fk @@ -231,8 +236,10 @@ constraint acs_mail_multipart_parts_pk primary key (multipart_id, sequence_number) ); +--RI Index +create index acs_mail_mpp_cr_item_id_idx ON acs_mail_multipart_parts(content_item_id); - -- Mail Links +-- Mail Links create table acs_mail_links ( mail_link_id integer @@ -244,7 +251,10 @@ constraint acs_mail_links_body_id_fk references acs_mail_bodies ); +--RI Index +create index acs_mail_links_body_id_idx ON acs_mail_links(body_id); + -- API ----------------------------------------------------------------- -- APIs for the datamodel in this file, separated out for future upgrades Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-mail/sql/oracle/upgrade/upgrade-4.6.1-4.6.2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-mail/sql/postgresql/acs-mail-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/postgresql/acs-mail-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-mail/sql/postgresql/acs-mail-create.sql 13 Aug 2001 17:28:19 -0000 1.3 +++ openacs-4/packages/acs-mail/sql/postgresql/acs-mail-create.sql 17 May 2003 09:52:12 -0000 1.4 @@ -176,7 +176,7 @@ body_from integer constraint acs_mail_bodies_body_from_fk references parties on delete set null, - body_date timestamp, + body_date timestamptz, header_message_id varchar(1000) constraint acs_mail_bodies_h_m_id_un unique @@ -199,6 +199,11 @@ references acs_objects on delete cascade ); +-- RI Indexes +create index acs_mail_bodies_item_id_idx ON acs_mail_bodies(content_item_id); +create index acs_mail_bodies_body_from_idx ON acs_mail_bodies(body_from); +create index acs_mail_bodies_body_reply_idx ON acs_mail_bodies(body_reply_to); + create table acs_mail_body_headers ( body_id integer constraint acs_mail_body_heads_body_id_fk @@ -237,8 +242,11 @@ primary key (multipart_id, sequence_number) ); - -- Mail Links +--RI Index +create index acs_mail_mpp_cr_item_id_idx ON acs_mail_multipart_parts(content_item_id); +-- Mail Links + create table acs_mail_links ( mail_link_id integer constraint acs_mail_links_ml_id_pk @@ -252,7 +260,10 @@ references acs_mail_bodies on delete cascade ); +-- RI Index +create index acs_mail_links_body_id_idx ON acs_mail_links(body_id); + -- API ----------------------------------------------------------------- -- APIs for the datamodel in this file, separated out for future upgrades Index: openacs-4/packages/acs-mail/sql/postgresql/acs-mail-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/postgresql/acs-mail-drop.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-mail/sql/postgresql/acs-mail-drop.sql 13 Aug 2001 17:29:54 -0000 1.2 +++ openacs-4/packages/acs-mail/sql/postgresql/acs-mail-drop.sql 17 May 2003 09:52:12 -0000 1.3 @@ -11,7 +11,7 @@ \i acs-mail-nt-drop.sql drop function acs_mail_queue_message__new (integer,integer, - integer,timestamp,integer,varchar,varchar); + integer,timestamptz,integer,varchar,varchar); drop function acs_mail_queue_message__delete (integer); drop table acs_mail_queue_incoming; @@ -24,22 +24,22 @@ ); -drop function acs_mail_gc_object__new (integer,varchar,timestamp,integer, +drop function acs_mail_gc_object__new (integer,varchar,timestamptz,integer, varchar,integer); drop function acs_mail_gc_object__delete(integer); -drop function acs_mail_body__new (integer,integer,integer,timestamp,varchar, +drop function acs_mail_body__new (integer,integer,integer,timestamptz,varchar, varchar,text,text,text,integer,varchar,date,integer,varchar,integer); drop function acs_mail_body__delete(integer); drop function acs_mail_body__body_p(integer); -drop function acs_mail_body__clone (integer,integer,varchar,timestamp, +drop function acs_mail_body__clone (integer,integer,varchar,timestamptz, integer,varchar,integer); drop function acs_mail_body__set_content_object (integer,integer); drop function acs_mail_multipart__new (integer,varchar,varchar, - timestamp,integer,varchar,integer); + timestamptz,integer,varchar,integer); drop function acs_mail_multipart__delete (integer); drop function acs_mail_multipart__multipart_p (integer); drop function acs_mail_multipart__add_content (integer,integer); -drop function acs_mail_link__new (integer,integer,integer,timestamp, +drop function acs_mail_link__new (integer,integer,integer,timestamptz, integer,varchar,varchar); drop function acs_mail_link__delete (integer); drop function acs_mail_link__link_p (integer); Index: openacs-4/packages/acs-mail/sql/postgresql/acs-mail-packages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/postgresql/acs-mail-packages-create.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-mail/sql/postgresql/acs-mail-packages-create.sql 21 Dec 2002 22:30:51 -0000 1.4 +++ openacs-4/packages/acs-mail/sql/postgresql/acs-mail-packages-create.sql 17 May 2003 09:52:12 -0000 1.5 @@ -8,7 +8,7 @@ -- Package Implementations --------------------------------------------- -create function acs_mail_gc_object__new (integer,varchar,timestamp with time zone,integer,varchar,integer) +create function acs_mail_gc_object__new (integer,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_gc_object_id alias for $1; -- default null @@ -51,7 +51,7 @@ -- first create a CR item. -- then call acs_mail_body__new with the CR item's item_id -create function acs_mail_body__new (integer,integer,integer,timestamp with time zone,varchar,varchar,text,text,text,integer,varchar,date,integer,varchar,integer) +create function acs_mail_body__new (integer,integer,integer,timestamptz,varchar,varchar,text,text,text,integer,varchar,date,integer,varchar,integer) returns integer as ' declare p_body_id alias for $1; -- default null @@ -136,8 +136,7 @@ end; ' language 'plpgsql'; -create function acs_mail_body__clone (integer,integer,varchar,timestamp with time zone, -integer,varchar,integer) +create function acs_mail_body__clone (integer,integer,varchar,timestamptz,integer,varchar,integer) returns integer as ' declare p_old_body_id alias for $1; @@ -150,7 +149,7 @@ v_object_id integer; v_body_reply_to integer; v_body_from integer; - v_body_date timestamp; + v_body_date timestamptz; v_header_message_id varchar; v_header_reply_to varchar; v_header_subject text; @@ -205,7 +204,7 @@ ---- --create or replace package body acs_mail_multipart create function acs_mail_multipart__new (integer,varchar,varchar, -timestamp,integer,varchar,integer) +timestamptz,integer,varchar,integer) returns integer as ' declare p_multipart_id alias for $1; -- default null, @@ -296,7 +295,7 @@ --end acs_mail_multipart; --create or replace package body acs_mail_link__ -create function acs_mail_link__new (integer,integer,integer,timestamp with time zone,integer,varchar,varchar) +create function acs_mail_link__new (integer,integer,integer,timestamptz,integer,varchar,varchar) returns integer as ' declare p_mail_link_id alias for $1; -- default null Index: openacs-4/packages/acs-mail/sql/postgresql/acs-mail-queue-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/postgresql/acs-mail-queue-create.sql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-mail/sql/postgresql/acs-mail-queue-create.sql 17 Jan 2003 14:32:33 -0000 1.7 +++ openacs-4/packages/acs-mail/sql/postgresql/acs-mail-queue-create.sql 17 May 2003 09:52:12 -0000 1.8 @@ -49,7 +49,7 @@ -- API ----------------------------------------------------------------- --create or replace package body acs_mail_queue_message__ -create function acs_mail_queue_message__new (integer,integer,integer,timestamp with time zone,integer,varchar,varchar) +create function acs_mail_queue_message__new (integer,integer,integer,timestamptz,integer,varchar,varchar) returns integer as ' declare p_mail_link_id alias for $1; -- default null Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-mail/sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-mail/tcl/acs-mail-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/tcl/acs-mail-procs-postgresql.xql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-mail/tcl/acs-mail-procs-postgresql.xql 22 Apr 2002 04:19:40 -0000 1.9 +++ openacs-4/packages/acs-mail/tcl/acs-mail-procs-postgresql.xql 17 May 2003 09:52:50 -0000 1.10 @@ -11,7 +11,7 @@ null::integer, -- new__parent_id null::integer, -- new__item_id null::varchar, -- new__locale - now()::timestamp, -- new__creation_date + current_timestamp, -- new__creation_date :creation_user::integer, -- new__creation_user null::integer, -- new__context_id :creation_ip::varchar, -- new__creation_ip Index: openacs-4/packages/acs-mail-lite/acs-mail-lite.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/acs-mail-lite.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-mail-lite/acs-mail-lite.info 8 May 2002 18:48:35 -0000 1.2 +++ openacs-4/packages/acs-mail-lite/acs-mail-lite.info 17 May 2003 09:53:10 -0000 1.3 @@ -18,17 +18,6 @@ - - - - - - - - - - - Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 10 Sep 2002 22:22:09 -0000 1.4 +++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 17 May 2003 09:53:28 -0000 1.5 @@ -26,6 +26,11 @@ set eh_list "" } + # Subject can not be longer than 200 characters + if { [string length $subject] > 200 } { + set subject "[string range $subject 0 196]..." + } + db_dml create_queue_entry {} } Index: openacs-4/packages/acs-messaging/acs-messaging.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/acs-messaging.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-messaging/acs-messaging.info 3 Aug 2002 17:52:46 -0000 1.6 +++ openacs-4/packages/acs-messaging/acs-messaging.info 17 May 2003 09:53:57 -0000 1.7 @@ -22,38 +22,8 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-create.sql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-create.sql 21 Dec 2002 22:30:40 -0000 1.9 +++ openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-create.sql 17 May 2003 09:54:26 -0000 1.10 @@ -50,7 +50,8 @@ reply_to integer constraint acs_messages_reply_to_fk references acs_messages (message_id) on delete set null, - sent_date timestamp + + sent_date timestamptz constraint acs_messages_sent_date_nn not null, sender integer @@ -189,7 +190,7 @@ constraint amo_to_address_nn not null, grouping_id integer, - wait_until timestamp + wait_until timestamptz constraint amo_wait_until_nn not null, constraint acs_messages_outgoing_pk primary key (message_id, to_address) Index: openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-drop.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-drop.sql 5 Jul 2001 21:11:37 -0000 1.3 +++ openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-drop.sql 17 May 2003 09:54:26 -0000 1.4 @@ -13,30 +13,30 @@ drop function acs_message_update_tr(); drop function acs_message__edit (integer,varchar,varchar,varchar, - text,integer,timestamp,integer,varchar,boolean); -drop function acs_message__new (integer,integer,timestamp,integer, + text,integer,timestamptz,integer,varchar,boolean); +drop function acs_message__new (integer,integer,timestamptz,integer, varchar,varchar,varchar,varchar,varchar,text, integer,integer,integer,varchar,varchar,boolean); drop function acs_message__delete (integer); drop function acs_message__message_p (integer); -drop function acs_message__send (integer,varchar,integer,timestamp); -drop function acs_message__send (integer,integer,integer,timestamp); +drop function acs_message__send (integer,varchar,integer,timestamptz); +drop function acs_message__send (integer,integer,integer,timestamptz); drop function acs_message__first_ancestor (integer); drop function acs_message__new_file (integer,integer,varchar,varchar, - text,varchar,text,timestamp,integer, + text,varchar,text,timestamptz,integer, varchar,boolean); drop function acs_message__edit_file (integer,varchar,text,varchar, - text,timestamp,integer,varchar,boolean); + text,timestamptz,integer,varchar,boolean); drop function acs_message__delete_file (integer); drop function acs_message__new_image (integer,integer,varchar,varchar, text,varchar,text,integer,integer, - timestamp,integer,varchar,boolean); + timestamptz,integer,varchar,boolean); drop function acs_message__edit_image (integer,varchar,text,varchar, - text,integer,integer,timestamp,integer, + text,integer,integer,timestamptz,integer, varchar,boolean); drop function acs_message__delete_image (integer); drop function acs_message__new_extlink (varchar,integer,varchar,varchar,text, - integer,timestamp,integer,varchar); + integer,timestamptz,integer,varchar); drop function acs_message__edit_extlink (integer,varchar,varchar,text); drop function acs_message__delete_extlink (integer); drop function acs_message__name (integer); Index: openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql 21 Dec 2002 22:30:40 -0000 1.11 +++ openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql 17 May 2003 09:54:26 -0000 1.12 @@ -10,8 +10,7 @@ -- updated for OpenACS by Jon Griffin -- -create function acs_message__edit (integer,varchar,varchar,varchar, -text,integer,timestamp with time zone,integer,varchar,boolean) +create function acs_message__edit (integer,varchar,varchar,varchar,text,integer,timestamptz,integer,varchar,boolean) returns integer as ' declare p_message_id alias for $1; @@ -74,8 +73,8 @@ -- Jon Griffin 05-21-2001 ---------------- -create function acs_message__new (integer,integer,timestamp with time zone,integer, -varchar,varchar,varchar,varchar,varchar,text,integer,integer,integer, +create function acs_message__new (integer,integer,timestamptz,integer, +varchar,varchar,varchar,varchar,text,integer,integer,integer,integer, varchar,varchar,boolean) returns integer as ' declare @@ -91,7 +90,7 @@ p_data alias for $10; --default null, p_parent_id alias for $11; --default 0, p_context_id alias for $12; - p_creation_date timestamp := current_timestamp; -- alias for $13 --default sysdate, + p_creation_date timestamptz := current_timestamp; -- alias for $13 --default sysdate, p_creation_user alias for $13; --default null, p_creation_ip alias for $14; --default null, p_object_type alias for $15; --default ''acs_message'', @@ -194,14 +193,14 @@ end if; end;' language 'plpgsql'; -create function acs_message__send (integer,varchar,integer,timestamp with time zone) +create function acs_message__send (integer,varchar,integer,timestamptz) returns integer as ' declare p_message_id alias for $1; p_to_address alias for $2; p_grouping_id alias for $3; -- default null p_wait_until alias for $4; -- default sysdate - v_wait_until timestamp; + v_wait_until timestamptz; begin v_wait_until := coalesce(p_wait_until, current_timestamp); insert into acs_messages_outgoing @@ -211,14 +210,14 @@ return 1; end;' language 'plpgsql'; -create function acs_message__send (integer,integer,integer,timestamp with time zone) +create function acs_message__send (integer,integer,integer,timestamptz) returns integer as ' declare p_message_id alias for $1; p_recipient_id alias for $2; p_grouping_id alias for $3; -- default null p_wait_until alias for $4; -- default sysdate - v_wait_until timestamp; + v_wait_until timestamptz; begin v_wait_until := coalesce (p_wait_until, current_timestamp); insert into acs_messages_outgoing @@ -258,7 +257,7 @@ -- by direct calls to CR code in the near future. create function acs_message__new_file (integer,integer,varchar,varchar, -text,varchar,integer,timestamp,integer,varchar,boolean,varchar) +text,varchar,integer,timestamptz,integer,varchar,boolean,varchar) returns integer as ' declare p_message_id alias for $1; @@ -312,7 +311,7 @@ end;' language 'plpgsql'; create function acs_message__edit_file (integer,varchar,text,varchar, -integer,timestamp,integer,varchar,boolean) +integer,timestamptz,integer,varchar,boolean) returns integer as ' declare p_file_id alias for $1; @@ -358,7 +357,7 @@ end;' language 'plpgsql'; create function acs_message__new_image (integer,integer,varchar,varchar, -text,varchar,integer,integer,integer,timestamp,integer,varchar,boolean,varchar) +text,varchar,integer,integer,integer,timestamptz,integer,varchar,boolean,varchar) returns integer as ' declare p_message_id alias for $1; @@ -416,7 +415,7 @@ end;' language 'plpgsql'; create function acs_message__edit_image (integer,varchar,text,varchar, -integer,integer,integer,timestamp,integer,varchar,boolean) +integer,integer,integer,timestamptz,integer,varchar,boolean) returns integer as ' declare p_image_id alias for $1; @@ -476,7 +475,7 @@ -- XXX should just call content_extlink.new create function acs_message__new_extlink (varchar,integer,varchar, -varchar,text,integer,timestamp,integer,varchar) +varchar,text,integer,timestamptz,integer,varchar) returns integer as ' declare p_name alias for $1; -- default null Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-messaging/sql/postgresql/upgrade/upgrade-4.6.2-4.6.3.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-reference/acs-reference.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/acs-reference.info,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-reference/acs-reference.info 23 Sep 2002 23:32:05 -0000 1.4 +++ openacs-4/packages/acs-reference/acs-reference.info 17 May 2003 09:55:06 -0000 1.5 @@ -27,29 +27,8 @@ - + - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/acs-reference/sql/postgresql/acs-reference-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/sql/postgresql/acs-reference-create.sql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-reference/sql/postgresql/acs-reference-create.sql 2 Sep 2001 17:06:29 -0000 1.7 +++ openacs-4/packages/acs-reference/sql/postgresql/acs-reference-create.sql 17 May 2003 09:55:32 -0000 1.8 @@ -48,13 +48,13 @@ package_name varchar(100) constraint arr_package_name_uq unique, -- last updated - last_update timestamp, + last_update timestamptz, -- where is this data from source varchar(1000), source_url varchar(255), -- should default to today - effective_date timestamp, -- default sysdate - expiry_date timestamp, + effective_date timestamptz, -- default sysdate + expiry_date timestamptz, -- a text field to hold the maintainer maintainer_id integer constraint arr_maintainer_id_fk references persons(person_id), @@ -69,9 +69,9 @@ -- default for Oracle -create function acs_reference__new (integer,varchar,boolean,varchar,timestamp, -varchar,varchar,timestamp,timestamp,integer,integer,varchar,varchar, -integer,varchar,integer) +create function acs_reference__new (integer,varchar,boolean,varchar,timestamptz, +varchar,varchar,timestamptz,timestamptz,integer,integer,varchar,varchar, +varchar,varchar,integer) returns integer as ' declare p_repository_id alias for $1; -- default null @@ -150,8 +150,8 @@ ' language 'plpgsql'; -- made initially for PG -create function acs_reference__new (varchar,timestamp, -varchar,varchar,timestamp) +create function acs_reference__new (varchar,timestamptz, +varchar,varchar,timestamptz) returns integer as ' declare p_table_name alias for $1; -- @@ -167,6 +167,7 @@ end; ' language 'plpgsql'; + create function acs_reference__delete (integer) returns integer as ' declare Index: openacs-4/packages/acs-reference/sql/postgresql/acs-reference-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/sql/postgresql/acs-reference-drop.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-reference/sql/postgresql/acs-reference-drop.sql 1 Sep 2001 20:34:19 -0000 1.2 +++ openacs-4/packages/acs-reference/sql/postgresql/acs-reference-drop.sql 17 May 2003 09:55:32 -0000 1.3 @@ -32,9 +32,9 @@ select acs_object_type__drop_type ('acs_reference_repository', 't'); -drop function acs_reference__new (varchar,timestamp, varchar,varchar,timestamp); -drop function acs_reference__new (integer,varchar,boolean,varchar,timestamp, -varchar,varchar,timestamp,timestamp,integer,integer,varchar,varchar, +drop function acs_reference__new (varchar,timestamptz, varchar,varchar,timestamptz); +drop function acs_reference__new (integer,varchar,boolean,varchar,timestamptz, +varchar,varchar,timestamptz,timestamptz,integer,integer,varchar,varchar, integer,varchar,integer); drop function acs_reference__delete (integer); drop function acs_reference__is_expired_p (integer);