diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/makefuncs.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/primnodes.h | 13 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 206cad6ba9f..0ae5f0c8991 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.390 2007/03/16 17:57:36 mha Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.391 2007/03/17 00:11:05 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200703161 +#define CATALOG_VERSION_NO 200703162 #endif diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 470d0e137eb..b500024e932 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/makefuncs.h,v 1.57 2007/01/05 22:19:55 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/makefuncs.h,v 1.58 2007/03/17 00:11:05 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -37,6 +37,7 @@ extern TargetEntry *makeTargetEntry(Expr *expr, extern TargetEntry *flatCopyTargetEntry(TargetEntry *src_tle); extern Const *makeConst(Oid consttype, + int32 consttypmod, int constlen, Datum constvalue, bool constisnull, diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 7efb6ec77cf..475bc149d73 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.127 2007/02/22 22:00:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.128 2007/03/17 00:11:05 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -154,7 +154,8 @@ typedef struct Var typedef struct Const { Expr xpr; - Oid consttype; /* PG_TYPE OID of the constant's datatype */ + Oid consttype; /* pg_type OID of the constant's datatype */ + int32 consttypmod; /* typmod value, if any */ int constlen; /* typlen of the constant's datatype */ Datum constvalue; /* the constant's value */ bool constisnull; /* whether the constant is null (if true, @@ -236,17 +237,17 @@ typedef struct Aggref * reflowerindexpr must be the same length as refupperindexpr when it * is not NIL. * - * Note: refrestype is NOT the element type, but the array type, - * when doing subarray fetch or either type of store. + * Note: the result datatype is the element type when fetching a single + * element; but it is the array type when doing subarray fetch or either + * type of store. * ---------------- */ typedef struct ArrayRef { Expr xpr; - Oid refrestype; /* type of the result of the ArrayRef - * operation */ Oid refarraytype; /* type of the array proper */ Oid refelemtype; /* type of the array elements */ + int32 reftypmod; /* typmod of the array (and elements too) */ List *refupperindexpr;/* expressions that evaluate to upper array * indexes */ List *reflowerindexpr;/* expressions that evaluate to lower array |