Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs-postgresql.xql,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs-postgresql.xql 2 Mar 2003 22:32:26 -0000 1.4.2.2
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs-postgresql.xql 3 Mar 2003 21:51:05 -0000 1.4.2.3
@@ -7,38 +7,38 @@
select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'D')
as day_of_the_week,
-next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday')
+next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday')
as sunday_date,
-to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday'),'J')
+to_char(next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday'),'J')
as sunday_julian,
-next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 1
+next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('1 day' as interval)
as monday_date,
-to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 1,'J')
+to_char(next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('1 day' as interval),'J')
as monday_julian,
-next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 2
+next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('2 days' as interval)
as tuesday_date,
-to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 2,'J')
+to_char(next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('2 days' as interval),'J')
as tuesday_julian,
-next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 3
+next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('3 days' as interval)
as wednesday_date,
-to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 3,'J')
+to_char(next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('3 days' as interval),'J')
as wednesday_julian,
-next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 4
+next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('4 days' as interval)
as thursday_date,
-to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 4,'J')
+to_char(next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('4 days' as interval),'J')
as thursday_julian,
-next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 5
+next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('5 days' as interval)
as friday_date,
-to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 5,'J')
+to_char(next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('5 days' as interval),'J')
as friday_julian,
-next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 6
+next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('6 days' as interval)
as saturday_date,
-to_char(next_day(to_date(:current_date, 'yyyy-mm-dd')-7, 'Sunday') + 6,'J')
+to_char(next_day(to_date(:current_date, 'yyyy-mm-dd') - cast('7 days' as interval), 'Sunday') + cast('6 days' as interval),'J')
as saturday_julian,
-:current_date::timestamptz - '7 days'::interval as last_week,
-to_char(:current_date::timestamptz - '7 days'::interval, 'Month DD, YYYY') as last_week_pretty,
-:current_date::timestamptz + '7 days'::interval as next_week,
-to_char(:current_date::timestamptz + '7 days'::interval, 'Month DD, YYYY') as next_week_pretty
+:current_date::timestamptz - cast('7 days' as interval) as last_week,
+to_char(:current_date::timestamptz - cast('7 days' as interval), 'Month DD, YYYY') as last_week_pretty,
+:current_date::timestamptz + cast('7 days' as interval) as next_week,
+to_char(:current_date::timestamptz + cast('7 days' as interval), 'Month DD, YYYY') as next_week_pretty
from dual
@@ -47,9 +47,9 @@
select to_char(to_date(:current_date, 'yyyy-mm-dd'), 'Day, DD Month YYYY')
as day_of_the_week,
-to_char(to_date(:current_date, 'yyyy-mm-dd')-1, 'yyyy-mm-dd')
+to_char(to_date(:current_date, 'yyyy-mm-dd') - cast('1 day' as interval), 'yyyy-mm-dd')
as yesterday,
-to_char(to_date(:current_date, 'yyyy-mm-dd')+1, 'yyyy-mm-dd')
+to_char(to_date(:current_date, 'yyyy-mm-dd') + cast('1 day' as interval), 'yyyy-mm-dd')
as tomorrow
from dual