Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Skip changeset discussions unless requested #388

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Skip changeset discussions unless requested #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/backend/apidb/common_pgsql_selection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ void extract_changesets(
for (const auto &row : rows) {
auto elem = extract_changeset(row, cc, changeset_cols);
auto tags = extract_tags(row, tag_cols);
auto comments = extract_comments(row, comments_cols);
auto comments = (include_changeset_discussions ? extract_comments(row, comments_cols) : comments_t{});
elem.comments_count = comments.size();
formatter.write_changeset(
elem, tags, include_changeset_discussions, comments, now);
Expand Down
4 changes: 2 additions & 2 deletions src/backend/apidb/readonly_pgsql_selection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,10 @@ void readonly_pgsql_selection::write_changesets(output_formatter &formatter,
"to_char(cc.created_at,'YYYY-MM-DD\"T\"HH24:MI:SS\"Z\"') AS created_at "
"FROM changeset_comments cc JOIN users u ON cc.author_id = u.id "
"where cc.changeset_id=c.id AND cc.visible ORDER BY cc.created_at) x "
")cc ON true "
")cc ON $2 "
"WHERE c.id = ANY($1)");

pqxx::result changesets = m.exec_prepared("extract_changesets", sel_changesets);
pqxx::result changesets = m.exec_prepared("extract_changesets", sel_changesets, include_changeset_discussions);

fetch_changesets(sel_changesets, cc);

Expand Down
5 changes: 3 additions & 2 deletions test/test_apidb_backend_changesets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ void check_changeset_with_comments_impl(
REQUIRE(f.m_changesets.size() == 1);

comments_t comments;
{

if (include_discussion) {
changeset_comment_info comment;
comment.id = 1;
comment.author_id = 3;
Expand All @@ -311,7 +312,7 @@ void check_changeset_with_comments_impl(
std::string("user_1"), // display_name
{}, // bounding box
0, // num_changes
1 // comments_count
include_discussion ? 1 : 0 // comments_count
),
tags_t(),
include_discussion,
Expand Down