Skip to content

Add ssv output format #3306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Add ssv output format #3306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d504289
Added support for @ssv in builtin.c
HenrikHolst Apr 2, 2025
a42a18a
Added info about the @ssv format
HenrikHolst Apr 2, 2025
2922160
Added info about the @ssv format
HenrikHolst Apr 2, 2025
08da6a2
Added test for @ssv format
HenrikHolst Apr 2, 2025
d2cf42f
Merge pull request #1 from HenrikHolst/patch-2
HenrikHolst Apr 2, 2025
e47c3a0
Merge pull request #2 from HenrikHolst/patch-3
HenrikHolst Apr 2, 2025
7e2f9ba
Merge pull request #3 from HenrikHolst/patch-4
HenrikHolst Apr 2, 2025
8292364
Changed from ssv to scsv
HenrikHolst Apr 15, 2025
cc32846
Change from ssv to csv in jq.test
HenrikHolst Apr 15, 2025
feb5353
Changed from ssv to csv in the manual
HenrikHolst Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions docs/content/manual/dev/manual.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2151,9 +2151,15 @@ sections:

* `@csv`:

The input must be an array, and it is rendered as CSV
with double quotes for strings, and quotes escaped by
repetition.
The input must be an array, and it is rendered as comma
separated CSV with double quotes for strings, and quotes
escaped by repetition.

* `@scsv`:

The input must be an array, and it is rendered as semicolon
separated CSV with double quotes for strings, and quotes
escaped by repetition.

* `@tsv`:

Expand Down
8 changes: 7 additions & 1 deletion jq.1.prebuilt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/builtin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,14 +558,19 @@ static jv f_format(jq_state *jq, jv input, jv fmt) {
} else if (!strcmp(fmt_s, "text")) {
jv_free(fmt);
return f_tostring(jq, input);
} else if (!strcmp(fmt_s, "csv") || !strcmp(fmt_s, "tsv")) {
} else if (!strcmp(fmt_s, "csv") || !strcmp(fmt_s, "scsv") || !strcmp(fmt_s, "tsv")) {
const char *quotes, *sep, *escapings;
const char *msg;
if (!strcmp(fmt_s, "csv")) {
msg = "cannot be csv-formatted, only array";
quotes = "\"";
sep = ",";
escapings = "\"\"\"\0";
} else if (!strcmp(fmt_s, "scsv")) {
msg = "cannot be scsv-formatted, only array";
quotes = "\"";
sep = ";";
escapings = "\"\"\"\0";
} else {
msg = "cannot be tsv-formatted, only array";
assert(!strcmp(fmt_s, "tsv"));
Expand Down
3 changes: 2 additions & 1 deletion tests/jq.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ null
null
"interpolation"

@text,@json,([1,.]|@csv,@tsv),@html,(@uri|.,@urid),@sh,(@base64|.,@base64d)
@text,@json,([1,.]|@csv,@scsv,@tsv),@html,(@uri|.,@urid),@sh,(@base64|.,@base64d)
"!()<>&'\"\t"
"!()<>&'\"\t"
"\"!()<>&'\\\"\\t\""
"1,\"!()<>&'\"\"\t\""
"1;\"!()<>&'\"\"\t\""
"1\t!()<>&'\"\\t"
"!()&lt;&gt;&amp;&apos;&quot;\t"
"%21%28%29%3C%3E%26%27%22%09"
Expand Down
Loading