durcno 1.0.0-alpha.10 → 1.0.0-alpha.11

package/dist/bin.cjs

@@ -10405,7 +10405,7 @@ async function status(options) {
 }
 
 // src/cli/index.ts
-program.version("1.0.0-alpha.9");
+program.version("1.0.0-alpha.10");
 var Options = {
   config: ["--config <path>", "Path to the config file"]
 };

package/dist/src/columns/common.d.mts

@@ -2,7 +2,7 @@ import { entityType } from "../symbols.mjs";
 import { Key } from "../types.mjs";
 import { StdTable, StdTableColumn, TableColumn } from "../table.mjs";
 import { Arg } from "../query-builders/pre.mjs";
-import { Query } from "../query-builders/query.mjs";
+import { Query, QueryContext } from "../query-builders/query.mjs";
 import { Sql } from "../sql.mjs";
 import * as z from "zod";
 
@@ -105,36 +105,34 @@ declare abstract class Column<TConfig extends ColumnConfig, TColVal, TPgType ext
     /** Phantom discriminant id for this entity kind. */kind: "column"; /** The PostgreSQL type category for this column. */
     PgType: TPgType; /** The TypeScript type for this column's value. */
     TsType: TColVal;
-    TsTypeScalar: TColVal;
-    ValTypeBase: GetValueArray<TColVal, TConfig>;
     HasValTypeOverridde: {};
     ValTypeOverride: {};
   };
-  readonly ValType: this["$"]["HasValTypeOverridde"] extends true ? this["$"]["ValTypeOverride"] : this["$"]["ValTypeBase"];
+  readonly ValType: this["$"]["HasValTypeOverridde"] extends true ? GetValueArray<this["$"]["ValTypeOverride"], TConfig> : GetValueArray<TColVal, TConfig>;
   readonly ValTypeInsert: this extends {
     isGeneratedAlways: true;
   } ? never : this extends {
     isGeneratedByDefault: true;
   } ? this["ValType"] | undefined : this extends {
-    hasDefault: true;
-  } ? this["ValType"] | Sql | null | undefined : this extends {
+    isNotNull: true;
+  } ? this extends {
     hasInsertFn: true;
-  } ? this["ValType"] | Sql | null | undefined : TConfig extends {
-    notNull: true;
-  } ? this["ValType"] | Sql : this["ValType"] | Sql | null | undefined;
-  readonly ValTypeUpdate: TConfig extends {
-    primaryKey: true;
-  } ? never : TConfig extends {
-    notNull: true;
-  } ? this["ValType"] : this["ValType"] | null;
-  readonly ValTypeSelect: TConfig extends {
+  } | {
+    hasDefault: true;
+  } ? this["ValType"] | Sql | undefined : this["ValType"] | Sql : this["ValType"] | Sql | null | undefined;
+  readonly ValTypeUpdate: this extends {
+    isPrimaryKey: true;
+  } ? never : this extends {
+    isNotNull: true;
+  } ? this["ValType"] | undefined : this["ValType"] | undefined | null;
+  readonly ValTypeSelect: this extends {
     isGeneratedAlways: true;
   } | {
     isGeneratedByDefault: true;
-  } ? this["ValType"] : TConfig extends {
-    primaryKey: true;
-  } ? this["ValType"] : TConfig extends {
-    notNull: true;
+  } | {
+    isPrimaryKey: true;
+  } | {
+    isNotNull: true;
   } ? this["ValType"] : this["ValType"] | null;
   constructor(config: TConfig);
   _: {
@@ -142,7 +140,7 @@ declare abstract class Column<TConfig extends ColumnConfig, TColVal, TPgType ext
     setTable: (table: StdTable) => void;
   };
   get name(): string | undefined;
