mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix pltcl self-test for recent changes to elog.

Browse Source
This commit is contained in:
Tom Lane 2002-10-19 22:01:45 +00:00
parent ba7c2d2b00
commit 78b13fee45
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pl/tcl/test/runtest
View File

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

10
src/pl/tcl/test/test_setup.sql
View File

@ -120,7 +120,7 @@ create function trig_pkey1_before() returns trigger as '
# #
spi_execp -count 1 $GD(plan_pkey1) [list $NEW(key1) $NEW(key2)] spi_execp -count 1 $GD(plan_pkey1) [list $NEW(key1) $NEW(key2)]
if {$ret == "t"} { if {$ret == "t"} {
elog WARN \\ elog ERROR \\
"duplicate key ''$NEW(key1)'', ''$NEW(key2)'' for T_pkey1" "duplicate key ''$NEW(key1)'', ''$NEW(key2)'' for T_pkey1"
} }
} }
@ -131,7 +131,7 @@ create function trig_pkey1_before() returns trigger as '
# #
set n [spi_execp -count 1 $GD(plan_dta1) [list $OLD(key1) $OLD(key2)]] set n [spi_execp -count 1 $GD(plan_dta1) [list $OLD(key1) $OLD(key2)]]
if {$n > 0} { if {$n > 0} {
elog WARN \\ elog ERROR \\
"key ''$OLD(key1)'', ''$OLD(key2)'' referenced by T_dta1" "key ''$OLD(key1)'', ''$OLD(key2)'' referenced by T_dta1"
} }
} }
@ -173,7 +173,7 @@ create function trig_pkey2_before() returns trigger as '
# #
set n [spi_execp -count 1 $GD(plan_pkey2) [list $NEW(key1) $NEW(key2)]] set n [spi_execp -count 1 $GD(plan_pkey2) [list $NEW(key1) $NEW(key2)]]
if {$n > 0} { if {$n > 0} {
elog WARN \\ elog ERROR \\
"duplicate key ''$NEW(key1)'', ''$NEW(key2)'' for T_pkey2" "duplicate key ''$NEW(key1)'', ''$NEW(key2)'' for T_pkey2"
} }
@ -325,7 +325,7 @@ create function check_primkey() returns trigger as '
and A.attname = ''[quote $key]'' \\ and A.attname = ''[quote $key]'' \\
and A.atttypid = T.oid"] and A.atttypid = T.oid"]
if {$n != 1} { if {$n != 1} {
elog WARN "table $keyrel doesn''t have a field named $key" elog ERROR "table $keyrel doesn''t have a field named $key"
} }
# #
@ -362,7 +362,7 @@ create function check_primkey() returns trigger as '
# #
set n [spi_execp -count 1 $GD($plankey) $arglist] set n [spi_execp -count 1 $GD($plankey) $arglist]
if {$n <= 0} { if {$n <= 0} {
elog WARN "key for $GD($planrel) not in $keyrel" elog ERROR "key for $GD($planrel) not in $keyrel"
} }
# #