diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/commands/defrem.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 13 | ||||
| -rw-r--r-- | src/include/parser/analyze.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parse_expr.h | 3 | ||||
| -rw-r--r-- | src/include/tcop/tcopprot.h | 8 | ||||
| -rw-r--r-- | src/include/utils/acl.h | 8 |
6 files changed, 21 insertions, 19 deletions
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 2a7a4bdcfa8..dce401d7d9b 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: defrem.h,v 1.20 2000/08/24 03:29:09 tgl Exp $ + * $Id: defrem.h,v 1.21 2000/10/07 00:58:20 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -48,7 +48,7 @@ extern void DefineType(char *name, List *parameters); /* * prototypes in remove.c */ -extern void RemoveFunction(char *functionName, int nargs, List *argNameList); +extern void RemoveFunction(char *functionName, List *argTypes); extern void RemoveOperator(char *operatorName, char *typeName1, char *typeName2); extern void RemoveType(char *typeName); diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 41309426e8b..b50990fe299 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.115 2000/10/05 19:11:36 tgl Exp $ + * $Id: parsenodes.h,v 1.116 2000/10/07 00:58:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -114,9 +114,8 @@ typedef struct AlterTableStmt typedef struct ChangeACLStmt { NodeTag type; - struct AclItem *aclitem; - unsigned modechg; List *relNames; + char *aclString; } ChangeACLStmt; /* ---------------------- @@ -488,10 +487,8 @@ typedef struct ProcedureStmt { NodeTag type; char *funcname; /* name of function to create */ - List *defArgs; /* list of definitions a list of strings - * (as Value *) */ - Node *returnType; /* the return type (as a string or a - * TypeName (ie.setof) */ + List *argTypes; /* list of argument types (TypeName nodes) */ + Node *returnType; /* the return type (a TypeName node) */ List *withClause; /* a list of DefElem */ List *as; /* definition of function body */ char *language; /* C, SQL, etc */ @@ -505,7 +502,7 @@ typedef struct RemoveAggrStmt { NodeTag type; char *aggname; /* aggregate to drop */ - char *aggtype; /* for this type */ + Node *aggtype; /* TypeName for input datatype, or NULL */ } RemoveAggrStmt; /* ---------------------- diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index afd8a34fb3e..9d60e0f64c8 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.11 2000/10/05 19:11:38 tgl Exp $ + * $Id: analyze.h,v 1.12 2000/10/07 00:58:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -15,6 +15,6 @@ #include "parser/parse_node.h" -extern List *parse_analyze(List *pl, ParseState *parentParseState); +extern List *parse_analyze(Node *parseTree, ParseState *parentParseState); #endif /* ANALYZE_H */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 7f1b5d5122d..410a24bc455 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.19 2000/06/15 03:32:55 momjian Exp $ + * $Id: parse_expr.h,v 1.20 2000/10/07 00:58:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -26,5 +26,6 @@ extern Oid exprType(Node *expr); extern int32 exprTypmod(Node *expr); extern bool exprIsLengthCoercion(Node *expr, int32 *coercedTypmod); extern void parse_expr_init(void); +extern char *TypeNameToInternalName(TypeName *typename); #endif /* PARSE_EXPR_H */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index 562efca25cc..062a5818407 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.34 2000/09/06 14:15:28 petere Exp $ + * $Id: tcopprot.h,v 1.35 2000/10/07 00:58:23 tgl Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -35,9 +35,9 @@ extern bool ShowPortNumber; extern List *pg_parse_and_rewrite(char *query_string, Oid *typev, int nargs); extern Plan *pg_plan_query(Query *querytree); -extern void pg_exec_query_dest(char *query_string, - CommandDest dest, - MemoryContext parse_context); +extern void pg_exec_query_string(char *query_string, + CommandDest dest, + MemoryContext parse_context); #endif /* BOOTSTRAP_INCLUDE */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 4add4202fcb..8836bd1733e 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.28 2000/10/02 04:49:27 tgl Exp $ + * $Id: acl.h,v 1.29 2000/10/07 00:58:23 tgl Exp $ * * NOTES * For backward-compatibility purposes we have to allow there @@ -167,12 +167,15 @@ extern char *aclcheck_error_strings[]; /*#define ACLDEBUG_TRACE*/ /* - * routines used internally (parser, etc.) + * routines used internally */ extern Acl *acldefault(char *relname, AclId ownerid); extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg); +/* + * routines used by the parser + */ extern char *aclmakepriv(char *old_privlist, char new_priv); extern char *aclmakeuser(char *user_type, char *user); extern ChangeACLStmt *makeAclStmt(char *privs, List *rel_list, char *grantee, @@ -187,6 +190,7 @@ extern Datum aclitemout(PG_FUNCTION_ARGS); extern Datum aclinsert(PG_FUNCTION_ARGS); extern Datum aclremove(PG_FUNCTION_ARGS); extern Datum aclcontains(PG_FUNCTION_ARGS); +extern void ExecuteChangeACLStmt(ChangeACLStmt *stmt); /* * prototypes for functions in aclchk.c |