Rethink \crosstabview's argument parsing logic.

\crosstabview interpreted its arguments in an unusual way, including
doing case-insensitive matching of unquoted column names, which is
surely not the right thing.  Rip that out in favor of doing something
equivalent to the dequoting/case-folding rules used by other psql
commands.  To keep it simple, change the syntax so that the optional
sort column is specified as a separate argument, instead of the
also-quite-unusual syntax that attached it to the colH argument with
a colon.

Also, rework the error messages to be closer to project style.

Author: tglsfdc

doc/src/sgml/ref/psql-ref.sgml

@@ -993,9 +993,10 @@ testdb=>
       <varlistentry id="APP-PSQL-meta-commands-crosstabview">
         <term><literal>\crosstabview [
             <replaceable class="parameter">colV</replaceable>
-            <replaceable class="parameter">colH</replaceable>[:<replaceable class="parameter">scolH</replaceable>]
-            [<replaceable class="parameter">colD</replaceable>]
-            ] </literal></term>
+            [ <replaceable class="parameter">colH</replaceable>
+            [ <replaceable class="parameter">colD</replaceable>
+            [ <replaceable class="parameter">sortcolH</replaceable>
+            ] ] ] ] </literal></term>
         <listitem>
         <para>
         Executes the current query buffer (like <literal>\g</literal>) and
@@ -1004,16 +1005,11 @@ testdb=&gt;
         The output column identified by <replaceable class="parameter">colV</>
         becomes a vertical header and the output column identified by
         <replaceable class="parameter">colH</replaceable>
-        becomes a horizontal header, optionally sorted by ranking data obtained
-        from column <replaceable class="parameter">scolH</replaceable>.
+        becomes a horizontal header.
         <replaceable class="parameter">colD</replaceable> identifies
         the output column to display within the grid.
-        If <replaceable class="parameter">colD</replaceable> is not
-        specified and there are exactly three columns in the result set,
-        the column that is neither
-        <replaceable class="parameter">colV</replaceable> nor
-        <replaceable class="parameter">colH</replaceable>
-        is displayed; if there are more columns, an error is reported.
+        <replaceable class="parameter">sortcolH</replaceable> identifies
+        an optional sort column for the horizontal header.
         </para>
 
         <para>
@@ -1024,6 +1020,12 @@ testdb=&gt;
         and <replaceable class="parameter">colH</replaceable> as column 2.
         <replaceable class="parameter">colH</replaceable> must differ from
         <replaceable class="parameter">colV</replaceable>.
+        If <replaceable class="parameter">colD</replaceable> is not
+        specified, then there must be exactly three columns in the query
+        result, and the column that is neither
+        <replaceable class="parameter">colV</replaceable> nor
+        <replaceable class="parameter">colH</replaceable>
+        is taken to be <replaceable class="parameter">colD</replaceable>.
         </para>
 
         <para>
@@ -1037,11 +1039,11 @@ testdb=&gt;
         found in column <replaceable class="parameter">colH</replaceable>,
         with duplicates removed.  By default, these appear in the same order
         as in the query results.  But if the
-        optional <replaceable class="parameter">scolH</> argument is given, it
-        identifies a column whose values must be integer numbers, and the
+        optional <replaceable class="parameter">sortcolH</> argument is given,
+        it identifies a column whose values must be integer numbers, and the
         values from <replaceable class="parameter">colH</replaceable> will
         appear in the horizontal header sorted according to the
-        corresponding <replaceable class="parameter">scolH</> values.
+        corresponding <replaceable class="parameter">sortcolH</> values.
         </para>
 
         <para>

src/bin/psql/command.c

@@ -368,13 +368,11 @@ exec_command(const char *cmd,
 	/* \crosstabview -- execute a query and display results in crosstab */
 	else if (strcmp(cmd, "crosstabview") == 0)
 	{
-		pset.ctv_col_V = psql_scan_slash_option(scan_state,
-												OT_NORMAL, NULL, false);
-		pset.ctv_col_H = psql_scan_slash_option(scan_state,
-												OT_NORMAL, NULL, false);
-		pset.ctv_col_D = psql_scan_slash_option(scan_state,
-												OT_NORMAL, NULL, false);
+		int			i;
 
+		for (i = 0; i < lengthof(pset.ctv_args); i++)
+			pset.ctv_args[i] = psql_scan_slash_option(scan_state,
+													  OT_NORMAL, NULL, true);
 		pset.crosstab_flag = true;
 		status = PSQL_CMD_SEND;
 	}

src/bin/psql/common.c

@@ -1130,6 +1130,7 @@ SendQuery(const char *query)
 	PGTransactionStatusType transaction_status;
 	double		elapsed_msec = 0;
 	bool		OK = false;
+	int			i;
 	bool		on_error_rollback_savepoint = false;
 	static bool on_error_rollback_warning = false;
 
@@ -1362,20 +1363,10 @@ SendQuery(const char *query)
 
 	/* reset \crosstabview trigger */
 	pset.crosstab_flag = false;
-	if (pset.ctv_col_V)
+	for (i = 0; i < lengthof(pset.ctv_args); i++)
 	{
-		free(pset.ctv_col_V);
-		pset.ctv_col_V = NULL;
-	}
-	if (pset.ctv_col_H)
-	{
-		free(pset.ctv_col_H);
-		pset.ctv_col_H = NULL;
-	}
-	if (pset.ctv_col_D)
-	{
-		free(pset.ctv_col_D);
-		pset.ctv_col_D = NULL;
+		pg_free(pset.ctv_args[i]);
+		pset.ctv_args[i] = NULL;
 	}
 
 	return OK;