@balena/abstract-sql-compiler 10.2.4-build-tests-ts-beb2503119ff2e479e1da25051d33a021129a9d7-1 → 10.2.4

package/.versionbot/CHANGELOG.yml

@@ -1,12 +1,4 @@
 - commits:
-    - subject: "Tests: convert test/odata/test to typescript"
-      hash: beb2503119ff2e479e1da25051d33a021129a9d7
-      body: ""
-      footer:
-        Change-type: patch
-        change-type: patch
-      author: Pagan Gazzard
-      nested: []
     - subject: Update dev dependencies
       hash: 703263fa73aff2253d1a931a5946a027d20c9ff6
       body: ""
@@ -17,7 +9,7 @@
       nested: []
   version: 10.2.4
   title: ""
-  date: 2025-04-04T13:16:10.504Z
+  date: 2025-04-04T13:13:39.664Z
 - commits:
     - subject: "Tests: convert test/abstract-sql/case-when-else.js to typescript"
       hash: 0edb21cc4ee30ead2a6eeb290623f3a0adc7a0fe

package/CHANGELOG.md

@@ -6,7 +6,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## 10.2.4 - 2025-04-04
 
-* Tests: convert test/odata/test to typescript [Pagan Gazzard]
 * Update dev dependencies [Pagan Gazzard]
 
 ## 10.2.3 - 2025-03-19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "10.2.4-build-tests-ts-beb2503119ff2e479e1da25051d33a021129a9d7-1",
+  "version": "10.2.4",
   "description": "A translator for abstract sql into sql.",
   "type": "commonjs",
   "main": "out/AbstractSQLCompiler.js",
@@ -64,6 +64,6 @@
     "npm": ">=10.7.0"
   },
   "versionist": {
-    "publishedAt": "2025-04-04T13:16:10.931Z"
+    "publishedAt": "2025-04-04T13:13:40.067Z"
   }
 }

package/test/odata/expand.js

@@ -18,9 +18,9 @@ const websqlAgg = mysqlAgg;
 		(field) => field === '"pilot"."licence"',
 	).join(', ');
 	const testFunc = (aggFunc, fields) => (result, sqlEquals) => {
-		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals?.(
-				result,
+		it('should select from pilot.*, aggregated licence', () =>
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -31,17 +31,16 @@ SELECT (
 	) AS "pilot.licence"
 ) AS "licence", ${remainingPilotFields}
 FROM "pilot"`,
-			);
-		});
+			));
 	};
 	const url = '/pilot?$expand=licence';
 	const urlCount = '/pilot?$expand=licence/$count';
 	test.postgres(url, testFunc(postgresAgg, aliasLicenceFields.join(', ')));
 	test.postgres(urlCount, testFunc(postgresAgg, 'COUNT(*) AS "$count"'));
-	test.mysql.fail(url, testFunc(mysqlAgg, aliasLicenceFields.join(', ')));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg, 'COUNT(*) AS "$count"'));
-	test.websql.fail(url, testFunc(websqlAgg, aliasLicenceFields.join(', ')));
-	test.websql.fail(urlCount, testFunc(websqlAgg, 'COUNT(*) AS "$count"'));
+	test.mysql.skip(url, testFunc(mysqlAgg, aliasLicenceFields.join(', ')));
+	test.mysql.skip(urlCount, testFunc(mysqlAgg, 'COUNT(*) AS "$count"'));
+	test.websql.skip(url, testFunc(websqlAgg, aliasLicenceFields.join(', ')));
+	test.websql.skip(urlCount, testFunc(websqlAgg, 'COUNT(*) AS "$count"'));
 })();
 
 (function () {
@@ -51,8 +50,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -79,8 +78,8 @@ FROM "pilot"`,
 		'/pilot?$expand=can_fly__plane($expand=plane)',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.fail(url, testFunc(mysqlAgg));
-		test.websql.fail(url, testFunc(websqlAgg));
+		test.mysql.skip(url, testFunc(mysqlAgg));
+		test.websql.skip(url, testFunc(websqlAgg));
 	}
 })();
 
@@ -95,8 +94,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -130,16 +129,16 @@ FROM "pilot"`,
 		'/pilot?$expand=can_fly__plane($expand=plane),licence',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.fail(url, testFunc(mysqlAgg));
-		test.websql.fail(url, testFunc(websqlAgg));
+		test.mysql.skip(url, testFunc(mysqlAgg));
+		test.websql.skip(url, testFunc(websqlAgg));
 	}
 })();
 
 (function () {
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -155,8 +154,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$select=licence&$expand=licence';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.skip(url, testFunc(mysqlAgg));
+	test.websql.skip(url, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -166,8 +165,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -194,8 +193,8 @@ FROM "pilot"`,
 		'/pilot?$select=id&$expand=can_fly__plane($expand=plane)',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.fail(url, testFunc(mysqlAgg));
-		test.websql.fail(url, testFunc(websqlAgg));
+		test.mysql.skip(url, testFunc(mysqlAgg));
+		test.websql.skip(url, testFunc(websqlAgg));
 	}
 })();
 
