Commit7d715ba

committed

Fix broken FOR UPDATE error message.

1 parent1b6b4d4 commit7d715baCopy full SHA for 7d715ba

File tree

-5

lines changed

-5

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`		`- *$Id: analyze.c,v 1.129 2000/01/15 02:59:31 petere Exp $`
	`8`	`+ *$Id: analyze.c,v 1.130 2000/01/16 08:21:59 tgl Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -1573,14 +1573,16 @@ transformForUpdate(Query qry, List forUpdate)`
`1573`	`1573`
`1574`	`1574`	`foreach(l,forUpdate)`
`1575`	`1575`	`{`
	`1576`	`+char*relname=lfirst(l);`
`1576`	`1577`	`List*l2;`
`1577`		`-List*l3;`
`1578`	`1578`
`1579`	`1579`	`i=1;`
`1580`	`1580`	`foreach(l2,qry->rtable)`
`1581`	`1581`	`{`
`1582`		`-if (strcmp(((RangeTblEntry*)lfirst(l2))->refname,lfirst(l))==0)`
	`1582`	`+if (strcmp(((RangeTblEntry*)lfirst(l2))->refname,relname)==0)`
`1583`	`1583`	`{`
	`1584`	`+List*l3;`
	`1585`	`+`
`1584`	`1586`	`foreach(l3,rowMark)`
`1585`	`1587`	`{`
`1586`	`1588`	`if (((RowMark)lfirst(l3))->rti==i)/ duplicate */`
`@@ -1598,11 +1600,11 @@ transformForUpdate(Query qry, List forUpdate)`
`1598`	`1600`	`i++;`
`1599`	`1601`	`}`
`1600`	`1602`	`if (l2==NULL)`
`1601`		`-elog(ERROR,"FOR UPDATE: relation %s not found in FROM clause",strVal(lfirst(l)));`
	`1603`	`+elog(ERROR,"FOR UPDATE: relation %s not found in FROM clause",`
	`1604`	`+relname);`
`1602`	`1605`	`}`
`1603`	`1606`
`1604`	`1607`	`qry->rowMark=rowMark;`
`1605`		`-return;`
`1606`	`1608`	`}`
`1607`	`1609`
`1608`	`1610`

Comments

(0)