@balena/abstract-sql-compiler 11.0.0-build-11-x-db9cd30f6ec498e5293df9e060f5531cd960b1cc-1 → 11.0.0-build-11-x-1d6801364e84c467215b1a2bd54345172071bdc2-1

package/src/{AbstractSQLSchemaOptimiser.ts → abstract-sql-schema-optimizer.ts}

@@ -4,18 +4,17 @@ export const enum Engines {
 	websql = 'websql',
 }
 
-import { AbstractSQLOptimiser } from './AbstractSQLOptimiser.js';
-export { Binding, SqlResult } from './AbstractSQLRules2SQL.js';
+import { AbstractSQLOptimizer } from './abstract-sql-optimizer.js';
+export { Binding, SqlResult } from './abstract-sql-rules-to-sql.js';
 import $sbvrTypes from '@balena/sbvr-types';
 const { default: sbvrTypes } = $sbvrTypes;
 import type {
 	AbstractSqlModel,
-	AbstractSqlQuery,
 	AbstractSqlType,
 	BooleanTypeNodes,
 	WhereNode,
-} from './AbstractSQLCompiler.js';
-import { isFromNode, isSelectQueryNode } from './AbstractSQLCompiler.js';
+} from './abstract-sql-compiler.js';
+import { isFromNode, isSelectQueryNode } from './abstract-sql-compiler.js';
 
 const countFroms = (n: AbstractSqlType[]) => {
 	let count = 0;
@@ -44,26 +43,19 @@ export const generateRuleSlug = (
 
 export const optimizeSchema = (
 	abstractSqlModel: AbstractSqlModel,
-	createCheckConstraints = true,
+	{ createCheckConstraints = true } = {},
 ): AbstractSqlModel => {
 	abstractSqlModel.rules = abstractSqlModel.rules
-		.map((rule): AbstractSqlQuery | undefined => {
-			const ruleBodyNode = rule.find((r) => r[0] === 'Body') as [
-				'Body',
-				AbstractSqlQuery,
-			];
-			if (ruleBodyNode == null || typeof ruleBodyNode === 'string') {
+		.map((rule) => {
+			const [, ruleBodyNode, ruleSENode] = rule;
+			if (ruleBodyNode == null || ruleBodyNode[0] !== 'Body') {
 				throw new Error('Invalid rule');
 			}
 			let ruleBody = ruleBodyNode[1];
 			if (typeof ruleBody === 'string') {
 				throw new Error('Invalid rule');
 			}
-			const ruleSENode = rule.find((r) => r[0] === 'StructuredEnglish') as [
-				'StructuredEnglish',
-				string,
-			];
-			if (ruleSENode == null) {
+			if (ruleSENode == null || ruleSENode[0] !== 'StructuredEnglish') {
 				throw new Error('Invalid structured English');
 			}
 			const ruleSE = ruleSENode[1];
@@ -72,7 +64,7 @@ export const optimizeSchema = (
 			}
 
 			// Optimize the rule body, this also normalizes it making the check constraint check easier
-			ruleBodyNode[1] = ruleBody = AbstractSQLOptimiser(ruleBody, true);
+			ruleBodyNode[1] = ruleBody = AbstractSQLOptimizer(ruleBody, true);
 
 			const count = countFroms(ruleBody);
 			if (

package/src/referenced-fields.ts

@@ -48,7 +48,7 @@ import type {
 	ToJSONNode,
 	UnionQueryNode,
 	WhereNode,
-} from './AbstractSQLCompiler.js';
+} from './abstract-sql-compiler.js';
 import {
 	isAliasNode,
 	isFromNode,
@@ -56,9 +56,9 @@ import {
 	isSelectQueryNode,
 	isTableNode,
 	isWhereNode,
-} from './AbstractSQLCompiler.js';
-import { AbstractSQLOptimiser } from './AbstractSQLOptimiser.js';
-import { isAbstractSqlQuery } from './AbstractSQLRules2SQL.js';
+} from './abstract-sql-compiler.js';
+import { AbstractSQLOptimizer } from './abstract-sql-optimizer.js';
+import { isAbstractSqlQuery } from './abstract-sql-rules-to-sql.js';
 
 export interface ReferencedFields {
 	[alias: string]: string[];
@@ -266,7 +266,7 @@ const $getRuleReferencedFields = (
 };
 export const getRuleReferencedFields: EngineInstance['getRuleReferencedFields'] =
 	(ruleBody) => {
-		ruleBody = AbstractSQLOptimiser(ruleBody);
+		ruleBody = AbstractSQLOptimizer(ruleBody);
 		const referencedFields: RuleReferencedFields = {};
 		if (
 			ruleBody[0] === 'Equals' &&

package/test/abstract-sql/case-when-else.ts

@@ -1,7 +1,7 @@
 import type {
 	CaseNode,
 	SelectQueryNode,
-} from '../../out/AbstractSQLCompiler.js';
+} from '../../out/abstract-sql-compiler.js';
 import test from './test.js';
 
 const buildSelect = (withElse: boolean): SelectQueryNode => {

package/test/abstract-sql/dates.ts

@@ -127,6 +127,29 @@ describe('DateTrunc', () => {
 			});
 		},
 	);
+
+	test(
+		[
+			'SelectQuery',
+			[
+				'Select',
+				[
+					[
+						'DateTrunc',
+						['EmbeddedText', 'year'],
+						['Date', '2022-10-10'],
+						['EmbeddedText', 'UTC'],
+					],
+				],
+			],
+		],
+		[['Date', '2022-10-10']],
+		(result, sqlEquals) => {
+			it('should produce a valid DateTrunc statement', () => {
+				sqlEquals(result, `SELECT DATE_TRUNC('year', $1, 'UTC')`);
+			});
+		},
+	);
 });
 
 describe('ToTime', () => {

package/test/abstract-sql/empty-query-optimisations.ts

@@ -1,5 +1,5 @@
 import { stripIndent } from 'common-tags';
-import type { SelectQueryNode } from '../../out/AbstractSQLCompiler.js';
+import type { SelectQueryNode } from '../../out/abstract-sql-compiler.js';
 
 import test from './test.js';
 

package/test/abstract-sql/get-referenced-fields.ts

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import * as AbstractSqlCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSqlCompiler from '../../out/abstract-sql-compiler.js';
 
 describe('getReferencedFields', () => {
 	it('should work with selected fields', () => {

package/test/abstract-sql/get-rule-referenced-fields.ts

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import * as AbstractSqlCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSqlCompiler from '../../out/abstract-sql-compiler.js';
 
 describe('getRuleReferencedFields', () => {
 	it('should work with single table NOT EXISTS', () => {

package/test/abstract-sql/schema-checks.ts

@@ -1,4 +1,4 @@
-import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSQLCompiler from '../../out/abstract-sql-compiler.js';
 import { expect } from 'chai';
 
 it('an empty abstractSql model should produce an empty schema', () => {

package/test/abstract-sql/schema-informative-reference.ts

@@ -1,4 +1,4 @@
-import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSQLCompiler from '../../out/abstract-sql-compiler.js';
 import { expect } from 'chai';
 
 describe('generate informative reference schema', () => {
@@ -81,14 +81,14 @@ describe('generate informative reference schema', () => {
 			.that.deep.equals([
 				`\
 CREATE TABLE IF NOT EXISTS "term" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				`\
 CREATE TABLE IF NOT EXISTS "term history" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"references-term" INTEGER NOT NULL
 );`,
@@ -210,20 +210,20 @@ CREATE TABLE IF NOT EXISTS "term history" (
 			.that.deep.equals([
 				`\
 CREATE TABLE IF NOT EXISTS "term" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				`\
 CREATE TABLE IF NOT EXISTS "termterm" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				`\
 CREATE TABLE IF NOT EXISTS "term history" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"references-term" INTEGER NOT NULL
 ,	"references-termterm" INTEGER NOT NULL
@@ -310,14 +310,14 @@ CREATE TABLE IF NOT EXISTS "term history" (
 			.that.deep.equals([
 				`\
 CREATE TABLE IF NOT EXISTS "term" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				`\
 CREATE TABLE IF NOT EXISTS "term history" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"references-term" INTEGER NOT NULL
 ,	FOREIGN KEY ("references-term") REFERENCES "term" ("id")
@@ -403,14 +403,14 @@ CREATE TABLE IF NOT EXISTS "term history" (
 			.that.deep.equals([
 				`\
 CREATE TABLE IF NOT EXISTS "term" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				`\
 CREATE TABLE IF NOT EXISTS "term history" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"references-term" INTEGER NOT NULL
 ,	FOREIGN KEY ("references-term") REFERENCES "term" ("id")

package/test/abstract-sql/schema-rule-optimization.ts

@@ -1,4 +1,4 @@
-import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSQLCompiler from '../../out/abstract-sql-compiler.js';
 import { expect } from 'chai';
 
 const generateSchema = (
@@ -70,7 +70,7 @@ it('should convert a basic rule to a check', () => {
 								],
 							],
 						],
-					] as AbstractSQLCompiler.AbstractSqlQuery,
+					],
 					['StructuredEnglish', 'Test rule abstract sql optimization'],
 				],
 			],

package/test/abstract-sql/schema-rule-to-check.ts

@@ -1,4 +1,4 @@
-import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSQLCompiler from '../../out/abstract-sql-compiler.js';
 import { expect } from 'chai';
 
 const generateSchema = (
@@ -60,7 +60,7 @@ it('should convert a basic rule to a check using NOT EXISTS', () => {
 								],
 							],
 						],
-					] as AbstractSQLCompiler.AbstractSqlQuery,
+					],
 					[
 						'StructuredEnglish',
 						'It is necessary that each test has an id that is greater than 0.',
@@ -132,7 +132,7 @@ it('should convert a basic rule to a check using COUNT(*) = 0', () => {
 							],
 							['Number', 0],
 						],
-					] as AbstractSQLCompiler.AbstractSqlQuery,
+					],
 					[
 						'StructuredEnglish',
 						'It is necessary that each test has an id that is greater than 0.',
@@ -224,7 +224,7 @@ it('should correctly shorten a converted check rule with a long name', () => {
 								],
 							],
 						],
-					] as AbstractSQLCompiler.AbstractSqlQuery,
+					],
 					[
 						'StructuredEnglish',
 						'It is necessary that each test_table_with_very_very_long_name has an id that is greater than 0.',
@@ -298,7 +298,7 @@ it('should work with differing table/resource names using NOT EXISTS', () => {
 								],
 							],
 						],
-					] as AbstractSQLCompiler.AbstractSqlQuery,
+					],
 					[
 						'StructuredEnglish',
 						'It is necessary that each test has an id that is greater than 0.',
@@ -370,7 +370,7 @@ it('should work with differing table/resource names using COUNT(*) = 0', () => {
 							],
 							['Number', 0],
 						],
-					] as AbstractSQLCompiler.AbstractSqlQuery,
+					],
 					[
 						'StructuredEnglish',
 						'It is necessary that each test has an id that is greater than 0.',

package/test/abstract-sql/schema-views.ts

@@ -1,4 +1,4 @@
-import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSQLCompiler from '../../out/abstract-sql-compiler.js';
 import { expect } from 'chai';
 
 it('a table with a static definition should not produce a view', () => {

package/test/abstract-sql/test.ts

@@ -1,4 +1,4 @@
-import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSQLCompiler from '../../out/abstract-sql-compiler.js';
 
 import { expect } from 'chai';
 import _ from 'lodash';

package/test/odata/filterby.ts

@@ -17,7 +17,7 @@ import type {
 	Binding,
 	DurationNode,
 	SqlResult,
-} from '../../out/AbstractSQLCompiler.js';
+} from '../../out/abstract-sql-compiler.js';
 
 const pilotFieldsStr = pilotFields.join(', ');
 const aliasPilotCanFlyPlaneFieldsStr = aliasPilotCanFlyPlaneFields.join(', ');
@@ -318,25 +318,25 @@ const createMethodCall = function (method: string, ...args: Operand[]) {
 		case 'HOUR':
 		case 'MINUTE':
 			return {
-				sql: `EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}))`,
+				sql: `EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}, 'UTC'))`,
 				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		case 'SECOND':
 			return {
-				sql: `FLOOR(EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql})))`,
+				sql: `FLOOR(EXTRACT('${method}' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}, 'UTC')))`,
 				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		case 'FRACTIONALSECONDS':
 			return {
-				sql: `EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql})) - FLOOR(EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql})))`,
+				sql: `EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}, 'UTC')) - FLOOR(EXTRACT('SECOND' FROM DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}, 'UTC')))`,
 				bindings: parsedArgs[0].bindings,
 				odata,
 			};
 		case 'TIME':
 			return {
-				sql: `CAST(DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}) AS ${method})`,
+				sql: `CAST(DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}, 'UTC') AS ${method})`,
 				bindings: parsedArgs[0].bindings,
 				odata,
 			};
@@ -348,7 +348,7 @@ const createMethodCall = function (method: string, ...args: Operand[]) {
 			};
 		case 'DATE':
 			return {
-				sql: `DATE(DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}))`,
+				sql: `DATE(DATE_TRUNC('milliseconds', ${parsedArgs[0].sql}, 'UTC'))`,
 				bindings: parsedArgs[0].bindings,
 				odata,
 			};
@@ -637,7 +637,7 @@ run(function () {
 INSERT INTO "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 BOOLEAN) 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"
+	SELECT CAST(NULL AS TIMESTAMPTZ) AS "created at", CAST(NULL AS TIMESTAMPTZ) AS "modified at", CAST(NULL AS INTEGER) AS "id", CAST(NULL AS INTEGER) AS "person", CAST(NULL AS BOOLEAN) 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 TIMESTAMPTZ) AS "hire date", CAST(NULL AS INTEGER) AS "was trained by-pilot"
 ) AS "$insert"
 WHERE EXISTS (
 	SELECT 1
@@ -778,7 +778,7 @@ run(function () {
 INSERT INTO "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 BOOLEAN) 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"
+	SELECT CAST(NULL AS TIMESTAMPTZ) AS "created at", CAST(NULL AS TIMESTAMPTZ) AS "modified at", CAST(NULL AS INTEGER) AS "id", CAST(NULL AS INTEGER) AS "person", CAST(NULL AS BOOLEAN) 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 TIMESTAMPTZ) AS "hire date", CAST(NULL AS INTEGER) AS "was trained by-pilot"
 ) AS "$insert"
 WHERE EXISTS (
 	SELECT 1
@@ -853,7 +853,7 @@ AND "pilot"."id" IN ((
 INSERT INTO "pilot" ("id", "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 BOOLEAN) 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"
+	SELECT CAST(NULL AS TIMESTAMPTZ) AS "created at", CAST(NULL AS TIMESTAMPTZ) AS "modified at", CAST(? AS INTEGER) AS "id", CAST(NULL AS INTEGER) AS "person", CAST(NULL AS BOOLEAN) 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 TIMESTAMPTZ) AS "hire date", CAST(NULL AS INTEGER) AS "was trained by-pilot"
 ) AS "$insert"
 WHERE EXISTS (
 	SELECT 1
@@ -1420,7 +1420,7 @@ run(function () {
 INSERT INTO "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"
+	SELECT CAST(NULL AS TIMESTAMPTZ) AS "created at", CAST(NULL AS TIMESTAMPTZ) AS "modified at", CAST(? AS INTEGER) AS "favourite colour"
 ) AS "$insert"
 WHERE EXISTS (
 	SELECT 1
@@ -1466,7 +1466,7 @@ run(function () {
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE CURRENT_TIMESTAMP - DATE_TRUNC('milliseconds', "pilot"."created at") < INTERVAL '1 0:0:0.0'`,
+WHERE CURRENT_TIMESTAMP - DATE_TRUNC('milliseconds', "pilot"."created at", 'UTC') < INTERVAL '1 0:0:0.0'`,
 			);
 		});
 	});
@@ -1495,7 +1495,7 @@ run(function () {
 				`\
 SELECT ${pilotFieldsStr}
 FROM "pilot"
-WHERE DATE_TRUNC('milliseconds', "pilot"."created at") + INTERVAL '1 0:0:0.0' > CURRENT_TIMESTAMP`,
+WHERE DATE_TRUNC('milliseconds', "pilot"."created at", 'UTC') + INTERVAL '1 0:0:0.0' > CURRENT_TIMESTAMP`,
 			);
 		});
 	});

package/test/odata/{resource_parsing.ts → resource-parsing.ts}

@@ -10,7 +10,7 @@ import {
 	aliasPilotLicenceFields,
 	aliasLicenceFields,
 } from './fields.js';
-import type { SqlResult } from '../../out/AbstractSQLCompiler.js';
+import type { SqlResult } from '../../out/abstract-sql-compiler.js';
 const aliasPilotFields = aliasFields(
 	'plane.pilot-can fly-plane.pilot',
 	pilotFields,
@@ -158,7 +158,7 @@ test(
 INSERT INTO "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 BOOLEAN) 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"
+	SELECT CAST(NULL AS TIMESTAMPTZ) AS "created at", CAST(NULL AS TIMESTAMPTZ) AS "modified at", CAST(? AS INTEGER) AS "id", CAST(NULL AS INTEGER) AS "person", CAST(NULL AS BOOLEAN) 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 TIMESTAMPTZ) AS "hire date", CAST(NULL AS INTEGER) AS "was trained by-pilot"
 ) AS "$insert"
 WHERE EXISTS (
 	SELECT 1
@@ -272,7 +272,7 @@ test(
 INSERT INTO "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"
+	SELECT CAST(NULL AS TIMESTAMPTZ) AS "created at", CAST(NULL AS TIMESTAMPTZ) AS "modified at", CAST(NULL AS INTEGER) AS "pilot", CAST(NULL AS INTEGER) AS "can fly-plane", CAST(? AS INTEGER) AS "id"
 ) AS "$insert"
 WHERE EXISTS (
 	SELECT 1

package/test/odata/test.ts

@@ -17,7 +17,7 @@ const typeVocab = await fs.promises.readFile(
 	'utf8',
 );
 
-import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSQLCompiler from '../../out/abstract-sql-compiler.js';
 
 import { expect } from 'chai';
 import _ from 'lodash';

package/test/sbvr/pilots.ts

@@ -73,38 +73,38 @@ END;
 $$;`,
 			`\
 CREATE TABLE IF NOT EXISTS "person" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 			modifiedAtTrigger('person'),
 			`\
 CREATE TABLE IF NOT EXISTS "plane" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"name" VARCHAR(255) NOT NULL CHECK ("name" IN ('planeA', 'planeB', 'planeC'))
 );`,
 			modifiedAtTrigger('plane'),
 			`\
 CREATE TABLE IF NOT EXISTS "veteran pilot" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 			modifiedAtTrigger('veteran pilot'),
 			`\
 CREATE TABLE IF NOT EXISTS "licence" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"was granted by-pilot" INTEGER NOT NULL
 );`,
 			modifiedAtTrigger('licence'),
 			`\
 CREATE TABLE IF NOT EXISTS "pilot" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"person" INTEGER NOT NULL
 ,	"name" VARCHAR(255) NOT NULL
@@ -117,8 +117,8 @@ CREATE TABLE IF NOT EXISTS "pilot" (
 			modifiedAtTrigger('pilot'),
 			`\
 CREATE TABLE IF NOT EXISTS "pilot-can fly-plane" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"pilot" INTEGER NOT NULL
 ,	"can fly-plane" INTEGER NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY

package/test/sbvr/reference-type.ts

@@ -58,15 +58,15 @@ $$;`,
 
 				`\
 CREATE TABLE IF NOT EXISTS "term" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				modifiedAtTrigger('term'),
 				`\
 CREATE TABLE IF NOT EXISTS "term history" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"references-term" INTEGER NOT NULL
 );`,
@@ -103,15 +103,15 @@ $$;`,
 
 				`\
 CREATE TABLE IF NOT EXISTS "term" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				modifiedAtTrigger('term'),
 				`\
 CREATE TABLE IF NOT EXISTS "term history" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"references-term" INTEGER NOT NULL
 );`,
@@ -147,15 +147,15 @@ $$;`,
 
 				`\
 CREATE TABLE IF NOT EXISTS "term" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				modifiedAtTrigger('term'),
 				`\
 CREATE TABLE IF NOT EXISTS "term history" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"references-term" INTEGER NOT NULL
 ,	FOREIGN KEY ("references-term") REFERENCES "term" ("id")
@@ -191,15 +191,15 @@ $$;`,
 
 				`\
 CREATE TABLE IF NOT EXISTS "term" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 );`,
 				modifiedAtTrigger('term'),
 				`\
 CREATE TABLE IF NOT EXISTS "term history" (
-	"created at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
-,	"modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+	"created at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
+,	"modified at" TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL
 ,	"id" SERIAL NOT NULL PRIMARY KEY
 ,	"references-term" INTEGER NOT NULL
 ,	FOREIGN KEY ("references-term") REFERENCES "term" ("id")

package/test/sbvr/test.ts

@@ -7,7 +7,7 @@ import { SBVRParser } from '@balena/sbvr-parser';
 import LF2AbstractSQL from '@balena/lf-to-abstract-sql';
 
 import { expect } from 'chai';
-import * as AbstractSQLCompiler from '../../out/AbstractSQLCompiler.js';
+import * as AbstractSQLCompiler from '../../out/abstract-sql-compiler.js';
 
 export function getTestHelpers(builtInVocab: string | boolean = false) {
 	const sbvrParser = SBVRParser.createInstance();

package/tsconfig.json

@@ -8,7 +8,6 @@
 		"noUnusedParameters": true,
 		"noUnusedLocals": true,
 		"preserveConstEnums": true,
-		"removeComments": true,
 		"sourceMap": true,
 		"declaration": true,
 		"skipLibCheck": true,