@balena/abstract-sql-compiler 7.22.2 → 7.22.3

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,15 @@
+- commits:
+    - subject: "Tests: update @balena/odata-to-abstract-sql to 5.x"
+      hash: e93dfd1cbf56a9df248ac199776dca44c71cbc11
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+  version: 7.22.3
+  title: ""
+  date: 2022-11-30T16:13:57.771Z
 - commits:
     - subject: Fix deprecation notice module name
       hash: 7272a823a00ffd6af52228f2cab4c95e3b3474b9
@@ -9,7 +21,7 @@
       nested: []
   version: 7.22.2
   title: ""
-  date: 2022-11-30T15:46:42.743Z
+  date: 2022-11-30T16:12:20.310Z
 - commits:
     - subject: Add deprecation notices to the legacy null formats of `null` and `'Null'`
       hash: d4a8a31911b80c4c8ad46e5b6567496c232fad9b

package/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 7.22.3 - 2022-11-30
+
+* Tests: update @balena/odata-to-abstract-sql to 5.x [Pagan Gazzard]
+
 ## 7.22.2 - 2022-11-30
 
 * Fix deprecation notice module name [Pagan Gazzard]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "7.22.2",
+  "version": "7.22.3",
   "description": "A translator for abstract sql into sql.",
   "main": "out/AbstractSQLCompiler.js",
   "types": "out/AbstractSQLCompiler.d.ts",
@@ -16,24 +16,24 @@
   "repository": "https://github.com/balena-io-modules/abstract-sql-compiler.git",
   "author": "",
   "dependencies": {
-    "@balena/sbvr-types": "^3.4.8",
+    "@balena/odata-to-abstract-sql": "^5.7.2",
+    "@balena/sbvr-types": "^3.4.18",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@balena/lf-to-abstract-sql": "^4.5.2",
+    "@balena/lf-to-abstract-sql": "^4.5.6",
     "@balena/lint": "^6.2.1",
     "@balena/odata-parser": "^2.4.2",
-    "@balena/sbvr-parser": "^1.4.2",
-    "@resin/odata-to-abstract-sql": "^3.3.0",
+    "@balena/sbvr-parser": "^1.4.3",
     "@types/chai": "^4.3.4",
     "@types/common-tags": "^1.8.1",
-    "@types/lodash": "^4.14.189",
-    "@types/mocha": "^10.0.0",
+    "@types/lodash": "^4.14.190",
+    "@types/mocha": "^10.0.1",
     "@types/node": "^18.11.9",
     "chai": "^4.3.7",
     "common-tags": "^1.8.2",
-    "husky": "^8.0.0",
-    "lint-staged": "^13.0.3",
+    "husky": "^8.0.2",
+    "lint-staged": "^13.0.4",
     "mocha": "^10.1.0",
     "require-npm4-to-publish": "^1.0.0",
     "ts-node": "^10.9.1",
@@ -58,6 +58,6 @@
     ]
   },
   "versionist": {
-    "publishedAt": "2022-11-30T15:46:43.065Z"
+    "publishedAt": "2022-11-30T16:13:58.130Z"
   }
 }

package/test/odata/expand.js

@@ -285,7 +285,7 @@ SELECT (
 	FROM (
 		SELECT ${fields}
 		FROM "licence" AS "pilot.licence"
-		WHERE "pilot.licence"."id" = ?
+		WHERE ("pilot.licence"."id") IS NOT NULL AND ("pilot.licence"."id") = (?)
 		AND "pilot"."licence" = "pilot.licence"."id"
 	) AS "pilot.licence"
 ) AS "licence", ${remainingPilotFields}
@@ -350,7 +350,7 @@ SELECT (
 		FROM "licence" AS "pilot.licence",
 			"pilot" AS "pilot.licence.is of-pilot"
 		WHERE "pilot.licence"."id" = "pilot.licence.is of-pilot"."licence"
-		AND "pilot.licence.is of-pilot"."id" = ?
+		AND ("pilot.licence.is of-pilot"."id") IS NOT NULL AND ("pilot.licence.is of-pilot"."id") = (?)
 		AND "pilot"."licence" = "pilot.licence"."id"
 	) AS "pilot.licence"
 ) AS "licence", ${remainingPilotFields}

