Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix -> operator on missing values to return null #193

Merged
merged 7 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fast-monkeys-approve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@powersync/service-sync-rules': patch
---

Fix -> operator on missing values to return null.
2 changes: 1 addition & 1 deletion packages/sync-rules/src/TableValuedFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const JSON_EACH: TableValuedFunction = {
throw new Error('Expected JSON string');
}
if (!Array.isArray(values)) {
throw new Error('Expected an array');
throw new Error(`Expected an array, got ${valueString}`);
}

return values.map((v) => {
Expand Down
7 changes: 5 additions & 2 deletions packages/sync-rules/src/sql_functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ const iif: DocumentedSqlFunction = {
parameters: [
{ name: 'x', type: ExpressionType.ANY, optional: false },
{ name: 'y', type: ExpressionType.ANY, optional: false },
{ name: 'z', type: ExpressionType.ANY, optional: false },
{ name: 'z', type: ExpressionType.ANY, optional: false }
],
getReturnType() {
return ExpressionType.ANY;
Expand Down Expand Up @@ -865,7 +865,10 @@ export function jsonExtract(sourceValue: SqliteValue, path: SqliteValue, operato
value = value[c];
}
if (operator == '->') {
// -> must always stringify
// -> must always stringify, except when it's null
if (value == null) {
return null;
}
return JSONBig.stringify(value);
} else {
// Plain scalar value - simple conversion.
Expand Down
26 changes: 19 additions & 7 deletions packages/sync-rules/test/src/sql_functions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ describe('SQL functions', () => {
expect(fn.json_extract(JSON.stringify({ foo: 42 }), '$')).toEqual('{"foo":42}');
expect(fn.json_extract(`{"foo": 42.0}`, '$')).toEqual('{"foo":42.0}');
expect(fn.json_extract(`{"foo": true}`, '$')).toEqual('{"foo":true}');
// SQLite gives null instead of 'null'. We should match that, but it's a breaking change.
expect(fn.json_extract(`{"foo": null}`, '$.foo')).toEqual('null');
// Matches SQLite
expect(fn.json_extract(`{}`, '$.foo')).toBeNull();
});

test('->>', () => {
Expand All @@ -23,6 +27,10 @@ describe('SQL functions', () => {
expect(jsonExtract(`{"foo": 42.0}`, 'foo', '->>')).toEqual(42.0);
expect(jsonExtract(`{"foo": 42.0}`, '$', '->>')).toEqual(`{"foo":42.0}`);
expect(jsonExtract(`{"foo": true}`, '$.foo', '->>')).toEqual(1n);
// SQLite gives null instead of 'null'. We should match that, but it's a breaking change.
expect(jsonExtract(`{"foo": null}`, '$.foo', '->>')).toEqual('null');
// Matches SQLite
expect(jsonExtract(`{}`, '$.foo', '->>')).toBeNull();
});

test('->', () => {
Expand All @@ -34,6 +42,10 @@ describe('SQL functions', () => {
expect(jsonExtract(`{"foo": 42.0}`, 'foo', '->')).toEqual('42.0');
expect(jsonExtract(`{"foo": 42.0}`, '$', '->')).toEqual(`{"foo":42.0}`);
expect(jsonExtract(`{"foo": true}`, '$.foo', '->')).toEqual('true');
// SQLite gives 'null' instead of null. We should match that, but it's a breaking change.
expect(jsonExtract(`{"foo": null}`, '$.foo', '->')).toBeNull();
// Matches SQLite
expect(jsonExtract(`{}`, '$.foo', '->')).toBeNull();
});

test('json_array_length', () => {
Expand Down Expand Up @@ -127,13 +139,13 @@ describe('SQL functions', () => {
test('iif', () => {
expect(fn.iif(null, 1, 2)).toEqual(2);
expect(fn.iif(0, 1, 2)).toEqual(2);
expect(fn.iif(1, "first", "second")).toEqual("first");
expect(fn.iif(0.1, "is_true", "is_false")).toEqual("is_true");
expect(fn.iif("a", "is_true", "is_false")).toEqual("is_false");
expect(fn.iif(0n, "is_true", "is_false")).toEqual("is_false");
expect(fn.iif(2n, "is_true", "is_false")).toEqual("is_true");
expect(fn.iif(new Uint8Array([]), "is_true", "is_false")).toEqual("is_false");
expect(fn.iif(Uint8Array.of(0x61, 0x62, 0x43), "is_true", "is_false")).toEqual("is_false");
expect(fn.iif(1, 'first', 'second')).toEqual('first');
expect(fn.iif(0.1, 'is_true', 'is_false')).toEqual('is_true');
expect(fn.iif('a', 'is_true', 'is_false')).toEqual('is_false');
expect(fn.iif(0n, 'is_true', 'is_false')).toEqual('is_false');
expect(fn.iif(2n, 'is_true', 'is_false')).toEqual('is_true');
expect(fn.iif(new Uint8Array([]), 'is_true', 'is_false')).toEqual('is_false');
expect(fn.iif(Uint8Array.of(0x61, 0x62, 0x43), 'is_true', 'is_false')).toEqual('is_false');
});

test('upper', () => {
Expand Down
37 changes: 37 additions & 0 deletions packages/sync-rules/test/src/table_valued_function_queries.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,43 @@ describe('table-valued function queries', () => {
expect(query.getStaticBucketIds(new RequestParameters({ sub: '' }, {}))).toEqual([]);
});

test('json_each(array param not present)', function () {
const sql = "SELECT json_each.value as v FROM json_each(request.parameters() -> 'array_not_present')";
const query = SqlParameterQuery.fromSql('mybucket', sql, {
...PARSE_OPTIONS,
accept_potentially_dangerous_queries: true
}) as StaticSqlParameterQuery;
expect(query.errors).toEqual([]);
expect(query.bucket_parameters).toEqual(['v']);

expect(query.getStaticBucketIds(new RequestParameters({ sub: '' }, {}))).toEqual([]);
});

test('json_each(array param not present, ifnull)', function () {
const sql = "SELECT json_each.value as v FROM json_each(ifnull(request.parameters() -> 'array_not_present', '[]'))";
const query = SqlParameterQuery.fromSql('mybucket', sql, {
...PARSE_OPTIONS,
accept_potentially_dangerous_queries: true
}) as StaticSqlParameterQuery;
expect(query.errors).toEqual([]);
expect(query.bucket_parameters).toEqual(['v']);

expect(query.getStaticBucketIds(new RequestParameters({ sub: '' }, {}))).toEqual([]);
});

test('json_each on json_keys', function () {
const sql = `SELECT value FROM json_each(json_keys('{"a": [], "b": 2, "c": null}'))`;
const query = SqlParameterQuery.fromSql('mybucket', sql, PARSE_OPTIONS) as StaticSqlParameterQuery;
expect(query.errors).toEqual([]);
expect(query.bucket_parameters).toEqual(['value']);

expect(query.getStaticBucketIds(new RequestParameters({ sub: '' }, {}))).toEqual([
'mybucket["a"]',
'mybucket["b"]',
'mybucket["c"]'
]);
});

test('json_each with fn alias', function () {
const sql = "SELECT e.value FROM json_each(request.parameters() -> 'array') e";
const query = SqlParameterQuery.fromSql('mybucket', sql, {
Expand Down