Update pltcl regress test to exercise return_null; also make use of

the fact that CREATE FUNCTION and CREATE AGGREGATE now allow array
types to be named like int4[] rather than _int4.
This commit is contained in:
Tom Lane 2000-10-17 21:23:09 +00:00
parent 179b8e5722
commit 8b6b414a5e
3 changed files with 11 additions and 6 deletions

View File

@ -21,7 +21,7 @@ psql -q -n -e $DBNAME <test_queries.sql > test.out 2>&1
if diff test.expected test.out >/dev/null 2>&1 ; then
echo " Tests passed O.K."
else
echo " Tests faild - look at diffs between"
echo " Tests failed - look at diffs between"
echo " test.expected and test.out"
fi

View File

@ -133,7 +133,11 @@ select tcl_sum(key1) from T_pkey2;
(1 row)
select tcl_avg(key1) from T_pkey1 where key1 = 99;
ERROR: pltcl: divide by zero
tcl_avg
---------
(1 row)
select tcl_sum(key1) from T_pkey1 where key1 = 99;
tcl_sum
---------

View File

@ -389,22 +389,23 @@ create function tcl_int4add(int4,int4) returns int4 as '
-- We use split(n) as a quick-and-dirty way of parsing the input array
-- value, which comes in as a string like '{1,2}'. There are better ways...
create function tcl_int4_accum(_int4,int4) returns _int4 as '
create function tcl_int4_accum(int4[], int4) returns int4[] as '
set state [split $1 "{,}"]
set newsum [expr {[lindex $state 1] + $2}]
set newcnt [expr {[lindex $state 2] + 1}]
return "{$newsum,$newcnt}"
' language 'pltcl';
create function tcl_int4_avg(_int4) returns int4 as '
create function tcl_int4_avg(int4[]) returns int4 as '
set state [split $1 "{,}"]
if {[lindex $state 2] == 0} { return_null }
return [expr {[lindex $state 1] / [lindex $state 2]}]
' language 'pltcl';
create aggregate tcl_avg (
sfunc = tcl_int4_accum,
basetype = int4,
stype = _int4,
stype = int4[],
finalfunc = tcl_int4_avg,
initcond = '{0,0}'
);
@ -413,7 +414,7 @@ create aggregate tcl_sum (
sfunc = tcl_int4add,
basetype = int4,
stype = int4,
initcond1 = '0'
initcond1 = 0
);
create function tcl_int4lt(int4,int4) returns bool as '