Revise collation derivation method and expression-tree representation.

[postgresql] / src / include / nodes / makefuncs.h

diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index f1b45e897bb93c9bcff56302d15ac89944939777..ead7c403ccecf773e6a95c6de87a42a4ac3e943a 100644 (file)
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -4,10 +4,10 @@
  *       prototypes for the creator functions (for primitive nodes)
  *
  *
- * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: makefuncs.h,v 1.45 2003/07/01 19:10:53 tgl Exp $
+ * src/include/nodes/makefuncs.h
  *
  *-------------------------------------------------------------------------
  */
@@ -18,45 +18,63 @@
 
 
 extern A_Expr *makeA_Expr(A_Expr_Kind kind, List *name,
-                                                 Node *lexpr, Node *rexpr);
+                  Node *lexpr, Node *rexpr, int location);
 
 extern A_Expr *makeSimpleA_Expr(A_Expr_Kind kind, const char *name,
-                                                               Node *lexpr, Node *rexpr);
+                                Node *lexpr, Node *rexpr, int location);
 
 extern Var *makeVar(Index varno,
                AttrNumber varattno,
                Oid vartype,
                int32 vartypmod,
+               Oid varcollid,
                Index varlevelsup);
 
-extern TargetEntry *makeTargetEntry(Resdom *resdom, Expr *expr);
+extern Var *makeVarFromTargetEntry(Index varno,
+                                                                  TargetEntry *tle);
 
-extern Resdom *makeResdom(AttrNumber resno,
-                  Oid restype,
-                  int32 restypmod,
-                  char *resname,
-                  bool resjunk);
+extern Var *makeWholeRowVar(RangeTblEntry *rte,
+                               Index varno,
+                               Index varlevelsup);
+
+extern TargetEntry *makeTargetEntry(Expr *expr,
+                               AttrNumber resno,
+                               char *resname,
+                               bool resjunk);
+
+extern TargetEntry *flatCopyTargetEntry(TargetEntry *src_tle);
+
+extern FromExpr *makeFromExpr(List *fromlist, Node *quals);
 
 extern Const *makeConst(Oid consttype,
+                 int32 consttypmod,
                  int constlen,
                  Datum constvalue,
                  bool constisnull,
                  bool constbyval);
 
-extern Const *makeNullConst(Oid consttype);
+extern Const *makeNullConst(Oid consttype, int32 consttypmod);
 
-extern Expr *makeBoolExpr(BoolExprType boolop, List *args);
+extern Node *makeBoolConst(bool value, bool isnull);
+
+extern Expr *makeBoolExpr(BoolExprType boolop, List *args, int location);
 
 extern Alias *makeAlias(const char *aliasname, List *colnames);
 
 extern RelabelType *makeRelabelType(Expr *arg, Oid rtype, int32 rtypmod,
-                                                                       CoercionForm rformat);
+                                                                       Oid rcollid, CoercionForm rformat);
 
-extern RangeVar *makeRangeVar(char *schemaname, char *relname);
+extern RangeVar *makeRangeVar(char *schemaname, char *relname, int location);
 
 extern TypeName *makeTypeName(char *typnam);
+extern TypeName *makeTypeNameFromNameList(List *names);
+extern TypeName *makeTypeNameFromOid(Oid typeOid, int32 typmod);
+
+extern FuncExpr *makeFuncExpr(Oid funcid, Oid rettype, List *args,
+                        Oid funccollid, Oid inputcollid, CoercionForm fformat);
 
-extern FuncExpr *makeFuncExpr(Oid funcid, Oid rettype,
-                                                         List *args, CoercionForm fformat);
+extern DefElem *makeDefElem(char *name, Node *arg);
+extern DefElem *makeDefElemExtended(char *nameSpace, char *name, Node *arg,
+                                       DefElemAction defaction);
 
 #endif   /* MAKEFUNC_H */