@balena/abstract-sql-compiler 10.2.4-build-renovate-major-22-node-81f07071cc94780a7385f50254cba5e9d8340e64-1 → 10.2.4-build-tests-ts-beb2503119ff2e479e1da25051d33a021129a9d7-1

package/test/odata/filterby.js

@@ -351,31 +351,25 @@ const createMethodCall = function (method, ...args) {
 const operandTest = (lhs, op, rhs, override) => {
 	run(function () {
 		let from;
-		let where;
 		let { odata, sql, bindings } = createExpression(lhs, op, rhs);
 		bindings = override?.bindings ?? bindings;
 		sql = override?.sql ?? sql;
 		if (_.includes(odata, '/')) {
 			from = `\
-"pilot",
-	"pilot" AS "pilot.trained-pilot"`;
-			where =
-				`\
-"pilot"."id" = "pilot.trained-pilot"."was trained by-pilot"
-AND ` + sql;
+"pilot"
+LEFT JOIN "pilot" AS "pilot.trained-pilot" ON "pilot"."id" = "pilot.trained-pilot"."was trained by-pilot"`;
 		} else {
 			from = '"pilot"';
-			where = sql;
 		}
 
 		test(`/pilot?$filter=${odata}`, 'GET', bindings, (result, sqlEquals) => {
 			it('should select from pilot where "' + odata + '"', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 SELECT ${pilotFieldsStr}
 FROM ${from}
-WHERE ${where}`,
+WHERE ${sql}`,
 				);
 			});
 		});
@@ -386,11 +380,11 @@ WHERE ${where}`,
 			(result, sqlEquals) => {
 				it('should select count(*) from pilot where "' + odata + '"', () => {
 					sqlEquals(
-						result.query,
+						result,
 						`\
 SELECT COUNT(*) AS "$count"
 FROM ${from}
-WHERE ${where}`,
+WHERE ${sql}`,
 					);
 				});
 			},
@@ -404,7 +398,7 @@ const methodTest = (...args) => {
 		test(`/pilot?$filter=${odata}`, 'GET', bindings, (result, sqlEquals) => {
 			it('should select from pilot where "' + odata + '"', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -419,7 +413,7 @@ WHERE ` + sql,
 			(result, sqlEquals) => {
 				it('should select count(*) from pilot where "' + odata + '"', () => {
 					sqlEquals(
-						result.query,
+						result,
 						`\
 SELECT COUNT(*) AS "$count"
 FROM "pilot"
@@ -519,7 +513,7 @@ run(function () {
 		(result, sqlEquals) => {
 			it('should select from pilot where "' + odata + '"', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -539,7 +533,7 @@ run(function () {
 		(result, sqlEquals) => {
 			it('should select from pilot where "' + odata + '"', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -560,13 +554,12 @@ run(function () {
 	test(`/pilot?$filter=${odata}`, 'GET', bindings, (result, sqlEquals) => {
 		it('should select from pilot where "' + odata + '"', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
-FROM "pilot",
-	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
-WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND ${sql}`,
+FROM "pilot"
+LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+WHERE ${sql}`,
 			);
 		});
 	});
@@ -584,14 +577,13 @@ run(function () {
 				'should select from pilot__can_fly__plane where "' + odata + '"',
 				() => {
 					sqlEquals(
-						result.query,
+						result,
 						`\
 SELECT ${aliasPilotCanFlyPlaneFieldsStr}
 FROM "pilot",
-	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-	"plane" AS "pilot.pilot-can fly-plane.can fly-plane"
-WHERE "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.can fly-plane"."id"
-AND ("pilot.pilot-can fly-plane.can fly-plane"."id") IS NOT NULL AND ("pilot.pilot-can fly-plane.can fly-plane"."id") = (?)
+	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.can fly-plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.can fly-plane"."id"
+WHERE ("pilot.pilot-can fly-plane.can fly-plane"."id") IS NOT NULL AND ("pilot.pilot-can fly-plane.can fly-plane"."id") = (?)
 AND "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
 AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 					);
@@ -608,15 +600,10 @@ run(function () {
 		10,
 	);
 	const name = 'Peter';
-	const bodyBindings = [['Bind', ['pilot', 'name']]].concat(bindings);
-	const filterWhere = [
-		'WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"',
-		'AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"',
-		`AND ${sql}`,
-	];
+	const bodyBindings = [['Bind', ['pilot', 'name']], ...bindings];
 	const insertTest = (result, sqlEquals) => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 INSERT INTO "pilot" ("name")
 SELECT "$insert"."name"
@@ -625,34 +612,34 @@ FROM (
 ) AS "$insert"
 WHERE EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane",
-		(
+	FROM (
 		SELECT "$insert".*
 	) AS "pilot"
-	${filterWhere.join('\n\t')}
+	LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
+	WHERE ${sql}
 )`,
 		);
 	};
 	const updateWhere = `\
 WHERE "pilot"."id" IN ((
 	SELECT "pilot"."id" AS "$modifyid"
-	FROM "pilot",
-		"pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
-	${filterWhere.join('\n\t')}
+	FROM "pilot"
+	LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
+	WHERE ${sql}
 ))`;
 
 	test(`/pilot?$filter=${odata}`, 'GET', bindings, (result, sqlEquals) => {
 		it(`should select from pilot where '${odata}'`, () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
-FROM "pilot",
-	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-	"plane" AS "pilot.pilot-can fly-plane.plane"
-${filterWhere.join('\n')}`,
+FROM "pilot"
+LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
+WHERE ${sql}`,
 			);
 		});
 	});
@@ -665,7 +652,7 @@ ${filterWhere.join('\n')}`,
 		(result, sqlEquals) => {
 			it(`should update pilot where '${odata}'`, () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 UPDATE "pilot"
 SET "name" = ?
@@ -727,15 +714,15 @@ ${updateWhere}`,
 	test(`/pilot?$filter=${odata}`, 'DELETE', bindings, (result, sqlEquals) => {
 		it('should delete from pilot where "' + odata + '"', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 DELETE FROM "pilot"
 WHERE "pilot"."id" IN ((
 	SELECT "pilot"."id" AS "$modifyid"
-	FROM "pilot",
-		"pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
-	${filterWhere.join('\n\t')}
+	FROM "pilot"
+	LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
+	WHERE ${sql}
 ))`,
 			);
 		});
@@ -758,7 +745,7 @@ run(function () {
 		(result, sqlEquals) => {
 			it(`should insert into pilot where '${odata}'`, () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 INSERT INTO "pilot" ("name")
 SELECT "$insert"."name"
@@ -802,7 +789,7 @@ run(function () {
 		(result, sqlEquals) => {
 			it('should update the pilot with id 1', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 UPDATE "pilot"
 SET "name" = ?
@@ -892,7 +879,7 @@ run(function () {
 				'should select from pilot__can_fly__plane where "' + odata + '"',
 				() => {
 					sqlEquals(
-						result.query,
+						result,
 						`\
 SELECT ${aliasPilotCanFlyPlaneFieldsStr}
 FROM "pilot",
@@ -1026,16 +1013,15 @@ test(
 	(result, sqlEquals) => {
 		it('should select from pilot where ...', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
+	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-	AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )`,
 			);
@@ -1050,16 +1036,15 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where ...', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT COUNT(*) AS "$count"
 FROM "pilot"
 WHERE EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
+	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-	AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )`,
 			);
@@ -1080,16 +1065,15 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE (EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
+	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-	AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )
 OR ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
@@ -1114,17 +1098,16 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE NOT (
 	(EXISTS (
 		SELECT 1
-		FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-			"plane" AS "pilot.pilot-can fly-plane.plane"
+		FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+		LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 		WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-		AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 		AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 	)
 	OR ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
@@ -1144,16 +1127,15 @@ test(
 	(result, sqlEquals) => {
 		it('should select from pilot where ...', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE NOT EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
+	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-	AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	AND NOT (
 		("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 	)
@@ -1170,16 +1152,15 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where ...', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT COUNT(*) AS "$count"
 FROM "pilot"
 WHERE NOT EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
+	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-	AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	AND NOT (
 		("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 	)
@@ -1196,13 +1177,12 @@ test(
 	(result, sqlEquals) => {
 		it('should select from pilot where ...', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
-FROM "pilot",
-	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
-WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND EXISTS (
+FROM "pilot"
+LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+WHERE EXISTS (
 	SELECT 1
 	FROM "plane" AS "pilot.pilot-can fly-plane.plane"
 	WHERE "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
@@ -1220,13 +1200,12 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where ...', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT COUNT(*) AS "$count"
-FROM "pilot",
-	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
-WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND EXISTS (
+FROM "pilot"
+LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+WHERE EXISTS (
 	SELECT 1
 	FROM "plane" AS "pilot.pilot-can fly-plane.plane"
 	WHERE "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
@@ -1244,13 +1223,12 @@ test(
 	(result, sqlEquals) => {
 		it('should select from pilot where ...', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
-FROM "pilot",
-	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
-WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND NOT EXISTS (
+FROM "pilot"
+LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+WHERE NOT EXISTS (
 	SELECT 1
 	FROM "plane" AS "pilot.pilot-can fly-plane.plane"
 	WHERE "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
@@ -1270,13 +1248,12 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where ...', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT COUNT(*) AS "$count"
-FROM "pilot",
-	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
-WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND NOT EXISTS (
+FROM "pilot"
+LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+WHERE NOT EXISTS (
 	SELECT 1
 	FROM "plane" AS "pilot.pilot-can fly-plane.plane"
 	WHERE "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
@@ -1302,16 +1279,15 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE (EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
+	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-	AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )
 OR ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
@@ -1336,16 +1312,15 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
+	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-	AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )
 AND NOT(("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?))
@@ -1370,16 +1345,15 @@ test(
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE EXISTS (
 	SELECT 1
-	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-		"plane" AS "pilot.pilot-can fly-plane.plane"
+	FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
+	LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-	AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )
 AND NOT(("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?))
@@ -1404,12 +1378,12 @@ run(function () {
 	test(
 		'/team?$filter=' + odata,
 		'POST',
-		[['Bind', ['team', 'favourite_colour']]].concat(bindings),
+		[['Bind', ['team', 'favourite_colour']], ...bindings],
 		{ favourite_colour: favouriteColour },
 		(result, sqlEquals) => {
 			it('should insert into team where "' + odata + '"', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 INSERT INTO "team" ("favourite colour")
 SELECT "$insert"."favourite colour"
@@ -1438,17 +1412,14 @@ run(function () {
 	test('/team?$filter=' + odata, 'GET', bindings, (result, sqlEquals) => {
 		it('should select from team where "' + odata + '"', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${teamFieldsStr}
-FROM "team",
-	"pilot" AS "team.includes-pilot",
-	"pilot-can fly-plane" AS "team.includes-pilot.pilot-can fly-plane",
-	"plane" AS "team.includes-pilot.pilot-can fly-plane.plane"
-WHERE "team"."favourite colour" = "team.includes-pilot"."is on-team"
-AND "team.includes-pilot"."id" = "team.includes-pilot.pilot-can fly-plane"."pilot"
-AND "team.includes-pilot.pilot-can fly-plane"."can fly-plane" = "team.includes-pilot.pilot-can fly-plane.plane"."id"
-AND ${sql}`,
+FROM "team"
+LEFT JOIN "pilot" AS "team.includes-pilot" ON "team"."favourite colour" = "team.includes-pilot"."is on-team"
+LEFT JOIN "pilot-can fly-plane" AS "team.includes-pilot.pilot-can fly-plane" ON "team.includes-pilot"."id" = "team.includes-pilot.pilot-can fly-plane"."pilot"
+LEFT JOIN "plane" AS "team.includes-pilot.pilot-can fly-plane.plane" ON "team.includes-pilot.pilot-can fly-plane"."can fly-plane" = "team.includes-pilot.pilot-can fly-plane.plane"."id"
+WHERE ${sql}`,
 			);
 		});
 	});
@@ -1459,7 +1430,7 @@ run(function () {
 	test(`/pilot?$filter=${odata}`, 'GET', [], (result, sqlEquals) => {
 		it('should select from pilot where "' + odata + '"', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -1471,7 +1442,7 @@ WHERE CURRENT_TIMESTAMP - DATE_TRUNC('milliseconds', "pilot"."created at") < INT
 
 run(function () {
 	const odata = 'now() add now()';
-	test(`/pilot?$filter=${odata}`, 'GET', [], (result, sqlEquals) => {
+	test.fail(`/pilot?$filter=${odata}`, 'GET', [], (result, sqlEquals) => {
 		it(
 			'should fail to add current_timestamp to current_timestamp where "' +
 				odata +
@@ -1489,7 +1460,7 @@ run(function () {
 	test(`/pilot?$filter=${odata}`, 'GET', [], (result, sqlEquals) => {
 		it('should select from pilot where "' + odata + '"', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -1504,7 +1475,7 @@ run(function () {
 	test(`/pilot?$filter=${odata}`, 'GET', [['Bind', 0]], (result, sqlEquals) => {
 		it('should select from pilot where "' + odata + '"', () => {
 			sqlEquals(
-				result.query,
+				result,
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"

package/test/odata/orderby.js

@@ -5,7 +5,7 @@ const pilotFieldsStr = pilotFields.join(', ');
 test('/pilot?$orderby=name', (result, sqlEquals) => {
 	it('should order by name desc', () => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -17,7 +17,7 @@ ORDER BY "pilot"."name" DESC`,
 test('/pilot?$orderby=name,age', (result, sqlEquals) => {
 	it('should order by name desc, age desc', () => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -30,7 +30,7 @@ ORDER BY "pilot"."name" DESC,
 test('/pilot?$orderby=name desc', (result, sqlEquals) => {
 	it('should order by name desc', () => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -42,7 +42,7 @@ ORDER BY "pilot"."name" DESC`,
 test('/pilot?$orderby=name asc', (result, sqlEquals) => {
 	it('should order by name asc', () => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -54,7 +54,7 @@ ORDER BY "pilot"."name" ASC`,
 test('/pilot?$orderby=name asc,age desc', (result, sqlEquals) => {
 	it('should order by name desc, age desc', () => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
@@ -67,12 +67,11 @@ ORDER BY "pilot"."name" ASC,
 test('/pilot?$orderby=licence/id asc', (result, sqlEquals) => {
 	it('should order by licence/id asc', () => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 SELECT ${pilotFieldsStr}
-FROM "pilot",
-	"licence" AS "pilot.licence"
-WHERE "pilot"."licence" = "pilot.licence"."id"
+FROM "pilot"
+LEFT JOIN "licence" AS "pilot.licence" ON "pilot"."licence" = "pilot.licence"."id"
 ORDER BY "pilot.licence"."id" ASC`,
 		);
 	});
@@ -81,19 +80,17 @@ ORDER BY "pilot.licence"."id" ASC`,
 test('/pilot?$orderby=can_fly__plane/plane/id asc', (result, sqlEquals) => {
 	it('should order by pilot__can_fly__plane/plane/id asc', () => {
 		sqlEquals(
-			result.query,
+			result,
 			`\
 SELECT ${pilotFieldsStr}
-FROM "pilot",
-	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-	"plane" AS "pilot.pilot-can fly-plane.plane"
-WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
+FROM "pilot"
+LEFT JOIN "pilot-can fly-plane" AS "pilot.pilot-can fly-plane" ON "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
+LEFT JOIN "plane" AS "pilot.pilot-can fly-plane.plane" ON "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 ORDER BY "pilot.pilot-can fly-plane.plane"."id" ASC`,
 		);
 	});
 });
 
-test.skip('/pilot?$orderby=favourite_colour/red', () => {
+test.fail('/pilot?$orderby=favourite_colour/red', () => {
 	it("should order by how red the pilot's favourite colour is");
 });