Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7816c7c

Browse files
committed
More cleanup of userid to be AclId rather than Oid.
1 parentcaaf941 commit7816c7c

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
staticvoidswap_relfilenodes(Oidr1,Oidr2);
6969
staticvoidcluster_rel(relToCluster*rv);
7070
staticboolcheck_cluster_ownership(OidrelOid);
71-
staticList*get_tables_to_cluster(Oidowner);
71+
staticList*get_tables_to_cluster(AclIdowner);
7272

7373
staticMemoryContextcluster_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
charsrc_loc[MAXPGPATH];
6464
charbuf[2*MAXPGPATH+100];
6565
Oidsrc_dboid;
66-
int4src_owner;
66+
AclIdsrc_owner;
6767
intsrc_encoding;
6868
boolsrc_istemplate;
6969
Oidsrc_lastsysoid;
@@ -76,7 +76,7 @@ createdb(const CreatedbStmt *stmt)
7676
Datumnew_record[Natts_pg_database];
7777
charnew_record_nulls[Natts_pg_database];
7878
Oiddboid;
79-
int32datdba;
79+
AclIddatdba;
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
boolretval;
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
constchar*owner_name;
44-
Oidowner_userid;
45-
Oidsaved_userid;
44+
AclIdowner_userid;
45+
AclIdsaved_userid;
4646
AclResultaclresult;
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
TupleDescpg_dsc;
985985
ScanKeyDatascankey;
986986
HeapScanDescscan;
987-
int32usesysid;
987+
AclIdusesysid;
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
constchar*
527527
assign_session_authorization(constchar*value,booldoit,boolinteractive)
528528
{
529-
Oidusesysid;
529+
AclIdusesysid;
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,CmdTypeoperation)
347347
{
348348
OidrelOid;
349-
Oiduserid;
349+
AclIduserid;
350350
AclResultaclcheck_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-
staticvoidsetRuleCheckAsUser(Query*qry,Oiduserid);
35+
staticvoidsetRuleCheckAsUser(Query*qry,AclIduserid);
3636
staticboolsetRuleCheckAsUser_walker(Node*node,Oid*context);
3737

3838

@@ -445,7 +445,7 @@ DefineQueryRewrite(RuleStmt *stmt)
445445
* them always.
446446
*/
447447
staticvoid
448-
setRuleCheckAsUser(Query*qry,Oiduserid)
448+
setRuleCheckAsUser(Query*qry,AclIduserid)
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-
int32usesysid;
706+
AclIdusesysid;
707707
Oidtableoid;
708708
AclModemode;
709709
AclResultaclresult;
@@ -751,7 +751,7 @@ has_table_privilege_id(PG_FUNCTION_ARGS)
751751
{
752752
Oidtableoid=PG_GETARG_OID(0);
753753
text*priv_type_text=PG_GETARG_TEXT_P(1);
754-
int32usesysid;
754+
AclIdusesysid;
755755
AclModemode;
756756
AclResultaclresult;
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-
int32usesysid;
916+
AclIdusesysid;
917917
Oiddatabaseoid;
918918
AclModemode;
919919
AclResultaclresult;
@@ -961,7 +961,7 @@ has_database_privilege_id(PG_FUNCTION_ARGS)
961961
{
962962
Oiddatabaseoid=PG_GETARG_OID(0);
963963
text*priv_type_text=PG_GETARG_TEXT_P(1);
964-
int32usesysid;
964+
AclIdusesysid;
965965
AclModemode;
966966
AclResultaclresult;
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-
int32usesysid;
1119+
AclIdusesysid;
11201120
Oidfunctionoid;
11211121
AclModemode;
11221122
AclResultaclresult;
@@ -1164,7 +1164,7 @@ has_function_privilege_id(PG_FUNCTION_ARGS)
11641164
{
11651165
Oidfunctionoid=PG_GETARG_OID(0);
11661166
text*priv_type_text=PG_GETARG_TEXT_P(1);
1167-
int32usesysid;
1167+
AclIdusesysid;
11681168
AclModemode;
11691169
AclResultaclresult;
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-
int32usesysid;
1318+
AclIdusesysid;
13191319
Oidlanguageoid;
13201320
AclModemode;
13211321
AclResultaclresult;
@@ -1363,7 +1363,7 @@ has_language_privilege_id(PG_FUNCTION_ARGS)
13631363
{
13641364
Oidlanguageoid=PG_GETARG_OID(0);
13651365
text*priv_type_text=PG_GETARG_TEXT_P(1);
1366-
int32usesysid;
1366+
AclIdusesysid;
13671367
AclModemode;
13681368
AclResultaclresult;
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-
int32usesysid;
1517+
AclIdusesysid;
15181518
Oidschemaoid;
15191519
AclModemode;
15201520
AclResultaclresult;
@@ -1562,7 +1562,7 @@ has_schema_privilege_id(PG_FUNCTION_ARGS)
15621562
{
15631563
Oidschemaoid=PG_GETARG_OID(0);
15641564
text*priv_type_text=PG_GETARG_TEXT_P(1);
1565-
int32usesysid;
1565+
AclIdusesysid;
15661566
AclModemode;
15671567
AclResultaclresult;
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
boolisnull;
172172
inti;
173173
intmatch_type;
174-
Oidsave_uid;
174+
AclIdsave_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
Datumcheck_values[RI_MAX_NUMKEYS];
547547
charcheck_nulls[RI_MAX_NUMKEYS+1];
548548
inti;
549-
Oidsave_uid;
549+
AclIdsave_uid;
550550
boolresult;
551551

552552
save_uid=GetUserId();
@@ -712,7 +712,7 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
712712
boolisnull;
713713
inti;
714714
intmatch_type;
715-
Oidsave_uid;
715+
AclIdsave_uid;
716716

717717
save_uid=GetUserId();
718718

@@ -942,7 +942,7 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
942942
boolisnull;
943943
inti;
944944
intmatch_type;
945-
Oidsave_uid;
945+
AclIdsave_uid;
946946

947947
save_uid=GetUserId();
948948

@@ -1179,8 +1179,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
11791179
chardel_nulls[RI_MAX_NUMKEYS+1];
11801180
boolisnull;
11811181
inti;
1182-
Oidsave_uid;
1183-
Oidfk_owner;
1182+
AclIdsave_uid;
1183+
AclIdfk_owner;
11841184

11851185
ReferentialIntegritySnapshotOverride= true;
11861186

@@ -1387,8 +1387,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
13871387
boolisnull;
13881388
inti;
13891389
intj;
1390-
Oidsave_uid;
1391-
Oidfk_owner;
1390+
AclIdsave_uid;
1391+
AclIdfk_owner;
13921392

13931393
ReferentialIntegritySnapshotOverride= true;
13941394

@@ -1631,8 +1631,8 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
16311631
chardel_nulls[RI_MAX_NUMKEYS+1];
16321632
boolisnull;
16331633
inti;
1634-
Oidsave_uid;
1635-
Oidfk_owner;
1634+
AclIdsave_uid;
1635+
AclIdfk_owner;
16361636

16371637
ReferentialIntegritySnapshotOverride= true;
16381638

@@ -1854,8 +1854,8 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
18541854
charupd_nulls[RI_MAX_NUMKEYS+1];
18551855
boolisnull;
18561856
inti;
1857-
Oidsave_uid;
1858-
Oidfk_owner;
1857+
AclIdsave_uid;
1858+
AclIdfk_owner;
18591859

18601860
ReferentialIntegritySnapshotOverride= true;
18611861

@@ -2082,8 +2082,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
20822082
charupd_nulls[RI_MAX_NUMKEYS+1];
20832083
boolisnull;
20842084
inti;
2085-
Oidsave_uid;
2086-
Oidfk_owner;
2085+
AclIdsave_uid;
2086+
AclIdfk_owner;
20872087

20882088
ReferentialIntegritySnapshotOverride= true;
20892089

@@ -2301,8 +2301,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
23012301
inti;
23022302
intmatch_type;
23032303
booluse_cached_query;
2304-
Oidsave_uid;
2305-
Oidfk_owner;
2304+
AclIdsave_uid;
2305+
AclIdfk_owner;
23062306

23072307
ReferentialIntegritySnapshotOverride= true;
23082308

@@ -2566,8 +2566,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
25662566
charupd_nulls[RI_MAX_NUMKEYS+1];
25672567
boolisnull;
25682568
inti;
2569-
Oidsave_uid;
2570-
Oidfk_owner;
2569+
AclIdsave_uid;
2570+
AclIdfk_owner;
25712571

25722572
ReferentialIntegritySnapshotOverride= true;
25732573

@@ -2828,8 +2828,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
28282828
boolisnull;
28292829
inti;
28302830
intmatch_type;
2831-
Oidsave_uid;
2832-
Oidfk_owner;
2831+
AclIdsave_uid;
2832+
AclIdfk_owner;
28332833

28342834
ReferentialIntegritySnapshotOverride= true;
28352835

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp