@balena/lf-to-abstract-sql 4.3.0 → 4.4.0

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Support the join optimization for `AND` clauses
+      hash: 968b6755664f48d5d84b8af63597986adbfbbc36
+      body: ''
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Pagan Gazzard
+      nested: []
+  version: 4.4.0
+  date: 2021-12-06T16:58:41.542Z
 - commits:
     - subject: Add an automatic `is of` reverse relationship for concept types
       hash: f84a80730b68b34203bfec29f97e5dac6b464857
@@ -8,7 +19,7 @@
       author: Pagan Gazzard
       nested: []
   version: 4.3.0
-  date: 2021-07-08T10:38:03.633Z
+  date: 2021-07-06T16:36:07.964Z
 - commits:
     - subject: Delete CODEOWNERS
       hash: cb88bffb06f6b1cc21a2df9ef22cfb4886fb0696

package/CHANGELOG.md

@@ -4,7 +4,11 @@ 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/).
 
-## 4.3.0 - 2021-07-08
+## 4.4.0 - 2021-12-06
+
+* Support the join optimization for `AND` clauses [Pagan Gazzard]
+
+## 4.3.0 - 2021-07-06
 
 * Add an automatic `is of` reverse relationship for concept types [Pagan Gazzard]
 

package/lf-to-abstract-sql.js

@@ -1244,17 +1244,29 @@ LF2AbstractSQL.FactTypeFieldName = function(factType) {
     return 2 === factType.length ? factType[1][1] : "has" === factType[1][1] ? factType[2][1] : factType[1][1] + "-" + factType[2][1];
 };
 
