git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 578b229)

Fix sepgsql compile error caused by oid removal.

author Andres Freund <andres@anarazel.de>

2018年11月21日 04:03:46 +0000 (20:03 -0800)

committer Andres Freund <andres@anarazel.de>

2018年11月21日 04:03:46 +0000 (20:03 -0800)

Per buildfarm animal rhinoceros. I (Andres) missed replacing a few
uses of ObjectIdAttributeNumber in sepgsql.

It's quite probable that the sepgsql test output will need more
adapting than done in 578b22...

Author: Thomas Munro
Discussion: https://postgr.es/m/CAEepm=2Sk+66HJV8FLDfm_sKTn22j7cWTY_Y1Rok3RxeWL_Y0w@mail.gmail.com

contrib/sepgsql/database.c patch | blob | blame | history

contrib/sepgsql/proc.c patch | blob | blame | history

contrib/sepgsql/relation.c patch | blob | blame | history

contrib/sepgsql/schema.c patch | blob | blame | history

diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c

index c641ec3565e2a36888275c641004c11a39e40e03..102c9c8012cf5b1a01bcd64e027cacf6f79b747d 100644 (file)

--- a/contrib/sepgsql/database.c

+++ b/contrib/sepgsql/database.c

@@ -80,7 +80,7 @@ sepgsql_database_post_create(Oid databaseId, const char *dtemplate)

rel = heap_open(DatabaseRelationId, AccessShareLock);

ScanKeyInit(&skey,

- ObjectIdAttributeNumber,

+ Anum_pg_database_oid,

BTEqualStrategyNumber, F_OIDEQ,

ObjectIdGetDatum(databaseId));

diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c

index c6a817d7c58ff7589f10780225134ce9feea7f15..a4acfd92daee613b93394bec5b3fe75b9296ecb4 100644 (file)

--- a/contrib/sepgsql/proc.c

+++ b/contrib/sepgsql/proc.c

@@ -59,7 +59,7 @@ sepgsql_proc_post_create(Oid functionId)

rel = heap_open(ProcedureRelationId, AccessShareLock);

ScanKeyInit(&skey,

- ObjectIdAttributeNumber,

+ Anum_pg_proc_oid,

BTEqualStrategyNumber, F_OIDEQ,

ObjectIdGetDatum(functionId));

@@ -253,7 +253,7 @@ sepgsql_proc_setattr(Oid functionId)

rel = heap_open(ProcedureRelationId, AccessShareLock);

ScanKeyInit(&skey,

- ObjectIdAttributeNumber,

+ Anum_pg_proc_oid,

BTEqualStrategyNumber, F_OIDEQ,

ObjectIdGetDatum(functionId));

diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c

index f0c22715aa5fa2b59e0569f791df9947d92cb25c..312740c598367074fdb5957a927cfc4345b78c48 100644 (file)

--- a/contrib/sepgsql/relation.c

+++ b/contrib/sepgsql/relation.c

@@ -262,7 +262,7 @@ sepgsql_relation_post_create(Oid relOid)

rel = heap_open(RelationRelationId, AccessShareLock);

ScanKeyInit(&skey,

- ObjectIdAttributeNumber,

+ Anum_pg_class_oid,

BTEqualStrategyNumber, F_OIDEQ,

ObjectIdGetDatum(relOid));

@@ -614,7 +614,7 @@ sepgsql_relation_setattr(Oid relOid)

rel = heap_open(RelationRelationId, AccessShareLock);

ScanKeyInit(&skey,

- ObjectIdAttributeNumber,

+ Anum_pg_class_oid,

BTEqualStrategyNumber, F_OIDEQ,

ObjectIdGetDatum(relOid));

diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c

index bc15a36a459c72d6fdb086c768b0b9a3afcd54a1..7b098318edaf7ef92ee3efdf67b50c49240f371e 100644 (file)

--- a/contrib/sepgsql/schema.c

+++ b/contrib/sepgsql/schema.c

@@ -59,7 +59,7 @@ sepgsql_schema_post_create(Oid namespaceId)

rel = heap_open(NamespaceRelationId, AccessShareLock);

ScanKeyInit(&skey,

- ObjectIdAttributeNumber,

+ Anum_pg_namespace_oid,

BTEqualStrategyNumber, F_OIDEQ,

ObjectIdGetDatum(namespaceId));

This is the main PostgreSQL git repository.