From 8c004ef391b33efcea7c9bfe793fd7b7385b7a9c Mon Sep 17 00:00:00 2001
From: Jason Fulghum <jason@dolthub.com>
Date: Wed, 31 May 2023 15:43:36 -0700
Subject: [PATCH] Changing to use `parquet` as the command line argument
 (instead of `pq`)

---
 go/cmd/dolt/commands/sql.go     | 6 +++---
 integration-tests/bats/sql.bats | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/go/cmd/dolt/commands/sql.go b/go/cmd/dolt/commands/sql.go
index a89f137edd..885fd6bcd8 100644
--- a/go/cmd/dolt/commands/sql.go
+++ b/go/cmd/dolt/commands/sql.go
@@ -147,7 +147,7 @@ func (cmd SqlCmd) Docs() *cli.CommandDocumentation {
 func (cmd SqlCmd) ArgParser() *argparser.ArgParser {
 	ap := argparser.NewArgParserWithMaxArgs(cmd.Name(), 0)
 	ap.SupportsString(QueryFlag, "q", "SQL query to run", "Runs a single query and exits.")
-	ap.SupportsString(FormatFlag, "r", "result output format", "How to format result output. Valid values are tabular, csv, json, vertical, and pq. Defaults to tabular.")
+	ap.SupportsString(FormatFlag, "r", "result output format", "How to format result output. Valid values are tabular, csv, json, vertical, and parquet. Defaults to tabular.")
 	ap.SupportsString(saveFlag, "s", "saved query name", "Used with --query, save the query to the query catalog with the name provided. Saved queries can be examined in the dolt_query_catalog system table.")
 	ap.SupportsString(executeFlag, "x", "saved query name", "Executes a saved query with the given name.")
 	ap.SupportsFlag(listSavedFlag, "l", "List all saved queries.")
@@ -323,7 +323,7 @@ func (cmd SqlCmd) handleLegacyArguments(ap *argparser.ArgParser, commandStr stri
 	if err != nil {
 		legacyParser := argparser.NewArgParserWithMaxArgs(cmd.Name(), 0)
 		legacyParser.SupportsString(QueryFlag, "q", "SQL query to run", "Runs a single query and exits.")
-		legacyParser.SupportsString(FormatFlag, "r", "result output format", "How to format result output. Valid values are tabular, csv, json, vertical, and pq. Defaults to tabular.")
+		legacyParser.SupportsString(FormatFlag, "r", "result output format", "How to format result output. Valid values are tabular, csv, json, vertical, and parquet. Defaults to tabular.")
 		legacyParser.SupportsString(saveFlag, "s", "saved query name", "Used with --query, save the query to the query catalog with the name provided. Saved queries can be examined in the dolt_query_catalog system table.")
 		legacyParser.SupportsString(executeFlag, "x", "saved query name", "Executes a saved query with the given name.")
 		legacyParser.SupportsFlag(listSavedFlag, "l", "List all saved queries.")
@@ -584,7 +584,7 @@ func GetResultFormat(format string) (engine.PrintResultFormat, errhand.VerboseEr
 		return engine.FormatNull, nil
 	case "vertical":
 		return engine.FormatVertical, nil
-	case "pq":
+	case "parquet":
 		return engine.FormatParquet, nil
 	default:
 		return engine.FormatTabular, errhand.BuildDError("Invalid argument for --result-format. Valid values are tabular, csv, json").Build()
diff --git a/integration-tests/bats/sql.bats b/integration-tests/bats/sql.bats
index f8bd7756da..569fbae223 100755
--- a/integration-tests/bats/sql.bats
+++ b/integration-tests/bats/sql.bats
@@ -1040,7 +1040,7 @@ SQL
     [ $status -eq 0 ]
     [[ "$output" =~ "utf8mb4" ]] || false
 
-    dolt sql -r pq -q "select * from test order by a" > out.parquet
+    dolt sql -r parquet -q "select * from test order by a" > out.parquet
     run parquet cat out.parquet
     [ "$status" -eq 0 ]
     [[ "$output" =~ '{"a": 1, "b": 1.5, "c": "1", "d": 1577836800000000}' ]] || false
@@ -1050,7 +1050,7 @@ SQL
     [[ "$output" =~ '{"a": 5, "b": 5.5, "c": "5", "d": null}' ]] || false
     [ "${#lines[@]}" -eq 5 ]
 
-    run dolt sql -r pq -q "select @@character_set_client"
+    run dolt sql -r parquet -q "select @@character_set_client"
     [ $status -eq 0 ]
     [[ "$output" =~ "utf8mb4" ]] || false
 }
@@ -1069,7 +1069,7 @@ SQL
     [ $status -eq 0 ]
     [[ "$output" =~ "{}" ]] || false
 
-    dolt sql -r pq -q "select * from test order by a" > out.parquet
+    dolt sql -r parquet -q "select * from test order by a" > out.parquet
     run parquet cat out.parquet
     [ "$status" -eq 0 ]
     [ "${#lines[@]}" -eq 0 ]
@@ -1097,7 +1097,7 @@ SQL
     [[ "$output" =~ '1,"{""key"": ""value""}"' ]] || false
     [[ "$output" =~ '2,"""Hello"""' ]] || false
 
-    dolt sql -r pq -q "select * from test order by a" > out.parquet
+    dolt sql -r parquet -q "select * from test order by a" > out.parquet
     run parquet cat out.parquet
     [ $status -eq 0 ]
     [[ "$output" =~ '{"a": 1, "v": "{\"key\": \"value\"}"}' ]] || false