rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change owner from oid to int4 type.

This commit is contained in:
Bruce Momjian 1998-08-11 18:28:49 +00:00
parent 8ed36c3dba
commit 79c8d2e3a0
20 changed files with 83 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
contrib/findoidjoins/README
View File

@ -13,32 +13,30 @@ Run on am empty database, it returns the system join relationships:
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Join pg_aggregate.aggbasetype => pg_proc.oid
Join pg_aggregate.aggbasetype => pg_type.oid
Join pg_aggregate.aggfinalfn => pg_proc.oid
Join pg_aggregate.aggfinaltype => pg_proc.oid
Join pg_aggregate.aggfinaltype => pg_type.oid
Join pg_aggregate.aggowner => pg_proc.oid
Join pg_aggregate.aggtransfn1 => pg_proc.oid Join pg_aggregate.aggtransfn1 => pg_proc.oid
Join pg_aggregate.aggtransfn2 => pg_proc.oid Join pg_aggregate.aggtransfn2 => pg_proc.oid
Join pg_aggregate.aggfinalfn => pg_proc.oid
Join pg_aggregate.aggbasetype => pg_proc.oid
Join pg_aggregate.aggbasetype => pg_type.oid
Join pg_aggregate.aggtranstype1 => pg_proc.oid Join pg_aggregate.aggtranstype1 => pg_proc.oid
Join pg_aggregate.aggtranstype1 => pg_type.oid Join pg_aggregate.aggtranstype1 => pg_type.oid
Join pg_aggregate.aggtranstype2 => pg_type.oid Join pg_aggregate.aggtranstype2 => pg_type.oid
Join pg_am.ambeginscan => pg_proc.oid Join pg_aggregate.aggfinaltype => pg_proc.oid
Join pg_am.ambuild => pg_proc.oid Join pg_aggregate.aggfinaltype => pg_type.oid
Join pg_am.amdelete => pg_proc.oid
Join pg_am.amendscan => pg_proc.oid
Join pg_am.amgettuple => pg_proc.oid Join pg_am.amgettuple => pg_proc.oid
Join pg_am.aminsert => pg_proc.oid Join pg_am.aminsert => pg_proc.oid
Join pg_am.ammarkpos => pg_proc.oid Join pg_am.amdelete => pg_proc.oid
Join pg_am.amowner => pg_proc.oid Join pg_am.ambeginscan => pg_proc.oid
Join pg_am.amrescan => pg_proc.oid Join pg_am.amrescan => pg_proc.oid
Join pg_am.amendscan => pg_proc.oid
Join pg_am.ammarkpos => pg_proc.oid
Join pg_am.amrestrpos => pg_proc.oid Join pg_am.amrestrpos => pg_proc.oid
Join pg_amop.amopclaid => pg_opclass.oid Join pg_am.ambuild => pg_proc.oid
Join pg_amop.amopid => pg_am.oid Join pg_amop.amopid => pg_am.oid
Join pg_amop.amopnpages => pg_proc.oid Join pg_amop.amopclaid => pg_opclass.oid
Join pg_amop.amopopr => pg_operator.oid Join pg_amop.amopopr => pg_operator.oid
Join pg_amop.amopselect => pg_proc.oid Join pg_amop.amopselect => pg_proc.oid
Join pg_amop.amopnpages => pg_proc.oid
Join pg_amproc.amid => pg_am.oid Join pg_amproc.amid => pg_am.oid
Join pg_amproc.amopclaid => pg_opclass.oid Join pg_amproc.amopclaid => pg_opclass.oid
Join pg_amproc.amopclaid => pg_operator.oid Join pg_amproc.amopclaid => pg_operator.oid
@ -47,42 +45,37 @@ Join pg_amproc.amproc => pg_operator.oid
Join pg_amproc.amproc => pg_proc.oid Join pg_amproc.amproc => pg_proc.oid
Join pg_attribute.attrelid => pg_class.oid Join pg_attribute.attrelid => pg_class.oid
Join pg_attribute.atttypid => pg_type.oid Join pg_attribute.atttypid => pg_type.oid
Join pg_class.relam => pg_am.oid
Join pg_class.relowner => pg_proc.oid
Join pg_class.reltype => pg_type.oid Join pg_class.reltype => pg_type.oid
Join pg_class.relam => pg_am.oid
Join pg_description.objoid => pg_proc.oid Join pg_description.objoid => pg_proc.oid
Join pg_description.objoid => pg_type.oid Join pg_description.objoid => pg_type.oid
Join pg_index.indexrelid => pg_class.oid Join pg_index.indexrelid => pg_class.oid
Join pg_index.indproc => pg_proc.oid
Join pg_index.indrelid => pg_class.oid Join pg_index.indrelid => pg_class.oid
Join pg_index.indproc => pg_proc.oid
Join pg_opclass.opcdeftype => pg_type.oid Join pg_opclass.opcdeftype => pg_type.oid
Join pg_operator.oprcode => pg_proc.oid
Join pg_operator.oprcom => pg_operator.oid
Join pg_operator.oprjoin => pg_proc.oid
Join pg_operator.oprleft => pg_type.oid Join pg_operator.oprleft => pg_type.oid
Join pg_operator.oprlsortop => pg_operator.oid
Join pg_operator.oprnegate => pg_operator.oid
Join pg_operator.oprowner => pg_proc.oid
Join pg_operator.oprrest => pg_proc.oid
Join pg_operator.oprresult => pg_type.oid
Join pg_operator.oprright => pg_type.oid Join pg_operator.oprright => pg_type.oid
Join pg_operator.oprresult => pg_type.oid
Join pg_operator.oprcom => pg_operator.oid
Join pg_operator.oprnegate => pg_operator.oid
Join pg_operator.oprlsortop => pg_operator.oid
Join pg_operator.oprrsortop => pg_operator.oid Join pg_operator.oprrsortop => pg_operator.oid
Join pg_operator.oprcode => pg_proc.oid
Join pg_operator.oprrest => pg_proc.oid
Join pg_operator.oprjoin => pg_proc.oid
Join pg_parg.parproid => pg_operator.oid Join pg_parg.parproid => pg_operator.oid
Join pg_parg.parproid => pg_proc.oid Join pg_parg.parproid => pg_proc.oid
Join pg_parg.partype => pg_type.oid Join pg_parg.partype => pg_type.oid
Join pg_proc.prolang => pg_language.oid Join pg_proc.prolang => pg_language.oid
Join pg_proc.proowner => pg_proc.oid
Join pg_proc.prorettype => pg_type.oid Join pg_proc.prorettype => pg_type.oid
Join pg_rewrite.ev_class => pg_class.oid Join pg_rewrite.ev_class => pg_class.oid
Join pg_statistic.starelid => pg_class.oid Join pg_type.typrelid => pg_class.oid
Join pg_type.typelem => pg_operator.oid Join pg_type.typelem => pg_operator.oid
Join pg_type.typelem => pg_proc.oid Join pg_type.typelem => pg_proc.oid
Join pg_type.typelem => pg_type.oid Join pg_type.typelem => pg_type.oid
Join pg_type.typinput => pg_proc.oid Join pg_type.typinput => pg_proc.oid
Join pg_type.typoutput => pg_proc.oid Join pg_type.typoutput => pg_proc.oid
Join pg_type.typowner => pg_proc.oid
Join pg_type.typreceive => pg_proc.oid Join pg_type.typreceive => pg_proc.oid
Join pg_type.typrelid => pg_class.oid
Join pg_type.typsend => pg_proc.oid Join pg_type.typsend => pg_proc.oid