@@ -206,8 +205,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane), aggregated licence', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -241,16 +240,16 @@ FROM "pilot"`,
 		'/pilot?$select=id,licence&$expand=can_fly__plane($expand=plane),licence',
 	]) {
 		test.postgres(url, testFunc(postgresAgg));
-		test.mysql.fail(url, testFunc(mysqlAgg));
-		test.websql.fail(url, testFunc(websqlAgg));
+		test.mysql.skip(url, testFunc(mysqlAgg));
+		test.websql.skip(url, testFunc(websqlAgg));
 	}
 })();
 
 (function () {
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -266,8 +265,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=can_fly__plane($select=id)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.skip(url, testFunc(mysqlAgg));
+	test.websql.skip(url, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -277,8 +276,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc, fields) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -307,25 +306,25 @@ FROM "pilot"`,
 		[['Bind', 0]],
 		testFunc(postgresAgg, 'COUNT(*) AS "$count"'),
 	);
-	test.mysql.fail(
+	test.mysql.skip(
 		url,
 		'GET',
 		[['Bind', 0]],
 		testFunc(mysqlAgg, aliasLicenceFields.join(', ')),
 	);
-	test.mysql.fail(
+	test.mysql.skip(
 		urlCount,
 		'GET',
 		[['Bind', 0]],
 		testFunc(mysqlAgg, 'COUNT(*) AS "$count"'),
 	);
-	test.websql.fail(
+	test.websql.skip(
 		url,
 		'GET',
 		[['Bind', 0]],
 		testFunc(websqlAgg, aliasLicenceFields.join(', ')),
 	);
-	test.websql.fail(
+	test.websql.skip(
 		urlCount,
 		'GET',
 		[['Bind', 0]],
@@ -340,8 +339,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -359,8 +358,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($filter=is_of__pilot/id eq 1)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.skip(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
+	test.websql.skip(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
 })();
 
 (function () {
@@ -370,8 +369,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -388,8 +387,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($orderby=id)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.skip(url, testFunc(mysqlAgg));
+	test.websql.skip(url, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -399,8 +398,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore orderby', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -416,8 +415,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($orderby=id)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg));
-	test.websql.fail(urlCount, testFunc(websqlAgg));
+	test.mysql.skip(urlCount, testFunc(mysqlAgg));
+	test.websql.skip(urlCount, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -427,8 +426,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -445,8 +444,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($top=10)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.skip(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
+	test.websql.skip(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
 })();
 
 (function () {
@@ -456,8 +455,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore top', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -473,8 +472,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($top=10)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg));
-	test.websql.fail(urlCount, testFunc(websqlAgg));
+	test.mysql.skip(urlCount, testFunc(mysqlAgg));
+	test.websql.skip(urlCount, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -484,8 +483,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated licence', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -502,8 +501,8 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=licence($skip=10)';
 	test.postgres(url, 'GET', [['Bind', 0]], testFunc(postgresAgg));
-	test.mysql.fail(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
-	test.websql.fail(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
+	test.mysql.skip(url, 'GET', [['Bind', 0]], testFunc(mysqlAgg));
+	test.websql.skip(url, 'GET', [['Bind', 0]], testFunc(websqlAgg));
 })();
 
 (function () {
@@ -513,8 +512,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) licence and ignore skip', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.licence".*')} AS "licence"
@@ -530,15 +529,15 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=licence/$count($skip=10)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg));
-	test.websql.fail(urlCount, testFunc(websqlAgg));
+	test.mysql.skip(urlCount, testFunc(mysqlAgg));
+	test.websql.skip(urlCount, testFunc(websqlAgg));
 })();
 
 (function () {
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated(pilot-can fly-plane, aggregated plane)', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -554,15 +553,15 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=can_fly__plane($select=plane)';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.skip(url, testFunc(mysqlAgg));
+	test.websql.skip(url, testFunc(websqlAgg));
 })();
 
 (function () {
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated count(*) pilot-can fly-plane and ignore select', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.pilot-can fly-plane".*')} AS "can_fly__plane"
@@ -578,8 +577,8 @@ FROM "pilot"`,
 	};
 	const urlCount = '/pilot?$expand=can_fly__plane/$count($select=plane)';
 	test.postgres(urlCount, testFunc(postgresAgg));
-	test.mysql.fail(urlCount, testFunc(mysqlAgg));
-	test.websql.fail(urlCount, testFunc(websqlAgg));
+	test.mysql.skip(urlCount, testFunc(mysqlAgg));
+	test.websql.skip(urlCount, testFunc(websqlAgg));
 })();
 
 (function () {
@@ -590,8 +589,8 @@ FROM "pilot"`,
 	).join(', ');
 	const testFunc = (aggFunc) => (result, sqlEquals) => {
 		it('should select from pilot.*, aggregated pilot', () => {
-			sqlEquals?.(
-				result,
+			sqlEquals(
+				result.query,
 				`\
 SELECT (
 	SELECT ${aggFunc('"pilot.trained-pilot".*')} AS "trained__pilot"
@@ -607,6 +606,6 @@ FROM "pilot"`,
 	};
 	const url = '/pilot?$expand=trained__pilot';
 	test.postgres(url, testFunc(postgresAgg));
-	test.mysql.fail(url, testFunc(mysqlAgg));
-	test.websql.fail(url, testFunc(websqlAgg));
+	test.mysql.skip(url, testFunc(mysqlAgg));
+	test.websql.skip(url, testFunc(websqlAgg));
 })();