@balena/abstract-sql-compiler 7.25.1 → 7.25.2

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,15 @@
+- commits:
+    - subject: "Tests: update @balena/odata-to-abstract-sql to 5.8"
+      hash: ade93b12c14a0a9c833845a9feb79f2feb4b6844
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+  version: 7.25.2
+  title: ""
+  date: 2023-01-23T20:28:54.912Z
 - commits:
     - subject: Change AggregateJSON to use `JSON_AGG` instead of
         `ARRAY_TO_JSON`+`ARRAY_AGG`
@@ -15,7 +27,7 @@
       nested: []
   version: 7.25.1
   title: ""
-  date: 2023-01-23T18:20:16.252Z
+  date: 2023-01-23T19:03:56.421Z
 - commits:
     - subject: Add `modifyFields`/`modifyName` to table definition
       hash: 174c07b3923bb41fe50b413829b4268c1b28172e

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.25.2 - 2023-01-23
+
+* Tests: update @balena/odata-to-abstract-sql to 5.8 [Thodoris Greasidis]
+
 ## 7.25.1 - 2023-01-23
 
 * Change AggregateJSON to use `JSON_AGG` instead of `ARRAY_TO_JSON`+`ARRAY_AGG` [Pagan Gazzard]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "description": "A translator for abstract sql into sql.",
   "main": "out/AbstractSQLCompiler.js",
   "types": "out/AbstractSQLCompiler.d.ts",
@@ -23,7 +23,7 @@
     "@balena/lf-to-abstract-sql": "^4.6.0",
     "@balena/lint": "^6.2.1",
     "@balena/odata-parser": "^2.4.2",
-    "@balena/odata-to-abstract-sql": "^5.7.2",
+    "@balena/odata-to-abstract-sql": "^5.8.0",
     "@balena/sbvr-parser": "^1.4.3",
     "@types/chai": "^4.3.4",
     "@types/common-tags": "^1.8.1",
@@ -58,6 +58,6 @@
     ]
   },
   "versionist": {
-    "publishedAt": "2023-01-23T18:20:16.640Z"
+    "publishedAt": "2023-01-23T20:28:55.331Z"
   }
 }

package/test/odata/filterby.js

@@ -623,13 +623,19 @@ run(function () {
 			result.query,
 			`\
 INSERT INTO "pilot" ("name")
-SELECT "pilot"."name"
-FROM "pilot-can fly-plane" AS "pilot.pilot-can fly-plane",
-	"plane" AS "pilot.pilot-can fly-plane.plane",
-	(
+SELECT "$insert"."name"
+FROM (
 	SELECT CAST(NULL AS TIMESTAMP) AS "created at", CAST(NULL AS TIMESTAMP) AS "modified at", CAST(NULL 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"
-${filterWhere.join('\n')}`,
+) 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",
+		(
+		SELECT "$insert".*
+	) AS "pilot"
+	${filterWhere.join('\n\t')}
+)`,
 		);
 	};
 	const updateWhere = `\
@@ -759,11 +765,17 @@ run(function () {
 					result.query,
 					`\
 INSERT INTO "pilot" ("name")
-SELECT "pilot"."name"
+SELECT "$insert"."name"
 FROM (
 	SELECT CAST(NULL AS TIMESTAMP) AS "created at", CAST(NULL AS TIMESTAMP) AS "modified at", CAST(NULL 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}`,
+) AS "$insert"
+WHERE EXISTS (
+	SELECT 1
+	FROM (
+		SELECT "$insert".*
+	) AS "pilot"
+	WHERE ${sql}
+)`,
 				);
 			});
 		},
@@ -824,12 +836,18 @@ AND "pilot"."id" IN ((
 						result[0].query,
 						`\
 INSERT INTO "pilot" ("id", "name")
-SELECT "pilot"."id", "pilot"."name"
+SELECT "$insert"."id", "$insert"."name"
 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") IS NOT NULL AND ("pilot"."id") = (?)`,
+) AS "$insert"
+WHERE EXISTS (
+	SELECT 1
+	FROM (
+		SELECT "$insert".*
+	) AS "pilot"
+	WHERE ${sql}
+	AND ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
+)`,
 					);
 				});
 				it('and updates', () => {
@@ -1398,11 +1416,17 @@ run(function () {
 					result.query,
 					`\
 INSERT INTO "team" ("favourite colour")
-SELECT "team"."favourite colour"
+SELECT "$insert"."favourite colour"
 FROM (
 	SELECT CAST(NULL AS TIMESTAMP) AS "created at", CAST(NULL AS TIMESTAMP) AS "modified at", CAST(? AS INTEGER) AS "favourite colour"
-) AS "team"
-WHERE ` + sql,
+) AS "$insert"
+WHERE EXISTS (
+	SELECT 1
+	FROM (
+		SELECT "$insert".*
+	) AS "team"
+	WHERE ${sql}
+)`,
 				);
 			});
 		},

package/test/odata/resource_parsing.js

@@ -154,11 +154,17 @@ test(
 				result[0].query,
 				`\
 INSERT INTO "pilot" ("id")
-SELECT "pilot"."id"
+SELECT "$insert"."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") IS NOT NULL AND ("pilot"."id") = (?)`,
+) AS "$insert"
+WHERE EXISTS (
+	SELECT 1
+	FROM (
+		SELECT "$insert".*
+	) AS "pilot"
+	WHERE ("pilot"."id") IS NOT NULL AND ("pilot"."id") = (?)
+)`,
 			);
 			sqlEquals(
 				result[1].query,
@@ -262,11 +268,17 @@ test(
 				result[0].query,
 				`\
 INSERT INTO "pilot-can fly-plane" ("id")
-SELECT "pilot-can fly-plane"."id"
+SELECT "$insert"."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") IS NOT NULL AND ("pilot-can fly-plane"."id") = (?)`,
+) AS "$insert"
+WHERE EXISTS (
+	SELECT 1
+	FROM (
+		SELECT "$insert".*
+	) AS "pilot-can fly-plane"
+	WHERE ("pilot-can fly-plane"."id") IS NOT NULL AND ("pilot-can fly-plane"."id") = (?)
+)`,
 			);
 			sqlEquals(
 				result[1].query,