Skip to content

Commit 7816c7c

Browse files
bmomjianbmomjian
committed
More cleanup of userid to be AclId rather than Oid.
1 parent caaf941 commit 7816c7c

File tree

17 files changed

+101
-97
lines changed

17 files changed

+101
-97
lines changed

‎src/backend/commands/cluster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.98 2002/12/04 05:18:33 momjian Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.99 2002/12/05 04:04:42 momjian Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -68,7 +68,7 @@ static void recreate_indexattr(Oid OIDOldHeap, List *indexes);
6868
static void swap_relfilenodes(Oid r1, Oid r2);
6969
static void cluster_rel(relToCluster *rv);
7070
static bool check_cluster_ownership(Oid relOid);
71-
static List *get_tables_to_cluster(Oid owner);
71+
static List *get_tables_to_cluster(AclId owner);
7272

7373
static MemoryContext cluster_context = NULL;
7474

‎src/backend/commands/dbcommands.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.108 2002/12/02 05:20:47 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.109 2002/12/05 04:04:42 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -63,7 +63,7 @@ createdb(const CreatedbStmt *stmt)
6363
char src_loc[MAXPGPATH];
6464
char buf[2 * MAXPGPATH + 100];
6565
Oid src_dboid;
66-
int4 src_owner;
66+
AclId src_owner;
6767
int src_encoding;
6868
bool src_istemplate;
6969
Oid src_lastsysoid;
@@ -76,7 +76,7 @@ createdb(const CreatedbStmt *stmt)
7676
Datum new_record[Natts_pg_database];
7777
char new_record_nulls[Natts_pg_database];
7878
Oid dboid;
79-
int32 datdba;
79+
AclId datdba;
8080
List *option;
8181
DefElem *downer = NULL;
8282
DefElem *dpath = NULL;
@@ -157,7 +157,7 @@ createdb(const CreatedbStmt *stmt)
157157
else
158158
datdba = GetUserId();
159159

