diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-09-14 22:51:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-14 22:51:29 +0200 |
commit | 280516c21bdbc7a55efba19e5343cd52a5556e3c (patch) | |
tree | 65c6440a42039f865a024f0ab4be61a19d05225a | |
parent | 760a101565e6a17c06f95e8e8a16d88adeefcfbf (diff) | |
parent | 781309b34d9c919b12c75eff01ebd9366877ba78 (diff) |
Merge pull request #28523 from vespa-engine/kkraune/nicer-yql-cli-examples
Semicolon not required in YQL anymore
-rw-r--r-- | client/go/internal/cli/cmd/curl.go | 2 | ||||
-rw-r--r-- | client/go/internal/cli/cmd/query.go | 2 | ||||
-rw-r--r-- | client/go/internal/curl/curl_test.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/client/go/internal/cli/cmd/curl.go b/client/go/internal/cli/cmd/curl.go index 10a860cea0e..2c754022901 100644 --- a/client/go/internal/cli/cmd/curl.go +++ b/client/go/internal/cli/cmd/curl.go @@ -30,7 +30,7 @@ For a more high-level interface to query and feeding, see the 'query' and 'docum `, Example: `$ vespa curl /ApplicationStatus $ vespa curl -- -X POST -H "Content-Type:application/json" --data-binary @src/test/resources/A-Head-Full-of-Dreams.json /document/v1/namespace/music/docid/1 -$ vespa curl -- -v --data-urlencode "yql=select * from music where album contains 'head';" /search/\?hits=5`, +$ vespa curl -- -v --data-urlencode "yql=select * from music where album contains 'head'" /search/\?hits=5`, DisableAutoGenTag: true, SilenceUsage: true, Args: cobra.MinimumNArgs(1), diff --git a/client/go/internal/cli/cmd/query.go b/client/go/internal/cli/cmd/query.go index 3f849fae99e..f72d1de2843 100644 --- a/client/go/internal/cli/cmd/query.go +++ b/client/go/internal/cli/cmd/query.go @@ -29,7 +29,7 @@ func newQueryCmd(cli *CLI) *cobra.Command { cmd := &cobra.Command{ Use: "query query-parameters", Short: "Issue a query to Vespa", - Example: `$ vespa query "yql=select * from music where album contains 'head';" hits=5`, + Example: `$ vespa query "yql=select * from music where album contains 'head'" hits=5`, Long: `Issue a query to Vespa. Any parameter from https://docs.vespa.ai/en/reference/query-api-reference.html diff --git a/client/go/internal/curl/curl_test.go b/client/go/internal/curl/curl_test.go index c8bcfb7f56b..9a84c784eca 100644 --- a/client/go/internal/curl/curl_test.go +++ b/client/go/internal/curl/curl_test.go @@ -24,10 +24,10 @@ func TestGet(t *testing.T) { require.Nil(t, err) c.PrivateKey = "key.pem" c.Certificate = "cert.pem" - c.Param("yql", "select * from sources * where title contains 'foo';") + c.Param("yql", "select * from sources * where title contains 'foo'") c.Param("hits", "5") - assert.Equal(t, `curl --key key.pem --cert cert.pem 'https://example.com?hits=5&yql=select+%2A+from+sources+%2A+where+title+contains+%27foo%27%3B'`, c.String()) + assert.Equal(t, `curl --key key.pem --cert cert.pem 'https://example.com?hits=5&yql=select+%2A+from+sources+%2A+where+title+contains+%27foo%27'`, c.String()) } func TestRawArgs(t *testing.T) { |