-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
d5f755d
commit d21f2eb
Showing
6 changed files
with
170 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| --- | ||
| '@powersync/common': patch | ||
| '@powersync/web': patch | ||
| '@powersync/react-native': patch | ||
| --- | ||
|
|
||
| Fixed issue where sequentially mutating the same row multiple times could cause the CRUD upload queue monitoring to think CRUD operations have not been processed correctly by the `BackendConnector` `uploadData` method. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| import Logger from 'js-logger'; | ||
| import p from 'p-defer'; | ||
| import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'; | ||
| import { ConnectedDatabaseUtils, generateConnectedDatabase } from './stream.test'; | ||
|
|
||
| describe('CRUD Uploads', () => { | ||
| let connectedUtils: ConnectedDatabaseUtils; | ||
| const logger = Logger.get('crud-logger'); | ||
|
|
||
| beforeAll(() => Logger.useDefaults()); | ||
|
|
||
| beforeEach(async () => { | ||
| connectedUtils = await generateConnectedDatabase({ | ||
| powerSyncOptions: { | ||
| logger, | ||
| /** | ||
| * The timeout here is set to longer than the default test timeout | ||
| * A retry wil cause tests to fail. | ||
| */ | ||
| crudUploadThrottleMs: 10_000, | ||
| flags: { | ||
| enableMultiTabs: false | ||
| } | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| afterEach(async () => { | ||
| connectedUtils.remote.streamController?.close(); | ||
| await connectedUtils.powersync.disconnectAndClear(); | ||
| await connectedUtils.powersync.close(); | ||
| }); | ||
|
|
||
| it('should warn for missing upload operations in uploadData', async () => { | ||
| const { powersync, uploadSpy } = connectedUtils; | ||
| const loggerSpy = vi.spyOn(logger, 'warn'); | ||
|
|
||
| const deferred = p(); | ||
|
|
||
| uploadSpy.mockImplementation(async (db) => { | ||
| // This upload method does not perform an upload | ||
| deferred.resolve(); | ||
| }); | ||
|
|
||
| // Create something with CRUD in it. | ||
| await powersync.execute('INSERT into users (id, name) VALUES (uuid(), ?)', ['steven']); | ||
|
|
||
| // The empty upload handler should have been called | ||
| // Timeouts seem to be weird in Vitest Browser mode. | ||
| // This makes the check below more stable. | ||
| await deferred.promise; | ||
|
|
||
| await vi.waitFor( | ||
| () => { | ||
| expect( | ||
| loggerSpy.mock.calls.find((logArgs) => | ||
| logArgs[0].includes('Potentially previously uploaded CRUD entries are still present') | ||
| ) | ||
| ).exist; | ||
| }, | ||
| { | ||
| timeout: 500 | ||
| } | ||
| ); | ||
| }); | ||
|
|
||
| it('should immediately upload sequential transactions', async () => { | ||
| const { powersync, uploadSpy } = connectedUtils; | ||
| const deferred = p(); | ||
|
|
||
| uploadSpy.mockImplementation(async (db) => { | ||
| // This upload method does not perform an upload | ||
| const nextTransaction = await db.getNextCrudTransaction(); | ||
| console.log('uploading trans', nextTransaction); | ||
| if (!nextTransaction) { | ||
| return; | ||
| } | ||
|
|
||
| // Mockingly delete the crud op in order to progress through the CRUD queue | ||
| for (const op of nextTransaction.crud) { | ||
| await db.execute(`DELETE FROM ps_crud WHERE id = ?`, [op.clientId]); | ||
| } | ||
|
|
||
| deferred.resolve(); | ||
| }); | ||
|
|
||
| // Create the first item | ||
| await powersync.execute('INSERT into users (id, name) VALUES (uuid(), ?)', ['steven']); | ||
|
|
||
| // Modify the first item in a new transaction | ||
| await powersync.execute(` | ||
| UPDATE | ||
| users | ||
| SET | ||
| name = 'Mugi' | ||
| WHERE | ||
| name = 'steven'`); | ||
|
|
||
| // Create a second item | ||
| await powersync.execute('INSERT into users (id, name) VALUES (uuid(), ?)', ['steven2']); | ||
|
|
||
| // The empty upload handler should have been called | ||
| // Timeouts seem to be weird in Vitest Browser mode. | ||
| // This makes the check below more stable. | ||
| await deferred.promise; | ||
|
|
||
| await vi.waitFor( | ||
| () => { | ||
| expect(uploadSpy.mock.calls.length).eq(3); | ||
| }, | ||
| { | ||
| timeout: 5_000 | ||
| } | ||
| ); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters