diff -rc pgsql_sugar.orig/src/backend/catalog/heap.c pgsql_sugar/src/backend/catalog/heap.c *** pgsql_sugar.orig/src/backend/catalog/heap.c Mon Oct 29 20:40:39 2007 --- pgsql_sugar/src/backend/catalog/heap.c Tue Nov 6 12:47:46 2007 *************** *** 45,50 **** --- 45,51 ---- #include "catalog/pg_statistic.h" #include "catalog/pg_tablespace.h" #include "catalog/pg_type.h" + #include "catalog/pg_type_fn.h" #include "commands/tablecmds.h" #include "commands/typecmds.h" #include "miscadmin.h" diff -rc pgsql_sugar.orig/src/backend/catalog/pg_aggregate.c pgsql_sugar/src/backend/catalog/pg_aggregate.c *** pgsql_sugar.orig/src/backend/catalog/pg_aggregate.c Mon Sep 3 02:39:14 2007 --- pgsql_sugar/src/backend/catalog/pg_aggregate.c Tue Nov 6 12:47:46 2007 *************** *** 21,26 **** --- 21,27 ---- #include "catalog/pg_language.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" + #include "catalog/pg_proc_fn.h" #include "catalog/pg_type.h" #include "miscadmin.h" #include "parser/parse_coerce.h" diff -rc pgsql_sugar.orig/src/backend/catalog/pg_proc.c pgsql_sugar/src/backend/catalog/pg_proc.c *** pgsql_sugar.orig/src/backend/catalog/pg_proc.c Mon Sep 3 02:39:14 2007 --- pgsql_sugar/src/backend/catalog/pg_proc.c Tue Nov 6 12:47:46 2007 *************** *** 21,26 **** --- 21,27 ---- #include "catalog/pg_language.h" #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" + #include "catalog/pg_proc_fn.h" #include "catalog/pg_type.h" #include "executor/functions.h" #include "funcapi.h" diff -rc pgsql_sugar.orig/src/backend/catalog/pg_type.c pgsql_sugar/src/backend/catalog/pg_type.c *** pgsql_sugar.orig/src/backend/catalog/pg_type.c Sat May 12 02:54:59 2007 --- pgsql_sugar/src/backend/catalog/pg_type.c Tue Nov 6 12:47:46 2007 *************** *** 21,26 **** --- 21,27 ---- #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" + #include "catalog/pg_type_fn.h" #include "commands/typecmds.h" #include "miscadmin.h" #include "parser/scansup.h" diff -rc pgsql_sugar.orig/src/backend/commands/functioncmds.c pgsql_sugar/src/backend/commands/functioncmds.c *** pgsql_sugar.orig/src/backend/commands/functioncmds.c Mon Sep 3 20:46:29 2007 --- pgsql_sugar/src/backend/commands/functioncmds.c Tue Nov 6 12:47:46 2007 *************** *** 41,47 **** --- 41,49 ---- #include "catalog/pg_language.h" #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" + #include "catalog/pg_proc_fn.h" #include "catalog/pg_type.h" + #include "catalog/pg_type_fn.h" #include "commands/defrem.h" #include "commands/proclang.h" #include "miscadmin.h" diff -rc pgsql_sugar.orig/src/backend/commands/proclang.c pgsql_sugar/src/backend/commands/proclang.c *** pgsql_sugar.orig/src/backend/commands/proclang.c Mon Sep 3 02:39:15 2007 --- pgsql_sugar/src/backend/commands/proclang.c Tue Nov 6 12:47:46 2007 *************** *** 22,27 **** --- 22,28 ---- #include "catalog/pg_namespace.h" #include "catalog/pg_pltemplate.h" #include "catalog/pg_proc.h" + #include "catalog/pg_proc_fn.h" #include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "commands/defrem.h" diff -rc pgsql_sugar.orig/src/backend/commands/tablecmds.c pgsql_sugar/src/backend/commands/tablecmds.c *** pgsql_sugar.orig/src/backend/commands/tablecmds.c Fri Oct 12 20:55:12 2007 --- pgsql_sugar/src/backend/commands/tablecmds.c Tue Nov 6 12:47:46 2007 *************** *** 32,37 **** --- 32,38 ---- #include "catalog/pg_tablespace.h" #include "catalog/pg_trigger.h" #include "catalog/pg_type.h" + #include "catalog/pg_type_fn.h" #include "catalog/toasting.h" #include "commands/cluster.h" #include "commands/defrem.h" diff -rc pgsql_sugar.orig/src/backend/commands/typecmds.c pgsql_sugar/src/backend/commands/typecmds.c *** pgsql_sugar.orig/src/backend/commands/typecmds.c Mon Oct 29 20:40:39 2007 --- pgsql_sugar/src/backend/commands/typecmds.c Tue Nov 6 12:47:46 2007 *************** *** 43,48 **** --- 43,49 ---- #include "catalog/pg_enum.h" #include "catalog/pg_namespace.h" #include "catalog/pg_type.h" + #include "catalog/pg_type_fn.h" #include "commands/defrem.h" #include "commands/tablecmds.h" #include "commands/typecmds.h" diff -rc pgsql_sugar.orig/src/backend/parser/keywords.c pgsql_sugar/src/backend/parser/keywords.c *** pgsql_sugar.orig/src/backend/parser/keywords.c Mon Sep 24 03:29:29 2007 --- pgsql_sugar/src/backend/parser/keywords.c Wed Nov 14 20:20:44 2007 *************** *** 12,23 **** * *------------------------------------------------------------------------- */ ! #include "postgres.h" #include ! #include "nodes/parsenodes.h" ! #include "parser/gramparse.h" /* required before parser/parse.h! */ #include "parser/keywords.h" #include "parser/parse.h" --- 12,29 ---- * *------------------------------------------------------------------------- */ ! #include "c.h" #include ! /* Following macro disables YYSTYPE union definition ! * in parse.h which is unnecessary for this source and ! * it cause useless dependency on another headers. It ! * is very important for pg_dump which also share this ! * piece of code and it cannot include postgres.h ! */ ! #define YYSTYPE int ! #include "parser/keywords.h" #include "parser/parse.h" diff -rc pgsql_sugar.orig/src/backend/utils/hash/pg_crc.c pgsql_sugar/src/backend/utils/hash/pg_crc.c *** pgsql_sugar.orig/src/backend/utils/hash/pg_crc.c Fri Jan 5 23:19:43 2007 --- pgsql_sugar/src/backend/utils/hash/pg_crc.c Wed Nov 14 14:24:06 2007 *************** *** 23,29 **** * *------------------------------------------------------------------------- */ ! #include "postgres.h" --- 23,29 ---- * *------------------------------------------------------------------------- */ ! #include "c.h" diff -rc pgsql_sugar.orig/src/bin/pg_config/pg_config.c pgsql_sugar/src/bin/pg_config/pg_config.c *** pgsql_sugar.orig/src/bin/pg_config/pg_config.c Thu May 31 17:13:04 2007 --- pgsql_sugar/src/bin/pg_config/pg_config.c Wed Nov 14 12:41:34 2007 *************** *** 22,28 **** *------------------------------------------------------------------------- */ ! #include "postgres.h" #include "port.h" --- 22,28 ---- *------------------------------------------------------------------------- */ ! #include "postgres_fe.h" #include "port.h" diff -rc pgsql_sugar.orig/src/bin/pg_controldata/pg_controldata.c pgsql_sugar/src/bin/pg_controldata/pg_controldata.c *** pgsql_sugar.orig/src/bin/pg_controldata/pg_controldata.c Tue Apr 3 06:14:26 2007 --- pgsql_sugar/src/bin/pg_controldata/pg_controldata.c Wed Nov 14 12:42:14 2007 *************** *** 8,14 **** * * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.34 2007/03/18 16:50:43 neilc Exp $ */ ! #include "postgres.h" #include #include --- 8,14 ---- * * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.34 2007/03/18 16:50:43 neilc Exp $ */ ! #include "postgres_fe.h" #include #include diff -rc pgsql_sugar.orig/src/bin/pg_dump/common.c pgsql_sugar/src/bin/pg_dump/common.c *** pgsql_sugar.orig/src/bin/pg_dump/common.c Sun Oct 28 20:08:02 2007 --- pgsql_sugar/src/bin/pg_dump/common.c Wed Nov 14 12:43:03 2007 *************** *** 19,25 **** #include "postgres_fe.h" #include "pg_backup_archiver.h" - #include "postgres.h" #include "catalog/pg_class.h" #include --- 19,24 ---- diff -rc pgsql_sugar.orig/src/bin/pg_dump/pg_dump.c pgsql_sugar/src/bin/pg_dump/pg_dump.c *** pgsql_sugar.orig/src/bin/pg_dump/pg_dump.c Sat Oct 13 22:18:41 2007 --- pgsql_sugar/src/bin/pg_dump/pg_dump.c Wed Nov 14 14:53:39 2007 *************** *** 17,28 **** *------------------------------------------------------------------------- */ ! /* ! * Although this is not a backend module, we must include postgres.h anyway ! * so that we can include a bunch of backend include files. pg_dump has ! * never pretended to be very independent of the backend anyhow ... ! */ ! #include "postgres.h" #include --- 17,23 ---- *------------------------------------------------------------------------- */ ! #include "postgres_fe.h" #include *************** *** 41,51 **** #endif #include "access/htup.h" #include "catalog/pg_class.h" #include "catalog/pg_proc.h" #include "catalog/pg_trigger.h" #include "catalog/pg_type.h" - #include "commands/sequence.h" #include "libpq/libpq-fs.h" #include "pg_backup_archiver.h" --- 36,46 ---- #endif #include "access/htup.h" + #include "access/attnum.h" #include "catalog/pg_class.h" #include "catalog/pg_proc.h" #include "catalog/pg_trigger.h" #include "catalog/pg_type.h" #include "libpq/libpq-fs.h" #include "pg_backup_archiver.h" diff -rc pgsql_sugar.orig/src/bin/psql/print.c pgsql_sugar/src/bin/psql/print.c *** pgsql_sugar.orig/src/bin/psql/print.c Fri Jan 5 23:19:49 2007 --- pgsql_sugar/src/bin/psql/print.c Wed Nov 14 12:44:02 2007 *************** *** 8,14 **** * Note: we include postgres.h not postgres_fe.h so that we can include * catalog/pg_type.h, and thereby have access to INT4OID and similar macros. */ ! #include "postgres.h" #include "print.h" #include "catalog/pg_type.h" --- 8,14 ---- * Note: we include postgres.h not postgres_fe.h so that we can include * catalog/pg_type.h, and thereby have access to INT4OID and similar macros. */ ! #include "postgres_fe.h" #include "print.h" #include "catalog/pg_type.h" diff -rc pgsql_sugar.orig/src/include/pg_config_manual.h pgsql_sugar/src/include/pg_config_manual.h *** pgsql_sugar.orig/src/include/pg_config_manual.h Fri Jun 8 20:23:53 2007 --- pgsql_sugar/src/include/pg_config_manual.h Tue Nov 6 12:47:46 2007 *************** *** 197,203 **** --- 197,214 ---- */ #define MAX_RANDOM_VALUE (0x7FFFFFFF) + /* + * Set the upper and lower bounds of a sequence + */ + #ifndef INT64_IS_BUSTED + #define SEQ_MAXVALUE INT64CONST(0x7FFFFFFFFFFFFFFF) + #else /* INT64_IS_BUSTED */ + #define SEQ_MAXVALUE ((int64) 0x7FFFFFFF) + #endif /* INT64_IS_BUSTED */ + #define SEQ_MINVALUE (-SEQ_MAXVALUE) + + /* *------------------------------------------------------------------------ * The following symbols are for enabling debugging code, not for diff -rc pgsql_sugar.orig/src/include/postgres.h pgsql_sugar/src/include/postgres.h *** pgsql_sugar.orig/src/include/postgres.h Mon Oct 1 18:25:56 2007 --- pgsql_sugar/src/include/postgres.h Tue Nov 6 12:51:45 2007 *************** *** 26,32 **** * 1) variable-length datatypes (TOAST support) * 2) datum type + support macros * 3) exception handling definitions - * 4) genbki macros used by catalog/pg_xxx.h files * * NOTES * --- 26,31 ---- *************** *** 710,730 **** const char *errorType, const char *fileName, int lineNumber); - /* ---------------------------------------------------------------- - * Section 4: genbki macros used by catalog/pg_xxx.h files - * ---------------------------------------------------------------- - */ - #define CATALOG(name,oid) typedef struct CppConcat(FormData_,name) - - #define BKI_BOOTSTRAP - #define BKI_SHARED_RELATION - #define BKI_WITHOUT_OIDS - - /* these need to expand into some harmless, repeatable declaration */ - #define DATA(x) extern int no_such_variable - #define DESCR(x) extern int no_such_variable - #define SHDESCR(x) extern int no_such_variable - - typedef int4 aclitem; /* PHONY definition for catalog use only */ - #endif /* POSTGRES_H */ --- 709,712 ---- diff -rc pgsql_sugar.orig/src/include/catalog/genbki.h pgsql_sugar/src/include/catalog/genbki.h *** pgsql_sugar.orig/src/include/catalog/genbki.h Tue Nov 6 12:50:26 2007 --- pgsql_sugar/src/include/catalog/genbki.h Tue Nov 6 13:19:36 2007 *************** *** 0 **** --- 1,35 ---- + /*------------------------------------------------------------------------- + * + * genbki.h + * Primary include file for all catalog header files + * + * genbki.h contains the CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so + * this file can be read by both genbki.sh and the C compiler. + * + * + * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group + * Portions Copyright (c) 1995, Regents of the University of California + * + * $PostgreSQL: $ + * + *------------------------------------------------------------------------- + */ + #ifndef GENBKI_H + #define GENBKI_H + + #include "c.h" + + #define CATALOG(name,oid) typedef struct CppConcat(FormData_,name) + + #define BKI_BOOTSTRAP + #define BKI_SHARED_RELATION + #define BKI_WITHOUT_OIDS + + /* these need to expand into some harmless, repeatable declaration */ + #define DATA(x) extern int no_such_variable + #define DESCR(x) extern int no_such_variable + #define SHDESCR(x) extern int no_such_variable + + typedef int4 aclitem; /* PHONY definition for catalog use only */ + + #endif /* GENBKI_H */ diff -rc pgsql_sugar.orig/src/include/catalog/pg_aggregate.h pgsql_sugar/src/include/catalog/pg_aggregate.h *** pgsql_sugar.orig/src/include/catalog/pg_aggregate.h Wed Oct 24 04:24:47 2007 --- pgsql_sugar/src/include/catalog/pg_aggregate.h Tue Nov 6 12:47:46 2007 *************** *** 19,24 **** --- 19,25 ---- #ifndef PG_AGGREGATE_H #define PG_AGGREGATE_H + #include "catalog/genbki.h" #include "nodes/pg_list.h" /* ---------------- diff -rc pgsql_sugar.orig/src/include/catalog/pg_am.h pgsql_sugar/src/include/catalog/pg_am.h *** pgsql_sugar.orig/src/include/catalog/pg_am.h Sat Apr 7 00:33:43 2007 --- pgsql_sugar/src/include/catalog/pg_am.h Tue Nov 6 12:47:46 2007 *************** *** 22,33 **** #ifndef PG_AM_H #define PG_AM_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_am definition. cpp turns this into --- 22,28 ---- #ifndef PG_AM_H #define PG_AM_H ! #include "catalog/genbki.h" /* ---------------- * pg_am definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_amop.h pgsql_sugar/src/include/catalog/pg_amop.h *** pgsql_sugar.orig/src/include/catalog/pg_amop.h Tue Aug 21 03:11:25 2007 --- pgsql_sugar/src/include/catalog/pg_amop.h Tue Nov 6 12:47:46 2007 *************** *** 40,51 **** #ifndef PG_AMOP_H #define PG_AMOP_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_amop definition. cpp turns this into --- 40,46 ---- #ifndef PG_AMOP_H #define PG_AMOP_H ! #include "catalog/genbki.h" /* ---------------- * pg_amop definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_amproc.h pgsql_sugar/src/include/catalog/pg_amproc.h *** pgsql_sugar.orig/src/include/catalog/pg_amproc.h Mon Sep 3 03:18:33 2007 --- pgsql_sugar/src/include/catalog/pg_amproc.h Tue Nov 6 12:47:46 2007 *************** *** 33,44 **** #ifndef PG_AMPROC_H #define PG_AMPROC_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_amproc definition. cpp turns this into --- 33,39 ---- #ifndef PG_AMPROC_H #define PG_AMPROC_H ! #include "catalog/genbki.h" /* ---------------- * pg_amproc definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_attrdef.h pgsql_sugar/src/include/catalog/pg_attrdef.h *** pgsql_sugar.orig/src/include/catalog/pg_attrdef.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_attrdef.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_ATTRDEF_H #define PG_ATTRDEF_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_attrdef definition. cpp turns this into --- 19,25 ---- #ifndef PG_ATTRDEF_H #define PG_ATTRDEF_H ! #include "catalog/genbki.h" /* ---------------- * pg_attrdef definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_attribute.h pgsql_sugar/src/include/catalog/pg_attribute.h *** pgsql_sugar.orig/src/include/catalog/pg_attribute.h Thu Sep 20 19:56:32 2007 --- pgsql_sugar/src/include/catalog/pg_attribute.h Tue Nov 6 12:47:46 2007 *************** *** 24,35 **** #ifndef PG_ATTRIBUTE_H #define PG_ATTRIBUTE_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_attribute definition. cpp turns this into --- 24,30 ---- #ifndef PG_ATTRIBUTE_H #define PG_ATTRIBUTE_H ! #include "catalog/genbki.h" /* ---------------- * pg_attribute definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_auth_members.h pgsql_sugar/src/include/catalog/pg_auth_members.h *** pgsql_sugar.orig/src/include/catalog/pg_auth_members.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_auth_members.h Wed Nov 14 14:41:07 2007 *************** *** 19,24 **** --- 19,26 ---- #ifndef PG_AUTH_MEMBERS_H #define PG_AUTH_MEMBERS_H + #include "catalog/genbki.h" + /* ---------------- * pg_auth_members definition. cpp turns this into * typedef struct FormData_pg_auth_members diff -rc pgsql_sugar.orig/src/include/catalog/pg_authid.h pgsql_sugar/src/include/catalog/pg_authid.h *** pgsql_sugar.orig/src/include/catalog/pg_authid.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_authid.h Tue Nov 6 12:47:46 2007 *************** *** 21,26 **** --- 21,28 ---- #ifndef PG_AUTHID_H #define PG_AUTHID_H + #include "catalog/genbki.h" + /* * The CATALOG definition has to refer to the type of rolvaliduntil as * "timestamptz" (lower case) so that bootstrap mode recognizes it. But diff -rc pgsql_sugar.orig/src/include/catalog/pg_autovacuum.h pgsql_sugar/src/include/catalog/pg_autovacuum.h *** pgsql_sugar.orig/src/include/catalog/pg_autovacuum.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_autovacuum.h Tue Nov 6 12:47:46 2007 *************** *** 13,24 **** #ifndef PG_AUTOVACUUM_H #define PG_AUTOVACUUM_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_autovacuum definition. cpp turns this into --- 13,19 ---- #ifndef PG_AUTOVACUUM_H #define PG_AUTOVACUUM_H ! #include "catalog/genbki.h" /* ---------------- * pg_autovacuum definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_cast.h pgsql_sugar/src/include/catalog/pg_cast.h *** pgsql_sugar.orig/src/include/catalog/pg_cast.h Tue Aug 21 03:11:25 2007 --- pgsql_sugar/src/include/catalog/pg_cast.h Tue Nov 6 12:47:46 2007 *************** *** 21,26 **** --- 21,28 ---- #ifndef PG_CAST_H #define PG_CAST_H + #include "catalog/genbki.h" + #define CastRelationId 2605 CATALOG(pg_cast,2605) diff -rc pgsql_sugar.orig/src/include/catalog/pg_class.h pgsql_sugar/src/include/catalog/pg_class.h *** pgsql_sugar.orig/src/include/catalog/pg_class.h Mon Sep 3 02:39:21 2007 --- pgsql_sugar/src/include/catalog/pg_class.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_CLASS_H #define PG_CLASS_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_class definition. cpp turns this into --- 19,25 ---- #ifndef PG_CLASS_H #define PG_CLASS_H ! #include "catalog/genbki.h" /* ---------------- * pg_class definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_constraint.h pgsql_sugar/src/include/catalog/pg_constraint.h *** pgsql_sugar.orig/src/include/catalog/pg_constraint.h Wed Feb 14 02:58:58 2007 --- pgsql_sugar/src/include/catalog/pg_constraint.h Tue Nov 6 12:47:46 2007 *************** *** 19,34 **** #ifndef PG_CONSTRAINT_H #define PG_CONSTRAINT_H #include "nodes/pg_list.h" /* ---------------- - * postgres.h contains the system type definitions and the - * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file - * can be read by both genbki.sh and the C compiler. - * ---------------- - */ - - /* ---------------- * pg_constraint definition. cpp turns this into * typedef struct FormData_pg_constraint * ---------------- --- 19,28 ---- #ifndef PG_CONSTRAINT_H #define PG_CONSTRAINT_H + #include "catalog/genbki.h" #include "nodes/pg_list.h" /* ---------------- * pg_constraint definition. cpp turns this into * typedef struct FormData_pg_constraint * ---------------- diff -rc pgsql_sugar.orig/src/include/catalog/pg_conversion.h pgsql_sugar/src/include/catalog/pg_conversion.h *** pgsql_sugar.orig/src/include/catalog/pg_conversion.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_conversion.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_CONVERSION_H #define PG_CONVERSION_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------------------------------------------------------- * pg_conversion definition. --- 19,25 ---- #ifndef PG_CONVERSION_H #define PG_CONVERSION_H ! #include "catalog/genbki.h" /* ---------------------------------------------------------------- * pg_conversion definition. diff -rc pgsql_sugar.orig/src/include/catalog/pg_database.h pgsql_sugar/src/include/catalog/pg_database.h *** pgsql_sugar.orig/src/include/catalog/pg_database.h Mon Sep 3 04:30:43 2007 --- pgsql_sugar/src/include/catalog/pg_database.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_DATABASE_H #define PG_DATABASE_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_database definition. cpp turns this into --- 19,25 ---- #ifndef PG_DATABASE_H #define PG_DATABASE_H ! #include "catalog/genbki.h" /* ---------------- * pg_database definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_depend.h pgsql_sugar/src/include/catalog/pg_depend.h *** pgsql_sugar.orig/src/include/catalog/pg_depend.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_depend.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_DEPEND_H #define PG_DEPEND_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_depend definition. cpp turns this into --- 19,25 ---- #ifndef PG_DEPEND_H #define PG_DEPEND_H ! #include "catalog/genbki.h" /* ---------------- * pg_depend definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_description.h pgsql_sugar/src/include/catalog/pg_description.h *** pgsql_sugar.orig/src/include/catalog/pg_description.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_description.h Tue Nov 6 12:47:46 2007 *************** *** 36,47 **** #ifndef PG_DESCRIPTION_H #define PG_DESCRIPTION_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_description definition. cpp turns this into --- 36,42 ---- #ifndef PG_DESCRIPTION_H #define PG_DESCRIPTION_H ! #include "catalog/genbki.h" /* ---------------- * pg_description definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_enum.h pgsql_sugar/src/include/catalog/pg_enum.h *** pgsql_sugar.orig/src/include/catalog/pg_enum.h Mon Apr 2 05:49:40 2007 --- pgsql_sugar/src/include/catalog/pg_enum.h Tue Nov 6 12:47:46 2007 *************** *** 21,36 **** #ifndef PG_ENUM_H #define PG_ENUM_H #include "nodes/pg_list.h" /* ---------------- - * postgres.h contains the system type definitions and the - * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file - * can be read by both genbki.sh and the C compiler. - * ---------------- - */ - - /* ---------------- * pg_enum definition. cpp turns this into * typedef struct FormData_pg_enum * ---------------- --- 21,30 ---- #ifndef PG_ENUM_H #define PG_ENUM_H + #include "catalog/genbki.h" #include "nodes/pg_list.h" /* ---------------- * pg_enum definition. cpp turns this into * typedef struct FormData_pg_enum * ---------------- diff -rc pgsql_sugar.orig/src/include/catalog/pg_index.h pgsql_sugar/src/include/catalog/pg_index.h *** pgsql_sugar.orig/src/include/catalog/pg_index.h Thu Sep 20 19:56:32 2007 --- pgsql_sugar/src/include/catalog/pg_index.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_INDEX_H #define PG_INDEX_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_index definition. cpp turns this into --- 19,25 ---- #ifndef PG_INDEX_H #define PG_INDEX_H ! #include "catalog/genbki.h" /* ---------------- * pg_index definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_inherits.h pgsql_sugar/src/include/catalog/pg_inherits.h *** pgsql_sugar.orig/src/include/catalog/pg_inherits.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_inherits.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_INHERITS_H #define PG_INHERITS_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_inherits definition. cpp turns this into --- 19,25 ---- #ifndef PG_INHERITS_H #define PG_INHERITS_H ! #include "catalog/genbki.h" /* ---------------- * pg_inherits definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_language.h pgsql_sugar/src/include/catalog/pg_language.h *** pgsql_sugar.orig/src/include/catalog/pg_language.h Mon Sep 3 04:30:43 2007 --- pgsql_sugar/src/include/catalog/pg_language.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_LANGUAGE_H #define PG_LANGUAGE_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_language definition. cpp turns this into --- 19,25 ---- #ifndef PG_LANGUAGE_H #define PG_LANGUAGE_H ! #include "catalog/genbki.h" /* ---------------- * pg_language definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_largeobject.h pgsql_sugar/src/include/catalog/pg_largeobject.h *** pgsql_sugar.orig/src/include/catalog/pg_largeobject.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_largeobject.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_LARGEOBJECT_H #define PG_LARGEOBJECT_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_largeobject definition. cpp turns this into --- 19,25 ---- #ifndef PG_LARGEOBJECT_H #define PG_LARGEOBJECT_H ! #include "catalog/genbki.h" /* ---------------- * pg_largeobject definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_listener.h pgsql_sugar/src/include/catalog/pg_listener.h *** pgsql_sugar.orig/src/include/catalog/pg_listener.h Fri Jan 5 23:19:52 2007 --- pgsql_sugar/src/include/catalog/pg_listener.h Tue Nov 6 12:47:46 2007 *************** *** 18,29 **** #ifndef PG_LISTENER_H #define PG_LISTENER_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------------------------------------------------------- * pg_listener definition. --- 18,24 ---- #ifndef PG_LISTENER_H #define PG_LISTENER_H ! #include "catalog/genbki.h" /* ---------------------------------------------------------------- * pg_listener definition. diff -rc pgsql_sugar.orig/src/include/catalog/pg_namespace.h pgsql_sugar/src/include/catalog/pg_namespace.h *** pgsql_sugar.orig/src/include/catalog/pg_namespace.h Mon Sep 3 04:30:43 2007 --- pgsql_sugar/src/include/catalog/pg_namespace.h Tue Nov 6 12:47:46 2007 *************** *** 19,30 **** #ifndef PG_NAMESPACE_H #define PG_NAMESPACE_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------------------------------------------------------- * pg_namespace definition. --- 19,25 ---- #ifndef PG_NAMESPACE_H #define PG_NAMESPACE_H ! #include "catalog/genbki.h" /* ---------------------------------------------------------------- * pg_namespace definition. diff -rc pgsql_sugar.orig/src/include/catalog/pg_opclass.h pgsql_sugar/src/include/catalog/pg_opclass.h *** pgsql_sugar.orig/src/include/catalog/pg_opclass.h Tue Aug 21 03:11:25 2007 --- pgsql_sugar/src/include/catalog/pg_opclass.h Tue Nov 6 12:47:46 2007 *************** *** 39,50 **** #ifndef PG_OPCLASS_H #define PG_OPCLASS_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_opclass definition. cpp turns this into --- 39,45 ---- #ifndef PG_OPCLASS_H #define PG_OPCLASS_H ! #include "catalog/genbki.h" /* ---------------- * pg_opclass definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_operator.h pgsql_sugar/src/include/catalog/pg_operator.h *** pgsql_sugar.orig/src/include/catalog/pg_operator.h Mon Aug 27 03:39:24 2007 --- pgsql_sugar/src/include/catalog/pg_operator.h Tue Nov 6 12:47:47 2007 *************** *** 22,37 **** #ifndef PG_OPERATOR_H #define PG_OPERATOR_H #include "nodes/pg_list.h" /* ---------------- - * postgres.h contains the system type definitions and the - * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file - * can be read by both genbki.sh and the C compiler. - * ---------------- - */ - - /* ---------------- * pg_operator definition. cpp turns this into * typedef struct FormData_pg_operator * ---------------- --- 22,31 ---- #ifndef PG_OPERATOR_H #define PG_OPERATOR_H + #include "catalog/genbki.h" #include "nodes/pg_list.h" /* ---------------- * pg_operator definition. cpp turns this into * typedef struct FormData_pg_operator * ---------------- diff -rc pgsql_sugar.orig/src/include/catalog/pg_opfamily.h pgsql_sugar/src/include/catalog/pg_opfamily.h *** pgsql_sugar.orig/src/include/catalog/pg_opfamily.h Tue Aug 21 03:11:25 2007 --- pgsql_sugar/src/include/catalog/pg_opfamily.h Tue Nov 6 12:47:47 2007 *************** *** 19,32 **** #ifndef PG_OPFAMILY_H #define PG_OPFAMILY_H /* ---------------- - * postgres.h contains the system type definitions and the - * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file - * can be read by both genbki.sh and the C compiler. - * ---------------- - */ - - /* ---------------- * pg_opfamily definition. cpp turns this into * typedef struct FormData_pg_opfamily * ---------------- --- 19,26 ---- #ifndef PG_OPFAMILY_H #define PG_OPFAMILY_H + #include "catalog/genbki.h" /* ---------------- * pg_opfamily definition. cpp turns this into * typedef struct FormData_pg_opfamily * ---------------- diff -rc pgsql_sugar.orig/src/include/catalog/pg_pltemplate.h pgsql_sugar/src/include/catalog/pg_pltemplate.h *** pgsql_sugar.orig/src/include/catalog/pg_pltemplate.h Mon Mar 26 18:58:41 2007 --- pgsql_sugar/src/include/catalog/pg_pltemplate.h Tue Nov 6 12:47:47 2007 *************** *** 19,30 **** #ifndef PG_PLTEMPLATE_H #define PG_PLTEMPLATE_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_pltemplate definition. cpp turns this into --- 19,25 ---- #ifndef PG_PLTEMPLATE_H #define PG_PLTEMPLATE_H ! #include "catalog/genbki.h" /* ---------------- * pg_pltemplate definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_proc.h pgsql_sugar/src/include/catalog/pg_proc.h *** pgsql_sugar.orig/src/include/catalog/pg_proc.h Wed Oct 24 04:24:47 2007 --- pgsql_sugar/src/include/catalog/pg_proc.h Tue Nov 6 12:47:47 2007 *************** *** 23,36 **** #ifndef PG_PROC_H #define PG_PROC_H /* ---------------- - * postgres.h contains the system type definitions and the - * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file - * can be read by both genbki.sh and the C compiler. - * ---------------- - */ - - /* ---------------- * pg_proc definition. cpp turns this into * typedef struct FormData_pg_proc * ---------------- --- 23,30 ---- #ifndef PG_PROC_H #define PG_PROC_H + #include "catalog/genbki.h" /* ---------------- * pg_proc definition. cpp turns this into * typedef struct FormData_pg_proc * ---------------- *************** *** 4436,4465 **** #define PROARGMODE_INOUT 'b' - /* - * prototypes for functions in pg_proc.c - */ - extern Oid ProcedureCreate(const char *procedureName, - Oid procNamespace, - bool replace, - bool returnsSet, - Oid returnType, - Oid languageObjectId, - Oid languageValidator, - const char *prosrc, - const char *probin, - bool isAgg, - bool security_definer, - bool isStrict, - char volatility, - oidvector *parameterTypes, - Datum allParameterTypes, - Datum parameterModes, - Datum parameterNames, - Datum proconfig, - float4 procost, - float4 prorows); - - extern bool function_parse_error_transpose(const char *prosrc); - #endif /* PG_PROC_H */ --- 4430,4433 ---- diff -rc pgsql_sugar.orig/src/include/catalog/pg_proc_fn.h pgsql_sugar/src/include/catalog/pg_proc_fn.h *** pgsql_sugar.orig/src/include/catalog/pg_proc_fn.h Tue Nov 6 12:50:37 2007 --- pgsql_sugar/src/include/catalog/pg_proc_fn.h Tue Nov 6 13:29:18 2007 *************** *** 0 **** --- 1,40 ---- + /*------------------------------------------------------------------------- + * + * pg_proc_fn.h + * prototypes for functions in pg_proc.c + * + * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * $PostgreSQL: $ + * + * + *------------------------------------------------------------------------- + */ + #ifndef PG_PROC_FN_H + #define PG_PROC_FN_H + + extern Oid ProcedureCreate(const char *procedureName, + Oid procNamespace, + bool replace, + bool returnsSet, + Oid returnType, + Oid languageObjectId, + Oid languageValidator, + const char *prosrc, + const char *probin, + bool isAgg, + bool security_definer, + bool isStrict, + char volatility, + oidvector *parameterTypes, + Datum allParameterTypes, + Datum parameterModes, + Datum parameterNames, + Datum proconfig, + float4 procost, + float4 prorows); + + extern bool function_parse_error_transpose(const char *prosrc); + + #endif /* PG_PROC_FN_H */ diff -rc pgsql_sugar.orig/src/include/catalog/pg_rewrite.h pgsql_sugar/src/include/catalog/pg_rewrite.h *** pgsql_sugar.orig/src/include/catalog/pg_rewrite.h Tue Mar 20 00:38:31 2007 --- pgsql_sugar/src/include/catalog/pg_rewrite.h Tue Nov 6 12:47:47 2007 *************** *** 22,33 **** #ifndef PG_REWRITE_H #define PG_REWRITE_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_rewrite definition. cpp turns this into --- 22,28 ---- #ifndef PG_REWRITE_H #define PG_REWRITE_H ! #include "catalog/genbki.h" /* ---------------- * pg_rewrite definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_shdepend.h pgsql_sugar/src/include/catalog/pg_shdepend.h *** pgsql_sugar.orig/src/include/catalog/pg_shdepend.h Fri Jan 5 23:19:53 2007 --- pgsql_sugar/src/include/catalog/pg_shdepend.h Tue Nov 6 12:47:47 2007 *************** *** 19,30 **** #ifndef PG_SHDEPEND_H #define PG_SHDEPEND_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_shdepend definition. cpp turns this into --- 19,25 ---- #ifndef PG_SHDEPEND_H #define PG_SHDEPEND_H ! #include "catalog/genbki.h" /* ---------------- * pg_shdepend definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_shdescription.h pgsql_sugar/src/include/catalog/pg_shdescription.h *** pgsql_sugar.orig/src/include/catalog/pg_shdescription.h Fri Jan 5 23:19:53 2007 --- pgsql_sugar/src/include/catalog/pg_shdescription.h Tue Nov 6 12:47:47 2007 *************** *** 29,40 **** #ifndef PG_SHDESCRIPTION_H #define PG_SHDESCRIPTION_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_shdescription definition. cpp turns this into --- 29,35 ---- #ifndef PG_SHDESCRIPTION_H #define PG_SHDESCRIPTION_H ! #include "catalog/genbki.h" /* ---------------- * pg_shdescription definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_statistic.h pgsql_sugar/src/include/catalog/pg_statistic.h *** pgsql_sugar.orig/src/include/catalog/pg_statistic.h Tue May 8 21:13:52 2007 --- pgsql_sugar/src/include/catalog/pg_statistic.h Tue Nov 6 12:47:47 2007 *************** *** 19,30 **** #ifndef PG_STATISTIC_H #define PG_STATISTIC_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* * Keep C compiler happy with anyarray, below. This will need to go elsewhere --- 19,25 ---- #ifndef PG_STATISTIC_H #define PG_STATISTIC_H ! #include "catalog/genbki.h" /* * Keep C compiler happy with anyarray, below. This will need to go elsewhere diff -rc pgsql_sugar.orig/src/include/catalog/pg_tablespace.h pgsql_sugar/src/include/catalog/pg_tablespace.h *** pgsql_sugar.orig/src/include/catalog/pg_tablespace.h Fri Jan 5 23:19:53 2007 --- pgsql_sugar/src/include/catalog/pg_tablespace.h Tue Nov 6 12:47:47 2007 *************** *** 19,30 **** #ifndef PG_TABLESPACE_H #define PG_TABLESPACE_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_tablespace definition. cpp turns this into --- 19,25 ---- #ifndef PG_TABLESPACE_H #define PG_TABLESPACE_H ! #include "catalog/genbki.h" /* ---------------- * pg_tablespace definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_trigger.h pgsql_sugar/src/include/catalog/pg_trigger.h *** pgsql_sugar.orig/src/include/catalog/pg_trigger.h Tue Mar 20 00:38:31 2007 --- pgsql_sugar/src/include/catalog/pg_trigger.h Tue Nov 6 12:47:47 2007 *************** *** 19,30 **** #ifndef PG_TRIGGER_H #define PG_TRIGGER_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_trigger definition. cpp turns this into --- 19,25 ---- #ifndef PG_TRIGGER_H #define PG_TRIGGER_H ! #include "catalog/genbki.h" /* ---------------- * pg_trigger definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_ts_config.h pgsql_sugar/src/include/catalog/pg_ts_config.h *** pgsql_sugar.orig/src/include/catalog/pg_ts_config.h Tue Aug 21 03:11:27 2007 --- pgsql_sugar/src/include/catalog/pg_ts_config.h Tue Nov 6 12:47:47 2007 *************** *** 21,32 **** #ifndef PG_TS_CONFIG_H #define PG_TS_CONFIG_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_ts_config definition. cpp turns this into --- 21,27 ---- #ifndef PG_TS_CONFIG_H #define PG_TS_CONFIG_H ! #include "catalog/genbki.h" /* ---------------- * pg_ts_config definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_ts_config_map.h pgsql_sugar/src/include/catalog/pg_ts_config_map.h *** pgsql_sugar.orig/src/include/catalog/pg_ts_config_map.h Tue Aug 21 03:11:27 2007 --- pgsql_sugar/src/include/catalog/pg_ts_config_map.h Tue Nov 6 12:47:47 2007 *************** *** 21,32 **** #ifndef PG_TS_CONFIG_MAP_H #define PG_TS_CONFIG_MAP_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_ts_config_map definition. cpp turns this into --- 21,27 ---- #ifndef PG_TS_CONFIG_MAP_H #define PG_TS_CONFIG_MAP_H ! #include "catalog/genbki.h" /* ---------------- * pg_ts_config_map definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_ts_dict.h pgsql_sugar/src/include/catalog/pg_ts_dict.h *** pgsql_sugar.orig/src/include/catalog/pg_ts_dict.h Tue Aug 21 03:11:27 2007 --- pgsql_sugar/src/include/catalog/pg_ts_dict.h Tue Nov 6 12:47:47 2007 *************** *** 21,32 **** #ifndef PG_TS_DICT_H #define PG_TS_DICT_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_ts_dict definition. cpp turns this into --- 21,27 ---- #ifndef PG_TS_DICT_H #define PG_TS_DICT_H ! #include "catalog/genbki.h" /* ---------------- * pg_ts_dict definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_ts_parser.h pgsql_sugar/src/include/catalog/pg_ts_parser.h *** pgsql_sugar.orig/src/include/catalog/pg_ts_parser.h Tue Aug 21 03:11:27 2007 --- pgsql_sugar/src/include/catalog/pg_ts_parser.h Tue Nov 6 12:47:47 2007 *************** *** 21,32 **** #ifndef PG_TS_PARSER_H #define PG_TS_PARSER_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_ts_parser definition. cpp turns this into --- 21,27 ---- #ifndef PG_TS_PARSER_H #define PG_TS_PARSER_H ! #include "catalog/genbki.h" /* ---------------- * pg_ts_parser definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_ts_template.h pgsql_sugar/src/include/catalog/pg_ts_template.h *** pgsql_sugar.orig/src/include/catalog/pg_ts_template.h Mon Sep 3 04:30:45 2007 --- pgsql_sugar/src/include/catalog/pg_ts_template.h Tue Nov 6 12:47:47 2007 *************** *** 21,32 **** #ifndef PG_TS_TEMPLATE_H #define PG_TS_TEMPLATE_H ! /* ---------------- ! * postgres.h contains the system type definitions and the ! * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file ! * can be read by both genbki.sh and the C compiler. ! * ---------------- ! */ /* ---------------- * pg_ts_template definition. cpp turns this into --- 21,27 ---- #ifndef PG_TS_TEMPLATE_H #define PG_TS_TEMPLATE_H ! #include "catalog/genbki.h" /* ---------------- * pg_ts_template definition. cpp turns this into diff -rc pgsql_sugar.orig/src/include/catalog/pg_type.h pgsql_sugar/src/include/catalog/pg_type.h *** pgsql_sugar.orig/src/include/catalog/pg_type.h Sun Oct 14 01:06:27 2007 --- pgsql_sugar/src/include/catalog/pg_type.h Tue Nov 6 12:47:47 2007 *************** *** 19,34 **** #ifndef PG_TYPE_H #define PG_TYPE_H ! #include "nodes/nodes.h" /* ---------------- - * postgres.h contains the system type definitions and the - * CATALOG(), BKI_BOOTSTRAP and DATA() sugar words so this file - * can be read by both genbki.sh and the C compiler. - * ---------------- - */ - - /* ---------------- * pg_type definition. cpp turns this into * typedef struct FormData_pg_type * --- 19,27 ---- #ifndef PG_TYPE_H #define PG_TYPE_H ! #include "catalog/genbki.h" /* ---------------- * pg_type definition. cpp turns this into * typedef struct FormData_pg_type * *************** *** 631,693 **** (typid) == ANYNONARRAYOID || \ (typid) == ANYENUMOID) - /* - * prototypes for functions in pg_type.c - */ - extern Oid TypeShellMake(const char *typeName, Oid typeNamespace); - extern Oid TypeCreate(Oid newTypeOid, - const char *typeName, - Oid typeNamespace, - Oid relationOid, - char relationKind, - int16 internalSize, - char typeType, - char typDelim, - Oid inputProcedure, - Oid outputProcedure, - Oid receiveProcedure, - Oid sendProcedure, - Oid typmodinProcedure, - Oid typmodoutProcedure, - Oid analyzeProcedure, - Oid elementType, - bool isImplicitArray, - Oid arrayType, - Oid baseType, - const char *defaultTypeValue, - char *defaultTypeBin, - bool passedByValue, - char alignment, - char storage, - int32 typeMod, - int32 typNDims, - bool typeNotNull); - - extern void GenerateTypeDependencies(Oid typeNamespace, - Oid typeObjectId, - Oid relationOid, - char relationKind, - Oid owner, - Oid inputProcedure, - Oid outputProcedure, - Oid receiveProcedure, - Oid sendProcedure, - Oid typmodinProcedure, - Oid typmodoutProcedure, - Oid analyzeProcedure, - Oid elementType, - bool isImplicitArray, - Oid baseType, - Node *defaultExpr, - bool rebuild); - - extern void TypeRename(Oid typeOid, const char *newTypeName, - Oid typeNamespace); - - extern char *makeArrayTypeName(const char *typeName, Oid typeNamespace); - - extern bool moveArrayTypeName(Oid typeOid, const char *typeName, - Oid typeNamespace); - #endif /* PG_TYPE_H */ --- 624,628 ---- diff -rc pgsql_sugar.orig/src/include/catalog/pg_type_fn.h pgsql_sugar/src/include/catalog/pg_type_fn.h *** pgsql_sugar.orig/src/include/catalog/pg_type_fn.h Tue Nov 6 12:50:50 2007 --- pgsql_sugar/src/include/catalog/pg_type_fn.h Tue Nov 6 13:23:16 2007 *************** *** 0 **** --- 1,77 ---- + /*------------------------------------------------------------------------- + * + * pg_type_fn.h + * prototypes for functions in pg_type.c + * + * + * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * $PostgreSQL: $ + * + * + *------------------------------------------------------------------------- + */ + #ifndef PG_TYPE_FN_H + #define PG_TYPE_FN_H + + #include "nodes/nodes.h" + + extern Oid TypeShellMake(const char *typeName, Oid typeNamespace); + + extern Oid TypeCreate(Oid newTypeOid, + const char *typeName, + Oid typeNamespace, + Oid relationOid, + char relationKind, + int16 internalSize, + char typeType, + char typDelim, + Oid inputProcedure, + Oid outputProcedure, + Oid receiveProcedure, + Oid sendProcedure, + Oid typmodinProcedure, + Oid typmodoutProcedure, + Oid analyzeProcedure, + Oid elementType, + bool isImplicitArray, + Oid arrayType, + Oid baseType, + const char *defaultTypeValue, + char *defaultTypeBin, + bool passedByValue, + char alignment, + char storage, + int32 typeMod, + int32 typNDims, + bool typeNotNull); + + extern void GenerateTypeDependencies(Oid typeNamespace, + Oid typeObjectId, + Oid relationOid, + char relationKind, + Oid owner, + Oid inputProcedure, + Oid outputProcedure, + Oid receiveProcedure, + Oid sendProcedure, + Oid typmodinProcedure, + Oid typmodoutProcedure, + Oid analyzeProcedure, + Oid elementType, + bool isImplicitArray, + Oid baseType, + Node *defaultExpr, + bool rebuild); + + extern void TypeRename(Oid typeOid, const char *newTypeName, + Oid typeNamespace); + + extern char *makeArrayTypeName(const char *typeName, Oid typeNamespace); + + extern bool moveArrayTypeName(Oid typeOid, const char *typeName, + Oid typeNamespace); + + + #endif /* PG_TYPE_FN_H */ diff -rc pgsql_sugar.orig/src/include/commands/sequence.h pgsql_sugar/src/include/commands/sequence.h *** pgsql_sugar.orig/src/include/commands/sequence.h Fri Jan 5 23:19:54 2007 --- pgsql_sugar/src/include/commands/sequence.h Tue Nov 6 12:47:47 2007 *************** *** 94,106 **** extern void seq_redo(XLogRecPtr lsn, XLogRecord *rptr); extern void seq_desc(StringInfo buf, uint8 xl_info, char *rec); - /* Set the upper and lower bounds of a sequence */ - #ifndef INT64_IS_BUSTED - #define SEQ_MAXVALUE INT64CONST(0x7FFFFFFFFFFFFFFF) - #else /* INT64_IS_BUSTED */ - #define SEQ_MAXVALUE ((int64) 0x7FFFFFFF) - #endif /* INT64_IS_BUSTED */ - - #define SEQ_MINVALUE (-SEQ_MAXVALUE) - #endif /* SEQUENCE_H */ --- 94,97 ---- diff -rc pgsql_sugar.orig/src/pl/plpgsql/src/pl_comp.c pgsql_sugar/src/pl/plpgsql/src/pl_comp.c *** pgsql_sugar.orig/src/pl/plpgsql/src/pl_comp.c Mon Jul 16 19:01:10 2007 --- pgsql_sugar/src/pl/plpgsql/src/pl_comp.c Tue Nov 6 12:47:47 2007 *************** *** 25,30 **** --- 25,31 ---- #include "catalog/pg_attribute.h" #include "catalog/pg_class.h" #include "catalog/pg_proc.h" + #include "catalog/pg_proc_fn.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "nodes/makefuncs.h"