@balena/abstract-sql-compiler 7.20.3 → 7.20.4

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,17 @@
+- commits:
+    - subject: "CI: Add several abstract-sql unit tests"
+      hash: e0319dd38e6851c5ed3f2b503ecf2ff93d67f0dd
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Josh Bowling <josh@monarci.com>
+        signed-off-by: Josh Bowling <josh@monarci.com>
+      author: Josh Bowling
+      nested: []
+  version: 7.20.4
+  title: ""
+  date: 2022-11-16T03:24:53.502Z
 - commits:
     - subject: Capitalize AggregateJSON SQL
       hash: 73ac2303a5912408c76d21c861891bf3b506a788
@@ -13,7 +27,7 @@
       nested: []
   version: 7.20.3
   title: ""
-  date: 2022-11-15T09:27:24.799Z
+  date: 2022-11-15T11:40:34.177Z
 - commits:
     - subject: "Dev: Disable package-lock.json generation"
       hash: 4d769c1a1d2f4f29ed85c6a31dd5b4dd6bced77d

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.20.4 - 2022-11-16
+
+* CI: Add several abstract-sql unit tests [Josh Bowling]
+
 ## 7.20.3 - 2022-11-15
 
 * Capitalize AggregateJSON SQL [Josh Bowling]

package/out/AbstractSQLCompiler.d.ts

@@ -8,9 +8,9 @@ export { Binding, SqlResult } from './AbstractSQLRules2SQL';
 import * as _ from 'lodash';
 import { ReferencedFields, RuleReferencedFields, ModifiedFields } from './referenced-fields';
 export type { ReferencedFields, RuleReferencedFields, ModifiedFields };
