Commit 275cf90
src,sqlite: only pass xFilter when user provided a callback
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #63516
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>1 parent ee15380 commit 275cf90
1 file changed
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2237,7 +2237,6 @@ static int xConflict(void* pCtx, int eConflict, sqlite3_changeset_iter* pIter) { | |||
| 2237 | 2237 | ||
| 2238 | 2238 | static int xFilter(void* pCtx, const char* zTab) { | |
| 2239 | 2239 | auto ctx = static_cast<ConflictCallbackContext*>(pCtx); | |
| 2240 | - if (!ctx->filterCallback) return 1; | ||
| 2241 | 2240 | return ctx->filterCallback(zTab) ? 1 : 0; | |
| 2242 | 2241 | } | |
| 2243 | 2242 | ||
@@ -2348,7 +2347,7 @@ void DatabaseSync::ApplyChangeset(const FunctionCallbackInfo<Value>& args) { | |||
| 2348 | 2347 | db->connection_, | |
| 2349 | 2348 | buf.length(), | |
| 2350 | 2349 | const_cast<void*>(static_cast<const void*>(buf.data())), | |
| 2351 | - xFilter, | ||
| 2350 | + context.filterCallback ? xFilter : nullptr, | ||
| 2352 | 2351 | xConflict, | |
| 2353 | 2352 | static_cast<void*>(&context)); | |
| 2354 | 2353 | if (r == SQLITE_OK) { | |
0 commit comments