agentlang 0.7.9 → 0.7.11

package/src/api/http.ts

@@ -48,6 +48,7 @@ import {
   PathAttributeNameQuery,
   setEntityEndpointsUpdater,
   setEventEndpointsUpdater,
+  setRelationshipEndpointsUpdater,
   UnauthorisedError,
 } from '../runtime/defs.js';
 import { evaluate } from '../runtime/interpreter.js';
@@ -311,6 +312,13 @@ export async function startServer(
       addEntityHandlers(moduleName, n);
     });
   });
+  setRelationshipEndpointsUpdater((moduleName: string) => {
+    const m = fetchModule(moduleName);
+    const relNames = m.getBetweenRelationshipNames();
+    relNames.forEach((n: string) => {
+      addBetweenHandlers(moduleName, n);
+    });
+  });
 }
 
 function ok(res: Response) {

package/src/cli/main.ts

@@ -17,7 +17,7 @@ import * as url from 'node:url';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { logger, updateLoggerFromConfig } from '../runtime/logger.js';
-import { Module } from '../runtime/module.js';
+import { Instance, Module } from '../runtime/module.js';
 import { ModuleDefinition } from '../language/generated/ast.js';
 import { Config } from '../runtime/state.js';
 import { prepareIntegrations } from '../runtime/integrations.js';
@@ -32,6 +32,7 @@ import { importModule } from '../runtime/jsmodules.js';
 import {
   isRuntimeMode_dev,
   isRuntimeMode_prod,
+  isRuntimeMode_test,
   setInternDynamicModuleFn,
   setRuntimeMode_generate_migration,
   setRuntimeMode_init_schema,
@@ -41,7 +42,11 @@ import {
   updateEndpoints,
 } from '../runtime/defs.js';
 import { initGlobalApi } from '../runtime/api.js';
-import { initCoreModuleManager } from '../runtime/modules/core.js';
+import {
+  initCoreModuleManager,
+  lookupTimersWithRunningStatus,
+  triggerTimer,
+} from '../runtime/modules/core.js';
 
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 
@@ -134,6 +139,7 @@ export async function runPostInitTasks(appSpec?: ApplicationSpec, config?: Confi
   await runInitFunctions();
   await runStandaloneStatements();
   initCoreModuleManager();
+  await runPersistedTimers();
   logger.info(
     `Running application ${appSpec?.name || 'unknown'} version ${appSpec?.version || 'unknown'} on port ${config?.service?.port || 8080}`
   );
@@ -169,6 +175,36 @@ export async function runPreInitTasks(): Promise<boolean> {
   return result;
 }
 
+async function runPersistedTimers() {
+  if (!isRuntimeMode_test()) {
+    const insts: Instance[] = await lookupTimersWithRunningStatus();
+    if (insts) {
+      for (let i = 0; i < insts.length; ++i) {
+        const inst: Instance = insts[i];
+        if (await restartTimer(inst)) {
+          logger.info(`Timer ${inst.lookup('name')} setup to restart`);
+        }
+      }
+    }
+  }
+}
+
+async function restartTimer(timerInst: Instance): Promise<boolean> {
+  const n = timerInst.lookup('name');
+  try {
+    if (isRuntimeMode_prod()) {
+      // TODO: create and configure an independent timer-managerment service.
+      logger.warn(`Cannot restart timer ${n}, timer management service is not configured`);
+    } else {
+      triggerTimer(timerInst);
+      return true;
+    }
+  } catch (reason: any) {
+    logger.warn(`Error while restarting timer ${n} - ${reason}`);
+  }
+  return false;
+}
+
 async function internDynamicModule(name: string, definition: string): Promise<string> {
   await refreshModuleDefinition(name, definition);
   await resetDefaultDatabase();

package/src/language/agentlang-validator.ts

@@ -1,11 +1,5 @@
 import type { ValidationAcceptor, ValidationChecks } from 'langium';
-import {
-  AgentlangAstType,
-  AttributeDefinition,
-  isStandaloneStatement,
-  ModuleDefinition,
-  SchemaDefinition,
-} from './generated/ast.js';
+import { AgentlangAstType, AttributeDefinition, SchemaDefinition } from './generated/ast.js';
 import type { AgentlangServices } from './agentlang-module.js';
 
 /**
@@ -15,7 +9,6 @@ export function registerValidationChecks(services: AgentlangServices) {
   const registry = services.validation.ValidationRegistry;
   const validator = services.validation.AgentlangValidator;
   const checks: ValidationChecks<AgentlangAstType> = {
-    ModuleDefinition: validator.checkUniqueDefs,
     SchemaDefinition: validator.checkUniqueAttributes,
   };
   registry.register(checks, validator);
@@ -25,49 +18,6 @@ export function registerValidationChecks(services: AgentlangServices) {
  * Implementation of custom validations.
  */
 export class AgentlangValidator {
-  // our new validation function for defs
-  checkUniqueDefs(module: ModuleDefinition, accept: ValidationAcceptor): void {
-    // create a set of visited functions
-    // and report an error when we see one we've already seen
-    const reported = new Set();
-    module.defs.forEach(d => {
-      let n: string | undefined;
-      if (!isStandaloneStatement(d)) {
-        if (
-          d.$type === 'PublicWorkflowDefinition' ||
-          d.$type === 'PublicAgentDefinition' ||
-          d.$type === 'PublicEventDefinition'
-        ) {
-          n = d.def.name;
-        } else {
-          n = d.name;
-        }
-        if (
-          d.$type != 'WorkflowDefinition' &&
-          d.$type != 'FlowDefinition' &&
-          d.$type != 'PublicWorkflowDefinition' &&
-          d.$type != 'ScenarioDefinition' &&
-          d.$type != 'DirectiveDefinition' &&
-          d.$type != 'GlossaryEntryDefinition' &&
-          reported.has(n)
-        ) {
-          accept('error', `Definition has non-unique name '${n}'.`, {
-            node: d,
-            property: 'name',
-          });
-        }
-        if (
-          d.$type != 'FlowDefinition' &&
-          d.$type != 'ScenarioDefinition' &&
-          d.$type != 'DirectiveDefinition' &&
-          d.$type != 'GlossaryEntryDefinition'
-        ) {
-          reported.add(n);
-        }
-      }
-    });
-  }
-
   checkUniqueAttributes(def: SchemaDefinition, accept: ValidationAcceptor): void {
     // create a set of visited functions
     // and report an error when we see one we've already seen

package/src/language/agentlang.langium

@@ -119,8 +119,11 @@ CrudMap: '{' (name=QueryId (':')? '{''}'
              | (name=QualifiedName (':')? '{''}' ',' '@from' source=Literal (',' upsert+='@upsert')?)
              | name=QualifiedName (':')? body=CrudMapBody)
              (',' relationships+=RelationshipPattern (',' relationships+=RelationshipPattern)*)?
-             (',' join=JoinSpec)?
+             (',' joins+=JoinSpec)*
              (',' into=SelectIntoSpec)?
+             (',' where=WhereSpec)?
+             (',' groupByClause=GroupByClause)?
+             (',' orderByClause=OrderByClause)?
              (',' upsert+='@upsert')?
              (',' distinct+='@distinct')?
              '}';
@@ -129,12 +132,18 @@ CrudMapBody: '{' (attributes+=SetAttribute (',' attributes+=SetAttribute)*)+ pro
 
 SelectIntoSpec: '@into' '{' entries+=SelectIntoEntry (',' entries+=SelectIntoEntry)* '}';
 
-SelectIntoEntry: alias=ID (':')? attribute=Ref;
+SelectIntoEntry: alias=ID (':')? (attribute=Ref | aggregate=AggregateFunctionSpec);
 
 JoinSpec: type=JoinType name=QualifiedName '{' lhs=QueryId op=SqlComparisonOpr? rhs=Ref '}';
 
 JoinType returns string: ('@join' | '@inner_join' | '@left_join' | '@right_join' | '@full_join');
 
+WhereSpec: '@where' ('{' (clauses+=WhereSpecClause (',' clauses+=WhereSpecClause)*)+ '}');
+WhereSpecClause: lhs=QueryId op=SqlComparisonOpr? rhs=Expr;
+
+GroupByClause: '@groupBy' ('(' (colNames+=QualifiedName (',' colNames+=QualifiedName)*)+ ')');
+OrderByClause: '@orderBy' ('(' (colNames+=QualifiedName (',' colNames+=QualifiedName)*)+ ')') (order=('@asc' | '@desc'))?;
+
 FullTextSearch: '{' name=QueryId query=Literal options=MapLiteral? '}';
 
 Return: 'return' pattern=Pattern;
@@ -179,9 +188,11 @@ RetryDefinition: 'agentlang/retry' name=ID '{' ('attempts' attempts=Decimal)? ('
 
 BackoffSpec: 'backoff' '{' (attributes+=SetAttribute (',' attributes+=SetAttribute)*)+ '}';
 
-ResolverDefinition: 'resolver' name=GenericName '[' (paths+=GenericName (',' paths+=GenericName)*)+ ']'
+ResolverDefinition: 'resolver' name=QualifiedName '[' (paths+=ResolverPathEntry (',' paths+=ResolverPathEntry)*)+ ']'
 '{' (methods+=ResolverMethodSpec (',' methods+=ResolverMethodSpec)*)+ '}';
 
+ResolverPathEntry returns string: QualifiedName | GenericName;
+
 ResolverMethodSpec: key=ResolverMethodName fn=ResolverFnName;
 
 ResolverFnName: name=(ID | Ref | STRING);
@@ -204,7 +215,7 @@ Delete: 'delete' pattern=Pattern;
 
 Purge: 'purge' pattern=Pattern;
 
-SetAttribute: name=QueryId op=SqlComparisonOpr? (':')? value=AttributeValueExpression;
+SetAttribute: name=QueryId op=SqlComparisonOpr? (':')? (value=AttributeValueExpression | aggregate=AggregateFunctionSpec);
 
 SqlComparisonOpr returns string: ('='|'<>' | '!=' |'<'|'<='|'>'|'>='|'in'|'like'|'between');
 
@@ -226,6 +237,8 @@ Comparison infers Expr:
 
 PrimExpr: Literal | Group | NegExpr | NotExpr;
 
+AggregateFunctionSpec: '@' name=ID (('(' ')') | ('(' (args+=QualifiedName (',' args+=QualifiedName)*)+ ')'));
+
 // grouped expression with parentheses
 Group:      '(' ge=Expr ')';
 // negated expression

package/src/language/generated/ast.ts

@@ -42,26 +42,31 @@ export type AgentlangKeywordNames =
     | "@actions"
     | "@after"
     | "@as"
+    | "@asc"
     | "@async"
     | "@before"
     | "@catch"
+    | "@desc"
     | "@distinct"
     | "@enum"
     | "@expr"
     | "@from"
     | "@full_join"
+    | "@groupBy"
     | "@inner_join"
     | "@into"
     | "@join"
     | "@left_join"
     | "@meta"
     | "@oneof"
+    | "@orderBy"
     | "@public"
     | "@rbac"
     | "@ref"
     | "@right_join"
     | "@then"
     | "@upsert"
+    | "@where"
     | "@with_unique"
     | "["
     | "]"
@@ -203,6 +208,12 @@ export function isRef(item: unknown): item is Ref {
     return typeof item === 'string';
 }
 
+export type ResolverPathEntry = GenericName | QualifiedName;
+
+export function isResolverPathEntry(item: unknown): item is ResolverPathEntry {
+    return isQualifiedName(item) || isGenericName(item);
+}
+
 export type SchemaDefinition = EntityDefinition | EventDefinition | PublicEventDefinition | RecordDefinition;
 
 export const SchemaDefinition = 'SchemaDefinition';
@@ -298,6 +309,19 @@ export function isAgentXtraSpec(item: unknown): item is AgentXtraSpec {
     return reflection.isInstance(item, AgentXtraSpec);
 }
 
+export interface AggregateFunctionSpec extends langium.AstNode {
+    readonly $container: SelectIntoEntry | SetAttribute;
+    readonly $type: 'AggregateFunctionSpec';
+    args: Array<QualifiedName>;
+    name: string;
+}
+
+export const AggregateFunctionSpec = 'AggregateFunctionSpec';
+
+export function isAggregateFunctionSpec(item: unknown): item is AggregateFunctionSpec {
+    return reflection.isInstance(item, AggregateFunctionSpec);
+}
+
 export interface AliasSpec extends langium.AstNode {
     readonly $container: RuntimeHint;
     readonly $type: 'AliasSpec';
@@ -379,7 +403,7 @@ export function isBeforeTriggerDefinition(item: unknown): item is BeforeTriggerD
 }
 
 export interface BinExpr extends langium.AstNode {
-    readonly $container: AttributeDefinition | BinExpr | CaseEntry | FnCall | Group | If | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError;
+    readonly $container: AttributeDefinition | BinExpr | CaseEntry | FnCall | Group | If | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError | WhereSpecClause;
     readonly $type: 'BinExpr';
     e1: Expr | PrimExpr;
     e2: Expr | PrimExpr;
@@ -447,12 +471,15 @@ export interface CrudMap extends langium.AstNode {
     readonly $type: 'CrudMap';
     body?: CrudMapBody;
     distinct: Array<'@distinct'>;
+    groupByClause?: GroupByClause;
     into?: SelectIntoSpec;
-    join?: JoinSpec;
+    joins: Array<JoinSpec>;
     name: QualifiedName | QueryId;
+    orderByClause?: OrderByClause;
     relationships: Array<RelationshipPattern>;
     source?: Literal;
     upsert: Array<'@upsert'>;
+    where?: WhereSpec;
 }
 
 export const CrudMap = 'CrudMap';
@@ -722,7 +749,7 @@ export function isGlossaryEntryDefinition(item: unknown): item is GlossaryEntryD
 }
 
 export interface Group extends langium.AstNode {
-    readonly $container: AttributeDefinition | BinExpr | CaseEntry | FnCall | Group | If | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError;
+    readonly $container: AttributeDefinition | BinExpr | CaseEntry | FnCall | Group | If | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError | WhereSpecClause;
     readonly $type: 'Group';
     ge: Expr;
 }
@@ -733,6 +760,18 @@ export function isGroup(item: unknown): item is Group {
     return reflection.isInstance(item, Group);
 }
 
+export interface GroupByClause extends langium.AstNode {
+    readonly $container: CrudMap;
+    readonly $type: 'GroupByClause';
+    colNames: Array<QualifiedName>;
+}
+
+export const GroupByClause = 'GroupByClause';
+
+export function isGroupByClause(item: unknown): item is GroupByClause {
+    return reflection.isInstance(item, GroupByClause);
+}
+
 export interface Handler extends langium.AstNode {
     readonly $container: CatchSpec;
     readonly $type: 'Handler';
@@ -815,7 +854,7 @@ export function isKvPairs(item: unknown): item is KvPairs {
 }
 
 export interface Literal extends langium.AstNode {
-    readonly $container: AttributeDefinition | BinExpr | CaseEntry | CrudMap | FnCall | FullTextSearch | GenericPropertyDef | Group | If | KvPair | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError;
+    readonly $container: AttributeDefinition | BinExpr | CaseEntry | CrudMap | FnCall | FullTextSearch | GenericPropertyDef | Group | If | KvPair | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError | WhereSpecClause;
     readonly $type: 'Literal';
     array?: ArrayLiteral;
     asyncFnCall?: AsyncFnCall;
@@ -899,7 +938,7 @@ export function isModuleDefinition(item: unknown): item is ModuleDefinition {
 }
 
 export interface NegExpr extends langium.AstNode {
-    readonly $container: AttributeDefinition | BinExpr | CaseEntry | FnCall | Group | If | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError;
+    readonly $container: AttributeDefinition | BinExpr | CaseEntry | FnCall | Group | If | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError | WhereSpecClause;
     readonly $type: 'NegExpr';
     ne: Expr;
 }
@@ -924,7 +963,7 @@ export function isNodeDefinition(item: unknown): item is NodeDefinition {
 }
 
 export interface NotExpr extends langium.AstNode {
-    readonly $container: AttributeDefinition | BinExpr | CaseEntry | FnCall | Group | If | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError;
+    readonly $container: AttributeDefinition | BinExpr | CaseEntry | FnCall | Group | If | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute | ThrowError | WhereSpecClause;
     readonly $type: 'NotExpr';
     ne: Expr;
 }
@@ -947,6 +986,19 @@ export function isOneOfSpec(item: unknown): item is OneOfSpec {
     return reflection.isInstance(item, OneOfSpec);
 }
 
+export interface OrderByClause extends langium.AstNode {
+    readonly $container: CrudMap;
+    readonly $type: 'OrderByClause';
+    colNames: Array<QualifiedName>;
+    order?: '@asc' | '@desc';
+}
+
+export const OrderByClause = 'OrderByClause';
+
+export function isOrderByClause(item: unknown): item is OrderByClause {
+    return reflection.isInstance(item, OrderByClause);
+}
+
 export interface Pattern extends langium.AstNode {
     readonly $container: Delete | ForEach | Purge | RelationshipPattern | Return | Statement;
     readonly $type: 'Pattern';
@@ -1230,8 +1282,8 @@ export interface ResolverDefinition extends langium.AstNode {
     readonly $container: ModuleDefinition;
     readonly $type: 'ResolverDefinition';
     methods: Array<ResolverMethodSpec>;
-    name: GenericName;
-    paths: Array<GenericName>;
+    name: QualifiedName;
+    paths: Array<ResolverPathEntry>;
 }
 
 export const ResolverDefinition = 'ResolverDefinition';
@@ -1334,8 +1386,9 @@ export function isScenarioDefinition(item: unknown): item is ScenarioDefinition
 export interface SelectIntoEntry extends langium.AstNode {
     readonly $container: SelectIntoSpec;
     readonly $type: 'SelectIntoEntry';
+    aggregate?: AggregateFunctionSpec;
     alias: string;
-    attribute: Ref;
+    attribute?: Ref;
 }
 
 export const SelectIntoEntry = 'SelectIntoEntry';
@@ -1359,9 +1412,10 @@ export function isSelectIntoSpec(item: unknown): item is SelectIntoSpec {
 export interface SetAttribute extends langium.AstNode {
     readonly $container: BackoffSpec | CrudMapBody;
     readonly $type: 'SetAttribute';
+    aggregate?: AggregateFunctionSpec;
     name: QueryId;
     op?: SqlComparisonOpr;
-    value: AttributeValueExpression;
+    value?: AttributeValueExpression;
 }
 
 export const SetAttribute = 'SetAttribute';
@@ -1445,6 +1499,32 @@ export function isTriggerEntry(item: unknown): item is TriggerEntry {
     return reflection.isInstance(item, TriggerEntry);
 }
 
+export interface WhereSpec extends langium.AstNode {
+    readonly $container: CrudMap;
+    readonly $type: 'WhereSpec';
+    clauses: Array<WhereSpecClause>;
+}
+
+export const WhereSpec = 'WhereSpec';
+
+export function isWhereSpec(item: unknown): item is WhereSpec {
+    return reflection.isInstance(item, WhereSpec);
+}
+
+export interface WhereSpecClause extends langium.AstNode {
+    readonly $container: WhereSpec;
+    readonly $type: 'WhereSpecClause';
+    lhs: QueryId;
+    op?: SqlComparisonOpr;
+    rhs: Expr;
+}
+
+export const WhereSpecClause = 'WhereSpecClause';
+
+export function isWhereSpecClause(item: unknown): item is WhereSpecClause {
+    return reflection.isInstance(item, WhereSpecClause);
+}
+
 export interface WorkflowDefinition extends langium.AstNode {
     readonly $container: ModuleDefinition | PublicWorkflowDefinition;
     readonly $type: 'WorkflowDefinition';
@@ -1479,6 +1559,7 @@ export type AgentlangAstType = {
     AgentDefinition: AgentDefinition
     AgentXtraAttribute: AgentXtraAttribute
     AgentXtraSpec: AgentXtraSpec
+    AggregateFunctionSpec: AggregateFunctionSpec
     AliasSpec: AliasSpec
     ArrayLiteral: ArrayLiteral
     AsyncFnCall: AsyncFnCall
@@ -1516,6 +1597,7 @@ export type AgentlangAstType = {
     GenericPropertyDef: GenericPropertyDef
     GlossaryEntryDefinition: GlossaryEntryDefinition
     Group: Group
+    GroupByClause: GroupByClause
     Handler: Handler
     If: If
     Import: Import
@@ -1532,6 +1614,7 @@ export type AgentlangAstType = {
     NodeDefinition: NodeDefinition
     NotExpr: NotExpr
     OneOfSpec: OneOfSpec
+    OrderByClause: OrderByClause
     Pattern: Pattern
     PrePostTriggerDefinition: PrePostTriggerDefinition
     PrimExpr: PrimExpr
@@ -1572,6 +1655,8 @@ export type AgentlangAstType = {
     ThrowError: ThrowError
     TriggerDefinition: TriggerDefinition
     TriggerEntry: TriggerEntry
+    WhereSpec: WhereSpec
+    WhereSpecClause: WhereSpecClause
     WorkflowDefinition: WorkflowDefinition
     WorkflowHeader: WorkflowHeader
 }
@@ -1579,7 +1664,7 @@ export type AgentlangAstType = {
 export class AgentlangAstReflection extends langium.AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ActionEntry, AfterTriggerDefinition, AgentDefinition, AgentXtraAttribute, AgentXtraSpec, AliasSpec, ArrayLiteral, AsyncFnCall, AttributeDefinition, AttributeValueExpression, BackoffSpec, BeforeTriggerDefinition, BinExpr, CaseEntry, CatchSpec, CompositeUniqueDefinition, ConditionalFlowStep, CrudMap, CrudMapBody, DecisionDefBody, DecisionDefinition, Definition, Delete, DirectiveDefinition, Else, EntityActionsDefinitions, EntityDefinition, EnumSpec, EventDefinition, Expr, ExtendsClause, FlowDefBody, FlowDefinition, FlowEntry, FlowStepSpec, FnCall, ForEach, FullTextSearch, GenericDefBody, GenericPropertyDef, GlossaryEntryDefinition, Group, Handler, If, Import, JoinSpec, KvPair, KvPairs, Literal, MapEntry, MapKey, MapLiteral, MetaDefinition, ModuleDefinition, NegExpr, NodeDefinition, NotExpr, OneOfSpec, Pattern, PrePostTriggerDefinition, PrimExpr, PropertyDefinition, PublicAgentDefinition, PublicEventDefinition, PublicWorkflowDefinition, Purge, RbacAllowSpec, RbacExpressionSpec, RbacOpr, RbacRolesSpec, RbacSpecDefinition, RbacSpecEntries, RbacSpecEntry, RecordDefinition, RecordExtraDefinition, RecordSchemaDefinition, RefSpec, RelNodes, RelationshipDefinition, RelationshipPattern, ResolverDefinition, ResolverFnName, ResolverMethodName, ResolverMethodSpec, RetryDefinition, Return, RuntimeHint, ScenarioDefinition, SchemaDefinition, SelectIntoEntry, SelectIntoSpec, SetAttribute, StandaloneStatement, Statement, ThenSpec, ThrowError, TriggerDefinition, TriggerEntry, WorkflowDefinition, WorkflowHeader];
+        return [ActionEntry, AfterTriggerDefinition, AgentDefinition, AgentXtraAttribute, AgentXtraSpec, AggregateFunctionSpec, AliasSpec, ArrayLiteral, AsyncFnCall, AttributeDefinition, AttributeValueExpression, BackoffSpec, BeforeTriggerDefinition, BinExpr, CaseEntry, CatchSpec, CompositeUniqueDefinition, ConditionalFlowStep, CrudMap, CrudMapBody, DecisionDefBody, DecisionDefinition, Definition, Delete, DirectiveDefinition, Else, EntityActionsDefinitions, EntityDefinition, EnumSpec, EventDefinition, Expr, ExtendsClause, FlowDefBody, FlowDefinition, FlowEntry, FlowStepSpec, FnCall, ForEach, FullTextSearch, GenericDefBody, GenericPropertyDef, GlossaryEntryDefinition, Group, GroupByClause, Handler, If, Import, JoinSpec, KvPair, KvPairs, Literal, MapEntry, MapKey, MapLiteral, MetaDefinition, ModuleDefinition, NegExpr, NodeDefinition, NotExpr, OneOfSpec, OrderByClause, Pattern, PrePostTriggerDefinition, PrimExpr, PropertyDefinition, PublicAgentDefinition, PublicEventDefinition, PublicWorkflowDefinition, Purge, RbacAllowSpec, RbacExpressionSpec, RbacOpr, RbacRolesSpec, RbacSpecDefinition, RbacSpecEntries, RbacSpecEntry, RecordDefinition, RecordExtraDefinition, RecordSchemaDefinition, RefSpec, RelNodes, RelationshipDefinition, RelationshipPattern, ResolverDefinition, ResolverFnName, ResolverMethodName, ResolverMethodSpec, RetryDefinition, Return, RuntimeHint, ScenarioDefinition, SchemaDefinition, SelectIntoEntry, SelectIntoSpec, SetAttribute, StandaloneStatement, Statement, ThenSpec, ThrowError, TriggerDefinition, TriggerEntry, WhereSpec, WhereSpecClause, WorkflowDefinition, WorkflowHeader];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1682,6 +1767,15 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                     ]
                 };
             }
+            case AggregateFunctionSpec: {
+                return {
+                    name: AggregateFunctionSpec,
+                    properties: [
+                        { name: 'args', defaultValue: [] },
+                        { name: 'name' }
+                    ]
+                };
+            }
             case AliasSpec: {
                 return {
                     name: AliasSpec,
@@ -1788,12 +1882,15 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                     properties: [
                         { name: 'body' },
                         { name: 'distinct', defaultValue: [] },
+                        { name: 'groupByClause' },
                         { name: 'into' },
-                        { name: 'join' },
+                        { name: 'joins', defaultValue: [] },
                         { name: 'name' },
+                        { name: 'orderByClause' },
                         { name: 'relationships', defaultValue: [] },
                         { name: 'source' },
-                        { name: 'upsert', defaultValue: [] }
+                        { name: 'upsert', defaultValue: [] },
+                        { name: 'where' }
                     ]
                 };
             }
@@ -1985,6 +2082,14 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                     ]
                 };
             }
+            case GroupByClause: {
+                return {
+                    name: GroupByClause,
+                    properties: [
+                        { name: 'colNames', defaultValue: [] }
+                    ]
+                };
+            }
             case Handler: {
                 return {
                     name: Handler,
@@ -2136,6 +2241,15 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                     ]
                 };
             }
+            case OrderByClause: {
+                return {
+                    name: OrderByClause,
+                    properties: [
+                        { name: 'colNames', defaultValue: [] },
+                        { name: 'order' }
+                    ]
+                };
+            }
             case Pattern: {
                 return {
                     name: Pattern,
@@ -2408,6 +2522,7 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                 return {
                     name: SelectIntoEntry,
                     properties: [
+                        { name: 'aggregate' },
                         { name: 'alias' },
                         { name: 'attribute' }
                     ]
@@ -2425,6 +2540,7 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                 return {
                     name: SetAttribute,
                     properties: [
+                        { name: 'aggregate' },
                         { name: 'name' },
                         { name: 'op' },
                         { name: 'value' }
@@ -2482,6 +2598,24 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                     ]
                 };
             }
+            case WhereSpec: {
+                return {
+                    name: WhereSpec,
+                    properties: [
+                        { name: 'clauses', defaultValue: [] }
+                    ]
+                };
+            }
+            case WhereSpecClause: {
+                return {
+                    name: WhereSpecClause,
+                    properties: [
+                        { name: 'lhs' },
+                        { name: 'op' },
+                        { name: 'rhs' }
+                    ]
+                };
+            }
             case WorkflowDefinition: {
                 return {
                     name: WorkflowDefinition,