NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit7b96519

committed

Don't mark auto-generated types as extension members.

Relation rowtypes and automatically-generated array types do not need tohave their own extension membership dependency entries. If we create suchthen it becomes more difficult to remove items from an extension, and it'salso harder for an extension upgrade script to make sure it duplicates thedependencies created by the extension's regular installation script.I changed the code in such a way that this happened in commit988cccc, I think because of worries aboutthe shell-type-replacement case; but that cure was worse than the disease.It would only matter if one extension created a shell type that wasreplaced with an auto-generated type in another extension, which seemspretty far-fetched. Better to make this work unsurprisingly in normalcases.Report and patch by Robert Haas, comment adjustments by me.

1 parente0b268f commit7b96519Copy full SHA for 7b96519

File tree

1 file changed

-5

lines changed

src/backend/catalog
- pg_type.c

1 file changed

-5

lines changed

`‎src/backend/catalog/pg_type.c`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,11 @@ TypeCreate(Oid newTypeOid,`
`480`	`480`	`*`
`481`	`481`	`* If rebuild is true, we remove existing dependencies and rebuild them`
`482`	`482`	`* from scratch. This is needed for ALTER TYPE, and also when replacing`
`483`		`- * a shell type.`
	`483`	`+ * a shell type. We don't remove an existing extension dependency, though.`
	`484`	`+ * (That means an extension can't absorb a shell type created in another`
	`485`	`+ * extension, nor ALTER a type created by another extension. Also, if it`
	`486`	`+ * replaces a free-standing shell type or ALTERs a free-standing type,`
	`487`	`+ * that type will become a member of the extension.)`
`484`	`488`	`*/`
`485`	`489`	`void`
`486`	`490`	`GenerateTypeDependencies(OidtypeNamespace,`
`@@ -505,6 +509,7 @@ GenerateTypeDependencies(Oid typeNamespace,`
`505`	`509`	`ObjectAddressmyself,`
`506`	`510`	`referenced;`
`507`	`511`
	`512`	`+/* If rebuild, first flush old dependencies, except extension deps */`
`508`	`513`	`if (rebuild)`
`509`	`514`	`{`
`510`	`515`	`deleteDependencyRecordsFor(TypeRelationId,typeObjectId, true);`
`@@ -516,7 +521,7 @@ GenerateTypeDependencies(Oid typeNamespace,`
`516`	`521`	`myself.objectSubId=0;`
`517`	`522`
`518`	`523`	`/*`
`519`		`- * Makedependency on namespace and shared dependency onowner.`
	`524`	`+ * Makedependencies on namespace,owner, extension.`
`520`	`525`	`*`
`521`	`526`	`* For a relation rowtype (that's not a composite type), we should skip`
`522`	`527`	`* these because we'll depend on them indirectly through the pg_class`
`@@ -532,10 +537,9 @@ GenerateTypeDependencies(Oid typeNamespace,`
`532`	`537`	`recordDependencyOn(&myself,&referenced,DEPENDENCY_NORMAL);`
`533`	`538`
`534`	`539`	`recordDependencyOnOwner(TypeRelationId,typeObjectId,owner);`
`535`		`-}`
`536`	`540`
`537`		`-/* dependency on extension */`
`538`		`-recordDependencyOnCurrentExtension(&myself,rebuild);`
	`541`	`+recordDependencyOnCurrentExtension(&myself,rebuild);`
	`542`	`+}`
`539`	`543`
`540`	`544`	`/* Normal dependencies on the I/O functions */`
`541`	`545`	`if (OidIsValid(inputProcedure))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7b96519

File tree

1 file changed

1 file changed

`‎src/backend/catalog/pg_type.c`

0 commit comments