status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix incorrect results when the second-to-last row is deleted

This commit is contained in:
Thomas Goyne 2016-03-22 11:37:05 -07:00 committed by Thomas Goyne
parent 20d9da973b
commit bab5540cf6
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/collection_notifications.cpp
View File

@ -269,7 +269,7 @@ void CollectionChangeBuilder::move(size_t from, size_t to)
void CollectionChangeBuilder::move_over(size_t row_ndx, size_t last_row) void CollectionChangeBuilder::move_over(size_t row_ndx, size_t last_row)
{ {
REALM_ASSERT(row_ndx <= last_row); REALM_ASSERT(row_ndx <= last_row);
if (row_ndx == last_row || row_ndx + 1 == last_row) { if (row_ndx == last_row) {
erase(row_ndx); erase(row_ndx);
return; return;
} }

1
tests/collection_change_indices.cpp
View File

@ -131,6 +131,7 @@ TEST_CASE("[collection_change] move_over()") {
c.move_over(4, 5); c.move_over(4, 5);
c.move_over(0, 4); c.move_over(0, 4);
c.move_over(2, 3); c.move_over(2, 3);
c.clean_up_stale_moves();
REQUIRE_INDICES(c.deletions, 0, 2, 4, 5, 6); REQUIRE_INDICES(c.deletions, 0, 2, 4, 5, 6);
REQUIRE_INDICES(c.insertions, 0); REQUIRE_INDICES(c.insertions, 0);

20
tests/results.cpp
View File

@ -385,6 +385,26 @@ TEST_CASE("Results") {
advance_and_notify(*r); advance_and_notify(*r);
REQUIRE(notification_calls == 2); REQUIRE(notification_calls == 2);
} }
SECTION("moving a matching row by deleting all other rows") {
r->begin_transaction();
table->clear();
table->add_empty_row(2);
table->set_int(0, 0, 15);
table->set_int(0, 1, 5);
r->commit_transaction();
advance_and_notify(*r);
write([&] {
table->move_last_over(0);
table->add_empty_row();
table->set_int(0, 1, 3);
});
REQUIRE(notification_calls == 3);
REQUIRE(change.deletions.empty());
REQUIRE_INDICES(change.insertions, 1);
}
} }
} }