Fix pltcl self-test for recent changes to elog.

tglsfdc · tglsfdc · commit 78b13fee45a4 · 2002-10-19T22:01:45.000Z
diff --git a/src/pl/tcl/test/runtest b/src/pl/tcl/test/runtest
@@ -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
     echo "    Tests passed O.K."
+    rm test.out
 else
     echo "    Tests failed - look at diffs between"
     echo "    test.expected and test.out"
diff --git a/src/pl/tcl/test/test_setup.sql b/src/pl/tcl/test/test_setup.sql
@@ -120,7 +120,7 @@ create function trig_pkey1_before() returns trigger as '
 	#
         spi_execp -count 1 $GD(plan_pkey1) [list $NEW(key1) $NEW(key2)]
 	if {$ret == "t"} {
-	    elog WARN \\
+	    elog ERROR \\
 	        "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)]]
 	if {$n > 0} {
-	    elog WARN \\
+	    elog ERROR \\
 	        "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)]]
     if {$n > 0} {
-	elog WARN \\
+	elog ERROR \\
 	    "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.atttypid = T.oid"]
 	    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]
     if {$n <= 0} {
-        elog WARN "key for $GD($planrel) not in $keyrel"
+        elog ERROR "key for $GD($planrel) not in $keyrel"
     }
 
     #

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ create function trig_pkey1_before() returns trigger as '`
`120`	`120`	`#`
`121`	`121`	`spi_execp -count 1 $GD(plan_pkey1) [list $NEW(key1) $NEW(key2)]`
`122`	`122`	`if {$ret == "t"} {`
`123`		`- elog WARN \\`
	`123`	`+ elog ERROR \\`
`124`	`124`	`"duplicate key ''$NEW(key1)'', ''$NEW(key2)'' for T_pkey1"`
`125`	`125`	`}`
`126`	`126`	`}`
`@@ -131,7 +131,7 @@ create function trig_pkey1_before() returns trigger as '`
`131`	`131`	`#`
`132`	`132`	`set n [spi_execp -count 1 $GD(plan_dta1) [list $OLD(key1) $OLD(key2)]]`
`133`	`133`	`if {$n > 0} {`
`134`		`- elog WARN \\`
	`134`	`+ elog ERROR \\`
`135`	`135`	`"key ''$OLD(key1)'', ''$OLD(key2)'' referenced by T_dta1"`
`136`	`136`	`}`
`137`	`137`	`}`
`@@ -173,7 +173,7 @@ create function trig_pkey2_before() returns trigger as '`
`173`	`173`	`#`
`174`	`174`	`set n [spi_execp -count 1 $GD(plan_pkey2) [list $NEW(key1) $NEW(key2)]]`
`175`	`175`	`if {$n > 0} {`
`176`		`- elog WARN \\`
	`176`	`+ elog ERROR \\`
`177`	`177`	`"duplicate key ''$NEW(key1)'', ''$NEW(key2)'' for T_pkey2"`
`178`	`178`	`}`
`179`	`179`
`@@ -325,7 +325,7 @@ create function check_primkey() returns trigger as '`
`325`	`325`	`and A.attname = ''[quote $key]'' \\`
`326`	`326`	`and A.atttypid = T.oid"]`
`327`	`327`	`if {$n != 1} {`
`328`		`- elog WARN "table $keyrel doesn''t have a field named $key"`
	`328`	`+ elog ERROR "table $keyrel doesn''t have a field named $key"`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`#`
`@@ -362,7 +362,7 @@ create function check_primkey() returns trigger as '`
`362`	`362`	`#`
`363`	`363`	`set n [spi_execp -count 1 $GD($plankey) $arglist]`
`364`	`364`	`if {$n <= 0} {`
`365`		`- elog WARN "key for $GD($planrel) not in $keyrel"`
	`365`	`+ elog ERROR "key for $GD($planrel) not in $keyrel"`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`#`