fastify-auto-sqlapi 0.1.5 → 0.1.7

package/AGENTS_BACKEND.md

@@ -485,12 +485,22 @@ type ComputedFieldFn = (ctx: {
   db: QueryClient;                                 // dialect-aware (qi, ph, dialectName, dateTrunc, ...)
   qiCol(field: string, opts?: { qualifier?: string }): string;
 }) => {
-  expr: string;                                    // SQL fragment
-  values: unknown[];                               // bound values (see limitations below)
+  expr: string;                                    // SQL fragment; mark each bound value with `?`
+  values: unknown[];                               // one entry per `?` marker in expr
   type: TSchema;                                   // REQUIRED — used by Swagger and body validation
 };
 ```
 
+**Bound values use `?` markers.** The engine assigns the placeholder positions — never write `$1` or `db.ph(n)` yourself. Use `\?` for a literal question mark (PostgreSQL jsonb operator). A computed whose marker count does not match `values.length` is rejected with a descriptive error, because it would bind values the query never references:
+
+```typescript
+bonus: ({ qiCol }) => ({
+  expr: `CASE WHEN ${qiCol('role')} = ? THEN ${qiCol('salary')} ELSE 0 END`,
+  values: ['admin'],
+  type: Type.Number(),
+}),
+```
+
 `qiCol(field)` returns a properly-quoted column reference, optionally prefixed by an alias qualifier — the engine passes the alias automatically when the computed is invoked inside a `joinLeft` LEFT JOIN, so the same function works both inline on the main query and as a parent-side column.
 
 ### Validation & startup checks
@@ -505,8 +515,9 @@ For `joinLeft` specifically, the computed expr is automatically alias-prefixed b
 
 ### Limitations (first round, by design)
 
-- **Bound `values` in computed expressions** are supported only on `filters`/`conditions` (main and `joinMustExist`/`joinMultiple`/`joinGroup`). They are rejected with 400 on `selectComputed`, `computeMin/Max/Sum/Avg`, `orderBy`, and `joinLeft.filters`/`conditions` — those paths require placeholder coordination not done in the first round. Most use cases (JSON extraction, concat, dateTrunc, simple ops) need no placeholders.
-- **Computed CAN be used in `joinGroup.aggregations.by`** (just pass the computed name as a string). Bound `values` are not supported in this position (rejected with 400). The existing FK-correlation rule for `orderBy <alias>.<fn>.<field>` still applies: 3-parti aggregation orderBy on a `by` that isn't the correlation FK is rejected — by definition a computed-by produces multiple groups per main row, so this is never valid.
+- **Bound `values` in computed expressions** work anywhere the expression lands in the `WHERE` clause or in `ORDER BY`: `filters` and `conditions` (main, `joinMustExist`, `joinMultiple`, `joinGroup`, `joinLeft`) and `orderBy`. The ConditionBuilder assigns the placeholder positions there, so no coordination is needed from the caller.
+- They are still rejected with 400 on `selectComputed`, `computeMin/Max/Sum/Avg`, `joinGroup.aggregations.by` and `defaultOrder`. Those expressions are emitted in the `SELECT` / `GROUP BY` list, which precedes the `WHERE` values in the parameter order — there is no correct position for them there. Most use cases (JSON extraction, concat, dateTrunc, simple ops) need no bound values at all.
+- **Computed CAN be used in `joinGroup.aggregations.by`** (just pass the computed name as a string). Bound `values` are not supported in this position (rejected with 400 — it is emitted in the `SELECT`/`GROUP BY` list). The existing FK-correlation rule for `orderBy <alias>.<fn>.<field>` still applies: 3-parti aggregation orderBy on a `by` that isn't the correlation FK is rejected — by definition a computed-by produces multiple groups per main row, so this is never valid.
 - **Computed cannot be used as aggregation function** (`sum`/`min`/`max`/...). The values inside `aggregations.sum: ['<name>']` must be schema field names. To aggregate on a derived expression, declare the derivation as a computed and pass the computed name as the field, BUT only via `computeMin/Max/Sum/Avg` (top-level main aggregates), not the joinGroup ones.
 - **No chained computed** (a computed referencing another computed). Flat-only.
 - **Read-only**. Computed fields are not usable in insert/update bodies — the consumer's `expr` is for SELECT/WHERE/ORDER BY, never for writes.

package/README.md

@@ -4,6 +4,16 @@ Automatic CRUD API generation from PostgreSQL, MySQL, and MariaDB tables for [Fa
 
 Point it at your database, and get a full REST API with search, advanced conditions, pagination, joins, aggregations, bulk operations, multi-tenant isolation, validation, and hooks.
 
+## What LLMs Are Saying
+
+> API: 5 new read-only tables — and this is where your plugin really shined.
+
+> Yes, it genuinely saved me a lot of work, and the numbers make that obvious: I deleted about 350 lines of hand-written API repository and route code, replacing them with roughly 150 lines of declarative configuration. And it wasn't a one-for-one trade. In return, I gained features I simply didn't have before: complete Swagger documentation, the conditions DSL (previously I only had sorting and fixed filters), pagination with total counts, structured 400 errors, and consistent camelCase conversion. 
+
+> The moment I thought, "Okay, this is well designed," was when I used computedFields: the case of "attributes stored inside a jsonb column that still need to be sortable and filterable" is exactly the kind of problem that usually forces you to step outside the framework, yet it fit in cleanly. It worked end-to-end with the role-based CASE expression, remained sortable, could be projected with selectComputed, and required zero SQL in the routes.
+
+> The AGENTS files deserve a mention: I configured everything without ever opening the source code—CLI schema, defineTable, buildRelation, computed, extraFilters, and the frontend request/response shapes. As "documentation for agents," they genuinely work, and that's more than I can say for most libraries.
+
 ## Features
 
 - **Zero boilerplate** — define your tables, get 7 endpoints each

package/dist/lib/cli/tables-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tables-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/tables-codegen.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,0FAA0F;IAC1F,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAID,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAuCpE;AAuCD,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,gBAAgB,EAAE,CAwB3E;AAID,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CA2HhG;AAID,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAqBrE;AAID,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CA6FlE"}
+{"version":3,"file":"tables-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/tables-codegen.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,0FAA0F;IAC1F,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAID,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAuCpE;AAuCD,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,gBAAgB,EAAE,CAwB3E;AAID,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CA6HhG;AAID,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAqBrE;AAID,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CA6FlE"}

package/dist/lib/cli/tables-codegen.js

@@ -151,7 +151,9 @@ export function generateSingleTableFile(schema, allSchemas) {
     lines.push(`  //   Schema,`);
     lines.push(`  //   extraFiltersValidation,`);
     lines.push(`  //   (condition, filters) => {`);
-    lines.push(`  //     if (filters.q) condition.isILike(Schema.col('${schema.fields.includes('name') ? 'name' : schema.fields[0]}'), \`%\${filters.q}%\`);`);
+    lines.push(`  //     // Prefix columns with the table name: the query may carry joins, and a`);
+    lines.push(`  //     // bare column shared with a joined table would be ambiguous.`);
+    lines.push(`  //     if (filters.q) condition.isILike(\`\${Schema.tableName}.\${Schema.col('${schema.fields.includes('name') ? 'name' : schema.fields[0]}')}\`, \`%\${filters.q}%\`);`);
     lines.push(`  //   }`);
     lines.push(`  // ),`);
     lines.push(`  defaultOrder: '${pkFirst(pk)}',`);

package/dist/lib/engine/query-params.d.ts

