diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.h | 14 | ||||
| -rw-r--r-- | src/include/utils/acl.h | 7 |
3 files changed, 21 insertions, 4 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 50eea65169b..9e1122982ae 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.224 2004/04/23 20:32:19 neilc Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.225 2004/04/26 15:06:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200404220 +#define CATALOG_VERSION_NO 200404260 #endif diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index f4998eee572..fa59adcfc81 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.325 2004/04/23 20:32:19 neilc Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.326 2004/04/26 15:06:49 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -3534,6 +3534,18 @@ DESCR("non-persistent series generator"); DATA(insert OID = 1069 ( generate_series PGNSP PGUID 12 f f t t v 2 20 "20 20" _null_ generate_series_int8 - _null_ )); DESCR("non-persistent series generator"); +/* aclitem utils */ +DATA(insert OID = 2510 ( aclitem_grantor PGNSP PGUID 12 f f t f i 1 23 "1033" _null_ aclitem_grantor - _null_ )); +DESCR("extract user id grantor from aclitem"); +DATA(insert OID = 2511 ( aclitem_grantee PGNSP PGUID 12 f f t f i 1 23 "1033" _null_ aclitem_grantee - _null_ )); +DESCR("extract grantee (user or group id) from aclitem"); +DATA(insert OID = 2512 ( aclitem_idtype PGNSP PGUID 12 f f t f i 1 23 "1033" _null_ aclitem_idtype - _null_ )); +DESCR("extract id type of grantee (0 public, 1 user, 2 group) from aclitem"); +DATA(insert OID = 2513 ( aclitem_privs PGNSP PGUID 12 f f t f i 1 23 "1033" _null_ aclitem_privs - _null_ )); +DESCR("extract privileges from aclitem"); +DATA(insert OID = 2514 ( aclitem_goptions PGNSP PGUID 12 f f t f i 1 23 "1033" _null_ aclitem_goptions - _null_ )); +DESCR("extract grant options from aclitem"); + /* * Symbolic values for provolatile column: these indicate whether the result diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index efe7af30b20..6cd1d7fb7ef 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.66 2004/01/14 23:01:55 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.67 2004/04/26 15:06:49 momjian Exp $ * * NOTES * An ACL array is simply an array of AclItems, representing the union @@ -220,6 +220,11 @@ extern Datum aclcontains(PG_FUNCTION_ARGS); extern Datum makeaclitem(PG_FUNCTION_ARGS); extern Datum aclitem_eq(PG_FUNCTION_ARGS); extern Datum hash_aclitem(PG_FUNCTION_ARGS); +extern Datum aclitem_grantee(PG_FUNCTION_ARGS); +extern Datum aclitem_grantor(PG_FUNCTION_ARGS); +extern Datum aclitem_idtype(PG_FUNCTION_ARGS); +extern Datum aclitem_privs(PG_FUNCTION_ARGS); +extern Datum aclitem_goptions(PG_FUNCTION_ARGS); /* * prototypes for functions in aclchk.c |