package/test/odata/filterby.js

@@ -7,7 +7,7 @@ const { expect } = require('chai');
 const test = require('./test');
 const { clientModel } = test;
 const _ = require('lodash');
-const { odataNameToSqlName } = require('@resin/odata-to-abstract-sql');
+const { odataNameToSqlName } = require('@balena/odata-to-abstract-sql');
 const {
 	pilotFields,
 	teamFields,
@@ -204,15 +204,40 @@ const createExpression = function (lhs, op, rhs) {
 	lhs = parseOperand(lhs);
 	rhs = parseOperand(rhs);
 	const bindings = lhs.bindings.concat(rhs.bindings);
-	if (['eq', 'ne'].includes(op) && [lhs.sql, rhs.sql].includes('NULL')) {
-		const nullCheck = op === 'eq' ? ' IS NULL' : ' IS NOT NULL';
-		if (lhs.sql === 'NULL') {
-			sql = rhs.sql + nullCheck;
+	if (['eq', 'ne'].includes(op)) {
+		if ([lhs.sql, rhs.sql].includes('NULL')) {
+			const nullCheck = op === 'eq' ? ' IS NULL' : ' IS NOT NULL';
+			if (lhs.sql === 'NULL') {
+				sql = rhs.sql + nullCheck;
+			} else {
+				sql = lhs.sql + nullCheck;
+			}
 		} else {
-			sql = lhs.sql + nullCheck;
+			const nullCheck = ' IS NOT NULL';
+			const lhsNullCheck =
+				lhs.sql === '?' ? '' : `(${lhs.sql})${nullCheck} AND `;
+			const rhsNullCheck =
+				rhs.sql === '?' ? '' : `(${rhs.sql})${nullCheck} AND `;
+			const bothNullCheck =
+				lhsNullCheck.length > 0 && rhsNullCheck.length > 0
+					? ` OR (${lhs.sql}) IS NULL AND (${rhs.sql}) IS NULL`
+					: '';
+
+			if (lhsNullCheck.length > 0 || rhsNullCheck.length > 0) {
+				if (op === 'ne') {
+					const mainCheck = `(${lhs.sql})${sqlOps.eq} (${rhs.sql})`;
+					sql = `NOT(${lhsNullCheck}${rhsNullCheck}${mainCheck}${bothNullCheck})`;
+				} else {
+					const mainCheck = `(${lhs.sql})${sqlOps[op]} (${rhs.sql})`;
+					sql = `${lhsNullCheck}${rhsNullCheck}${mainCheck}${bothNullCheck}`;
+				}
+			} else {
+				const mainCheck = `${lhs.sql}${sqlOps[op]} ${rhs.sql}`;
+				sql = `${lhsNullCheck}${rhsNullCheck}${mainCheck}${bothNullCheck}`;
+			}
 		}
 	} else {
-		sql = lhs.sql + sqlOps[op] + ' ' + rhs.sql;
+		sql = `${lhs.sql}${sqlOps[op]} ${rhs.sql}`;
 	}
 
 	if (sqlOpBrackets[op]) {
@@ -275,25 +300,25 @@ const createMethodCall = function (method, ...args) {
 		case 'HOUR':
 		case 'MINUTE':
 			return {
-				sql: `EXTRACT('${method}' FROM ${args[0].sql})`,
+				sql: `EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${args[0].sql}))`,
 				bindings: args[0].bindings,
 				odata,
 			};
 		case 'SECOND':
 			return {
-				sql: `FLOOR(EXTRACT('${method}' FROM ${args[0].sql}))`,
+				sql: `FLOOR(EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${args[0].sql})))`,
 				bindings: args[0].bindings,
 				odata,
 			};
 		case 'FRACTIONALSECONDS':
 			return {
-				sql: `EXTRACT('SECOND' FROM ${args[0].sql}) - FLOOR(EXTRACT('SECOND' FROM ${args[0].sql}))`,
+				sql: `EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${args[0].sql})) - FLOOR(EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${args[0].sql})))`,
 				bindings: args[0].bindings,
 				odata,
 			};
 		case 'TIME':
 			return {
-				sql: `CAST(${args[0].sql} AS ${method})`,
+				sql: `CAST(DATE_TRUNC('milliseconds', ${args[0].sql}) AS ${method})`,
 				bindings: args[0].bindings,
 				odata,
 			};
@@ -303,6 +328,12 @@ const createMethodCall = function (method, ...args) {
 				bindings: args[0].bindings,
 				odata,
 			};
+		case 'DATE':
+			return {
+				sql: `DATE(DATE_TRUNC('milliseconds', ${args[0].sql}))`,
+				bindings: args[0].bindings,
+				odata,
+			};
 		default:
 			if (methodMaps.hasOwnProperty(method)) {
 				method = methodMaps[method];
@@ -496,7 +527,7 @@ run(function () {
 					`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE "pilot"."name" = ?`,
+WHERE ("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?)`,
 				);
 			});
 		},
@@ -516,8 +547,8 @@ run(function () {
 					`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE ("pilot"."name" = $1
-OR "pilot"."favourite colour" = $1)`,
+WHERE (("pilot"."name") IS NOT NULL AND ("pilot"."name") = ($1)
+OR ("pilot"."favourite colour") IS NOT NULL AND ("pilot"."favourite colour") = ($1))`,
 				);
 			});
 		},
@@ -564,9 +595,9 @@ 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" = ?
+AND ("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" = ?`,
+AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 					);
 				},
 			);
@@ -767,7 +798,7 @@ run(function () {
 					`\
 UPDATE "pilot"
 SET "name" = ?
-WHERE "pilot"."id" = ?
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
 AND "pilot"."id" IN ((
 	SELECT "pilot"."id"
 	FROM "pilot"
@@ -798,7 +829,7 @@ FROM (
 	SELECT CAST(NULL AS TIMESTAMP) AS "created at", CAST(NULL AS TIMESTAMP) AS "modified at", CAST(? AS INTEGER) AS "id", CAST(NULL AS INTEGER) AS "person", CAST(NULL AS INTEGER) AS "is experienced", CAST(? AS VARCHAR(255)) AS "name", CAST(NULL AS INTEGER) AS "age", CAST(NULL AS INTEGER) AS "favourite colour", CAST(NULL AS INTEGER) AS "is on-team", CAST(NULL AS INTEGER) AS "licence", CAST(NULL AS TIMESTAMP) AS "hire date", CAST(NULL AS INTEGER) AS "was trained by-pilot"
 ) AS "pilot"
 WHERE ${sql}
-AND "pilot"."id" = ?`,
+AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 					);
 				});
 				it('and updates', () => {
@@ -818,7 +849,7 @@ SET "created at" = DEFAULT,
 	"licence" = DEFAULT,
 	"hire date" = DEFAULT,
 	"was trained by-pilot" = DEFAULT
-WHERE "pilot"."id" = ?
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
 AND "pilot"."id" IN ((
 	SELECT "pilot"."id"
 	FROM "pilot"
@@ -854,7 +885,7 @@ FROM "pilot",
 	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
 WHERE ${sql}
 AND "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND "pilot"."id" = ?`,
+AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 					);
 				},
 			);
@@ -868,14 +899,21 @@ methodTest('startswith', 'name', "'P'");
 run(() => {
 	operandTest(createMethodCall('length', 'name'), 'eq', 4);
 });
+
 run(() => {
-	operandTest(createMethodCall('indexof', 'name', "'Pe'"), 'eq', 0);
+	operandTest(createMethodCall('indexof', 'name', "'Pe'"), 'eq', 0, {
+		sql: '(STRPOS("pilot"."name", $1) - 1) IS NOT NULL AND (STRPOS("pilot"."name", $1) - 1) = ($2)',
+	});
 });
 run(() => {
-	operandTest(createMethodCall('substring', 'name', 1), 'eq', "'ete'");
+	operandTest(createMethodCall('substring', 'name', 1), 'eq', "'ete'", {
+		sql: '(SUBSTRING("pilot"."name", $1 + 1)) IS NOT NULL AND (SUBSTRING("pilot"."name", $1 + 1)) = ($2)',
+	});
 });
 run(() => {
-	operandTest(createMethodCall('substring', 'name', 1, 2), 'eq', "'et'");
+	operandTest(createMethodCall('substring', 'name', 1, 2), 'eq', "'et'", {
+		sql: '(SUBSTRING("pilot"."name", $1 + 1, $2)) IS NOT NULL AND (SUBSTRING("pilot"."name", $1 + 1, $2)) = ($3)',
+	});
 });
 run(() => {
 	operandTest(createMethodCall('tolower', 'name'), 'eq', "'pete'");
@@ -892,11 +930,15 @@ run(() => {
 });
 run(function () {
 	const concat = createMethodCall('concat', 'name', "'%20'");
-	operandTest(createMethodCall('trim', concat), 'eq', "'Pete'");
+	operandTest(createMethodCall('trim', concat), 'eq', "'Pete'", {
+		sql: '(TRIM(("pilot"."name" || $1))) IS NOT NULL AND (TRIM(("pilot"."name" || $1))) = ($2)',
+	});
 });
 run(function () {
 	const concat = createMethodCall('concat', 'name', "'%20'");
-	operandTest(concat, 'eq', "'Pete%20'");
+	operandTest(concat, 'eq', "'Pete%20'", {
+		sql: '(("pilot"."name" || $1)) IS NOT NULL AND (("pilot"."name" || $1)) = ($2)',
+	});
 });
 run(() => {
 	operandTest(createMethodCall('year', 'hire_date'), 'eq', 2011);
@@ -957,6 +999,9 @@ run(() => {
 		createMethodCall('replace', 'name', "'ete'", "'at'"),
 		'eq',
 		"'Pat'",
+		{
+			sql: '(REPLACE("pilot"."name", $1, $2)) IS NOT NULL AND (REPLACE("pilot"."name", $1, $2)) = ($3)',
+		},
 	);
 });
 
@@ -977,7 +1022,7 @@ WHERE EXISTS (
 		"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"
-	AND "pilot.pilot-can fly-plane.plane"."name" = ?
+	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )`,
 			);
 		});
@@ -1001,7 +1046,7 @@ WHERE EXISTS (
 		"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"
-	AND "pilot.pilot-can fly-plane.plane"."name" = ?
+	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )`,
 			);
 		});
@@ -1012,11 +1057,11 @@ test(
 	"/pilot?$filter=can_fly__plane/any(d:d/plane/name eq 'Concorde') or (id eq 5 or id eq 10) or (name eq 'Peter' or name eq 'Harry')",
 	'GET',
 	[
+		['Bind', 0],
 		['Bind', 1],
 		['Bind', 2],
 		['Bind', 3],
 		['Bind', 4],
-		['Bind', 0],
 	],
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
@@ -1025,16 +1070,18 @@ test(
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE ("pilot"."id" IN (?, ?)
-OR "pilot"."name" IN (?, ?)
-OR EXISTS (
+WHERE (EXISTS (
 	SELECT 1
 	FROM "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"
-	AND "pilot.pilot-can fly-plane.plane"."name" = ?
-))`,
+	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") = (?)
+OR ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
+OR ("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?)
+OR ("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?))`,
 			);
 		});
 	},
@@ -1044,11 +1091,11 @@ test(
 	"/pilot?$filter=not(can_fly__plane/any(d:d/plane/name eq 'Concorde') or (id eq 5 or id eq 10) or (name eq 'Peter' or name eq 'Harry'))",
 	'GET',
 	[
+		['Bind', 0],
 		['Bind', 1],
 		['Bind', 2],
 		['Bind', 3],
 		['Bind', 4],
-		['Bind', 0],
 	],
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
@@ -1058,16 +1105,18 @@ test(
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE NOT (
-	("pilot"."id" IN (?, ?)
-	OR "pilot"."name" IN (?, ?)
-	OR EXISTS (
+	(EXISTS (
 		SELECT 1
 		FROM "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"
-		AND "pilot.pilot-can fly-plane.plane"."name" = ?
-	))
+		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") = (?)
+	OR ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
+	OR ("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?)
+	OR ("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?))
 )`,
 			);
 		});
@@ -1091,7 +1140,9 @@ WHERE NOT EXISTS (
 		"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"
-	AND "pilot.pilot-can fly-plane.plane"."name" != ?
+	AND NOT (
+		("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
+	)
 )`,
 			);
 		});
@@ -1115,7 +1166,9 @@ WHERE NOT EXISTS (
 		"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"
-	AND "pilot.pilot-can fly-plane.plane"."name" != ?
+	AND NOT (
+		("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
+	)
 )`,
 			);
 		});
@@ -1139,7 +1192,7 @@ AND 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"
-	AND "pilot.pilot-can fly-plane.plane"."name" = ?
+	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )`,
 			);
 		});
@@ -1163,7 +1216,7 @@ AND 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"
-	AND "pilot.pilot-can fly-plane.plane"."name" = ?
+	AND ("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
 )`,
 			);
 		});
@@ -1187,7 +1240,9 @@ AND 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"
-	AND "pilot.pilot-can fly-plane.plane"."name" != ?
+	AND NOT (
+		("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
+	)
 )`,
 			);
 		});
@@ -1211,7 +1266,9 @@ AND 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"
-	AND "pilot.pilot-can fly-plane.plane"."name" != ?
+	AND NOT (
+		("pilot.pilot-can fly-plane.plane"."name") IS NOT NULL AND ("pilot.pilot-can fly-plane.plane"."name") = (?)
+	)
 )`,
 			);
 		});
@@ -1222,11 +1279,11 @@ test(
 	"/pilot?$filter=can_fly__plane/any(d:d/plane/name eq 'Concorde') or (id eq 5 or name eq 'Peter') or (id eq 10 or name eq 'Harry')",
 	'GET',
 	[
+		['Bind', 0],
 		['Bind', 1],
-		['Bind', 3],
 		['Bind', 2],
+		['Bind', 3],
 		['Bind', 4],
-		['Bind', 0],
 	],
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
@@ -1235,16 +1292,18 @@ test(
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE ("pilot"."id" IN (?, ?)
-OR "pilot"."name" IN (?, ?)
-OR EXISTS (
+WHERE (EXISTS (
 	SELECT 1
 	FROM "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"
-	AND "pilot.pilot-can fly-plane.plane"."name" = ?
-))`,
+	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") = (?)
+OR ("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?)
+OR ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
+OR ("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?))`,
 			);
 		});
 	},
