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 | 10 | ||||
| -rw-r--r-- | src/include/commands/sequence.h | 29 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 5 |
4 files changed, 36 insertions, 12 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 739f4cb422d..6a192ecd817 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catversion.h,v 1.89 2001/08/14 22:21:58 tgl Exp $ + * $Id: catversion.h,v 1.90 2001/08/16 20:38:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200108132 +#define CATALOG_VERSION_NO 200108151 #endif diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index ee867e4d3a7..e2a48dec681 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.205 2001/08/15 07:07:40 ishii Exp $ + * $Id: pg_proc.h,v 1.206 2001/08/16 20:38:54 tgl Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -2003,13 +2003,13 @@ DESCR("convert int8 to int8 (no-op)"); /* SEQUENCEs nextval & currval functions */ -DATA(insert OID = 1574 ( nextval PGUID 12 f t f t 1 f 23 "25" 100 0 0 100 nextval - )); +DATA(insert OID = 1574 ( nextval PGUID 12 f t f t 1 f 20 "25" 100 0 0 100 nextval - )); DESCR("sequence next value"); -DATA(insert OID = 1575 ( currval PGUID 12 f t f t 1 f 23 "25" 100 0 0 100 currval - )); +DATA(insert OID = 1575 ( currval PGUID 12 f t f t 1 f 20 "25" 100 0 0 100 currval - )); DESCR("sequence current value"); -DATA(insert OID = 1576 ( setval PGUID 12 f t f t 2 f 23 "25 23" 100 0 0 100 setval - )); +DATA(insert OID = 1576 ( setval PGUID 12 f t f t 2 f 20 "25 20" 100 0 0 100 setval - )); DESCR("set sequence value"); -DATA(insert OID = 1765 ( setval PGUID 12 f t f t 3 f 23 "25 23 16" 100 0 0 100 setval_and_iscalled - )); +DATA(insert OID = 1765 ( setval PGUID 12 f t f t 3 f 20 "25 20 16" 100 0 0 100 setval_and_iscalled - )); DESCR("set sequence value and iscalled status"); DATA(insert OID = 1579 ( varbit_in PGUID 12 f t t t 1 f 1562 "0" 100 0 0 100 varbit_in - )); diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index 75b2311481d..77a5470f439 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -3,6 +3,10 @@ * sequence.h * prototypes for sequence.c. * + * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * $Id: sequence.h,v 1.16 2001/08/16 20:38:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -12,17 +16,38 @@ #include "nodes/parsenodes.h" #include "access/xlog.h" +/* + * On a machine with no 64-bit-int C datatype, sizeof(int64) will not be 8, + * but we need this struct type to line up with the way that a sequence + * table is defined --- and pg_type will say that int8 is 8 bytes anyway. + * So, we need padding. Ugly but necessary. + */ typedef struct FormData_pg_sequence { NameData sequence_name; +#ifndef INT64_IS_BUSTED + int64 last_value; + int64 increment_by; + int64 max_value; + int64 min_value; + int64 cache_value; + int64 log_cnt; +#else int32 last_value; + int32 pad1; int32 increment_by; + int32 pad2; int32 max_value; + int32 pad3; int32 min_value; + int32 pad4; int32 cache_value; + int32 pad5; int32 log_cnt; - char is_cycled; - char is_called; + int32 pad6; +#endif + bool is_cycled; + bool is_called; } FormData_pg_sequence; typedef FormData_pg_sequence *Form_pg_sequence; diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index a76c6f949f1..e6752a9efcb 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.140 2001/08/10 18:57:41 tgl Exp $ + * $Id: parsenodes.h,v 1.141 2001/08/16 20:38:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1097,8 +1097,7 @@ typedef struct ColumnDef NodeTag type; char *colname; /* name of column */ TypeName *typename; /* type of column */ - bool is_not_null; /* flag to NOT NULL constraint */ - bool is_sequence; /* is a sequence? */ + bool is_not_null; /* NOT NULL constraint specified? */ Node *raw_default; /* default value (untransformed parse * tree) */ char *cooked_default; /* nodeToString representation */ |