mirror of
https://github.com/postgres/postgres.git
synced 2025-06-27 23:21:58 +03:00
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they flow past the right margin. By default, BSD indent lines up statement continuation lines that are within parentheses so that they start just to the right of the preceding left parenthesis. However, traditionally, if that resulted in the continuation line extending to the right of the desired right margin, then indent would push it left just far enough to not overrun the margin, if it could do so without making the continuation line start to the left of the current statement indent. That makes for a weird mix of indentations unless one has been completely rigid about never violating the 80-column limit. This behavior has been pretty universally panned by Postgres developers. Hence, disable it with indent's new -lpl switch, so that parenthesized lines are always lined up with the preceding left paren. 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
This commit is contained in:
@ -44,7 +44,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
|
||||
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
|
||||
/*------
|
||||
translator: this string will be truncated at 149 characters expanded. */
|
||||
ecpg_gettext("unsupported type \"%s\" on line %d"), str, line);
|
||||
ecpg_gettext("unsupported type \"%s\" on line %d"), str, line);
|
||||
break;
|
||||
|
||||
case ECPG_TOO_MANY_ARGUMENTS:
|
||||
@ -106,7 +106,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
|
||||
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
|
||||
/*------
|
||||
translator: this string will be truncated at 149 characters expanded. */
|
||||
ecpg_gettext("null value without indicator on line %d"), line);
|
||||
ecpg_gettext("null value without indicator on line %d"), line);
|
||||
break;
|
||||
|
||||
case ECPG_NO_ARRAY:
|
||||
@ -162,7 +162,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
|
||||
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
|
||||
/*------
|
||||
translator: this string will be truncated at 149 characters expanded. */
|
||||
ecpg_gettext("descriptor index out of range on line %d"), line);
|
||||
ecpg_gettext("descriptor index out of range on line %d"), line);
|
||||
break;
|
||||
|
||||
case ECPG_UNKNOWN_DESCRIPTOR_ITEM:
|
||||
@ -190,7 +190,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
|
||||
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
|
||||
/*------
|
||||
translator: this string will be truncated at 149 characters expanded. */
|
||||
ecpg_gettext("error in transaction processing on line %d"), line);
|
||||
ecpg_gettext("error in transaction processing on line %d"), line);
|
||||
break;
|
||||
|
||||
case ECPG_CONNECT:
|
||||
|
Reference in New Issue
Block a user