mirror of
https://github.com/postgres/postgres.git
synced 2026-03-01 04:40:42 -05: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 e3860ffa4d 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
82 lines
2.7 KiB
C
82 lines
2.7 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* pg_database.h
|
|
* definition of the system "database" relation (pg_database)
|
|
* along with the relation's initial contents.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/catalog/pg_database.h
|
|
*
|
|
* NOTES
|
|
* the genbki.pl script reads this file and generates .bki
|
|
* information from the DATA() statements.
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef PG_DATABASE_H
|
|
#define PG_DATABASE_H
|
|
|
|
#include "catalog/genbki.h"
|
|
|
|
/* ----------------
|
|
* pg_database definition. cpp turns this into
|
|
* typedef struct FormData_pg_database
|
|
* ----------------
|
|
*/
|
|
#define DatabaseRelationId 1262
|
|
#define DatabaseRelation_Rowtype_Id 1248
|
|
|
|
CATALOG(pg_database,1262) BKI_SHARED_RELATION BKI_ROWTYPE_OID(1248) BKI_SCHEMA_MACRO
|
|
{
|
|
NameData datname; /* database name */
|
|
Oid datdba; /* owner of database */
|
|
int32 encoding; /* character encoding */
|
|
NameData datcollate; /* LC_COLLATE setting */
|
|
NameData datctype; /* LC_CTYPE setting */
|
|
bool datistemplate; /* allowed as CREATE DATABASE template? */
|
|
bool datallowconn; /* new connections allowed? */
|
|
int32 datconnlimit; /* max connections allowed (-1=no limit) */
|
|
Oid datlastsysoid; /* highest OID to consider a system OID */
|
|
TransactionId datfrozenxid; /* all Xids < this are frozen in this DB */
|
|
TransactionId datminmxid; /* all multixacts in the DB are >= this */
|
|
Oid dattablespace; /* default table space for this DB */
|
|
|
|
#ifdef CATALOG_VARLEN /* variable-length fields start here */
|
|
aclitem datacl[1]; /* access permissions */
|
|
#endif
|
|
} FormData_pg_database;
|
|
|
|
/* ----------------
|
|
* Form_pg_database corresponds to a pointer to a tuple with
|
|
* the format of pg_database relation.
|
|
* ----------------
|
|
*/
|
|
typedef FormData_pg_database *Form_pg_database;
|
|
|
|
/* ----------------
|
|
* compiler constants for pg_database
|
|
* ----------------
|
|
*/
|
|
#define Natts_pg_database 13
|
|
#define Anum_pg_database_datname 1
|
|
#define Anum_pg_database_datdba 2
|
|
#define Anum_pg_database_encoding 3
|
|
#define Anum_pg_database_datcollate 4
|
|
#define Anum_pg_database_datctype 5
|
|
#define Anum_pg_database_datistemplate 6
|
|
#define Anum_pg_database_datallowconn 7
|
|
#define Anum_pg_database_datconnlimit 8
|
|
#define Anum_pg_database_datlastsysoid 9
|
|
#define Anum_pg_database_datfrozenxid 10
|
|
#define Anum_pg_database_datminmxid 11
|
|
#define Anum_pg_database_dattablespace 12
|
|
#define Anum_pg_database_datacl 13
|
|
|
|
DATA(insert OID = 1 ( template1 PGUID ENCODING "LC_COLLATE" "LC_CTYPE" t t -1 0 0 1 1663 _null_));
|
|
SHDESCR("default template for new databases");
|
|
#define TemplateDbOid 1
|
|
|
|
#endif /* PG_DATABASE_H */
|