@@ -1254,11 +1313,11 @@ test(
 	"/pilot?$filter=can_fly__plane/any(d:d/plane/name eq 'Concorde') and (id ne 5 and id ne 10) and (name ne 'Peter' and name ne 'Harry')",
 	'GET',
 	[
+		['Bind', 0],
 		['Bind', 1],
 		['Bind', 2],
 		['Bind', 3],
 		['Bind', 4],
-		['Bind', 0],
 	],
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
@@ -1267,16 +1326,18 @@ test(
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE "pilot"."id" NOT IN (?, ?)
-AND "pilot"."name" NOT IN (?, ?)
-AND EXISTS (
+WHERE EXISTS (
 	SELECT 1
 	FROM "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"
-	AND "pilot.pilot-can fly-plane.plane"."name" = ?
-)`,
+	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") = (?))
+AND NOT(("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?))
+AND NOT(("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?))
+AND NOT(("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?))`,
 			);
 		});
 	},
@@ -1286,11 +1347,11 @@ test(
 	"/pilot?$filter=can_fly__plane/any(d:d/plane/name eq 'Concorde') and (id ne 5 and name ne 'Peter') and (id ne 10 and name ne 'Harry')",
 	'GET',
 	[
+		['Bind', 0],
 		['Bind', 1],
-		['Bind', 3],
 		['Bind', 2],
+		['Bind', 3],
 		['Bind', 4],
-		['Bind', 0],
 	],
 	(result, sqlEquals) => {
 		it('should select count(*) from pilot where id in (5,10)', () => {
@@ -1299,16 +1360,18 @@ test(
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE "pilot"."id" NOT IN (?, ?)
-AND "pilot"."name" NOT IN (?, ?)
-AND EXISTS (
+WHERE EXISTS (
 	SELECT 1
 	FROM "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"
-	AND "pilot.pilot-can fly-plane.plane"."name" = ?
-)`,
+	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") = (?))
+AND NOT(("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?))
+AND NOT(("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?))
+AND NOT(("pilot"."name") IS NOT NULL AND ("pilot"."name") = (?))`,
 			);
 		});
 	},
@@ -1380,7 +1443,7 @@ run(function () {
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE CURRENT_TIMESTAMP - "pilot"."created at" < INTERVAL '1 0:0:0.0'`,
+WHERE CURRENT_TIMESTAMP - DATE_TRUNC('milliseconds', "pilot"."created at") < INTERVAL '1 0:0:0.0'`,
 			);
 		});
 	});
