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

package/out/referenced-fields.js

@@ -1,6 +1,6 @@
-import { isAliasNode, isFromNode, isSelectNode, isSelectQueryNode, isTableNode, isWhereNode, } from './AbstractSQLCompiler.js';
-import { AbstractSQLOptimiser } from './AbstractSQLOptimiser.js';
-import { isAbstractSqlQuery } from './AbstractSQLRules2SQL.js';
+import { isAliasNode, isFromNode, isSelectNode, isSelectQueryNode, isTableNode, isWhereNode, } from './abstract-sql-compiler.js';
+import { AbstractSQLOptimizer } from './abstract-sql-optimizer.js';
+import { isAbstractSqlQuery } from './abstract-sql-rules-to-sql.js';
 export const getReferencedFields = (ruleBody) => {
     const referencedFields = getRuleReferencedFields(ruleBody);
     const result = {};
@@ -32,6 +32,9 @@ const getRuleReferencedScope = (rulePart, scope, isSafe) => {
                     scope[alias] = { tableName: from[1], isSafe };
                     break;
                 case 'SelectQuery':
+                    // Ignore SelectQuery in the From as we'll handle any fields it selects
+                    // when we recurse in. With true scope handling however we could prune
+                    // fields that don't affect the end result and avoid false positives
                     scope[alias] = { tableName: '', isSafe };
                     break;
                 default:
@@ -50,6 +53,8 @@ const getRuleReferencedScope = (rulePart, scope, isSafe) => {
 };
 const addReference = (referencedFields, scope, aliasName, fieldName) => {
     const a = scope[aliasName];
+    // The scoped tableName is empty in the case of an aliased from query
+    // and those fields will be covered when we recurse into them
     if (a.tableName !== '') {
         referencedFields[a.tableName] ??= {
             create: [],
@@ -74,6 +79,7 @@ const $getRuleReferencedFields = (referencedFields, rulePart, isSafe, { scope, c
     }
     switch (rulePart[0]) {
         case 'SelectQuery':
+            // Update the current scope before trying to resolve field references
             ({ scope, currentlyScopedAliases } = getRuleReferencedScope(rulePart, scope, isSafe));
             rulePart.forEach((node) => {
                 $getRuleReferencedFields(referencedFields, node, isSafe, {
@@ -96,18 +102,21 @@ const $getRuleReferencedFields = (referencedFields, rulePart, isSafe, { scope, c
                 throw new Error(`Invalid ReferencedField: ${rulePart}`);
             }
             for (const aliasName of Object.keys(scope)) {
+                // We assume any unreferenced field can come from any of the scoped tables
                 addReference(referencedFields, scope, aliasName, fieldName);
             }
             return;
         }
         case 'Not':
         case 'NotExists':
+            // When hitting a `Not` we invert the safety rule
             if (isSafe === IsSafe.Insert) {
                 isSafe = IsSafe.Delete;
             }
             else if (isSafe === IsSafe.Delete) {
                 isSafe = IsSafe.Insert;
             }
+        // eslint-disable-next-line no-fallthrough -- Fallthrough
         case 'Where':
         case 'And':
         case 'Exists':
@@ -121,6 +130,8 @@ const $getRuleReferencedFields = (referencedFields, rulePart, isSafe, { scope, c
         case 'Having':
             scope = { ...scope };
             for (const key of Object.keys(scope)) {
+                // Treat all entries under a `HAVING` as unknown since it can include counts in such a way
+                // that our expectations of safety do not hold
                 scope[key] = { ...scope[key], isSafe: IsSafe.Unknown };
             }
             rulePart.forEach((node) => {
@@ -135,6 +146,7 @@ const $getRuleReferencedFields = (referencedFields, rulePart, isSafe, { scope, c
                 throw new Error('Only COUNT(*) is supported for rule referenced fields');
             }
             for (const aliasName of currentlyScopedAliases) {
+                // We use '' as it means that only operations that affect every field will match against it
                 addReference(referencedFields, scope, aliasName, '');
             }
             return;
@@ -148,7 +160,7 @@ const $getRuleReferencedFields = (referencedFields, rulePart, isSafe, { scope, c
     }
 };
 export const getRuleReferencedFields = (ruleBody) => {
-    ruleBody = AbstractSQLOptimiser(ruleBody);
+    ruleBody = AbstractSQLOptimizer(ruleBody);
     const referencedFields = {};
     if (ruleBody[0] === 'Equals' &&
         ruleBody[2][0] === 'Number' &&
@@ -187,6 +199,7 @@ const checkQuery = (query) => {
         tableName = table[1];
     }
     else if (typeof table === 'string') {
+        // Deprecated: Remove this when we drop implicit tables
         tableName = table;
     }
     else {
@@ -214,15 +227,22 @@ export const getModifiedFields = (abstractSqlQuery) => {
         return checkQuery(abstractSqlQuery);
     }
 };
+// TS requires this to be a funtion declaration
 function assertAbstractSqlIsNotLegacy(abstractSql) {
     if (!isAbstractSqlQuery(abstractSql)) {
         throw new Error('cannot introspect into the string form of AbstractSqlQuery');
     }
 }
+// Find how many times an abstract sql fragment selects from the given table
+// TODO:
+// - Not all abstract sql nodes are supported here yet but hopefully nothing
+//   important is missing atm
+// - Create missing node types
 const countTableSelects = (abstractSql, table) => {
     assertAbstractSqlIsNotLegacy(abstractSql);
     let sum = 0;
     switch (abstractSql[0]) {
+        // Unary nodes
         case 'Alias':
         case 'Any':
         case 'Average':
@@ -242,6 +262,7 @@ const countTableSelects = (abstractSql, table) => {
             assertAbstractSqlIsNotLegacy(unaryOperation[1]);
             return countTableSelects(unaryOperation[1], table);
         }
+        // `COUNT` is an unary function but we only support the `COUNT(*)` form
         case 'Count': {
             const countNode = abstractSql;
             if (countNode[1] !== '*') {
@@ -249,6 +270,7 @@ const countTableSelects = (abstractSql, table) => {
             }
             return 0;
         }
+        // Binary nodes
         case 'AddDateDuration':
         case 'AddDateNumber':
         case 'DateTrunc':
@@ -272,6 +294,7 @@ const countTableSelects = (abstractSql, table) => {
             return (countTableSelects(leftOperand, table) +
                 countTableSelects(rightOperand, table));
         }
+        // Binary nodes with optional `ON` second argument
         case 'FullJoin':
         case 'Join':
         case 'LeftJoin':
@@ -284,6 +307,7 @@ const countTableSelects = (abstractSql, table) => {
             }
             return sum + countTableSelects(joinNode[1], table);
         }
+        // n-ary nodes
         case 'And':
         case 'Or':
         case 'SelectQuery':
@@ -296,6 +320,7 @@ const countTableSelects = (abstractSql, table) => {
             }
             return sum;
         }
+        // n-ary nodes but the slice starts at the third argument
         case 'In':
         case 'NotIn': {
             const inNode = abstractSql;
@@ -305,6 +330,7 @@ const countTableSelects = (abstractSql, table) => {
             }
             return sum;
         }
+        // n-ary-like node
         case 'Select': {
             const selectNode = abstractSql;
             for (const arg of selectNode[1]) {
@@ -313,6 +339,7 @@ const countTableSelects = (abstractSql, table) => {
             }
             return sum;
         }
+        // Uninteresting atomic nodes
         case 'Boolean':
         case 'Date':
         case 'Duration':
@@ -324,6 +351,7 @@ const countTableSelects = (abstractSql, table) => {
         case 'ReferencedField':
         case 'Text':
             return 0;
+        // The atomic node we're looking for: a table selection
         case 'Table': {
             const tableNode = abstractSql;
             if (tableNode[1] === table) {
@@ -337,6 +365,24 @@ const countTableSelects = (abstractSql, table) => {
             throw new Error(`unknown abstract sql type: ${abstractSql[0]}`);
     }
 };
+// TODO:
+// - This function only narrows the root table of the rule. This is always
+//   safe when the root table isn't selected from more than once and it is not
+//   negated in the LF. Right now we conservatively check for the former but
+//   not the second. The negative forms (e.g. it is forbidden that ...) are
+//   not fully supported anyway.
+// - Removing multiple candidates selecting from the same database table to
+//   avoid visibility issues is too conservative. The correct criteria is to
+//   just remove any that are present in at least 2 disjoint subqueries.
+//   Because in this case the problem is that in those cases there is not a
+//   single place in the query that has visibility inside both disjoint
+//   subqueries and that is a requirement for adding the corrent binds for
+//   narrowing.
+// - We assume the ID column is named "id".
+// - This is a very restricted implementation of narrowing which could be
+//   expanded to cover more situations.
+//
+// This function modifies `abstractSql` in place.
 export const insertAffectedIdsBinds = (abstractSql, lfRuleInfo) => {
     const rootTableSelectCount = countTableSelects(abstractSql, lfRuleInfo.root.table);
     if (rootTableSelectCount !== 1) {
@@ -351,6 +397,9 @@ export const insertAffectedIdsBinds = (abstractSql, lfRuleInfo) => {
             ['Any', ['Bind', lfRuleInfo.root.table], 'Integer'],
         ],
     ];
+    // Assume (but check) that the query is of the form:
+    //
+    // SELECT (SELECT COUNT(*) ...) = 0
     if (abstractSql[0] !== 'Equals' ||
         abstractSql[1][0] !== 'SelectQuery' ||
         abstractSql[2][0] !== 'Number') {

package/out/referenced-fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"referenced-fields.js","sourceRoot":"","sources":["../src/referenced-fields.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"referenced-fields.js","sourceRoot":"","sources":["../src/referenced-fields.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "11.0.0-build-11-x-db9cd30f6ec498e5293df9e060f5531cd960b1cc-1",
+  "version": "11.0.0-build-11-x-1d6801364e84c467215b1a2bd54345172071bdc2-1",
   "description": "A translator for abstract sql into sql.",
   "type": "module",
-  "main": "out/AbstractSQLCompiler.js",
-  "types": "out/AbstractSQLCompiler.d.ts",
+  "main": "out/abstract-sql-compiler.js",
+  "types": "out/abstract-sql-compiler.d.ts",
   "scripts": {
     "build": "tsc --project ./tsconfig.build.json",
     "pretest": "npm run build",
@@ -17,27 +17,27 @@
   "repository": "https://github.com/balena-io-modules/abstract-sql-compiler.git",
   "author": "",
   "peerDependencies": {
-    "@balena/sbvr-types": "^7.1.0 || ^8.0.0 || ^9.0.2 || ^10.0.0"
+    "@balena/sbvr-types": "^7.1.0 || ^8.0.0 || ^9.0.2 || ^10.0.0 || ^11.0.0"
   },
   "devDependencies": {
-    "@balena/lf-to-abstract-sql": "^5.0.4",
-    "@balena/lint": "^9.1.6",
+    "@balena/lf-to-abstract-sql": "^5.0.9",
+    "@balena/lint": "^9.3.2",
     "@balena/odata-parser": "^3.1.2",
-    "@balena/odata-to-abstract-sql": "^7.2.0",
-    "@balena/sbvr-parser": "^1.4.9",
+    "@balena/odata-to-abstract-sql": "^8.0.1",
+    "@balena/sbvr-parser": "^1.4.12",
     "@types/chai": "^4.3.20",
     "@types/common-tags": "^1.8.4",
-    "@types/lodash": "^4.17.16",
+    "@types/lodash": "^4.17.20",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.17.30",
+    "@types/node": "^20.19.8",
     "chai": "^4.5.0",
     "common-tags": "^1.8.2",
     "husky": "^9.1.7",
-    "lint-staged": "^16.0.0",
+    "lint-staged": "^16.1.2",
     "lodash": "^4.17.21",
-    "mocha": "^11.2.0",
+    "mocha": "^11.7.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.3"
   },
   "lint-staged": {
     "*.ts": [
@@ -56,6 +56,6 @@
     "npm": ">=10.7.0"
   },
   "versionist": {
-    "publishedAt": "2025-07-03T14:10:41.331Z"
+    "publishedAt": "2025-07-16T14:26:48.746Z"
   }
 }

package/src/{AbstractSQLCompiler.ts → abstract-sql-compiler.ts}

@@ -6,17 +6,17 @@ export const enum Engines {
 	/* eslint-enable @typescript-eslint/no-shadow */
 }
 
-import { AbstractSQLOptimiser } from './AbstractSQLOptimiser.js';
-import type { Binding, SqlResult } from './AbstractSQLRules2SQL.js';
-import { AbstractSQLRules2SQL } from './AbstractSQLRules2SQL.js';
-export { Binding, SqlResult } from './AbstractSQLRules2SQL.js';
+import { AbstractSQLOptimizer } from './abstract-sql-optimizer.js';
+import type { Binding, SqlResult } from './abstract-sql-rules-to-sql.js';
+import { AbstractSQLRules2SQL } from './abstract-sql-rules-to-sql.js';
+export { Binding, SqlResult } from './abstract-sql-rules-to-sql.js';
 import type { SbvrType } from '@balena/sbvr-types';
 import $sbvrTypes from '@balena/sbvr-types';
 const { default: sbvrTypes } = $sbvrTypes;
 import {
 	optimizeSchema,
 	generateRuleSlug,
-} from './AbstractSQLSchemaOptimiser.js';
+} from './abstract-sql-schema-optimizer.js';
 import type {
 	ReferencedFields,
 	RuleReferencedFields,
@@ -178,7 +178,9 @@ export type NumberTypeNodes = StrictNumberTypeNodes | UnknownTypeNodes;
 
 export type FieldNode = ['Field', string];
 export type ReferencedFieldNode = ['ReferencedField', string, string];
-export type DateTruncNode = ['DateTrunc', TextTypeNodes, DateTypeNodes];
+export type DateTruncNode =
+	| ['DateTrunc', TextTypeNodes, DateTypeNodes]
+	| ['DateTrunc', TextTypeNodes, DateTypeNodes, TextTypeNodes];
 export type ToDateNode = ['ToDate', DateTypeNodes];
 export type ToTimeNode = ['ToTime', DateTypeNodes];
 export type CurrentTimestampNode = ['CurrentTimestamp'];
@@ -236,14 +238,7 @@ export type CaseNode =
 	| ['Case', ...WhenNode[]]
 	| ['Case', ...WhenNode[], ElseNode];
 
-/**
- * @deprecated This gets converted to the `['Bind', [string, string]]` form during compilation
- */
-type BackCompatBindNode = ['Bind', string, string];
-export type BindNode =
-	| ['Bind', number | string]
-	| ['Bind', [string, string]]
-	| BackCompatBindNode;
+export type BindNode = ['Bind', number | string] | ['Bind', [string, string]];
 export type CastNode = ['Cast', AnyTypeNodes, string];
 export type CoalesceNode = [
 	'Coalesce',
@@ -258,7 +253,6 @@ export type UnknownTypeNodes =
 	| NullNode
 	| FieldNode
 	| ReferencedFieldNode
-	| EqualsAnyNode
 	| BindNode
 	| CastNode
 	| CaseNode
@@ -383,11 +377,6 @@ export type FromTypeNodes =
 	| FromTypeNode[keyof FromTypeNode]
 	| AliasNode<FromTypeNode[keyof FromTypeNode]>;
 
-/**
- * @deprecated `FromTypeNodes` already includes aliased versions
- */
-export type AliasableFromTypeNodes = FromTypeNodes;
-
 export type SelectNode = ['Select', AnyTypeNodes[]];
 export type FromNode = ['From', FromTypeNodes];
 export type InnerJoinNode = ['Join', FromTypeNodes, OnNode?];
@@ -458,7 +447,7 @@ export interface AbstractSqlField {
 		type?: string;
 	};
 	defaultValue?: string;
-	computed?: AbstractSqlQuery;
+	computed?: AnyTypeNodes;
 	checks?: BooleanTypeNodes[];
 }
 export interface Trigger {
@@ -540,7 +529,9 @@ export interface AbstractSqlModel {
 	tables: {
 		[resourceName: string]: AbstractSqlTable;
 	};
-	rules: AbstractSqlQuery[];
+	rules: Array<
+		['Rule', ['Body', AbstractSqlQuery], ['StructuredEnglish', string]]
+	>;
 	functions?: Record<
 		string,
 		{
@@ -691,7 +682,7 @@ export const isFieldTypeNode = (
  * @param n The abstract sql to check
  * @param checkNodeTypeFn A function that checks if a given node is the correct type
  */
-const containsNode = (
+export const abstractSqlContainsNode = (
 	n: AnyTypeNodes,
 	checkNodeTypeFn: (n: AnyTypeNodes) => boolean,
 ): boolean => {
@@ -699,7 +690,10 @@ const containsNode = (
 		return true;
 	}
 	for (const p of n) {
-		if (Array.isArray(p) && containsNode(p as AnyTypeNodes, checkNodeTypeFn)) {
+		if (
+			Array.isArray(p) &&
+			abstractSqlContainsNode(p as AnyTypeNodes, checkNodeTypeFn)
+		) {
 			return true;
 		}
 	}
@@ -746,7 +740,7 @@ export function compileRule(
 	engine: Engines,
 	noBinds = false,
 ): SqlResult | [SqlResult, SqlResult] | string | [string, string] {
-	abstractSQL = AbstractSQLOptimiser(abstractSQL, noBinds);
+	abstractSQL = AbstractSQLOptimizer(abstractSQL, noBinds);
 	return AbstractSQLRules2SQL(abstractSQL, engine, noBinds);
 }
 
@@ -755,7 +749,9 @@ const compileSchema = (
 	engine: Engines,
 	ifNotExists: boolean,
 ): SqlModel => {
-	abstractSqlModel = optimizeSchema(abstractSqlModel, false);
+	abstractSqlModel = optimizeSchema(abstractSqlModel, {
+		createCheckConstraints: false,
+	});
 
 	let ifNotExistsStr = '';
 	let orReplaceStr = '';
@@ -830,8 +826,10 @@ $$;`);
 		if (viewDefinition != null) {
 			let definitionAbstractSql = viewDefinition.abstractSql;
 			// If there are any resource nodes then it's a dynamic definition and cannot become a view
-			if (containsNode(definitionAbstractSql, isResourceNode)) {
-				return;
+			if (abstractSqlContainsNode(definitionAbstractSql, isResourceNode)) {
+				throw new Error(
+					`Cannot create a view from a dynamic viewDefinition, found for table resourceName: '${table.resourceName}', name: '${table.name}'`,
+				);
 			}
 			if (isTableNode(definitionAbstractSql)) {
 				// If the definition is a table node we need to wrap it in a select query for the view creation
@@ -1063,22 +1061,15 @@ CREATE TABLE ${ifNotExistsStr}"${table.name}" (
 
 	const ruleStatements: SqlRule[] = abstractSqlModel.rules.map(
 		(rule): SqlRule => {
-			const ruleBodyNode = rule.find((r) => r[0] === 'Body') as [
-				'Body',
-				AbstractSqlQuery,
-			];
-			if (ruleBodyNode == null || typeof ruleBodyNode === 'string') {
+			const [, ruleBodyNode, ruleSENode] = rule;
+			if (ruleBodyNode == null || ruleBodyNode[0] !== 'Body') {
 				throw new Error('Invalid rule');
 			}
 			const 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];

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

@@ -25,7 +25,6 @@ import type {
 	CrossJoinNode,
 	CurrentDateNode,
 	CurrentTimestampNode,
-	DateTruncNode,
 	DeleteQueryNode,
 	DivideNode,
 	DurationNode,
@@ -104,9 +103,9 @@ import type {
 	EscapeForLikeNode,
 	EqualsAnyNode,
 	NotInNode,
-} from './AbstractSQLCompiler.js';
-import { isFieldTypeNode } from './AbstractSQLCompiler.js';
-import * as AbstractSQLRules2SQL from './AbstractSQLRules2SQL.js';
+} from './abstract-sql-compiler.js';
+import { isFieldTypeNode } from './abstract-sql-compiler.js';
+import * as AbstractSQLRules2SQL from './abstract-sql-rules-to-sql.js';
 
 const {
 	isAbstractSqlQuery,
@@ -217,7 +216,6 @@ const UnknownValue: MetaMatchFn<UnknownTypeNodes> = (args) => {
 		case 'Null':
 		case 'Field':
 		case 'ReferencedField':
-		case 'EqualsAny':
 		case 'Bind':
 		case 'Cast':
 		case 'Case':
@@ -884,7 +882,16 @@ const typeRules = {
 	Floor: matchArgs<FloorNode>('Floor', NumericValue),
 	Ceiling: matchArgs<CeilingNode>('Ceiling', NumericValue),
 	ToDate: matchArgs<ToDateNode>('ToDate', DateValue),
-	DateTrunc: matchArgs<DateTruncNode>('DateTrunc', TextValue, DateValue),
+	DateTrunc: (args) => {
+		checkMinArgs('DateTrunc', args, 2);
+		const precision = TextValue(getAbstractSqlQuery(args, 0));
+		const date = DateValue(getAbstractSqlQuery(args, 1));
+		const timeZone =
+			args.length === 3 ? TextValue(getAbstractSqlQuery(args, 2)) : undefined;
+		return timeZone
+			? ['DateTrunc', precision, date, timeZone]
+			: ['DateTrunc', precision, date];
+	},
 	ToTime: matchArgs<ToTimeNode>('ToTime', DateValue),
 	ExtractJSONPathAsText: (args): ExtractJSONPathAsTextNode => {
 		checkMinArgs('ExtractJSONPathAsText', args, 1);
@@ -1209,21 +1216,13 @@ const typeRules = {
 			];
 		},
 	),
-	Bind: tryMatches<BindNode>(
-		Helper<OptimisationMatchFn<BindNode>>((args) => {
-			if (args.length !== 2) {
-				return false;
-			}
-			return ['Bind', args] as BindNode;
-		}),
-		(args) => {
-			if (noBinds) {
-				throw new SyntaxError('Cannot use a bind whilst they are disabled');
-			}
-			checkArgs('Bind', args, 1);
-			return ['Bind', ...args] as BindNode;
-		},
-	),
+	Bind: (args) => {
+		if (noBinds) {
+			throw new SyntaxError('Cannot use a bind whilst they are disabled');
+		}
+		checkArgs('Bind', args, 1);
+		return ['Bind', ...args] as BindNode;
+	},
 	Text,
 	Value: Text,
 	Date: matchArgs('Date', identity),
@@ -1590,7 +1589,7 @@ const typeRules = {
 	),
 } satisfies Record<string, MatchFn<AnyTypeNodes>>;
 
-export const AbstractSQLOptimiser = (
+export const AbstractSQLOptimizer = (
 	abstractSQL: AbstractSqlQuery,
 	$noBinds = false,
 ): AbstractSqlQuery => {

package/src/{AbstractSQLRules2SQL.ts → abstract-sql-rules-to-sql.ts}

@@ -18,8 +18,8 @@ import type {
 	StrictDurationTypeNodes,
 	StrictTextArrayTypeNodes,
 	StrictJSONTypeNodes,
-} from './AbstractSQLCompiler.js';
-import { Engines, isFieldTypeNode } from './AbstractSQLCompiler.js';
+} from './abstract-sql-compiler.js';
+import { Engines, isFieldTypeNode } from './abstract-sql-compiler.js';
 
 export type Binding =
 	| [string, any]
@@ -76,7 +76,6 @@ const UnknownValue: MetaMatchFn = (args, indent) => {
 		case 'Null':
 		case 'Field':
 		case 'ReferencedField':
-		case 'EqualsAny':
 		case 'Bind':
 		case 'Cast':
 		case 'Case':
@@ -176,7 +175,8 @@ export const isBooleanValue = (
 		type === 'Like' ||
 		type === 'IsNotDistinctFrom' ||
 		type === 'IsDistinctFrom' ||
-		type === 'StartsWith'
+		type === 'StartsWith' ||
+		type === 'EqualsAny'
 	);
 };
 const BooleanValue = MatchValue(isBooleanValue);
@@ -1208,7 +1208,7 @@ const typeRules: Record<string, MatchFn> = {
 		return `DATE(${date})`;
 	},
 	DateTrunc: (args, indent) => {
-		checkArgs('DateTrunc', args, 2);
+		checkMinArgs('DateTrunc', args, 2);
 		const precision = TextValue(getAbstractSqlQuery(args, 0), indent);
 		const date = DateValue(getAbstractSqlQuery(args, 1), indent);
 		// Postgres generated timestamps have a microseconds precision
@@ -1216,7 +1216,13 @@ const typeRules: Record<string, MatchFn> = {
 		// js timestamps that have only milliseconds precision
 		// thus supporting for truncating to a given precision
 		if (engine === Engines.postgres) {
-			return `DATE_TRUNC(${precision}, ${date})`;
+			const timeZone =
+				args.length === 3
+					? TextValue(getAbstractSqlQuery(args, 2), indent)
+					: undefined;
+			return timeZone
+				? `DATE_TRUNC(${precision}, ${date}, ${timeZone})`
+				: `DATE_TRUNC(${precision}, ${date})`;
 		} else if (
 			// not postgresql ==> no need to truncate ==> return timestamp as is (milliseconds precision)
 			precision === "'milliseconds'" ||