@powersync/service-core-tests 0.13.2 → 0.14.0

package/dist/tests/register-data-storage-data-tests.js

@@ -50,10 +50,10 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
-import { getUuidReplicaIdentityBson, storage } from '@powersync/service-core';
+import { getUuidReplicaIdentityBson, storage, updateSyncRulesFromYaml } from '@powersync/service-core';
 import { describe, expect, test } from 'vitest';
 import * as test_utils from '../test-utils/test-utils-index.js';
-import { TEST_TABLE } from './util.js';
+import { bucketRequest, bucketRequestMap, bucketRequests, TEST_TABLE } from './util.js';
 /**
  * Normalize data from OplogEntries for comparison in tests.
  * Tests typically expect the stringified result
@@ -79,14 +79,12 @@ export function registerDataStorageDataTests(generateStorageFactory) {
         const env_1 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_1, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                 const sourceTable = TEST_TABLE;
@@ -107,7 +105,7 @@ bucket_definitions:
                 await batch.commit('1/1');
             });
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]])));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -121,10 +119,12 @@ bucket_definitions:
                 { op: 'PUT', object_id: 'test1', checksum: c1 },
                 { op: 'REMOVE', object_id: 'test1', checksum: c2 }
             ]);
-            const checksums = [...(await bucketStorage.getChecksums(checkpoint, ['global[]'])).values()];
+            const checksums = [
+                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
+            ];
             expect(checksums).toEqual([
                 {
-                    bucket: 'global[]',
+                    bucket: bucketRequest(syncRules, 'global[]'),
                     checksum: (c1 + c2) & 0xffffffff,
                     count: 2
                 }
@@ -144,14 +144,12 @@ bucket_definitions:
         const env_2 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_2, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT client_id as id, description FROM "%"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             const sourceTable = TEST_TABLE;
             await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
@@ -188,7 +186,7 @@ bucket_definitions:
                 await batch.commit('1/1');
             });
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]])));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -216,14 +214,12 @@ bucket_definitions:
         const env_3 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_3, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                 const sourceTable = TEST_TABLE;
@@ -255,7 +251,7 @@ bucket_definitions:
                 });
             });
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]])));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -269,10 +265,12 @@ bucket_definitions:
                 { op: 'PUT', object_id: 'test1', checksum: c1 },
                 { op: 'REMOVE', object_id: 'test1', checksum: c2 }
             ]);
-            const checksums = [...(await bucketStorage.getChecksums(checkpoint, ['global[]'])).values()];
+            const checksums = [
+                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
+            ];
             expect(checksums).toEqual([
                 {
-                    bucket: 'global[]',
+                    bucket: bucketRequest(syncRules, 'global[]'),
                     checksum: (c1 + c2) & 0xffffffff,
                     count: 2
                 }
@@ -292,14 +290,12 @@ bucket_definitions:
         const env_4 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_4, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                 const sourceTable = TEST_TABLE;
@@ -368,7 +364,7 @@ bucket_definitions:
                 await batch.commit('2/1');
             });
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]])));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -384,10 +380,12 @@ bucket_definitions:
                 { op: 'PUT', object_id: 'test1', checksum: c1 },
                 { op: 'REMOVE', object_id: 'test1', checksum: c2 }
             ]);
-            const checksums = [...(await bucketStorage.getChecksums(checkpoint, ['global[]'])).values()];
+            const checksums = [
+                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
+            ];
             expect(checksums).toEqual([
                 {
-                    bucket: 'global[]',
+                    bucket: bucketRequest(syncRules, 'global[]'),
                     checksum: (c1 + c1 + c1 + c2) & 0xffffffff,
                     count: 4
                 }
@@ -414,14 +412,12 @@ bucket_definitions:
             // 1. Not getting the correct "current_data" state for each operation.
             // 2. Output order not being correct.
             const factory = __addDisposableResource(env_5, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "test"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             // Pre-setup
             const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
@@ -520,7 +516,7 @@ bucket_definitions:
                 });
             });
             const checkpoint2 = result2.flushed_op;
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint2, new Map([['global[]', checkpoint1]])));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint2, bucketRequestMap(syncRules, [['global[]', checkpoint1]])));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -564,14 +560,12 @@ bucket_definitions:
                 ]);
             }
             const factory = __addDisposableResource(env_6, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "test"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             const sourceTable = test_utils.makeTestTable('test', ['id', 'description']);
             // Pre-setup
@@ -618,7 +612,7 @@ bucket_definitions:
                 });
             });
             const checkpoint3 = result3.flushed_op;
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, new Map([['global[]', checkpoint1]])));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, bucketRequestMap(syncRules, [['global[]', checkpoint1]])));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -672,14 +666,12 @@ bucket_definitions:
                 ]);
             }
             const factory = __addDisposableResource(env_7, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "test"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             const sourceTable = test_utils.makeTestTable('test', ['id', 'description']);
             // Pre-setup
@@ -726,7 +718,7 @@ bucket_definitions:
                 });
             });
             const checkpoint3 = result3.flushed_op;
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, new Map([['global[]', checkpoint1]])));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, bucketRequestMap(syncRules, [['global[]', checkpoint1]])));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -771,14 +763,12 @@ bucket_definitions:
             // The specific batch splits is an implementation detail of the storage driver,
             // and the test will have to updated when other implementations are added.
             const factory = __addDisposableResource(env_8, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                 const sourceTable = TEST_TABLE;
@@ -826,7 +816,7 @@ bucket_definitions:
             const options = {
                 chunkLimitBytes: 16 * 1024 * 1024
             };
-            const batch1 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]]), options));
+            const batch1 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]]), options));
             expect(test_utils.getBatchData(batch1)).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 },
                 { op_id: '2', op: 'PUT', object_id: 'large1', checksum: 454746904 }
@@ -836,7 +826,7 @@ bucket_definitions:
                 has_more: true,
                 next_after: '2'
             });
-            const batch2 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', BigInt(batch1[0].chunkData.next_after)]]), options));
+            const batch2 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', BigInt(batch1[0].chunkData.next_after)]]), options));
             expect(test_utils.getBatchData(batch2)).toEqual([
                 { op_id: '3', op: 'PUT', object_id: 'large2', checksum: 1795508474 },
                 { op_id: '4', op: 'PUT', object_id: 'test3', checksum: 1359888332 }
@@ -846,7 +836,7 @@ bucket_definitions:
                 has_more: false,
                 next_after: '4'
             });
-            const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', BigInt(batch2[0].chunkData.next_after)]]), options));
+            const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', BigInt(batch2[0].chunkData.next_after)]]), options));
             expect(test_utils.getBatchData(batch3)).toEqual([]);
             expect(test_utils.getBatchMeta(batch3)).toEqual(null);
         }
@@ -865,14 +855,12 @@ bucket_definitions:
         try {
             // Test syncing a batch of data that is limited by count.
             const factory = __addDisposableResource(env_9, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                 const sourceTable = TEST_TABLE;
@@ -890,7 +878,7 @@ bucket_definitions:
                 await batch.commit('1/1');
             });
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch1 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]]), { limit: 4 }));
+            const batch1 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]]), { limit: 4 }));
             expect(test_utils.getBatchData(batch1)).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 },
                 { op_id: '2', op: 'PUT', object_id: 'test2', checksum: 730027011 },
@@ -902,7 +890,7 @@ bucket_definitions:
                 has_more: true,
                 next_after: '4'
             });
-            const batch2 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', BigInt(batch1.chunkData.next_after)]]), {
+            const batch2 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', BigInt(batch1.chunkData.next_after)]]), {
                 limit: 4
             }));
             expect(test_utils.getBatchData(batch2)).toEqual([
@@ -914,7 +902,7 @@ bucket_definitions:
                 has_more: false,
                 next_after: '6'
             });
-            const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', BigInt(batch2.chunkData.next_after)]]), {
+            const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', BigInt(batch2.chunkData.next_after)]]), {
                 limit: 4
             }));
             expect(test_utils.getBatchData(batch3)).toEqual([]);
@@ -935,8 +923,7 @@ bucket_definitions:
             const env_10 = { stack: [], error: void 0, hasError: false };
             try {
                 const factory = __addDisposableResource(env_10, await generateStorageFactory(), true);
-                const syncRules = await factory.updateSyncRules({
-                    content: `
+                const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
   bucket_definitions:
     global1:
       data:
@@ -944,8 +931,7 @@ bucket_definitions:
     global2:
       data:
         - SELECT id, description FROM test WHERE bucket = 'global2'
-  `
-                });
+  `));
                 const bucketStorage = factory.getInstance(syncRules);
                 await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                     const sourceTable = TEST_TABLE;
@@ -964,10 +950,11 @@ bucket_definitions:
                     await batch.commit('1/1');
                 });
                 const { checkpoint } = await bucketStorage.getCheckpoint();
-                return await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([
+                const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [
                     ['global1[]', 0n],
                     ['global2[]', 0n]
                 ]), options));
+                return { syncRules, batch };
             }
             catch (e_10) {
                 env_10.error = e_10;
@@ -980,10 +967,10 @@ bucket_definitions:
             }
         };
         test('batch has_more (1)', async () => {
-            const batch = await setup({ limit: 5 });
+            const { batch, syncRules } = await setup({ limit: 5 });
             expect(batch.length).toEqual(2);
-            expect(batch[0].chunkData.bucket).toEqual('global1[]');
-            expect(batch[1].chunkData.bucket).toEqual('global2[]');
+            expect(batch[0].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global1[]'));
+            expect(batch[1].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global2[]'));
             expect(test_utils.getBatchData(batch[0])).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
             ]);
@@ -1005,10 +992,10 @@ bucket_definitions:
             });
         });
         test('batch has_more (2)', async () => {
-            const batch = await setup({ limit: 11 });
+            const { batch, syncRules } = await setup({ limit: 11 });
             expect(batch.length).toEqual(2);
-            expect(batch[0].chunkData.bucket).toEqual('global1[]');
-            expect(batch[1].chunkData.bucket).toEqual('global2[]');
+            expect(batch[0].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global1[]'));
+            expect(batch[1].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global2[]'));
             expect(test_utils.getBatchData(batch[0])).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
             ]);
@@ -1036,11 +1023,11 @@ bucket_definitions:
         });
         test('batch has_more (3)', async () => {
             // 50 bytes is more than 1 row, less than 2 rows
-            const batch = await setup({ limit: 3, chunkLimitBytes: 50 });
+            const { batch, syncRules } = await setup({ limit: 3, chunkLimitBytes: 50 });
             expect(batch.length).toEqual(3);
-            expect(batch[0].chunkData.bucket).toEqual('global1[]');
-            expect(batch[1].chunkData.bucket).toEqual('global2[]');
-            expect(batch[2].chunkData.bucket).toEqual('global2[]');
+            expect(batch[0].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global1[]'));
+            expect(batch[1].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global2[]'));
+            expect(batch[2].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global2[]'));
             expect(test_utils.getBatchData(batch[0])).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
             ]);
@@ -1077,13 +1064,12 @@ bucket_definitions:
                 parameters_size_bytes: 0,
                 replication_size_bytes: 0
             });
-            const r = await f.configureSyncRules({ content: 'bucket_definitions: {}', validate: false });
+            const r = await f.configureSyncRules(updateSyncRulesFromYaml('bucket_definitions: {}'));
             const storage = f.getInstance(r.persisted_sync_rules);
             await storage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                 await batch.keepalive('1/0');
             });
-            const metrics2 = await f.getStorageMetrics();
-            expect(metrics2).toMatchSnapshot();
+            await f.getStorageMetrics();
         }
         catch (e_11) {
             env_11.error = e_11;
@@ -1102,15 +1088,13 @@ bucket_definitions:
             // but large enough in size to be split over multiple returned chunks.
             // Similar to the above test, but splits over 1MB chunks.
             const factory = __addDisposableResource(env_12, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
   bucket_definitions:
     global:
       data:
         - SELECT id FROM test
         - SELECT id FROM test_ignore WHERE false
-  `
-            });
+  `));
             const bucketStorage = factory.getInstance(syncRules);
             const sourceTable = test_utils.makeTestTable('test', ['id']);
             const sourceTableIgnore = test_utils.makeTestTable('test_ignore', ['id']);
@@ -1155,14 +1139,12 @@ bucket_definitions:
         const env_13 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_13, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT client_id as id, description FROM "%"
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             const sourceTable = TEST_TABLE;
             await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
@@ -1178,10 +1160,14 @@ bucket_definitions:
                 await batch.commit('1/1');
             });
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const checksums = [...(await bucketStorage.getChecksums(checkpoint, ['global[]'])).values()];
-            expect(checksums).toEqual([{ bucket: 'global[]', checksum: 1917136889, count: 1 }]);
-            const checksums2 = [...(await bucketStorage.getChecksums(checkpoint + 1n, ['global[]'])).values()];
-            expect(checksums2).toEqual([{ bucket: 'global[]', checksum: 1917136889, count: 1 }]);
+            const checksums = [
+                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
+            ];
+            expect(checksums).toEqual([{ bucket: bucketRequest(syncRules, 'global[]'), checksum: 1917136889, count: 1 }]);
+            const checksums2 = [
+                ...(await bucketStorage.getChecksums(checkpoint + 1n, bucketRequests(syncRules, ['global[]']))).values()
+            ];
+            expect(checksums2).toEqual([{ bucket: bucketRequest(syncRules, 'global[]'), checksum: 1917136889, count: 1 }]);
         }
         catch (e_13) {
             env_13.error = e_13;
@@ -1205,15 +1191,13 @@ export function testChecksumBatching(generateStorageFactory) {
         const env_14 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_14, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   user:
     parameters: select request.user_id() as user_id
     data:
       - select id, description from test where user_id = bucket.user_id
-`
-            });
+`));
             const bucketStorage = factory.getInstance(syncRules);
             const sourceTable = TEST_TABLE;
             await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
@@ -1236,14 +1220,14 @@ bucket_definitions:
             });
             const { checkpoint } = await bucketStorage.getCheckpoint();
             bucketStorage.clearChecksumCache();
-            const buckets = ['user["u1"]', 'user["u2"]', 'user["u3"]', 'user["u4"]'];
+            const buckets = bucketRequests(syncRules, ['user["u1"]', 'user["u2"]', 'user["u3"]', 'user["u4"]']);
             const checksums = [...(await bucketStorage.getChecksums(checkpoint, buckets)).values()];
             checksums.sort((a, b) => a.bucket.localeCompare(b.bucket));
             expect(checksums).toEqual([
-                { bucket: 'user["u1"]', count: 4, checksum: 346204588 },
-                { bucket: 'user["u2"]', count: 4, checksum: 5261081 },
-                { bucket: 'user["u3"]', count: 4, checksum: 134760718 },
-                { bucket: 'user["u4"]', count: 4, checksum: -302639724 }
+                { bucket: bucketRequest(syncRules, 'user["u1"]'), count: 4, checksum: 346204588 },
+                { bucket: bucketRequest(syncRules, 'user["u2"]'), count: 4, checksum: 5261081 },
+                { bucket: bucketRequest(syncRules, 'user["u3"]'), count: 4, checksum: 134760718 },
+                { bucket: bucketRequest(syncRules, 'user["u4"]'), count: 4, checksum: -302639724 }
             ]);
         }
         catch (e_14) {