@@ -0,0 +1,40 @@
+import type { ConditionBuilder } from 'node-condition-builder';
+import type { QueryClient } from '../db.js';
+/**
+ * Owns the bound values of a statement while it is being assembled.
+ *
+ * A statement is built from several fragments (WHERE condition, EXISTS subqueries,
+ * aggregation clauses, LEFT JOIN filters, ORDER BY), each of which must number its
+ * placeholders from wherever the preceding fragments left off. Computing that offset at the
+ * call site is how placeholders drift out of step with values — a query that binds a value
+ * nobody references does not fail, it silently reads the wrong parameter.
+ *
+ * Here the offset is derived in exactly one place. `emit` hands a producer the index its
+ * first placeholder must take and absorbs the values it returned in the same step, so SQL
+ * and values cannot be appended independently.
+ *
+ * Fragments must be emitted in the order their placeholders appear in the final SQL: MySQL
+ * binds `?` positionally, so a fragment numbered out of textual order would break there while
+ * working on PostgreSQL.
+ */
+export declare class QueryParams {
+    private values;
+    /** Values bound so far. */
+    get length(): number;
+    /**
+     * Render a fragment at the current offset and record the values it bound.
+     * Returns whatever the producer returned, so callers can read its SQL and any extras.
+     */
+    emit<T extends {
+        values: unknown[];
+    }>(produce: (startIndex: number) => T): T;
+    /** Render a ConditionBuilder at the current offset and return its SQL. */
+    emitCondition(condition: ConditionBuilder, db: QueryClient): string;
+    /**
+     * Copy of the values bound so far. Take a snapshot before emitting a fragment that only
+     * the main query carries (ORDER BY), so the COUNT/aggregate queries can bind the subset
+     * they actually reference.
+     */
+    snapshot(): unknown[];
+}
+//# sourceMappingURL=query-params.d.ts.map

package/dist/lib/engine/query-params.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-params.d.ts","sourceRoot":"","sources":["../../../src/lib/engine/query-params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAiB;IAE/B,2BAA2B;IAC3B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH,IAAI,CAAC,CAAC,SAAS;QAAE,MAAM,EAAE,OAAO,EAAE,CAAA;KAAE,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC;IAM5E,0EAA0E;IAC1E,aAAa,CAAC,SAAS,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,GAAG,MAAM;IAOnE;;;;OAIG;IACH,QAAQ,IAAI,OAAO,EAAE;CAGtB"}

package/dist/lib/engine/query-params.js

@@ -0,0 +1,48 @@
+/**
+ * Owns the bound values of a statement while it is being assembled.
+ *
+ * A statement is built from several fragments (WHERE condition, EXISTS subqueries,
+ * aggregation clauses, LEFT JOIN filters, ORDER BY), each of which must number its
+ * placeholders from wherever the preceding fragments left off. Computing that offset at the
+ * call site is how placeholders drift out of step with values — a query that binds a value
+ * nobody references does not fail, it silently reads the wrong parameter.
+ *
+ * Here the offset is derived in exactly one place. `emit` hands a producer the index its
+ * first placeholder must take and absorbs the values it returned in the same step, so SQL
+ * and values cannot be appended independently.
+ *
+ * Fragments must be emitted in the order their placeholders appear in the final SQL: MySQL
+ * binds `?` positionally, so a fragment numbered out of textual order would break there while
+ * working on PostgreSQL.
+ */
+export class QueryParams {
+    values = [];
+    /** Values bound so far. */
+    get length() {
+        return this.values.length;
+    }
+    /**
+     * Render a fragment at the current offset and record the values it bound.
+     * Returns whatever the producer returned, so callers can read its SQL and any extras.
+     */
+    emit(produce) {
+        const out = produce(this.values.length + 1);
+        this.values.push(...out.values);
+        return out;
+    }
+    /** Render a ConditionBuilder at the current offset and return its SQL. */
+    emitCondition(condition, db) {
+        return this.emit((startIndex) => ({
+            sql: condition.build(startIndex, db.ph),
+            values: condition.getValues(),
+        })).sql;
+    }
+    /**
+     * Copy of the values bound so far. Take a snapshot before emitting a fragment that only
+     * the main query carries (ORDER BY), so the COUNT/aggregate queries can bind the subset
+     * they actually reference.
+     */
+    snapshot() {
+        return [...this.values];
+    }
+}

package/dist/lib/engine/rest/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/rest/get.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAuB,MAAM,mBAAmB,CAAC;AAEnF,wBAAsB,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CA8BrE"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/rest/get.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAuB,MAAM,mBAAmB,CAAC;AAEnF,wBAAsB,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAgCrE"}

package/dist/lib/engine/rest/get.js

@@ -8,10 +8,12 @@ export async function getEngine(params) {
     const { db, tableConf, id, tenant } = params;
     const pkCol = tableConf.Schema.col(primaryAsString(tableConf.primary));
     const cb = new ConditionBuilder('AND', db.cbDialect);
-    cb.isEqual(db.qi(pkCol), id);
+    // Table-qualified: the tenant scope may add a through-join, and a bare PK column
+    // shared with the through table would be ambiguous.
+    cb.isEqual(`${db.qi(tableConf.Schema.tableName)}.${db.qi(pkCol)}`, id);
     const joins = [];
     if (tenant) {
-        cb.append(buildTenantCondition(db, tenant.scope, tenant.ids));
+        cb.append(buildTenantCondition(db, tenant.scope, tenant.ids, tableConf.Schema.tableName));
         if ('through' in tenant.scope) {
             joins.push(buildTenantJoin(db, tenant.scope, tableConf.Schema.tableName));
         }

package/dist/lib/engine/search/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/search/search.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,YAAY,EAcb,MAAM,mBAAmB,CAAC;AA+nC3B,wBAAsB,YAAY,CAChC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,YAAY,CAAC,CA4IvB"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/lib/engine/search/search.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,YAAY,EAcb,MAAM,mBAAmB,CAAC;AAwlC3B,wBAAsB,YAAY,CAChC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,YAAY,CAAC,CA4HvB"}

package/dist/lib/engine/search/search.js

@@ -1,5 +1,6 @@
-import { ConditionBuilder } from 'node-condition-builder';
+import { ConditionBuilder, Expression } from 'node-condition-builder';
 import { camelcaseObject } from '../../naming.js';
+import { QueryParams } from '../query-params.js';
 import { buildTenantCondition, buildTenantJoin } from '../../tenant.js';
 import { assertReadable, assertFiltersReadable, readableSelectColumns } from '../../read-access.js';
 import { primaryAsString } from '../../../types.js';
@@ -32,7 +33,9 @@ function buildComputedContext(db, schema, alias) {
                 err400(`Unknown field referenced by computed expression: ${field}`);
             }
             const col = db.qi(schema.col(field));
-            const qualifier = opts?.qualifier ?? alias;
+            // Default to the owning table: the statement may carry joins, and a bare
+            // column shared with a joined table would be ambiguous.
+            const qualifier = opts?.qualifier ?? alias ?? schema.tableName;
             return qualifier ? `${db.qi(qualifier)}.${col}` : col;
         },
     };
@@ -41,14 +44,15 @@ function resolveFieldRef(field, schema, tableConf, db, alias) {
     if (field in schema.fields) {
         assertReadable(tableConf, field);
         const col = db.qi(schema.col(field));
-        const expr = alias ? `${db.qi(alias)}.${col}` : col;
-        return { expr, values: [], computed: false };
+        // Qualified with the alias or the owning table — never bare, so the reference
+        // stays unambiguous when the statement carries joins.
+        const expr = `${db.qi(alias ?? schema.tableName)}.${col}`;
+        return { expr, computed: false };
     }
     const fn = tableConf?.computedFields?.[field];
     if (fn) {
         const ctx = buildComputedContext(db, schema, alias);
-        const out = fn(ctx);
-        return { expr: out.expr, values: out.values ?? [], computed: true };
+        return { expr: computedExpression(field, fn(ctx)), computed: true };
     }
     err400(`Unknown field: ${field}`);
 }
