Commit1da2bcc

Neil Conway

committed

Unbreak regression tests (Peter's recent checkin to executor/spi.c did

not update some error message text).

1 parentb8c06a6 commit1da2bccCopy full SHA for 1da2bcc

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,7 @@ SELECT * from FKTABLE;`
`646`	`646`	`UPDATE PKTABLE set ptest2=5 where ptest2=2;`
`647`	`647`	`ERROR: insert or update on table "fktable" violates foreign key constraint "constrname3"`
`648`	`648`	`DETAIL: Key (ftest1,ftest2,ftest3)=(1,-1,3) is not present in table "pktable".`
`649`		`-CONTEXT: SQLquery "UPDATE ONLY "public"."fktable" SET "ftest2" = DEFAULT WHERE "ftest1" = $1 AND "ftest2" = $2 AND "ftest3" = $3"`
	`649`	`+CONTEXT: SQLstatement "UPDATE ONLY "public"."fktable" SET "ftest2" = DEFAULT WHERE "ftest1" = $1 AND "ftest2" = $2 AND "ftest3" = $3"`
`650`	`650`	`-- Try to update something that will set default`
`651`	`651`	`UPDATE PKTABLE set ptest1=0, ptest2=5, ptest3=10 where ptest2=2;`
`652`	`652`	`UPDATE PKTABLE set ptest2=10 where ptest2=4;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,14 +85,14 @@ DETAIL: Trigger "check_fkeys_pkey2_exist" found tuple referencing non-existent`
`85`	`85`	`delete from pkeys where pkey1 = 30 and pkey2 = '3';`
`86`	`86`	`NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted`
`87`	`87`	`ERROR: "check_fkeys2_fkey_restrict": tuple is referenced in "fkeys"`
`88`		`-CONTEXT: SQLquery "delete from fkeys2 where fkey21 = $1 and fkey22 = $2 "`
	`88`	`+CONTEXT: SQLstatement "delete from fkeys2 where fkey21 = $1 and fkey22 = $2 "`
`89`	`89`	`delete from pkeys where pkey1 = 40 and pkey2 = '4';`
`90`	`90`	`NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted`
`91`	`91`	`NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted`
`92`	`92`	`update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 50 and pkey2 = '5';`
`93`	`93`	`NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted`
`94`	`94`	`ERROR: "check_fkeys2_fkey_restrict": tuple is referenced in "fkeys"`
`95`		`-CONTEXT: SQLquery "delete from fkeys2 where fkey21 = $1 and fkey22 = $2 "`
	`95`	`+CONTEXT: SQLstatement "delete from fkeys2 where fkey21 = $1 and fkey22 = $2 "`
`96`	`96`	`update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1';`
`97`	`97`	`NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted`
`98`	`98`	`NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted`

Comments

(0)