Commit8b6b414

committed

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

the fact that CREATE FUNCTION and CREATE AGGREGATE now allow arraytypes to be named like int4[] rather than _int4.

1 parent179b8e5 commit8b6b414Copy full SHA for 8b6b414

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ psql -q -n -e $DBNAME <test_queries.sql > test.out 2>&1`
`21`	`21`	`if diff test.expected test.out>/dev/null2>&1;then`
`22`	`22`	`echo" Tests passed O.K."`
`23`	`23`	`else`
`24`		`-echo" Testsfaild - look at diffs between"`
	`24`	`+echo" Testsfailed - look at diffs between"`
`25`	`25`	`echo" test.expected and test.out"`
`26`	`26`	`fi`
`27`	`27`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,11 @@ select tcl_sum(key1) from T_pkey2;`
`133`	`133`	`(1 row)`
`134`	`134`
`135`	`135`	`select tcl_avg(key1) from T_pkey1 where key1 = 99;`
`136`		`-ERROR: pltcl: divide by zero`
	`136`	`+ tcl_avg`
	`137`	`+---------`
	`138`	`+`
	`139`	`+(1 row)`
	`140`	`+`
`137`	`141`	`select tcl_sum(key1) from T_pkey1 where key1 = 99;`
`138`	`142`	`tcl_sum`
`139`	`143`	`---------`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -389,22 +389,23 @@ create function tcl_int4add(int4,int4) returns int4 as '`
`389`	`389`	`-- We use split(n) as a quick-and-dirty way of parsing the input array`
`390`	`390`	`-- value, which comes in as a string like '{1,2}'. There are better ways...`
`391`	`391`
`392`		`-createfunctiontcl_int4_accum(_int4,int4) returns_int4as'`
	`392`	`+createfunctiontcl_int4_accum(int4[],int4) returnsint4[]as'`
`393`	`393`	`set state [split $1 "{,}"]`
`394`	`394`	`set newsum [expr {[lindex $state 1] + $2}]`
`395`	`395`	`set newcnt [expr {[lindex $state 2] + 1}]`
`396`	`396`	`return "{$newsum,$newcnt}"`
`397`	`397`	`' language'pltcl';`
`398`	`398`
`399`		`-createfunctiontcl_int4_avg(_int4) returns int4as'`
	`399`	`+createfunctiontcl_int4_avg(int4[]) returns int4as'`
`400`	`400`	`set state [split $1 "{,}"]`
	`401`	`+ if {[lindex $state 2] == 0} { return_null }`
`401`	`402`	`return [expr {[lindex $state 1] / [lindex $state 2]}]`
`402`	`403`	`' language'pltcl';`
`403`	`404`
`404`	`405`	`createaggregatetcl_avg (`
`405`	`406`	`sfunc= tcl_int4_accum,`
`406`	`407`	`basetype= int4,`
`407`		`-stype=_int4,`
	`408`	`+stype=int4[],`
`408`	`409`	`finalfunc= tcl_int4_avg,`
`409`	`410`	`initcond='{0,0}'`
`410`	`411`	`);`
`@@ -413,7 +414,7 @@ create aggregate tcl_sum (`
`413`	`414`	`sfunc= tcl_int4add,`
`414`	`415`	`basetype= int4,`
`415`	`416`	`stype= int4,`
`416`		`-initcond1='0'`
	`417`	`+initcond1=0`
`417`	`418`	`);`
`418`	`419`
`419`	`420`	`createfunctiontcl_int4lt(int4,int4) returns boolas'`

Comments

(0)