-  get nameSnake(): string | undefined;
+  get nameSql(): string | undefined;
   get table(): TableLike | undefined;
   get isPrimaryKey(): TConfig extends {
     primaryKey: true;
@@ -166,7 +164,7 @@ declare abstract class Column<TConfig extends ColumnConfig, TColVal, TPgType ext
    * @returns string `"table"."column"`
    */
   get fullName(): string;
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
   abstract toDriverScalar(value: TColVal | Sql | null): string | number | null;
   abstract toSQLScalar(value: TColVal | Sql | null): string;
   abstract fromDriverScalar(value: unknown): TColVal | null;

package/dist/src/columns/common.mjs

@@ -27,7 +27,7 @@ var Column = class {
 	#generatedAs;
 	#references;
 	#name;
-	#nameSnake;
+	#nameSql;
 	#table;
 	constructor(config) {
 		this.config = config;
@@ -38,7 +38,7 @@ var Column = class {
 	_ = {
 		setName: (name) => {
 			this.#name = name;
-			this.#nameSnake = camelToSnake(name);
+			this.#nameSql = camelToSnake(name);
 		},
 		setTable: (table) => {
 			this.#table = table;
@@ -47,8 +47,8 @@ var Column = class {
 	get name() {
 		return this.#name;
 	}
-	get nameSnake() {
-		return this.#nameSnake;
+	get nameSql() {
+		return this.#nameSql;
 	}
 	get table() {
 		return this.#table;
@@ -77,7 +77,7 @@ var Column = class {
 	get zodType() {
 		let schema = this.zodTypeScaler;
 		if (!this.config.dimension) return schema;
-		for (const dim of this.config.dimension) if (typeof dim === "number") schema = z.tuple(Array(dim).map(() => schema));
+		for (const dim of this.config.dimension) if (typeof dim === "number") schema = z.tuple(Array.from({ length: dim }, () => schema));
 		else schema = z.array(schema);
 		return schema;
 	}
@@ -86,10 +86,13 @@ var Column = class {
 	* @returns string `"table"."column"`
 	*/
 	get fullName() {
-		return `"${this.table?._.name}"."${this.nameSnake}"`;
+		return `"${this.table?._.name}"."${this.nameSql}"`;
 	}
-	toQuery(query) {
-		query.sql += this.fullName;
+	toQuery(query, ctx) {
+		const alias = ctx?.tableAliases?.get(`${this.table?._.schema}.${this.table?._.name}`);
+		if (alias === void 0) query.sql += this.fullName;
+		else if (alias === null) query.sql += `"${this.nameSql}"`;
+		else query.sql += `"${alias}"."${this.nameSql}"`;
 	}
 	/**
 	* Converts a JavaScript value to the PostgreSQL driver format.

package/dist/src/constraints/check.d.mts

@@ -1,5 +1,6 @@
 import { TableAnyColumn } from "../table.mjs";
 import { AnyFilter, Filter } from "../filters/index.mjs";
+import { QueryContext } from "../query-builders/query.mjs";
 import { Sql } from "../sql.mjs";
 
 //#region src/constraints/check.d.ts
@@ -14,8 +15,12 @@ declare class Check {
   constructor(name: string, expr: AnyFilter | Sql);
   /** Returns the constraint name, appending `_check` suffix if not already present. */
   getName(): string;
-  /** Renders the constraint expression to a SQL string. */
-  toSQL(): string;
+  /**
+   * Renders the constraint expression to a SQL string.
+   * Pass a {@link QueryContext} with `null` alias entries to suppress table qualifiers
+   * on specific tables (used by the snapshot builder for CHECK constraint SQL).
+   */
+  toSQL(ctx?: QueryContext): string;
 }
 //#endregion
 export { Check, CheckExpression };

package/dist/src/constraints/check.mjs

@@ -1,5 +1,4 @@
 import { Query } from "../query-builders/query.mjs";
-import { isTableCol } from "../entity.mjs";
 import { Sql } from "../sql.mjs";
 //#region src/constraints/check.ts
 /** A CHECK constraint for a table, storing its name and filter/SQL expression. */
@@ -14,11 +13,15 @@ var Check = class {
 	getName() {
 		return this.#name.includes("check") ? this.#name : `${this.#name}_check`;
 	}
-	/** Renders the constraint expression to a SQL string. */
-	toSQL() {
+	/**
+	* Renders the constraint expression to a SQL string.
+	* Pass a {@link QueryContext} with `null` alias entries to suppress table qualifiers
+	* on specific tables (used by the snapshot builder for CHECK constraint SQL).
+	*/
+	toSQL(ctx) {
 		if (this.#expr instanceof Sql) return this.#expr.string;
 		const query = new Query("", () => []);
-		this.#expr.toQuery(query);
+		this.#expr.toQuery(query, ctx);
 		return query.sql;
 	}
 };
@@ -26,31 +29,5 @@ var Check = class {
 function check(name, expr) {
 	return new Check(name, expr);
 }
-/**
-* Wraps a column proxy so that `fullName` returns the unqualified quoted name,
-* e.g. `"price"` instead of `"public"."price"`.
-* Required so filter conditions in check constraints emit unqualified column names.
-*/
-function proxyColumnForCheck(col) {
-	return new Proxy(col, { get(target, prop) {
-		if (prop === "fullName") return `"${target.nameSnake}"`;
-		if (prop === "toQuery") return (val) => val.sql += `"${target.nameSnake}"`;
-		const val = Reflect.get(target, prop, target);
-		if (typeof val === "function") return val.bind(target);
-		return val;
-	} });
-}
-/**
-* Wraps a table so that any column access returns a check-safe column proxy.
-* Pass the result to the `checkConstraints` callback so filters produce correct SQL.
-*/
-function createCheckTableProxy(table) {
-	return new Proxy(table, { get(target, prop) {
-		const val = Reflect.get(target, prop, target);
-		if (isTableCol(val)) return proxyColumnForCheck(val);
-		if (typeof val === "function") return val.bind(target);
-		return val;
-	} });
-}
 //#endregion
-export { check, createCheckTableProxy };
+export { check };

package/dist/src/constraints/primary-key.mjs

@@ -11,7 +11,7 @@ var PrimaryKeyConstraint = class {
 		return this.#name.startsWith(`${table._.name}_`) ? this.#name : `${table._.name}_${this.#name}`;
 	}
 	getColumns() {
-		return this.#columns.map((col) => col.nameSnake);
+		return this.#columns.map((col) => col.nameSql);
 	}
 };
 /**

package/dist/src/constraints/unique.mjs

@@ -11,7 +11,7 @@ var UniqueConstraint = class {
 		return this.#name.startsWith(`${table._.name}_`) ? this.#name : `${table._.name}_${this.#name}`;
 	}
 	getColumns() {
-		return this.#columns.map((col) => col.nameSnake);
+		return this.#columns.map((col) => col.nameSql);
 	}
 };
 /**

package/dist/src/entity.mjs

@@ -20,4 +20,4 @@ function isTableCol(value) {
 }
 const isTCol = isTableCol;
 //#endregion
-export { is, isCol, isTCol, isTableCol };
+export { is, isCol, isTCol };

package/dist/src/filters/array.d.mts

@@ -1,7 +1,7 @@
 import { TableAnyColumn } from "../table.mjs";
 import { Filter } from "./index.mjs";
 import { Arg, IsArg } from "../query-builders/pre.mjs";
-import { Query } from "../query-builders/query.mjs";
+import { Query, QueryContext } from "../query-builders/query.mjs";
 
 //#region src/filters/array.d.ts
 /**
@@ -17,7 +17,7 @@ declare class ArrayContainsFilter<TCol extends TableAnyColumn, TValues extends A
   readonly left: TCol;
   readonly values: TValues;
   constructor(column: TCol, values: TValues);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if an array column contains all specified values.
@@ -36,7 +36,7 @@ declare class ArrayContainedByFilter<TCol extends TableAnyColumn, TValues extend
   readonly left: TCol;
   readonly values: TValues;
   constructor(column: TCol, values: TValues);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if an array column is contained by the specified values.
@@ -52,7 +52,7 @@ declare class ArrayOverlapsFilter<TCol extends TableAnyColumn, TValues extends A
   readonly left: TCol;
   readonly right: TValues;
   constructor(column: TCol, values: TValues);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if an array column overlaps with the specified values.
@@ -68,7 +68,7 @@ declare class ArrayHasFilter<TCol extends TableAnyColumn, TRight extends ArrayEl
   readonly left: TCol;
   readonly value: TRight;
   constructor(column: TCol, value: TRight);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if a value exists in an array column.
@@ -84,7 +84,7 @@ declare class ArrayAllFilter<TCol extends TableAnyColumn, TRight extends ArrayEl
   readonly left: TCol;
   readonly value: TRight;
   constructor(column: TCol, value: TRight);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if all elements in an array column equal a value.

package/dist/src/filters/array.mjs

@@ -24,8 +24,9 @@ var ArrayContainsFilter = class extends Filter {
 		this.left = column;
 		this.values = values;
 	}
-	toQuery(query) {
-		query.sql += `${this.left.fullName} @> `;
+	toQuery(query, ctx) {
+		this.left.toQuery(query, ctx);
+		query.sql += " @> ";
 		if (is(this.values, Arg)) query.addArg(this.values);
 		else query.sql += `${this.left.toSQL(this.values)}::${this.left.sqlType}`;
 	}
@@ -45,8 +46,9 @@ var ArrayContainedByFilter = class extends Filter {
 		this.left = column;
 		this.values = values;
 	}
-	toQuery(query) {
-		query.sql += `${this.left.fullName} <@ `;
+	toQuery(query, ctx) {
+		this.left.toQuery(query, ctx);
+		query.sql += " <@ ";
 		if (is(this.values, Arg)) query.addArg(this.values);
 		else query.sql += `${this.left.toSQL(this.values)}::${this.left.sqlType}`;
 	}
@@ -66,8 +68,9 @@ var ArrayOverlapsFilter = class extends Filter {
 		this.left = column;
 		this.right = values;
 	}
-	toQuery(query) {
-		query.sql += `${this.left.fullName} && `;
+	toQuery(query, ctx) {
+		this.left.toQuery(query, ctx);
+		query.sql += " && ";
 		if (is(this.right, Arg)) query.addArg(this.right);
 		else query.sql += `${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
@@ -87,10 +90,12 @@ var ArrayHasFilter = class extends Filter {
 		this.left = column;
 		this.value = value;
 	}
-	toQuery(query) {
+	toQuery(query, ctx) {
 		if (is(this.value, Arg)) query.addArg(this.value);
 		else query.sql += this.left.toSQLScalar(this.value);
-		query.sql += ` = ANY(${this.left.fullName})`;
+		query.sql += " = ANY(";
+		this.left.toQuery(query, ctx);
+		query.sql += ")";
 	}
 };
 function arrayHas(column, value) {
@@ -108,10 +113,12 @@ var ArrayAllFilter = class extends Filter {
 		this.left = column;
 		this.value = value;
 	}
-	toQuery(query) {
+	toQuery(query, ctx) {
 		if (is(this.value, Arg)) query.addArg(this.value);
 		else query.sql += this.left.toSQLScalar(this.value);
-		query.sql += ` = ALL(${this.left.fullName})`;
+		query.sql += " = ALL(";
+		this.left.toQuery(query, ctx);
+		query.sql += ")";
 	}
 };
 function arrayAll(column, value) {

package/dist/src/filters/index.d.mts

@@ -3,7 +3,7 @@ import { TableAnyColumn } from "../table.mjs";
 import { AnyScalarSqlFn } from "../functions/index.mjs";
 import { SelectQuery } from "../query-builders/select.mjs";
 import { Arg, IsArg } from "../query-builders/pre.mjs";
-import { Query } from "../query-builders/query.mjs";
+import { Query, QueryContext } from "../query-builders/query.mjs";
 import { Sql } from "../sql.mjs";
 
 //#region src/filters/index.d.ts
@@ -13,7 +13,7 @@ declare abstract class Filter<TColumns extends TableAnyColumn = TableAnyColumn,
   readonly $Columns: TColumns;
   /** Phantom field: `true` when this filter embeds at least one `Arg` placeholder. */
   readonly $HasArg: THasArg;
-  abstract toQuery(query: Query): void;
+  abstract toQuery(query: Query, ctx?: QueryContext): void;
 }
 /** Convenience alias for a `Filter` with all type parameters widened to `any`. */
 type AnyFilter = Filter<any, any>;
@@ -33,14 +33,14 @@ declare class ComparisonLeftIsColumn<TLeft extends TableAnyColumn, TOp extends s
   readonly op: TOp;
   readonly right: TRight;
   constructor(field: TLeft, op: TOp, right: TRight);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 declare class ComparisonLeftIsSqlFn<TLeft extends AnyScalarSqlFn, TOp extends string, TRight extends BasicTypes | AnyScalarSqlFn> extends Filter<TLeft["$Columns"] | (TRight extends AnyScalarSqlFn ? TRight["$Columns"] : never), HasArg<TLeft> extends true ? true : HasArg<TRight>> {
   readonly left: TLeft;
   readonly op: TOp;
   readonly right: TRight;
   constructor(field: TLeft, op: TOp, right: TRight);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 declare function eq<TLeft extends TableAnyColumn, TRight extends TLeft["ValType"]>(left: TLeft, right: TRight): ComparisonLeftIsColumn<TLeft, "=", TRight>;
 declare function eq<TLeft extends TableAnyColumn, TRight extends Arg<TLeft["ValType"]> | TableAnyColumn | AnyScalarSqlFn>(left: TLeft, right: TRight): ComparisonLeftIsColumn<TLeft, "=", TRight>;
@@ -69,13 +69,13 @@ declare function lte<TLeft extends AnyScalarSqlFn, TRight extends AnyScalarSqlFn
 declare class IsNullCondition<TCol extends TableAnyColumn> extends Filter<TCol, false> {
   readonly field: TCol;
   constructor(field: TCol);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 declare function isNull<TCol extends TableAnyColumn>(field: TCol): IsNullCondition<TCol>;
 declare class IsNotNullCondition<TCol extends TableAnyColumn> extends Filter<TCol, false> {
   readonly field: TCol;
   constructor(field: TCol);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 declare function isNotNull<TCol extends TableAnyColumn>(field: TCol): IsNotNullCondition<TCol>;
 type InSelectQuery<TArg extends boolean, TReturn> = SelectQuery<any, any, any, any, any, TArg, any, any, Record<string, TReturn>[]>;
@@ -83,26 +83,26 @@ declare class InCondition<TCol extends TableAnyColumn, TArg extends boolean> ext
   readonly field: TCol;
   readonly values: TCol["ValType"][] | InSelectQuery<TArg, TCol["ValType"]>;
   constructor(field: TCol, values: TCol["ValType"][] | InSelectQuery<TArg, TCol["ValType"]>);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 declare function isIn<TCol extends TableAnyColumn>(field: TCol, values: TCol["ValType"][] | InSelectQuery<boolean, TCol["ValType"]>): InCondition<TCol, false>;
 declare class NotInCondition<TCol extends TableAnyColumn> extends Filter<TCol, false> {
   readonly field: TCol;
   readonly values: TCol["ValType"][];
   constructor(field: TCol, values: TCol["ValType"][]);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 declare function notIn<TCol extends TableAnyColumn>(field: TCol, values: TCol["ValType"][]): NotInCondition<TCol>;
 declare class AndCondition<TConditions extends (AnyFilter | Sql)[]> extends Filter<ExtractCols<TConditions[number]>, HasArgOf<TConditions>> {
   readonly conditions: TConditions;
   constructor(...conditions: TConditions);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 declare function and<TConditions extends (AnyFilter | Sql)[]>(...conditions: TConditions): AndCondition<TConditions>;
 declare class OrCondition<TConditions extends (AnyFilter | Sql)[]> extends Filter<ExtractCols<TConditions[number]>, HasArgOf<TConditions>> {
   readonly conditions: TConditions;
   constructor(...conditions: TConditions);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 declare function or<TConditions extends (AnyFilter | Sql)[]>(...conditions: TConditions): OrCondition<TConditions>;
 //#endregion

package/dist/src/filters/index.mjs

@@ -20,12 +20,12 @@ var ComparisonLeftIsColumn = class extends Filter {
 		this.op = op;
 		this.right = right;
 	}
-	toQuery(query) {
-		this.left.toQuery(query);
+	toQuery(query, ctx) {
+		this.left.toQuery(query, ctx);
 		query.sql += ` ${this.op} `;
 		if (is(this.right, Arg)) query.addArg(this.right);
-		else if (isTCol(this.right)) this.right.toQuery(query);
-		else if (this.right instanceof SqlFn) this.right.toQuery(query);
+		else if (isTCol(this.right)) this.right.toQuery(query, ctx);
+		else if (this.right instanceof SqlFn) this.right.toQuery(query, ctx);
 		else query.sql += this.left.toSQL(this.right);
 	}
 };
@@ -39,10 +39,10 @@ var ComparisonLeftIsSqlFn = class extends Filter {
 		this.op = op;
 		this.right = right;
 	}
-	toQuery(query) {
-		this.left.toQuery(query);
+	toQuery(query, ctx) {
+		this.left.toQuery(query, ctx);
 		query.sql += ` ${this.op} `;
-		if (this.right instanceof SqlFn) this.right.toQuery(query);
+		if (this.right instanceof SqlFn) this.right.toQuery(query, ctx);
 		else query.sql += toSqlValue(this.right);
 	}
 };
@@ -76,8 +76,9 @@ var IsNullCondition = class extends Filter {
 		super();
 		this.field = field;
 	}
-	toQuery(query) {
-		query.sql += `${this.field.fullName} IS NULL`;
+	toQuery(query, ctx) {
+		this.field.toQuery(query, ctx);
+		query.sql += " IS NULL";
 	}
 };
 function isNull(field) {
@@ -89,8 +90,9 @@ var IsNotNullCondition = class extends Filter {
 		super();
 		this.field = field;
 	}
-	toQuery(query) {
-		query.sql += `${this.field.fullName} IS NOT NULL`;
+	toQuery(query, ctx) {
+		this.field.toQuery(query, ctx);
+		query.sql += " IS NOT NULL";
 	}
 };
 function isNotNull(field) {
@@ -104,17 +106,19 @@ var InCondition = class extends Filter {
 		this.field = field;
 		this.values = values;
 	}
-	toQuery(query) {
+	toQuery(query, ctx) {
 		if (Array.isArray(this.values)) {
 			if (this.values.length === 0) {
 				query.sql += "FALSE";
 				return;
 			}
-			query.sql += `${this.field.fullName} IN (`;
+			this.field.toQuery(query, ctx);
+			query.sql += " IN (";
 			query.sql += this.values.map((v) => this.field.toSQL(v)).join(", ");
 			query.sql += ")";
 		} else {
-			query.sql += `${this.field.fullName} IN (`;
+			this.field.toQuery(query, ctx);
+			query.sql += " IN (";
 			query.sql += this.values.toQuery();
 			query.sql += ")";
 		}
@@ -131,12 +135,13 @@ var NotInCondition = class extends Filter {
 		this.field = field;
 		this.values = values;
 	}
-	toQuery(query) {
+	toQuery(query, ctx) {
 		if (this.values.length === 0) {
 			query.sql += "TRUE";
 			return;
 		}
-		query.sql += `${this.field.fullName} NOT IN (`;
+		this.field.toQuery(query, ctx);
+		query.sql += " NOT IN (";
 		query.sql += this.values.map((v) => this.field.toSQL(v)).join(", ");
 		query.sql += ")";
 	}
@@ -150,10 +155,10 @@ var AndCondition = class extends Filter {
 		super();
 		this.conditions = conditions;
 	}
-	toQuery(query) {
+	toQuery(query, ctx) {
 		query.sql += "(";
 		for (let i = 0; i < this.conditions.length; i++) {
-			this.conditions[i].toQuery(query);
+			this.conditions[i].toQuery(query, ctx);
 			if (i < this.conditions.length - 1) query.sql += " AND ";
 		}
 		query.sql += ")";
@@ -168,10 +173,10 @@ var OrCondition = class extends Filter {
 		super();
 		this.conditions = conditions;
 	}
-	toQuery(query) {
+	toQuery(query, ctx) {
 		query.sql += "(";
 		for (let i = 0; i < this.conditions.length; i++) {
-			this.conditions[i].toQuery(query);
+			this.conditions[i].toQuery(query, ctx);
 			if (i < this.conditions.length - 1) query.sql += " OR ";
 		}
 		query.sql += ")";

package/dist/src/filters/postgis.d.mts

@@ -3,7 +3,7 @@ import { TableColumn } from "../table.mjs";
 import { Filter } from "./index.mjs";
 import { PointColumn } from "../columns/postgis/geography/point.mjs";
 import { Arg, IsArg } from "../query-builders/pre.mjs";
-import { Query } from "../query-builders/query.mjs";
+import { Query, QueryContext } from "../query-builders/query.mjs";
 
 //#region src/filters/postgis.d.ts
 /** Constrains `TCol` to geography point columns only. */
@@ -22,7 +22,7 @@ declare class StDWithinFilter<TCol extends GeographyPointCol, TPoint extends TCo
   private readonly point;
   private readonly radius;
   constructor(col: TCol, point: TPoint, radius: TRadius);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if a geography column is within `radius` meters
@@ -50,7 +50,7 @@ declare class StIntersectsFilter<TCol extends GeographyPointCol, TPoint extends
   private readonly col;
   private readonly point;
   constructor(col: TCol, point: TPoint);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if a geography column intersects the given point.
@@ -73,7 +73,7 @@ declare class StContainsFilter<TCol extends GeographyPointCol, TPoint extends TC
   private readonly col;
   private readonly point;
   constructor(col: TCol, point: TPoint);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if a geography column contains the given point.
@@ -96,7 +96,7 @@ declare class StWithinFilter<TCol extends GeographyPointCol, TPoint extends TCol
   private readonly col;
   private readonly point;
   constructor(col: TCol, point: TPoint);
-  toQuery(query: Query): void;
+  toQuery(query: Query, ctx?: QueryContext): void;
 }
 /**
  * Creates a condition that checks if a geography column is within the given point geometry.

package/dist/src/filters/postgis.mjs

@@ -25,8 +25,10 @@ var StDWithinFilter = class extends Filter {
 		this.point = point;
 		this.radius = radius;
 	}
-	toQuery(query) {
-		query.sql += `ST_DWithin(${this.col.fullName}, `;
+	toQuery(query, ctx) {
+		query.sql += "ST_DWithin(";
+		this.col.toQuery(query, ctx);
+		query.sql += ", ";
 		pointToQuery(query, this.point, this.col.toSQL.bind(this.col));
 		query.sql += ", ";
 		if (is(this.radius, Arg)) query.addArg(this.radius);
@@ -64,8 +66,10 @@ var StIntersectsFilter = class extends Filter {
 		this.col = col;
 		this.point = point;
 	}
-	toQuery(query) {
-		query.sql += `ST_Intersects(${this.col.fullName}, `;
+	toQuery(query, ctx) {
+		query.sql += "ST_Intersects(";
+		this.col.toQuery(query, ctx);
+		query.sql += ", ";
 		pointToQuery(query, this.point, this.col.toSQL.bind(this.col));
 		query.sql += ")";
 	}
@@ -95,8 +99,10 @@ var StContainsFilter = class extends Filter {
 		this.col = col;
 		this.point = point;
 	}
-	toQuery(query) {
-		query.sql += `ST_Contains(${this.col.fullName}, `;
+	toQuery(query, ctx) {
+		query.sql += "ST_Contains(";
+		this.col.toQuery(query, ctx);
+		query.sql += ", ";
 		pointToQuery(query, this.point, this.col.toSQL.bind(this.col));
 		query.sql += ")";
 	}
@@ -126,8 +132,10 @@ var StWithinFilter = class extends Filter {
 		this.col = col;
 		this.point = point;
 	}
-	toQuery(query) {
-		query.sql += `ST_Within(${this.col.fullName}, `;
+	toQuery(query, ctx) {
+		query.sql += "ST_Within(";
+		this.col.toQuery(query, ctx);
+		query.sql += ", ";
 		pointToQuery(query, this.point, this.col.toSQL.bind(this.col));
 		query.sql += ")";
 	}