@@ -58,16 +62,28 @@ function resolveFieldRef(field, schema, tableConf, db, alias) {
  * appends the tenant condition to `cb` (direct: `col IN ids`; indirect: condition on the
  * through table) and, for indirect scopes, pushes the INNER JOIN clause into `joins`.
  * No-op without a tenant context (admin) or when the join table is not tenant-scoped.
+ *
+ * `joinTableRef` is the raw name the join table goes by in the statement: its table name
+ * in plain side-queries, or the subquery alias inside an aliased, correlated EXISTS.
  */
-function appendJoinTenantScope(db, joinTableConf, tenant, joinTableName, cb, joins) {
+function appendJoinTenantScope(db, joinTableConf, tenant, joinTableRef, cb, joins) {
     const scope = joinTableConf?.tenantScope;
     if (!tenant || !scope)
         return;
-    cb.append(buildTenantCondition(db, scope, tenant.ids));
+    cb.append(buildTenantCondition(db, scope, tenant.ids, joinTableRef));
     if ('through' in scope) {
-        joins?.push(buildTenantJoin(db, scope, joinTableName));
+        joins?.push(buildTenantJoin(db, scope, joinTableRef));
     }
 }
+/**
+ * Alias for the FROM of a correlated subquery (EXISTS, aggregate). The subquery must not
+ * say `FROM <table>` bare: on a self-referencing relation the inner table would shadow the
+ * outer one and the correlation would silently compare each row with itself. The request
+ * alias is used, suffixed when it would itself collide with the outer table's name.
+ */
+function subqueryAlias(alias, tableConf) {
+    return alias === tableConf.Schema.tableName ? `${alias}_sub` : alias;
+}
 function findJoinByAlias(tableConf, alias) {
     return tableConf.allowedReadJoins?.find((j) => j.alias === alias);
 }
@@ -98,16 +114,48 @@ function extractJoinRefs(db, tableConf, joinDef) {
     };
 }
 /**
- * Evaluate a computed field. When `allowBoundValues=false`, throws 400 if the computed binds
- * any parameters — used in positions where parameter binding cannot be coordinated (orderBy,
- * compute*, joinLeft.filters, etc).
+ * Evaluate a computed field into an Expression carrying its own bound values.
+ *
+ * Inside a WHERE clause the ConditionBuilder assigns the placeholder indexes, so bound
+ * values are always safe there. `allowBoundValues=false` is for the positions that sit
+ * *before* the WHERE values in the parameter order (SELECT projections, aggregations),
+ * where they cannot be placed correctly; those still reject with 400.
  */
-function evaluateComputedField(fn, schema, db, alias, message, allowBoundValues = false) {
+function evaluateComputedField(name, fn, schema, db, alias, message, allowBoundValues = false) {
     const ev = fn(buildComputedContext(db, schema, alias));
     if (!allowBoundValues && (ev.values?.length ?? 0) > 0) {
         err400(message);
     }
-    return ev;
+    return computedExpression(name, ev);
+}
+/**
+ * Build the Expression for a computed field, checking that it marks each bound value
+ * with a `?`.
+ *
+ * A mismatch is always a table-configuration bug and would otherwise produce a query that
+ * binds values nobody references — silently returning wrong rows. Expressions without
+ * bound values are exempt: they are emitted verbatim, so a `?` there is a literal operator
+ * (PostgreSQL jsonb) rather than a marker.
+ */
+function computedExpression(name, ev) {
+    const values = ev.values ?? [];
+    if (values.length > 0) {
+        const markers = (ev.expr.match(/\\\?|\?/g) ?? []).filter((m) => m === '?').length;
+        if (markers !== values.length) {
+            throw new Error(`Computed field '${name}' declares ${values.length} bound value(s) but its expression ` +
+                `contains ${markers} '?' marker(s). Mark each bound value with '?' (use '\\?' for a ` +
+                `literal question mark) so the engine can assign placeholder positions.`);
+        }
+    }
+    return new Expression(ev.expr, values);
+}
+/** Bound values carried by a resolved field reference. */
+function refValues(expr) {
+    return expr instanceof Expression ? [...expr.values] : [];
+}
+/** Render a resolved field reference to SQL, binding any values from `startIndex`. */
+function renderRef(expr, startIndex, db) {
+    return expr instanceof Expression ? expr.render(startIndex, db.ph) : expr;
 }
 /** Map rows from snake_case columns to camelCase fields, preserving any computed-field columns
  * that are projected by their declared name (skipped by camelcaseObject). */
@@ -133,9 +181,10 @@ function buildSelectionColumns(selection, joinSchema, db, joinTableConf) {
     if (selection === '*') {
         return readableSelectColumns(joinTableConf, joinSchema, db) ?? '*';
     }
+    const table = db.qi(joinSchema.tableName);
     return selection
         .split(',')
-        .map((c) => db.qi(validateSchemaField(c.trim(), joinSchema, joinTableConf)))
+        .map((c) => `${table}.${db.qi(validateSchemaField(c.trim(), joinSchema, joinTableConf))}`)
         .join(', ');
 }
 const AGG_FN = {
@@ -149,7 +198,12 @@ const AGG_FN = {
 function aggExpr(fn, qualifiedCol) {
     return fn.distinct ? `COUNT(DISTINCT ${qualifiedCol})` : `${fn.sql}(${qualifiedCol})`;
 }
-function buildAggOrderExpr(db, dbTables, tableConf, alias, fn, field, joinGroup, startIdx) {
+/**
+ * Correlated aggregate subquery for `<alias>.<fn>.<field>`, as an Expression carrying the
+ * values of its optional filter. Markers are `?`, so whoever embeds it — a ConditionBuilder
+ * or an ORDER BY list — decides the placeholder positions.
+ */
+function buildAggOrderExpr(db, dbTables, tableConf, alias, fn, field, joinGroup) {
     const aggFn = AGG_FN[fn];
     if (!aggFn)
         err400(`Invalid aggregation function: ${fn}`);
@@ -167,20 +221,24 @@ function buildAggOrderExpr(db, dbTables, tableConf, alias, fn, field, joinGroup,
     }
     const fieldCol = validateSchemaField(field, joinSchema);
     const refs = extractJoinRefs(db, tableConf, joinDef);
+    // The subquery FROM is aliased so the correlation to the outer table survives a
+    // self-referencing relation; everything inside references the alias.
+    const subAlias = subqueryAlias(alias, tableConf);
+    const subRef = db.qi(subAlias);
     let filterWhere = '';
     let filterVals = [];
     const joinTableConf = dbTables[joinSchema.tableName];
     if (groupReq.filters || groupReq.conditions?.length) {
-        const cb = buildJoinRefCondition(joinTableConf, joinSchema, { filters: groupReq.filters, conditions: groupReq.conditions }, db);
-        const built = cb.build(startIdx, db.ph);
-        if (built) {
-            filterWhere = ` AND ${built}`;
-            filterVals = cb.getValues();
+        const cb = buildJoinRefCondition(joinTableConf, joinSchema, { filters: groupReq.filters, conditions: groupReq.conditions }, db, subAlias);
+        const fragment = cb.toExpression();
+        if (fragment.value) {
+            filterWhere = ` AND ${fragment.value}`;
+            filterVals = [...fragment.values];
         }
     }
-    const qualifiedCol = `${refs.joinTable}.${db.qi(fieldCol)}`;
-    const expr = `COALESCE((SELECT ${aggExpr(aggFn, qualifiedCol)} FROM ${refs.joinTable} WHERE ${refs.joinTable}.${refs.fkCol} = ${refs.mainTable}.${refs.mainCol}${filterWhere}), 0)`;
-    return { expr, values: filterVals };
+    const qualifiedCol = `${subRef}.${db.qi(fieldCol)}`;
+    const expr = `COALESCE((SELECT ${aggExpr(aggFn, qualifiedCol)} FROM ${refs.joinTable} AS ${subRef} WHERE ${subRef}.${refs.fkCol} = ${refs.mainTable}.${refs.mainCol}${filterWhere}), 0)`;
+    return new Expression(expr, filterVals);
 }
 /**
  * Pre-scan `orderBy` for the joinLeft aliases referenced in 2-parti notation (`<alias>.<field>`).
@@ -219,10 +277,11 @@ function validateOrderBy(orderBy, tableConf, db, dbTables, joinGroup, startIdx)
                 err400('Cannot combine distinctResults with aggregation orderBy');
             }
             const [, alias, fn, field, dir] = dotted3;
-            const { expr, values } = buildAggOrderExpr(db, dbTables, tableConf, alias, fn, field, joinGroup, currentIdx);
-            outParts.push(`${expr} ${(dir || 'ASC').toUpperCase()}`);
-            outValues.push(...values);
-            currentIdx += values.length;
+            const expr = buildAggOrderExpr(db, dbTables, tableConf, alias, fn, field, joinGroup);
+            const aggVals = [...expr.values];
+            outParts.push(`${renderRef(expr, currentIdx, db)} ${(dir || 'ASC').toUpperCase()}`);
+            outValues.push(...aggVals);
+            currentIdx += aggVals.length;
             continue;
         }
         // 2-parti: <alias>.<field> [ASC|DESC] (joinLeft inline ordering)
@@ -243,9 +302,12 @@ function validateOrderBy(orderBy, tableConf, db, dbTables, joinGroup, startIdx)
         }
         const [, field, dir] = plain;
         const ref = resolveFieldRef(field, tableConf.Schema, tableConf, db);
-        outParts.push(`${ref.expr} ${(dir || 'ASC').toUpperCase()}`);
-        outValues.push(...ref.values);
-        currentIdx += ref.values.length;
+        // A computed field binds its own values here: ORDER BY is emitted after the WHERE, so
+        // its placeholders continue from `currentIdx`.
+        const refVals = refValues(ref.expr);
+        outParts.push(`${renderRef(ref.expr, currentIdx, db)} ${(dir || 'ASC').toUpperCase()}`);
+        outValues.push(...refVals);
+        currentIdx += refVals.length;
     }
     return { sql: outParts.join(', '), values: outValues, leftJoinAliases };
 }
@@ -279,9 +341,10 @@ function buildLeftJoinClauses(db, dbTables, tableConf, aliasesNeedingJoin, joinL
                         cb.isEqual(`${aliasIdent}.${db.qi(joinSchema.col(field))}`, value);
                     }
                     else if (computed?.[field]) {
-                        // Computed field on the parent table: build expr with alias-qualified columns.
-                        const ev = evaluateComputedField(computed[field], joinSchema, db, alias, `Computed field '${field}' with bound values is not supported in joinLeft.filters`);
-                        cb.isEqual(ev.expr, value);
+                        // Computed field on the parent table: expr with alias-qualified columns. Bound
+                        // values are placed by this ConditionBuilder, whose SQL lands in the WHERE.
+                        const expr = evaluateComputedField(field, computed[field], joinSchema, db, alias, '', true);
+                        cb.isEqual(expr, value);
                     }
                 }
             }
@@ -296,8 +359,8 @@ function buildLeftJoinClauses(db, dbTables, tableConf, aliasesNeedingJoin, joinL
                         dispatchConditionMethod(cb, c.method, col, c.params ?? []);
                     }
                     else if (computed?.[c.field]) {
-                        const ev = evaluateComputedField(computed[c.field], joinSchema, db, alias, `Computed field '${c.field}' with bound values is not supported in joinLeft.conditions`);
-                        dispatchConditionMethod(cb, c.method, ev.expr, c.params ?? []);
+                        const expr = evaluateComputedField(c.field, computed[c.field], joinSchema, db, alias, '', true);
+                        dispatchConditionMethod(cb, c.method, expr, c.params ?? []);
                     }
                     else {
                         err400(`Unknown field: ${c.field}`);
@@ -333,12 +396,12 @@ function convertConfiguredOrder(order, tableConf, db) {
             const [, field, dir] = match;
             const suffix = dir ? ` ${dir.toUpperCase()}` : '';
             if (field in tableConf.Schema.fields) {
-                return `${db.qi(tableConf.Schema.col(field))}${suffix}`;
+                return `${db.qi(tableConf.Schema.tableName)}.${db.qi(tableConf.Schema.col(field))}${suffix}`;
             }
             const computed = tableConf.computedFields?.[field];
             if (computed) {
-                const ev = evaluateComputedField(computed, tableConf.Schema, db, undefined, `Computed field '${field}' with bound values cannot be used in defaultOrder`);
-                return `${ev.expr}${suffix}`;
+                const ev = evaluateComputedField(field, computed, tableConf.Schema, db, undefined, `Computed field '${field}' with bound values cannot be used in defaultOrder`);
+                return `${ev.value}${suffix}`;
             }
         }
         return trimmed;
@@ -366,8 +429,8 @@ async function executeMainQuery(db, tableConf, where, values, orderBy, paginator
             const fn = tableConf.computedFields?.[name];
             if (!fn)
                 err400(`Unknown computed field in selectComputed: '${name}'`);
-            const out = evaluateComputedField(fn, tableConf.Schema, db, undefined, `Computed field '${name}' with bound values cannot be used in selectComputed`);
-            projections.push(`${out.expr} AS ${db.qi(name)}`);
+            const out = evaluateComputedField(name, fn, tableConf.Schema, db, undefined, `Computed field '${name}' with bound values cannot be used in selectComputed`);
+            projections.push(`${out.value} AS ${db.qi(name)}`);
         }
         columns = projections.join(', ');
     }
@@ -398,10 +461,12 @@ async function buildPagination(db, tableConf, where, values, paginator, extraJoi
     for (const { key, field, fn } of computations) {
         if (field) {
             const ref = resolveFieldRef(field, tableConf.Schema, tableConf, db);
-            if (ref.values.length > 0) {
+            // The aggregate sits in the SELECT list, before the WHERE values: a computed that
+            // binds parameters cannot be placed here.
+            if (refValues(ref.expr).length > 0) {
                 err400(`Computed field '${field}' with bound values cannot be used in compute${key.charAt(0).toUpperCase() + key.slice(1)}`);
             }
-            const result = await db.query(`SELECT ${fn}(${ref.expr}) as value FROM ${db.qi(tableName)}${joinClause} WHERE ${where}`, values);
+            const result = await db.query(`SELECT ${fn}(${renderRef(ref.expr, 1, db)}) as value FROM ${db.qi(tableName)}${joinClause} WHERE ${where}`, values);
             computed[key] = { [field]: result.rows[0].value };
         }
     }
@@ -426,16 +491,11 @@ async function executeJoinMultiple(db, dbTables, tableConf, mainResults, joinMul
         }
         const cb = buildJoinRefCondition(joinTableConf, joinSchema, ref || {}, db);
         const fkCol = joinSchema.col(joinField);
-        cb.isIn(db.qi(fkCol), ids);
+        cb.isIn(`${db.qi(joinSchema.tableName)}.${db.qi(fkCol)}`, ids);
         const tenantJoins = [];
         appendJoinTenantScope(db, joinTableConf, tenant, joinSchema.tableName, cb, tenantJoins);
-        let where = cb.build(1, db.ph);
-        let values = cb.getValues();
-        // Side-channel: computed-field clauses on the join table
-        const computedClauses = collectJoinRefComputedClauses(joinTableConf, ref || {}, db);
-        if (computedClauses.length > 0) {
-            ({ where, values } = appendComputedConditions(where, values, computedClauses, db));
-        }
+        const where = cb.build(1, db.ph);
+        const values = cb.getValues();
         const selection = ref?.selection ?? defaultSelection;
         const columns = buildSelectionColumns(selection, joinSchema, db, joinTableConf);
         const rows = await db.select({
@@ -465,7 +525,7 @@ async function executeJoinLeft(db, dbTables, tableConf, mainResults, joinLeft, t
         }
         const fkCol = joinSchema.col(joinField);
         const cb = new ConditionBuilder('AND', db.cbDialect);
-        cb.isIn(db.qi(fkCol), ids);
+        cb.isIn(`${db.qi(joinSchema.tableName)}.${db.qi(fkCol)}`, ids);
         const tenantJoins = [];
         appendJoinTenantScope(db, joinTableConf, tenant, joinSchema.tableName, cb, tenantJoins);
         const where = cb.build(1, db.ph);
@@ -495,11 +555,11 @@ function buildByExpression(by, joinSchema, joinTableConf, db) {
         err400(`Invalid 'by' specification: expected a field or computed name`);
     }
     if (by in joinSchema.fields) {
-        return db.qi(joinSchema.col(by));
+        return `${db.qi(joinSchema.tableName)}.${db.qi(joinSchema.col(by))}`;
     }
     const fn = joinTableConf?.computedFields?.[by];
     if (fn) {
-        return evaluateComputedField(fn, joinSchema, db, undefined, `Computed field '${by}' with bound values cannot be used in aggregations.by`).expr;
+        return evaluateComputedField(by, fn, joinSchema, db, undefined, `Computed field '${by}' with bound values cannot be used in aggregations.by`).value;
     }
     err400(`Unknown field: ${by}`);
 }
@@ -529,7 +589,7 @@ async function executeJoinGroup(db, dbTables, tableConf, mainResults, joinGroup,
             const fn = AGG_FN[kind];
             for (const f of fields) {
                 const col = validateSchemaField(f, joinSchema, joinTableConf);
-                selectParts.push(`${aggExpr(fn, db.qi(col))} as "${kind}_${f}"`);
+                selectParts.push(`${aggExpr(fn, `${db.qi(joinSchema.tableName)}.${db.qi(col)}`)} as "${kind}_${f}"`);
             }
         };
         addAgg('distinctCount', aggregations.distinctCount);
@@ -545,16 +605,11 @@ async function executeJoinGroup(db, dbTables, tableConf, mainResults, joinGroup,
         const groupRef = { filters: groupFilters, conditions: groupConditions };
         const cb = buildJoinRefCondition(joinTableConf, joinSchema, groupRef, db);
         const fkCol = joinSchema.col(joinField);
-        cb.isIn(db.qi(fkCol), ids);
+        cb.isIn(`${db.qi(joinSchema.tableName)}.${db.qi(fkCol)}`, ids);
         const tenantJoins = [];
         appendJoinTenantScope(db, joinTableConf, tenant, joinSchema.tableName, cb, tenantJoins);
-        let where = cb.build(1, db.ph);
-        let values = cb.getValues();
-        // Side-channel: computed-field clauses on the join table
-        const computedClauses = collectJoinRefComputedClauses(joinTableConf, groupRef, db);
-        if (computedClauses.length > 0) {
-            ({ where, values } = appendComputedConditions(where, values, computedClauses, db));
-        }
+        const where = cb.build(1, db.ph);
+        const values = cb.getValues();
         const groupBy = groupByParts.length > 0 ? `GROUP BY ${groupByParts.join(', ')}` : '';
         const fromJoins = tenantJoins.length > 0 ? ` ${tenantJoins.join(' ')}` : '';
         const sql = `SELECT ${selectParts.join(', ')} FROM ${db.qi(joinSchema.tableName)}${fromJoins} WHERE ${where} ${groupBy}`;
@@ -613,65 +668,40 @@ function dispatchConditionMethod(cb, method, colOrExpr, params) {
         cb[method](colOrExpr, true);
     }
 }
-function buildJoinRefCondition(joinTableConf, joinSchema, ref, db) {
+function buildJoinRefCondition(joinTableConf, joinSchema, ref, db, qualifier) {
     assertFiltersReadable(ref.filters, joinTableConf);
+    // Bare table name for plain side-queries; the subquery alias when the condition lands
+    // inside an aliased, correlated FROM (there the table name would resolve to the outer query).
+    const colQualifier = qualifier ?? joinSchema.tableName;
     const cb = (ref.filters && joinTableConf)
-        ? joinTableConf.filters(ref.filters, db.cbDialect)
+        ? joinTableConf.filters(ref.filters, db.cbDialect, colQualifier)
         : new ConditionBuilder('AND', db.cbDialect);
-    if (ref.conditions?.length) {
-        for (const c of ref.conditions) {
-            if (!ALLOWED_SET.has(c.method)) {
-                err400(`Invalid condition method: ${c.method}`);
-            }
-            // Skip computed-field conditions here — they are processed via side-channel
-            // by `collectJoinRefComputedClauses` since ConditionBuilder cannot bind values
-            // for an LHS expression.
-            if (joinTableConf?.computedFields?.[c.field])
-                continue;
-            const col = db.qi(validateSchemaField(c.field, joinSchema, joinTableConf));
-            dispatchConditionMethod(cb, c.method, col, c.params ?? []);
-        }
-    }
-    return cb;
-}
-/**
- * Side-channel: gather equality + operator clauses targeting computed fields
- * declared on the join table's `computedFields`. To be appended to a WHERE
- * after the main `cb.build()` with correct placeholder offsets.
- */
-function collectJoinRefComputedClauses(joinTableConf, ref, db) {
-    const out = [];
+    // Equality filters targeting the join table's computed fields
     const computed = joinTableConf?.computedFields;
-    if (!computed)
-        return out;
-    // Equality filters on computed names
-    if (ref.filters) {
+    if (computed && ref.filters) {
         for (const [name, value] of Object.entries(ref.filters)) {
             if (value === null || value === undefined)
                 continue;
             if (!computed[name])
                 continue;
-            const ev = evaluateComputedField(computed[name], joinTableConf.Schema, db, undefined, '', true);
-            out.push({ method: 'isEqual', expr: ev.expr, values: ev.values ?? [], params: [value] });
+            const expr = evaluateComputedField(name, computed[name], joinTableConf.Schema, db, colQualifier, '', true);
+            cb.isEqual(expr, value);
         }
     }
-    // Operator conditions on computed names
     if (ref.conditions?.length) {
         for (const c of ref.conditions) {
-            if (!computed[c.field])
-                continue;
-            if (!ALLOWED_SET.has(c.method))
+            if (!ALLOWED_SET.has(c.method)) {
                 err400(`Invalid condition method: ${c.method}`);
-            const ev = evaluateComputedField(computed[c.field], joinTableConf.Schema, db, undefined, '', true);
-            out.push({
-                method: c.method,
-                expr: ev.expr,
-                values: ev.values ?? [],
-                params: c.params ?? [],
-            });
+            }
+            // Computed fields resolve to an Expression carrying their own bound values, which
+            // the ConditionBuilder places together with the compared value.
+            const operand = computed?.[c.field]
+                ? evaluateComputedField(c.field, computed[c.field], joinTableConf.Schema, db, colQualifier, '', true)
+                : `${db.qi(colQualifier)}.${db.qi(validateSchemaField(c.field, joinSchema, joinTableConf))}`;
+            dispatchConditionMethod(cb, c.method, operand, c.params ?? []);
         }
     }
-    return out;
+    return cb;
 }
 /**
  * Apply non-dotted conditions to the main `condition` ConditionBuilder when
@@ -680,7 +710,6 @@ function collectJoinRefComputedClauses(joinTableConf, ref, db) {
  * offsets), since ConditionBuilder cannot bind values for an LHS expression.
  */
 function applyConditions(condition, conditions, schema, tableConf, db) {
-    const computedClauses = [];
     for (const c of conditions) {
         // Skip dot-notation fields — those become aggregation conditions processed later
         if (c.field.includes('.'))
@@ -688,67 +717,32 @@ function applyConditions(condition, conditions, schema, tableConf, db) {
         if (!ALLOWED_SET.has(c.method)) {
             err400(`Invalid condition method: ${c.method}`);
         }
+        // A computed field resolves to an Expression carrying its own bound values; the
+        // ConditionBuilder places them, so no placeholder offset is computed here.
         const ref = resolveFieldRef(c.field, schema, tableConf, db);
-        if (!ref.computed) {
-            dispatchConditionMethod(condition, c.method, ref.expr, c.params);
-        }
-        else {
-            computedClauses.push({
-                method: c.method,
-                expr: ref.expr,
-                values: ref.values,
-                params: c.params ?? [],
-            });
-        }
+        dispatchConditionMethod(condition, c.method, ref.expr, c.params);
     }
-    return computedClauses;
 }
 /**
- * Equality filters targeting computed fields: when `filters.<computedName>` is
- * set on the request body and the computed exists on `tableConf.computedFields`,
- * generate a side-channel clause `<expr> = ?` with the user value as parameter.
- * This complements the auto-generated equality on schema fields done by
- * `tableConf.filters()`.
+ * Equality filters targeting computed fields: `filters.<computedName>` becomes
+ * `<expr> = <value>` on the same ConditionBuilder used for schema fields, which
+ * `tableConf.filters()` has already populated.
  */
-function collectComputedFilterClauses(filters, tableConf, db) {
-    const out = [];
+function applyComputedFilters(condition, filters, tableConf, db) {
     const computed = tableConf.computedFields;
     if (!computed)
-        return out;
+        return;
     for (const [name, value] of Object.entries(filters)) {
         if (value === null || value === undefined)
             continue;
         if (!computed[name])
             continue;
-        const ref = evaluateComputedField(computed[name], tableConf.Schema, db, undefined, '', true);
-        out.push({ method: 'isEqual', expr: ref.expr, values: ref.values ?? [], params: [value] });
-    }
-    return out;
-}
-/**
- * Append computed-field condition clauses (side-channel from applyConditions)
- * to the current WHERE, coordinating placeholder indices with the running
- * `values` array.
- */
-function appendComputedConditions(currentWhere, currentValues, clauses, db) {
-    let where = currentWhere;
-    let values = [...currentValues];
-    for (const c of clauses) {
-        // Append the computed's own bound values first; the expr placeholders
-        // (if any) reference them via stable indices set by the consumer.
-        values = [...values, ...c.values];
-        const tmpCb = new ConditionBuilder('AND', db.cbDialect);
-        dispatchConditionMethod(tmpCb, c.method, c.expr, c.params);
-        const startIdx = values.length + 1;
-        const clauseSql = tmpCb.build(startIdx, db.ph);
-        where += ` AND ${clauseSql}`;
-        values.push(...tmpCb.getValues());
+        const expr = evaluateComputedField(name, computed[name], tableConf.Schema, db, undefined, '', true);
+        condition.isEqual(expr, value);
     }
-    return { where, values };
 }
-function appendAggConditions(currentWhere, currentValues, conditions, db, dbTables, tableConf, joinGroup) {
-    let where = currentWhere;
-    let values = [...currentValues];
+function appendAggConditions(params, conditions, db, dbTables, tableConf, joinGroup) {
+    let where = '';
     for (const c of conditions) {
         if (!c.field.includes('.'))
             continue;
@@ -760,53 +754,38 @@ function appendAggConditions(currentWhere, currentValues, conditions, db, dbTabl
             err400(`Invalid dotted field in condition: ${c.field} (expected <alias>.<fn>.<field>)`);
         }
         const [alias, fn, field] = parts;
-        const { expr, values: exprValues } = buildAggOrderExpr(db, dbTables, tableConf, alias, fn, field, joinGroup, values.length + 1);
-        values = [...values, ...exprValues];
+        // The aggregate carries the values of its own filter; passing it as the left-hand side
+        // lets the ConditionBuilder place those and the compared value in one step.
+        const expr = buildAggOrderExpr(db, dbTables, tableConf, alias, fn, field, joinGroup);
         const tmpCb = new ConditionBuilder('AND', db.cbDialect);
         dispatchConditionMethod(tmpCb, c.method, expr, c.params);
-        const startIdx = values.length + 1;
-        const clause = tmpCb.build(startIdx, db.ph);
-        where += ` AND ${clause}`;
-        values.push(...tmpCb.getValues());
+        where += ` AND ${params.emitCondition(tmpCb, db)}`;
     }
-    return { where, values };
+    return where;
 }
 // ─── joinMustExist (EXISTS subquery filter on main) ─────────
-function buildJoinMustExistClauses(db, dbTables, tableConf, joinMustExist, currentWhere, currentValues, tenant) {
-    let where = currentWhere;
-    const values = [...currentValues];
+function buildJoinMustExistClauses(params, db, dbTables, tableConf, joinMustExist, tenant) {
+    let where = '';
     for (const [alias, ref] of Object.entries(joinMustExist)) {
         const joinDef = requireJoin(tableConf, alias, false);
         const { joinSchema } = joinDef;
         const joinTableConf = dbTables[joinSchema.tableName];
         const refs = extractJoinRefs(db, tableConf, joinDef);
-        const filterCondition = buildJoinRefCondition(joinTableConf, joinSchema, ref, db);
+        // The EXISTS FROM is aliased so the correlation to the outer table survives a
+        // self-referencing relation; everything inside references the alias.
+        const subAlias = subqueryAlias(alias, tableConf);
+        const subRef = db.qi(subAlias);
+        const filterCondition = buildJoinRefCondition(joinTableConf, joinSchema, ref, db, subAlias);
         const tenantJoins = [];
-        appendJoinTenantScope(db, joinTableConf, tenant, joinSchema.tableName, filterCondition, tenantJoins);
-        const startIdx = values.length + 1;
-        let filterWhere = filterCondition.build(startIdx, db.ph);
-        let filterVals = [...filterCondition.getValues()];
-        // Side-channel: computed-field clauses
-        const computedClauses = collectJoinRefComputedClauses(joinTableConf, ref, db);
-        if (computedClauses.length > 0) {
-            let cwhere = filterWhere;
-            let cvalues = filterVals;
-            ({ where: cwhere, values: cvalues } = appendComputedConditions(cwhere, [...values, ...cvalues], computedClauses, db));
-            // appendComputedConditions starts with currentValues; we need just the
-            // delta belonging to this EXISTS subquery to update filterVals.
-            filterVals = cvalues.slice(values.length);
-            filterWhere = cwhere;
-        }
-        // Qualify the FK with the join table: the EXISTS FROM may include the tenant
-        // through-join, so a bare column could become ambiguous.
+        appendJoinTenantScope(db, joinTableConf, tenant, subAlias, filterCondition, tenantJoins);
+        const filterWhere = params.emitCondition(filterCondition, db);
         const innerWhere = filterWhere
-            ? `${refs.joinTable}.${refs.fkCol} = ${refs.mainTable}.${refs.mainCol} AND ${filterWhere}`
-            : `${refs.joinTable}.${refs.fkCol} = ${refs.mainTable}.${refs.mainCol}`;
+            ? `${subRef}.${refs.fkCol} = ${refs.mainTable}.${refs.mainCol} AND ${filterWhere}`
+            : `${subRef}.${refs.fkCol} = ${refs.mainTable}.${refs.mainCol}`;
         const existsJoins = tenantJoins.length > 0 ? ` ${tenantJoins.join(' ')}` : '';
-        where += ` AND EXISTS (SELECT 1 FROM ${refs.joinTable}${existsJoins} WHERE ${innerWhere})`;
-        values.push(...filterVals);
+        where += ` AND EXISTS (SELECT 1 FROM ${refs.joinTable} AS ${subRef}${existsJoins} WHERE ${innerWhere})`;
     }
-    return { where, values };
+    return where;
 }
 // ─── searchEngine entrypoint ────────────────────────────────
 export async function searchEngine(dbTables, params) {
@@ -827,44 +806,36 @@ export async function searchEngine(dbTables, params) {
     // Build main condition
     assertFiltersReadable(filters, tableConf);
     const condition = tableConf.filters(filters || {}, db.cbDialect);
-    // Filters that target computed fields (declared on tableConf.computedFields)
-    // are applied via the side-channel pattern further down.
-    let computedFilterClauses = [];
+    // Filters and conditions targeting computed fields go on the same ConditionBuilder:
+    // a computed resolves to an Expression carrying its own values, and the builder is
+    // what assigns every placeholder index.
     if (filters && tableConf.computedFields) {
-        computedFilterClauses = collectComputedFilterClauses(filters, tableConf, db);
+        applyComputedFilters(condition, filters, tableConf, db);
     }
-    let computedConditionClauses = [];
     if (conditions?.length) {
-        computedConditionClauses = applyConditions(condition, conditions, tableConf.Schema, tableConf, db);
+        applyConditions(condition, conditions, tableConf.Schema, tableConf, db);
     }
     // Tenant
     const tenantJoins = [];
     if (tenant) {
-        condition.append(buildTenantCondition(db, tenant.scope, tenant.ids));
+        condition.append(buildTenantCondition(db, tenant.scope, tenant.ids, tableConf.Schema.tableName));
         if ('through' in tenant.scope) {
             tenantJoins.push(buildTenantJoin(db, tenant.scope, tableConf.Schema.tableName));
         }
     }
-    let where = condition.build(1, db.ph);
-    let values = [...condition.getValues()];
-    // Append computed filter (equality) and condition (operator) clauses with
-    // correct placeholder offsets.
-    if (computedFilterClauses.length > 0) {
-        ({ where, values } = appendComputedConditions(where, values, computedFilterClauses, db));
-    }
-    if (computedConditionClauses.length > 0) {
-        ({ where, values } = appendComputedConditions(where, values, computedConditionClauses, db));
-    }
+    // From here the statement is assembled fragment by fragment. `bound` owns the values and
+    // hands each fragment the placeholder index it must start from, so no offset is computed
+    // at any call site. Fragments must be emitted in the order their placeholders appear in
+    // the final SQL — MySQL binds `?` positionally.
+    const bound = new QueryParams();
+    let where = bound.emitCondition(condition, db);
     // joinMustExist (EXISTS)
     if (joinMustExist && Object.keys(joinMustExist).length > 0) {
-        ({ where, values } = buildJoinMustExistClauses(db, dbTables, tableConf, joinMustExist, where, values, tenant));
+        where += buildJoinMustExistClauses(bound, db, dbTables, tableConf, joinMustExist, tenant);
     }
     // Aggregation conditions (HAVING-style)
-    if (conditions?.length) {
-        const hasAggConditions = conditions.some((c) => c.field.includes('.'));
-        if (hasAggConditions) {
-            ({ where, values } = appendAggConditions(where, values, conditions, db, dbTables, tableConf, joinGroup));
-        }
+    if (conditions?.length && conditions.some((c) => c.field.includes('.'))) {
+        where += appendAggConditions(bound, conditions, db, dbTables, tableConf, joinGroup);
     }
     // Determine which joinLeft aliases need a LEFT JOIN on the main query:
     // - any alias used in 2-parti orderBy
@@ -880,32 +851,24 @@ export async function searchEngine(dbTables, params) {
                 aliasesNeedingLeftJoin.add(alias);
         }
     }
-    // Build LEFT JOIN clauses + extra WHERE for filtered parents. Their placeholders start right
-    // after the WHERE values; the same clause SQL is reused by the pagination COUNT/compute queries,
-    // whose value array is [...WHERE, ...leftJoin] — so this base MUST stay `values.length + 1`.
+    // LEFT JOIN clauses + extra WHERE for filtered parents.
     const extraJoinClauses = [...tenantJoins];
-    let leftJoinValues = [];
     if (aliasesNeedingLeftJoin.size > 0) {
-        const lj = buildLeftJoinClauses(db, dbTables, tableConf, aliasesNeedingLeftJoin, joinLeft, values.length + 1);
+        const lj = bound.emit((startIndex) => buildLeftJoinClauses(db, dbTables, tableConf, aliasesNeedingLeftJoin, joinLeft, startIndex));
         extraJoinClauses.push(...lj.joinClauses);
-        leftJoinValues = lj.values;
         for (const w of lj.whereExtras)
             where += ` AND ${w}`;
     }
-    // orderBy is parsed AFTER the LEFT JOIN values so aggregation-orderBy placeholders start past
-    // them (main query binds [...WHERE, ...leftJoin, ...orderBy]). Parsing it earlier with base
-    // `values.length + 1` misbinds when BOTH an aggregation orderBy and a filtered joinLeft exist.
+    // The pagination COUNT and the compute* queries reuse the WHERE and its joins but drop the
+    // ORDER BY, so they bind everything up to this point and nothing after it.
+    const whereAndJoinValues = bound.snapshot();
+    // ORDER BY is emitted last, so an aggregation-orderBy numbers its placeholders past the
+    // WHERE and LEFT JOIN values.
     let safeOrderBy;
-    let orderByValues = [];
     if (orderBy) {
-        const obResult = validateOrderBy(orderBy, tableConf, db, dbTables, joinGroup, values.length + leftJoinValues.length + 1);
-        safeOrderBy = obResult.sql;
-        orderByValues = obResult.values;
-    }
-    // Bind WHERE values + LEFT JOIN values + orderBy aggregation values for main query.
-    // Pagination COUNT/compute include WHERE + LEFT JOIN values (no orderBy).
-    const whereAndJoinValues = [...values, ...leftJoinValues];
-    const mainValues = [...whereAndJoinValues, ...orderByValues];
+        safeOrderBy = bound.emit((startIndex) => validateOrderBy(orderBy, tableConf, db, dbTables, joinGroup, startIndex)).sql;
+    }
+    const mainValues = bound.snapshot();
     const main = await executeMainQuery(db, tableConf, where, mainValues, safeOrderBy, paginator, extraJoinClauses, params.selectComputed, params.maxRows);
     let pagination;
     if (paginator) {

package/dist/lib/table-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-helpers.d.ts","sourceRoot":"","sources":["../../src/lib/table-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,yBAAyB,EAAiC,MAAM,wBAAwB,CAAC;AACzH,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,MAAM,EACP,MAAM,aAAa,CAAC;AAarB,KAAK,UAAU,CAAC,EAAE,IAAI,EAAE,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAExH,wBAAgB,eAAe,CAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,EAAE,SAAS,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,EAErE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,YAAY,GAAE,EAAa,EAC3B,iBAAiB,CAAC,EAAE,CAClB,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,yBAAyB;CAAE,KAC3E,IAAI,GACR;IAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAAC,OAAO,EAAE,aAAa,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CA0BhG;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,MAAM,CAAC,CAAC,CAAC,CAMX;AAkED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAEjC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,EAClD,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,EAC3B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,cAAc,CAShB;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,GAC5B,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAE9B;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,KAAK,EAAE,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAE,GACvC,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAEjC"}
+{"version":3,"file":"table-helpers.d.ts","sourceRoot":"","sources":["../../src/lib/table-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,yBAAyB,EAAiC,MAAM,wBAAwB,CAAC;AACzH,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,MAAM,EACP,MAAM,aAAa,CAAC;AAarB,KAAK,UAAU,CAAC,EAAE,IAAI,EAAE,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAExH,wBAAgB,eAAe,CAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,EAAE,SAAS,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,EAErE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,YAAY,GAAE,EAAa,EAC3B,iBAAiB,CAAC,EAAE,CAClB,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,yBAAyB;CAAE,KAC3E,IAAI,GACR;IAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAAC,OAAO,EAAE,aAAa,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CA8BhG;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,MAAM,CAAC,CAAC,CAAC,CAMX;AAkED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAEjC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,EAClD,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,EAC3B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,cAAc,CAShB;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,GAC5B,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAE9B;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,KAAK,EAAE,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAE,GACvC,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAEjC"}

package/dist/lib/table-helpers.js

@@ -9,12 +9,16 @@ function qi(field, dialect) {
     return getDialect(dialect ?? ConditionBuilder.DIALECT).qi(field);
 }
 export function exportTableInfo(Schema, extraFilters = {}, extendedCondition) {
-    const filters = (filterValues, dialect) => {
+    const filters = (filterValues, dialect, qualifier) => {
         const condition = new ConditionBuilder('AND', dialect);
-        // Only auto-match real schema fields (DB columns)
+        // Only auto-match real schema fields (DB columns). Columns are table-qualified:
+        // the statement may carry joins (LEFT JOIN parents, tenant through-joins), and a
+        // bare column shared with a joined table would be ambiguous. A caller-provided
+        // qualifier (a subquery alias) takes precedence over the table name.
+        const table = qi(qualifier ?? Schema.tableName, dialect);
         for (const field of Object.keys(Schema.fields)) {
             if (field in filterValues && filterValues[field] !== null && filterValues[field] !== undefined) {
-                condition.isEqual(qi(Schema.col(field), dialect), filterValues[field]);
+                condition.isEqual(`${table}.${qi(Schema.col(field), dialect)}`, filterValues[field]);
             }
         }
         // extraFilters are handled exclusively by extendedCondition

package/dist/lib/tenant.d.ts

@@ -3,7 +3,7 @@ import type { QueryClient } from './db.js';
 import { ConditionBuilder, type ConditionValue, type ConditionValueOrUndefined } from 'node-condition-builder';
 import type { ITable, SqlApiPluginOptions, TenantId, TenantScope, TenantScopeIndirect, TenantContext } from '../types.js';
 export declare function resolveTenant(options: SqlApiPluginOptions, tableConf: ITable, request: FastifyRequest): Promise<TenantContext | undefined>;
-export declare function buildTenantCondition(db: QueryClient, scope: TenantScope, tenantIds: TenantId[]): ConditionBuilder;
+export declare function buildTenantCondition(db: QueryClient, scope: TenantScope, tenantIds: TenantId[], ownTable: string): ConditionBuilder;
 export declare function buildTenantJoin(db: QueryClient, scope: TenantScopeIndirect, mainTableName: string): string;
 export declare function injectTenantValue(record: Record<string, unknown>, scope: TenantScope, tenantIds: TenantId[]): void;
 export declare function validateTenantFK(db: QueryClient, scope: TenantScopeIndirect, tenantIds: TenantId[], fkValues: unknown[]): Promise<void>;

package/dist/lib/tenant.d.ts.map

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

package/dist/types/computed.d.ts

@@ -15,10 +15,20 @@ export interface ComputedFieldContext {
 }
 /**
  * Result returned by a ComputedFieldFn.
- *  - `expr`: SQL fragment usable as a scalar expression.
- *  - `values`: bound parameter values (always parameterized — never interpolate
- *    user-derived data into `expr`).
+ *  - `expr`: SQL fragment usable as a scalar expression. Mark each bound value with `?`
+ *    (use `\?` for a literal question mark, e.g. the PostgreSQL jsonb operator). The engine
+ *    assigns the placeholder positions — never write `$1` / `db.ph(n)` yourself, and never
+ *    interpolate user-derived data into the SQL.
+ *  - `values`: bound parameter values, one per `?` marker in `expr`. A mismatch between
+ *    markers and values is rejected: it would bind values the query never references.
  *  - `type`: TypeBox schema for Swagger filters and main response (REQUIRED).
+ *
+ * Example:
+ *   ({ qiCol }) => ({
+ *     expr: `CASE WHEN ${qiCol('role')} = ? THEN ${qiCol('salary')} ELSE 0 END`,
+ *     values: ['admin'],
+ *     type: Type.Number(),
+ *   })
  */
 export interface ComputedFieldExpr {
     expr: string;

package/dist/types/computed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computed.d.ts","sourceRoot":"","sources":["../../src/types/computed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,WAAW,CAAC;IAChB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;CAC7D;AAED;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,oBAAoB,KAAK,iBAAiB,CAAC"}
+{"version":3,"file":"computed.d.ts","sourceRoot":"","sources":["../../src/types/computed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,WAAW,CAAC;IAChB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;CAC7D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,oBAAoB,KAAK,iBAAiB,CAAC"}

package/dist/types/table.d.ts

@@ -16,8 +16,13 @@ export type ExtendedConditionFn = (condition: ConditionBuilder, filters: FilterR
  * `dialect` selects identifier quoting and builder behavior per call (the engines pass
  * the dialect of the QueryClient that runs the query); when omitted, the global
  * `ConditionBuilder.DIALECT` is used.
+ *
+ * `qualifier` is the raw (unquoted) table name or alias to prefix columns with; it
+ * defaults to the table's own name. The engines pass an alias when the condition lands
+ * inside a correlated subquery whose FROM is aliased — there the bare table name would
+ * resolve against the OUTER query.
  */
-export type TableFilterFn = (filters: FilterRecord, dialect?: CbDialect) => ConditionBuilder;
+export type TableFilterFn = (filters: FilterRecord, dialect?: CbDialect, qualifier?: string) => ConditionBuilder;
 export interface ITable<F extends Record<string, TSchema> = Record<string, TSchema>> {
     primary: (string & keyof F) | (string & keyof F)[];
     Schema: SchemaDefinition<F>;

package/dist/types/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/types/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,WAAW,IAAI,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAChI,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEpE,4FAA4F;AAC5F,MAAM,MAAM,cAAc,GACtB,QAAQ,GACR,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,YAAY,GACZ,YAAY,CAAC;AAEjB,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;AACrE,MAAM,MAAM,mBAAmB,GAAG,CAAC,SAAS,EAAE,gBAAgB,EAAE,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;AAC/F;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,gBAAgB,CAAC;AAE7F,MAAM,WAAW,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACjF,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC;IACnD,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC5B,OAAO,EAAE,aAAa,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACjD,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC,iBAAiB,CAAC,EAAE,cAAc,EAAE,CAAC;IACrC,SAAS,CAAC,EAAE,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAClC,YAAY,CAAC,EAAE,CACb,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE;SAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI;KAAE,KAC1D,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,YAAY,CAAC,EAAE,CACb,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE;SAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI;KAAE,EAC7D,sBAAsB,CAAC,EAAE,OAAO,KAC7B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,WAAW,CAAC,EAAE,CACZ,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE;SAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAAE,EACzC,gBAAgB,CAAC,EAAE,OAAO,KACvB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,CACZ,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE;SAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI;KAAE,EAC7D,gBAAgB,CAAC,EAAE,OAAO,EAC1B,eAAe,CAAC,EAAE,OAAO,KACtB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;;;;;;;;;;OAYG;IACH,YAAY,CAAC,EAAE,CACb,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,cAAc,EACnB,EAAE,EAAE,MAAM,GAAG,MAAM,KAChB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;OAGG;IACH,WAAW,CAAC,EAAE,CACZ,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,cAAc,EACnB,EAAE,EAAE,MAAM,GAAG,MAAM,KAChB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,CACjB,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KACrB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAChB,EAAE,EAAE,WAAW,EACf,GAAG,EAAE,cAAc,EACnB,UAAU,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KAC5B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAC9B;;;;;;;;;;;OAWG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC;IAChG,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAGD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAGnD,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAE7D;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAEpG"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/types/table.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify-auto-sqlapi",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Fastify plugin for automatic CRUD API generation from PostgreSQL, MySQL and MariaDB tables",
   "type": "module",
   "main": "./dist/index.js",
@@ -64,7 +64,7 @@
   "homepage": "https://github.com/LucaRainone/fastify-auto-sqlapi#readme",
   "dependencies": {
     "@sinclair/typebox": "^0.34.14",
-    "node-condition-builder": "^1.0.6"
+    "node-condition-builder": "^1.2.0"
   },
   "devDependencies": {
     "@fastify/postgres": "^6.0.2",