@@ -1410,14 +1473,14 @@ run(function () {
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE "pilot"."created at" + INTERVAL '1 0:0:0.0' > CURRENT_TIMESTAMP`,
+WHERE DATE_TRUNC('milliseconds', "pilot"."created at") + INTERVAL '1 0:0:0.0' > CURRENT_TIMESTAMP`,
 			);
 		});
 	});
 });
 
 run(function () {
-	const odata = 'totalseconds(created_at) gt 1';
+	const odata = "totalseconds(duration'P1D') gt 1";
 	test(`/pilot?$filter=${odata}`, 'GET', [['Bind', 0]], (result, sqlEquals) => {
 		it('should select from pilot where "' + odata + '"', () => {
 			sqlEquals(
@@ -1425,7 +1488,7 @@ run(function () {
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE EXTRACT(EPOCH FROM "pilot"."created at") > $1`,
+WHERE EXTRACT(EPOCH FROM INTERVAL '1 0:0:0.0') > $1`,
 			);
 		});
 	});

package/test/odata/resource_parsing.js

@@ -37,7 +37,7 @@ test('/pilot(1)', 'GET', [['Bind', 0]], (result, sqlEquals) => {
 			`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 		);
 	});
 });
@@ -49,7 +49,7 @@ test("/pilot('TextKey')", 'GET', [['Bind', 0]], (result, sqlEquals) => {
 			`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 		);
 	});
 });
@@ -63,7 +63,7 @@ SELECT ${aliasLicenceFieldsStr}
 FROM "pilot",
 	"licence" AS "pilot.licence"
 WHERE "pilot"."licence" = "pilot.licence"."id"
-AND "pilot"."id" = ?`,
+AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 		);
 	});
 });
@@ -77,7 +77,7 @@ SELECT ${aliasPilotLicenceFieldsStr}
 FROM "licence",
 	"pilot" AS "licence.is of-pilot"
 WHERE "licence"."id" = "licence.is of-pilot"."licence"
-AND "licence"."id" = ?`,
+AND ("licence"."id") IS NOT NULL AND ("licence"."id") = (?)`,
 		);
 	});
 });
@@ -97,7 +97,7 @@ FROM "pilot",
 	"plane" AS "pilot.pilot-can fly-plane.plane"
 WHERE "pilot.pilot-can fly-plane"."can fly-plane" = "pilot.pilot-can fly-plane.plane"."id"
 AND "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND "pilot"."id" = ?`,
+AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 			);
 		});
 	},