2
contrib/findoidjoins/findoidjoins.c
View File

@ -39,7 +39,7 @@ main(int argc, char **argv)
typname = 'regproc') AND \ typname = 'regproc') AND \
a.attrelid = c.oid AND \ a.attrelid = c.oid AND \
a.atttypid = t.oid \ a.atttypid = t.oid \
ORDER BY 2, 3; \ ORDER BY 2, a.attnum ; \
"); ");
doquery("FETCH ALL IN c_attributes"); doquery("FETCH ALL IN c_attributes");
attres = get_result(); attres = get_result();

8
src/backend/catalog/aclchk.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.12 1998/07/27 19:37:45 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.13 1998/08/11 18:28:11 momjian Exp $
* *
* NOTES * NOTES
* See acl.h. * See acl.h.
@ -455,14 +455,14 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
* if the acl is null, by default the owner can do whatever he * if the acl is null, by default the owner can do whatever he
* wants to with it * wants to with it
*/ */
Oid ownerId; int4 ownerId;
relation = heap_openr(RelationRelationName); relation = heap_openr(RelationRelationName);
ownerId = (Oid) heap_getattr(htp, ownerId = (int4) heap_getattr(htp,
Anum_pg_class_relowner, Anum_pg_class_relowner,
RelationGetTupleDescriptor(relation), RelationGetTupleDescriptor(relation),
(bool *) NULL); (bool *) NULL);
acl = aclownerdefault(relname, ownerId); acl = aclownerdefault(relname, (AclId)ownerId);
} }
#else #else
{ /* This is why the syscache is great... */ { /* This is why the syscache is great... */

10
src/backend/commands/dbcommands.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.18 1998/07/27 19:37:52 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.19 1998/08/11 18:28:13 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -38,7 +38,7 @@
/* non-export function prototypes */ /* non-export function prototypes */
static void static void
check_permissions(char *command, char *dbpath, char *dbname, check_permissions(char *command, char *dbpath, char *dbname,
Oid *dbIdP, Oid *userIdP); Oid *dbIdP, int4 *userIdP);
static HeapTuple get_pg_dbtup(char *command, char *dbname, Relation dbrel); static HeapTuple get_pg_dbtup(char *command, char *dbname, Relation dbrel);
static void stop_vacuum(char *dbpath, char *dbname); static void stop_vacuum(char *dbpath, char *dbname);
@ -191,12 +191,12 @@ check_permissions(char *command,
char *dbpath, char *dbpath,
char *dbname, char *dbname,
Oid *dbIdP, Oid *dbIdP,
Oid *userIdP) int4 *userIdP)
{ {
Relation dbrel; Relation dbrel;
HeapTuple dbtup, HeapTuple dbtup,
utup; utup;
Oid dbowner = (Oid) 0; int4 dbowner = 0;
char use_createdb; char use_createdb;
bool dbfound; bool dbfound;
bool use_super; bool use_super;
@ -250,7 +250,7 @@ check_permissions(char *command,
if (dbfound) if (dbfound)
{ {
dbowner = (Oid) heap_getattr(dbtup, dbowner = (int4) heap_getattr(dbtup,
Anum_pg_database_datdba, Anum_pg_database_datdba,
RelationGetTupleDescriptor(dbrel), RelationGetTupleDescriptor(dbrel),
(char *) NULL); (char *) NULL);

10
src/backend/storage/smgr/md.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.35 1998/07/26 04:30:44 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.36 1998/08/11 18:28:15 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -565,8 +565,8 @@ mdblindwrt(char *dbstr,
/* this is work arround only !!! */ /* this is work arround only !!! */
{ {
char dbpath[MAXPGPATH + 1]; char dbpath[MAXPGPATH + 1];
Oid owner, int4 owner;
id; Oid id;
char *tmpPath; char *tmpPath;
#ifdef MULTIBYTE #ifdef MULTIBYTE
int tmpEncoding; int tmpEncoding;
@ -610,8 +610,8 @@ mdblindwrt(char *dbstr,
/* this is work arround only !!! */ /* this is work arround only !!! */
{ {
char dbpath[MAXPGPATH + 1]; char dbpath[MAXPGPATH + 1];
Oid owner, int4 owner;
id; Oid id;
char *tmpPath; char *tmpPath;
#ifdef MULTIBYTE #ifdef MULTIBYTE

5
src/backend/utils/cache/lsyscache.c vendored
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.17 1998/08/11 14:32:01 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.18 1998/08/11 18:28:18 momjian Exp $
* *
* NOTES * NOTES
* Eventually, the index information should go through here, too. * Eventually, the index information should go through here, too.
@ -50,7 +50,7 @@ op_class(Oid oprno, int32 opclass, Oid amopid)
if (SearchSysCacheStruct(AMOPOPID, if (SearchSysCacheStruct(AMOPOPID,
(char *) &amoptup, (char *) &amoptup,
ObjectIdGetDatum(opclass), ObjectIdGetDatum(opclass),
ObjectIdGetDatum(opno), ObjectIdGetDatum(oprno),
ObjectIdGetDatum(amopid), ObjectIdGetDatum(amopid),
0)) 0))
return true; return true;
@ -245,7 +245,6 @@ op_mergejoinable(Oid opno, Oid ltype, Oid rtype, Oid *leftOp, Oid *rightOp)
optup.oprleft == ltype && optup.oprleft == ltype &&
optup.oprright == rtype) optup.oprright == rtype)
{ {
*leftOp = ObjectIdGetDatum(optup.oprlsortop); *leftOp = ObjectIdGetDatum(optup.oprlsortop);
*rightOp = ObjectIdGetDatum(optup.oprrsortop); *rightOp = ObjectIdGetDatum(optup.oprrsortop);
return TRUE; return TRUE;

4
src/backend/utils/cache/relcache.c vendored
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.45 1998/08/01 15:26:29 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.46 1998/08/11 18:28:22 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1063,7 +1063,7 @@ formrdesc(char *relationName,
} }
else else
{ {
relation->rd_rel->relowner = InvalidOid; /* XXX incorrect */ relation->rd_rel->relowner = 0;
relation->rd_rel->relisshared = false; relation->rd_rel->relisshared = false;
} }

4
src/backend/utils/init/miscinit.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.18 1998/07/26 04:31:01 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.19 1998/08/11 18:28:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -442,7 +442,7 @@ SetPgUserName()
*/ */
static Oid UserId = InvalidOid; static Oid UserId = InvalidOid;
Oid int
GetUserId() GetUserId()
{ {
Assert(OidIsValid(UserId)); Assert(OidIsValid(UserId));

8
src/backend/utils/init/postinit.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.32 1998/07/26 04:31:01 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.33 1998/08/11 18:28:28 momjian Exp $
* *
* NOTES * NOTES
* InitPostgres() is the function called from PostgresMain * InitPostgres() is the function called from PostgresMain
@ -84,9 +84,9 @@ static void InitUserid(void);
extern char *ExpandDatabasePath(char *name); extern char *ExpandDatabasePath(char *name);
#ifdef MULTIBYTE #ifdef MULTIBYTE
extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path, int *encoding); extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path, int *encoding);
#else #else
extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path); extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path);
#endif #endif
static IPCKey PostgresIpcKey; static IPCKey PostgresIpcKey;
@ -125,7 +125,7 @@ static IPCKey PostgresIpcKey;
static void static void
InitMyDatabaseInfo(char *name) InitMyDatabaseInfo(char *name)
{ {
Oid owner; int4 owner;
char *path, char *path,
myPath[MAXPGPATH + 1]; myPath[MAXPGPATH + 1];
#ifdef MULTIBYTE #ifdef MULTIBYTE

6
src/backend/utils/misc/database.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.14 1998/07/27 19:38:26 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.15 1998/08/11 18:28:30 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,7 +35,7 @@
* Pull database information from pg_database. * Pull database information from pg_database.
*/ */
int int
GetDatabaseInfo(char *name, Oid *owner, char *path) GetDatabaseInfo(char *name, int4 *owner, char *path)
{ {
Oid dbowner, Oid dbowner,
dbid; dbid;
@ -179,7 +179,7 @@ ExpandDatabasePath(char *dbpath)
* -------------------------------- * --------------------------------
*/ */
void void
GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path) GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path)
{ {
int dbfd; int dbfd;
int fileflags; int fileflags;

4
src/include/catalog/pg_aggregate.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_aggregate.h,v 1.15 1998/07/08 14:08:58 thomas Exp $ * $Id: pg_aggregate.h,v 1.16 1998/08/11 18:28:36 momjian Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -45,7 +45,7 @@
CATALOG(pg_aggregate) CATALOG(pg_aggregate)
{ {
NameData aggname; NameData aggname;
Oid aggowner; int4 aggowner;
regproc aggtransfn1; regproc aggtransfn1;
regproc aggtransfn2; regproc aggtransfn2;
regproc aggfinalfn; regproc aggfinalfn;

4
src/include/catalog/pg_am.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_am.h,v 1.6 1998/08/11 05:32:43 momjian Exp $ * $Id: pg_am.h,v 1.7 1998/08/11 18:28:37 momjian Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -36,7 +36,7 @@
CATALOG(pg_am) CATALOG(pg_am)
{ {
NameData amname; NameData amname;
Oid amowner; int4 amowner;
char amkind; char amkind;
int2 amstrategies; int2 amstrategies;
int2 amsupport; int2 amsupport;

14
src/include/catalog/pg_attribute.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_attribute.h,v 1.33 1998/07/12 21:29:28 momjian Exp $ * $Id: pg_attribute.h,v 1.34 1998/08/11 18:28:39 momjian Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -179,7 +179,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
*/ */
#define Schema_pg_type \ #define Schema_pg_type \
{ 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
{ 1247, {"typowner"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1247, {"typowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1247, {"typlen"}, 21, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1247, {"typlen"}, 21, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
{ 1247, {"typprtlen"}, 21, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1247, {"typprtlen"}, 21, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
{ 1247, {"typbyval"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1247, {"typbyval"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@ -196,7 +196,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
{ 1247, {"typdefault"}, 25, 0, -1, 16, 0, -1, -1, '\0' , '\0', 'i', '\0', '\0' } { 1247, {"typdefault"}, 25, 0, -1, 16, 0, -1, -1, '\0' , '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1247 typname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1247 typname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
DATA(insert OID = 0 ( 1247 typowner 26 0 4 2 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1247 typowner 23 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1247 typlen 21 0 2 3 0 -1 -1 t f s f f)); DATA(insert OID = 0 ( 1247 typlen 21 0 2 3 0 -1 -1 t f s f f));
DATA(insert OID = 0 ( 1247 typprtlen 21 0 2 4 0 -1 -1 t f s f f)); DATA(insert OID = 0 ( 1247 typprtlen 21 0 2 4 0 -1 -1 t f s f f));
DATA(insert OID = 0 ( 1247 typbyval 16 0 1 5 0 -1 -1 t f c f f)); DATA(insert OID = 0 ( 1247 typbyval 16 0 1 5 0 -1 -1 t f c f f));
@ -238,7 +238,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f));
*/ */
#define Schema_pg_proc \ #define Schema_pg_proc \
{ 1255, {"proname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1255, {"proname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
{ 1255, {"proowner"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1255, {"proowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1255, {"prolang"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1255, {"prolang"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1255, {"proisinh"}, 16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1255, {"proisinh"}, 16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
{ 1255, {"proistrusted"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1255, {"proistrusted"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@ -255,7 +255,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f));
{ 1255, {"probin"}, 17, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } { 1255, {"probin"}, 17, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1255 proname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1255 proname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
DATA(insert OID = 0 ( 1255 proowner 26 0 4 2 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1255 proowner 23 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1255 prolang 26 0 4 3 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1255 prolang 26 0 4 3 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1255 proisinh 16 0 1 4 0 -1 -1 t f c f f)); DATA(insert OID = 0 ( 1255 proisinh 16 0 1 4 0 -1 -1 t f c f f));
DATA(insert OID = 0 ( 1255 proistrusted 16 0 1 5 0 -1 -1 t f c f f)); DATA(insert OID = 0 ( 1255 proistrusted 16 0 1 5 0 -1 -1 t f c f f));
@ -358,7 +358,7 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f));
#define Schema_pg_class \ #define Schema_pg_class \
{ 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relowner"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"relowner"}, 23, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
@ -373,7 +373,7 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relowner 26 0 4 3 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 relowner 23 0 4 3 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relam 26 0 4 4 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 relam 26 0 4 4 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relpages 23 0 4 5 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 relpages 23 0 4 5 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 reltuples 23 0 4 6 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 reltuples 23 0 4 6 0 -1 -1 t f i f f));

14
src/include/catalog/pg_attribute_mb.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_attribute_mb.h,v 1.2 1998/08/06 05:13:03 momjian Exp $ * $Id: pg_attribute_mb.h,v 1.3 1998/08/11 18:28:41 momjian Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -179,7 +179,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
*/ */
#define Schema_pg_type \ #define Schema_pg_type \
{ 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
{ 1247, {"typowner"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1247, {"typowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1247, {"typlen"}, 21, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1247, {"typlen"}, 21, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
{ 1247, {"typprtlen"}, 21, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1247, {"typprtlen"}, 21, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
{ 1247, {"typbyval"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1247, {"typbyval"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@ -196,7 +196,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
{ 1247, {"typdefault"}, 25, 0, -1, 16, 0, -1, -1, '\0' , '\0', 'i', '\0', '\0' } { 1247, {"typdefault"}, 25, 0, -1, 16, 0, -1, -1, '\0' , '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1247 typname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1247 typname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
DATA(insert OID = 0 ( 1247 typowner 26 0 4 2 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1247 typowner 23 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1247 typlen 21 0 2 3 0 -1 -1 t f s f f)); DATA(insert OID = 0 ( 1247 typlen 21 0 2 3 0 -1 -1 t f s f f));
DATA(insert OID = 0 ( 1247 typprtlen 21 0 2 4 0 -1 -1 t f s f f)); DATA(insert OID = 0 ( 1247 typprtlen 21 0 2 4 0 -1 -1 t f s f f));
DATA(insert OID = 0 ( 1247 typbyval 16 0 1 5 0 -1 -1 t f c f f)); DATA(insert OID = 0 ( 1247 typbyval 16 0 1 5 0 -1 -1 t f c f f));
@ -239,7 +239,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f));
*/ */
#define Schema_pg_proc \ #define Schema_pg_proc \
{ 1255, {"proname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1255, {"proname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
{ 1255, {"proowner"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1255, {"proowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1255, {"prolang"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1255, {"prolang"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1255, {"proisinh"}, 16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1255, {"proisinh"}, 16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
{ 1255, {"proistrusted"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1255, {"proistrusted"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@ -256,7 +256,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f));
{ 1255, {"probin"}, 17, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } { 1255, {"probin"}, 17, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }
DATA(insert OID = 0 ( 1255 proname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1255 proname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
DATA(insert OID = 0 ( 1255 proowner 26 0 4 2 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1255 proowner 23 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1255 prolang 26 0 4 3 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1255 prolang 26 0 4 3 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1255 proisinh 16 0 1 4 0 -1 -1 t f c f f)); DATA(insert OID = 0 ( 1255 proisinh 16 0 1 4 0 -1 -1 t f c f f));
DATA(insert OID = 0 ( 1255 proistrusted 16 0 1 5 0 -1 -1 t f c f f)); DATA(insert OID = 0 ( 1255 proistrusted 16 0 1 5 0 -1 -1 t f c f f));
@ -359,7 +359,7 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f));
#define Schema_pg_class \ #define Schema_pg_class \
{ 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relowner"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"relowner"}, 23, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
{ 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
@ -374,7 +374,7 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f));
DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relowner 26 0 4 3 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 relowner 23 0 4 3 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relam 26 0 4 4 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 relam 26 0 4 4 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 relpages 23 0 4 5 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 relpages 23 0 4 5 0 -1 -1 t f i f f));
DATA(insert OID = 0 ( 1259 reltuples 23 0 4 6 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1259 reltuples 23 0 4 6 0 -1 -1 t f i f f));

4
src/include/catalog/pg_class.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_class.h,v 1.21 1998/08/06 05:13:05 momjian Exp $ * $Id: pg_class.h,v 1.22 1998/08/11 18:28:43 momjian Exp $
* *
* NOTES * NOTES
* ``pg_relation'' is being replaced by ``pg_class''. currently * ``pg_relation'' is being replaced by ``pg_class''. currently
@ -54,7 +54,7 @@ CATALOG(pg_class) BOOTSTRAP
{ {
NameData relname; NameData relname;
Oid reltype; Oid reltype;
Oid relowner; int4 relowner;
Oid relam; Oid relam;
int4 relpages; int4 relpages;
int4 reltuples; int4 reltuples;

4
src/include/catalog/pg_class_mb.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_class_mb.h,v 1.2 1998/08/06 05:13:07 momjian Exp $ * $Id: pg_class_mb.h,v 1.3 1998/08/11 18:28:44 momjian Exp $
* *
* NOTES * NOTES
* ``pg_relation'' is being replaced by ``pg_class''. currently * ``pg_relation'' is being replaced by ``pg_class''. currently
@ -54,7 +54,7 @@ CATALOG(pg_class) BOOTSTRAP
{ {
NameData relname; NameData relname;
Oid reltype; Oid reltype;
Oid relowner; int4 relowner;
Oid relam; Oid relam;
int4 relpages; int4 relpages;
int4 reltuples; int4 reltuples;

4
src/include/catalog/pg_operator.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_operator.h,v 1.32 1998/07/08 14:08:59 thomas Exp $ * $Id: pg_operator.h,v 1.33 1998/08/11 18:28:45 momjian Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -36,7 +36,7 @@
CATALOG(pg_operator) CATALOG(pg_operator)
{ {
NameData oprname; NameData oprname;
Oid oprowner; int4 oprowner;
int2 oprprec; int2 oprprec;
char oprkind; char oprkind;
bool oprisleft; bool oprisleft;

4
src/include/catalog/pg_proc.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_proc.h,v 1.63 1998/07/24 03:32:16 scrappy Exp $ * $Id: pg_proc.h,v 1.64 1998/08/11 18:28:47 momjian Exp $
* *
* NOTES * NOTES
* The script catalog/genbki.sh reads this file and generates .bki * The script catalog/genbki.sh reads this file and generates .bki
@ -39,7 +39,7 @@
CATALOG(pg_proc) BOOTSTRAP CATALOG(pg_proc) BOOTSTRAP
{ {
NameData proname; NameData proname;
Oid proowner; int4 proowner;
Oid prolang; Oid prolang;
bool proisinh; bool proisinh;
bool proistrusted; bool proistrusted;

4
src/include/catalog/pg_type.h
View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_type.h,v 1.42 1998/07/20 19:21:45 momjian Exp $ * $Id: pg_type.h,v 1.43 1998/08/11 18:28:49 momjian Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -40,7 +40,7 @@
CATALOG(pg_type) BOOTSTRAP CATALOG(pg_type) BOOTSTRAP
{ {
NameData typname; NameData typname;
Oid typowner; int4 typowner;
int2 typlen; int2 typlen;
/* /*

10
src/include/miscadmin.h
View File

@ -11,7 +11,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: miscadmin.h,v 1.29 1998/07/26 04:31:23 scrappy Exp $ * $Id: miscadmin.h,v 1.30 1998/08/11 18:28:33 momjian Exp $
* *
* NOTES * NOTES
* some of the information in this file will be moved to * some of the information in this file will be moved to
@ -117,11 +117,11 @@ extern char *DatabasePath;
/* in utils/misc/database.c */ /* in utils/misc/database.c */
#ifdef MULTIBYTE #ifdef MULTIBYTE
extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path, int *encoding); extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path, int *encoding);
#else #else
extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path); extern void GetRawDatabaseInfo(char *name, int4 *owner, Oid *db_id, char *path);
#endif #endif
extern int GetDatabaseInfo(char *name, Oid *owner, char *path); extern int GetDatabaseInfo(char *name, int4 *owner, char *path);
extern char *ExpandDatabasePath(char *path); extern char *ExpandDatabasePath(char *path);
/* now in utils/init/miscinit.c */ /* now in utils/init/miscinit.c */
@ -134,7 +134,7 @@ extern const char *getdatabaseencoding(void);
extern char *getpgusername(void); extern char *getpgusername(void);
extern void SetPgUserName(void); extern void SetPgUserName(void);
extern Oid GetUserId(void); extern int GetUserId(void);
extern void SetUserId(void); extern void SetUserId(void);
extern int ValidateBinary(char *path); extern int ValidateBinary(char *path);
extern int FindExec(char *backend, char *argv0, char *binary_name); extern int FindExec(char *backend, char *argv0, char *binary_name);