Added compulsory engine V2 filter

Author: matt-aitken

apps/webapp/app/v3/querySchemas.ts

@@ -31,6 +31,7 @@ export const runsSchema: TableSchema = {
     projectId: "project_id",
     environmentId: "environment_id",
   },
+  requiredFilters: [{ column: "engine", value: "V2" }],
   columns: {
     run_id: {
       name: "run_id",

internal-packages/tsql/src/index.ts

@@ -9,7 +9,12 @@ import { TSQLParser } from "./grammar/TSQLParser.js";
 import { TSQLParseTreeConverter } from "./query/parser.js";
 import type { SelectQuery, SelectSetQuery, Expression } from "./query/ast.js";
 import { SyntaxError } from "./query/errors.js";
-import { createSchemaRegistry, type TableSchema, type FieldMappings } from "./query/schema.js";
+import {
+  createSchemaRegistry,
+  type TableSchema,
+  type FieldMappings,
+  type RequiredFilter,
+} from "./query/schema.js";
 import { createPrinterContext, type QuerySettings } from "./query/printer_context.js";
 import { printToClickHouse, type PrintResult } from "./query/printer.js";
 
@@ -62,6 +67,7 @@ export {
   type TableSchema,
   type ColumnSchema,
   type TenantColumnConfig,
+  type RequiredFilter,
   type SchemaRegistry,
   type ClickHouseType,
   type OutputColumnMetadata,

internal-packages/tsql/src/query/printer.ts

@@ -1147,15 +1147,17 @@ export class ClickHousePrinter {
   // ============================================================
 
   /**
-   * Create a WHERE clause expression for tenant isolation
+   * Create a WHERE clause expression for tenant isolation and required filters
    * Note: We use just the column name without table prefix since ClickHouse
    * requires the actual table name (task_runs_v2), not the TSQL alias (task_runs)
    *
    * Organization ID is always required. Project ID and Environment ID are optional -
    * if not provided, the query will return results across all projects/environments.
+   *
+   * Required filters from the table schema are also always included.
    */
   private createTenantGuard(tableSchema: TableSchema, _tableAlias: string): And | CompareOperation {
-    const { tenantColumns } = tableSchema;
+    const { tenantColumns, requiredFilters } = tableSchema;
 
     // Organization guard is always required
     const orgGuard: CompareOperation = {
@@ -1190,6 +1192,19 @@ export class ClickHousePrinter {
       guards.push(envGuard);
     }
 
+    // Add required filters from the table schema
+    if (requiredFilters && requiredFilters.length > 0) {
+      for (const filter of requiredFilters) {
+        const filterGuard: CompareOperation = {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Eq,
+          left: { expression_type: "field", chain: [filter.column] } as Field,
+          right: { expression_type: "constant", value: filter.value } as Constant,
+        };
+        guards.push(filterGuard);
+      }
+    }
+
     // If only org guard, return it directly (no need for AND wrapper)
     if (guards.length === 1) {
       return orgGuard;

internal-packages/tsql/src/query/schema.ts

@@ -209,6 +209,16 @@ export interface TenantColumnConfig {
   environmentId: string;
 }
 
+/**
+ * Required filter that is always applied to queries on a table
+ */
+export interface RequiredFilter {
+  /** The ClickHouse column name to filter on */
+  column: string;
+  /** The value the column must equal */
+  value: string;
+}
+
 /**
  * Schema definition for a table
  */
@@ -225,6 +235,11 @@ export interface TableSchema {
   description?: string;
   /** Whether this table can be joined to other tables */
   joinable?: boolean;
+  /**
+   * Required filters that are always applied to queries on this table.
+   * These are injected into the WHERE clause automatically, similar to tenant isolation.
+   */
+  requiredFilters?: RequiredFilter[];
 }
 
 /**