@@ -118,7 +118,7 @@ FROM "plane",
 	"pilot" AS "plane.pilot-can fly-plane.pilot"
 WHERE "plane.pilot-can fly-plane"."pilot" = "plane.pilot-can fly-plane.pilot"."id"
 AND "plane"."id" = "plane.pilot-can fly-plane"."can fly-plane"
-AND "plane"."id" = ?`,
+AND ("plane"."id") IS NOT NULL AND ("plane"."id") = (?)`,
 			);
 		});
 	},
@@ -130,7 +130,7 @@ test('/pilot(1)', 'DELETE', [['Bind', 0]], (result, sqlEquals) => {
 			result.query,
 			`\
 DELETE FROM "pilot"
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 		);
 	});
 });
@@ -158,7 +158,7 @@ SELECT "pilot"."id"
 FROM (
 	SELECT CAST(NULL AS TIMESTAMP) AS "created at", CAST(NULL AS TIMESTAMP) AS "modified at", CAST(? AS INTEGER) AS "id", CAST(NULL AS INTEGER) AS "person", CAST(NULL AS INTEGER) AS "is experienced", CAST(NULL AS VARCHAR(255)) AS "name", CAST(NULL AS INTEGER) AS "age", CAST(NULL AS INTEGER) AS "favourite colour", CAST(NULL AS INTEGER) AS "is on-team", CAST(NULL AS INTEGER) AS "licence", CAST(NULL AS TIMESTAMP) AS "hire date", CAST(NULL AS INTEGER) AS "was trained by-pilot"
 ) AS "pilot"
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 			);
 			sqlEquals(
 				result[1].query,
@@ -176,7 +176,7 @@ SET "created at" = DEFAULT,
 	"licence" = DEFAULT,
 	"hire date" = DEFAULT,
 	"was trained by-pilot" = DEFAULT
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 			);
 		});
 	},
@@ -219,7 +219,7 @@ INSERT INTO "pilot" DEFAULT VALUES`,
 				`\
 UPDATE "pilot"
 SET "is experienced" = ?
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 			);
 		});
 	};
@@ -237,7 +237,7 @@ test(
 				result.query,
 				`\
 DELETE FROM "pilot-can fly-plane"
-WHERE "pilot-can fly-plane"."id" = ?`,
+WHERE ("pilot-can fly-plane"."id") IS NOT NULL AND ("pilot-can fly-plane"."id") = (?)`,
 			);
 		});
 	},
