Skip to content

Commit d8ff060

Browse files
tglsfdctglsfdc
committed
Fix behavior of printTable() and friends with externally-invoked pager.
The formatting modes that depend on knowledge of the terminal window width did not work right when printing a query result that's been fetched in sections (as a result of FETCH_SIZE). ExecQueryUsingCursor() would force use of the pager as soon as there's more than one result section, and then print.c would see an output file pointer that's not stdout and incorrectly conclude that the terminal window width isn't relevant. This has been broken all along for non-expanded "wrapped" output format, and as of 9.5 the issue affects expanded mode as well. The problem also caused "\pset expanded auto" mode to invariably *not* switch to expanded output in a segmented result, which seems to me to be exactly backwards. To fix, we need to pass down an "is_pager" flag to inform the print.c subroutines that some calling level has already replaced stdout with a pager pipe, so they should (a) not do that again and (b) nonetheless honor the window size. (Notably, this makes the first is_pager test in print_aligned_text() not be dead code anymore.) This patch is a bit invasive because there are so many existing calls of printQuery()/printTable(), but fortunately all but a couple can just pass "false" for the added parameter. Back-patch to 9.5 but no further. Given the lack of field complaints, it's not clear that we should change the behavior in stable branches. Also, the API change for printQuery()/printTable() might possibly break third-party code, again something we don't like to do in stable branches. However, it's not quite too late to do this in 9.5, and with the larger scope of the problem there, it seems worth doing.
1 parent 1caef31 commit d8ff060

File tree

7 files changed

+102
-72
lines changed

7 files changed

+102
-72
lines changed

‎src/bin/psql/common.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "common.h"
1010

1111
#include <ctype.h>
12+
#include <limits.h>
1213
#include <signal.h>
1314
#ifndef WIN32
1415
#include <unistd.h> /* for write() */
@@ -537,7 +538,7 @@ PSQLexecWatch(const char *query, const printQueryOpt *opt)
537538
switch (PQresultStatus(res))
538539
{
539540
case PGRES_TUPLES_OK:
540-
printQuery(res, opt, pset.queryFout, pset.logfile);
541+
printQuery(res, opt, pset.queryFout, false, pset.logfile);
541542
break;
542543

543544
case PGRES_COMMAND_OK:
@@ -624,7 +625,7 @@ PrintQueryTuples(const PGresult *results)
624625
return false;
625626
}
626627

627-
printQuery(results, &my_popt, pset.queryFout, pset.logfile);
628+
printQuery(results, &my_popt, pset.queryFout, false, pset.logfile);
628629

629630
/* close file/pipe, restore old setting */
630631
setQFout(NULL);
@@ -633,7 +634,7 @@ PrintQueryTuples(const PGresult *results)
633634
pset.queryFoutPipe = queryFoutPipe_copy;
634635
}
635636
else
636-
printQuery(results, &my_popt, pset.queryFout, pset.logfile);
637+
printQuery(results, &my_popt, pset.queryFout, false, pset.logfile);
637638

638639
return true;
639640
}
@@ -1336,11 +1337,11 @@ ExecQueryUsingCursor(const char *query, double *elapsed_msec)
13361337
* If query requires multiple result sets, hack to ensure that
13371338
* only one pager instance is used for the whole mess
13381339
*/
1339-
pset.queryFout = PageOutput(100000, &(my_popt.topt));
1340+
pset.queryFout = PageOutput(INT_MAX, &(my_popt.topt));
13401341
did_pager = true;
13411342
}
13421343

1343-
printQuery(results, &my_popt, pset.queryFout, pset.logfile);
1344+
printQuery(results, &my_popt, pset.queryFout, did_pager, pset.logfile);
13441345

13451346
PQclear(results);
13461347

‎src/bin/psql/describe.c‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ describeAggregates(const char *pattern, bool verbose, bool showSystem)
123123
myopt.title = _("List of aggregate functions");
124124
myopt.translate_header = true;
125125

126-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
126+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
127127

128128
PQclear(res);
129129
return true;
@@ -204,7 +204,7 @@ describeTablespaces(const char *pattern, bool verbose)
204204
myopt.title = _("List of tablespaces");
205205
myopt.translate_header = true;
206206

207-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
207+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
208208

209209
PQclear(res);
210210
return true;
@@ -469,7 +469,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
469469
myopt.translate_columns = translate_columns;
470470
myopt.n_translate_columns = lengthof(translate_columns);
471471

472-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
472+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
473473

474474
PQclear(res);
475475
return true;
@@ -585,7 +585,7 @@ describeTypes(const char *pattern, bool verbose, bool showSystem)
585585
myopt.title = _("List of data types");
586586
myopt.translate_header = true;
587587

588-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
588+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
589589

