@powersync/service-core-tests 0.16.0 → 0.17.1

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

@@ -27,13 +27,13 @@ export function registerDataStorageDataTests(config) {
     const storageVersion = config.storageVersion ?? storage.CURRENT_STORAGE_VERSION;
     test('removing row', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const testTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -54,7 +54,7 @@ bucket_definitions:
         await writer.commit('1/1');
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -68,7 +68,9 @@ bucket_definitions:
             { op: 'PUT', object_id: 'test1', checksum: c1 },
             { op: 'REMOVE', object_id: 'test1', checksum: c2 }
         ]);
-        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
+        const checksums = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
+        ];
         expect(checksums).toEqual([
             {
                 bucket: request.bucket,
@@ -79,13 +81,13 @@ bucket_definitions:
     });
     test('insert after delete in new batch', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const testTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -107,7 +109,7 @@ bucket_definitions:
         await writer.commit('2/1');
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -117,7 +119,9 @@ bucket_definitions:
         });
         const c1 = 2871785649;
         expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
+        const checksums = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
+        ];
         expect(checksums).toEqual([
             {
                 bucket: request.bucket,
@@ -129,13 +133,13 @@ bucket_definitions:
     test('update after delete in new batch', async () => {
         // Update after delete may not be common, but the storage layer should handle it in an eventually-consistent way.
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const testTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -161,7 +165,7 @@ bucket_definitions:
         await writer.commit('2/1');
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -171,7 +175,9 @@ bucket_definitions:
         });
         const c1 = 2871785649;
         expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
+        const checksums = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
+        ];
         expect(checksums).toEqual([
             {
                 bucket: request.bucket,
@@ -182,7 +188,7 @@ bucket_definitions:
     });
     test('insert after delete in same batch', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -190,7 +196,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const testTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -211,7 +217,7 @@ bucket_definitions:
         await writer.commit('1/1');
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -221,7 +227,9 @@ bucket_definitions:
         });
         const c1 = 2871785649;
         expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
+        const checksums = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
+        ];
         expect(checksums).toEqual([
             {
                 bucket: request.bucket,
@@ -232,7 +240,7 @@ bucket_definitions:
     });
     test('(insert, delete, insert), (delete)', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -240,7 +248,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         {
             await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
             const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
@@ -283,7 +291,7 @@ bucket_definitions:
         }
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
         expect(reduceBucket(batch[0].chunkData.data).slice(1)).toEqual([]);
         const data = batch[0].chunkData.data.map((d) => {
             return {
@@ -296,7 +304,7 @@ bucket_definitions:
     });
     test('changing client ids', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -304,7 +312,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -340,7 +348,7 @@ bucket_definitions:
         });
         await writer.commit('1/1');
         const { checkpoint } = await bucketStorage.getCheckpoint();
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [bucketRequest(syncRules, 'global[]')]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [bucketRequest(syncRules, 'global[]')]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -356,7 +364,7 @@ bucket_definitions:
     });
     test('re-apply delete', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -364,7 +372,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -392,7 +400,7 @@ bucket_definitions:
         await writer.flush();
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -406,7 +414,9 @@ bucket_definitions:
             { op: 'PUT', object_id: 'test1', checksum: c1 },
             { op: 'REMOVE', object_id: 'test1', checksum: c2 }
         ]);
-        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
+        const checksums = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
+        ];
         expect(checksums).toEqual([
             {
                 bucket: bucketRequest(syncRules, 'global[]').bucket,
@@ -417,13 +427,13 @@ bucket_definitions:
     });
     test('re-apply update + delete', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -489,7 +499,7 @@ bucket_definitions:
         await writer.commit('2/1');
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -505,7 +515,9 @@ bucket_definitions:
             { op: 'PUT', object_id: 'test1', checksum: c1 },
             { op: 'REMOVE', object_id: 'test1', checksum: c2 }
         ]);