@@ -266,7 +266,7 @@ SELECT "pilot-can fly-plane"."id"
 FROM (
 	SELECT CAST(NULL AS TIMESTAMP) AS "created at", CAST(NULL AS TIMESTAMP) AS "modified at", CAST(NULL AS INTEGER) AS "pilot", CAST(NULL AS INTEGER) AS "can fly-plane", CAST(? AS INTEGER) AS "id"
 ) AS "pilot-can fly-plane"
-WHERE "pilot-can fly-plane"."id" = ?`,
+WHERE ("pilot-can fly-plane"."id") IS NOT NULL AND ("pilot-can fly-plane"."id") = (?)`,
 			);
 			sqlEquals(
 				result[1].query,
@@ -277,7 +277,7 @@ SET "created at" = DEFAULT,
 	"pilot" = DEFAULT,
 	"can fly-plane" = DEFAULT,
 	"id" = ?
-WHERE "pilot-can fly-plane"."id" = ?`,
+WHERE ("pilot-can fly-plane"."id") IS NOT NULL AND ("pilot-can fly-plane"."id") = (?)`,
 			);
 		});
 	},
@@ -323,7 +323,7 @@ INSERT INTO "pilot-can fly-plane" DEFAULT VALUES`,
 				`\
 UPDATE "pilot-can fly-plane"
 SET "pilot" = ?
