diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2008-06-11 10:48:17 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2008-06-11 10:48:17 +0000 |
| commit | 8b64a2642a6cf9aa5ce439ec2862e1d2bb968be7 (patch) | |
| tree | 78517db04af38b82d03dcf2bc3a4ed86ffea054b | |
| parent | 96675bff1f49d2d846750e344d3adc409e6bad73 (diff) | |
| download | postgresql-8b64a2642a6cf9aa5ce439ec2862e1d2bb968be7.tar.gz postgresql-8b64a2642a6cf9aa5ce439ec2862e1d2bb968be7.zip | |
Add optional on/off argument to \timing.
David Fetter.
| -rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 7 | ||||
| -rw-r--r-- | src/bin/psql/command.c | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 6333e37bf25..36f7fa23d40 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.207 2008/06/01 16:23:08 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.208 2008/06/11 10:48:16 heikki Exp $ PostgreSQL documentation --> @@ -1861,10 +1861,11 @@ lo_import 152801 <varlistentry> - <term><literal>\timing</literal></term> + <term><literal>\timing [ <replaceable class="parameter">on</replaceable> | <replaceable class="parameter">off</replaceable> ]</literal></term> <listitem> <para> - Toggles a display of how long each SQL statement takes, in milliseconds. + Without parameter, toggles a display of how long each SQL statement + takes, in milliseconds. With parameter, sets same. </para> </listitem> </varlistentry> diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index b86d67e9281..1a1241bd5c7 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.189 2008/05/14 19:10:29 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.190 2008/06/11 10:48:17 heikki Exp $ */ #include "postgres_fe.h" #include "command.h" @@ -884,7 +884,12 @@ exec_command(const char *cmd, /* \timing -- toggle timing of queries */ else if (strcmp(cmd, "timing") == 0) { - pset.timing = !pset.timing; + char *opt = psql_scan_slash_option(scan_state, + OT_NORMAL, NULL, false); + if (opt) + pset.timing = ParseVariableBool(opt); + else + pset.timing = !pset.timing; if (!pset.quiet) { if (pset.timing) @@ -892,6 +897,7 @@ exec_command(const char *cmd, else puts(_("Timing is off.")); } + free(opt); } /* \unset */ |