mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-12 01:18:35 +08:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments to the right of code, and remove pgindent hack that caused comments following #endif to not obey the general rule. Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using the published version of pg_bsd_indent, but a hacked-up version that tried to minimize the amount of movement of comments to the right of code. The situation of interest is where such a comment has to be moved to the right of its default placement at column 33 because there's code there. BSD indent has always moved right in units of tab stops in such cases --- but in the previous incarnation, indent was working in 8-space tab stops, while now it knows we use 4-space tabs. So the net result is that in about half the cases, such comments are placed one tab stop left of before. This is better all around: it leaves more room on the line for comment text, and it means that in such cases the comment uniformly starts at the next 4-space tab stop after the code, rather than sometimes one and sometimes two tabs after. Also, ensure that comments following #endif are indented the same as comments following other preprocessor commands such as #else. That inconsistency turns out to have been self-inflicted damage from a poorly-thought-through post-indent "fixup" in pgindent. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
58 lines
1.6 KiB
C
58 lines
1.6 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* pg_user_mapping.h
|
|
* definition of the system "user mapping" relation (pg_user_mapping)
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/catalog/pg_user_mapping.h
|
|
*
|
|
* NOTES
|
|
* the genbki.pl script reads this file and generates .bki
|
|
* information from the DATA() statements.
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef PG_USER_MAPPING_H
|
|
#define PG_USER_MAPPING_H
|
|
|
|
#include "catalog/genbki.h"
|
|
|
|
/* ----------------
|
|
* pg_user_mapping definition. cpp turns this into
|
|
* typedef struct FormData_pg_user_mapping
|
|
* ----------------
|
|
*/
|
|
#define UserMappingRelationId 1418
|
|
|
|
CATALOG(pg_user_mapping,1418)
|
|
{
|
|
Oid umuser; /* Id of the user, InvalidOid if PUBLIC is
|
|
* wanted */
|
|
Oid umserver; /* server of this mapping */
|
|
|
|
#ifdef CATALOG_VARLEN /* variable-length fields start here */
|
|
text umoptions[1]; /* user mapping options */
|
|
#endif
|
|
} FormData_pg_user_mapping;
|
|
|
|
/* ----------------
|
|
* Form_pg_user_mapping corresponds to a pointer to a tuple with
|
|
* the format of pg_user_mapping relation.
|
|
* ----------------
|
|
*/
|
|
typedef FormData_pg_user_mapping *Form_pg_user_mapping;
|
|
|
|
/* ----------------
|
|
* compiler constants for pg_user_mapping
|
|
* ----------------
|
|
*/
|
|
|
|
#define Natts_pg_user_mapping 3
|
|
#define Anum_pg_user_mapping_umuser 1
|
|
#define Anum_pg_user_mapping_umserver 2
|
|
#define Anum_pg_user_mapping_umoptions 3
|
|
|
|
#endif /* PG_USER_MAPPING_H */
|