-WHERE "pilot-can fly-plane"."id" = ?`,
+WHERE ("pilot-can fly-plane"."id") IS NOT NULL AND ("pilot-can fly-plane"."id") = (?)`,
 			);
 		});
 	};
@@ -338,7 +338,7 @@ test('/pilot(1)/$links/licence', 'GET', [['Bind', 0]], (result, sqlEquals) => {
 			`\
 SELECT "pilot"."licence" AS "licence"
 FROM "pilot"
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 		);
 	});
 });
@@ -356,7 +356,7 @@ SELECT "pilot.pilot-can fly-plane"."can fly-plane" AS "plane"
 FROM "pilot",
 	"pilot-can fly-plane" AS "pilot.pilot-can fly-plane"
 WHERE "pilot"."id" = "pilot.pilot-can fly-plane"."pilot"
-AND "pilot"."id" = ?`,
+AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 			);
 		});
 	},
@@ -377,7 +377,7 @@ test("/team('purple')", 'GET', [['Bind', 0]], (result, sqlEquals) => {
 			`\
 SELECT ${teamFieldsStr}
 FROM "team"
-WHERE "team"."favourite colour" = ?`,
+WHERE ("team"."favourite colour") IS NOT NULL AND ("team"."favourite colour") = (?)`,
 		);
 	});
 });
@@ -459,7 +459,8 @@ test(
 				`\
 SELECT COUNT(*) AS "$count"
 FROM "pilot"
-WHERE "pilot"."id" IN (?, ?)`,
+WHERE (("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
+OR ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?))`,
 			);
 		});
 	},
