diff options
| -rw-r--r-- | src/bin/psql/common.c | 14 | ||||
| -rw-r--r-- | src/bin/psql/t/001_basic.pl | 12 |
2 files changed, 22 insertions, 4 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 9b140badeb9..03e6d9ce8f8 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -1566,6 +1566,16 @@ ExecQueryAndProcessResults(const char *query, double *elapsed_msec, bool *svpt_g else result = PQgetResult(pset.db); + /* + * Get current timing measure in case an error occurs + */ + if (timing) + { + INSTR_TIME_SET_CURRENT(after); + INSTR_TIME_SUBTRACT(after, before); + *elapsed_msec = INSTR_TIME_GET_MILLISEC(after); + } + continue; } else if (svpt_gone_p && !*svpt_gone_p) @@ -1619,7 +1629,7 @@ ExecQueryAndProcessResults(const char *query, double *elapsed_msec, bool *svpt_g last = (next_result == NULL); /* - * Get timing measure before printing the last result. + * Update current timing measure. * * It will include the display of previous results, if any. This * cannot be helped because the server goes on processing further @@ -1630,7 +1640,7 @@ ExecQueryAndProcessResults(const char *query, double *elapsed_msec, bool *svpt_g * With combined queries, timing must be understood as an upper bound * of the time spent processing them. */ - if (last && timing) + if (timing) { INSTR_TIME_SET_CURRENT(after); INSTR_TIME_SUBTRACT(after, before); diff --git a/src/bin/psql/t/001_basic.pl b/src/bin/psql/t/001_basic.pl index 90e69d7cdba..c3ed18e84da 100644 --- a/src/bin/psql/t/001_basic.pl +++ b/src/bin/psql/t/001_basic.pl @@ -85,8 +85,16 @@ psql_like( '\timing on SELECT 1', qr/^1$ -^Time: \d+.\d\d\d ms/m, - '\timing'); +^Time: \d+\.\d\d\d ms/m, + '\timing with successful query'); + +# test \timing with query that fails +{ + my ($ret, $stdout, $stderr) = $node->psql('postgres', "\\timing on\nSELECT error"); + isnt($ret, 0, '\timing with query error: query failed'); + like($stdout, qr/^Time: \d+\.\d\d\d ms/m, '\timing with query error: timing output appears'); + unlike($stdout, qr/^Time: 0\.000 ms/m, '\timing with query error: timing was updated'); +} # test that ENCODING variable is set and that it is updated when # client encoding is changed |