Skip to content
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

Jump to bottom

Fix: SQLite causes crash when trying to merge undefined #334

Merged
merged 15 commits into from
Sep 15, 2023
Merged

Fix: SQLite causes crash when trying to merge undefined #334

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9b28da5
fix: remove "NOT NULL" constraint from SQLite database
Sep 11, 2023
3f78096
fix: instead of removing "NOT NULL" constraint, delete nullish keys m…
Sep 11, 2023
2589692
fix: use lodash instead of JS non-strict null check
Sep 11, 2023
68382ff
fix: move key removal to Onyx layer
Sep 11, 2023
91acf99
fix: improve how Onyx merges a batch of objects
Sep 11, 2023
e2dd119
fix: move utils to "utils.js"
Sep 11, 2023
0274d24
Merge branch 'main' into @chrispader/fix-sqlite-undefined-crash
Sep 11, 2023
2f15c19
fix: typo
Sep 12, 2023
bf5035a
fix: don't remove keys when set/merge value is undefined
Sep 12, 2023
cb1de93
fix: don't allow setting undefined in SQLite (causes crash)
Sep 12, 2023
3989ee2
Merge branch 'main' into @chrispader/fix-sqlite-undefined-crash
Sep 12, 2023
00e2660
fix: handle nullish values in a batch of changes have to reset the ex…
Sep 12, 2023
0f54a21
fix: remove batched object merging improvements
Sep 12, 2023
2b7350a
fix: filter out any undefined keypairs
Sep 13, 2023
3f9a42c
fix: stringify value in SQLite
Sep 14, 2023
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
22 changes: 19 additions & 3 deletions lib/storage/providers/SQLiteStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,27 @@ const provider = {
ON CONFLICT DO UPDATE
SET valueJSON = JSON_PATCH(valueJSON, JSON(:value));
`;
const queryArguments = _.map(pairs, (pair) => {

const queryArguments = [];
const keysToDelete = [];
_.forEach(pairs, (pair) => {
if (pair[1] == null) {
chrispader marked this conversation as resolved.
Show resolved Hide resolved
keysToDelete.push(pair[0]);
return;
}

const value = JSON.stringify(pair[1]);
return [pair[0], value];

queryArguments.push([pair[0], value]);
});
return db.executeBatchAsync([[query, queryArguments]]);

const deletePromise = this.removeItems(keysToDelete);
chrispader marked this conversation as resolved.
Show resolved Hide resolved
const mergePromise = queryArguments.length !== 0 ? db.executeBatchAsync([[query, queryArguments]]) : Promise.resolve();

return Promise.all([
mergePromise,
deletePromise,
]).then(() => mergePromise);
},

/**
Expand Down
Loading