+LF2AbstractSQL.JoinOptimization = function(query, whereBody) {
+    if ("And" == whereBody[0]) {
+        for (var i = 1; i < whereBody.length; i++) if (this.JoinOptimization(query, whereBody[i])) {
+            whereBody.splice(i, 1);
+            i--;
+        }
+        if (1 === whereBody.length) return !0;
+    } else if ("Exists" == whereBody[0] && ("SelectQuery" == whereBody[1][0] || "InsertQuery" == whereBody[1][0] || "UpdateQuery" == whereBody[1][0] || "UpsertQuery" == whereBody[1][0])) {
+        whereBody = whereBody[1].slice(1);
+        for (var i = 0; i < whereBody.length; i++) "From" == whereBody[i][0] && query.push(whereBody[i]);
+        for (var i = 0; i < whereBody.length; i++) "Where" == whereBody[i][0] && this.AddWhereClause(query, whereBody[i][1]);
+        return !0;
+    }
+    return !1;
+};
+
 LF2AbstractSQL.AddWhereClause = function(query, whereBody) {
-    if (!_.isEqual(whereBody, [ "Equals", [ "Boolean", !0 ], [ "Boolean", !0 ] ])) if ("Exists" != whereBody[0] || "SelectQuery" != whereBody[1][0] && "InsertQuery" != whereBody[1][0] && "UpdateQuery" != whereBody[1][0] && "UpsertQuery" != whereBody[1][0]) {
+    if (!_.isEqual(whereBody, [ "Equals", [ "Boolean", !0 ], [ "Boolean", !0 ] ])) if (this.JoinOptimization(query, whereBody)) ; else {
         for (var i = 1; i < query.length; i++) if ("Where" == query[i][0]) {
             query[i][1] = [ "And", query[i][1], whereBody ];
             return;
         }
         query.push([ "Where", whereBody ]);
-    } else {
-        whereBody = whereBody[1].slice(1);
-        for (var i = 0; i < whereBody.length; i++) "From" == whereBody[i][0] && query.push(whereBody[i]);
-        for (var i = 0; i < whereBody.length; i++) "Where" == whereBody[i][0] && this.AddWhereClause(query, whereBody[i][1]);
     }
 };
 

package/lf-to-abstract-sql.ometajs

@@ -1015,29 +1015,56 @@ LF2AbstractSQL.FactTypeFieldName = function(factType) {
 	return factType[1][1] + '-' + factType[2][1];
 };
 
-LF2AbstractSQL.AddWhereClause = function(query, whereBody) {
-	// TODO: Move these to optimisation passes?
-	// Check if it's true == true
-	if (_.isEqual(whereBody, ['Equals', ['Boolean', true], ['Boolean', true]])) {
-		return;
-	}
-	// Check if it's a place where we can do a join optimisation.
-	if(whereBody[0] == 'Exists' && (
-			whereBody[1][0] == 'SelectQuery' || whereBody[1][0] == 'InsertQuery' ||
-			whereBody[1][0] == 'UpdateQuery' || whereBody[1][0] == 'UpsertQuery')) {
+LF2AbstractSQL.JoinOptimization = function(query, whereBody) {
+	if (whereBody[0] == 'And') {
+		// If the where clause is an `AND` then check through each branch to see if it can be optimized
+		for (var i = 1; i < whereBody.length; i++) {
+			if (this.JoinOptimization(query, whereBody[i])) {
+				// If we optimized it away then remove it
+				whereBody.splice(i, 1);
+				// And decrement i to recognize that we removed it
+				i--;
+			}
+		}
+		if (whereBody.length === 1) {
+			return true;
+		}
+	} else if (
+		whereBody[0] == 'Exists' &&
+		(whereBody[1][0] == 'SelectQuery' ||
+			whereBody[1][0] == 'InsertQuery' ||
+			whereBody[1][0] == 'UpdateQuery' ||
+			whereBody[1][0] == 'UpsertQuery')
+	) {
+		// If the where clause is an `EXISTS($query)` then it can be optimized into a join for LF
 		whereBody = whereBody[1].slice(1);
-		for(var i=0; i < whereBody.length; i++) {
-			if(whereBody[i][0] == 'From') {
+		for (var i = 0; i < whereBody.length; i++) {
+			if (whereBody[i][0] == 'From') {
 				query.push(whereBody[i]);
 			}
 		}
-		for(var i=0; i < whereBody.length; i++) {
-			if(whereBody[i][0] == 'Where') {
+		for (var i = 0; i < whereBody.length; i++) {
+			if (whereBody[i][0] == 'Where') {
 				this.AddWhereClause(query, whereBody[i][1]);
 			}
 		}
+		return true;
+	}
+	return false;
+}
+
+LF2AbstractSQL.AddWhereClause = function(query, whereBody) {
+	// TODO: Move these to optimisation passes?
+	// Check if it's true == true
+	if (_.isEqual(whereBody, ['Equals', ['Boolean', true], ['Boolean', true]])) {
+		return;
+	}
+	// Check if it's a place where we can do a join optimisation.
+	if (this.JoinOptimization(query, whereBody)) {
+		// We optimized away the entire thing so we don't need to add it at all
 	}
 	else {
+		// Some is left so we add it
 		for(var i=1; i < query.length; i++) {
 			if(query[i][0] == 'Where') {
 				query[i][1] = ['And', query[i][1], whereBody];

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@balena/lf-to-abstract-sql",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "LF to Abstract SQL translator.",
   "main": "index.js",
   "scripts": {
-    "lint": "balena-lint --typescript -e js test index.js",
-    "lint-fix": "balena-lint --typescript --fix -e js test index.js",
+    "lint": "balena-lint -e js test index.js",
+    "lint-fix": "balena-lint --fix -e js test index.js",
     "pretest": "npm run prepare",
     "test": "mocha",
     "posttest": "npm run lint",
@@ -21,10 +21,10 @@
     "ometa-js": "^1.5.4"
   },
   "devDependencies": {
-    "@balena/lint": "^5.4.2",
-    "@balena/sbvr-types": "^3.4.4",
+    "@balena/lint": "^6.2.0",
+    "@balena/sbvr-types": "^3.4.6",
     "chai": "^4.3.4",
-    "mocha": "^8.4.0",
+    "mocha": "^9.1.3",
     "require-npm4-to-publish": "^1.0.0"
   },
   "mocha": {
@@ -35,6 +35,6 @@
     "_": "test/**/*.js"
   },
   "versionist": {
-    "publishedAt": "2021-07-08T10:38:03.698Z"
+    "publishedAt": "2021-12-06T16:58:41.621Z"
   }
 }