mirror of
https://github.com/postgres/postgres.git
synced 2025-11-04 20:11:56 +03:00
Add trailing commas to enum definitions
Since C99, there can be a trailing comma after the last value in an enum definition. A lot of new code has been introducing this style on the fly. Some new patches are now taking an inconsistent approach to this. Some add the last comma on the fly if they add a new last value, some are trying to preserve the existing style in each place, some are even dropping the last comma if there was one. We could nudge this all in a consistent direction if we just add the trailing commas everywhere once. I omitted a few places where there was a fixed "last" value that will always stay last. I also skipped the header files of libpq and ecpg, in case people want to use those with older compilers. There were also a small number of cases where the enum type wasn't used anywhere (but the enum values were), which ended up confusing pgindent a bit, so I left those alone. Discussion: https://www.postgresql.org/message-id/flat/386f8c45-c8ac-4681-8add-e3b0852c1620%40eisentraut.org
This commit is contained in:
@@ -280,7 +280,7 @@ typedef enum CmdType
|
||||
CMD_MERGE, /* merge stmt */
|
||||
CMD_UTILITY, /* cmds like create, destroy, copy, vacuum,
|
||||
* etc. */
|
||||
CMD_NOTHING /* dummy command for instead nothing rules
|
||||
CMD_NOTHING, /* dummy command for instead nothing rules
|
||||
* with qual */
|
||||
} CmdType;
|
||||
|
||||
@@ -324,7 +324,7 @@ typedef enum JoinType
|
||||
* by the executor (nor, indeed, by most of the planner).
|
||||
*/
|
||||
JOIN_UNIQUE_OUTER, /* LHS path must be made unique */
|
||||
JOIN_UNIQUE_INNER /* RHS path must be made unique */
|
||||
JOIN_UNIQUE_INNER, /* RHS path must be made unique */
|
||||
|
||||
/*
|
||||
* We might need additional join types someday.
|
||||
@@ -364,7 +364,7 @@ typedef enum AggStrategy
|
||||
AGG_PLAIN, /* simple agg across all input rows */
|
||||
AGG_SORTED, /* grouped agg, input must be sorted */
|
||||
AGG_HASHED, /* grouped agg, use internal hashtable */
|
||||
AGG_MIXED /* grouped agg, hash and sort both used */
|
||||
AGG_MIXED, /* grouped agg, hash and sort both used */
|
||||
} AggStrategy;
|
||||
|
||||
/*
|
||||
@@ -388,7 +388,7 @@ typedef enum AggSplit
|
||||
/* Initial phase of partial aggregation, with serialization: */
|
||||
AGGSPLIT_INITIAL_SERIAL = AGGSPLITOP_SKIPFINAL | AGGSPLITOP_SERIALIZE,
|
||||
/* Final phase of partial aggregation, with deserialization: */
|
||||
AGGSPLIT_FINAL_DESERIAL = AGGSPLITOP_COMBINE | AGGSPLITOP_DESERIALIZE
|
||||
AGGSPLIT_FINAL_DESERIAL = AGGSPLITOP_COMBINE | AGGSPLITOP_DESERIALIZE,
|
||||
} AggSplit;
|
||||
|
||||
/* Test whether an AggSplit value selects each primitive option: */
|
||||
@@ -408,13 +408,13 @@ typedef enum SetOpCmd
|
||||
SETOPCMD_INTERSECT,
|
||||
SETOPCMD_INTERSECT_ALL,
|
||||
SETOPCMD_EXCEPT,
|
||||
SETOPCMD_EXCEPT_ALL
|
||||
SETOPCMD_EXCEPT_ALL,
|
||||
} SetOpCmd;
|
||||
|
||||
typedef enum SetOpStrategy
|
||||
{
|
||||
SETOP_SORTED, /* input must be sorted */
|
||||
SETOP_HASHED /* use internal hashtable */
|
||||
SETOP_HASHED, /* use internal hashtable */
|
||||
} SetOpStrategy;
|
||||
|
||||
/*
|
||||
@@ -427,7 +427,7 @@ typedef enum OnConflictAction
|
||||
{
|
||||
ONCONFLICT_NONE, /* No "ON CONFLICT" clause */
|
||||
ONCONFLICT_NOTHING, /* ON CONFLICT ... DO NOTHING */
|
||||
ONCONFLICT_UPDATE /* ON CONFLICT ... DO UPDATE */
|
||||
ONCONFLICT_UPDATE, /* ON CONFLICT ... DO UPDATE */
|
||||
} OnConflictAction;
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user