@balena/lf-to-abstract-sql 4.5.5 → 4.5.6

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,15 @@
+- commits:
+    - subject: Stop using legacy/deprecated format for table aliases
+      hash: aa18d8cd7733e5250f9dfb2415904e9fc5a0c4b6
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+  version: 4.5.6
+  title: ""
+  date: 2022-11-29T14:16:21.062Z
 - commits:
     - subject: Update @balena/sbvr-parser from 1.4.1 to 1.4.2
       hash: 66473607a0ad66965d6660c94d8941e312282a6c
@@ -11,7 +23,7 @@
       nested: []
   version: 4.5.5
   title: ""
-  date: 2022-11-17T08:47:24.825Z
+  date: 2022-11-17T08:50:36.617Z
 - commits:
     - subject: Add .npmrc
       hash: a2569a1953c937353ec94139a137283d719b9de3

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/).
 
+## 4.5.6 - 2022-11-29
+
+* Stop using legacy/deprecated format for table aliases [Pagan Gazzard]
+
 ## 4.5.5 - 2022-11-17
 
 * Update @balena/sbvr-parser from 1.4.1 to 1.4.2 [Josh Bowling]

package/lf-to-abstract-sql.js

@@ -677,7 +677,7 @@ var OMeta = require("ometa-js/lib/ometajs/core"), SBVRCompilerLibs = require("./
         binds = this._applyWithArgs("RoleBindings", actualFactType);
         tableAlias = this._applyWithArgs("LinkTableAlias", binds, actualFactType);
         linkTable = this._applyWithArgs("GetTable", actualFactType);
-        query = [ "SelectQuery", [ "Select", [] ], [ "From", [ linkTable.name, tableAlias ] ] ];
+        query = [ "SelectQuery", [ "Select", [] ], [ "From", [ "Alias", [ "Table", linkTable.name ], tableAlias ] ] ];
         binds.forEach(function(bind, i) {
             var baseIdentifierName = actualFactType[2 * i][1];
             if (!$elf.GetTable(baseIdentifierName).primitive) {
@@ -1301,7 +1301,7 @@ LF2AbstractSQL.CreateConceptTypesResolver = function(query, identifier, varNum)
         var conceptTable, conceptAlias;
         if (0 === conceptTypeResolutions.length) {
             conceptTypeResolutions.push(identifier.name);
-            query.push([ "From", [ this.GetTable(identifier.name).name, parentAlias ] ]);
+            query.push([ "From", [ "Alias", [ "Table", this.GetTable(identifier.name).name ], parentAlias ] ]);
             this.ResolveLinkTable(parentAlias);
         }
         parentAlias = _.last(conceptTypeResolutions);
@@ -1310,7 +1310,7 @@ LF2AbstractSQL.CreateConceptTypesResolver = function(query, identifier, varNum)
                 conceptAlias = concept[1] + varNum;
                 conceptTable = this.GetTable(concept[1]);
                 if (!1 !== conceptTable.primitive) break;
-                query.push([ "From", [ conceptTable.name, conceptAlias ] ]);
+                query.push([ "From", [ "Alias", [ "Table", conceptTable.name ], conceptAlias ] ]);
                 this.AddWhereClause(query, [ "Equals", [ "ReferencedField", parentAlias, concept[1] ], [ "ReferencedField", conceptAlias, conceptTable.idField ] ]);
                 this.ResolveLinkTable(parentAlias);
                 parentAlias = conceptAlias;

package/lf-to-abstract-sql.ometajs

@@ -554,7 +554,7 @@ export ometa LF2AbstractSQL <: SBVRCompilerLibs {
 		RoleBindings(actualFactType):binds
 		LinkTableAlias(binds, actualFactType):tableAlias
 		GetTable(actualFactType):linkTable
-		{['SelectQuery', ['Select', []], ['From', [linkTable.name, tableAlias]]]}:query
+		{['SelectQuery', ['Select', []], ['From', ['Alias', ['Table', linkTable.name], tableAlias]]]}:query
 		{	binds.forEach(function(bind, i) {
 				var baseIdentifierName = actualFactType[i*2][1],
 					targetTable = $elf.GetTable(baseIdentifierName);
@@ -1112,7 +1112,7 @@ LF2AbstractSQL.CreateConceptTypesResolver = function(query, identifier, varNum)
 		if (conceptTypeResolutions.length === 0) {
 			// Resolve the initial level on first call
 			conceptTypeResolutions.push(identifier.name);
-			query.push(['From', [this.GetTable(identifier.name).name, parentAlias]])
+			query.push(['From', ['Alias', ['Table', this.GetTable(identifier.name).name], parentAlias]])
 			this.ResolveLinkTable(parentAlias);
 		}
 
@@ -1128,7 +1128,7 @@ LF2AbstractSQL.CreateConceptTypesResolver = function(query, identifier, varNum)
 			if(conceptTable.primitive !== false) {
 				break;
 			}
-			query.push(['From', [conceptTable.name, conceptAlias]]);
+			query.push(['From', ['Alias', ['Table', conceptTable.name], conceptAlias]]);
 			this.AddWhereClause(query, ['Equals', ['ReferencedField', parentAlias, concept[1]], ['ReferencedField', conceptAlias, conceptTable.idField]]);
 			this.ResolveLinkTable(parentAlias);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/lf-to-abstract-sql",
-  "version": "4.5.5",
+  "version": "4.5.6",
   "description": "LF to Abstract SQL translator.",
   "main": "index.js",
   "scripts": {
@@ -16,13 +16,13 @@
   "author": "",
   "license": "BSD",
   "dependencies": {
-    "@balena/sbvr-parser": "^1.4.2",
+    "@balena/sbvr-parser": "^1.4.3",
     "lodash": "^4.17.21",
     "ometa-js": "^1.5.4"
   },
   "devDependencies": {
     "@balena/lint": "^6.2.1",
-    "@balena/sbvr-types": "^3.4.8",
+    "@balena/sbvr-types": "^3.4.18",
     "chai": "^4.3.7",
     "mocha": "^10.1.0",
     "require-npm4-to-publish": "^1.0.0"
@@ -35,6 +35,6 @@
     "_": "test/**/*.js"
   },
   "versionist": {
-    "publishedAt": "2022-11-17T08:47:25.024Z"
+    "publishedAt": "2022-11-29T14:16:21.278Z"
   }
 }

package/test/pilots.js

@@ -136,7 +136,7 @@ describe('pilots', function () {
 						[
 							'SelectQuery',
 							['Select', []],
-							['From', ['pilot', 'pilot.0']],
+							['From', ['Alias', ['Table', 'pilot'], 'pilot.0']],
 							[
 								'Where',
 								[
@@ -148,7 +148,11 @@ describe('pilots', function () {
 											['Select', []],
 											[
 												'From',
-												['pilot-can fly-plane', 'pilot.0-can fly-plane.1'],
+												[
+													'Alias',
+													['Table', 'pilot-can fly-plane'],
+													'pilot.0-can fly-plane.1',
+												],
 											],
 											[
 												'Where',

package/test/sbvr-helper.js

@@ -486,7 +486,14 @@ exports.TableSpace = function () {
 				const query = [
 					'SelectQuery',
 					['Select', []],
-					['From', [generateName(termName), termName + '.' + varNum]],
+					[
+						'From',
+						[
+							'Alias',
+							['Table', generateName(termName)],
+							termName + '.' + varNum,
+						],
+					],
 				];
 				let extra = [];
 				if (lf.length === 4) {
@@ -586,7 +593,7 @@ exports.TableSpace = function () {
 					}
 
 					return [
-						['From', [tableName, tableAlias]],
+						['From', ['Alias', ['Table', tableName], tableAlias]],
 						[
 							'Where',
 							['And'].concat(
@@ -711,8 +718,8 @@ const stripLinkTable = (sql, tableAliases) =>
 			return false;
 		}
 
-		// Remove [ 'From', [ tableName', tableAlias ] ]
-		if (sqlPart[0] === 'From' && tableAliases.includes(sqlPart[1][1])) {
+		// Remove [ 'From', [ 'Alias', [ 'Table', tableName' ], tableAlias ] ]
+		if (sqlPart[0] === 'From' && tableAliases.includes(sqlPart[1][2])) {
 			return true;
 		}