Add optional on/off argument to \timing.

hlinnaka · hlinnaka · commit 8b64a2642a6c · 2008-06-11T10:48:17.000Z
David Fetter.
diff --git 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
@@ -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,14 +884,20 @@ 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)
 				puts(_("Timing is on."));
 			else
 				puts(_("Timing is off."));
 		}
+		free(opt);
 	}
 
 	/* \unset */

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2008, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.189 2008/05/14 19:10:29 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.190 2008/06/11 10:48:17 heikki Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "command.h"`
`@@ -884,14 +884,20 @@ exec_command(const char *cmd,`
`884`	`884`	`/* \timing -- toggle timing of queries */`
`885`	`885`	`else if (strcmp(cmd, "timing") == 0)`
`886`	`886`	`{`
`887`		`- pset.timing = !pset.timing;`
	`887`	`+ char *opt = psql_scan_slash_option(scan_state,`
	`888`	`+ OT_NORMAL, NULL, false);`
	`889`	`+ if (opt)`
	`890`	`+ pset.timing = ParseVariableBool(opt);`
	`891`	`+ else`
	`892`	`+ pset.timing = !pset.timing;`
`888`	`893`	`if (!pset.quiet)`
`889`	`894`	`{`
`890`	`895`	`if (pset.timing)`
`891`	`896`	`puts(_("Timing is on."));`
`892`	`897`	`else`
`893`	`898`	`puts(_("Timing is off."));`
`894`	`899`	`}`
	`900`	`+ free(opt);`
`895`	`901`	`}`
`896`	`902`
`897`	`903`	`/* \unset */`