-export declare type NullNode = ['Null'];
-export declare type DateNode = ['Date', Date];
-export declare type DurationNode = [
+export type NullNode = ['Null'];
+export type DateNode = ['Date', Date];
+export type DurationNode = [
     'Duration',
     {
         negative?: boolean;
@@ -20,114 +20,114 @@ export declare type DurationNode = [
         second?: number;
     }
 ];
-export declare type BooleanNode = ['Boolean', boolean];
-export declare type EqualsNode = ['Equals', AbstractSqlType, AbstractSqlType];
-export declare type NotEqualsNode = ['NotEquals', AbstractSqlType, AbstractSqlType];
-export declare type GreaterThanNode = ['GreaterThan', AbstractSqlType, AbstractSqlType];
-export declare type GreaterThanOrEqualNode = [
+export type BooleanNode = ['Boolean', boolean];
+export type EqualsNode = ['Equals', AbstractSqlType, AbstractSqlType];
+export type NotEqualsNode = ['NotEquals', AbstractSqlType, AbstractSqlType];
+export type GreaterThanNode = ['GreaterThan', AbstractSqlType, AbstractSqlType];
+export type GreaterThanOrEqualNode = [
     'GreaterThanOrEqual',
     AbstractSqlType,
     AbstractSqlType
 ];
-export declare type LessThanNode = ['LessThan', AbstractSqlType, AbstractSqlType];
-export declare type LessThanOrEqualNode = [
+export type LessThanNode = ['LessThan', AbstractSqlType, AbstractSqlType];
+export type LessThanOrEqualNode = [
     'LessThanOrEqual',
     AbstractSqlType,
     AbstractSqlType
 ];
-export declare type InNode = [
+export type InNode = [
     'In',
     FieldNode | ReferencedFieldNode,
     AbstractSqlType,
     ...AbstractSqlType[]
 ];
-export declare type NotExistsNode = ['NotExists', AbstractSqlType];
-export declare type ExistsNode = ['Exists', AbstractSqlType];
-export declare type NotNode = ['Not', BooleanTypeNodes];
-export declare type AndNode = ['And', ...BooleanTypeNodes[]];
-export declare type OrNode = ['Or', ...BooleanTypeNodes[]];
-export declare type BooleanTypeNodes = BooleanNode | EqualsNode | NotEqualsNode | GreaterThanNode | GreaterThanOrEqualNode | LessThanNode | LessThanOrEqualNode | InNode | ExistsNode | NotExistsNode | NotNode | AndNode | OrNode | UnknownTypeNodes;
-export declare type NumberNode = ['Number', number];
-export declare type CountNode = ['Count', '*'];
-export declare type AverageNode = ['Average', NumberTypeNodes];
-export declare type SumNode = ['Sum', NumberTypeNodes];
-export declare type NumberTypeNodes = NumberNode | CountNode | AverageNode | SumNode | UnknownTypeNodes;
-export declare type FieldNode = ['Field', string];
-export declare type ReferencedFieldNode = ['ReferencedField', string, string];
-export declare type DateTruncNode = ['DateTrunc', TextTypeNodes, DateTypeNodes];
-export declare type DateTypeNodes = DateNode | DateTruncNode;
-export declare type BindNode = ['Bind', number | string] | ['Bind', string, string];
-export declare type CastNode = ['Cast', AbstractSqlType, string];
-export declare type CoalesceNode = [
+export type NotExistsNode = ['NotExists', AbstractSqlType];
+export type ExistsNode = ['Exists', AbstractSqlType];
+export type NotNode = ['Not', BooleanTypeNodes];
+export type AndNode = ['And', ...BooleanTypeNodes[]];
+export type OrNode = ['Or', ...BooleanTypeNodes[]];
+export type BooleanTypeNodes = BooleanNode | EqualsNode | NotEqualsNode | GreaterThanNode | GreaterThanOrEqualNode | LessThanNode | LessThanOrEqualNode | InNode | ExistsNode | NotExistsNode | NotNode | AndNode | OrNode | UnknownTypeNodes;
+export type NumberNode = ['Number', number];
+export type CountNode = ['Count', '*'];
+export type AverageNode = ['Average', NumberTypeNodes];
+export type SumNode = ['Sum', NumberTypeNodes];
+export type NumberTypeNodes = NumberNode | CountNode | AverageNode | SumNode | UnknownTypeNodes;
+export type FieldNode = ['Field', string];
+export type ReferencedFieldNode = ['ReferencedField', string, string];
+export type DateTruncNode = ['DateTrunc', TextTypeNodes, DateTypeNodes];
+export type DateTypeNodes = DateNode | DateTruncNode;
+export type BindNode = ['Bind', number | string] | ['Bind', string, string];
+export type CastNode = ['Cast', AbstractSqlType, string];
+export type CoalesceNode = [
     'Cast',
     UnknownTypeNodes,
     UnknownTypeNodes,
     ...UnknownTypeNodes[]
 ];
-export declare type UnknownTypeNodes = FieldNode | ReferencedFieldNode | BindNode | CastNode | CoalesceNode | UnknownNode;
-export declare type TextNode = ['Text', string];
-export declare type ConcatenateNode = ['Concatenate', ...TextTypeNodes[]];
-export declare type ConcatenateWithSeparatorNode = [
+export type UnknownTypeNodes = FieldNode | ReferencedFieldNode | BindNode | CastNode | CoalesceNode | UnknownNode;
+export type TextNode = ['Text', string];
+export type ConcatenateNode = ['Concatenate', ...TextTypeNodes[]];
+export type ConcatenateWithSeparatorNode = [
     'ConcatenateWithSeparator',
     TextTypeNodes,
     ...TextTypeNodes[]
 ];
-export declare type LikeNode = ['Like', AbstractSqlType, AbstractSqlType];
-export declare type ReplaceNode = [
+export type LikeNode = ['Like', AbstractSqlType, AbstractSqlType];
+export type ReplaceNode = [
     'Replace',
     TextTypeNodes,
     TextTypeNodes,
     TextTypeNodes
 ];
-export declare type TextTypeNodes = ConcatenateNode | ConcatenateWithSeparatorNode | LikeNode | ReplaceNode | UnknownTypeNodes;
-export declare type SelectQueryNode = [
+export type TextTypeNodes = ConcatenateNode | ConcatenateWithSeparatorNode | LikeNode | ReplaceNode | UnknownTypeNodes;
+export type SelectQueryNode = [
     'SelectQuery',
     ...Array<SelectNode | FromNode | InnerJoinNode | LeftJoinNode | RightJoinNode | FullJoinNode | CrossJoinNode | WhereNode | GroupByNode | HavingNode | OrderByNode | LimitNode | OffsetNode>
 ];
-export declare type UnionQueryNode = [
+export type UnionQueryNode = [
     'UnionQuery',
     ...(UnionQueryNode | SelectQueryNode)[]
 ];
-export declare type InsertQueryNode = ['InsertQuery', ...AbstractSqlType[]];
-export declare type UpdateQueryNode = ['UpdateQuery', ...AbstractSqlType[]];
-export declare type DeleteQueryNode = ['DeleteQuery', ...AbstractSqlType[]];
-export declare type UpsertQueryNode = ['UpsertQuery', InsertQueryNode, UpdateQueryNode];
+export type InsertQueryNode = ['InsertQuery', ...AbstractSqlType[]];
+export type UpdateQueryNode = ['UpdateQuery', ...AbstractSqlType[]];
+export type DeleteQueryNode = ['DeleteQuery', ...AbstractSqlType[]];
+export type UpsertQueryNode = ['UpsertQuery', InsertQueryNode, UpdateQueryNode];
 export interface FromTypeNode {
     SelectQueryNode: SelectQueryNode;
     UnionQueryNode: UnionQueryNode;
     TableNode: TableNode;
     ResourceNode: ResourceNode;
 }
-export declare type ResourceNode = ['Resource', string];
-export declare type FromTypeNodes = FromTypeNode[keyof FromTypeNode] | AliasNode<FromTypeNode[keyof FromTypeNode]>;
-declare type AliasableFromTypeNodes = FromTypeNodes | AliasNode<FromTypeNodes>;
-export declare type SelectNode = ['Select', AbstractSqlType[]];
-export declare type FromNode = ['From', AliasableFromTypeNodes];
-export declare type InnerJoinNode = ['Join', AliasableFromTypeNodes, OnNode?];
-export declare type LeftJoinNode = ['LeftJoin', AliasableFromTypeNodes, OnNode?];
-export declare type RightJoinNode = ['RightJoin', AliasableFromTypeNodes, OnNode?];
-export declare type FullJoinNode = ['FullJoin', AliasableFromTypeNodes, OnNode?];
-export declare type CrossJoinNode = ['CrossJoin', AliasableFromTypeNodes];
-export declare type OnNode = ['On', BooleanTypeNodes];
-export declare type TableNode = ['Table', string];
-export declare type WhereNode = ['Where', BooleanTypeNodes];
-export declare type GroupByNode = ['GroupBy', Array<FieldNode | ReferencedFieldNode>];
-export declare type HavingNode = ['Having', BooleanTypeNodes];
-export declare type OrderByNode = [
+export type ResourceNode = ['Resource', string];
+export type FromTypeNodes = FromTypeNode[keyof FromTypeNode] | AliasNode<FromTypeNode[keyof FromTypeNode]>;
+type AliasableFromTypeNodes = FromTypeNodes | AliasNode<FromTypeNodes>;
+export type SelectNode = ['Select', AbstractSqlType[]];
+export type FromNode = ['From', AliasableFromTypeNodes];
+export type InnerJoinNode = ['Join', AliasableFromTypeNodes, OnNode?];
+export type LeftJoinNode = ['LeftJoin', AliasableFromTypeNodes, OnNode?];
+export type RightJoinNode = ['RightJoin', AliasableFromTypeNodes, OnNode?];
+export type FullJoinNode = ['FullJoin', AliasableFromTypeNodes, OnNode?];
+export type CrossJoinNode = ['CrossJoin', AliasableFromTypeNodes];
+export type OnNode = ['On', BooleanTypeNodes];
+export type TableNode = ['Table', string];
+export type WhereNode = ['Where', BooleanTypeNodes];
+export type GroupByNode = ['GroupBy', Array<FieldNode | ReferencedFieldNode>];
+export type HavingNode = ['Having', BooleanTypeNodes];
+export type OrderByNode = [
     'OrderBy',
     ...Array<['ASC' | 'DESC', FieldNode | ReferencedFieldNode]>
 ];
-export declare type LimitNode = ['Limit', NumberTypeNodes];
-export declare type OffsetNode = ['Offset', NumberTypeNodes];
-export declare type FieldsNode = ['Fields', string[]];
-export declare type ValuesNode = [
+export type LimitNode = ['Limit', NumberTypeNodes];
+export type OffsetNode = ['Offset', NumberTypeNodes];
+export type FieldsNode = ['Fields', string[]];
+export type ValuesNode = [
     'Values',
     SelectQueryNode | UnionQueryNode | ValuesNodeTypes[]
 ];
-export declare type ValuesNodeTypes = 'Default' | NullNode | BindNode | TextNode | NumberNode;
-export declare type AliasNode<T> = ['Alias', T, string];
-export declare type AbstractSqlType = string | NullNode | DateNode | BooleanTypeNodes | NumberTypeNodes | TextTypeNodes | UnknownTypeNodes | DurationNode | SelectQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode | UpsertQueryNode | SelectNode | ValuesNode | InnerJoinNode | LeftJoinNode | RightJoinNode | FullJoinNode | CrossJoinNode | GroupByNode | HavingNode | UnknownNode;
-export declare type UnknownNode = AbstractSqlQuery;
+export type ValuesNodeTypes = 'Default' | NullNode | BindNode | TextNode | NumberNode;
+export type AliasNode<T> = ['Alias', T, string];
+export type AbstractSqlType = string | NullNode | DateNode | BooleanTypeNodes | NumberTypeNodes | TextTypeNodes | UnknownTypeNodes | DurationNode | SelectQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode | UpsertQueryNode | SelectNode | ValuesNode | InnerJoinNode | LeftJoinNode | RightJoinNode | FullJoinNode | CrossJoinNode | GroupByNode | HavingNode | UnknownNode;
+export type UnknownNode = AbstractSqlQuery;
 export interface AbstractSqlQuery extends Array<AbstractSqlType> {
     0: string;
 }
@@ -184,14 +184,14 @@ export interface SqlRule {
     referencedFields?: ReferencedFields | undefined;
     ruleReferencedFields?: RuleReferencedFields | undefined;
 }
-export declare type RelationshipMapping = [string, [string, string]?];
+export type RelationshipMapping = [string, [string, string]?];
 export interface RelationshipLeafNode {
     $: RelationshipMapping;
 }
 export interface RelationshipInternalNode {
     [resourceName: string]: Relationship;
 }
-export declare type Relationship = RelationshipLeafNode | RelationshipInternalNode;
+export type Relationship = RelationshipLeafNode | RelationshipInternalNode;
 export interface AbstractSqlModel {
     synonyms: {
         [synonym: string]: string;

package/out/AbstractSQLRules2SQL.d.ts

@@ -1,5 +1,5 @@
 import { AbstractSqlQuery, AbstractSqlType, Engines, InsertQueryNode, SelectQueryNode, UnionQueryNode, UpdateQueryNode, DeleteQueryNode, UpsertQueryNode } from './AbstractSQLCompiler';
-export declare type Binding = [string, any] | ['Bind', number | string | [string, string]];
+export type Binding = [string, any] | ['Bind', number | string | [string, string]];
 export interface SqlResult {
     query: string;
     bindings: Binding[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "7.20.3",
+  "version": "7.20.4",
   "description": "A translator for abstract sql into sql.",
   "main": "out/AbstractSQLCompiler.js",
   "types": "out/AbstractSQLCompiler.d.ts",
@@ -63,6 +63,6 @@
     ]
   },
   "versionist": {
-    "publishedAt": "2022-11-15T09:27:25.077Z"
+    "publishedAt": "2022-11-16T03:24:53.788Z"
   }
 }

package/test/abstract-sql/aggregate.ts

@@ -40,3 +40,324 @@ describe('Sum', () => {
 		},
 	);
 });
+
+describe('Add', () => {
+	test(
+		['SelectQuery', ['Select', [['Add', ['Number', 5], ['Number', 3]]]]],
+		(result, sqlEquals) => {
+			it('should produce a valid addition statement', () => {
+				sqlEquals(result.query, 'SELECT 5 + 3');
+			});
+		},
+	);
+});
+
+describe('Subtract', () => {
+	test(
+		['SelectQuery', ['Select', [['Subtract', ['Number', 5], ['Number', 3]]]]],
+		(result, sqlEquals) => {
+			it('should produce a valid subtraction statement', () => {
+				sqlEquals(result.query, 'SELECT 5 - 3');
+			});
+		},
+	);
+});
+
+describe('Multiply', () => {
+	test(
+		['SelectQuery', ['Select', [['Multiply', ['Number', 5], ['Number', 3]]]]],
+		(result, sqlEquals) => {
+			it('should produce a valid multiplication statement', () => {
+				sqlEquals(result.query, 'SELECT 5 * 3');
+			});
+		},
+	);
+});
+
+describe('Divide', () => {
+	test(
+		['SelectQuery', ['Select', [['Divide', ['Number', 10], ['Number', 5]]]]],
+		(result, sqlEquals) => {
+			it('should produce a valid division statement', () => {
+				sqlEquals(result.query, 'SELECT 10 / 5');
+			});
+		},
+	);
+});
+
+describe('Year', () => {
+	test(
+		['SelectQuery', ['Select', [['Year', ['Date', '2022-10-10']]]]],
+		[['Date', '2022-10-10']],
+		(result, sqlEquals) => {
+			it('should produce a valid extract year statement', () => {
+				sqlEquals(result.query, `SELECT EXTRACT('YEAR' FROM $1)`);
+			});
+		},
+	);
+});
+
+describe('Month', () => {
+	test(
+		['SelectQuery', ['Select', [['Month', ['Date', '2022-10-10']]]]],
+		[['Date', '2022-10-10']],
+		(result, sqlEquals) => {
+			it('should produce a valid extract month statement', () => {
+				sqlEquals(result.query, `SELECT EXTRACT('MONTH' FROM $1)`);
+			});
+		},
+	);
+});
+
+describe('Day', () => {
+	test(
+		['SelectQuery', ['Select', [['Day', ['Date', '2022-10-10']]]]],
+		[['Date', '2022-10-10']],
+		(result, sqlEquals) => {
+			it('should produce a valid extract day statement', () => {
+				sqlEquals(result.query, `SELECT EXTRACT('DAY' FROM $1)`);
+			});
+		},
+	);
+});
+
+describe('Hour', () => {
+	test(
+		[
+			'SelectQuery',
+			['Select', [['Hour', ['Date', '2022-10-10T10:10:10.000Z']]]],
+		],
+		[['Date', '2022-10-10T10:10:10.000Z']],
+		(result, sqlEquals) => {
+			it('should produce a valid extract hour statement', () => {
+				sqlEquals(result.query, `SELECT EXTRACT('HOUR' FROM $1)`);
+			});
+		},
+	);
+});
+
+describe('Minute', () => {
+	test(
+		[
+			'SelectQuery',
+			['Select', [['Minute', ['Date', '2022-10-10T10:10:10.000Z']]]],
+		],
+		[['Date', '2022-10-10T10:10:10.000Z']],
+		(result, sqlEquals) => {
+			it('should produce a valid extract minute statement', () => {
+				sqlEquals(result.query, `SELECT EXTRACT('MINUTE' FROM $1)`);
+			});
+		},
+	);
+});
+
+describe('Second', () => {
+	test(
+		[
+			'SelectQuery',
+			['Select', [['Second', ['Date', '2022-10-10T10:10:10.000Z']]]],
+		],
+		[['Date', '2022-10-10T10:10:10.000Z']],
+		(result, sqlEquals) => {
+			it('should produce a valid extract second statement', () => {
+				sqlEquals(result.query, `SELECT FLOOR(EXTRACT('SECOND' FROM $1))`);
+			});
+		},
+	);
+});
+
+describe('Fractionalseconds', () => {
+	test(
+		[
+			'SelectQuery',
+			['Select', [['Fractionalseconds', ['Date', '2022-10-10T10:10:10.000Z']]]],
+		],
+		[['Date', '2022-10-10T10:10:10.000Z']],
+		(result, sqlEquals) => {
+			it('should produce a valid extract fractionalseconds statement', () => {
+				sqlEquals(
+					result.query,
+					`SELECT EXTRACT('SECOND' FROM $1) - FLOOR(EXTRACT('SECOND' FROM $1))`,
+				);
+			});
+		},
+	);
+});
+
+describe('Totalseconds', () => {
+	test(
+		[
+			'SelectQuery',
+			[
+				'Select',
+				[
+					[
+						'Totalseconds',
+						[
+							'Duration',
+							{
+								day: 1,
+							},
+						],
+					],
+				],
+			],
+		],
+		(result, sqlEquals) => {
+			it('should produce a valid interval statement', () => {
+				sqlEquals(
+					result.query,
+					`SELECT EXTRACT(EPOCH FROM INTERVAL '1 0:0:0.0')`,
+				);
+			});
+		},
+	);
+});
+
+describe('Concatenate', () => {
+	test(
+		[
+			'SelectQuery',
+			[
+				'Select',
+				[['Concatenate', ['EmbeddedText', 'foo'], ['EmbeddedText', 'bar']]],
+			],
+		],
+		(result, sqlEquals) => {
+			it('should produce a valid concatenate statement', () => {
+				sqlEquals(result.query, `SELECT ('foo' || 'bar')`);
+			});
+		},
+	);
+});
+
+describe('ConcatenateWithSeparator', () => {
+	test(
+		[
+			'SelectQuery',
+			[
+				'Select',
+				[
+					[
+						'ConcatenateWithSeparator',
+						['EmbeddedText', '|'],
+						['EmbeddedText', 'foo'],
+						['EmbeddedText', 'bar'],
+					],
+				],
+			],
+		],
+		(result, sqlEquals) => {
+			it('should produce a valid concatenate with separator statement', () => {
+				sqlEquals(result.query, `SELECT CONCAT_WS('|', 'foo', 'bar')`);
+			});
+		},
+	);
+});
+
+describe('Replace', () => {
+	test(
+		[
+			'SelectQuery',
+			[
+				'Select',
+				[
+					[
+						'Replace',
+						['EmbeddedText', 'foobar'],
+						['EmbeddedText', 'bar'],
+						['EmbeddedText', 'baz'],
+					],
+				],
+			],
+		],
+		(result, sqlEquals) => {
+			it('should produce a valid replace statement', () => {
+				sqlEquals(result.query, `SELECT REPLACE('foobar', 'bar', 'baz')`);
+			});
+		},
+	);
+});
+
+describe('CharacterLength', () => {
+	test(
+		[
+			'SelectQuery',
+			['Select', [['CharacterLength', ['EmbeddedText', 'foobar']]]],
+		],
+		(result, sqlEquals) => {
+			it('should produce a valid character length statement', () => {
+				sqlEquals(result.query, `SELECT LENGTH('foobar')`);
+			});
+		},
+	);
+});
+
+describe('StrPos', () => {
+	test(
+		[
+			'SelectQuery',
+			[
+				'Select',
+				[['StrPos', ['EmbeddedText', 'foobar'], ['EmbeddedText', 'b']]],
+			],
+		],
+		(result, sqlEquals) => {
+			it('should produce a valid string position statement', () => {
+				sqlEquals(result.query, `SELECT STRPOS('foobar', 'b')`);
+			});
+		},
+	);
+});
+
+describe('Duration', () => {
+	test(
+		[
+			'SelectQuery',
+			[
+				'Select',
+				[
+					[
+						'Duration',
+						{
+							negative: false,
+							day: 1,
+							hour: 2,
+							minute: 3,
+							second: 4,
+						},
+					],
+				],
+			],
+		],
+		(result, sqlEquals) => {
+			it('should produce a valid interval statement', () => {
+				sqlEquals(result.query, `SELECT INTERVAL '1 2:3:4.0'`);
+			});
+		},
+	);
+});
+
+describe('Substring', () => {
+	test(
+		[
+			'SelectQuery',
+			[
+				'Select',
+				[
+					[
+						'Substring',
+						['EmbeddedText', 'foobar'],
+						['Number', 0],
+						['Number', 5],
+					],
+				],
+			],
+		],
+		(result, sqlEquals) => {
+			it('should produce a valid substring statement', () => {
+				sqlEquals(result.query, `SELECT SUBSTRING('foobar', 0, 5)`);
+			});
+		},
+	);
+});