160-
if (datdba == (int32) GetUserId())
160+
if (datdba == GetUserId())
161161
{
162162
/* creating database for self: can be superuser or createdb */
163163
if (!superuser() && !have_createdb_privilege())
@@ -670,7 +670,7 @@ have_createdb_privilege(void)
670670
bool retval;
671671

672672
utup = SearchSysCache(SHADOWSYSID,
673-
ObjectIdGetDatum(GetUserId()),
673+
Int32GetDatum(GetUserId()),
674674
0, 0, 0);
675675

676676
if (!HeapTupleIsValid(utup))

‎src/backend/commands/schemacmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/schemacmds.c,v 1.6 2002/09/04 20:31:15 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/schemacmds.c,v 1.7 2002/12/05 04:04:42 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -41,8 +41,8 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
4141
List *parsetree_list;
4242
List *parsetree_item;
4343
const char *owner_name;
44-
Oid owner_userid;
45-
Oid saved_userid;
44+
AclId owner_userid;
45+
AclId saved_userid;
4646
AclResult aclresult;
4747

4848
saved_userid = GetUserId();

‎src/backend/commands/user.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.114 2002/12/02 05:20:47 tgl Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.115 2002/12/05 04:04:42 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -984,7 +984,7 @@ DropUser(DropUserStmt *stmt)
984984
TupleDesc pg_dsc;
985985
ScanKeyData scankey;
986986
HeapScanDesc scan;
987-
int32 usesysid;
987+
AclId usesysid;
988988

989989
tuple = SearchSysCache(SHADOWNAME,
990990
PointerGetDatum(user),

‎src/backend/commands/variable.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.71 2002/09/04 20:31:17 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.72 2002/12/05 04:04:42 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -526,7 +526,7 @@ show_server_encoding(void)
526526
const char *
527527
assign_session_authorization(const char *value, bool doit, bool interactive)
528528
{
529-
Oid usesysid;
529+
AclId usesysid;
530530
char *endptr;
531531
char *result;
532532

‎src/backend/executor/execMain.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
*
2929
* IDENTIFICATION
30-
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.188 2002/11/29 19:03:01 tgl Exp $
30+
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.189 2002/12/05 04:04:42 momjian Exp $
3131
*
3232
*-------------------------------------------------------------------------
3333
*/
@@ -346,7 +346,7 @@ static void
346346
ExecCheckRTEPerms(RangeTblEntry *rte, CmdType operation)
347347
{
348348
Oid relOid;
349-
Oid userid;
349+
AclId userid;
350350
AclResult aclcheck_result;
351351

352352
/*

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.80 2002/09/11 14:48:54 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.81 2002/12/05 04:04:42 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -32,7 +32,7 @@
3232
#include "utils/syscache.h"
3333

3434

35-
static void setRuleCheckAsUser(Query *qry, Oid userid);
35+
static void setRuleCheckAsUser(Query *qry, AclId userid);
3636
static bool setRuleCheckAsUser_walker(Node *node, Oid *context);
3737

3838

@@ -445,7 +445,7 @@ DefineQueryRewrite(RuleStmt *stmt)
445445
* them always.
446446
*/
447447
static void
448-
setRuleCheckAsUser(Query *qry, Oid userid)
448+
setRuleCheckAsUser(Query *qry, AclId userid)
449449
{
450450
List *l;
451451

‎src/backend/utils/adt/acl.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.83 2002/11/13 00:39:47 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.84 2002/12/05 04:04:42 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -703,7 +703,7 @@ has_table_privilege_name(PG_FUNCTION_ARGS)
703703
{
704704
text *tablename = PG_GETARG_TEXT_P(0);
705705
text *priv_type_text = PG_GETARG_TEXT_P(1);
706-
int32 usesysid;
706+
AclId usesysid;
707707
Oid tableoid;
708708
AclMode mode;
709709
AclResult aclresult;
@@ -751,7 +751,7 @@ has_table_privilege_id(PG_FUNCTION_ARGS)
751751
{
752752
Oid tableoid = PG_GETARG_OID(0);
753753
text *priv_type_text = PG_GETARG_TEXT_P(1);
754-
int32 usesysid;
754+
AclId usesysid;
755755
AclMode mode;
756756
AclResult aclresult;
757757

@@ -913,7 +913,7 @@ has_database_privilege_name(PG_FUNCTION_ARGS)
913913
{
914914
text *databasename = PG_GETARG_TEXT_P(0);
915915
text *priv_type_text = PG_GETARG_TEXT_P(1);
916-
int32 usesysid;
916+
AclId usesysid;
917917
Oid databaseoid;
918918
AclMode mode;
919919
AclResult aclresult;
@@ -961,7 +961,7 @@ has_database_privilege_id(PG_FUNCTION_ARGS)
961961
{
962962
Oid databaseoid = PG_GETARG_OID(0);
963963
text *priv_type_text = PG_GETARG_TEXT_P(1);
964-
int32 usesysid;
964+
AclId usesysid;
965965
AclMode mode;
966966
AclResult aclresult;
967967

@@ -1116,7 +1116,7 @@ has_function_privilege_name(PG_FUNCTION_ARGS)
11161116
{
11171117
text *functionname = PG_GETARG_TEXT_P(0);
11181118
text *priv_type_text = PG_GETARG_TEXT_P(1);
1119-
int32 usesysid;
1119+
AclId usesysid;
11201120
Oid functionoid;
11211121
AclMode mode;
11221122
AclResult aclresult;
@@ -1164,7 +1164,7 @@ has_function_privilege_id(PG_FUNCTION_ARGS)
11641164
{
11651165
Oid functionoid = PG_GETARG_OID(0);
11661166
text *priv_type_text = PG_GETARG_TEXT_P(1);
1167-
int32 usesysid;
1167+
AclId usesysid;
11681168
AclMode mode;
11691169
AclResult aclresult;
11701170

@@ -1315,7 +1315,7 @@ has_language_privilege_name(PG_FUNCTION_ARGS)
13151315
{
13161316
text *languagename = PG_GETARG_TEXT_P(0);
13171317
text *priv_type_text = PG_GETARG_TEXT_P(1);
1318-
int32 usesysid;
1318+
AclId usesysid;
13191319
Oid languageoid;
13201320
AclMode mode;
13211321
AclResult aclresult;
@@ -1363,7 +1363,7 @@ has_language_privilege_id(PG_FUNCTION_ARGS)
13631363
{
13641364
Oid languageoid = PG_GETARG_OID(0);
13651365
text *priv_type_text = PG_GETARG_TEXT_P(1);
1366-
int32 usesysid;
1366+
AclId usesysid;
13671367
AclMode mode;
13681368
AclResult aclresult;
13691369

@@ -1514,7 +1514,7 @@ has_schema_privilege_name(PG_FUNCTION_ARGS)
15141514
{
15151515
text *schemaname = PG_GETARG_TEXT_P(0);
15161516
text *priv_type_text = PG_GETARG_TEXT_P(1);
1517-
int32 usesysid;
1517+
AclId usesysid;
15181518
Oid schemaoid;
15191519
AclMode mode;
15201520
AclResult aclresult;
@@ -1562,7 +1562,7 @@ has_schema_privilege_id(PG_FUNCTION_ARGS)
15621562
{
15631563
Oid schemaoid = PG_GETARG_OID(0);
15641564
text *priv_type_text = PG_GETARG_TEXT_P(1);
1565-
int32 usesysid;
1565+
AclId usesysid;
15661566
AclMode mode;
15671567
AclResult aclresult;
15681568

‎src/backend/utils/adt/ri_triggers.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
1919
*
20-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.44 2002/11/29 21:39:11 tgl Exp $
20+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.45 2002/12/05 04:04:43 momjian Exp $
2121
*
2222
* ----------
2323
*/
@@ -171,7 +171,7 @@ RI_FKey_check(PG_FUNCTION_ARGS)
171171
bool isnull;
172172
int i;
173173
int match_type;
174-
Oid save_uid;
174+
AclId save_uid;
175175

176176
save_uid = GetUserId();
177177

@@ -546,7 +546,7 @@ ri_Check_Pk_Match(Relation pk_rel, HeapTuple old_row, Oid tgoid, int match_type,
546546
Datum check_values[RI_MAX_NUMKEYS];
547547
char check_nulls[RI_MAX_NUMKEYS + 1];
548548
int i;
549-
Oid save_uid;
549+
AclId save_uid;
550550
bool result;
551551

552552
save_uid = GetUserId();
@@ -712,7 +712,7 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
712712
bool isnull;
713713
int i;
714714
int match_type;
715-
Oid save_uid;
715+
AclId save_uid;
716716

717717
save_uid = GetUserId();
718718

@@ -942,7 +942,7 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
942942
bool isnull;
943943
int i;
944944
int match_type;
945-
Oid save_uid;
945+
AclId save_uid;
946946

947947
save_uid = GetUserId();
948948

@@ -1179,8 +1179,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
11791179
char del_nulls[RI_MAX_NUMKEYS + 1];
11801180
bool isnull;
11811181
int i;
1182-
Oid save_uid;
1183-
Oid fk_owner;
1182+
AclId save_uid;
1183+
AclId fk_owner;
11841184

11851185
ReferentialIntegritySnapshotOverride = true;
11861186

@@ -1387,8 +1387,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
13871387
bool isnull;
13881388
int i;
13891389
int j;
1390-
Oid save_uid;
1391-
Oid fk_owner;
1390+
AclId save_uid;
1391+
AclId fk_owner;
13921392

13931393
ReferentialIntegritySnapshotOverride = true;
13941394

@@ -1631,8 +1631,8 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
16311631
char del_nulls[RI_MAX_NUMKEYS + 1];
16321632
bool isnull;
16331633
int i;
1634-
Oid save_uid;
1635-
Oid fk_owner;
1634+
AclId save_uid;
1635+
AclId fk_owner;
16361636

16371637
ReferentialIntegritySnapshotOverride = true;
16381638

@@ -1854,8 +1854,8 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
18541854
char upd_nulls[RI_MAX_NUMKEYS + 1];
18551855
bool isnull;
18561856
int i;
1857-
Oid save_uid;
1858-
Oid fk_owner;
1857+
AclId save_uid;
1858+
AclId fk_owner;
18591859

18601860
ReferentialIntegritySnapshotOverride = true;
18611861

@@ -2082,8 +2082,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
20822082
char upd_nulls[RI_MAX_NUMKEYS + 1];
20832083
bool isnull;
20842084
int i;
2085-
Oid save_uid;
2086-
Oid fk_owner;
2085+
AclId save_uid;
2086+
AclId fk_owner;
20872087

20882088
ReferentialIntegritySnapshotOverride = true;
20892089

@@ -2301,8 +2301,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
23012301
int i;
23022302
int match_type;
23032303
bool use_cached_query;
2304-
Oid save_uid;
2305-
Oid fk_owner;
2304+
AclId save_uid;
2305+
AclId fk_owner;
23062306

23072307
ReferentialIntegritySnapshotOverride = true;
23082308

@@ -2566,8 +2566,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
25662566
char upd_nulls[RI_MAX_NUMKEYS + 1];
25672567
bool isnull;
25682568
int i;
2569-
Oid save_uid;
2570-
Oid fk_owner;
2569+
AclId save_uid;
2570+
AclId fk_owner;
25712571

25722572
ReferentialIntegritySnapshotOverride = true;
25732573

@@ -2828,8 +2828,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
28282828
bool isnull;
28292829
int i;
28302830
int match_type;
2831-
Oid save_uid;
2832-
Oid fk_owner;
2831+
AclId save_uid;
2832+
AclId fk_owner;
28332833

28342834
ReferentialIntegritySnapshotOverride = true;
28352835

0 commit comments

Comments
 (0)