@@ -476,7 +477,7 @@ test(
 				`\
 SELECT COUNT(*) AS "$count"
 FROM "pilot"
-WHERE ("pilot"."id" = ?
+WHERE (("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
 OR "pilot"."id" IS NULL)`,
 			);
 		});
@@ -492,7 +493,7 @@ SELECT COUNT(*) AS "$count"
 FROM "pilot",
 	"licence" AS "pilot.licence"
 WHERE "pilot"."licence" = "pilot.licence"."id"
-AND "pilot"."id" = ?`,
+AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 		);
 	});
 });

package/test/odata/select.js

@@ -35,7 +35,7 @@ test(
 				`\
 SELECT "pilot"."favourite colour" AS "favourite_colour"
 FROM "pilot"
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 			);
 		});
 	},
@@ -52,7 +52,7 @@ test(
 				`\
 SELECT "pilot"."favourite colour" AS "favourite_colour"
 FROM "pilot"
-WHERE "pilot"."id" = ?`,
+WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)`,
 			);
 		});
 	},

package/test/odata/stress.js

@@ -4,7 +4,16 @@ const { pilotFields } = require('./fields');
 const pilotFieldsStr = pilotFields.join(', ');
 
 const filterIDs = _.range(1, 5000);
-const filterBindsString = _.map(filterIDs, _.constant('?')).join(', ');
+const filterBindsInString = _.map(filterIDs, () => '?').join(', ');
+const filterBindsOrString = _.map(
+	filterIDs,
+	() => '("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)',
+).join('\nOR ');
+const filterBindsNandString = _.map(
+	filterIDs,
+	() => 'NOT(("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?))',
+).join('\nAND ');
+
 const filterBinds = _.map(filterIDs, (_n, i) => ['Bind', i]);
 
 let filterString = `id in (${filterIDs.join(', ')})`;
@@ -20,7 +29,7 @@ test(
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE "pilot"."id" IN (` +
-					filterBindsString +
+					filterBindsInString +
 					')',
 			);
 		});
@@ -40,7 +49,7 @@ test(
 SELECT ${pilotFieldsStr}
 FROM "pilot"
 WHERE "pilot"."id" NOT IN (` +
-					filterBindsString +
+					filterBindsInString +
 					')',
 			);
 		});
@@ -59,9 +68,7 @@ test(
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE "pilot"."id" IN (` +
-					filterBindsString +
-					')',
+WHERE (${filterBindsOrString})`,
 			);
 		});
 	},
@@ -79,9 +86,7 @@ test(
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE "pilot"."id" NOT IN (` +
-					filterBindsString +
-					')',
+WHERE ${filterBindsNandString}`,
 			);
 		});
 	},

package/test/odata/test.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const ODataParser = require('@balena/odata-parser');
-const { OData2AbstractSQL } = require('@resin/odata-to-abstract-sql');
+const { OData2AbstractSQL } = require('@balena/odata-to-abstract-sql');
 const sbvrModel = fs.readFileSync(require.resolve('../model.sbvr'), 'utf8');
 
 const AbstractSQLCompiler = require('../..');