Commit94da2a6

committed

Use RangeVarGetRelidExtended() in AlterSequence()

This allows us to combine the opening and the ownership check.Reported-by: Robert Haas <robertmhaas@gmail.com>

1 parent41839b7 commit94da2a6Copy full SHA for 94da2a6

File tree

+10

-12

lines changed

+10

-12

lines changed

Lines changed: 7 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -429,10 +429,13 @@ AlterSequence(ParseState pstate, AlterSeqStmt stmt)`
`429`	`429`	`HeapTupleseqtuple;`
`430`	`430`	`HeapTuplenewdatatuple;`
`431`	`431`
`432`		`-/* Open and lock sequence. */`
`433`		`-relid=RangeVarGetRelid(stmt->sequence,`
`434`		`-ShareRowExclusiveLock,`
`435`		`-stmt->missing_ok);`
	`432`	`+/* Open and lock sequence, and check for ownership along the way. */`
	`433`	`+relid=RangeVarGetRelidExtended(stmt->sequence,`
	`434`	`+ShareRowExclusiveLock,`
	`435`	`+stmt->missing_ok,`
	`436`	`+ false,`
	`437`	`+RangeVarCallbackOwnsRelation,`
	`438`	`+NULL);`
`436`	`439`	`if (relid==InvalidOid)`
`437`	`440`	`{`
`438`	`441`	`ereport(NOTICE,`
`@@ -443,11 +446,6 @@ AlterSequence(ParseState pstate, AlterSeqStmt stmt)`
`443`	`446`
`444`	`447`	`init_sequence(relid,&elm,&seqrel);`
`445`	`448`
`446`		`-/* allow ALTER to sequence owner only */`
`447`		`-if (!pg_class_ownercheck(relid,GetUserId()))`
`448`		`-aclcheck_error(ACLCHECK_NOT_OWNER,ACL_KIND_CLASS,`
`449`		`-stmt->sequence->relname);`
`450`		`-`
`451`	`449`	`rel=heap_open(SequenceRelationId,RowExclusiveLock);`
`452`	`450`	`seqtuple=SearchSysCacheCopy1(SEQRELID,`
`453`	`451`	`ObjectIdGetDatum(relid));`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -307,8 +307,8 @@ DROP SEQUENCE myseq2;`
`307`	`307`	`ALTER SEQUENCE IF EXISTS sequence_test2 RESTART WITH 24`
`308`	`308`	`INCREMENT BY 4 MAXVALUE 36 MINVALUE 5 CYCLE;`
`309`	`309`	`NOTICE: relation "sequence_test2" does not exist, skipping`
`310`		`-ALTER SEQUENCEpg_class CYCLE; -- error, not a sequence`
`311`		`-ERROR: "pg_class" is not a sequence`
	`310`	`+ALTER SEQUENCEserialTest1 CYCLE; -- error, not a sequence`
	`311`	`+ERROR: "serialtest1" is not a sequence`
`312`	`312`	`CREATE SEQUENCE sequence_test2 START WITH 32;`
`313`	`313`	`CREATE SEQUENCE sequence_test4 INCREMENT BY -1;`
`314`	`314`	`SELECT nextval('sequence_test2');`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ DROP SEQUENCE myseq2;`
`172`	`172`	`ALTERSEQUENCE IF EXISTS sequence_test2 RESTART WITH24`
`173`	`173`	`INCREMENT BY4 MAXVALUE36 MINVALUE5 CYCLE;`
`174`	`174`
`175`		`-ALTERSEQUENCEpg_class CYCLE;-- error, not a sequence`
	`175`	`+ALTERSEQUENCEserialTest1 CYCLE;-- error, not a sequence`
`176`	`176`
`177`	`177`	`CREATESEQUENCEsequence_test2 START WITH32;`
`178`	`178`	`CREATESEQUENCEsequence_test4 INCREMENT BY-1;`

Comments

(0)