From 382ceffdf7f620d8f2d50e451b4167d291ae2348 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 21 Jun 2017 15:35:54 -0400 Subject: 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 --- src/bin/pg_upgrade/function.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/bin/pg_upgrade/function.c') diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c index 685d1de0b73..8383b75325b 100644 --- a/src/bin/pg_upgrade/function.c +++ b/src/bin/pg_upgrade/function.c @@ -95,7 +95,7 @@ get_loadable_libraries(void) "FROM pg_catalog.pg_proc p " " JOIN pg_catalog.pg_namespace n " " ON pronamespace = n.oid " - "WHERE proname = 'plpython_call_handler' AND " + "WHERE proname = 'plpython_call_handler' AND " "nspname = 'public' AND " "prolang = %u AND " "probin = '$libdir/plpython' AND " @@ -118,9 +118,9 @@ get_loadable_libraries(void) "pre-8.1 install of plpython, and must be removed for pg_upgrade\n" "to complete because it references a now-obsolete \"plpython\"\n" "shared object file. You can remove the \"public\" schema version\n" - "of this function by running the following command:\n" + "of this function by running the following command:\n" "\n" - " DROP FUNCTION public.plpython_call_handler()\n" + " DROP FUNCTION public.plpython_call_handler()\n" "\n" "in each affected database:\n" "\n"); -- cgit v1.2.3