Skip to content

Commit 2eb566a

Browse files
rkistnerrkistner
committed
Post-merge test fixes.
1 parent 9863b16 commit 2eb566a

File tree

3 files changed

+27
-24
lines changed

3 files changed

+27
-24
lines changed

‎packages/service-core/test/src/compacting.test.ts

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,51 +222,54 @@ bucket_definitions:
222222
});
223223

224224
test('compacting (3)', async () => {
225-
const sync_rules = SqlSyncRules.fromYaml(`
225+
const sync_rules = testRules(`
226226
bucket_definitions:
227227
global:
228228
data: [select * from test]
229229
`);
230230

231-
const storage = (await factory()).getInstance({ id: 1, sync_rules, slot_name: 'test' });
231+
const storage = (await factory()).getInstance(sync_rules);
232232

233-
const result = await storage.startBatch({}, async (batch) => {
233+
const result = await storage.startBatch(BATCH_OPTIONS, async (batch) => {
234234
await batch.save({
235235
sourceTable: TEST_TABLE,
236236
tag: 'insert',
237237
after: {
238238
id: 't1'
239-
}
239+
},
240+
afterReplicaId: 't1'
240241
});
241242

242243
await batch.save({
243244
sourceTable: TEST_TABLE,
244245
tag: 'insert',
245246
after: {
246247
id: 't2'
247-
}
248+
},
249+
afterReplicaId: 't2'
248250
});
249251

250252
await batch.save({
251253
sourceTable: TEST_TABLE,
252254
tag: 'delete',
253255
before: {
254256
id: 't1'
255-
}
257+
},
258+
beforeReplicaId: 't1'
256259
});
257260
});
258261

259262
const checkpoint1 = result!.flushed_op;
260263
const checksumBefore = await storage.getChecksums(checkpoint1, ['global[]']);
261-
console.log('before', checksumBefore);
262264

263-
const result2 = await storage.startBatch({}, async (batch) => {
265+
const result2 = await storage.startBatch(BATCH_OPTIONS, async (batch) => {
264266
await batch.save({
265267
sourceTable: TEST_TABLE,
266268
tag: 'delete',
267269
before: {
268270
id: 't2'
269-
}
271+
},
272+
beforeReplicaId: 't2'
270273
});
271274
});
272275
const checkpoint2 = result2!.flushed_op;
@@ -280,15 +283,15 @@ bucket_definitions:
280283
expect(batchAfter.targetOp).toEqual(4n);
281284
expect(dataAfter).toMatchObject([
282285
{
283-
checksum: 857217610,
286+
checksum: 1874612650,
284287
op: 'CLEAR',
285288
op_id: '4'
286289
}
287290
]);
288291
expect(checksumAfter.get('global[]')).toEqual({
289292
bucket: 'global[]',
290293
count: 1,
291-
checksum: 857217610
294+
checksum: 1874612650
292295
});
293296
});
294297
}

‎packages/sync-rules/test/src/parameter_queries.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -394,39 +394,39 @@ describe('parameter queries', () => {
394394

395395
test('case-sensitive parameter queries (3)', () => {
396396
const sql = 'SELECT user_id FROM users WHERE Users.user_id = token_parameters.user_id';
397-
const query = SqlParameterQuery.fromSql('mybucket', sql) as SqlParameterQuery;
397+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as SqlParameterQuery;
398398
expect(query.errors).toMatchObject([
399399
{ message: `Unquoted identifiers are converted to lower-case. Use "Users" instead.` }
400400
]);
401401
});
402402

403403
test('case-sensitive parameter queries (4)', () => {
404404
const sql = 'SELECT Users.user_id FROM users WHERE user_id = token_parameters.user_id';
405-
const query = SqlParameterQuery.fromSql('mybucket', sql) as SqlParameterQuery;
405+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as SqlParameterQuery;
406406
expect(query.errors).toMatchObject([
407407
{ message: `Unquoted identifiers are converted to lower-case. Use "Users" instead.` }
408408
]);
409409
});
410410

411411
test('case-sensitive parameter queries (5)', () => {
412412
const sql = 'SELECT user_id FROM Users WHERE user_id = token_parameters.user_id';
413-
const query = SqlParameterQuery.fromSql('mybucket', sql) as SqlParameterQuery;
413+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as SqlParameterQuery;
414414
expect(query.errors).toMatchObject([
415415
{ message: `Unquoted identifiers are converted to lower-case. Use "Users" instead.` }
416416
]);
417417
});
418418

419419
test('case-sensitive parameter queries (6)', () => {
420420
const sql = 'SELECT userId FROM users';
421-
const query = SqlParameterQuery.fromSql('mybucket', sql) as SqlParameterQuery;
421+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as SqlParameterQuery;
422422
expect(query.errors).toMatchObject([
423423
{ message: `Unquoted identifiers are converted to lower-case. Use "userId" instead.` }
424424
]);
425425
});
426426

427427
test('case-sensitive parameter queries (7)', () => {
428428
const sql = 'SELECT user_id as userId FROM users';
429-
const query = SqlParameterQuery.fromSql('mybucket', sql) as SqlParameterQuery;
429+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as SqlParameterQuery;
430430
expect(query.errors).toMatchObject([
431431
{ message: `Unquoted identifiers are converted to lower-case. Use "userId" instead.` }
432432
]);

‎packages/sync-rules/test/src/static_parameter_queries.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,36 +85,36 @@ describe('static parameter queries', () => {
8585

8686
test('static value', function () {
8787
const sql = `SELECT WHERE 1`;
88-
const query = SqlParameterQuery.fromSql('mybucket', sql) as StaticSqlParameterQuery;
88+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as StaticSqlParameterQuery;
8989
expect(query.errors).toEqual([]);
9090
expect(query.getStaticBucketIds(new RequestParameters({ sub: '' }, {}))).toEqual(['mybucket[]']);
9191
});
9292

9393
test('static expression (1)', function () {
9494
const sql = `SELECT WHERE 1 = 1`;
95-
const query = SqlParameterQuery.fromSql('mybucket', sql) as StaticSqlParameterQuery;
95+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as StaticSqlParameterQuery;
9696
expect(query.errors).toEqual([]);
9797
expect(query.getStaticBucketIds(new RequestParameters({ sub: '' }, {}))).toEqual(['mybucket[]']);
9898
});
9999

100100
test('static expression (2)', function () {
101101
const sql = `SELECT WHERE 1 != 1`;
102-
const query = SqlParameterQuery.fromSql('mybucket', sql) as StaticSqlParameterQuery;
102+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as StaticSqlParameterQuery;
103103
expect(query.errors).toEqual([]);
104104
expect(query.getStaticBucketIds(new RequestParameters({ sub: '' }, {}))).toEqual([]);
105105
});
106106

107107
test('static IN expression', function () {
108108
const sql = `SELECT WHERE 'admin' IN '["admin", "superuser"]'`;
109-
const query = SqlParameterQuery.fromSql('mybucket', sql, undefined, {}) as StaticSqlParameterQuery;
109+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as StaticSqlParameterQuery;
110110
expect(query.errors).toEqual([]);
111111
expect(query.getStaticBucketIds(new RequestParameters({ sub: '' }, {}))).toEqual(['mybucket[]']);
112112
});
113113

114114
test('IN for permissions in request.jwt() (1)', function () {
115115
// Can use -> or ->> here
116116
const sql = `SELECT 'read:users' IN (request.jwt() ->> 'permissions') as access_granted`;
117-
const query = SqlParameterQuery.fromSql('mybucket', sql) as StaticSqlParameterQuery;
117+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as StaticSqlParameterQuery;
118118
expect(query.errors).toEqual([]);
119119
expect(
120120
query.getStaticBucketIds(new RequestParameters({ sub: '', permissions: ['write', 'read:users'] }, {}))
@@ -127,7 +127,7 @@ describe('static parameter queries', () => {
127127
test('IN for permissions in request.jwt() (2)', function () {
128128
// Can use -> or ->> here
129129
const sql = `SELECT WHERE 'read:users' IN (request.jwt() ->> 'permissions')`;
130-
const query = SqlParameterQuery.fromSql('mybucket', sql, undefined, {}) as StaticSqlParameterQuery;
130+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as StaticSqlParameterQuery;
131131
expect(query.errors).toEqual([]);
132132
expect(
133133
query.getStaticBucketIds(new RequestParameters({ sub: '', permissions: ['write', 'read:users'] }, {}))
@@ -139,15 +139,15 @@ describe('static parameter queries', () => {
139139

140140
test('IN for permissions in request.jwt() (3)', function () {
141141
const sql = `SELECT WHERE request.jwt() ->> 'role' IN '["admin", "superuser"]'`;
142-
const query = SqlParameterQuery.fromSql('mybucket', sql, undefined, {}) as StaticSqlParameterQuery;
142+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as StaticSqlParameterQuery;
143143
expect(query.errors).toEqual([]);
144144
expect(query.getStaticBucketIds(new RequestParameters({ sub: '', role: 'superuser' }, {}))).toEqual(['mybucket[]']);
145145
expect(query.getStaticBucketIds(new RequestParameters({ sub: '', role: 'superadmin' }, {}))).toEqual([]);
146146
});
147147

148148
test('case-sensitive queries (1)', () => {
149149
const sql = 'SELECT request.user_id() as USER_ID';
150-
const query = SqlParameterQuery.fromSql('mybucket', sql) as SqlParameterQuery;
150+
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as SqlParameterQuery;
151151
expect(query.errors).toMatchObject([
152152
{ message: `Unquoted identifiers are converted to lower-case. Use "USER_ID" instead.` }
153153
]);

0 commit comments

Comments
 (0)