590590
PQclear(res);
591591
return true;
@@ -660,7 +660,7 @@ describeOperators(const char *pattern, bool verbose, bool showSystem)
660660
myopt.title = _("List of operators");
661661
myopt.translate_header = true;
662662

663-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
663+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
664664

665665
PQclear(res);
666666
return true;
@@ -731,7 +731,7 @@ listAllDbs(const char *pattern, bool verbose)
731731
myopt.title = _("List of databases");
732732
myopt.translate_header = true;
733733

734-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
734+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
735735

736736
PQclear(res);
737737
return true;
@@ -847,7 +847,7 @@ permissionsList(const char *pattern)
847847
myopt.translate_columns = translate_columns;
848848
myopt.n_translate_columns = lengthof(translate_columns);
849849

850-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
850+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
851851

852852
termPQExpBuffer(&buf);
853853
PQclear(res);
@@ -921,7 +921,7 @@ listDefaultACLs(const char *pattern)
921921
myopt.translate_columns = translate_columns;
922922
myopt.n_translate_columns = lengthof(translate_columns);
923923

924-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
924+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
925925

926926
termPQExpBuffer(&buf);
927927
PQclear(res);
@@ -1117,7 +1117,7 @@ objectDescription(const char *pattern, bool showSystem)
11171117
myopt.translate_columns = translate_columns;
11181118
myopt.n_translate_columns = lengthof(translate_columns);
11191119

1120-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
1120+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
11211121

11221122
PQclear(res);
11231123
return true;
@@ -1260,7 +1260,7 @@ describeOneTableDetails(const char *schemaname,
12601260
{
12611261
printfPQExpBuffer(&buf,
12621262
"SELECT c.relchecks, c.relkind, c.relhasindex, c.relhasrules, "
1263-
"c.relhastriggers, c.relrowsecurity, c.relforcerowsecurity, "
1263+
"c.relhastriggers, c.relrowsecurity, c.relforcerowsecurity, "
12641264
"c.relhasoids, %s, c.reltablespace, "
12651265
"CASE WHEN c.reloftype = 0 THEN '' ELSE c.reloftype::pg_catalog.regtype::pg_catalog.text END, "
12661266
"c.relpersistence, c.relreplident\n"
@@ -2546,8 +2546,7 @@ describeOneTableDetails(const char *schemaname,
25462546
printTableAddFooter(&cont, buf.data);
25472547
}
25482548

2549-
printTable(&cont, pset.queryFout, pset.logfile);
2550-
printTableCleanup(&cont);
2549+
printTable(&cont, pset.queryFout, false, pset.logfile);
25512550

25522551
retval = true;
25532552

@@ -2791,7 +2790,7 @@ describeRoles(const char *pattern, bool verbose)
27912790
}
27922791
termPQExpBuffer(&buf);
27932792

2794-
printTable(&cont, pset.queryFout, pset.logfile);
2793+
printTable(&cont, pset.queryFout, false, pset.logfile);
27952794
printTableCleanup(&cont);
27962795

27972796
for (i = 0; i < nrows; i++)
@@ -2865,7 +2864,7 @@ listDbRoleSettings(const char *pattern, const char *pattern2)
28652864
myopt.title = _("List of settings");
28662865
myopt.translate_header = true;
28672866

2868-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
2867+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
28692868
}
28702869

28712870
PQclear(res);
@@ -3029,7 +3028,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
30293028
myopt.translate_columns = translate_columns;
30303029
myopt.n_translate_columns = lengthof(translate_columns);
30313030

3032-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3031+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
30333032
}
30343033

30353034
PQclear(res);
@@ -3105,7 +3104,7 @@ listLanguages(const char *pattern, bool verbose, bool showSystem)
31053104
myopt.title = _("List of languages");
31063105
myopt.translate_header = true;
31073106

3108-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3107+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
31093108

31103109
PQclear(res);
31113110
return true;
@@ -3192,7 +3191,7 @@ listDomains(const char *pattern, bool verbose, bool showSystem)
31923191
myopt.title = _("List of domains");
31933192
myopt.translate_header = true;
31943193

3195-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3194+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
31963195

31973196
PQclear(res);
31983197
return true;
@@ -3268,7 +3267,7 @@ listConversions(const char *pattern, bool verbose, bool showSystem)
32683267
myopt.translate_columns = translate_columns;
32693268
myopt.n_translate_columns = lengthof(translate_columns);
32703269

3271-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3270+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
32723271

32733272
PQclear(res);
32743273
return true;
@@ -3334,7 +3333,7 @@ listEventTriggers(const char *pattern, bool verbose)
33343333
myopt.translate_columns = translate_columns;
33353334
myopt.n_translate_columns = lengthof(translate_columns);
33363335

3337-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3336+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
33383337

33393338
PQclear(res);
33403339
return true;
@@ -3433,7 +3432,7 @@ listCasts(const char *pattern, bool verbose)
34333432
myopt.translate_columns = translate_columns;
34343433
myopt.n_translate_columns = lengthof(translate_columns);
34353434

