mirror of
https://github.com/postgres/postgres.git
synced 2026-02-18 18:25:17 -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
85 lines
2.6 KiB
C
85 lines
2.6 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* foreign.h
|
|
* support for foreign-data wrappers, servers and user mappings.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
*
|
|
* src/include/foreign/foreign.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef FOREIGN_H
|
|
#define FOREIGN_H
|
|
|
|
#include "nodes/parsenodes.h"
|
|
|
|
|
|
/* Helper for obtaining username for user mapping */
|
|
#define MappingUserName(userid) \
|
|
(OidIsValid(userid) ? GetUserNameFromId(userid, false) : "public")
|
|
|
|
|
|
/*
|
|
* Generic option types for validation.
|
|
* NB! These are treated as flags, so use only powers of two here.
|
|
*/
|
|
typedef enum
|
|
{
|
|
ServerOpt = 1, /* options applicable to SERVER */
|
|
UserMappingOpt = 2, /* options for USER MAPPING */
|
|
FdwOpt = 4 /* options for FOREIGN DATA WRAPPER */
|
|
} GenericOptionFlags;
|
|
|
|
typedef struct ForeignDataWrapper
|
|
{
|
|
Oid fdwid; /* FDW Oid */
|
|
Oid owner; /* FDW owner user Oid */
|
|
char *fdwname; /* Name of the FDW */
|
|
Oid fdwhandler; /* Oid of handler function, or 0 */
|
|
Oid fdwvalidator; /* Oid of validator function, or 0 */
|
|
List *options; /* fdwoptions as DefElem list */
|
|
} ForeignDataWrapper;
|
|
|
|
typedef struct ForeignServer
|
|
{
|
|
Oid serverid; /* server Oid */
|
|
Oid fdwid; /* foreign-data wrapper */
|
|
Oid owner; /* server owner user Oid */
|
|
char *servername; /* name of the server */
|
|
char *servertype; /* server type, optional */
|
|
char *serverversion; /* server version, optional */
|
|
List *options; /* srvoptions as DefElem list */
|
|
} ForeignServer;
|
|
|
|
typedef struct UserMapping
|
|
{
|
|
Oid umid; /* Oid of user mapping */
|
|
Oid userid; /* local user Oid */
|
|
Oid serverid; /* server Oid */
|
|
List *options; /* useoptions as DefElem list */
|
|
} UserMapping;
|
|
|
|
typedef struct ForeignTable
|
|
{
|
|
Oid relid; /* relation Oid */
|
|
Oid serverid; /* server Oid */
|
|
List *options; /* ftoptions as DefElem list */
|
|
} ForeignTable;
|
|
|
|
|
|
extern ForeignServer *GetForeignServer(Oid serverid);
|
|
extern ForeignServer *GetForeignServerByName(const char *name, bool missing_ok);
|
|
extern UserMapping *GetUserMapping(Oid userid, Oid serverid);
|
|
extern ForeignDataWrapper *GetForeignDataWrapper(Oid fdwid);
|
|
extern ForeignDataWrapper *GetForeignDataWrapperByName(const char *name,
|
|
bool missing_ok);
|
|
extern ForeignTable *GetForeignTable(Oid relid);
|
|
|
|
extern List *GetForeignColumnOptions(Oid relid, AttrNumber attnum);
|
|
|
|
extern Oid get_foreign_data_wrapper_oid(const char *fdwname, bool missing_ok);
|
|
extern Oid get_foreign_server_oid(const char *servername, bool missing_ok);
|
|
|
|
#endif /* FOREIGN_H */
|