-        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
+        const checksums = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
+        ];
         expect(checksums).toEqual([
             {
                 bucket: bucketRequest(syncRules, 'global[]').bucket,
@@ -523,13 +535,13 @@ bucket_definitions:
         // 1. Not getting the correct "current_data" state for each operation.
         // 2. Output order not being correct.
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "test"
 `, { storageVersion }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         // Pre-setup
@@ -627,7 +639,7 @@ bucket_definitions:
         const result2 = await writer.flush();
         const checkpoint2 = result2.flushed_op;
         const request = bucketRequest(syncRules, 'global[]', checkpoint1);
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint2, [request]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint2), [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -659,7 +671,7 @@ bucket_definitions:
             ]);
         }
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -667,7 +679,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id', 'description'], config);
         // Pre-setup
@@ -713,7 +725,7 @@ bucket_definitions:
         const result3 = await writer.flush();
         const checkpoint3 = result3.flushed_op;
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, [{ ...request, start: checkpoint1 }]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint3), [{ ...request, start: checkpoint1 }]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -755,7 +767,7 @@ bucket_definitions:
             ]);
         }
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -763,7 +775,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id', 'description'], config);
         // Pre-setup
@@ -809,7 +821,7 @@ bucket_definitions:
         const result3 = await writer.flush();
         const checkpoint3 = result3.flushed_op;
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, [{ ...request, start: checkpoint1 }]));
+        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint3), [{ ...request, start: checkpoint1 }]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -842,7 +854,7 @@ 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.
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -850,7 +862,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -898,7 +910,7 @@ bucket_definitions:
             chunkLimitBytes: 16 * 1024 * 1024
         };
         const request = bucketRequest(syncRules, 'global[]');
-        const batch1 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request], options));
+        const batch1 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request], 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 }
@@ -908,7 +920,7 @@ bucket_definitions:
             has_more: true,
             next_after: '2'
         });
-        const batch2 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch1[0].chunkData.next_after) }], options));
+        const batch2 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [{ ...request, start: 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 }
@@ -918,14 +930,14 @@ bucket_definitions:
             has_more: false,
             next_after: '4'
         });
-        const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch2[0].chunkData.next_after) }], options));
+        const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [{ ...request, start: BigInt(batch2[0].chunkData.next_after) }], options));
         expect(test_utils.getBatchData(batch3)).toEqual([]);
         expect(test_utils.getBatchMeta(batch3)).toEqual(null);
     });
     test('long batch', async () => {
         // Test syncing a batch of data that is limited by count.
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -933,7 +945,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -951,7 +963,7 @@ bucket_definitions:
         await writer.commit('1/1');
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch1 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request], { limit: 4 }));
+        const batch1 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request], { 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 },
@@ -963,7 +975,7 @@ bucket_definitions:
             has_more: true,
             next_after: '4'
         });
-        const batch2 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch1.chunkData.next_after) }], {
+        const batch2 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [{ ...request, start: BigInt(batch1.chunkData.next_after) }], {
             limit: 4
         }));
         expect(test_utils.getBatchData(batch2)).toEqual([
@@ -975,7 +987,7 @@ bucket_definitions:
             has_more: false,
             next_after: '6'
         });
-        const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch2.chunkData.next_after) }], {
+        const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [{ ...request, start: BigInt(batch2.chunkData.next_after) }], {
             limit: 4
         }));
         expect(test_utils.getBatchData(batch3)).toEqual([]);
@@ -984,7 +996,7 @@ bucket_definitions:
     describe('batch has_more', () => {
         const setup = async (options) => {
             await using factory = await generateStorageFactory();
-            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+            const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
   bucket_definitions:
     global1:
       data:
@@ -993,7 +1005,7 @@ bucket_definitions:
       data:
         - SELECT id, description FROM test WHERE bucket = 'global2'
   `, { storageVersion }));
-            const bucketStorage = factory.getInstance(syncRules);
+            const bucketStorage = factory.getInstance(replicationStream);
             await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
             const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
             await writer.markAllSnapshotDone('1/1');
@@ -1013,7 +1025,7 @@ bucket_definitions:
             const { checkpoint } = await bucketStorage.getCheckpoint();
             const global1Request = bucketRequest(syncRules, 'global1[]', 0n);
             const global2Request = bucketRequest(syncRules, 'global2[]', 0n);
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [global1Request, global2Request], options));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [global1Request, global2Request], options));
             return { batch, global1Request, global2Request };
         };
         test('batch has_more (1)', async () => {
@@ -1074,34 +1086,59 @@ bucket_definitions:
         test('batch has_more (3)', async () => {
             // 50 bytes is more than 1 row, less than 2 rows
             const { batch, global1Request, global2Request } = await setup({ limit: 3, chunkLimitBytes: 50 });
-            expect(batch.length).toEqual(3);
-            expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
-            expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
-            expect(batch[2].chunkData.bucket).toEqual(global2Request.bucket);
-            expect(test_utils.getBatchData(batch[0])).toEqual([
-                { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
-            ]);
-            expect(test_utils.getBatchData(batch[1])).toEqual([
-                { op_id: '2', op: 'PUT', object_id: 'test2', checksum: 730027011 }
-            ]);
-            expect(test_utils.getBatchData(batch[2])).toEqual([
-                { op_id: '3', op: 'PUT', object_id: 'test3', checksum: 1359888332 }
-            ]);
-            expect(test_utils.getBatchMeta(batch[0])).toEqual({
-                after: '0',
-                has_more: false,
-                next_after: '1'
-            });
-            expect(test_utils.getBatchMeta(batch[1])).toEqual({
-                after: '0',
-                has_more: true,
-                next_after: '2'
-            });
-            expect(test_utils.getBatchMeta(batch[2])).toEqual({
-                after: '2',
-                has_more: true,
-                next_after: '3'
-            });
+            if (config.compressedBucketStorage) {
+                // In v3+, ops in the same bucket share a document, so ops 2 and 3 (global2) are batched together
+                expect(batch.length).toEqual(2);
+                expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
+                expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
+                expect(test_utils.getBatchData(batch[0])).toEqual([
+                    { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
+                ]);
+                expect(test_utils.getBatchData(batch[1])).toEqual([
+                    { op_id: '2', op: 'PUT', object_id: 'test2', checksum: 730027011 },
+                    { op_id: '3', op: 'PUT', object_id: 'test3', checksum: 1359888332 }
+                ]);
+                expect(test_utils.getBatchMeta(batch[0])).toEqual({
+                    after: '0',
+                    has_more: false,
+                    next_after: '1'
+                });
+                expect(test_utils.getBatchMeta(batch[1])).toEqual({
+                    after: '0',
+                    has_more: true,
+                    next_after: '3'
+                });
+            }
+            else {
+                expect(batch.length).toEqual(3);
+                expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
+                expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
+                expect(batch[2].chunkData.bucket).toEqual(global2Request.bucket);
+                expect(test_utils.getBatchData(batch[0])).toEqual([
+                    { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
+                ]);
+                expect(test_utils.getBatchData(batch[1])).toEqual([
+                    { op_id: '2', op: 'PUT', object_id: 'test2', checksum: 730027011 }
+                ]);
+                expect(test_utils.getBatchData(batch[2])).toEqual([
+                    { op_id: '3', op: 'PUT', object_id: 'test3', checksum: 1359888332 }
+                ]);
+                expect(test_utils.getBatchMeta(batch[0])).toEqual({
+                    after: '0',
+                    has_more: false,
+                    next_after: '1'
+                });
+                expect(test_utils.getBatchMeta(batch[1])).toEqual({
+                    after: '0',
+                    has_more: true,
+                    next_after: '2'
+                });
+                expect(test_utils.getBatchMeta(batch[2])).toEqual({
+                    after: '2',
+                    has_more: true,
+                    next_after: '3'
+                });
+            }
         });
     });
     test('empty storage metrics', async () => {
@@ -1125,7 +1162,7 @@ bucket_definitions:
         // but large enough in size to be split over multiple returned chunks.
         // Similar to the above test, but splits over 1MB chunks.
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
   bucket_definitions:
     global:
       data:
@@ -1134,7 +1171,7 @@ bucket_definitions:
   `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config, 1);
         const sourceTableIgnore = await test_utils.resolveTestTable(writer, 'test_ignore', ['id'], config, 2);
@@ -1166,7 +1203,7 @@ bucket_definitions:
     });
     test('unchanged checksums', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -1174,7 +1211,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -1190,21 +1227,25 @@ bucket_definitions:
         await writer.commit('1/1');
         const { checkpoint } = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
+        const checksums = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
+        ];
         expect(checksums).toEqual([{ bucket: request.bucket, checksum: 1917136889, count: 1 }]);
-        const checksums2 = [...(await bucketStorage.getChecksums(checkpoint + 1n, [request])).values()];
+        const checksums2 = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint + 1n), [request])).values()
+        ];
         expect(checksums2).toEqual([{ bucket: request.bucket, checksum: 1917136889, count: 1 }]);
     });
     testChecksumBatching(config);
     test('empty checkpoints (1)', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         await writer.markAllSnapshotDone('1/1');
         await writer.commit('1/1');
@@ -1224,7 +1265,7 @@ bucket_definitions:
     });
     test('empty checkpoints (2)', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -1232,7 +1273,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer1 = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         await using writer2 = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer2, 'test', ['id'], config);
@@ -1263,7 +1304,7 @@ bucket_definitions:
     });
     test('empty checkpoints (sync rule activation)', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -1271,7 +1312,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const result1 = await writer.commit('1/1', { createEmptyCheckpoints: false });
         expect(result1).toEqual({ checkpointBlocked: true, checkpointCreated: false });
@@ -1290,8 +1331,8 @@ bucket_definitions:
         // Now, the checkpoint should advance the sync rules active.
         const cp2 = await bucketStorage.getCheckpoint();
         expect(cp2.lsn).toEqual('3/1');
-        const activeSyncRules = await factory.getActiveSyncRulesContent();
-        expect(activeSyncRules?.id).toEqual(syncRules.id);
+        const activeSyncRules = await factory.getActiveSyncConfig();
+        expect(activeSyncRules?.content.replicationStreamId).toEqual(syncRules.replicationStreamId);
         // At this point, it should be a truely empty checkpoint
         const result4 = await writer.commit('4/1', { createEmptyCheckpoints: false });
         expect(result4).toEqual({ checkpointBlocked: false, checkpointCreated: false });
@@ -1301,7 +1342,7 @@ bucket_definitions:
     });
     test.runIf(storageVersion >= 3)('deleting while streaming', async () => {
         await using factory = await generateStorageFactory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -1309,7 +1350,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using snapshotWriter = await bucketStorage.createWriter({
             ...test_utils.BATCH_OPTIONS,
             skipExistingRows: true
@@ -1344,7 +1385,7 @@ bucket_definitions:
         await streamingWriter.keepalive('3/1');
         const cp = await bucketStorage.getCheckpoint();
         expect(cp.lsn).toEqual('3/1');
-        const data = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(cp.checkpoint, [bucketRequest(syncRules, 'global[]')]));
+        const data = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(cp.checkpoint), [bucketRequest(syncRules, 'global[]')]));
         expect(data).toEqual([]);
     });
 }
@@ -1357,7 +1398,7 @@ export function testChecksumBatching(config) {
     const storageVersion = config.storageVersion ?? CURRENT_STORAGE_VERSION;
     test('checksums for multiple buckets', async () => {
         await using factory = await config.factory();
-        const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   user:
     parameters: select request.user_id() as user_id
@@ -1366,7 +1407,7 @@ bucket_definitions:
 `, {
             storageVersion
         }));
-        const bucketStorage = factory.getInstance(syncRules);
+        const bucketStorage = factory.getInstance(replicationStream);
         await using writer = await bucketStorage.createWriter(test_utils.BATCH_OPTIONS);
         const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
         await writer.markAllSnapshotDone('1/1');
@@ -1391,7 +1432,9 @@ bucket_definitions:
         const users = ['u1', 'u2', 'u3', 'u4'];
         const expectedChecksums = [346204588, 5261081, 134760718, -302639724];
         const bucketRequests = users.map((user) => bucketRequest(syncRules, `user["${user}"]`));
-        const checksums = [...(await bucketStorage.getChecksums(checkpoint, bucketRequests)).values()];
+        const checksums = [
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), bucketRequests)).values()
+        ];
         checksums.sort((a, b) => a.bucket.localeCompare(b.bucket));
         const expected = bucketRequests.map((request, index) => ({
             bucket: request.bucket,
@@ -1411,7 +1454,11 @@ streams:
   invalid:
     query: UPDATE test SET foo = 'bar' RETURNING *
 `));
-        const { errors } = deployed.parsed({ defaultSchema: 'ignored' }).syncConfigWithErrors;
+        const [deployedContent] = deployed.syncConfigContent;
+        expect(deployedContent).toBeDefined();
+        const [deployedConfig] = deployedContent.parsed({ defaultSchema: 'ignored' }).syncConfigs;
+        expect(deployedConfig).toBeDefined();
+        const { errors } = deployedConfig;
         expect(errors).toHaveLength(1);
         expect(errors[0].message).toStrictEqual('Expected a SELECT statement');
         expect(errors[0].location).toStrictEqual({