3436-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3435+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
34373436

34383437
PQclear(res);
34393438
return true;
@@ -3509,7 +3508,7 @@ listCollations(const char *pattern, bool verbose, bool showSystem)
35093508
myopt.translate_columns = translate_columns;
35103509
myopt.n_translate_columns = lengthof(translate_columns);
35113510

3512-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3511+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
35133512

35143513
PQclear(res);
35153514
return true;
@@ -3566,7 +3565,7 @@ listSchemas(const char *pattern, bool verbose, bool showSystem)
35663565
myopt.title = _("List of schemas");
35673566
myopt.translate_header = true;
35683567

3569-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3568+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
35703569

35713570
PQclear(res);
35723571
return true;
@@ -3623,7 +3622,7 @@ listTSParsers(const char *pattern, bool verbose)
36233622
myopt.title = _("List of text search parsers");
36243623
myopt.translate_header = true;
36253624

3626-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3625+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
36273626

36283627
PQclear(res);
36293628
return true;
@@ -3769,7 +3768,7 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
37693768
myopt.translate_columns = translate_columns;
37703769
myopt.n_translate_columns = lengthof(translate_columns);
37713770

3772-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3771+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
37733772

37743773
PQclear(res);
37753774

@@ -3801,7 +3800,7 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
38013800
myopt.translate_columns = NULL;
38023801
myopt.n_translate_columns = 0;
38033802

3804-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3803+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
38053804

38063805
PQclear(res);
38073806
return true;
@@ -3869,7 +3868,7 @@ listTSDictionaries(const char *pattern, bool verbose)
38693868
myopt.title = _("List of text search dictionaries");
38703869
myopt.translate_header = true;
38713870

3872-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3871+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
38733872

38743873
PQclear(res);
38753874
return true;
@@ -3937,7 +3936,7 @@ listTSTemplates(const char *pattern, bool verbose)
39373936
myopt.title = _("List of text search templates");
39383937
myopt.translate_header = true;
39393938

3940-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3939+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
39413940

39423941
PQclear(res);
39433942
return true;
@@ -3994,7 +3993,7 @@ listTSConfigs(const char *pattern, bool verbose)
39943993
myopt.title = _("List of text search configurations");
39953994
myopt.translate_header = true;
39963995

3997-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
3996+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
39983997

39993998
PQclear(res);
40003999
return true;
@@ -4132,7 +4131,7 @@ describeOneTSConfig(const char *oid, const char *nspname, const char *cfgname,
41324131
myopt.topt.default_footer = false;
41334132
myopt.translate_header = true;
41344133

4135-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
4134+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
41364135

41374136
termPQExpBuffer(&title);
41384137

@@ -4215,7 +4214,7 @@ listForeignDataWrappers(const char *pattern, bool verbose)
42154214
myopt.title = _("List of foreign-data wrappers");
42164215
myopt.translate_header = true;
42174216

4218-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
4217+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
42194218

42204219
PQclear(res);
42214220
return true;
@@ -4294,7 +4293,7 @@ listForeignServers(const char *pattern, bool verbose)
42944293
myopt.title = _("List of foreign servers");
42954294
myopt.translate_header = true;
42964295

4297-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
4296+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
42984297

42994298
PQclear(res);
43004299
return true;
@@ -4352,7 +4351,7 @@ listUserMappings(const char *pattern, bool verbose)
43524351
myopt.title = _("List of user mappings");
43534352
myopt.translate_header = true;
43544353

4355-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
4354+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
43564355

43574356
PQclear(res);
43584357
return true;
@@ -4426,7 +4425,7 @@ listForeignTables(const char *pattern, bool verbose)
44264425
myopt.title = _("List of foreign tables");
44274426
myopt.translate_header = true;
44284427

4429-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
4428+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
44304429

44314430
PQclear(res);
44324431
return true;
@@ -4480,7 +4479,7 @@ listExtensions(const char *pattern)
44804479
myopt.title = _("List of installed extensions");
44814480
myopt.translate_header = true;
44824481

4483-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
4482+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
44844483

44854484
PQclear(res);
44864485
return true;
@@ -4587,7 +4586,7 @@ listOneExtensionContents(const char *extname, const char *oid)
45874586
myopt.title = title;
45884587
myopt.translate_header = true;
45894588

4590-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
4589+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
45914590

45924591
PQclear(res);
45934592
return true;

‎src/bin/psql/large_obj.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ do_lo_list(void)
308308
myopt.title = _("Large objects");
309309
myopt.translate_header = true;
310310

311-
printQuery(res, &myopt, pset.queryFout, pset.logfile);
311+
printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
312312

313313
PQclear(res);
314314
return true;

0 commit comments

Comments
 (0)